aw/st
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bold attribute is back.

Browse Source 
visibility of the cursor is not saved/loaded anymore.
scrolling up/down is fixed.
added RI and RIS sequences.
fixed cursor drawing bug.
This commit is contained in:
Aurélien Aptel 2010-03-11 23:50:50 +01:00
parent 7cdaf130b1
commit 0f4dd5035e
2 changed files with 126 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h
View File

@ -1,7 +1,8 @@
#define SHELL "/bin/bash" #define SHELL "/bin/bash"
#define TAB 8 #define TAB 8
#define FONT "fixed" #define FONT "6x13"
#define BOLDFONT FONT"bold"
#define BORDER 3 #define BORDER 3
#define LINESPACE 0 /* additional pixel between each line */ #define LINESPACE 0 /* additional pixel between each line */

173
st.c
View File

@ -57,7 +57,6 @@ typedef Glyph* Line;
typedef struct { typedef struct {
Glyph attr; /* current char attributes */ Glyph attr; /* current char attributes */
char hidden;
int x; int x;
int y; int y;
} TCursor; } TCursor;
@ -79,6 +78,7 @@ typedef struct {
int col; /* nb col */ int col; /* nb col */
Line* line; /* screen */ Line* line; /* screen */
TCursor c; /* cursor */ TCursor c; /* cursor */
char hidec;
int top; /* top scroll limit */ int top; /* top scroll limit */
int bot; /* bottom scroll limit */ int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */ int mode; /* terminal mode flags */
@ -109,6 +109,7 @@ typedef struct {
typedef struct { typedef struct {
unsigned long col[LEN(colorname)]; unsigned long col[LEN(colorname)];
XFontStruct* font; XFontStruct* font;
XFontStruct* bfont;
GC gc; GC gc;
} DC; } DC;
@ -135,8 +136,11 @@ static void tnew(int, int);
static void tnewline(void); static void tnewline(void);
static void tputc(char); static void tputc(char);
static void tputs(char*, int); static void tputs(char*, int);
static void treset(void);
static void tresize(int, int); static void tresize(int, int);
static void tscroll(void); static void tscroll(void);
static void tscrollup(int);
static void tscrolldown(int);
static void tsetattr(int*, int); static void tsetattr(int*, int);
static void tsetchar(char); static void tsetchar(char);
static void tsetscroll(int, int); static void tsetscroll(int, int);
@ -149,12 +153,11 @@ static void ttywrite(const char *, size_t);
static unsigned long xgetcol(const char *); static unsigned long xgetcol(const char *);
static void xclear(int, int, int, int); static void xclear(int, int, int, int);
static void xcursor(int); static void xcursor(int);
static void xdrawc(int, int, Glyph);
static void xinit(void); static void xinit(void);
static void xscroll(void); static void xscroll(void);
static void expose(XEvent *); static void expose(XEvent *);
static char * kmap(KeySym); static char* kmap(KeySym);
static void kpress(XEvent *); static void kpress(XEvent *);
static void resize(XEvent *); static void resize(XEvent *);
@ -312,6 +315,18 @@ tcursor(int mode) {
term.c = c, tmoveto(c.x, c.y); term.c = c, tmoveto(c.x, c.y);
} }
void
treset(void) {
term.c.attr.mode = ATTR_NULL;
term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG;
term.c.x = term.c.y = 0;
term.hidec = 0;
term.top = 0, term.bot = term.row - 1;
term.mode = MODE_WRAP;
tclearregion(0, 0, term.col-1, term.row-1);
}
void void
tnew(int col, int row) { /* screen size */ tnew(int col, int row) { /* screen size */
term.row = row, term.col = col; term.row = row, term.col = col;
@ -323,17 +338,19 @@ tnew(int col, int row) { /* screen size */
term.c.attr.fg = DefaultFG; term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG; term.c.attr.bg = DefaultBG;
term.c.x = term.c.y = 0; term.c.x = term.c.y = 0;
term.c.hidden = 0; term.hidec = 0;
/* allocate screen */ /* allocate screen */
term.line = calloc(term.row, sizeof(Line)); term.line = calloc(term.row, sizeof(Line));
for(row = 0 ; row < term.row; row++) for(row = 0 ; row < term.row; row++)
term.line[row] = calloc(term.col, sizeof(Glyph)); term.line[row] = calloc(term.col, sizeof(Glyph));
} }
/* TODO: Replace with scrollup/scolldown */
void void
tscroll(void) { tscroll(void) {
Line temp = term.line[term.top]; Line temp = term.line[term.top];
int i; int i;
/* No dirty flag to set because of xscroll */
/* X stuff _before_ the line swapping (results in wrong line index) */ /* X stuff _before_ the line swapping (results in wrong line index) */
xscroll(); xscroll();
for(i = term.top; i < term.bot; i++) for(i = term.top; i < term.bot; i++)
@ -342,6 +359,41 @@ tscroll(void) {
term.line[term.bot] = temp; term.line[term.bot] = temp;
} }
void
tscrolldown (int n) {
int i;
Line temp;
/* TODO: set dirty flag or scroll with some X func */
LIMIT(n, 0, term.bot-term.top+1);
for(i = 0; i < n; i++)
memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
for(i = term.bot; i >= term.top+n; i--) {
temp = term.line[i];
term.line[i] = term.line[i-n];
term.line[i-n] = temp;
}
}
void
tscrollup (int n) {
int i;
Line temp;
LIMIT(n, 0, term.bot-term.top+1);
/* TODO: set dirty flag or scroll with some X func */
for(i = 0; i < n; i++)
memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
for(i = term.top; i <= term.bot-n; i++) {
temp = term.line[i];
term.line[i] = term.line[i+n];
term.line[i+n] = temp;
}
}
void void
tnewline(void) { tnewline(void) {
int y = term.c.y + 1; int y = term.c.y + 1;
@ -420,17 +472,20 @@ tsetchar(char c) {
void void
tclearregion(int x1, int y1, int x2, int y2) { tclearregion(int x1, int y1, int x2, int y2) {
int x, y; int y, temp;
if(x1 > x2)
temp = x1, x1 = x2, x2 = temp;
if(y1 > y2)
temp = y1, y1 = y2, y2 = temp;
LIMIT(x1, 0, term.col-1); LIMIT(x1, 0, term.col-1);
LIMIT(x2, 0, term.col-1); LIMIT(x2, 0, term.col-1);
LIMIT(y1, 0, term.row-1); LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1); LIMIT(y2, 0, term.row-1);
/* XXX: could be optimized */ for(y = y1; y <= y2; y++)
for(x = x1; x <= x2; x++) memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
for(y = y1; y <= y2; y++)
memset(&term.line[y][x], 0, sizeof(Glyph));
xclear(x1, y1, x2, y2); xclear(x1, y1, x2, y2);
} }
@ -542,9 +597,6 @@ tsetattr(int *attr, int l) {
case 7: case 7:
term.c.attr.mode |= ATTR_REVERSE; term.c.attr.mode |= ATTR_REVERSE;
break; break;
case 8:
term.c.hidden = CURSOR_HIDE;
break;
case 22: case 22:
term.c.attr.mode &= ~ATTR_BOLD; term.c.attr.mode &= ~ATTR_BOLD;
break; break;
@ -565,6 +617,8 @@ tsetattr(int *attr, int l) {
term.c.attr.fg = attr[i] - 30; term.c.attr.fg = attr[i] - 30;
else if(BETWEEN(attr[i], 40, 47)) else if(BETWEEN(attr[i], 40, 47))
term.c.attr.bg = attr[i] - 40; term.c.attr.bg = attr[i] - 40;
else
fprintf(stderr, "erresc: gfx attr %d unkown\n", attr[i]);
break; break;
} }
} }
@ -590,7 +644,7 @@ csihandle(void) {
switch(escseq.mode) { switch(escseq.mode) {
default: default:
unknown: unknown:
printf("erresc: unknown sequence -- "); printf("erresc: unknown csi ");
csidump(); csidump();
/* die(""); */ /* die(""); */
break; break;
@ -665,7 +719,14 @@ csihandle(void) {
break; break;
} }
break; break;
case 'S': /* XXX: SU -- Scroll <n> line up (faked) */ case 'S': /* SU -- Scroll <n> line up */
DEFAULT(escseq.arg[0], 1);
tscrollup(escseq.arg[0]);
break;
case 'T': /* SD -- Scroll <n> line down */
DEFAULT(escseq.arg[0], 1);
tscrolldown(escseq.arg[0]);
break;
case 'L': /* IL -- Insert <n> blank lines */ case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(escseq.arg[0], 1); DEFAULT(escseq.arg[0], 1);
tinsertblankline(escseq.arg[0]); tinsertblankline(escseq.arg[0]);
@ -682,7 +743,7 @@ csihandle(void) {
case 12: /* att610 -- Stop blinking cursor (IGNORED) */ case 12: /* att610 -- Stop blinking cursor (IGNORED) */
break; break;
case 25: case 25:
term.c.hidden = 1; term.hidec = 1;
break; break;
case 1048: /* XXX: no alt. screen to erase/save */ case 1048: /* XXX: no alt. screen to erase/save */
case 1049: case 1049:
@ -731,7 +792,7 @@ csihandle(void) {
case 12: /* att610 -- Start blinking cursor (IGNORED) */ case 12: /* att610 -- Start blinking cursor (IGNORED) */
break; break;
case 25: case 25:
term.c.hidden = 0; term.hidec = 0;
break; break;
case 1048: case 1048:
case 1049: /* XXX: no alt. screen to erase/save */ case 1049: /* XXX: no alt. screen to erase/save */
@ -866,11 +927,15 @@ tputc(char c) {
break; break;
case 'M': /* RI -- Reverse index */ case 'M': /* RI -- Reverse index */
if(term.c.y == term.top) if(term.c.y == term.top)
tinsertblankline(1); tscrolldown(1);
else else
tmoveto(term.c.x, term.c.y-1); tmoveto(term.c.x, term.c.y-1);
term.esc = 0; term.esc = 0;
break; break;
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
break;
case '=': /* DECPAM */ case '=': /* DECPAM */
term.mode |= MODE_APPKEYPAD; term.mode |= MODE_APPKEYPAD;
term.esc = 0; term.esc = 0;
@ -888,7 +953,7 @@ tputc(char c) {
term.esc = 0; term.esc = 0;
break; break;
default: default:
fprintf(stderr, "erresc: unknown sequence ESC %02X '%c'\n", c, isprint(c)?c:'.'); fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
term.esc = 0; term.esc = 0;
} }
} }
@ -991,8 +1056,6 @@ xscroll(void) {
void void
xinit(void) { xinit(void) {
XGCValues values;
unsigned long valuemask;
XClassHint chint; XClassHint chint;
XWMHints wmhint; XWMHints wmhint;
XSizeHints shint; XSizeHints shint;
@ -1005,9 +1068,10 @@ xinit(void) {
die("Can't open display\n"); die("Can't open display\n");
/* font */ /* font */
if(!(dc.font = XLoadQueryFont(xw.dis, FONT))) if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
die("Can't load font %s\n", FONT); die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
/* XXX: Assuming same size for bold font */
xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing; xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
xw.ch = dc.font->ascent + dc.font->descent + LINESPACE; xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
@ -1027,10 +1091,7 @@ xinit(void) {
dc.col[DefaultBG], dc.col[DefaultBG],
dc.col[DefaultBG]); dc.col[DefaultBG]);
/* gc */ /* gc */
values.foreground = XWhitePixel(xw.dis, xw.scr); dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
values.font = dc.font->fid;
valuemask = GCForeground | GCFont;
dc.gc = XCreateGC(xw.dis, xw.win, valuemask, &values);
XMapWindow(xw.dis, xw.win); XMapWindow(xw.dis, xw.win);
/* wm stuff */ /* wm stuff */
chint.res_name = TNAME, chint.res_class = TNAME; chint.res_name = TNAME, chint.res_class = TNAME;
@ -1060,29 +1121,14 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
if(base.mode & ATTR_GFX) if(base.mode & ATTR_GFX)
for(i = 0; i < len; i++) for(i = 0; i < len; i++)
s[i] = gfx[s[i]]; s[i] = gfx[s[i]];
XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
XDrawImageString(xw.dis, xw.win, dc.gc, winx, winy, s, len); XDrawImageString(xw.dis, xw.win, dc.gc, winx, winy, s, len);
if(base.mode & ATTR_UNDERLINE) if(base.mode & ATTR_UNDERLINE)
XDrawLine(xw.dis, xw.win, dc.gc, winx, winy+1, winx+width-1, winy+1); XDrawLine(xw.dis, xw.win, dc.gc, winx, winy+1, winx+width-1, winy+1);
} }
void
xdrawc(int x, int y, Glyph g) {
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
unsigned long xfg, xbg;
/* reverse video */
if(g.mode & ATTR_REVERSE)
xfg = dc.col[g.bg], xbg = dc.col[g.fg];
else
xfg = dc.col[g.fg], xbg = dc.col[g.bg];
/* background */
XSetBackground(xw.dis, dc.gc, xbg);
XSetForeground(xw.dis, dc.gc, xfg);
XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
}
void void
xcursor(int mode) { xcursor(int mode) {
static int oldx = 0; static int oldx = 0;
@ -1094,24 +1140,54 @@ xcursor(int mode) {
if(term.line[term.c.y][term.c.x].state & GLYPH_SET) if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
g.c = term.line[term.c.y][term.c.x].c; g.c = term.line[term.c.y][term.c.x].c;
/* remove the old cursor */ /* remove the old cursor */
if(term.line[oldy][oldx].state & GLYPH_SET) if(term.line[oldy][oldx].state & GLYPH_SET)
xdrawc(oldx, oldy, term.line[oldy][oldx]); xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
else else
xclear(oldx, oldy, oldx, oldy); xclear(oldx, oldy, oldx, oldy);
/* draw the new one */ /* draw the new one */
if(mode == CURSOR_DRAW) { if(mode == CURSOR_DRAW) {
xdrawc(term.c.x, term.c.y, g); xdraws(&g.c, g, term.c.x, term.c.y, 1);
oldx = term.c.x, oldy = term.c.y; oldx = term.c.x, oldy = term.c.y;
} }
} }
#ifdef DEBUG
/* basic drawing routines */
void
xdrawc(int x, int y, Glyph g) {
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
}
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]);
if(!term.hidec)
xcursor(CURSOR_DRAW);
}
#endif
void void
draw(int redraw_all) { draw(int redraw_all) {
int i, x, y, ox; int i, x, y, ox;
Glyph base, new; Glyph base, new;
char buf[DRAW_BUF_SIZ]; char buf[DRAW_BUF_SIZ];
/* XXX: optimize with GLYPH_DIRTY hint */
for(y = 0; y < term.row; y++) { for(y = 0; y < term.row; y++) {
base = term.line[y][0]; base = term.line[y][0];
i = ox = 0; i = ox = 0;
@ -1129,8 +1205,7 @@ draw(int redraw_all) {
} }
xdraws(buf, base, ox, y, i); xdraws(buf, base, ox, y, i);
} }
if(!term.c.hidden) xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
xcursor(CURSOR_DRAW);
} }
void void
@ -1179,7 +1254,7 @@ kpress(XEvent *ev) {
break; break;
case XK_Insert: case XK_Insert:
if(shift) if(shift)
/* XXX: paste X clipboard */; draw(1), puts("draw!")/* XXX: paste X clipboard */;
break; break;
default: default:
fprintf(stderr, "errkey: %d\n", (int)ksym); fprintf(stderr, "errkey: %d\n", (int)ksym);