Change who's expanding tabs.

[st.git] / st.c

diff --git a/st.c b/st.c
index 0536b6f..2594c65 100644 (file)
--- a/st.c
+++ b/st.c
@@ -68,6 +68,7 @@ char *argv0;
 #define LEN(a)                 (sizeof(a) / sizeof(a)[0])
 #define DEFAULT(a, b)          (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)       ((a) <= (x) && (x) <= (b))
 #define LEN(a)                 (sizeof(a) / sizeof(a)[0])
 #define DEFAULT(a, b)          (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)       ((a) <= (x) && (x) <= (b))

+#define DIVCEIL(n, d)          (((n) + ((d) - 1)) / (d))

 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))


@@ -439,7 +440,6 @@ static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xsetsel(char *, Time);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xsetsel(char *, Time);

-static void xtermclear(int, int, int, int);

 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xresize(int, int);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xresize(int, int);


@@ -1151,8 +1151,7 @@ selnotify(XEvent *e)
         * Deleting the property again tells the selection owner to send the
         * next data chunk in the property.
         */
         * Deleting the property again tells the selection owner to send the
         * next data chunk in the property.
         */

-       if (e->type == PropertyNotify)
-               XDeleteProperty(xw.dpy, xw.win, (int)property);
+       XDeleteProperty(xw.dpy, xw.win, (int)property);

 }
 
 void
 }
 
 void


@@ -1404,9 +1403,9 @@ stty(void)
                if ((n = strlen(s)) > siz-1)
                        die("stty parameter length too long\n");
                *q++ = ' ';
                if ((n = strlen(s)) > siz-1)
                        die("stty parameter length too long\n");
                *q++ = ' ';

-               q = memcpy(q, s, n);
+               memcpy(q, s, n);

                q += n;
                q += n;

-               siz-= n + 1;
+               siz -= n + 1;

        }
        *q = '\0';
        if (system(cmd) != 0)
        }
        *q = '\0';
        if (system(cmd) != 0)


@@ -3213,17 +3212,6 @@ xsetcolorname(int x, const char *name)
        return 0;
 }
 
        return 0;
 }
 

-void
-xtermclear(int col1, int row1, int col2, int row2)
-{
-       XftDrawRect(xw.draw,
-                       &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
-                       borderpx + col1 * xw.cw,
-                       borderpx + row1 * xw.ch,
-                       (col2-col1+1) * xw.cw,
-                       (row2-row1+1) * xw.ch);
-}
-

 /*
  * Absolute coordinates.
  */
 /*
  * Absolute coordinates.
  */


@@ -3289,8 +3277,9 @@ xloadfont(Font *f, FcPattern *pattern)
 {
        FcPattern *match;
        FcResult result;
 {
        FcPattern *match;
        FcResult result;

+       XGlyphInfo extents;

 
 

-       match = FcFontMatch(NULL, pattern, &result);
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);

        if (!match)
                return 1;
 
        if (!match)
                return 1;
 


@@ -3299,6 +3288,10 @@ xloadfont(Font *f, FcPattern *pattern)
                return 1;
        }
 
                return 1;
        }
 

+       XftTextExtentsUtf8(xw.dpy, f->match,
+               (const FcChar8 *) ascii_printable,
+               strlen(ascii_printable), &extents);
+

        f->set = NULL;
        f->pattern = FcPatternDuplicate(pattern);
 
        f->set = NULL;
        f->pattern = FcPatternDuplicate(pattern);
 


@@ -3308,7 +3301,7 @@ xloadfont(Font *f, FcPattern *pattern)
        f->rbearing = f->match->max_advance_width;
 
        f->height = f->ascent + f->descent;
        f->rbearing = f->match->max_advance_width;
 
        f->height = f->ascent + f->descent;

-       f->width = f->lbearing + f->rbearing;
+       f->width = DIVCEIL(extents.xOff, strlen(ascii_printable));

 
        return 0;
 }
 
        return 0;
 }


@@ -3352,9 +3345,6 @@ xloadfonts(char *fontstr, double fontsize)
                defaultfontsize = usedfontsize;
        }
 
                defaultfontsize = usedfontsize;
        }
 

-       FcConfigSubstitute(0, pattern, FcMatchPattern);
-       FcDefaultSubstitute(pattern);
-

        if (xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
 
        if (xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
 


@@ -3677,7 +3667,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                specs[numspecs].font = frc[f].font;
                specs[numspecs].glyph = glyphidx;
                specs[numspecs].x = (short)xp;
                specs[numspecs].font = frc[f].font;
                specs[numspecs].glyph = glyphidx;
                specs[numspecs].x = (short)xp;

-               specs[numspecs].y = (short)(winy + frc[f].font->ascent);
+               specs[numspecs].y = (short)yp;

                xp += runewidth;
                numspecs++;
        }
                xp += runewidth;
                numspecs++;
        }


@@ -3983,7 +3973,6 @@ drawregion(int x1, int y1, int x2, int y2)
                if (!term.dirty[y])
                        continue;
 
                if (!term.dirty[y])
                        continue;
 

-               xtermclear(0, y, term.col, y);

                term.dirty[y] = 0;
 
                specs = term.specbuf;
                term.dirty[y] = 0;
 
                specs = term.specbuf;