Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
This is a shorter bit handling in MODE_MOUSE.
[st.git] / st.c
diff --git a/st.c b/st.c
index 0f47d6d..bcb36a2 100644 (file)
--- a/st.c
+++ b/st.c
@@ -118,6 +118,7 @@ enum term_mode {
        MODE_8BIT        = 8192,
        MODE_BLINK       = 16384,
        MODE_FBLINK      = 32768,
        MODE_8BIT        = 8192,
        MODE_BLINK       = 16384,
        MODE_FBLINK      = 32768,
+       MODE_FOCUS       = 65536,
 };
 
 enum escape_state {
 };
 
 enum escape_state {
@@ -249,11 +250,17 @@ typedef struct {
        int mode;
        int type;
        int snap;
        int mode;
        int type;
        int snap;
-       int bx, by;
-       int ex, ey;
+       /*
+        * Selection variables:
+        * nb – normalized coordinates of the beginning of the selection
+        * ne – normalized coordinates of the end of the selection
+        * ob – original coordinates of the beginning of the selection
+        * oe – original coordinates of the end of the selection
+        */
        struct {
                int x, y;
        struct {
                int x, y;
-       } b, e;
+       } nb, ne, ob, oe;
+
        char *clip;
        Atom xtarget;
        bool alt;
        char *clip;
        Atom xtarget;
        bool alt;
@@ -363,11 +370,13 @@ static void xloadcols(void);
 static int xsetcolorname(int, const char *);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, int);
 static int xsetcolorname(int, const char *);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, int);
+static int xloadfontset(Font *);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xtermclear(int, int, int, int);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xtermclear(int, int, int, int);
+static void xunloadfont(Font *f);
 static void xunloadfonts(void);
 static void xresize(int, int);
 
 static void xunloadfonts(void);
 static void xresize(int, int);
 
@@ -388,6 +397,7 @@ static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selrequest(XEvent *);
 
 static void selinit(void);
+static void selsort(void);
 static inline bool selected(int, int);
 static void selcopy(void);
 static void selscroll(int, int);
 static inline bool selected(int, int);
 static void selcopy(void);
 static void selscroll(int, int);
@@ -628,12 +638,12 @@ utf8size(char *s) {
        }
 }
 
        }
 }
 
-void
+static void
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
-       sel.bx = -1;
+       sel.ob.x = -1;
        sel.clip = NULL;
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
        sel.clip = NULL;
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
@@ -656,25 +666,33 @@ y2row(int y) {
        return LIMIT(y, 0, term.row-1);
 }
 
        return LIMIT(y, 0, term.row-1);
 }
 
+static void
+selsort(void) {
+       if(sel.ob.y == sel.oe.y) {
+               sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+               sel.ne.x = MAX(sel.ob.x, sel.oe.x);
+       } else {
+               sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
+               sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+       }
+       sel.nb.y = MIN(sel.ob.y, sel.oe.y);
+       sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+}
+
 static inline bool
 selected(int x, int y) {
 static inline bool
 selected(int x, int y) {
-       int bx, ex;
-
-       if(sel.ey == y && sel.by == y) {
-               bx = MIN(sel.bx, sel.ex);
-               ex = MAX(sel.bx, sel.ex);
-
-               return BETWEEN(x, bx, ex);
-       }
+       if(sel.ne.y == y && sel.nb.y == y)
+               return BETWEEN(x, sel.nb.x, sel.ne.x);
 
        if(sel.type == SEL_RECTANGULAR) {
 
        if(sel.type == SEL_RECTANGULAR) {
-               return ((sel.b.y <= y && y <= sel.e.y)
-                       && (sel.b.x <= x && x <= sel.e.x));
+               return ((sel.nb.y <= y && y <= sel.ne.y)
+                       && (sel.nb.x <= x && x <= sel.ne.x));
        }
        }
-       return ((sel.b.y < y && y < sel.e.y)
-               || (y == sel.e.y && x <= sel.e.x))
-               || (y == sel.b.y && x >= sel.b.x
-                       && (x <= sel.e.x || sel.b.y != sel.e.y));
+
+       return ((sel.nb.y < y && y < sel.ne.y)
+               || (y == sel.ne.y && x <= sel.ne.x))
+               || (y == sel.nb.y && x >= sel.nb.x
+                       && (x <= sel.ne.x || sel.nb.y != sel.ne.y));
 }
 
 void
 }
 
 void
