Fix st with input method.

[st.git] / st.c

diff --git a/st.c b/st.c
index 77ae26e..546db41 100644 (file)
--- a/st.c
+++ b/st.c
@@ -89,7 +89,7 @@ char *argv0;
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {

-        ATTR_NULL      = 0,
+       ATTR_NULL      = 0,

        ATTR_BOLD      = 1,
        ATTR_FAINT     = 2,
        ATTR_ITALIC    = 4,
        ATTR_BOLD      = 1,
        ATTR_FAINT     = 2,
        ATTR_ITALIC    = 4,


@@ -405,6 +405,7 @@ static void ttyread(void);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);

+static void tstrsequence(uchar c);

 
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);


@@ -2347,6 +2348,30 @@ tdeftran(char ascii) {
        }
 }
 
        }
 }
 

+void
+tstrsequence(uchar c) {
+       if (c & 0x80) {
+               switch (c) {
+               case 0x90:   /* DCS -- Device Control String */
+                       c = 'P';
+                       break;
+               case 0x9f:   /* APC -- Application Program Command */
+                       c = '_';
+                       break;
+               case 0x9e:   /* PM -- Privacy Message */
+                       c = '^';
+                       break;
+               case 0x9d:   /* OSC -- Operating System Command */
+                       c = ']';
+                       break;
+               }
+       }
+       strreset();
+       strescseq.type = c;
+       term.esc |= ESC_STR;
+       return;
+}
+

 void
 tcontrolcode(uchar ascii) {
        static char question[UTF_SIZ] = "?";
 void
 tcontrolcode(uchar ascii) {
        static char question[UTF_SIZ] = "?";


@@ -2401,12 +2426,16 @@ tcontrolcode(uchar ascii) {
        case 0177:   /* DEL (IGNORED) */
                return;
        case 0x84:   /* TODO: IND */
        case 0177:   /* DEL (IGNORED) */
                return;
        case 0x84:   /* TODO: IND */

-       case 0x85:   /* TODO: NEL */
-       case 0x88:   /* TODO: HTS */
+               break;
+       case 0x85:   /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 0x88:   /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;

        case 0x8d:   /* TODO: RI */
        case 0x8e:   /* TODO: SS2 */
        case 0x8f:   /* TODO: SS3 */
        case 0x8d:   /* TODO: RI */
        case 0x8e:   /* TODO: SS2 */
        case 0x8f:   /* TODO: SS3 */

-       case 0x90:   /* TODO: DCS */

        case 0x98:   /* TODO: SOS */
                break;
        case 0x9a:   /* DECID -- Identify Terminal */
        case 0x98:   /* TODO: SOS */
                break;
        case 0x9a:   /* DECID -- Identify Terminal */


@@ -2414,10 +2443,13 @@ tcontrolcode(uchar ascii) {
                break;
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */
                break;
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */

-       case 0x9d:   /* TODO: OSC */
-       case 0x9e:   /* TODO: PM */
-       case 0x9f:   /* TODO: APC */

                break;
                break;

+       case 0x90:   /* DCS -- Device Control String */
+       case 0x9f:   /* APC -- Application Program Command */
+       case 0x9e:   /* PM -- Privacy Message */
+       case 0x9d:   /* OSC -- Operating System Command */
+               tstrsequence(ascii);
+               return;

        }
        /* only CAN, SUB, \a and C1 chars interrupt a sequence */
        term.esc &= ~(ESC_STR_END|ESC_STR);
        }
        /* only CAN, SUB, \a and C1 chars interrupt a sequence */
        term.esc &= ~(ESC_STR_END|ESC_STR);


@@ -2533,9 +2565,7 @@ tputc(char *c, int len) {
                        case '^': /* PM -- Privacy Message */
                        case ']': /* OSC -- Operating System Command */
                        case 'k': /* old title set compatibility */
                        case '^': /* PM -- Privacy Message */
                        case ']': /* OSC -- Operating System Command */
                        case 'k': /* old title set compatibility */

-                               strreset();
-                               strescseq.type = ascii;
-                               term.esc |= ESC_STR;
+                               tstrsequence(ascii);

                                return;
                        case '(': /* set primary charset G0 */
                        case ')': /* set secondary charset G1 */
                                return;
                        case '(': /* set primary charset G0 */
                        case ')': /* set secondary charset G1 */


@@ -3756,6 +3786,8 @@ run(void) {
        /* Waiting for window mapping */
        while(1) {
                XNextEvent(xw.dpy, &ev);
        /* Waiting for window mapping */
        while(1) {
                XNextEvent(xw.dpy, &ev);

+               if(XFilterEvent(&ev, None))
+                       continue;

                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;