X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/ccafacb3ff22c85516ff46a88275097936dfe442..4e6915a16b75c1e79142e15a9b23e761140d4e9b:/st.c?ds=sidebyside
diff --git a/st.c b/st.c
index 1f58569..62b877f 100644
--- a/st.c
+++ b/st.c
@@ -1,13 +1,194 @@
-/* See LICENSE for licence details. */
-#include "st.h"
+/* See LICENSE for licence details. */
+#define _XOPEN_SOURCE 600
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <X11/Xutil.h>
+
+#define TNAME "st"
+
+/* Arbitrary sizes */
+#define ESCSIZ 256
+#define ESCARG 16
+
+#define SERRNO strerror(errno)
+#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 BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
+#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
+
+/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
+enum { ATnone=0 , ATreverse=1 , ATunderline=2, ATbold=4 };
+enum { CSup, CSdown, CSright, CSleft, CShide, CSdraw, CSwrap, CSsave, CSload };
+enum { CRset=1, CRupdate=2 };
+enum { TMwrap=1, TMinsert=2 };
+enum { SCupdate, SCredraw };
+
+typedef int Color;
+
+typedef struct {
+ char c; /* character code */
+ char mode; /* attribute flags */
+ Color fg; /* foreground */
+ Color bg; /* background */
+ char state; /* state flag */
+} Glyph;
+
+typedef Glyph* Line;
+
+typedef struct {
+ Glyph attr; /* current char attributes */
+ char hidden;
+ int x;
+ int y;
+} TCursor;
+
+/* Escape sequence structs */
+/* ESC <pre> [[ [<priv>] <arg> [;]] <mode>] */
+typedef struct {
+ char buf[ESCSIZ+1]; /* raw string */
+ int len; /* raw string length */
+ char pre;
+ char priv;
+ int arg[ESCARG+1];
+ int narg; /* nb of args */
+ char mode;
+} Escseq;
+
+/* Internal representation of the screen */
+typedef struct {
+ int row; /* nb row */
+ int col; /* nb col */
+ Line* line; /* screen */
+ TCursor c; /* cursor */
+ int top; /* top scroll limit */
+ int bot; /* bottom scroll limit */
+ int mode; /* terminal mode */
+} Term;
+
+/* Purely graphic info */
+typedef struct {
+ Display* dis;
+ Window win;
+ int scr;
+ int w; /* window width */
+ int h; /* window height */
+ int ch; /* char height */
+ int cw; /* char width */
+} XWindow;
+
+typedef struct {
+ KeySym k;
+ char s[ESCSIZ];
+} Key;
+
+#include "config.h"
+
+/* Drawing Context */
+typedef struct {
+ unsigned long col[LEN(colorname)];
+ XFontStruct* font;
+ GC gc;
+} DC;
+
+static void die(const char *errstr, ...);
+static void draw(int);
+static void execsh(void);
+static void sigchld(int);
+static void run(void);
+
+static int escaddc(char);
+static int escfinal(char);
+static void escdump(void);
+static void eschandle(void);
+static void escparse(void);
+static void escreset(void);
+
+static void tclearregion(int, int, int, int);
+static void tcpos(int);
+static void tcursor(int);
+static void tdeletechar(int);
+static void tdeleteline(int);
+static void tinsertblank(int);
+static void tinsertblankline(int);
+static void tmoveto(int, int);
+static void tnew(int, int);
+static void tnewline(void);
+static void tputc(char);
+static void tputs(char*, int);
+static void tresize(int, int);
+static void tscroll(void);
+static void tsetattr(int*, int);
+static void tsetchar(char);
+static void tsetscroll(int, int);
+
+static void ttynew(void);
+static void ttyread(void);
+static void ttyresize(int, int);
+static void ttywrite(const char *, size_t);
+
+static unsigned long xgetcol(const char *);
+static void xclear(int, int, int, int);
+static void xcursor(int);
+static void xdrawc(int, int, Glyph);
+static void xinit(void);
+static void xscroll(void);
+
+static void expose(XEvent *);
+static char * kmap(KeySym);
+static void kpress(XEvent *);
+static void resize(XEvent *);
+
+static void (*handler[LASTEvent])(XEvent *) = {
+ [KeyPress] = kpress,
+ [Expose] = expose,
+ [ConfigureNotify] = resize
+};
/* Globals */
-DC dc;
-XWindow xw;
-Term term;
-Escseq escseq;
-int cmdfd;
-int running;
+static DC dc;
+static XWindow xw;
+static Term term;
+static Escseq escseq;
+static int cmdfd;
+static pid_t pid;
+static int running;
+
+#ifdef DEBUG
+void
+tdump(void) {
+ int row, col;
+ Glyph c;
+
+ for(row = 0; row < term.row; row++) {
+ for(col = 0; col < term.col; col++) {
+ if(col == term.c.x && row == term.c.y)
+ putchar('#');
+ else {
+ c = term.line[row][col];
+ putchar(c.state & CRset ? c.c : '.');
+ }
+ }
+ putchar('\n');
+ }
+}
+#endif
void
die(const char *errstr, ...) {
@@ -27,35 +208,44 @@ execsh(void) {
}
void
-xbell(void) { /* visual bell */
+xbell(void) { /* visual bell */
XRectangle r = { 0, 0, xw.w, xw.h };
XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
- XFlush(xw.dis);
- usleep(30000);
+ /* usleep(30000); */
draw(SCredraw);
}
+void
+sigchld(int a) {
+ int stat = 0;
+ if(waitpid(pid, &stat, 0) < 0)
+ die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+ if(WIFEXITED(stat))
+ exit(WEXITSTATUS(stat));
+ else
+ exit(EXIT_FAILURE);
+}
+
void
ttynew(void) {
int m, s;
- pid_t pid;
char *pts;
if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
- die("openpt");
- if(grantpt(m) == -1)
- die("grandpt");
- if(unlockpt(m) == -1)
- die("unlockpt");
- if((pts = ptsname(m)) == NULL)
- die("ptsname");
+ die("openpt failed: %s\n", SERRNO);
+ if(grantpt(m) < 0)
+ die("grandpt failed: %s\n", SERRNO);
+ if(unlockpt(m) < 0)
+ die("unlockpt failed: %s\n", SERRNO);
+ if(!(pts = ptsname(m)))
+ die("ptsname failed: %s\n", SERRNO);
if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
- die("slave open");
+ die("Couldn't open slave: %s\n", SERRNO);
fcntl(s, F_SETFL, O_NDELAY);
switch(pid = fork()) {
case -1:
- die("fork");
+ die("fork failed\n");
break;
case 0:
setsid(); /* create a new process group */
@@ -63,12 +253,13 @@ ttynew(void) {
dup2(s, STDOUT_FILENO);
dup2(s, STDERR_FILENO);
if(ioctl(s, TIOCSCTTY, NULL) < 0)
- die("slave TTIOCSTTY");
+ die("ioctl TTIOCSTTY failed: %s\n", SERRNO);
execsh();
break;
default:
close(s);
cmdfd = m;
+ signal(SIGCHLD, sigchld);
}
}
@@ -86,9 +277,8 @@ ttyread(void) {
int ret;
switch(ret = read(cmdfd, buf, BUFSIZ)) {
- case -1: /* error or exit */
- /* XXX: be more precise */
- running = 0;
+ case -1:
+ die("Couldn't read from shell: %s\n", SERRNO);
break;
default:
tputs(buf, ret);
@@ -96,9 +286,9 @@ ttyread(void) {
}
void
-ttywrite(char *s, size_t n) {
+ttywrite(const char *s, size_t n) {
if(write(cmdfd, s, n) == -1)
- die("write error on tty.");
+ die("write error on tty: %s\n", SERRNO);
}
void
@@ -109,7 +299,7 @@ ttyresize(int x, int y) {
w.ws_col = term.col;
w.ws_xpixel = w.ws_ypixel = 0;
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
- fprintf(stderr, "Couldn't set window size: %m\n");
+ fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
int
@@ -127,7 +317,7 @@ escfinal(char c) {
}
else if(BETWEEN(c, 0x40, 0x7E))
return 1;
- return 0;
+ return 0;
}
void
@@ -163,21 +353,19 @@ void
tscroll(void) {
Line temp = term.line[term.top];
int i;
-
+ /* X stuff _before_ the line swapping (results in wrong line index) */
+ xscroll();
for(i = term.top; i < term.bot; i++)
term.line[i] = term.line[i+1];
memset(temp, 0, sizeof(Glyph) * term.col);
term.line[term.bot] = temp;
- xscroll();
}
void
tnewline(void) {
int y = term.c.y + 1;
-
- if(y > term.bot) {
+ if(y > term.bot)
tscroll(), y = term.bot;
- }
tmoveto(0, y);
}
@@ -311,6 +499,13 @@ tinsertblank(int n) {
tclearregion(src, term.c.y, dst, term.c.y);
}
+void
+tsetlinestate(int n, int state) {
+ int i;
+ for(i = 0; i < term.col; i++)
+ term.line[n][i].state |= state;
+}
+
void
tinsertblankline (int n) {
int i;
@@ -332,10 +527,11 @@ tinsertblankline (int n) {
term.line[i-n] = blank;
/* blank it */
memset(blank, 0, term.col * sizeof(Glyph));
+ tsetlinestate(i, CRupdate);
+ tsetlinestate(i-n, CRupdate);
}
}
-
void
tdeleteline(int n) {
int i;
@@ -357,6 +553,8 @@ tdeleteline(int n) {
term.line[i+n] = blank;
/* blank it */
memset(blank, 0, term.col * sizeof(Glyph));
+ tsetlinestate(i, CRupdate);
+ tsetlinestate(i-n, CRupdate);
}
}
@@ -364,63 +562,48 @@ void
tsetattr(int *attr, int l) {
int i;
-#ifdef TRUECOLOR /* ESC [ ? <fg/bg> ; <r> ; <g> ; <b> m */
- Color col;
- if(escseq.priv && escseq.len == 4) { /* True color extension :) */
- col = (escseq.arg[1]<<16) + (escseq.arg[2]<<8) + escseq.arg[3];
- switch(escseq.arg[0]) {
- case 3: /* foreground */
- term.c.attr.fg = col;
+ for(i = 0; i < l; i++) {
+ switch(attr[i]) {
+ case 0:
+ memset(&term.c.attr, 0, sizeof(term.c.attr));
+ term.c.attr.fg = DefaultFG;
+ term.c.attr.bg = DefaultBG;
+ break;
+ case 1:
+ term.c.attr.mode |= ATbold;
+ break;
+ case 4:
+ term.c.attr.mode |= ATunderline;
+ break;
+ case 7:
+ term.c.attr.mode |= ATreverse;
break;
- case 4: /* background */
- term.c.attr.bg = col;
+ case 8:
+ term.c.hidden = CShide;
+ break;
+ case 22:
+ term.c.attr.mode &= ~ATbold;
+ break;
+ case 24:
+ term.c.attr.mode &= ~ATunderline;
+ break;
+ case 27:
+ term.c.attr.mode &= ~ATreverse;
+ break;
+ case 39:
+ term.c.attr.fg = DefaultFG;
+ break;
+ case 49:
+ term.c.attr.fg = DefaultBG;
+ break;
+ default:
+ if(BETWEEN(attr[i], 30, 37))
+ term.c.attr.fg = attr[i] - 30;
+ else if(BETWEEN(attr[i], 40, 47))
+ term.c.attr.bg = attr[i] - 40;
break;
}
}
- else
-#endif
- for(i = 0; i < l; i++) {
- switch(attr[i]) {
- case 0:
- memset(&term.c.attr, 0, sizeof(term.c.attr));
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- break;
- case 1:
- term.c.attr.mode |= ATbold;
- break;
- case 4:
- term.c.attr.mode |= ATunderline;
- break;
- case 7:
- term.c.attr.mode |= ATreverse;
- break;
- case 8:
- term.c.hidden = CShide;
- break;
- case 22:
- term.c.attr.mode &= ~ATbold;
- break;
- case 24:
- term.c.attr.mode &= ~ATunderline;
- break;
- case 27:
- term.c.attr.mode &= ~ATreverse;
- break;
- case 39:
- term.c.attr.fg = DefaultFG;
- break;
- case 49:
- term.c.attr.fg = DefaultBG;
- break;
- default:
- if(BETWEEN(attr[i], 30, 37))
- term.c.attr.fg = attr[i] - 30;
- else if(BETWEEN(attr[i], 40, 47))
- term.c.attr.bg = attr[i] - 40;
- break;
- }
- }
}
void
@@ -435,16 +618,21 @@ tsetscroll(int t, int b) {
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
}
-
void
-eschandle(void) {
- /* escdump(); */
+eschandle(void) {
switch(escseq.pre) {
+ default:
+ goto unknown_seq;
case '[':
switch(escseq.mode) {
+ default:
+ unknown_seq:
+ fprintf(stderr, "erresc: unknown sequence\n");
+ escdump();
+ break;
case '@': /* Insert <n> blank char */
DEFAULT(escseq.arg[0], 1);
tinsertblank(escseq.arg[0]);
@@ -496,7 +684,7 @@ eschandle(void) {
break;
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
- break;
+ break;
}
break;
case 'K': /* Clear line */
@@ -516,6 +704,10 @@ eschandle(void) {
DEFAULT(escseq.arg[0], 1);
tinsertblankline(escseq.arg[0]);
break;
+ case 'l':
+ if(escseq.priv && escseq.arg[0] == 25)
+ term.c.hidden = 1;
+ break;
case 'M': /* Delete <n> lines */
DEFAULT(escseq.arg[0], 1);
tdeleteline(escseq.arg[0]);
@@ -529,6 +721,8 @@ eschandle(void) {
tmoveto(term.c.x, escseq.arg[0]-1);
break;
case 'h': /* Set terminal mode */
+ if(escseq.priv && escseq.arg[0] == 25)
+ term.c.hidden = 0;
break;
case 'm': /* Terminal attribute (color) */
tsetattr(escseq.arg, escseq.narg);
@@ -556,16 +750,14 @@ eschandle(void) {
void
escdump(void) {
int i;
- puts("------");
- printf("rawbuf : %s\n", escseq.buf);
+ printf("rawbuf : %s\n", escseq.buf);
printf("prechar : %c\n", escseq.pre);
printf("private : %c\n", escseq.priv ? '?' : ' ');
- printf("narg : %d\n", escseq.narg);
- if(escseq.narg) {
+ printf("narg : %d\n", escseq.narg);
+ if(escseq.narg)
for(i = 0; i < escseq.narg; i++)
printf("\targ %d = %d\n", i, escseq.arg[i]);
- }
- printf("mode : %c\n", escseq.mode);
+ printf("mode : %c\n", escseq.mode);
}
void
@@ -573,11 +765,23 @@ escreset(void) {
memset(&escseq, 0, sizeof(escseq));
}
+void
+tputtab(void) {
+ int space = TAB - term.c.x % TAB;
+
+ if(term.c.x + space >= term.col)
+ space--;
+
+ for(; space > 0; space--)
+ tcursor(CSright);
+}
+
void
tputc(char c) {
static int inesc = 0;
-
+#if 0
dump(c);
+#endif
/* start of escseq */
if(c == '\033')
escreset(), inesc = 1;
@@ -589,6 +793,9 @@ tputc(char c) {
tsetchar(c);
tcursor(CSright);
break;
+ case '\t':
+ tputtab();
+ break;
case '\b':
tcursor(CSleft);
break;
@@ -610,24 +817,6 @@ tputs(char *s, int len) {
tputc(*s++);
}
-void
-tdump(void) {
- int row, col;
- Glyph c;
-
- for(row = 0; row < term.row; row++) {
- for(col = 0; col < term.col; col++) {
- if(col == term.c.x && row == term.c.y)
- putchar('#');
- else {
- c = term.line[row][col];
- putchar(c.state & CRset ? c.c : '.');
- }
- }
- putchar('\n');
- }
-}
-
void
tresize(int col, int row) {
int i;
@@ -637,19 +826,23 @@ tresize(int col, int row) {
if(col < 1 || row < 1)
return;
+ /* alloc */
line = calloc(row, sizeof(Line));
for(i = 0 ; i < row; i++)
line[i] = calloc(col, sizeof(Glyph));
- for(i = 0 ; i < minrow; i++) {
+ /* copy */
+ for(i = 0 ; i < minrow; i++)
memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
+ /* free */
+ for(i = 0; i < term.row; i++)
free(term.line[i]);
- }
free(term.line);
+
LIMIT(term.c.x, 0, col-1);
LIMIT(term.c.y, 0, row-1);
LIMIT(term.top, 0, row-1);
LIMIT(term.bot, 0, row-1);
- // if(term.bot == term.row-1)
+
term.bot = row-1;
term.line = line;
term.col = col, term.row = row;
@@ -667,7 +860,6 @@ xgetcol(const char *s) {
return color.pixel;
}
-
void
xclear(int x1, int y1, int x2, int y2) {
XClearArea(xw.dis, xw.win,
@@ -676,7 +868,6 @@ xclear(int x1, int y1, int x2, int y2) {
False);
}
-
void
xscroll(void) {
int srcy = (term.top+1) * xw.ch;
@@ -688,9 +879,6 @@ xscroll(void) {
xclear(0, term.bot, term.col-1, term.bot);
}
-
-
-
void
xinit(void) {
XGCValues values;
@@ -703,12 +891,12 @@ xinit(void) {
xw.dis = XOpenDisplay(NULL);
xw.scr = XDefaultScreen(xw.dis);
- if(!(xw.dis && xw.scr))
- die("can not open display");
-
+ if(!xw.dis)
+ die("Can't open display\n");
+
/* font */
if(!(dc.font = XLoadQueryFont(xw.dis, FONT)))
- die("can not find font " FONT);
+ die("Can't load font %s\n", FONT);
xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
@@ -721,7 +909,7 @@ xinit(void) {
term.c.attr.bg = DefaultBG;
term.c.attr.mode = ATnone;
/* windows */
- xw.h = term.row * xw.ch;
+ xw.h = term.row * xw.ch;
xw.w = term.col * xw.cw;
/* XXX: this BORDER is useless after the first resize, handle it in xdraws() */
xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
@@ -743,7 +931,6 @@ xinit(void) {
XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
XStoreName(xw.dis, xw.win, TNAME);
XSync(xw.dis, 0);
-
}
void
@@ -762,7 +949,7 @@ xdrawc(int x, int y, Glyph g) {
/* string */
XSetForeground(xw.dis, dc.gc, xfg);
XDrawString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &(g.c), 1);
- if(g.mode & ATbold) /* XXX: bold hack (draw again at x+1) */
+ if(g.mode & ATbold) /* XXX: bold hack (draw again at x+1) */
XDrawString(xw.dis, xw.win, dc.gc, r.x+1, r.y+dc.font->ascent, &(g.c), 1);
/* underline */
if(g.mode & ATunderline) {
@@ -776,20 +963,24 @@ xcursor(int mode) {
static int oldx = 0;
static int oldy = 0;
Glyph g = {' ', ATnone, DefaultBG, DefaultCS, 0};
-
+
+ LIMIT(oldx, 0, term.col-1);
+ LIMIT(oldy, 0, term.row-1);
+
if(term.line[term.c.y][term.c.x].state & CRset)
g.c = term.line[term.c.y][term.c.x].c;
/* remove the old cursor */
if(term.line[oldy][oldx].state & CRset)
xdrawc(oldx, oldy, term.line[oldy][oldx]);
- else xclear(oldx, oldy, oldx, oldy); /* XXX: maybe a bug */
- if(mode == CSdraw && !term.c.hidden) {
+ else
+ xclear(oldx, oldy, oldx, oldy);
+ /* draw the new one */
+ if(mode == CSdraw) {
xdrawc(term.c.x, term.c.y, g);
oldx = term.c.x, oldy = term.c.y;
}
}
-
void
draw(int redraw_all) {
int x, y;
@@ -797,14 +988,18 @@ draw(int redraw_all) {
if(redraw_all)
XClearWindow(xw.dis, xw.win);
+
/* XXX: drawing could be optimised */
for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) {
changed = term.line[y][x].state & CRupdate;
set = term.line[y][x].state & CRset;
- if((changed && set) || (redraw_all && set)) {
+ if(redraw_all || changed) {
term.line[y][x].state &= ~CRupdate;
- xdrawc(x, y, term.line[y][x]);
+ if(set)
+ xdrawc(x, y, term.line[y][x]);
+ else
+ xclear(x, y, x, y);
}
}
}
@@ -812,46 +1007,50 @@ draw(int redraw_all) {
}
void
-kpress(XKeyEvent *e) {
+expose(XEvent *ev) {
+ draw(SCredraw);
+}
+
+char *
+kmap(KeySym k) {
+ int i;
+ for(i = 0; i < LEN(key); i++)
+ if(key[i].k == k)
+ return (char*)key[i].s;
+ return NULL;
+}
+
+void
+kpress(XEvent *ev) {
+ XKeyEvent *e = &ev->xkey;
KeySym ksym;
char buf[32];
+ char *customkey;
int len;
int meta;
int shift;
- meta = e->state & Mod4Mask;
+ meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
- if(len > 0) {
+
+ if(customkey = kmap(ksym))
+ ttywrite(customkey, strlen(customkey));
+ else if(len > 0) {
buf[sizeof(buf)-1] = '\0';
if(meta && len == 1)
ttywrite("\033", 1);
ttywrite(buf, len);
- return;
- }
- switch(ksym) {
-#ifdef DEBUG1
- default:
- printf("errkey: %d\n", (int)ksym);
- break;
-#endif
- case XK_Up:
- case XK_Down:
- case XK_Left:
- case XK_Right:
- sprintf(buf, "\033[%c", "DACB"[ksym - XK_Left]);
- ttywrite(buf, 3);
- break;
- case XK_Delete: ttywrite(KEYDELETE, sizeof(KEYDELETE)-1); break;
- case XK_Home: ttywrite( KEYHOME, sizeof( KEYHOME)-1); break;
- case XK_End: ttywrite( KEYEND, sizeof( KEYEND)-1); break;
- case XK_Prior: ttywrite( KEYPREV, sizeof( KEYPREV)-1); break;
- case XK_Next: ttywrite( KEYNEXT, sizeof( KEYNEXT)-1); break;
- case XK_Insert:
- /* XXX: paste X clipboard */
- if(shift);
- break;
- }
+ } else
+ switch(ksym) {
+ case XK_Insert:
+ if(shift)
+ /* XXX: paste X clipboard */;
+ break;
+ default:
+ fprintf(stderr, "errkey: %d\n", (int)ksym);
+ break;
+ }
}
void
@@ -859,8 +1058,8 @@ resize(XEvent *e) {
int col, row;
col = e->xconfigure.width / xw.cw;
row = e->xconfigure.height / xw.ch;
-
- if(term.col != col && term.row != row) {
+
+ if(term.col != col || term.row != row) {
tresize(col, row);
ttyresize(col, row);
xw.w = e->xconfigure.width;
@@ -869,60 +1068,47 @@ resize(XEvent *e) {
}
}
-
void
run(void) {
- int ret;
XEvent ev;
fd_set rfd;
- struct timeval tv = {0, 10000};
+ int xfd = XConnectionNumber(xw.dis);
running = 1;
XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
- XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* seems to fix the resize bug in wmii */
+ XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */
+
while(running) {
- while(XPending(xw.dis)) {
- XNextEvent(xw.dis, &ev);
- switch (ev.type) {
- default:
- break;
- case KeyPress:
- kpress(&ev.xkey);
- break;
- case Expose:
- draw(SCredraw);
- break;
- case ConfigureNotify:
- resize(&ev);
- break;
- }
- }
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
- ret = select(cmdfd+1, &rfd, NULL, NULL, &tv);
- if(ret < 0) {
- fprintf(stderr, "select: %m\n");
- running = 0;
+ FD_SET(xfd, &rfd);
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+ if(errno == EINTR)
+ continue;
+ die("select failed: %s\n", SERRNO);
}
- if(!ret)
- continue;
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
draw(SCupdate);
}
+ while(XPending(xw.dis)) {
+ XNextEvent(xw.dis, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev);
+ }
}
}
int
main(int argc, char *argv[]) {
if(argc == 2 && !strncmp("-v", argv[1], 3))
- die("st-"", © 2009 st engineers\n");
+ die("st-" VERSION ", © 2009 st engineers\n");
else if(argc != 1)
die("usage: st [-v]\n");
setlocale(LC_CTYPE, "");
- tnew(80, 24);
- ttynew();
- xinit();
- run();
+ tnew(80, 24);
+ ttynew();
+ xinit();
+ run();
return 0;
}