Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Adding the patch of David Dufberg Töttrup to implement WM_DELETE_WINDOW. Thank you!
[st.git] / st.c
diff --git a/st.c b/st.c
index 710cf34..1ac7fde 100644 (file)
--- a/st.c
+++ b/st.c
@@ -26,6 +26,7 @@
 #include <X11/keysym.h>
 #include <X11/extensions/Xdbe.h>
 #include <X11/Xft/Xft.h>
 #include <X11/keysym.h>
 #include <X11/extensions/Xdbe.h>
 #include <X11/Xft/Xft.h>
+#include <fontconfig/fontconfig.h>
 #define Glyph Glyph_
 #define Font Font_
 
 #define Glyph Glyph_
 #define Font Font_
 
@@ -39,8 +40,8 @@
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
-       "usage: st [-t title] [-c class] [-g geometry]" \
-       " [-w windowid] [-v] [-f file] [-e command...]\n"
+       "usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+       " [-t title] [-w windowid] [-e command ...]\n"
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
@@ -196,7 +197,7 @@ typedef struct {
        Colormap cmap;
        Window win;
        XdbeBackBuffer buf;
        Colormap cmap;
        Window win;
        XdbeBackBuffer buf;
-       Atom xembed;
+       Atom xembed, wmdeletewin;
        XIM xim;
        XIC xic;
        XftDraw *xft_draw;
        XIM xim;
        XIC xic;
        XftDraw *xft_draw;
@@ -235,6 +236,8 @@ typedef struct {
 
 /* Font structure */
 typedef struct {
 
 /* Font structure */
 typedef struct {
+       int height;
+       int width;
        int ascent;
        int descent;
        short lbearing;
        int ascent;
        int descent;
        short lbearing;
@@ -365,11 +368,12 @@ static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
-static char **opt_cmd  = NULL;
-static char *opt_io    = NULL;
+static char **opt_cmd = NULL;
+static char *opt_io = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
+static char *opt_font = NULL;
 
 void *
 xmalloc(size_t len) {
 
 void *
 xmalloc(size_t len) {
@@ -846,12 +850,15 @@ execsh(void) {
 void
 sigchld(int a) {
        int stat = 0;
 void
 sigchld(int a) {
        int stat = 0;
+
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
-       if(WIFEXITED(stat))
+
+       if(WIFEXITED(stat)) {
                exit(WEXITSTATUS(stat));
                exit(WEXITSTATUS(stat));
-       else
+       } else {
                exit(EXIT_FAILURE);
                exit(EXIT_FAILURE);
+       }
 }
 
 void
 }
 
 void
@@ -1344,7 +1351,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
-                       case 5: /* DECSCNM -- Reverve video */
+                       case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
@@ -1964,8 +1971,8 @@ xloadcols(void) {
        }
 
        /* load colors [16-255] ; same colors as xterm */
        }
 
        /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++)
-               for(g = 0; g < 6; g++)
+       for(i = 16, r = 0; r < 6; r++) {
+               for(g = 0; g < 6; g++) {
                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
@@ -1975,12 +1982,13 @@ xloadcols(void) {
                                }
                                i++;
                        }
                                }
                                i++;
                        }
+               }
+       }
 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
-                       dc.xft_col[i] = dc.xft_col[256];
-                       fprintf(stderr, "Could not allocate color %d\n", i);
+                       die("Could not allocate color %d\n", i);
                }
        }
 }
                }
        }
 }
@@ -2044,15 +2052,29 @@ xhints(void) {
 
 void
 xinitfont(Font *f, char *fontstr) {
 
 void
 xinitfont(Font *f, char *fontstr) {
-       f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr);
-
-       if(!f->xft_set)
+       FcPattern *pattern, *match;
+       FcResult result;
+
+       pattern = FcNameParse((FcChar8 *)fontstr);
+       if(!pattern)
+               die("st: can't open font %s\n", fontstr);
+
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
+       FcPatternDestroy(pattern);
+       if(!match)
+               die("st: can't open font %s\n", fontstr);
+       if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
+               FcPatternDestroy(match);
                die("st: can't open font %s.\n", fontstr);
                die("st: can't open font %s.\n", fontstr);
+       }
 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;
 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;
+
+       f->height = f->xft_set->height;
+       f->width = f->lbearing + f->rbearing;
 }
 
 void
 }
 
 void
