Changing the license to MIT/X.

[st.git] / st.c

diff --git a/st.c b/st.c
index 8c8efaf..f063029 100644 (file)
--- a/st.c
+++ b/st.c
@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>

+#include <pwd.h>

 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>


@@ -59,6 +60,8 @@
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 

+/* macros */
+#define CLEANMASK(mask) (mask & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))

 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))


@@ -69,8 +72,6 @@
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) (term.mode & (flag))
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) (term.mode & (flag))
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)

-#define X2COL(x) (((x) - BORDER)/xw.cw)
-#define Y2ROW(y) (((y) - BORDER)/xw.ch)

 
 #define VT102ID "\033[?6c"
 
 
 #define VT102ID "\033[?6c"
 


@@ -123,6 +124,7 @@ enum escape_state {
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */

+       ESC_TEST       = 32, /* Enter in test mode */

 };
 
 enum window_state {
 };
 
 enum window_state {


@@ -236,6 +238,24 @@ typedef struct {
        struct timeval tclick2;
 } Selection;
 
        struct timeval tclick2;
 } Selection;
 

+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       const void *v;
+} Arg;
+
+typedef struct {
+       unsigned int mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;
+
+/* function definitions used in config.h */
+static void xzoom(const Arg *);
+
+/* Config.h for applying patches and the configuration. */

 #include "config.h"
 
 /* Font structure */
 #include "config.h"
 
 /* Font structure */


@@ -289,7 +309,7 @@ static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);

-static void tsetchar(char*);
+static void tsetchar(char *, Glyph *, int, int);

 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);


@@ -319,6 +339,7 @@ static void unmap(XEvent *);
 static char *kmap(KeySym, uint);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);
 static char *kmap(KeySym, uint);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);

+static void cresize(int width, int height);

 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);


@@ -339,10 +360,10 @@ static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 

+static ssize_t xwrite(int, char *, size_t);

 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);

-static char *smstrcat(char *, ...);

 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,


@@ -378,6 +399,23 @@ static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;
 
 static char *opt_class = NULL;
 static char *opt_font = NULL;
 

