Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Redrawing is fixed.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
0db81f4
..
89c59b4
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-48,13
+48,11
@@
#define ESC_ARG_SIZ 16
#define STR_BUF_SIZ 256
#define STR_ARG_SIZ 16
#define ESC_ARG_SIZ 16
#define STR_BUF_SIZ 256
#define STR_ARG_SIZ 16
-#define DRAW_BUF_SIZ 1024
+#define DRAW_BUF_SIZ
20*
1024
#define UTF_SIZ 4
#define XK_NO_MOD UINT_MAX
#define XK_ANY_MOD 0
#define UTF_SIZ 4
#define XK_NO_MOD UINT_MAX
#define XK_ANY_MOD 0
-#define SELECT_TIMEOUT (20*1000) /* 20 ms */
-#define DRAW_TIMEOUT (20*1000) /* 20 ms */
#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
#define SERRNO strerror(errno)
#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
#define SERRNO strerror(errno)
@@
-200,12
+198,12
@@
typedef struct {
int scr;
Bool isfixed; /* is fixed geometry? */
int fx, fy, fw, fh; /* fixed geometry */
int scr;
Bool isfixed; /* is fixed geometry? */
int fx, fy, fw, fh; /* fixed geometry */
+ int tw, th; /* tty width and height */
int w; /* window width */
int h; /* window height */
int ch; /* char height */
int cw; /* char width */
char state; /* focus, redraw, visible */
int w; /* window width */
int h; /* window height */
int ch; /* char height */
int cw; /* char width */
char state; /* focus, redraw, visible */
- struct timeval lastdraw;
} XWindow;
typedef struct {
} XWindow;
typedef struct {
@@
-240,7
+238,7
@@
typedef struct {
short lbearing;
short rbearing;
XFontSet set;
short lbearing;
short rbearing;
XFontSet set;
- } font, bfont, ifont;
+ } font, bfont, ifont
, ibfont
;
} DC;
static void die(const char*, ...);
} DC;
static void die(const char*, ...);
@@
-250,7
+248,6
@@
static void drawregion(int, int, int, int);
static void execsh(void);
static void sigchld(int);
static void run(void);
static void execsh(void);
static void sigchld(int);
static void run(void);
-static bool last_draw_too_old(void);
static void csidump(void);
static void csihandle(void);
static void csidump(void);
static void csihandle(void);
@@
-292,10
+289,10
@@
static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
-static void xcopy(void);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
+static void xresettitle(void);
static void xseturgency(int);
static void xsetsel(char*);
static void xresize(int, int);
static void xseturgency(int);
static void xsetsel(char*);
static void xresize(int, int);
@@
-328,6
+325,7
@@
static int isfullutf8(char *, int);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
+static void *xcalloc(size_t nmemb, size_t size);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
@@
-366,14
+364,22
@@
void *
xmalloc(size_t len) {
void *p = malloc(len);
if(!p)
xmalloc(size_t len) {
void *p = malloc(len);
if(!p)
- die("Out of memory");
+ die("Out of memory
\n
");
return p;
}
void *
xrealloc(void *p, size_t len) {
if((p = realloc(p, len)) == NULL)
return p;
}
void *
xrealloc(void *p, size_t len) {
if((p = realloc(p, len)) == NULL)
- die("Out of memory");
+ die("Out of memory\n");
+ return p;
+}
+
+void *
+xcalloc(size_t nmemb, size_t size) {
+ void *p = calloc(nmemb, size);
+ if(!p)
+ die("Out of memory\n");
return p;
}
return p;
}
@@
-565,8
+571,11
@@
bpress(XEvent *e) {
if(IS_SET(MODE_MOUSE))
mousereport(e);
else if(e->xbutton.button == Button1) {
if(IS_SET(MODE_MOUSE))
mousereport(e);
else if(e->xbutton.button == Button1) {
- if(sel.bx != -1)
+ if(sel.bx != -1) {
+ sel.bx = -1;
tsetdirt(sel.b.y, sel.e.y);
tsetdirt(sel.b.y, sel.e.y);
+ draw();
+ }
sel.mode = 1;
sel.ex = sel.bx = X2COL(e->xbutton.x);
sel.ey = sel.by = Y2ROW(e->xbutton.y);
sel.mode = 1;
sel.ex = sel.bx = X2COL(e->xbutton.x);
sel.ey = sel.by = Y2ROW(e->xbutton.y);
@@
-588,14
+597,17
@@
selcopy(void) {
/* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) {
/* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) {
- is_selected = selected(x, y);
- if((term.line[y][x].state & GLYPH_SET) && is_selected) {
- int size = utf8size(term.line[y][x].c);
- memcpy(ptr, term.line[y][x].c, size);
- ptr += size;
- }
+ int size;
+ char *p;
+ Glyph *gp = &term.line[y][x];
+
+ if(!(is_selected = selected(x, y)))
+ continue;
+ p = (gp->state & GLYPH_SET) ? gp->c : " ";
+ size = utf8size(p);
+ memcpy(ptr, p, size);
+ ptr += size;
}
}
-
/* \n at the end of every selected line except for the last one */
if(is_selected && y < sel.e.y)
*ptr++ = '\n';
/* \n at the end of every selected line except for the last one */
if(is_selected && y < sel.e.y)
*ptr++ = '\n';
@@
-638,7
+650,6
@@
void selclear(XEvent *e) {
return;
sel.bx = -1;
tsetdirt(sel.b.y, sel.e.y);
return;
sel.bx = -1;
tsetdirt(sel.b.y, sel.e.y);
- draw();
}
void
}
void
@@
-688,8
+699,6
@@
xsetsel(char *str) {
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-
- XFlush(xw.dpy);
}
void
}
void
@@
-732,7
+741,6
@@
brelease(XEvent *e) {
}
memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
gettimeofday(&sel.tclick1, NULL);
}
memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
gettimeofday(&sel.tclick1, NULL);
- draw();
}
void
}
void
@@
-749,7
+757,6
@@
bmotion(XEvent *e) {
int starty = MIN(oldey, sel.ey);
int endy = MAX(oldey, sel.ey);
tsetdirt(starty, endy);
int starty = MIN(oldey, sel.ey);
int endy = MAX(oldey, sel.ey);
tsetdirt(starty, endy);
- draw();
}
}
}
}
}
}
@@
-773,6
+780,13
@@
execsh(void) {
unsetenv("LINES");
unsetenv("TERMCAP");
unsetenv("LINES");
unsetenv("TERMCAP");
+ signal(SIGCHLD, SIG_DFL);
+ signal(SIGHUP, SIG_DFL);
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, 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);
putenv("TERM="TNAME);
args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@
-881,8
+895,8
@@
ttyresize(int x, int y) {
w.ws_row = term.row;
w.ws_col = term.col;
w.ws_row = term.row;
w.ws_col = term.col;
- w.ws_xpixel = xw.w;
- w.ws_ypixel = xw.h;
+ w.ws_xpixel = xw.
t
w;
+ w.ws_ypixel = xw.
t
h;
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
@@
-1684,6
+1698,7
@@
tputc(char *c) {
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
+ xresettitle();
break;
case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
break;
case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
@@
-1714,6
+1729,8
@@
tputc(char *c) {
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
switch(ascii) {
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
switch(ascii) {
+ case '\0': /* padding character, do nothing */
+ break;
case '\t':
tputtab(1);
break;
case '\t':
tputtab(1);
break;
@@
-1797,8
+1814,8
@@
tresize(int col, int row) {
/* allocate any new rows */
for(/* i == minrow */; i < row; i++) {
term.dirty[i] = 1;
/* allocate any new rows */
for(/* i == minrow */; i < row; i++) {
term.dirty[i] = 1;
- term.line[i] = calloc(col, sizeof(Glyph));
- term.alt [i] = calloc(col, sizeof(Glyph));
+ term.line[i] =
x
calloc(col, sizeof(Glyph));
+ term.alt [i] =
x
calloc(col, sizeof(Glyph));
}
if(col > term.col) {
bool *bp = term.tabs + term.col;
}
if(col > term.col) {
bool *bp = term.tabs + term.col;
@@
-1821,8
+1838,8
@@
tresize(int col, int row) {
void
xresize(int col, int row) {
void
xresize(int col, int row) {
- xw.w = MAX(1, 2*BORDER + col * xw.cw);
- xw.h = MAX(1, 2*BORDER + row * xw.ch);
+ xw.
t
w = MAX(1, 2*BORDER + col * xw.cw);
+ xw.
t
h = MAX(1, 2*BORDER + row * xw.ch);
}
void
}
void
@@
-1934,13
+1951,15
@@
xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
}
void
}
void
-initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+initfonts(char *fontstr, char *bfontstr, char *ifontstr
, char *ibfontstr
) {
if((dc.font.set = xinitfont(fontstr)) == NULL)
die("Can't load font %s\n", fontstr);
if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
die("Can't load bfont %s\n", bfontstr);
if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
die("Can't load ifont %s\n", ifontstr);
if((dc.font.set = xinitfont(fontstr)) == NULL)
die("Can't load font %s\n", fontstr);
if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
die("Can't load bfont %s\n", bfontstr);
if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
die("Can't load ifont %s\n", ifontstr);
+ if((dc.ibfont.set = xinitfont(ibfontstr)) == NULL)
+ die("Can't load ibfont %s\n", ibfontstr);
xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
&dc.font.lbearing, &dc.font.rbearing);
xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
&dc.font.lbearing, &dc.font.rbearing);
@@
-1948,6
+1967,8
@@
initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
&dc.bfont.lbearing, &dc.bfont.rbearing);
xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
&dc.ifont.lbearing, &dc.ifont.rbearing);
&dc.bfont.lbearing, &dc.bfont.rbearing);
xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
&dc.ifont.lbearing, &dc.ifont.rbearing);
+ xgetfontinfo(dc.ibfont.set, &dc.ibfont.ascent, &dc.ibfont.descent,
+ &dc.ibfont.lbearing, &dc.ibfont.rbearing);
}
void
}
void
@@
-1955,14
+1976,14
@@
xinit(void) {
XSetWindowAttributes attrs;
Cursor cursor;
Window parent;
XSetWindowAttributes attrs;
Cursor cursor;
Window parent;
- int sw, sh;
+ int sw, sh
, major, minor
;
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
/* font */
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
/* font */
- initfonts(FONT, BOLDFONT, ITALICFONT);
+ initfonts(FONT, BOLDFONT, ITALICFONT
, ITALICBOLDFONT
);
/* XXX: Assuming same size for bold font */
xw.cw = dc.font.rbearing - dc.font.lbearing;
/* XXX: Assuming same size for bold font */
xw.cw = dc.font.rbearing - dc.font.lbearing;
@@
-2006,9
+2027,10
@@
xinit(void) {
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
| CWColormap,
&attrs);
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
| CWColormap,
&attrs);
+ if(!XdbeQueryExtension(xw.dpy, &major, &minor))
+ die("Xdbe extension is not present\n");
xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
-
/* input methods */
xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
/* input methods */
xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
@@
-2026,7
+2048,7
@@
xinit(void) {
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
-
XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"
);
+
xresettitle(
);
XMapWindow(xw.dpy, xw.win);
xhints();
XSync(xw.dpy, 0);
XMapWindow(xw.dpy, xw.win);
xhints();
XSync(xw.dpy, 0);
@@
-2057,6
+2079,8
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
if(base.mode & ATTR_ITALIC)
fontset = dc.ifont.set;
if(base.mode & ATTR_ITALIC)
fontset = dc.ifont.set;
+ if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+ fontset = dc.ibfont.set;
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
@@
-2077,13
+2101,6
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
}
XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
}
-/* copy buffer pixmap to screen pixmap */
-void
-xcopy() {
- XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
- XdbeSwapBuffers(xw.dpy, swpinfo, 1);
-}
-
void
xdrawcursor(void) {
static int oldx = 0;
void
xdrawcursor(void) {
static int oldx = 0;
@@
-2104,8
+2121,6
@@
xdrawcursor(void) {
} else
xclear(oldx, oldy, oldx, oldy);
} else
xclear(oldx, oldy, oldx, oldy);
- xcopy();
-
/* 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))
@@
-2118,23
+2133,30
@@
xdrawcursor(void) {
xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
oldx = term.c.x, oldy = term.c.y;
}
xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
oldx = term.c.x, oldy = term.c.y;
}
+}
- xcopy();
+void
+xresettitle(void) {
+ XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
}
void
redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
}
void
redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+
+ xclear(0, 0, xw.w, xw.h);
tfulldirt();
draw();
tfulldirt();
draw();
+ XSync(xw.dpy, False); /* necessary for a good tput flash */
nanosleep(&tv, NULL);
}
void
draw() {
nanosleep(&tv, NULL);
}
void
draw() {
+ XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
+
drawregion(0, 0, term.col, term.row);
drawregion(0, 0, term.col, term.row);
- xcopy();
- gettimeofday(&xw.lastdraw, NULL);
+ XdbeSwapBuffers(xw.dpy, swpinfo, 1);
}
void
}
void
@@
-2189,7
+2211,6
@@
expose(XEvent *ev) {
if(!e->count)
xw.state &= ~WIN_REDRAW;
}
if(!e->count)
xw.state &= ~WIN_REDRAW;
}
- xcopy();
}
void
}
void
@@
-2222,7
+2243,6
@@
focus(XEvent *ev) {
xseturgency(0);
} else
xw.state &= ~WIN_FOCUSED;
xseturgency(0);
} else
xw.state &= ~WIN_FOCUSED;
- draw();
}
char*
}
char*
@@
-2298,7
+2318,6
@@
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;
}
- draw();
}
}
}
}
@@
-2315,47
+2334,48
@@
resize(XEvent *e) {
row = (xw.h - 2*BORDER) / xw.ch;
if(col == term.col && row == term.row)
return;
row = (xw.h - 2*BORDER) / xw.ch;
if(col == term.col && row == term.row)
return;
- if(tresize(col, row))
- draw();
+
+ xclear(0, 0, xw.w, xw.h);
+ tresize(col, row);
xresize(col, row);
ttyresize(col, row);
}
xresize(col, row);
ttyresize(col, row);
}
-bool
-last_draw_too_old(void) {
- struct timeval now;
- gettimeofday(&now, NULL);
- return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000;
-}
-
void
run(void) {
XEvent ev;
fd_set rfd;
void
run(void) {
XEvent ev;
fd_set rfd;
- int xfd = XConnectionNumber(xw.dpy);
- struct timeval timeout = {0};
- bool stuff_to_print = 0;
+ int xfd = XConnectionNumber(xw.dpy), i;
+ struct timeval drawtimeout, *tv = NULL;
- for(
;;
) {
+ for(
i = 0;; i++
) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- timeout.tv_sec = 0;
- timeout.tv_usec = SELECT_TIMEOUT;
- if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) {
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
}
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
}
- if(FD_ISSET(cmdfd, &rfd)) {
+
+ /*
+ * Stop after a certain number of reads so the user does not
+ * feel like the system is stuttering.
+ */
+ if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {
ttyread();
ttyread();
- stuff_to_print = 1;
- }
- if(stuff_to_print && last_draw_too_old()) {
- stuff_to_print = 0;
- draw();
+ /*
+ * Just wait a bit so it isn't disturbing the
+ * user and the system is able to write something.
+ */
+ drawtimeout.tv_sec = 0;
+ drawtimeout.tv_usec = 5;
+ tv = &drawtimeout;
+ continue;
}
}
+ i = 0;
+ tv = NULL;
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
@@
-2364,6
+2384,9
@@
run(void) {
if(handler[ev.type])
(handler[ev.type])(&ev);
}
if(handler[ev.type])
(handler[ev.type])(&ev);
}
+
+ draw();
+ XFlush(xw.dpy);
}
}
}
}