CURSOR_SAVE, CURSOR_LOAD };
enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
-enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
+ MODE_CRLF=16 };
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
enum { SCREEN_UPDATE, SCREEN_REDRAW };
+enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
typedef struct {
char c; /* character code */
int bufh; /* pixmap height */
int ch; /* char height */
int cw; /* char width */
- int focus;
- int vis; /* is visible */
+ char state; /* focus, redraw, visible */
} XWindow;
typedef struct {
static void tinsertblankline(int);
static void tmoveto(int, int);
static void tnew(int, int);
-static void tnewline(void);
+static void tnewline(int);
static void tputtab(void);
static void tputc(char);
static void tputs(char*, int);
static void treset(void);
-static void tresize(int, int);
+static int tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int*, int);
static void xinit(void);
static void xloadcols(void);
static void xseturgency(int);
+static void xresize(int, int);
static void expose(XEvent *);
static void visibility(XEvent *);
}
void
-tnewline(void) {
+tnewline(int first_col) {
int y = term.c.y;
- if(term.c.y == term.bot)
+ if(y == term.bot)
tscrollup(term.top, 1);
else
y++;
- tmoveto(0, y);
+ tmoveto(first_col ? 0 : term.c.x, y);
}
void
void
tclearregion(int x1, int y1, int x2, int y2) {
- int y, temp;
+ int x, y, temp;
if(x1 > x2)
temp = x1, x1 = x2, x2 = temp;
LIMIT(y2, 0, term.row-1);
for(y = y1; y <= y2; y++)
- memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
+ for(x = x1; x <= x2; x++)
+ term.line[y][x].state = 0;
}
void
break;
case 12: /* att610 -- Stop blinking cursor (IGNORED) */
break;
+ case 20:
+ term.mode &= ~MODE_CRLF;
+ break;
case 25:
term.c.state |= CURSOR_HIDE;
break;
case 7:
term.mode |= MODE_WRAP;
break;
+ case 20:
+ term.mode |= MODE_CRLF;
+ break;
case 12: /* att610 -- Start blinking cursor (IGNORED) */
/* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
if(escseq.narg > 1 && escseq.arg[1] != 25)
term.esc = 0;
break;
case 'E': /* NEL -- Next line */
- tnewline();
+ tnewline(1); /* always go to first col */
term.esc = 0;
break;
case 'M': /* RI -- Reverse index */
case '\r':
tmoveto(0, term.c.y);
break;
+ case '\f':
+ case '\v':
case '\n':
- tnewline();
+ /* go to first col if the mode is set */
+ tnewline(IS_SET(MODE_CRLF));
break;
case '\a':
- if(!xw.focus)
+ if(!(xw.state & WIN_FOCUSED))
xseturgency(1);
break;
case '\033':
break;
default:
if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
- tnewline();
+ tnewline(1); /* always go to first col */
tsetchar(c);
if(term.c.x+1 < term.col)
tmoveto(term.c.x+1, term.c.y);
tputc(*s++);
}
-void
+int
tresize(int col, int row) {
- int i;
+ int i, x;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int slide = term.c.y - row + 1;
if(col < 1 || row < 1)
- return;
+ return 0;
/* free unneeded rows */
i = 0;
for(i = 0; i < minrow; i++) {
term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph));
- memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
- memset(term.alt[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
+ for(x = mincol; x < col; x++) {
+ term.line[i][x].state = 0;
+ term.alt[i][x].state = 0;
+ }
}
/* allocate any new rows */
tmoveto(term.c.x, term.c.y);
/* reset scrolling region */
tsetscroll(0, row-1);
+ return (slide > 0);
+}
+
+void
+xresize(int col, int row) {
+ Pixmap newbuf;
+ int oldw, oldh;
+
+ oldw = xw.bufw;
+ oldh = xw.bufh;
+ xw.bufw = MAX(1, col * xw.cw);
+ xw.bufh = MAX(1, row * xw.ch);
+ newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+ XFreePixmap(xw.dis, xw.buf);
+ XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+ if(xw.bufw > oldw)
+ XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+ xw.bufw-oldw, MIN(xw.bufh, oldh));
+ else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
+ XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+ xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
+ False);
+ if(xw.bufh > oldh)
+ XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+ xw.bufw, xw.bufh-oldh);
+ else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
+ XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+ xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
+ False);
+ xw.buf = newbuf;
}
void
xclear(oldx, oldy, oldx, oldy);
/* draw the new one */
- if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
+ if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
xdraws(&g.c, g, term.c.x, term.c.y, 1);
oldx = term.c.x, oldy = term.c.y;
}
Glyph base, new;
char buf[DRAW_BUF_SIZ];
- if(!xw.vis)
+ if(!(xw.state & WIN_VISIBLE))
return;
xclear(0, 0, term.col-1, term.row-1);
}
xdrawcursor();
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
- XFlush(xw.dis);
}
#endif
void
expose(XEvent *ev) {
- draw(SCREEN_REDRAW);
+ XExposeEvent *e = &ev->xexpose;
+ if(xw.state & WIN_REDRAW) {
+ if(!e->count) {
+ xw.state &= ~WIN_REDRAW;
+ draw(SCREEN_REDRAW);
+ }
+ } else
+ XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
+ e->width, e->height, e->x, e->y);
}
void
visibility(XEvent *ev) {
XVisibilityEvent *e = &ev->xvisibility;
- /* XXX if this goes from 0 to 1, need a full redraw for next Expose,
- * not just a buf copy */
- xw.vis = e->state != VisibilityFullyObscured;
+ if(e->state == VisibilityFullyObscured)
+ xw.state &= ~WIN_VISIBLE;
+ else if(!(xw.state & WIN_VISIBLE))
+ /* need a full redraw for next Expose, not just a buf copy */
+ xw.state |= WIN_VISIBLE | WIN_REDRAW;
}
void
unmap(XEvent *ev) {
- xw.vis = 0;
+ xw.state &= ~WIN_VISIBLE;
}
void
void
focus(XEvent *ev) {
- if((xw.focus = ev->type == FocusIn))
+ if(ev->type == FocusIn) {
+ xw.state |= WIN_FOCUSED;
xseturgency(0);
+ } else
+ xw.state &= ~WIN_FOCUSED;
draw(SCREEN_UPDATE);
}
meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
-
+
+ /* 1. custom keys from config.h */
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);
- } else
+ /* 2. hardcoded (overrides X lookup) */
+ else
switch(ksym) {
case XK_Up:
case XK_Down:
break;
case XK_Insert:
if(shift)
- selpaste(), draw(1);
+ selpaste();
+ break;
+ case XK_Return:
+ if(IS_SET(MODE_CRLF))
+ ttywrite("\r\n", 2);
+ else
+ ttywrite("\r", 1);
break;
+ /* 3. X lookup */
default:
- fprintf(stderr, "errkey: %d\n", (int)ksym);
+ if(len > 0) {
+ buf[sizeof(buf)-1] = '\0';
+ if(meta && len == 1)
+ ttywrite("\033", 1);
+ ttywrite(buf, len);
+ } else /* 4. nothing to send */
+ fprintf(stderr, "errkey: %d\n", (int)ksym);
break;
}
}
xw.w = e->xconfigure.width;
xw.h = e->xconfigure.height;
- xw.bufw = xw.w - 2*BORDER;
- xw.bufh = xw.h - 2*BORDER;
- col = xw.bufw / xw.cw;
- row = xw.bufh / xw.ch;
- tresize(col, row);
+ col = (xw.w - 2*BORDER) / xw.cw;
+ row = (xw.h - 2*BORDER) / xw.ch;
+ if(col == term.col && row == term.row)
+ return;
+ if(tresize(col, row))
+ draw(SCREEN_REDRAW);
ttyresize(col, row);
- xw.bufh = MAX(1, xw.bufh);
- xw.bufw = MAX(1, xw.bufw);
- XFreePixmap(xw.dis, xw.buf);
- xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ xresize(col, row);
}
void
Got questions, comments, patches, etc.? Contact Jason Woofenden