snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Applying the CBT patch of Roberto Vargas. Thanks.

Browse source
This commit is contained in:
Christoph Lohmann 2012-08-30 21:17:54 +02:00
parent 91fa81dbac
commit c58950f2ef
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
st.c
View file

@ -97,11 +97,11 @@ enum glyph_state {
}; };
enum term_mode { enum term_mode {
MODE_WRAP = 1, MODE_WRAP = 1,
MODE_INSERT = 2, MODE_INSERT = 2,
MODE_APPKEYPAD = 4, MODE_APPKEYPAD = 4,
MODE_ALTSCREEN = 8, MODE_ALTSCREEN = 8,
MODE_CRLF = 16, MODE_CRLF = 16,
MODE_MOUSEBTN = 32, MODE_MOUSEBTN = 32,
MODE_MOUSEMOTION = 64, MODE_MOUSEMOTION = 64,
MODE_MOUSE = 32|64, MODE_MOUSE = 32|64,
@ -110,8 +110,8 @@ enum term_mode {
enum escape_state { enum escape_state {
ESC_START = 1, ESC_START = 1,
ESC_CSI = 2, ESC_CSI = 2,
ESC_STR = 4, /* DSC, OSC, PM, APC */ ESC_STR = 4, /* DSC, OSC, PM, APC */
ESC_ALTCHARSET = 8, ESC_ALTCHARSET = 8,
ESC_STR_END = 16, /* a final string was encountered */ ESC_STR_END = 16, /* a final string was encountered */
}; };
@ -152,21 +152,21 @@ typedef struct {
/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */ /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
typedef struct { typedef struct {
char buf[ESC_BUF_SIZ]; /* raw string */ char buf[ESC_BUF_SIZ]; /* raw string */
int len; /* raw string length */ int len; /* raw string length */
char priv; char priv;
int arg[ESC_ARG_SIZ]; int arg[ESC_ARG_SIZ];
int narg; /* nb of args */ int narg; /* nb of args */
char mode; char mode;
} CSIEscape; } CSIEscape;
/* STR Escape sequence structs */ /* STR Escape sequence structs */
/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */ /* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
typedef struct { typedef struct {
char type; /* ESC type ... */ char type; /* ESC type ... */
char buf[STR_BUF_SIZ]; /* raw string */ char buf[STR_BUF_SIZ]; /* raw string */
int len; /* raw string length */ int len; /* raw string length */
char *args[STR_ARG_SIZ]; char *args[STR_ARG_SIZ];
int narg; /* nb of args */ int narg; /* nb of args */
} STREscape; } STREscape;
/* Internal representation of the screen */ /* Internal representation of the screen */
@ -262,7 +262,7 @@ static void tinsertblankline(int);
static void tmoveto(int, int); static void tmoveto(int, int);
static void tnew(int, int); static void tnew(int, int);
static void tnewline(int); static void tnewline(int);
static void tputtab(void); static void tputtab(bool);
static void tputc(char*); static void tputc(char*);
static void treset(void); static void treset(void);
static int tresize(int, int); static int tresize(int, int);
@ -1243,7 +1243,7 @@ csihandle(void) {
case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */ case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[0], 1);
while (csiescseq.arg[0]--) while (csiescseq.arg[0]--)
tputtab(); tputtab(1);
break; break;
case 'J': /* ED -- Clear screen */ case 'J': /* ED -- Clear screen */
sel.bx = -1; sel.bx = -1;
@ -1356,7 +1356,11 @@ csihandle(void) {
DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[0], 1);
tdeletechar(csiescseq.arg[0]); tdeletechar(csiescseq.arg[0]);
break; break;
/* XXX: (CSI n Z) CBT -- Cursor Backward Tabulation <n> tab stops */ case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
DEFAULT(csiescseq.arg[0], 1);
while (csiescseq.arg[0]--)
tputtab(0);
break;
case 'd': /* VPA -- Move to <row> */ case 'd': /* VPA -- Move to <row> */
DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x, csiescseq.arg[0]-1); tmoveto(term.c.x, csiescseq.arg[0]-1);
@ -1528,11 +1532,20 @@ strreset(void) {
} }
void void
tputtab(void) { tputtab(bool forward) {
unsigned x; unsigned x = term.c.x;
for (x = term.c.x + 1; x < term.col && !term.tabs[x]; ++x) if (forward) {
/* nothing */ ; if (x == term.col)
return;
for (++x; x < term.col && !term.tabs[x]; ++x)
/* nothing */ ;
} else {
if (x == 0)
return;
for (--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
tmoveto(x, term.c.y); tmoveto(x, term.c.y);
} }
@ -1650,7 +1663,7 @@ tputc(char *c) {
sel.bx = -1; sel.bx = -1;
switch(ascii) { switch(ascii) {
case '\t': case '\t':
tputtab(); tputtab(1);
break; break;
case '\b': case '\b':
tmoveto(term.c.x-1, term.c.y); tmoveto(term.c.x-1, term.c.y);
@ -1806,8 +1819,8 @@ void
xclear(int x1, int y1, int x2, int y2) { xclear(int x1, int y1, int x2, int y2) {
XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]); XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
XFillRectangle(xw.dpy, xw.buf, dc.gc, XFillRectangle(xw.dpy, xw.buf, dc.gc,
BORDER + x1 * xw.cw, BORDER + y1 * xw.ch, BORDER + x1 * xw.cw, BORDER + y1 * xw.ch,
(x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
} }
void void
@ -1982,8 +1995,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/* copy buffer pixmap to screen pixmap */ /* copy buffer pixmap to screen pixmap */
void void
xcopy() { xcopy() {
XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}}; XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
XdbeSwapBuffers(xw.dpy, swpinfo, 1); XdbeSwapBuffers(xw.dpy, swpinfo, 1);
} }
@ -2080,8 +2093,8 @@ expose(XEvent *ev) {
if(xw.state & WIN_REDRAW) { if(xw.state & WIN_REDRAW) {
if(!e->count) if(!e->count)
xw.state &= ~WIN_REDRAW; xw.state &= ~WIN_REDRAW;
} }
xcopy(); xcopy();
} }
void void