The xinit() call needs to be behind all the tty init, otherwise all the

[st.git] / st.c

diff --git a/st.c b/st.c
index 3c158c0..2d080e5 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_MOUSEBTN    = 32,
        MODE_MOUSEMOTION = 64,
        MODE_MOUSE       = 32|64,

-       MODE_REVERSE     = 128
+       MODE_REVERSE     = 128,
+       MODE_KBDLOCK     = 256

 };
 
 enum escape_state {
 };
 
 enum escape_state {


@@ -292,7 +293,7 @@ static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(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);
 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
 }
 
 void

-ttyresize(int x, int y) {
+ttyresize(void) {

        struct winsize w;
 
        w.ws_row = term.row;
        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;
                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;

+

        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 


@@ -1278,7 +1280,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {

-                       case 1:
+                               break;
+                       case 1: /* DECCKM -- Cursor key */

                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 5: /* DECSCNM -- Reverve video */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 5: /* DECSCNM -- Reverve video */


@@ -1287,12 +1290,14 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if(mode != term.mode)
                                        redraw();
                                break;
                                if(mode != term.mode)
                                        redraw();
                                break;

-                       case 7:
+                       case 6: /* XXX: DECOM -- Origin */
+                               break;
+                       case 7: /* DECAWM -- Auto wrap */

                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;

-                       case 20:
-                               MODBIT(term.mode, set, MODE_CRLF);
+                       case 8: /* XXX: DECARM -- Auto repeat */

                                break;
                                break;

+                       case 0:  /* Error (IGNORED) */

                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:


@@ -1320,6 +1325,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:

+                       /* case 2:  DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
+                       /* case 3:  DECCOLM -- Column  (NOT SUPPORTED) */
+                       /* case 4:  DECSCLM -- Scroll (NOT SUPPORTED) */
+                       /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
+                       /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
+                       /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */

                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);


@@ -1327,9 +1338,19 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        }
                } else {
                        switch(*args) {
                        }
                } else {
                        switch(*args) {

-                       case 4:
+                       case 0:  /* Error (IGNORED) */
+                               break;
+                       case 2:  /* KAM -- keyboard action */
+                               MODBIT(term.mode, set, MODE_KBDLOCK);
+                               break;
+                       case 4:  /* IRM -- Insertion-replacement */

                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;

+                       case 12: /* XXX: SRM -- Send/Receive */
+                               break;
+                       case 20: /* LNM -- Linefeed/new line */
+                               MODBIT(term.mode, set, MODE_CRLF);
+                               break;

                        default:
                                fprintf(stderr,
                                        "erresc: unknown set/reset mode %d\n",
                        default:
                                fprintf(stderr,
                                        "erresc: unknown set/reset mode %d\n",


@@ -1707,6 +1728,7 @@ tputc(char *c) {
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;

+                               xclear(0, 0, xw.w, xw.h);

                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */


@@ -2256,6 +2278,8 @@ kpress(XEvent *ev) {
        int shift;
        Status status;
 
        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);
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);


@@ -2326,7 +2350,7 @@ resize(XEvent *e) {
        xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);
        xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);

-       ttyresize(col, row);
+       ttyresize();

 }
 
 void
 }
 
 void