Lazy fontset loading.

[st.git] / st.c

diff --git a/st.c b/st.c
index 0f47d6d..56955a3 100644 (file)
--- a/st.c
+++ b/st.c
@@ -363,6 +363,7 @@ 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 xsettitle(char *);
 static void xresettitle(void);
 static void xseturgency(int);


@@ -707,8 +708,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;
                }


@@ -2641,16 +2644,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 +2724,15 @@ 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
 xunloadfonts(void) {
        int i, ip;
 void
 xunloadfonts(void) {
        int i, ip;


@@ -2985,7 +2993,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 +3050,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


@@ -3479,25 +3490,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;