@@ -2060,6 +2082,8 @@ initfonts(char *fontstr) {
        char *fstr;
 
        xinitfont(&dc.font, fontstr);
        char *fstr;
 
        xinitfont(&dc.font, fontstr);
+       xw.cw = dc.font.width;
+       xw.ch = dc.font.height;
 
        fstr = smstrcat(fontstr, ":weight=bold", NULL);
        xinitfont(&dc.bfont, fstr);
 
        fstr = smstrcat(fontstr, ":weight=bold", NULL);
        xinitfont(&dc.bfont, fstr);
@@ -2087,11 +2111,7 @@ xinit(void) {
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
-       initfonts(FONT);
-
-       /* XXX: Assuming same size for bold font */
-       xw.cw = dc.font.rbearing - dc.font.lbearing;
-       xw.ch = dc.font.ascent + dc.font.descent;
+       initfonts((opt_font != NULL)? opt_font : FONT);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
@@ -2156,6 +2176,8 @@ xinit(void) {
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+       xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+       XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
@@ -2165,24 +2187,34 @@ xinit(void) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
-       int fg = base.fg, bg = base.bg, temp;
-       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch,
+           width = charlen*xw.cw;
        Font *font = &dc.font;
        XGlyphInfo extents;
        Font *font = &dc.font;
        XGlyphInfo extents;
-
-       /* only switch default fg/bg if term is in RV mode */
-       if(IS_SET(MODE_REVERSE)) {
-               if(fg == DefaultFG)
-                       fg = DefaultBG;
-               if(bg == DefaultBG)
-                       bg = DefaultFG;
-       }
+       XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
+                *temp, revfg, revbg;
+       XRenderColor colfg, colbg;
 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
 
        if(base.mode & ATTR_BOLD) {
 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
 
        if(base.mode & ATTR_BOLD) {
-               fg += 8;
+               if(BETWEEN(base.fg, 0, 7)) {
+                       /* basic system colors */
+                       fg = &dc.xft_col[base.fg + 8];
+               } else if(BETWEEN(base.fg, 16, 195)) {
+                       /* 256 colors */
+                       fg = &dc.xft_col[base.fg + 36];
+               } else if(BETWEEN(base.fg, 232, 251)) {
+                       /* greyscale */
+                       fg = &dc.xft_col[base.fg + 4];
+               }
+               /*
+                * Those ranges will not be brightened:
+                *      8 - 15 – bright system colors
+                *      196 - 231 – highest 256 color cube
+                *      252 - 255 – brightest colors in grescale
+                */
                font = &dc.bfont;
        }
 
                font = &dc.bfont;
        }
 
@@ -2191,13 +2223,40 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 
-       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
+       if(IS_SET(MODE_REVERSE)) {
+               if(fg == &dc.xft_col[DefaultFG]) {
+                       fg = &dc.xft_col[DefaultBG];
+               } else {
+                       colfg.red = ~fg->color.red;
+                       colfg.green = ~fg->color.green;
+                       colfg.blue = ~fg->color.blue;
+                       colfg.alpha = fg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       fg = &revfg;
+               }
+
+               if(bg == &dc.xft_col[DefaultBG]) {
+                       bg = &dc.xft_col[DefaultFG];
+               } else {
+                       colbg.red = ~bg->color.red;
+                       colbg.green = ~bg->color.green;
+                       colbg.blue = ~bg->color.blue;
+                       colbg.alpha = bg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       bg = &revbg;
+               }
+       }
+
+       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
+                       &extents);
        width = extents.xOff;
        width = extents.xOff;
-       XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
-       XftDrawStringUtf8(xw.xft_draw, &dc.xft_col[fg], font->xft_set, winx, winy, (FcChar8 *)s, bytelen);
+
+       XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
+       XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
+                       winy + font->ascent, (FcChar8 *)s, bytelen);
 
        if(base.mode & ATTR_UNDERLINE) {
 
        if(base.mode & ATTR_UNDERLINE) {
-               XftDrawRect(xw.xft_draw, &dc.xft_col[fg], winx, winy+1,
+               XftDrawRect(xw.xft_draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }
 }
                                width, 1);
        }
 }
@@ -2421,6 +2480,10 @@ cmessage(XEvent *e) {
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
+       } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+               /* Send SIGHUP to shell */
+               kill(pid, SIGHUP);
+               exit(EXIT_SUCCESS);
        }
 }
 
        }
 }
 
@@ -2503,22 +2566,19 @@ main(int argc, char *argv[]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
-               case 't':
-                       if(++i < argc) opt_title = argv[i];
-                       break;
                case 'c':
                case 'c':
-                       if(++i < argc) opt_class = argv[i];
-                       break;
-               case 'w':
-                       if(++i < argc) opt_embed = argv[i];
-                       break;
-               case 'f':
-                       if(++i < argc) opt_io = argv[i];
+                       if(++i < argc)
+                               opt_class = argv[i];
                        break;
                case 'e':
                        /* eat every remaining arguments */
                        break;
                case 'e':
                        /* eat every remaining arguments */
-                       if(++i < argc) opt_cmd = &argv[i];
+                       if(++i < argc)
+                               opt_cmd = &argv[i];
                        goto run;
                        goto run;
+               case 'f':
+                       if(++i < argc)
+                               opt_font = argv[i];
+                       break;
                case 'g':
                        if(++i >= argc)
                                break;
                case 'g':
                        if(++i >= argc)
                                break;
@@ -2540,9 +2600,21 @@ main(int argc, char *argv[]) {
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;
+               case 'o':
+                       if(++i < argc)
+                               opt_io = argv[i];
+                       break;
+               case 't':
+                       if(++i < argc)
+                               opt_title = argv[i];
+                       break;
                case 'v':
                default:
                        die(USAGE);
                case 'v':
                default:
                        die(USAGE);
+               case 'w':
+                       if(++i < argc)
+                               opt_embed = argv[i];
+                       break;
                }
        }
 
                }
        }