X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/54bc450dbf057e66bed5f10d13d90a469e5ca8ae..6734de9b6e1e74e6c713a6a3e22322e80884828d:/st.c
diff --git a/st.c b/st.c
index 4d04416..1d01925 100644
--- a/st.c
+++ b/st.c
@@ -16,10 +16,14 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+#include <sys/time.h>
+#include <time.h>
#if defined(__linux)
#include <pty.h>
@@ -30,8 +34,8 @@
#endif
#define USAGE \
- "st-" VERSION ", (c) 2010 st engineers\n" \
- "usage: st [-t title] [-c class] [-e cmd] [-v]\n"
+ "st-" VERSION ", (c) 2010-2011 st engineers\n" \
+ "usage: st [-t title] [-c class] [-v] [-e command...]\n"
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
@@ -44,11 +48,14 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) < (b) ? (b) : (a))
#define LEN(a) (sizeof(a) / sizeof(a[0]))
-#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
+#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#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)
/* 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 };
@@ -56,10 +63,9 @@ enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT,
CURSOR_SAVE, CURSOR_LOAD };
enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
-enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
- MODE_CRLF=16 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
+ MODE_CRLF=16, MODE_MOUSE=32 };
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
-enum { SCREEN_UPDATE, SCREEN_REDRAW };
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
#undef B0
@@ -86,21 +92,21 @@ typedef struct {
/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
typedef struct {
char buf[ESC_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ int len; /* raw string length */
char priv;
int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
char mode;
} CSIEscape;
/* Internal representation of the screen */
typedef struct {
- int row; /* nb row */
+ int row; /* nb row */
int col; /* nb col */
Line* line; /* screen */
Line* alt; /* alternate screen */
TCursor c; /* cursor */
- int top; /* top scroll limit */
+ int top; /* top scroll limit */
int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */
int esc; /* escape state flags */
@@ -117,17 +123,18 @@ typedef struct {
XIM xim;
XIC xic;
int scr;
- int w; /* window width */
+ int w; /* window width */
int h; /* window height */
int bufw; /* pixmap width */
int bufh; /* pixmap height */
int ch; /* char height */
int cw; /* char width */
char state; /* focus, redraw, visible */
-} XWindow;
+} XWindow;
typedef struct {
KeySym k;
+ unsigned int mask;
char s[ESC_BUF_SIZ];
} Key;
@@ -149,14 +156,18 @@ typedef struct {
int mode;
int bx, by;
int ex, ey;
- struct {int x, y;} b, e;
+ struct {int x, y;} b, e;
char *clip;
+ Atom xtarget;
+ struct timeval tclick1;
+ struct timeval tclick2;
} Selection;
#include "config.h"
-static void die(const char *errstr, ...);
-static void draw(int);
+static void die(const char*, ...);
+static void draw(void);
+static void drawregion(int, int, int, int);
static void execsh(void);
static void sigchld(int);
static void run(void);
@@ -204,7 +215,7 @@ static void xresize(int, int);
static void expose(XEvent *);
static void visibility(XEvent *);
static void unmap(XEvent *);
-static char* kmap(KeySym);
+static char* kmap(KeySym, unsigned int state);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
@@ -217,7 +228,7 @@ static void selrequest(XEvent *);
static void selinit(void);
static inline int selected(int, int);
static void selcopy(void);
-static void selpaste(void);
+static void selpaste();
static int utf8decode(char *, long *);
static int utf8encode(long *, char *);
@@ -247,7 +258,7 @@ static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
-static char *opt_cmd = NULL;
+static char **opt_cmd = NULL;
static char *opt_title = NULL;
static char *opt_class = NULL;
@@ -338,7 +349,7 @@ isfullutf8(char *s, int b) {
else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
return 0;
else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
- ((b == 1) ||
+ ((b == 1) ||
((b == 2) && (*c2&(B7|B6)) == B7)))
return 0;
else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
@@ -354,52 +365,85 @@ int
utf8size(char *s) {
unsigned char c = *s;
- if (~c&B7)
+ if(~c&B7)
return 1;
- else if ((c&(B7|B6|B5)) == (B7|B6))
+ else if((c&(B7|B6|B5)) == (B7|B6))
return 2;
- else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+ else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
return 3;
- else
+ else
return 4;
}
void
selinit(void) {
+ sel.tclick1.tv_sec = 0;
+ sel.tclick1.tv_usec = 0;
sel.mode = 0;
sel.bx = -1;
sel.clip = NULL;
+ sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
+ if(sel.xtarget == None)
+ sel.xtarget = XA_STRING;
}
-static inline int
+static inline int
selected(int x, int y) {
if(sel.ey == y && sel.by == y) {
int bx = MIN(sel.bx, sel.ex);
int ex = MAX(sel.bx, sel.ex);
return BETWEEN(x, bx, ex);
}
- return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
+ return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
|| (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
}
void
getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
- if(b)
+ if(b)
*b = e->xbutton.button;
- *x = e->xbutton.x/xw.cw;
- *y = e->xbutton.y/xw.ch;
+ *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.e.y = MAX(sel.by, sel.ey);
}
+void
+mousereport(XEvent *e) {
+ 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 };
+
+ if(!IS_SET(MODE_MOUSE))
+ return;
+
+ /* from urxvt */
+ if(e->xbutton.type == ButtonRelease || button == AnyButton)
+ button = 3;
+ else {
+ button -= Button1;
+ if(button >= 3)
+ button += 64 - 3;
+ }
+
+ buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+ + (state & Mod4Mask ? 8 : 0)
+ + (state & ControlMask ? 16 : 0);
+
+ ttywrite(buf, sizeof(buf));
+}
+
void
bpress(XEvent *e) {
+ mousereport(e);
sel.mode = 1;
- sel.ex = sel.bx = e->xbutton.x/xw.cw;
- sel.ey = sel.by = e->xbutton.y/xw.ch;
+ sel.ex = sel.bx = X2COL(e->xbutton.x);
+ sel.ey = sel.by = Y2ROW(e->xbutton.y);
}
void
@@ -419,8 +463,8 @@ selcopy(void) {
memcpy(ptr, term.line[y][x].c, sl);
ptr += sl;
}
- if(ls)
- *ptr = '\n', ptr++;
+ if(ls && y < sel.e.y)
+ *ptr++ = '\n';
}
*ptr = 0;
}
@@ -452,7 +496,7 @@ selnotify(XEvent *e) {
void
selpaste() {
- XConvertSelection(xw.dpy, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+ XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
void
@@ -473,12 +517,12 @@ selrequest(XEvent *e) {
xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
if(xsre->target == xa_targets) {
/* respond with the supported type */
- Atom string = XA_STRING;
+ Atom string = sel.xtarget;
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
XA_ATOM, 32, PropModeReplace,
(unsigned char *) &string, 1);
xev.property = xsre->property;
- } else if(xsre->target == XA_STRING) {
+ } else if(xsre->target == sel.xtarget) {
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
xsre->target, 8, PropModeReplace,
(unsigned char *) sel.clip, strlen(sel.clip));
@@ -506,30 +550,59 @@ xsetsel(char *str) {
XFlush(xw.dpy);
}
-/* TODO: doubleclick to select word */
void
brelease(XEvent *e) {
int b;
+
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
- if(sel.bx==sel.ex && sel.by==sel.ey) {
+ mousereport(e);
+ if(sel.bx == sel.ex && sel.by == sel.ey) {
sel.bx = -1;
- if(b==2)
+ if(b == 2)
selpaste();
- } else {
- if(b==1)
- selcopy();
- }
- draw(1);
+ else if(b == 1) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+
+ if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
+ /* 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) {
+ /* double click to select word */
+ sel.bx = sel.ex;
+ while(term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
+ term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--;
+ sel.b.x = sel.bx;
+ while(term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
+ term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++;
+ sel.e.x = sel.ex;
+ sel.b.y = sel.e.y = sel.ey;
+ selcopy();
+ }
+ }
+ } else if(b == 1)
+ selcopy();
+ memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
+ gettimeofday(&sel.tclick1, NULL);
+ draw();
}
void
bmotion(XEvent *e) {
- if (sel.mode) {
+ if(sel.mode) {
+ int oldey = sel.ey,
+ oldex = sel.ex;
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
- /* XXX: draw() can't keep up, disabled for now.
- selection is visible on button release.
- draw(1); */
+
+ if(oldey != sel.ey || oldex != sel.ex) {
+ int starty = MIN(oldey, sel.ey);
+ int endy = MAX(oldey, sel.ey);
+ drawregion(0, (starty > 0 ? starty : 0), term.col, (sel.ey < term.row ? endy+1 : term.row));
+ }
}
}
@@ -545,16 +618,17 @@ die(const char *errstr, ...) {
void
execsh(void) {
- char *args[] = {getenv("SHELL"), "-i", NULL};
- if(opt_cmd)
- args[0] = opt_cmd, args[1] = NULL;
- else
- DEFAULT(args[0], SHELL);
+ char **args;
+ char *envshell = getenv("SHELL");
+
+ DEFAULT(envshell, "sh");
putenv("TERM="TNAME);
+ args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
execvp(args[0], args);
+ exit(EXIT_FAILURE);
}
-void
+void
sigchld(int a) {
int stat = 0;
if(waitpid(pid, &stat, 0) < 0)
@@ -607,7 +681,7 @@ dump(char c) {
void
ttyread(void) {
static char buf[BUFSIZ];
- static int buflen = 0;
+ static int buflen = 0;
char *ptr;
char s[UTF_SIZ];
int charsize; /* size of utf8 char in bytes */
@@ -663,8 +737,8 @@ tcursor(int mode) {
void
treset(void) {
term.c = (TCursor){{
- .mode = ATTR_NULL,
- .fg = DefaultFG,
+ .mode = ATTR_NULL,
+ .fg = DefaultFG,
.bg = DefaultBG
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
@@ -719,9 +793,9 @@ tscrollup(int orig, int n) {
tclearregion(0, orig, term.col-1, orig+n-1);
- for(i = orig; i <= term.bot-n; i++) {
+ for(i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
- term.line[i] = term.line[i+n];
+ term.line[i] = term.line[i+n];
term.line[i+n] = temp;
}
}
@@ -851,47 +925,47 @@ tsetattr(int *attr, int l) {
term.c.attr.bg = DefaultBG;
break;
case 1:
- term.c.attr.mode |= ATTR_BOLD;
+ term.c.attr.mode |= ATTR_BOLD;
break;
- case 4:
+ case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
- case 7:
- term.c.attr.mode |= ATTR_REVERSE;
+ case 7:
+ term.c.attr.mode |= ATTR_REVERSE;
break;
- case 22:
- term.c.attr.mode &= ~ATTR_BOLD;
+ case 22:
+ term.c.attr.mode &= ~ATTR_BOLD;
break;
- case 24:
+ case 24:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
- case 27:
- term.c.attr.mode &= ~ATTR_REVERSE;
+ case 27:
+ term.c.attr.mode &= ~ATTR_REVERSE;
break;
case 38:
- if (i + 2 < l && attr[i + 1] == 5) {
+ if(i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if (BETWEEN(attr[i], 0, 255))
+ if(BETWEEN(attr[i], 0, 255))
term.c.attr.fg = attr[i];
else
fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
}
else
- fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
break;
case 39:
term.c.attr.fg = DefaultFG;
break;
case 48:
- if (i + 2 < l && attr[i + 1] == 5) {
+ if(i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if (BETWEEN(attr[i], 0, 255))
+ if(BETWEEN(attr[i], 0, 255))
term.c.attr.bg = attr[i];
else
fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
}
else
- fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
break;
case 49:
term.c.attr.bg = DefaultBG;
@@ -905,7 +979,7 @@ tsetattr(int *attr, int l) {
term.c.attr.fg = attr[i] - 90 + 8;
else if(BETWEEN(attr[i], 100, 107))
term.c.attr.fg = attr[i] - 100 + 8;
- else
+ else
fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
break;
@@ -925,7 +999,7 @@ tsetscroll(int t, int b) {
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
}
void
@@ -933,7 +1007,7 @@ csihandle(void) {
switch(escseq.mode) {
default:
unknown:
- printf("erresc: unknown csi ");
+ fprintf(stderr, "erresc: unknown csi ");
csidump();
/* die(""); */
break;
@@ -1042,6 +1116,9 @@ csihandle(void) {
case 25:
term.c.state |= CURSOR_HIDE;
break;
+ case 1000: /* disable X11 xterm mouse reporting */
+ term.mode &= ~MODE_MOUSE;
+ break;
case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN)) {
@@ -1105,6 +1182,9 @@ csihandle(void) {
case 25:
term.c.state &= ~CURSOR_HIDE;
break;
+ case 1000: /* enable X11 xterm mouse reporting */
+ term.mode |= MODE_MOUSE;
+ break;
case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN))
@@ -1150,7 +1230,7 @@ csihandle(void) {
}
void
-csidump(void) {
+csidump(void) {
int i;
printf("ESC [ %s", escseq.priv ? "? " : "");
if(escseq.narg)
@@ -1183,7 +1263,7 @@ tputc(char *c) {
csiparse(), csihandle();
}
/* TODO: handle other OSC */
- } else if(term.esc & ESC_OSC) {
+ } else if(term.esc & ESC_OSC) {
if(ascii == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
@@ -1205,7 +1285,7 @@ tputc(char *c) {
term.c.attr.mode &= ~ATTR_GFX;
break;
default:
- printf("esc unhandled charset: ESC ( %c\n", ascii);
+ fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
} else {
@@ -1296,7 +1376,6 @@ tputc(char *c) {
tmoveto(term.c.x+1, term.c.y);
else
term.c.state |= CURSOR_WRAPNEXT;
- break;
}
}
}
@@ -1395,7 +1474,7 @@ xloadcols(void) {
unsigned long white = WhitePixel(xw.dpy, xw.scr);
for(i = 0; i < 16; i++) {
- if (!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
+ if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
} else
@@ -1409,7 +1488,7 @@ xloadcols(void) {
color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
- if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
+ if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
@@ -1436,8 +1515,7 @@ xclear(int x1, int y1, int x2, int y2) {
}
void
-xhints(void)
-{
+xhints(void) {
XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints size = {
@@ -1453,8 +1531,7 @@ xhints(void)
}
XFontSet
-xinitfont(char *fontstr)
-{
+xinitfont(char *fontstr) {
XFontSet set;
char *def, **missing;
int n;
@@ -1470,8 +1547,7 @@ xinitfont(char *fontstr)
}
void
-xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing)
-{
+xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {
XFontStruct **xfonts;
char **font_names;
int i, n;
@@ -1488,8 +1564,7 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
}
void
-initfonts(char *fontstr, char *bfontstr)
-{
+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);
@@ -1502,6 +1577,7 @@ initfonts(char *fontstr, char *bfontstr)
void
xinit(void) {
XSetWindowAttributes attrs;
+ Cursor cursor;
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
@@ -1511,7 +1587,7 @@ xinit(void) {
initfonts(FONT, BOLDFONT);
/* XXX: Assuming same size for bold font */
- xw.cw = dc.font.rbearing - dc.font.lbearing;
+ xw.cw = dc.font.rbearing - dc.font.lbearing;
xw.ch = dc.font.ascent + dc.font.descent;
/* colors */
@@ -1543,15 +1619,22 @@ xinit(void) {
/* input methods */
xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
- xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
+ xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+ | XIMStatusNothing, XNClientWindow, xw.win,
XNFocusWindow, xw.win, NULL);
/* gc */
dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
+ /* white cursor, black outline */
+ cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+ XDefineCursor(xw.dpy, xw.win, cursor);
+ XRecolorCursor(xw.dpy, cursor,
+ &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
+ &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+
+ XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
XMapWindow(xw.dpy, xw.win);
xhints();
- XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
XSync(xw.dpy, 0);
}
@@ -1580,7 +1663,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
- dc.gc, winx, winy, s, bytelen);
+ dc.gc, winx, winy, s, bytelen);
if(base.mode & ATTR_UNDERLINE)
XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
@@ -1614,37 +1697,13 @@ xdrawcursor(void) {
}
}
-#ifdef DEBUG
-/* basic drawing routines */
-void
-xdrawc(int x, int y, Glyph g) {
- int sl = utf8size(g.c);
- XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
- XSetBackground(xw.dpy, dc.gc, dc.col[g.bg]);
- XSetForeground(xw.dpy, dc.gc, dc.col[g.fg]);
- XmbDrawImageString(xw.dpy, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
- dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
-}
-
void
-draw(int dummy) {
- int x, y;
-
- xclear(0, 0, term.col-1, term.row-1);
- for(y = 0; y < term.row; y++)
- for(x = 0; x < term.col; x++)
- if(term.line[y][x].state & GLYPH_SET)
- xdrawc(x, y, term.line[y][x]);
-
- xdrawcursor();
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
- XFlush(xw.dpy);
+draw() {
+ drawregion(0, 0, term.col, term.row);
}
-#else
-/* optimized drawing routine */
void
-draw(int redraw_all) {
+drawregion(int x1, int y1, int x2, int y2) {
int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
@@ -1652,13 +1711,13 @@ draw(int redraw_all) {
if(!(xw.state & WIN_VISIBLE))
return;
- xclear(0, 0, term.col-1, term.row-1);
- for(y = 0; y < term.row; y++) {
+ xclear(x1, y1, x2-1, y2-1);
+ for(y = y1; y < y2; y++) {
base = term.line[y][0];
ic = ib = ox = 0;
- for(x = 0; x < term.col; x++) {
+ for(x = x1; x < x2; x++) {
new = term.line[y][x];
- if(sel.bx!=-1 && *(new.c) && selected(x, y))
+ if(sel.bx != -1 && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE;
if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
@@ -1683,15 +1742,13 @@ draw(int redraw_all) {
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
}
-#endif
-
void
expose(XEvent *ev) {
XExposeEvent *e = &ev->xexpose;
if(xw.state & WIN_REDRAW) {
if(!e->count) {
xw.state &= ~WIN_REDRAW;
- draw(SCREEN_REDRAW);
+ draw();
}
} else
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
@@ -1728,14 +1785,14 @@ focus(XEvent *ev) {
xseturgency(0);
} else
xw.state &= ~WIN_FOCUSED;
- draw(SCREEN_UPDATE);
+ draw();
}
char*
-kmap(KeySym k) {
+kmap(KeySym k, unsigned int state) {
int i;
for(i = 0; i < LEN(key); i++)
- if(key[i].k == k)
+ if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
return (char*)key[i].s;
return NULL;
}
@@ -1756,7 +1813,7 @@ kpress(XEvent *ev) {
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
/* 1. custom keys from config.h */
- if((customkey = kmap(ksym)))
+ if((customkey = kmap(ksym, e->state)))
ttywrite(customkey, strlen(customkey));
/* 2. hardcoded (overrides X lookup) */
else
@@ -1765,7 +1822,8 @@ kpress(XEvent *ev) {
case XK_Down:
case XK_Left:
case XK_Right:
- sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
+ /* XXX: shift up/down doesn't work */
+ sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
ttywrite(buf, 3);
break;
case XK_Insert:
@@ -1784,8 +1842,7 @@ kpress(XEvent *ev) {
if(meta && len == 1)
ttywrite("\033", 1);
ttywrite(buf, len);
- } else /* 4. nothing to send */
- fprintf(stderr, "errkey: %d\n", (int)ksym);
+ }
break;
}
}
@@ -1804,7 +1861,7 @@ resize(XEvent *e) {
if(col == term.col && row == term.row)
return;
if(tresize(col, row))
- draw(SCREEN_REDRAW);
+ draw();
ttyresize(col, row);
xresize(col, row);
}
@@ -1826,11 +1883,11 @@ run(void) {
}
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
- draw(SCREEN_UPDATE);
+ draw();
}
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
- if (XFilterEvent(&ev, xw.win))
+ if(XFilterEvent(&ev, xw.win))
continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
@@ -1850,14 +1907,17 @@ main(int argc, char *argv[]) {
case 'c':
if(++i < argc) opt_class = argv[i];
break;
- case 'e':
- if(++i < argc) opt_cmd = argv[i];
- break;
+ case 'e':
+ /* eat every remaining arguments */
+ if(++i < argc) opt_cmd = &argv[i];
+ goto run;
case 'v':
default:
die(USAGE);
}
}
+
+ run:
setlocale(LC_CTYPE, "");
tnew(80, 24);
ttynew();