do not truncate font size when zooming

[st.git] / st.c

diff --git a/st.c b/st.c
index 0c6b9c3..bb64c55 100644 (file)
--- a/st.c
+++ b/st.c
@@ -71,7 +71,7 @@ char *argv0;
 #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
-#define ISDELIM(u) (BETWEEN(u, 0, 127) && strchr(worddelimiters, u) != NULL)
+#define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL)
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) ((term.mode & (flag)) != 0)
@@ -191,8 +191,8 @@ typedef XftColor Color;
 typedef struct {
        Rune u;           /* character code */
        ushort mode;      /* attribute flags */
-       ushort fg;        /* foreground  */
-       ushort bg;        /* background  */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */
 } Glyph;
 
 typedef Glyph *Line;
@@ -473,6 +473,7 @@ static size_t utf8decode(char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static size_t utf8encode(Rune, char *);
 static char utf8encodebyte(Rune, size_t);
+static char *utf8strchr(char *s, Rune u);
 static size_t utf8validate(Rune *, size_t);
 
 static ssize_t xwrite(int, const char *, size_t);
@@ -640,6 +641,21 @@ utf8encodebyte(Rune u, size_t i) {
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 
+char *
+utf8strchr(char *s, Rune u) {
+       Rune r;
+       size_t i, j, len;
+
+       len = strlen(s);
+       for(i = 0, j = 0; i < len; i += j) {
+               if(!(j = utf8decode(&s[i], &r, len - i)))
+                       break;
+               if(r == u)
+                       return &(s[i]);
+       }
+       return NULL;
+}
+
 size_t
 utf8validate(Rune *u, size_t i) {
        if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
@@ -3045,7 +3061,6 @@ xloadfont(Font *f, FcPattern *pattern) {
 void
 xloadfonts(char *fontstr, double fontsize) {
        FcPattern *pattern;
-       FcResult r_sz, r_psz;
        double fontval;
        float ceilf(float);
 
@@ -3064,11 +3079,11 @@ xloadfonts(char *fontstr, double fontsize) {
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                usedfontsize = fontsize;
        } else {
-               r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
-               r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
-               if(r_psz == FcResultMatch) {
+               if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
+                               FcResultMatch) {
                        usedfontsize = fontval;
-               } else if(r_sz == FcResultMatch) {
+               } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
+                               FcResultMatch) {
                        usedfontsize = -1;
                } else {
                        /*
@@ -3141,14 +3156,14 @@ void
 xzoom(const Arg *arg) {
        Arg larg;
 
-       larg.i = usedfontsize + arg->i;
+       larg.f = usedfontsize + arg->f;
        xzoomabs(&larg);
 }
 
 void
 xzoomabs(const Arg *arg) {
        xunloadfonts();
-       xloadfonts(usedfont, arg->i);
+       xloadfonts(usedfont, arg->f);
        cresize(0, 0);
        redraw();
        xhints();
@@ -3159,7 +3174,7 @@ xzoomreset(const Arg *arg) {
        Arg larg;
 
        if(defaultfontsize > 0) {
-               larg.i = defaultfontsize;
+               larg.f = defaultfontsize;
                xzoomabs(&larg);
        }
 }