JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / st.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add preliminary blink stubs. Real implementation is still missing.
[st.git] / st.c
diff --git a/st.c b/st.c
index a2564f8..5e8cf02 100644 (file)
--- a/st.c
+++ b/st.c
@@ -76,6 +76,8 @@ enum glyph_attribute {
        ATTR_UNDERLINE = 2,
        ATTR_BOLD      = 4,
        ATTR_GFX       = 8,
+       ATTR_ITALIC    = 16,
+       ATTR_BLINK     = 32,
 };
 
 enum cursor_movement {
@@ -238,7 +240,7 @@ typedef struct {
                short lbearing;
                short rbearing;
                XFontSet set;
-       } font, bfont;
+       } font, bfont, ifont;
 } DC;
 
 static void die(const char*, ...);
@@ -290,7 +292,7 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
-static void xcopy();
+static void xcopy(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
@@ -310,12 +312,13 @@ static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void selnotify(XEvent *);
+static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
 static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
@@ -335,6 +338,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
+       [SelectionClear] = selclear,
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
@@ -611,6 +615,14 @@ selpaste() {
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
 }
 
+void selclear(XEvent *e) {
+       if(sel.bx == -1)
+               return;
+       sel.bx = -1;
+       tsetdirt(sel.b.y, sel.e.y);
+       draw();
+}
+
 void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
@@ -739,6 +751,10 @@ execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
+
        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@ -785,9 +801,15 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
-               if(opt_io && !(fileio = fopen(opt_io, "w"))) {
-                       fprintf(stderr, "Error opening %s:%s\n",
-                               opt_io, strerror(errno));
+               if(opt_io) {
+                       if(!strcmp(opt_io, "-")) {
+                               fileio = stdout;
+                       } else {
+                               if(!(fileio = fopen(opt_io, "w"))) {
+                                       fprintf(stderr, "Error opening %s:%s\n",
+                                               opt_io, strerror(errno));
+                               }
+                       }
                }
        }
 }
@@ -1111,31 +1133,38 @@ tsetattr(int *attr, int l) {
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:
-                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+                                       | ATTR_ITALIC | ATTR_BLINK);
                        term.c.attr.fg = DefaultFG;
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
-               case 3: /* enter standout (highlight) mode TODO: make it italic */
-                       term.c.attr.mode |= ATTR_REVERSE;
+               case 3: /* enter standout (highlight) */
+                       term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
+               case 5:
+                       term.c.attr.mode |= ATTR_BLINK;
+                       break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
-               case 23: /* leave standout (highlight) mode TODO: make it italic */
-                       term.c.attr.mode &= ~ATTR_REVERSE;
+               case 23: /* leave standout (highlight) mode */
+                       term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
+               case 25:
+                       term.c.attr.mode &= ~ATTR_BLINK;
+                       break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
@@ -1487,6 +1516,9 @@ strhandle(void) {
                        break;
                }
                break;
+       case 'k': /* old title set compatibility */
+               XStoreName(xw.dpy, xw.win, strescseq.buf);
+               break;
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
@@ -1549,8 +1581,10 @@ void
 tputc(char *c) {
        char ascii = *c;
 
-       if(fileio)
+       if(fileio) {
                putc(ascii, fileio);
+               fflush(fileio);
+       }
 
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
@@ -1600,6 +1634,7 @@ tputc(char *c) {
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */
                        case ']': /* OSC -- Operating System Command */
+                       case 'k': /* old title set compatibility */
                                strreset();
                                strescseq.type = ascii;
                                term.esc |= ESC_STR;
@@ -1882,14 +1917,20 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
-initfonts(char *fontstr, char *bfontstr) {
-       if((dc.font.set = xinitfont(fontstr)) == NULL ||
-          (dc.bfont.set = xinitfont(bfontstr)) == NULL)
-               die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+       if((dc.font.set = xinitfont(fontstr)) == NULL)
+               die("Can't load font %s\n", fontstr);
+       if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
+               die("Can't load bfont %s\n", bfontstr);
+       if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
+               die("Can't load ifont %s\n", ifontstr);
+
        xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
            &dc.font.lbearing, &dc.font.rbearing);
        xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
            &dc.bfont.lbearing, &dc.bfont.rbearing);
+       xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
+           &dc.ifont.lbearing, &dc.ifont.rbearing);
 }
 
 void
@@ -1903,6 +1944,17 @@ xinit(void) {
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
 
+       /* font */
+       initfonts(FONT, BOLDFONT, ITALICFONT);
+
+       /* XXX: Assuming same size for bold font */
+       xw.cw = dc.font.rbearing - dc.font.lbearing;
+       xw.ch = dc.font.ascent + dc.font.descent;
+
+       /* colors */
+       xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
+       xloadcols();
+
        /* adjust fixed window geometry */
        if(xw.isfixed) {
                sw = DisplayWidth(xw.dpy, xw.scr);
@@ -1922,24 +1974,12 @@ xinit(void) {
                xw.fy = 0;
        }
 
-       /* font */
-       initfonts(FONT, BOLDFONT);
-
-       /* XXX: Assuming same size for bold font */
-       xw.cw = dc.font.rbearing - dc.font.lbearing;
-       xw.ch = dc.font.ascent + dc.font.descent;
-
-       /* colors */
-       xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-       xloadcols();
-
        attrs.background_pixel = dc.col[DefaultBG];
        attrs.border_pixel = dc.col[DefaultBG];
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
-               | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
-               | EnterWindowMask | LeaveWindowMask;
+               | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        attrs.colormap = xw.cmap;
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
@@ -1998,6 +2038,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                fontset = dc.bfont.set;
        }
 
+       if(base.mode & ATTR_ITALIC)
+               fontset = dc.ifont.set;
+
        XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
        XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
@@ -2022,7 +2065,6 @@ void
 xcopy() {
        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
        XdbeSwapBuffers(xw.dpy, swpinfo, 1);
-
 }
 
 void
@@ -2045,7 +2087,7 @@ xdrawcursor(void) {
        } else
                xclear(oldx, oldy, oldx, oldy);
 
-       xcopy(oldx, oldy, 1, 1);
+       xcopy();
 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
@@ -2060,7 +2102,7 @@ xdrawcursor(void) {
                oldx = term.c.x, oldy = term.c.y;
        }
 
-       xcopy(term.c.x, term.c.y, 1, 1);
+       xcopy();
 }
 
 void
st; my hacks to st (simple terminal) http://st.suckless.org/