Fix LNM sequence

[st.git] / st.c

diff --git a/st.c b/st.c
index 3c158c0..d432ee7 100644 (file)
--- a/st.c
+++ b/st.c
@@ -110,7 +110,8 @@ enum term_mode {
        MODE_MOUSEBTN    = 32,
        MODE_MOUSEMOTION = 64,
        MODE_MOUSE       = 32|64,
-       MODE_REVERSE     = 128
+       MODE_REVERSE     = 128,
+       MODE_KBDLOCK     = 256
 };
 
 enum escape_state {
@@ -292,7 +293,7 @@ static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(void);
-static void ttyresize(int, int);
+static void ttyresize(void);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
@@ -899,7 +900,7 @@ ttywrite(const char *s, size_t n) {
 }
 
 void
-ttyresize(int x, int y) {
+ttyresize(void) {
        struct winsize w;
 
        w.ws_row = term.row;
@@ -952,6 +953,7 @@ treset(void) {
                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
+       xclear(0, 0, xw.w, xw.h);
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
@@ -1290,9 +1292,6 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 7:
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
-                       case 20:
-                               MODBIT(term.mode, set, MODE_CRLF);
-                               break;
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
@@ -1327,9 +1326,15 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        }
                } else {
                        switch(*args) {
+                       case 2:
+                               MODBIT(term.mode, set, MODE_KBDLOCK);
+                               break;
                        case 4:
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
+                       case 20:
+                               MODBIT(term.mode, set, MODE_CRLF);
+                               break;
                        default:
                                fprintf(stderr,
                                        "erresc: unknown set/reset mode %d\n",
@@ -2256,6 +2261,8 @@ kpress(XEvent *ev) {
        int shift;
        Status status;
 
+       if (IS_SET(MODE_KBDLOCK))
+               return;
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
@@ -2326,7 +2333,7 @@ resize(XEvent *e) {
        xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);
-       ttyresize(col, row);
+       ttyresize();
 }
 
 void
@@ -2433,9 +2440,9 @@ main(int argc, char *argv[]) {
 
  run:
        setlocale(LC_CTYPE, "");
+       xinit();
        tnew(80, 24);
        ttynew();
-       xinit();
        selinit();
        run();
        return 0;