Merge remote-tracking branch 'origin/master'

[st.git] / st.c

diff --git a/st.c b/st.c
index fda7044..37bec70 100644 (file)
--- a/st.c
+++ b/st.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <stdint.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
@@ -180,8 +181,8 @@ typedef unsigned short ushort;
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */
-       ulong fg;        /* foreground  */
-       ulong bg;        /* background  */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */
 } Glyph;
 
 typedef Glyph *Line;
@@ -239,7 +240,7 @@ typedef struct {
        Colourmap cmap;
        Window win;
        Drawable buf;
-       Atom xembed, wmdeletewin;
+       Atom xembed, wmdeletewin, netwmname, netwmpid;
        XIM xim;
        XIC xic;
        Draw draw;
@@ -379,7 +380,7 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
-static long tdefcolor(int *, int *, int);
+static int32_t tdefcolor(int *, int *, int);
 static void tselcs(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
@@ -397,7 +398,7 @@ static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);
 static int xloadfont(Font *, FcPattern *);
-static void xloadfonts(char *, int);
+static void xloadfonts(char *, double);
 static int xloadfontset(Font *);
 static void xsettitle(char *);
 static void xresettitle(void);
@@ -477,7 +478,7 @@ static char *opt_font = NULL;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
-static int usedfontsize = 0;
+static double usedfontsize = 0;
 
 /* Font Ring Cache */
 enum {
@@ -952,11 +953,12 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
-                       last = gp + term.col;
+                       last = &gp[term.col-1];
 
-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+                       while(last >= gp && !(selected(last - gp, y) &&
+                                             strcmp(last->c, " ") != 0)) {
+                               --last;
+                       }
 
                        for(x = 0; gp <= last; x++, ++gp) {
                                if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
@@ -1666,9 +1668,9 @@ tdeleteline(int n) {
        tscrollup(term.c.y, n);
 }
 
-long
+int32_t
 tdefcolor(int *attr, int *npar, int l) {
-       long idx = -1;
+       int32_t idx = -1;
        uint r, g, b;
 
        switch (attr[*npar + 1]) {
@@ -1717,7 +1719,7 @@ tdefcolor(int *attr, int *npar, int l) {
 void
 tsetattr(int *attr, int l) {
        int i;
-       long idx;
+       int32_t idx;
 
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
@@ -2151,20 +2153,21 @@ csireset(void) {
 void
 strhandle(void) {
        char *p = NULL;
-       int i, j, narg;
+       int j, narg, par;
 
        strparse();
        narg = strescseq.narg;
+       par = atoi(strescseq.args[0]);
 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */
-               switch(i = atoi(strescseq.args[0])) {
+               switch(par) {
                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);
-                       break;
+                       return;
                case 4: /* color set */
                        if(narg < 3)
                                break;
@@ -2181,25 +2184,20 @@ strhandle(void) {
                                 */
                                redraw(0);
                        }
-                       break;
-               default:
-                       fprintf(stderr, "erresc: unknown str ");
-                       strdump();
-                       break;
+                       return;
                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
-               break;
+               return;
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
-       default:
-               fprintf(stderr, "erresc: unknown str ");
-               strdump();
-               /* die(""); */
-               break;
+               return;
        }
+
+       fprintf(stderr, "erresc: unknown str ");
+       strdump();
 }
 
 void
@@ -2825,9 +2823,9 @@ xloadfont(Font *f, FcPattern *pattern) {
 }
 
 void
-xloadfonts(char *fontstr, int fontsize) {
+xloadfonts(char *fontstr, double fontsize) {
        FcPattern *pattern;
-       FcResult result;
+       FcResult r_sz, r_psz;
        double fontval;
 
        if(fontstr[0] == '-') {
@@ -2841,12 +2839,16 @@ xloadfonts(char *fontstr, int fontsize) {
 
        if(fontsize > 0) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);
+               FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                usedfontsize = fontsize;
        } else {
-               result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
-               if(result == FcResultMatch) {
-                       usedfontsize = (int)fontval;
+               r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
+               r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
+               if(r_psz == FcResultMatch) {
+                       usedfontsize = fontval;
+               } else if(r_sz == FcResultMatch) {
+                       usedfontsize = -1;
                } else {
                        /*
                         * Default font size is 12, if none given. This is to
@@ -2863,6 +2865,12 @@ xloadfonts(char *fontstr, int fontsize) {
        if(xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
 
+       if(usedfontsize < 0) {
+               FcPatternGetDouble(dc.font.match->pattern,
+                                  FC_PIXEL_SIZE, 0, &fontval);
+               usedfontsize = fontval;
+       }
+
        /* Setting character width and height. */
        xw.cw = CEIL(dc.font.width * cwscale);
        xw.ch = CEIL(dc.font.height * chscale);
@@ -2932,6 +2940,7 @@ xinit(void) {
        Cursor cursor;
        Window parent;
        int sw, sh;
+       pid_t thispid = getpid();
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
@@ -3023,8 +3032,13 @@ xinit(void) {
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+       xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
+       xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+       XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+                       PropModeReplace, (unsigned char *)&thispid, 1);
+
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
@@ -3066,6 +3080,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        base.fg = defaultunderline;
        }
        if(IS_TRUECOL(base.fg)) {
+               colfg.alpha = 0xffff;
                colfg.red = TRUERED(base.fg);
                colfg.green = TRUEGREEN(base.fg);
                colfg.blue = TRUEBLUE(base.fg);
@@ -3076,6 +3091,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        if(IS_TRUECOL(base.bg)) {
+               colbg.alpha = 0xffff;
                colbg.green = TRUEGREEN(base.bg);
                colbg.red = TRUERED(base.bg);
                colbg.blue = TRUEBLUE(base.bg);
@@ -3355,6 +3371,7 @@ xsettitle(char *p) {
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);
+       XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
        XFree(prop.value);
 }
 
@@ -3659,11 +3676,11 @@ run(void) {
                }
        }
 
+       ttynew();
        if(!xw.isfixed)
                cresize(w, h);
        else
                cresize(xw.fw, xw.fh);
-       ttynew();
 
        gettimeofday(&lastblink, NULL);
        gettimeofday(&last, NULL);