#define X2COL(x) (((x) - BORDER)/xw.cw)
#define Y2ROW(y) (((y) - BORDER)/xw.ch)
+#define VT102ID "\033[?6c"
+
enum glyph_attribute {
ATTR_NULL = 0,
ATTR_REVERSE = 1,
int mode;
int bx, by;
int ex, ey;
- struct {int x, y;} b, e;
+ struct {
+ int x, y;
+ } b, e;
char *clip;
Atom xtarget;
bool alt;
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
-static void xclearborders(void);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
return BETWEEN(x, bx, ex);
}
- 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));
+ 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
/* double click to select word */
sel.bx = sel.ex;
while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
- term.line[sel.ey][sel.bx-1].c[0] != ' ') {
+ term.line[sel.ey][sel.bx-1].c[0] != ' ') {
sel.bx--;
}
sel.b.x = sel.bx;
while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
- term.line[sel.ey][sel.ex+1].c[0] != ' ') {
+ term.line[sel.ey][sel.ex+1].c[0] != ' ') {
sel.ex++;
}
sel.e.x = sel.ex;
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
for(i = TAB; i < term.col; i += TAB)
term.tabs[i] = 1;
- term.top = 0, term.bot = term.row - 1;
+ term.top = 0;
+ term.bot = term.row - 1;
term.mode = MODE_WRAP;
tclearregion(0, 0, term.col-1, term.row-1);
void
tnew(int col, int row) {
/* set screen size */
- term.row = row, term.col = col;
+ term.row = row;
+ term.col = col;
term.line = xmalloc(term.row * sizeof(Line));
term.alt = xmalloc(term.row * sizeof(Line));
term.dirty = xmalloc(term.row * sizeof(*term.dirty));
if(IS_SET(MODE_ALTSCREEN))
tclearregion(0, 0, term.col-1, term.row-1);
if((set && !IS_SET(MODE_ALTSCREEN)) ||
- (!set && IS_SET(MODE_ALTSCREEN))) {
- tswapscreen();
+ (!set && IS_SET(MODE_ALTSCREEN))) {
+ tswapscreen();
}
if(*args != 1049)
break;
DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
break;
+ case 'c': /* DA -- Device Attributes */
+ if(csiescseq.arg[0] == 0)
+ ttywrite(VT102ID, sizeof(VT102ID) - 1);
+ break;
case 'C': /* CUF -- Cursor <n> Forward */
case 'a':
DEFAULT(csiescseq.arg[0], 1);
void
tputc(char *c, int len) {
uchar ascii = *c;
+ bool control = ascii < '\x20' || ascii == 0177;
if(iofd != -1)
write(iofd, c, len);
-
- switch(ascii) {
- case '\t':
- tputtab(1);
- return;
- case '\b':
- tmoveto(term.c.x-1, term.c.y);
- return;
- case '\r':
- tmoveto(0, term.c.y);
- return;
- case '\f':
- case '\v':
- case '\n':
- /* go to first col if the mode is set */
- tnewline(IS_SET(MODE_CRLF));
- return;
- case '\a':
- if(term.esc & ESC_STR)
+ /*
+ * STR sequences must be checked before of anything
+ * because it can use some control codes as part of the sequence
+ */
+ if(term.esc & ESC_STR) {
+ switch(ascii) {
+ case '\033':
+ term.esc = ESC_START | ESC_STR_END;
break;
-
- if(!(xw.state & WIN_FOCUSED))
- xseturgency(1);
- return;
- case '\033':
- csireset();
- term.esc = ESC_START;
+ case '\a': /* backwards compatibility to xterm */
+ term.esc = 0;
+ strhandle();
+ break;
+ default:
+ strescseq.buf[strescseq.len++] = ascii;
+ if(strescseq.len+1 >= STR_BUF_SIZ) {
+ term.esc = 0;
+ strhandle();
+ }
+ }
return;
}
-
- if(term.esc & ESC_START) {
+ /*
+ * Actions of control codes must be performed as soon they arrive
+ * because they can be embedded inside a control sequence, and
+ * they must not cause conflicts with sequences.
+ */
+ if(control) {
+ switch(ascii) {
+ case '\t': /* HT */
+ tputtab(1);
+ return;
+ case '\b': /* BS */
+ tmoveto(term.c.x-1, term.c.y);
+ return;
+ case '\r': /* CR */
+ tmoveto(0, term.c.y);
+ return;
+ case '\f': /* LF */
+ case '\v': /* VT */
+ case '\n': /* LF */
+ /* go to first col if the mode is set */
+ tnewline(IS_SET(MODE_CRLF));
+ return;
+ case '\a': /* BEL */
+ if(!(xw.state & WIN_FOCUSED))
+ xseturgency(1);
+ return;
+ case '\033': /* ESC */
+ csireset();
+ term.esc = ESC_START;
+ return;
+ case '\016': /* SO */
+ term.c.attr.mode |= ATTR_GFX;
+ return;
+ case '\017': /* SI */
+ term.c.attr.mode &= ~ATTR_GFX;
+ return;
+ case '\032': /* SUB */
+ case '\030': /* CAN */
+ csireset();
+ return;
+ case '\005': /* ENQ (IGNORED) */
+ case '\000': /* NUL (IGNORED) */
+ case '\021': /* XON (IGNORED) */
+ case '\023': /* XOFF (IGNORED) */
+ case 0177: /* DEL (IGNORED) */
+ return;
+ }
+ } else if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
csiescseq.buf[csiescseq.len++] = ascii;
if(BETWEEN(ascii, 0x40, 0x7E)
term.esc = 0;
csiparse(), csihandle();
}
- } else if(term.esc & ESC_STR) {
- switch(ascii) {
- case '\033':
- term.esc = ESC_START | ESC_STR_END;
- break;
- case '\a': /* backwards compatibility to xterm */
- term.esc = 0;
- strhandle();
- break;
- default:
- strescseq.buf[strescseq.len++] = ascii;
- if(strescseq.len+1 >= STR_BUF_SIZ) {
- term.esc = 0;
- strhandle();
- }
- }
} else if(term.esc & ESC_STR_END) {
term.esc = 0;
if(ascii == '\\')
}
term.esc = 0;
break;
+ case 'Z': /* DECID -- Identify Terminal */
+ ttywrite(VT102ID, sizeof(VT102ID) - 1);
+ term.esc = 0;
+ break;
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
- xclearborders();
xresettitle();
break;
case '=': /* DECPAM -- Application keypad */
term.esc = 0;
}
}
- } else {
- if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
- sel.bx = -1;
- if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
- if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
- tnewline(1); /* always go to first col */
- tsetchar(c);
- if(term.c.x+1 < term.col) {
- tmoveto(term.c.x+1, term.c.y);
- } else {
- term.c.state |= CURSOR_WRAPNEXT;
- }
- }
+ /*
+ * All characters which forms part of a sequence are not
+ * printed
+ */
+ return;
}
+ /*
+ * Display control codes only if we are in graphic mode
+ */
+ if(control && !(term.c.attr.mode & ATTR_GFX))
+ return;
+ if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+ sel.bx = -1;
+ if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+ tnewline(1); /* always go to first col */
+ tsetchar(c);
+ if(term.c.x+1 < term.col)
+ tmoveto(term.c.x+1, term.c.y);
+ else
+ term.c.state |= CURSOR_WRAPNEXT;
}
int
x1, y1, x2-x1, y2-y1);
}
-void
-xclearborders(void) {
- /* top and left border */
- xclear(0, 0, BORDER, xw.h);
- xclear(0, 0, xw.w, BORDER);
-
- /* lower and right border */
- xclear(BORDER, xw.th - 1, xw.w, xw.h);
- /* Will just draw what hasn't been drawn by the previous call. */
- xclear(xw.tw - 1, BORDER, xw.w, xw.h - xw.th - 2);
-}
-
void
xhints(void) {
XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
void
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
- int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch,
- width = charlen*xw.cw;
+ int winx = BORDER + x * xw.cw, winy = BORDER + y * xw.ch,
+ width = charlen * xw.cw;
Font *font = &dc.font;
XGlyphInfo extents;
XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
* Those ranges will not be brightened:
* 8 - 15 – bright system colors
* 196 - 231 – highest 256 color cube
- * 252 - 255 – brightest colors in grescale
+ * 252 - 255 – brightest colors in greyscale
*/
font = &dc.bfont;
}
&extents);
width = extents.xOff;
+ /* Intelligent cleaning up of the borders. */
+ if(x == 0) {
+ xclear(0, (y == 0)? 0 : winy, BORDER,
+ winy + xw.ch + (y == term.row-1)? xw.h : 0);
+ }
+ if(x + charlen >= term.col-1) {
+ xclear(winx + width, (y == 0)? 0 : winy, xw.w,
+ (y == term.row-1)? xw.h : (winy + xw.ch));
+ }
+ if(y == 0)
+ xclear(winx, 0, winx + width, BORDER);
+ if(y == term.row-1)
+ xclear(winx, winy + xw.ch, winx + width, xw.h);
+
XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
winy + font->ascent, (FcChar8 *)s, bytelen);
redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
- xclearborders();
tfulldirt();
draw();
XSync(xw.dpy, False); /* necessary for a good tput flash */
tresize(col, row);
xresize(col, row);
- xclearborders();
ttyresize();
}