@@ -707,8 +725,10 @@ selsnap(int mode, int *x, int *y, int direction) {
                                }
                        }
 
                                }
                        }
 
-                       if(term.line[*y][*x + direction].c[0] == ' ')
+                       if(strchr(worddelimiters,
+                                       term.line[*y][*x + direction].c[0])) {
                                break;
                                break;
+                       }
 
                        *x += direction;
                }
 
                        *x += direction;
                }
@@ -758,22 +778,18 @@ getbuttoninfo(XEvent *e) {
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
-       sel.ex = x2col(e->xbutton.x);
-       sel.ey = y2row(e->xbutton.y);
+       sel.oe.x = x2col(e->xbutton.x);
+       sel.oe.y = y2row(e->xbutton.y);
 
 
-       if (sel.by < sel.ey
-                       || (sel.by == sel.ey && sel.bx < sel.ex)) {
-               selsnap(sel.snap, &sel.bx, &sel.by, -1);
-               selsnap(sel.snap, &sel.ex, &sel.ey, +1);
+       if(sel.ob.y < sel.oe.y
+                       || (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
+               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
        } else {
        } else {
-               selsnap(sel.snap, &sel.ex, &sel.ey, -1);
-               selsnap(sel.snap, &sel.bx, &sel.by, +1);
+               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
+               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
        }
        }
-
-       sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
-       sel.b.y = MIN(sel.by, sel.ey);
-       sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
-       sel.e.y = MAX(sel.by, sel.ey);
+       selsort();
 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {
 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {
@@ -797,7 +813,8 @@ mousereport(XEvent *e) {
                if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
                        return;
                button = ob + 32;
                if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
                        return;
                button = ob + 32;
-               ox = x, oy = y;
+               ox = x;
+               oy = y;
        } else if(!IS_SET(MODE_MOUSESGR)
                        && (e->xbutton.type == ButtonRelease
                                || button == AnyButton)) {
        } else if(!IS_SET(MODE_MOUSESGR)
                        && (e->xbutton.type == ButtonRelease
                                || button == AnyButton)) {
@@ -808,7 +825,8 @@ mousereport(XEvent *e) {
                        button += 64 - 3;
                if(e->xbutton.type == ButtonPress) {
                        ob = button;
                        button += 64 - 3;
                if(e->xbutton.type == ButtonPress) {
                        ob = button;
-                       ox = x, oy = y;
+                       ox = x;
+                       oy = y;
                }
        }
 
                }
        }
 
@@ -855,15 +873,15 @@ bpress(XEvent *e) {
                gettimeofday(&now, NULL);
 
                /* Clear previous selection, logically and visually. */
                gettimeofday(&now, NULL);
 
                /* Clear previous selection, logically and visually. */
-               if(sel.bx != -1) {
-                       sel.bx = -1;
-                       tsetdirt(sel.b.y, sel.e.y);
+               if(sel.ob.x != -1) {
+                       sel.ob.x = -1;
+                       tsetdirt(sel.nb.y, sel.ne.y);
                        draw();
                }
                sel.mode = 1;
                sel.type = SEL_REGULAR;
                        draw();
                }
                sel.mode = 1;
                sel.type = SEL_REGULAR;
-               sel.ex = sel.bx = x2col(e->xbutton.x);
-               sel.ey = sel.by = y2row(e->xbutton.y);
+               sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
+               sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
 
                /*
                 * If the user clicks below predefined timeouts specific
 
                /*
                 * If the user clicks below predefined timeouts specific
@@ -876,12 +894,9 @@ bpress(XEvent *e) {
                } else {
                        sel.snap = 0;
                }
                } else {
                        sel.snap = 0;
                }
-               selsnap(sel.snap, &sel.bx, &sel.by, -1);
-               selsnap(sel.snap, &sel.ex, &sel.ey, +1);
-               sel.b.x = sel.bx;
-               sel.b.y = sel.by;
-               sel.e.x = sel.ex;
-               sel.e.y = sel.ey;
+               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
+               selsort();
 
                /*
                 * Draw selection, unless it's regular and we don't want to
 
                /*
                 * Draw selection, unless it's regular and we don't want to
@@ -889,7 +904,7 @@ bpress(XEvent *e) {
                 */
                if(sel.snap != 0) {
                        sel.mode++;
                 */
                if(sel.snap != 0) {
                        sel.mode++;
-                       tsetdirt(sel.b.y, sel.e.y);
+                       tsetdirt(sel.nb.y, sel.ne.y);
                        draw();
                }
                sel.tclick2 = sel.tclick1;
                        draw();
                }
                sel.tclick2 = sel.tclick1;
@@ -903,14 +918,14 @@ selcopy(void) {
        int x, y, bufsize, size, i, ex;
        Glyph *gp, *last;
 
        int x, y, bufsize, size, i, ex;
        Glyph *gp, *last;
 
-       if(sel.bx == -1) {
+       if(sel.ob.x == -1) {
                str = NULL;
        } else {
                str = NULL;
        } else {
-               bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+               bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
                ptr = str = xmalloc(bufsize);
 
                /* append every set & selected glyph to the selection */
                ptr = str = xmalloc(bufsize);
 
                /* append every set & selected glyph to the selection */
-               for(y = sel.b.y; y < sel.e.y + 1; y++) {
+               for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
                        last = gp + term.col;
 
                        gp = &term.line[y][0];
                        last = gp + term.col;
 
@@ -936,20 +951,20 @@ selcopy(void) {
                         * st.
                         * FIXME: Fix the computer world.
                         */
                         * st.
                         * FIXME: Fix the computer world.
                         */
-                       if(y < sel.e.y && !((gp-1)->mode & ATTR_WRAP))
+                       if(y < sel.ne.y && !((gp-1)->mode & ATTR_WRAP))
                                *ptr++ = '\n';
 
                        /*
                         * If the last selected line expands in the selection
                         * after the visible text '\n' is appended.
                         */
                                *ptr++ = '\n';
 
                        /*
                         * If the last selected line expands in the selection
                         * after the visible text '\n' is appended.
                         */
-                       if(y == sel.e.y) {
+                       if(y == sel.ne.y) {
                                i = term.col;
                                while(--i > 0 && term.line[y][i].c[0] == ' ')
                                        /* nothing */;
                                i = term.col;
                                while(--i > 0 && term.line[y][i].c[0] == ' ')
                                        /* nothing */;
-                               ex = sel.e.x;
-                               if(sel.b.y == sel.e.y && sel.e.x < sel.b.x)
-                                       ex = sel.b.x;
+                               ex = sel.ne.x;
+                               if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
+                                       ex = sel.nb.x;
                                if(i < ex)
                                        *ptr++ = '\n';
                        }
                                if(i < ex)
                                        *ptr++ = '\n';
                        }
@@ -1012,10 +1027,10 @@ clippaste(const Arg *dummy) {
 
 void
 selclear(XEvent *e) {
 
 void
 selclear(XEvent *e) {
-       if(sel.bx == -1)
+       if(sel.ob.x == -1)
                return;
                return;
-       sel.bx = -1;
-       tsetdirt(sel.b.y, sel.e.y);
+       sel.ob.x = -1;
+       tsetdirt(sel.nb.y, sel.ne.y);
 }
 
 void
 }
 
 void
@@ -1078,13 +1093,13 @@ brelease(XEvent *e) {
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                if(sel.mode < 2) {
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                if(sel.mode < 2) {
-                       sel.bx = -1;
+                       sel.ob.x = -1;
                } else {
                        getbuttoninfo(e);
                        selcopy();
                }
                sel.mode = 0;
                } else {
                        getbuttoninfo(e);
                        selcopy();
                }
                sel.mode = 0;
-               term.dirty[sel.ey] = 1;
+               tsetdirt(sel.nb.y, sel.ne.y);
        }
 }
 
        }
 }
 
@@ -1101,15 +1116,14 @@ bmotion(XEvent *e) {
                return;
 
        sel.mode++;
                return;
 
        sel.mode++;
-       oldey = sel.ey;
-       oldex = sel.ex;
-       oldsby = sel.b.y;
-       oldsey = sel.e.y;
+       oldey = sel.oe.y;
+       oldex = sel.oe.x;
+       oldsby = sel.nb.y;
+       oldsey = sel.ne.y;
        getbuttoninfo(e);
 
        getbuttoninfo(e);
 
-       if(oldey != sel.ey || oldex != sel.ex) {
-               tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
-       }
+       if(oldey != sel.oe.y || oldex != sel.oe.x)
+               tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
 
 void
 }
 
 void
@@ -1407,31 +1421,30 @@ tscrollup(int orig, int n) {
 
 void
 selscroll(int orig, int n) {
 
 void
 selscroll(int orig, int n) {
-       if(sel.bx == -1)
+       if(sel.ob.x == -1)
                return;
 
                return;
 
-       if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
-               if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
-                       sel.bx = -1;
+       if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+               if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+                       sel.ob.x = -1;
                        return;
                }
                if(sel.type == SEL_RECTANGULAR) {
                        return;
                }
                if(sel.type == SEL_RECTANGULAR) {
-                       if(sel.by < term.top)
-                               sel.by = term.top;
-                       if(sel.ey > term.bot)
-                               sel.ey = term.bot;
+                       if(sel.ob.y < term.top)
+                               sel.ob.y = term.top;
+                       if(sel.oe.y > term.bot)
+                               sel.oe.y = term.bot;
                } else {
                } else {
-                       if(sel.by < term.top) {
-                               sel.by = term.top;
-                               sel.bx = 0;
+                       if(sel.ob.y < term.top) {
+                               sel.ob.y = term.top;
+                               sel.ob.x = 0;
                        }
                        }
-                       if(sel.ey > term.bot) {
-                               sel.ey = term.bot;
-                               sel.ex = term.col;
+                       if(sel.oe.y > term.bot) {
+                               sel.oe.y = term.bot;
+                               sel.oe.x = term.col;
                        }
                }
                        }
                }
-               sel.b.y = sel.by, sel.b.x = sel.bx;
-               sel.e.y = sel.ey, sel.e.x = sel.ex;
+               selsort();
        }
 }
 
        }
 }
 
@@ -1770,6 +1783,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);
                                MODBIT(term.mode, 0, MODE_MOUSEBTN);
                                break;
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);
                                MODBIT(term.mode, 0, MODE_MOUSEBTN);
                                break;
+                       case 1003: /* 1003: enable all mouse reports */
+                               MODBIT(term.mode, set, MODE_MOUSE);
+                               break;
+                       case 1004:
+                               MODBIT(term.mode, set, MODE_FOCUS);
+                               break;
                        case 1006:
                                MODBIT(term.mode, set, MODE_MOUSESGR);
                                break;
                        case 1006:
                                MODBIT(term.mode, set, MODE_MOUSESGR);
                                break;
@@ -1795,6 +1814,16 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
+                       /* Not implemented mouse modes. See comments there. */
+                       case 9: /* X10 compatibility mode */
+                       case 1001: /* mouse highlight mode; can hang the
+                                     terminal by design when implemented. */
+                       case 1005: /* UTF-8 mouse mode; will confuse
+                                     applications not supporting UTF-8
+                                     and luit. */
+                       case 1015: /* urxvt mangled mouse mode; incompatible
+                                     and can be mistaken for other control
+                                     codes. */
                        default:
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                        default:
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
@@ -1901,7 +1930,7 @@ csihandle(void) {
                        tputtab(1);
                break;
        case 'J': /* ED -- Clear screen */
                        tputtab(1);
                break;
        case 'J': /* ED -- Clear screen */
-               sel.bx = -1;
+               sel.ob.x = -1;
                switch(csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch(csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -2397,8 +2426,8 @@ tputc(char *c, int len) {
         */
        if(control && !(term.c.attr.mode & ATTR_GFX))
                return;
         */
        if(control && !(term.c.attr.mode & ATTR_GFX))
                return;
-       if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
-               sel.bx = -1;
+       if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+               sel.ob.x = -1;
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
                tnewline(1);
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
                tnewline(1);
@@ -2641,16 +2670,12 @@ xloadfont(Font *f, FcPattern *pattern) {
        if(!match)
                return 1;
 
        if(!match)
                return 1;
 
-       if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) {
-               FcPatternDestroy(match);
-               return 1;
-       }
-
        if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
                FcPatternDestroy(match);
                return 1;
        }
 
        if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
                FcPatternDestroy(match);
                return 1;
        }
 
+       f->set = NULL;
        f->pattern = FcPatternDuplicate(pattern);
 
        f->ascent = f->match->ascent;
        f->pattern = FcPatternDuplicate(pattern);
 
        f->ascent = f->match->ascent;
@@ -2725,6 +2750,23 @@ xloadfonts(char *fontstr, int fontsize) {
        FcPatternDestroy(pattern);
 }
 
        FcPatternDestroy(pattern);
 }
 
+int
+xloadfontset(Font *f) {
+       FcResult result;
+
+       if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
+               return 1;
+       return 0;
+}
+
+void
+xunloadfont(Font *f) {
+       XftFontClose(xw.dpy, f->match);
+       FcPatternDestroy(f->pattern);
+       if(f->set)
+               FcFontSetDestroy(f->set);
+}
+
 void
 xunloadfonts(void) {
        int i, ip;
 void
 xunloadfonts(void) {
        int i, ip;
@@ -2741,18 +2783,10 @@ xunloadfonts(void) {
        frccur = -1;
        frclen = 0;
 
        frccur = -1;
        frclen = 0;
 
-       XftFontClose(xw.dpy, dc.font.match);
-       FcPatternDestroy(dc.font.pattern);
-       FcFontSetDestroy(dc.font.set);
-       XftFontClose(xw.dpy, dc.bfont.match);
-       FcPatternDestroy(dc.bfont.pattern);
-       FcFontSetDestroy(dc.bfont.set);
-       XftFontClose(xw.dpy, dc.ifont.match);
-       FcPatternDestroy(dc.ifont.pattern);
-       FcFontSetDestroy(dc.ifont.set);
-       XftFontClose(xw.dpy, dc.ibfont.match);
-       FcPatternDestroy(dc.ibfont.pattern);
-       FcFontSetDestroy(dc.ibfont.set);
+       xunloadfont(&dc.font);
+       xunloadfont(&dc.bfont);
+       xunloadfont(&dc.ifont);
+       xunloadfont(&dc.ibfont);
 }
 
 void
 }
 
 void
@@ -2985,7 +3019,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        r.width = width;
        XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
 
        r.width = width;
        XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
 
-       fcsets[0] = font->set;
        for(xp = winx; bytelen > 0;) {
                /*
                 * Search for the range in the to be printed string of glyphs
        for(xp = winx; bytelen > 0;) {
                /*
                 * Search for the range in the to be printed string of glyphs
@@ -3043,6 +3076,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
                /* Nothing was found. */
                if(i >= frclen) {
 
                /* Nothing was found. */
                if(i >= frclen) {
+                       if(!font->set)
+                               xloadfontset(font);
+                       fcsets[0] = font->set;
+
                        /*
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                        /*
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
@@ -3200,7 +3237,7 @@ drawregion(int x1, int y1, int x2, int y2) {
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
-       bool ena_sel = sel.bx != -1;
+       bool ena_sel = sel.ob.x != -1;
 
        if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
                ena_sel = 0;
 
        if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
                ena_sel = 0;
@@ -3289,9 +3326,13 @@ focus(XEvent *ev) {
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
+               if(IS_SET(MODE_FOCUS))
+                       ttywrite("\033[I", 3);
        } else {
                XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;
        } else {
                XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;
+               if(IS_SET(MODE_FOCUS))
+                       ttywrite("\033[O", 3);
        }
 }
 
        }
 }
 
@@ -3479,25 +3520,23 @@ run(void) {
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
 
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
 
-               switch(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
-               case -1:
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
-               default:
-                       if(FD_ISSET(cmdfd, &rfd)) {
-                               ttyread();
-                               if(blinktimeout) {
-                                       blinkset = tattrset(ATTR_BLINK);
-                                       if(!blinkset && term.mode & ATTR_BLINK)
-                                               term.mode &= ~(MODE_BLINK);
-                               }
+               }
+               if(FD_ISSET(cmdfd, &rfd)) {
+                       ttyread();
+                       if(blinktimeout) {
+                               blinkset = tattrset(ATTR_BLINK);
+                               if(!blinkset && term.mode & ATTR_BLINK)
+                                       term.mode &= ~(MODE_BLINK);
                        }
                        }
-
-                       if(FD_ISSET(xfd, &rfd))
-                               xev = actionfps;
-                       break;
                }
                }
+
+               if(FD_ISSET(xfd, &rfd))
+                       xev = actionfps;
+
                gettimeofday(&now, NULL);
                drawtimeout.tv_sec = 0;
                drawtimeout.tv_usec = (1000/xfps) * 1000;
                gettimeofday(&now, NULL);
                drawtimeout.tv_sec = 0;
                drawtimeout.tv_usec = (1000/xfps) * 1000;