fix warning

[st.git] / st.c

diff --git a/st.c b/st.c
index 9ca032f..1692f81 100644 (file)
--- a/st.c
+++ b/st.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

+#include <pty.h>

 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>


@@ -46,8 +47,8 @@
 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };

-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, 
-       CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE = 1, 
+       CURSOR_DRAW = 0, CURSOR_SAVE, CURSOR_LOAD };

 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };


@@ -67,6 +68,7 @@ typedef struct {
        Glyph attr;      /* current char attributes */
        int x;
        int y;
        Glyph attr;      /* current char attributes */
        int x;
        int y;

+       char hide;

 } TCursor;
 
 /* CSI Escape sequence structs */
 } TCursor;
 
 /* CSI Escape sequence structs */


@@ -86,7 +88,6 @@ typedef struct {
        int col;        /* nb col */
        Line* line; /* screen */
        TCursor c;      /* cursor */
        int col;        /* nb col */
        Line* line; /* screen */
        TCursor c;      /* cursor */

-       char hidec;

        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */
        int mode;       /* terminal mode flags */
        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */
        int mode;       /* terminal mode flags */


@@ -149,7 +150,6 @@ static void tputc(char);
 static void tputs(char*, int);
 static void treset(void);
 static void tresize(int, int);
 static void tputs(char*, int);
 static void treset(void);
 static void tresize(int, int);

-static void tscroll(void);

 static void tscrollup(int);
 static void tscrolldown(int);
 static void tsetattr(int*, int);
 static void tscrollup(int);
 static void tscrolldown(int);
 static void tsetattr(int*, int);


@@ -222,17 +222,17 @@ die(const char *errstr, ...) {
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};

-       DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
+       DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */

        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
 
 void
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
 
 void

-xbell(void) { /* visual bell */
-       XRectangle r = { BORDER, BORDER, xw.bufw, xw.bufh };
+xbell(void) {

        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);

-       XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
-       /* usleep(30000); */
+       XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);
+       XFlush(xw.dis);
+       usleep(BellTime);

        draw(SCREEN_REDRAW);
 }
 
        draw(SCREEN_REDRAW);
 }
 


@@ -326,11 +326,12 @@ tcursor(int mode) {
 
 void
 treset(void) {
 
 void
 treset(void) {

-       term.c.attr.mode = ATTR_NULL;
-       term.c.attr.fg = DefaultFG;
-       term.c.attr.bg = DefaultBG;
-       term.c.x = term.c.y = 0;
-       term.hidec = 0;
+       term.c = (TCursor){{
+               .mode = ATTR_NULL, 
+               .fg = DefaultFG, 
+               .bg = DefaultBG
+       }, .x = 0, .y = 0, .hide = 0};
+       

        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        tclearregion(0, 0, term.col-1, term.row-1);
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        tclearregion(0, 0, term.col-1, term.row-1);


@@ -338,33 +339,13 @@ treset(void) {
 
 void
 tnew(int col, int row) {
 
 void
 tnew(int col, int row) {

-       /* screen size */
+       /* set screen size */

        term.row = row, term.col = col;
        term.row = row, term.col = col;

-       term.top = 0, term.bot = term.row - 1;
-       /* mode */
-       term.mode = MODE_WRAP;
-       /* cursor */
-       term.c.attr.mode = ATTR_NULL;
-       term.c.attr.fg = DefaultFG;
-       term.c.attr.bg = DefaultBG;
-       term.c.x = term.c.y = 0;
-       term.hidec = 0;
-       /* allocate screen */
-       term.line = calloc(term.row, sizeof(Line));
+       term.line = malloc(term.row * sizeof(Line));

        for(row = 0 ; row < term.row; row++)
        for(row = 0 ; row < term.row; row++)

-               term.line[row] = calloc(term.col, sizeof(Glyph));
-}
-
-/* TODO: Replace with scrollup/scolldown */
-void
-tscroll(void) {
-       Line temp = term.line[term.top];
-       int i;
-
-       for(i = term.top; i < term.bot; i++)
-               term.line[i] = term.line[i+1];
-       memset(temp, 0, sizeof(Glyph) * term.col);
-       term.line[term.bot] = temp;
+               term.line[row] = malloc(term.col * sizeof(Glyph));
+       /* setup screen */
+       treset();

 }
 
 void
 }
 
 void


@@ -393,18 +374,18 @@ tscrollup (int n) {
        for(i = 0; i < n; i++)
                memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
        
        for(i = 0; i < n; i++)
                memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
        

-        for(i = term.top; i <= term.bot-n; i++) { 
+       for(i = term.top; i <= term.bot-n; i++) { 

                 temp = term.line[i];
                 term.line[i] = term.line[i+n]; 
                 term.line[i+n] = temp;
                 temp = term.line[i];
                 term.line[i] = term.line[i+n]; 
                 term.line[i+n] = temp;

-        }
+       }

 }
 
 void
 tnewline(void) {
        int y = term.c.y + 1;
        if(y > term.bot)
 }
 
 void
 tnewline(void) {
        int y = term.c.y + 1;
        if(y > term.bot)

-               tscroll(), y = term.bot;
+               tscrollup(1), y = term.bot;

        tmoveto(0, y);
 }
 
        tmoveto(0, y);
 }
 


@@ -731,7 +712,7 @@ csihandle(void) {
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:

-                               term.hidec = 1;
+                               term.c.hide = CURSOR_HIDE;

                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:
                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:


@@ -780,7 +761,7 @@ csihandle(void) {
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:

-                               term.hidec = 0;
+                               term.c.hide = CURSOR_DRAW;

                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */
                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */


@@ -1186,8 +1167,7 @@ draw(int dummy) {
                        if(term.line[y][x].state & GLYPH_SET)
                                xdrawc(x, y, term.line[y][x]);
 
                        if(term.line[y][x].state & GLYPH_SET)
                                xdrawc(x, y, term.line[y][x]);
 

-       if(!term.hidec)
-               xcursor(CURSOR_DRAW);
+       xcursor(term.c.hide);

        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }


@@ -1201,25 +1181,29 @@ draw(int redraw_all) {
        char buf[DRAW_BUF_SIZ];
        
        XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
        char buf[DRAW_BUF_SIZ];
        
        XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);

-       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);

        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];

-                       if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ)
-                               buf[i++] = new.c;
-                       else {
+                       if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+                                               i >= DRAW_BUF_SIZ)) {

                                xdraws(buf, base, ox, y, i);
                                xdraws(buf, base, ox, y, i);

-                               buf[0] = new.c;
-                               i = 1;
-                               ox = x;
-                               base = new;
+                               i = 0;
+                       }
+                       if(new.state & GLYPH_SET) {
+                               if(i == 0) {
+                                       ox = x;
+                                       base = new;
+                               }
+                               buf[i++] = new.c;

                        }
                }
                        }
                }

-               xdraws(buf, base, ox, y, i);
+               if(i > 0)
+                       xdraws(buf, base, ox, y, i);

        }
        }

-       xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
+       xcursor(term.c.hide);

        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }


@@ -1314,7 +1298,7 @@ run(void) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);

-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {

                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);