+static char *usedfont = NULL;
+static int usedfontsize = 0;
+
+ssize_t
+xwrite(int fd, char *s, size_t len) {
+       size_t aux = len;
+
+       while(len > 0) {
+               ssize_t r = write(fd, s, len);
+               if(r < 0)
+                       return r;
+               len -= r;
+               s += r;
+       }
+       return aux;
+}
+

 void *
 xmalloc(size_t len) {
        void *p = malloc(len);
 void *
 xmalloc(size_t len) {
        void *p = malloc(len);


@@ -406,44 +444,6 @@ xcalloc(size_t nmemb, size_t size) {
        return p;
 }
 
        return p;
 }
 

-char *
-smstrcat(char *src, ...)
-{
-       va_list fmtargs;
-       char *ret, *p, *v;
-       int len, slen, flen;
-
-       len = slen = strlen(src);
-
-       va_start(fmtargs, src);
-       for(;;) {
-               v = va_arg(fmtargs, char *);
-               if(v == NULL)
-                       break;
-               len += strlen(v);
-       }
-       va_end(fmtargs);
-
-       p = ret = xmalloc(len+1);
-       memmove(p, src, slen);
-       p += slen;
-
-       va_start(fmtargs, src);
-       for(;;) {
-               v = va_arg(fmtargs, char *);
-               if(v == NULL)
-                       break;
-               flen = strlen(v);
-               memmove(p, v, flen);
-               p += flen;
-       }
-       va_end(fmtargs);
-
-       ret[len] = '\0';
-
-       return ret;
-}
-

 int
 utf8decode(char *s, long *u) {
        uchar c;
 int
 utf8decode(char *s, long *u) {
        uchar c;


@@ -580,6 +580,22 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 

+static int
+x2col(int x) {
+       x -= borderpx;
+       x /= xw.cw;
+
+       return LIMIT(x, 0, term.col-1);
+}
+
+static int
+y2row(int y) {
+       y -= borderpx;
+       y /= xw.ch;
+
+       return LIMIT(y, 0, term.row-1);
+}
+

 static inline bool
 selected(int x, int y) {
        int bx, ex;
 static inline bool
 selected(int x, int y) {
        int bx, ex;


@@ -601,8 +617,9 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
        if(b)
                *b = e->xbutton.button;
 
        if(b)
                *b = e->xbutton.button;
 

-       *x = X2COL(e->xbutton.x);
-       *y = Y2ROW(e->xbutton.y);
+       *x = x2col(e->xbutton.x);
+       *y = y2row(e->xbutton.y);
+

        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;


@@ -611,8 +628,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 
 void
 mousereport(XEvent *e) {
 
 void
 mousereport(XEvent *e) {

-       int x = X2COL(e->xbutton.x);
-       int y = Y2ROW(e->xbutton.y);
+       int x = x2col(e->xbutton.x);
+       int y = y2row(e->xbutton.y);

        int button = e->xbutton.button;
        int state = e->xbutton.state;
        char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
        int button = e->xbutton.button;
        int state = e->xbutton.state;
        char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };


@@ -654,8 +671,8 @@ bpress(XEvent *e) {
                        draw();
                }
                sel.mode = 1;
                        draw();
                }
                sel.mode = 1;

-               sel.ex = sel.bx = X2COL(e->xbutton.x);
-               sel.ey = sel.by = Y2ROW(e->xbutton.y);
+               sel.ex = sel.bx = x2col(e->xbutton.x);
+               sel.ey = sel.by = y2row(e->xbutton.y);

        }
 }
 
        }
 }
 


@@ -663,7 +680,7 @@ void
 selcopy(void) {
        char *str, *ptr, *p;
        int x, y, bufsize, is_selected = 0, size;
 selcopy(void) {
        char *str, *ptr, *p;
        int x, y, bufsize, is_selected = 0, size;

-       Glyph *gp;
+       Glyph *gp, *last;

 
        if(sel.bx == -1) {
                str = NULL;
 
        if(sel.bx == -1) {
                str = NULL;


@@ -673,11 +690,16 @@ selcopy(void) {
 
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
 
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {

-                       for(x = 0; x < term.col; x++) {
-                               gp = &term.line[y][x];
+                       gp = &term.line[y][0];
+                       last = gp + term.col;
+
+                       while(--last >= gp && !(last->state & GLYPH_SET))
+                               /* nothing */;

 
 

+                       for(x = 0; gp <= last; x++, ++gp) {

                                if(!(is_selected = selected(x, y)))
                                        continue;
                                if(!(is_selected = selected(x, y)))
                                        continue;

+

                                p = (gp->state & GLYPH_SET) ? gp->c : " ";
                                size = utf8size(p);
                                memcpy(ptr, p, size);
                                p = (gp->state & GLYPH_SET) ? gp->c : " ";
                                size = utf8size(p);
                                memcpy(ptr, p, size);


@@ -796,13 +818,13 @@ brelease(XEvent *e) {
                        sel.bx = -1;
                        gettimeofday(&now, NULL);
 
                        sel.bx = -1;
                        gettimeofday(&now, NULL);
 

-                       if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
+                       if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {

                                /* triple click on the line */
                                sel.b.x = sel.bx = 0;
                                sel.e.x = sel.ex = term.col;
                                sel.b.y = sel.e.y = sel.ey;
                                selcopy();
                                /* triple click on the line */
                                sel.b.x = sel.bx = 0;
                                sel.e.x = sel.ex = term.col;
                                sel.b.y = sel.e.y = sel.ey;
                                selcopy();

-                       } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
+                       } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {

                                /* double click to select word */
                                sel.bx = sel.ex;
                                while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
                                /* double click to select word */
                                sel.bx = sel.ex;
                                while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&


@@ -863,11 +885,23 @@ void
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");

+       const struct passwd *pass = getpwuid(getuid());
+       char buf[sizeof(long) * 8 + 1];

 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 
 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 

+       if(pass) {
+               setenv("LOGNAME", pass->pw_name, 1);
+               setenv("USER", pass->pw_name, 1);
+               setenv("SHELL", pass->pw_shell, 0);
+               setenv("HOME", pass->pw_dir, 0);
+       }
+
+       snprintf(buf, sizeof(buf), "%lu", xw.win);
+       setenv("WINDOWID", buf, 1);
+

        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);


@@ -875,9 +909,9 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 

-       DEFAULT(envshell, SHELL);
-       putenv("TERM="TNAME);
-       args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
+       DEFAULT(envshell, shell);
+       setenv("TERM", termname, 1);
+       args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};

        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }
        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }


@@ -925,13 +959,12 @@ ttynew(void) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {

-                       if(!strcmp(opt_io, "-")) {
-                               iofd = STDOUT_FILENO;
-                       } else {
-                               if((iofd = open(opt_io, O_WRONLY | O_CREAT, 0666)) < 0) {
-                                       fprintf(stderr, "Error opening %s:%s\n",
-                                               opt_io, strerror(errno));
-                               }
+                       iofd = (!strcmp(opt_io, "-")) ?
+                                 STDOUT_FILENO :
+                                 open(opt_io, O_WRONLY | O_CREAT, 0666);
+                       if(iofd < 0) {
+                               fprintf(stderr, "Error opening %s:%s\n",
+                                       opt_io, strerror(errno));

                        }
                }
        }
                        }
                }
        }


@@ -1027,12 +1060,12 @@ treset(void) {
 
        term.c = (TCursor){{
                .mode = ATTR_NULL,
 
        term.c = (TCursor){{
                .mode = ATTR_NULL,

-               .fg = DefaultFG,
-               .bg = DefaultBG
+               .fg = defaultfg,
+               .bg = defaultbg

        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));

-       for(i = TAB; i < term.col; i += TAB)
+       for(i = tabspaces; i < term.col; i += tabspaces)

                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;
                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;


@@ -1182,8 +1215,8 @@ tmoveto(int x, int y) {
 }
 
 void
 }
 
 void

-tsetchar(char *c) {
-       char *vt100_0[62] = { /* 0x41 - 0x7e */
+tsetchar(char *c, Glyph *attr, int x, int y) {
+       static char *vt100_0[62] = { /* 0x41 - 0x7e */

                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
                0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
                0, 0, 0, 0, 0, 0, 0, 0, /* P - W */


@@ -1197,17 +1230,17 @@ tsetchar(char *c) {
        /*
         * The table is proudly stolen from rxvt.
         */
        /*
         * The table is proudly stolen from rxvt.
         */

-       if(term.c.attr.mode & ATTR_GFX) {
+       if(attr->mode & ATTR_GFX) {

                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 
                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 

-       term.dirty[term.c.y] = 1;
-       term.line[term.c.y][term.c.x] = term.c.attr;
-       memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
-       term.line[term.c.y][term.c.x].state |= GLYPH_SET;
+       term.dirty[y] = 1;
+       term.line[y][x] = *attr;
+       memcpy(term.line[y][x].c, c, UTF_SIZ);
+       term.line[y][x].state |= GLYPH_SET;

 }
 
 void
 }
 
 void


@@ -1292,8 +1325,8 @@ tsetattr(int *attr, int l) {
                case 0:
                        term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
                                        | ATTR_ITALIC | ATTR_BLINK);
                case 0:
                        term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
                                        | ATTR_ITALIC | ATTR_BLINK);

-                       term.c.attr.fg = DefaultFG;
-                       term.c.attr.bg = DefaultBG;
+                       term.c.attr.fg = defaultfg;
+                       term.c.attr.bg = defaultbg;

                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;


@@ -1343,7 +1376,7 @@ tsetattr(int *attr, int l) {
                        }
                        break;
                case 39:
                        }
                        break;
                case 39:

-                       term.c.attr.fg = DefaultFG;
+                       term.c.attr.fg = defaultfg;

                        break;
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {
                        break;
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {


@@ -1362,7 +1395,7 @@ tsetattr(int *attr, int l) {
                        }
                        break;
                case 49:
                        }
                        break;
                case 49:

-                       term.c.attr.bg = DefaultBG;
+                       term.c.attr.bg = defaultbg;

                        break;
                default:
                        if(BETWEEN(attr[i], 30, 37)) {
                        break;
                default:
                        if(BETWEEN(attr[i], 30, 37)) {


@@ -1792,8 +1825,14 @@ tputc(char *c, int len) {
        uchar ascii = *c;
        bool control = ascii < '\x20' || ascii == 0177;
 
        uchar ascii = *c;
        bool control = ascii < '\x20' || ascii == 0177;
 

-       if(iofd != -1)
-               write(iofd, c, len);
+       if(iofd != -1) {
+               if (xwrite(iofd, c, len) < 0) {
+                       fprintf(stderr, "Error writting in %s:%s\n",
+                               opt_io, strerror(errno));
+                       close(iofd);
+                       iofd = -1;
+               }
+       }

        /*
         * STR sequences must be checked before of anything
         * because it can use some control codes as part of the sequence
        /*
         * STR sequences must be checked before of anything
         * because it can use some control codes as part of the sequence


@@ -1893,11 +1932,25 @@ tputc(char *c, int len) {
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;

+               } else if(term.esc & ESC_TEST) {
+                       if(ascii == '8') { /* DEC screen alignment test. */
+                               char E[UTF_SIZ] = "E";
+                               int x, y;
+
+                               for(x = 0; x < term.col; ++x) {
+                                       for(y = 0; y < term.row; ++y)
+                                               tsetchar(E, &term.c.attr, x, y);
+                               }
+                       }
+                       term.esc = 0;

                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;

+                       case '#':
+                               term.esc |= ESC_TEST;
+                               break;

                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */
                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */


@@ -1988,7 +2041,7 @@ tputc(char *c, int len) {
                sel.bx = -1;
        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                tnewline(1); /* always go to first col */
                sel.bx = -1;
        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                tnewline(1); /* always go to first col */

-       tsetchar(c);
+       tsetchar(c, &term.c.attr, term.c.x, term.c.y);

        if(term.c.x+1 < term.col)
                tmoveto(term.c.x+1, term.c.y);
        else
        if(term.c.x+1 < term.col)
                tmoveto(term.c.x+1, term.c.y);
        else


@@ -2053,11 +2106,12 @@ tresize(int col, int row) {
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)
                        /* nothing */ ;
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)
                        /* nothing */ ;

-               for(bp += TAB; bp < term.tabs + col; bp += TAB)
+               for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)

                        *bp = 1;
        }
        /* update terminal size */
                        *bp = 1;
        }
        /* update terminal size */

-       term.col = col, term.row = row;
+       term.col = col;
+       term.row = row;

        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */


@@ -2068,8 +2122,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
 
 void
 xresize(int col, int row) {

-       xw.tw = MAX(1, 2*BORDER + col * xw.cw);
-       xw.th = MAX(1, 2*BORDER + row * xw.ch);
+       xw.tw = MAX(1, 2*borderpx + col * xw.cw);
+       xw.th = MAX(1, 2*borderpx + row * xw.ch);

 
        XftDrawChange(xw.xft_draw, xw.buf);
 }
 
        XftDrawChange(xw.xft_draw, xw.buf);
 }


@@ -2115,9 +2169,9 @@ xloadcols(void) {
 void
 xtermclear(int col1, int row1, int col2, int row2) {
        XftDrawRect(xw.xft_draw,
 void
 xtermclear(int col1, int row1, int col2, int row2) {
        XftDrawRect(xw.xft_draw,

-                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
-                       BORDER + col1 * xw.cw,
-                       BORDER + row1 * xw.ch,
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+                       borderpx + col1 * xw.cw,
+                       borderpx + row1 * xw.ch,

                        (col2-col1+1) * xw.cw,
                        (row2-row1+1) * xw.ch);
 }
                        (col2-col1+1) * xw.cw,
                        (row2-row1+1) * xw.ch);
 }


@@ -2128,13 +2182,13 @@ xtermclear(int col1, int row1, int col2, int row2) {
 void
 xclear(int x1, int y1, int x2, int y2) {
        XftDrawRect(xw.xft_draw,
 void
 xclear(int x1, int y1, int x2, int y2) {
        XftDrawRect(xw.xft_draw,

-                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],

                        x1, y1, x2-x1, y2-y1);
 }
 
 void
 xhints(void) {
                        x1, y1, x2-x1, y2-y1);
 }
 
 void
 xhints(void) {

-       XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
+       XClassHint class = {opt_class ? opt_class : termname, termname};

        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints *sizeh = NULL;
 
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints *sizeh = NULL;
 


@@ -2145,8 +2199,8 @@ xhints(void) {
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;

-               sizeh->base_height = 2*BORDER;
-               sizeh->base_width = 2*BORDER;
+               sizeh->base_height = 2*borderpx;
+               sizeh->base_width = 2*borderpx;

        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;
        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;


@@ -2157,22 +2211,17 @@ xhints(void) {
        XFree(sizeh);
 }
 
        XFree(sizeh);
 }
 

-void
-xinitfont(Font *f, char *fontstr) {
-       FcPattern *pattern, *match;
+int
+xloadfont(Font *f, FcPattern *pattern) {
+       FcPattern *match;

        FcResult result;
 
        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);
        match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);

-       FcPatternDestroy(pattern);

        if(!match)
        if(!match)

-               die("st: can't open font %s\n", fontstr);
+               return 1;

        if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
                FcPatternDestroy(match);
        if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
                FcPatternDestroy(match);

-               die("st: can't open font %s.\n", fontstr);
+               return 1;

        }
 
        f->ascent = f->xft_set->ascent;
        }
 
        f->ascent = f->xft_set->ascent;


@@ -2182,27 +2231,73 @@ xinitfont(Font *f, char *fontstr) {
 
        f->height = f->xft_set->height;
        f->width = f->lbearing + f->rbearing;
 
        f->height = f->xft_set->height;
        f->width = f->lbearing + f->rbearing;

+
+       return 0;

 }
 
 void
 }
 
 void

-initfonts(char *fontstr) {
-       char *fstr;
+xloadfonts(char *fontstr, int fontsize) {
+       FcPattern *pattern;
+       FcResult result;
+       double fontval;
+
+       if(fontstr[0] == '-') {
+               pattern = XftXlfdParse(fontstr, False, False);
+       } else {
+               pattern = FcNameParse((FcChar8 *)fontstr);
+       }

 
 

-       xinitfont(&dc.font, fontstr);
+       if(!pattern)
+               die("st: can't open font %s\n", fontstr);
+
+       if(fontsize > 0) {
+               FcPatternDel(pattern, FC_PIXEL_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;
+               } else {
+                       /*
+                        * Default font size is 12, if none given. This is to
+                        * have a known usedfontsize value.
+                        */
+                       FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
+                       usedfontsize = 12;
+               }
+       }
+
+       if(xloadfont(&dc.font, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       /* Setting character width and height. */

        xw.cw = dc.font.width;
        xw.ch = dc.font.height;
 
        xw.cw = dc.font.width;
        xw.ch = dc.font.height;
 

-       fstr = smstrcat(fontstr, ":weight=bold", NULL);
-       xinitfont(&dc.bfont, fstr);
-       free(fstr);
+       FcPatternDel(pattern, FC_WEIGHT);
+       FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+       if(xloadfont(&dc.bfont, pattern))
+               die("st: can't open font %s\n", fontstr);

 
 

-       fstr = smstrcat(fontstr, ":slant=italic,oblique", NULL);
-       xinitfont(&dc.ifont, fstr);
-       free(fstr);
+       FcPatternDel(pattern, FC_SLANT);
+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+       if(xloadfont(&dc.ibfont, pattern))
+               die("st: can't open font %s\n", fontstr);

 
 

-       fstr = smstrcat(fontstr, ":weight=bold:slant=italic,oblique", NULL);
-       xinitfont(&dc.ibfont, fstr);
-       free(fstr);
+       FcPatternDel(pattern, FC_WEIGHT);
+       if(xloadfont(&dc.ifont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDestroy(pattern);
+}
+
+void
+xzoom(const Arg *arg)
+{
+       xloadfonts(usedfont, usedfontsize + arg->i);
+       cresize(0, 0);
+       draw();

 }
 
 void
 }
 
 void


@@ -2218,7 +2313,8 @@ xinit(void) {
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */

-       initfonts((opt_font != NULL)? opt_font : FONT);
+       usedfont = (opt_font == NULL)? font : opt_font;
+       xloadfonts(usedfont, 0);

 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);


@@ -2237,14 +2333,14 @@ xinit(void) {
                xw.w = xw.fw;
        } else {
                /* window - default size */
                xw.w = xw.fw;
        } else {
                /* window - default size */

-               xw.h = 2*BORDER + term.row * xw.ch;
-               xw.w = 2*BORDER + term.col * xw.cw;
+               xw.h = 2*borderpx + term.row * xw.ch;
+               xw.w = 2*borderpx + term.col * xw.cw;

                xw.fx = 0;
                xw.fy = 0;
        }
 
                xw.fx = 0;
                xw.fy = 0;
        }
 

-       attrs.background_pixel = dc.xft_col[DefaultBG].pixel;
-       attrs.border_pixel = dc.xft_col[DefaultBG].pixel;
+       attrs.background_pixel = dc.xft_col[defaultbg].pixel;
+       attrs.border_pixel = dc.xft_col[defaultbg].pixel;

        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask


@@ -2294,7 +2390,7 @@ 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 winx = BORDER + x * xw.cw, winy = BORDER + y * xw.ch,
+       int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,

            width = charlen * xw.cw;
        Font *font = &dc.font;
        XGlyphInfo extents;
            width = charlen * xw.cw;
        Font *font = &dc.font;
        XGlyphInfo extents;


@@ -2302,9 +2398,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                 *temp, revfg, revbg;
        XRenderColor colfg, colbg;
 
                 *temp, revfg, revbg;
        XRenderColor colfg, colbg;
 

-       if(base.mode & ATTR_REVERSE)
-               temp = fg, fg = bg, bg = temp;
-

        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */
        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */


@@ -2327,12 +2420,12 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
        if(base.mode & ATTR_ITALIC)
                font = &dc.ifont;
 
        if(base.mode & ATTR_ITALIC)
                font = &dc.ifont;

-       if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+       if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD))

                font = &dc.ibfont;
 
        if(IS_SET(MODE_REVERSE)) {
                font = &dc.ibfont;
 
        if(IS_SET(MODE_REVERSE)) {

-               if(fg == &dc.xft_col[DefaultFG]) {
-                       fg = &dc.xft_col[DefaultBG];
+               if(fg == &dc.xft_col[defaultfg]) {
+                       fg = &dc.xft_col[defaultbg];

                } else {
                        colfg.red = ~fg->color.red;
                        colfg.green = ~fg->color.green;
                } else {
                        colfg.red = ~fg->color.red;
                        colfg.green = ~fg->color.green;


@@ -2342,8 +2435,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        fg = &revfg;
                }
 
                        fg = &revfg;
                }
 

-               if(bg == &dc.xft_col[DefaultBG]) {
-                       bg = &dc.xft_col[DefaultFG];
+               if(bg == &dc.xft_col[defaultbg]) {
+                       bg = &dc.xft_col[defaultfg];

                } else {
                        colbg.red = ~bg->color.red;
                        colbg.green = ~bg->color.green;
                } else {
                        colbg.red = ~bg->color.red;
                        colbg.green = ~bg->color.green;


@@ -2354,13 +2447,16 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                }
        }
 
                }
        }
 

+       if(base.mode & ATTR_REVERSE)
+               temp = fg, fg = bg, bg = temp;
+

        XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
                        &extents);
        width = extents.xOff;
 
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
        XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
                        &extents);
        width = extents.xOff;
 
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {

-               xclear(0, (y == 0)? 0 : winy, BORDER,
+               xclear(0, (y == 0)? 0 : winy, borderpx,

                        winy + xw.ch + (y == term.row-1)? xw.h : 0);
        }
        if(x + charlen >= term.col-1) {
                        winy + xw.ch + (y == term.row-1)? xw.h : 0);
        }
        if(x + charlen >= term.col-1) {


@@ -2368,7 +2464,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        (y == term.row-1)? xw.h : (winy + xw.ch));
        }
        if(y == 0)
                        (y == term.row-1)? xw.h : (winy + xw.ch));
        }
        if(y == 0)

-               xclear(winx, 0, winx + width, BORDER);
+               xclear(winx, 0, winx + width, borderpx);

        if(y == term.row-1)
                xclear(winx, winy + xw.ch, winx + width, xw.h);
 
        if(y == term.row-1)
                xclear(winx, winy + xw.ch, winx + width, xw.h);
 


@@ -2386,7 +2482,7 @@ void
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;
        int sl;
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;
        int sl;

-       Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
+       Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs, 0};

 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);


@@ -2406,10 +2502,10 @@ xdrawcursor(void) {
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
                if(!(xw.state & WIN_FOCUSED))
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
                if(!(xw.state & WIN_FOCUSED))

-                       g.bg = DefaultUCS;
+                       g.bg = defaultucs;

 
                if(IS_SET(MODE_REVERSE))
 
                if(IS_SET(MODE_REVERSE))

-                       g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
+                       g.mode |= ATTR_REVERSE, g.fg = defaultcs, g.bg = defaultfg;

 
                sl = utf8size(g.c);
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
 
                sl = utf8size(g.c);
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);


@@ -2526,9 +2622,11 @@ xseturgency(int add) {
 void
 focus(XEvent *ev) {
        if(ev->type == FocusIn) {
 void
 focus(XEvent *ev) {
        if(ev->type == FocusIn) {

+               XSetICFocus(xw.xic);

                xw.state |= WIN_FOCUSED;
                xseturgency(0);
        } else {
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
        } else {

+               XUnsetICFocus(xw.xic);

                xw.state &= ~WIN_FOCUSED;
        }
 }
                xw.state &= ~WIN_FOCUSED;
        }
 }


@@ -2554,11 +2652,8 @@ void
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;

-       char buf[32];
-       char *customkey;
-       int len;
-       int meta;
-       int shift;
+       char buf[32], *customkey;
+       int len, meta, shift, i;

        Status status;
 
        if (IS_SET(MODE_KBDLOCK))
        Status status;
 
        if (IS_SET(MODE_KBDLOCK))


@@ -2568,7 +2663,17 @@ kpress(XEvent *ev) {
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 

-       /* 1. custom keys from config.h */
+       /* 1. shortcuts */
+       for(i = 0; i < LEN(shortcuts); i++) {
+               if((ksym == shortcuts[i].keysym)
+                               && (CLEANMASK(shortcuts[i].mod) == \
+                                       CLEANMASK(e->state))
+                               && shortcuts[i].func) {
+                       shortcuts[i].func(&(shortcuts[i].arg));
+               }
+       }
+
+       /* 2. custom keys from config.h */

        if((customkey = kmap(ksym, e->state))) {
                ttywrite(customkey, strlen(customkey));
        /* 2. hardcoded (overrides X lookup) */
        if((customkey = kmap(ksym, e->state))) {
                ttywrite(customkey, strlen(customkey));
        /* 2. hardcoded (overrides X lookup) */


@@ -2589,6 +2694,9 @@ kpress(XEvent *ev) {
                                selpaste();
                        break;
                case XK_Return:
                                selpaste();
                        break;
                case XK_Return:

+                       if(meta)
+                               ttywrite("\033", 1);
+

                        if(IS_SET(MODE_CRLF)) {
                                ttywrite("\r\n", 2);
                        } else {
                        if(IS_SET(MODE_CRLF)) {
                                ttywrite("\r\n", 2);
                        } else {


@@ -2626,24 +2734,31 @@ cmessage(XEvent *e) {
 }
 
 void
 }
 
 void

-resize(XEvent *e) {
+cresize(int width, int height)
+{

        int col, row;
 
        int col, row;
 

-       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
-               return;
+       if(width != 0)
+               xw.w = width;
+       if(height != 0)
+               xw.h = height;

 
 

-       xw.w = e->xconfigure.width;
-       xw.h = e->xconfigure.height;
-       col = (xw.w - 2*BORDER) / xw.cw;
-       row = (xw.h - 2*BORDER) / xw.ch;
-       if(col == term.col && row == term.row)
-               return;
+       col = (xw.w - 2*borderpx) / xw.cw;
+       row = (xw.h - 2*borderpx) / xw.ch;

 
        tresize(col, row);
        xresize(col, row);
        ttyresize();
 }
 
 
        tresize(col, row);
        xresize(col, row);
        ttyresize();
 }
 

+void
+resize(XEvent *e) {
+       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+               return;
+
+       cresize(e->xconfigure.width, e->xconfigure.height);
+}
+

 void
 run(void) {
        XEvent ev;
 void
 run(void) {
        XEvent ev;


@@ -2682,7 +2797,7 @@ run(void) {
 
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
 
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);

-                       if(XFilterEvent(&ev, xw.win))
+                       if(XFilterEvent(&ev, None))

                                continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
                                continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);


@@ -2757,9 +2872,10 @@ main(int argc, char *argv[]) {
 
 run:
        setlocale(LC_CTYPE, "");
 
 run:
        setlocale(LC_CTYPE, "");

+       XSetLocaleModifiers("");

        tnew(80, 24);
        tnew(80, 24);

-       ttynew();

        xinit();
        xinit();

+       ttynew();

        selinit();
        run();
        return 0;
        selinit();
        run();
        return 0;