Add support for enabling/disabling utf

[st.git] / st.c

diff --git a/st.c b/st.c
index 2473af7..ebbd7ca 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))


@@ -136,6 +137,7 @@ enum term_mode {
        MODE_MOUSEMANY   = 1 << 18,
        MODE_BRCKTPASTE  = 1 << 19,
        MODE_PRINT       = 1 << 20,
        MODE_MOUSEMANY   = 1 << 18,
        MODE_BRCKTPASTE  = 1 << 19,
        MODE_PRINT       = 1 << 20,

+       MODE_UTF8        = 1 << 21,

        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };
        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };


@@ -157,6 +159,7 @@ enum escape_state {
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */

+       ESC_UTF8       = 64,

 };
 
 enum window_state {
 };
 
 enum window_state {


@@ -411,6 +414,7 @@ static void tfulldirt(void);
 static void techo(Rune);
 static void tcontrolcode(uchar );
 static void tdectest(char );
 static void techo(Rune);
 static void tcontrolcode(uchar );
 static void tdectest(char );

+static void tdefutf8(char);

 static int32_t tdefcolor(int *, int *, int);
 static void tdeftran(char);
 static inline int match(uint, uint);
 static int32_t tdefcolor(int *, int *, int);
 static void tdeftran(char);
 static inline int match(uint, uint);


@@ -1150,8 +1154,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


@@ -1403,9 +1406,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)


@@ -1478,17 +1481,29 @@ ttyread(void)
        if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
                die("Couldn't read from shell: %s\n", strerror(errno));
 
        if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
                die("Couldn't read from shell: %s\n", strerror(errno));
 

-       /* process every complete utf8 char */

        buflen += ret;
        ptr = buf;
        buflen += ret;
        ptr = buf;

-       while ((charsize = utf8decode(ptr, &unicodep, buflen))) {
-               tputc(unicodep);
-               ptr += charsize;
-               buflen -= charsize;
-       }

 
 

+       for (;;) {
+               if (IS_SET(MODE_UTF8)) {
+                       /* process a complete utf8 char */
+                       charsize = utf8decode(ptr, &unicodep, buflen);
+                       if (charsize == 0)
+                               break;
+                       tputc(unicodep);
+                       ptr += charsize;
+                       buflen -= charsize;
+
+               } else {
+                       if (buflen <= 0)
+                               break;
+                       tputc(*ptr++ & 0xFF);
+                       buflen--;
+               }
+       }

        /* keep any uncomplete utf8 char for the next call */
        /* keep any uncomplete utf8 char for the next call */

-       memmove(buf, ptr, buflen);
+       if (buflen > 0)
+               memmove(buf, ptr, buflen);

 
        return ret;
 }
 
        return ret;
 }


@@ -1554,15 +1569,26 @@ void
 ttysend(char *s, size_t n)
 {
        int len;
 ttysend(char *s, size_t n)
 {
        int len;

+       char *t, *lim;

        Rune u;
 
        ttywrite(s, n);
        Rune u;
 
        ttywrite(s, n);

-       if (IS_SET(MODE_ECHO))
-               while ((len = utf8decode(s, &u, n)) > 0) {
-                       techo(u);
-                       n -= len;
-                       s += len;
+       if (!IS_SET(MODE_ECHO))
+               return;
+
+       lim = &s[n];
+       for (t = s; t < lim; t += len) {
+               if (IS_SET(MODE_UTF8)) {
+                       len = utf8decode(t, &u, n);
+               } else {
+                       u = *t & 0xFF;
+                       len = 1;

                }
                }

+               if (len <= 0)
+                       break;
+               techo(u);
+               n -= len;
+       }

 }
 
 void
 }
 
 void


@@ -1656,7 +1682,7 @@ treset(void)
                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;
                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;

-       term.mode = MODE_WRAP;
+       term.mode = MODE_WRAP|MODE_UTF8;

        memset(term.trantbl, CS_USA, sizeof(term.trantbl));
        term.charset = 0;
 
        memset(term.trantbl, CS_USA, sizeof(term.trantbl));
        term.charset = 0;
 


@@ -2689,6 +2715,15 @@ techo(Rune u)
        tputc(u);
 }
 
        tputc(u);
 }
 

+void
+tdefutf8(char ascii)
+{
+       if (ascii == 'G')
+               term.mode |= MODE_UTF8;
+       else if (ascii == '@')
+               term.mode &= ~MODE_UTF8;
+}
+

 void
 tdeftran(char ascii)
 {
 void
 tdeftran(char ascii)
 {


@@ -2851,6 +2886,9 @@ eschandle(uchar ascii)
        case '#':
                term.esc |= ESC_TEST;
                return 0;
        case '#':
                term.esc |= ESC_TEST;
                return 0;

+       case '%':
+               term.esc |= ESC_UTF8;
+               return 0;

        case 'P': /* DCS -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
        case 'P': /* DCS -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */


@@ -2930,10 +2968,15 @@ tputc(Rune u)
        Glyph *gp;
 
        control = ISCONTROL(u);
        Glyph *gp;
 
        control = ISCONTROL(u);

-       len = utf8encode(u, c);
-       if (!control && (width = wcwidth(u)) == -1) {
-               memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
-               width = 1;
+       if (!IS_SET(MODE_UTF8)) {
+               c[0] = u;
+               width = len = 1;
+       } else {
+               len = utf8encode(u, c);
+               if (!control && (width = wcwidth(u)) == -1) {
+                       memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
+                       width = 1;
+               }

        }
 
        if (IS_SET(MODE_PRINT))
        }
 
        if (IS_SET(MODE_PRINT))


@@ -2994,6 +3037,8 @@ tputc(Rune u)
                                csihandle();
                        }
                        return;
                                csihandle();
                        }
                        return;

+               } else if (term.esc & ESC_UTF8) {
+                       tdefutf8(u);

                } else if (term.esc & ESC_ALTCHARSET) {
                        tdeftran(u);
                } else if (term.esc & ESC_TEST) {
                } else if (term.esc & ESC_ALTCHARSET) {
                        tdeftran(u);
                } else if (term.esc & ESC_TEST) {


@@ -3277,8 +3322,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;
 


@@ -3287,6 +3333,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);
 


@@ -3296,7 +3346,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;
 }


@@ -3340,9 +3390,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);
 


@@ -3665,7 +3712,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++;
        }