#define USAGE \
"st-" VERSION ", (c) 2010 st engineers\n" \
- "usage: st [-t title] [-e cmd] [-v]\n"
+ "usage: st [-t title] [-c class] [-e cmd] [-v]\n"
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
#define ESC_BUF_SIZ 256
#define ESC_ARG_SIZ 16
#define DRAW_BUF_SIZ 1024
+#define UTF_SIZ 4
#define SERRNO strerror(errno)
#define MIN(a, b) ((a) < (b) ? (a) : (b))
enum { SCREEN_UPDATE, SCREEN_REDRAW };
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
+#undef B0
+enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
+
typedef struct {
- char c; /* character code */
+ char c[UTF_SIZ]; /* character code */
char mode; /* attribute flags */
int fg; /* foreground */
int bg; /* background */
char s[ESC_BUF_SIZ];
} Key;
+typedef struct {
+ XFontSet fs;
+ short lbearing;
+ short rbearing;
+ int ascent;
+ int descent;
+} FontInfo;
+
/* Drawing Context */
typedef struct {
unsigned long col[256];
- XFontStruct* font;
- XFontStruct* bfont;
+ FontInfo font;
+ FontInfo bfont;
GC gc;
} DC;
static void tnew(int, int);
static void tnewline(int);
static void tputtab(void);
-static void tputc(char);
-static void tputs(char*, int);
+static void tputc(char*);
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 tsetchar(char);
+static void tsetchar(char*);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void ttyresize(int, int);
static void ttywrite(const char *, size_t);
-static void xdraws(char *, Glyph, 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 xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
static void xseturgency(int);
+static void xsetsel(char*);
static void xresize(int, int);
static void expose(XEvent *);
static void brelease(XEvent *);
static void bpress(XEvent *);
static void bmotion(XEvent *);
-static void selection_notify(XEvent *);
-static void selection_request(XEvent *);
+static void selnotify(XEvent *);
+static void selrequest(XEvent *);
+
+static void selinit(void);
+static inline int selected(int, int);
+static void selcopy(void);
+static void selpaste(void);
+
+static int stou(char *, long *);
+static int utos(long *, char *);
+static int slen(char *);
+static int canstou(char *, int);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
- [SelectionNotify] = selection_notify,
- [SelectionRequest] = selection_request,
+ [SelectionNotify] = selnotify,
+ [SelectionRequest] = selrequest,
};
/* Globals */
static Selection sel;
static char *opt_cmd = NULL;
static char *opt_title = NULL;
+static char *opt_class = NULL;
+
+/* UTF-8 decode */
+static int stou(char *s, long *u) {
+ unsigned char c;
+ int i, n, rtn;
+
+ rtn = 1;
+ c = *s;
+ if(~c&B7) { /* 0xxxxxxx */
+ *u = c;
+ return rtn;
+ } else if ((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+ *u = c&(B4|B3|B2|B1|B0);
+ n = 1;
+ } else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
+ *u = c&(B3|B2|B1|B0);
+ n = 2;
+ } else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+ *u = c&(B2|B1|B0);
+ n = 3;
+ } else
+ goto invalid;
+ for (i=n,++s; i>0; --i,++rtn,++s) {
+ c = *s;
+ if ((c&(B7|B6)) != B7) /* 10xxxxxx */
+ goto invalid;
+ *u <<= 6;
+ *u |= c&(B5|B4|B3|B2|B1|B0);
+ }
+ if ((n == 1 && *u < 0x80) ||
+ (n == 2 && *u < 0x800) ||
+ (n == 3 && *u < 0x10000) ||
+ (*u >= 0xD800 && *u <= 0xDFFF))
+ goto invalid;
+ return rtn;
+invalid:
+ *u = 0xFFFD;
+ return rtn;
+}
+
+/* UTF-8 encode */
+static int utos(long *u, char *s) {
+ unsigned char *sp;
+ unsigned long uc;
+ int i, n;
+
+ sp = (unsigned char*) s;
+ uc = *u;
+ if (uc < 0x80) {
+ *sp = uc; /* 0xxxxxxx */
+ return 1;
+ } else if (*u < 0x800) {
+ *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
+ n = 1;
+ } else if (uc < 0x10000) {
+ *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
+ n = 2;
+ } else if (uc <= 0x10FFFF) {
+ *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
+ n = 3;
+ } else {
+ goto invalid;
+ }
+ for (i=n,++sp; i>0; --i,++sp)
+ *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+ return n+1;
+invalid:
+ /* U+FFFD */
+ *s++ = '\xEF';
+ *s++ = '\xBF';
+ *s = '\xBD';
+ return 3;
+}
+
+/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
+ UTF-8 otherwise return 0 */
+static int canstou(char *s, int b) {
+ unsigned char c = *s;
+ int n;
+
+ if (b < 1)
+ return 0;
+ else if (~c&B7)
+ return 1;
+ else if ((c&(B7|B6|B5)) == (B7|B6))
+ n = 1;
+ else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+ n = 2;
+ else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4))
+ n = 3;
+ else
+ return 1;
+ for (--b,++s; n>0&&b>0; --n,--b,++s) {
+ c = *s;
+ if ((c&(B7|B6)) != B7)
+ break;
+ }
+ if (n > 0 && b == 0)
+ return 0;
+ else
+ return 1;
+}
-void
-selinit(void) {
+static int slen(char *s) {
+ unsigned char c = *s;
+
+ if (~c&B7)
+ return 1;
+ else if ((c&(B7|B6|B5)) == (B7|B6))
+ return 2;
+ else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+ return 3;
+ else
+ return 4;
+}
+
+static void selinit(void) {
sel.mode = 0;
sel.bx = -1;
sel.clip = NULL;
sel.ey = sel.by = e->xbutton.y/xw.ch;
}
-static char *getseltext() {
+static void selcopy() {
char *str, *ptr;
- int ls, x, y, sz;
+ int ls, x, y, sz, sl;
+
if(sel.bx == -1)
- return NULL;
- sz = (term.col+1) * (sel.e.y-sel.b.y+1);
- ptr = str = malloc(sz);
- for(y = 0; y < term.row; y++) {
- for(x = 0; x < term.col; x++)
- if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
- *ptr = term.line[y][x].c, ptr++;
- if(ls)
- *ptr = '\n', ptr++;
+ str = NULL;
+ else {
+ sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+ ptr = str = malloc(sz);
+ for(y = 0; y < term.row; y++) {
+ for(x = 0; x < term.col; x++)
+ if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
+ sl = slen(term.line[y][x].c);
+ memcpy(ptr, term.line[y][x].c, sl);
+ ptr += sl;
+ }
+ if(ls)
+ *ptr = '\n', ptr++;
+ }
+ *ptr = 0;
}
- *ptr = 0;
- return str;
+ xsetsel(str);
}
-static void selection_notify(XEvent *e) {
+static void selnotify(XEvent *e) {
unsigned long nitems;
- unsigned long length;
- int format, res;
+ unsigned long ofs, rem;
+ int format;
unsigned char *data;
Atom type;
- res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, 0, False,
- AnyPropertyType, &type, &format, &nitems, &length, &data);
- switch(res) {
- case BadAtom:
- case BadValue:
- case BadWindow:
- fprintf(stderr, "Invalid paste, XGetWindowProperty0");
+ ofs = 0;
+ do {
+ if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+ False, AnyPropertyType, &type, &format,
+ &nitems, &rem, &data)) {
+ fprintf(stderr, "Clipboard allocation failed\n");
return;
- }
-
- res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, length, False,
- AnyPropertyType, &type, &format, &nitems, &length, &data);
- switch(res) {
- case BadAtom:
- case BadValue:
- case BadWindow:
- fprintf(stderr, "Invalid paste, XGetWindowProperty0");
- return;
- }
-
- if(data) {
+ }
ttywrite((const char *) data, nitems * format / 8);
XFree(data);
- }
+ /* number of 32-bit chunks returned */
+ ofs += nitems * format / 32;
+ } while(rem > 0);
}
static void selpaste() {
XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
}
-static void selection_request(XEvent *e)
+static void selrequest(XEvent *e)
{
XSelectionRequestEvent *xsre;
XSelectionEvent xev;
- int res;
Atom xa_targets;
xsre = (XSelectionRequestEvent *) e;
if(xsre->target == xa_targets) {
/* respond with the supported type */
Atom string = XA_STRING;
- res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32,
- PropModeReplace, (unsigned char *) &string, 1);
- switch(res) {
- case BadAlloc:
- case BadAtom:
- case BadMatch:
- case BadValue:
- case BadWindow:
- fprintf(stderr, "Error in selection_request, TARGETS");
- break;
- default:
- xev.property = xsre->property;
- }
+ XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ XA_ATOM, 32, PropModeReplace,
+ (unsigned char *) &string, 1);
+ xev.property = xsre->property;
} else if(xsre->target == XA_STRING) {
- res = XChangeProperty(xsre->display, xsre->requestor, xsre->property,
- xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip,
- strlen(sel.clip));
- switch(res) {
- case BadAlloc:
- case BadAtom:
- case BadMatch:
- case BadValue:
- case BadWindow:
- fprintf(stderr, "Error in selection_request, XA_STRING");
- break;
- default:
- xev.property = xsre->property;
- }
+ XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ xsre->target, 8, PropModeReplace,
+ (unsigned char *) sel.clip, strlen(sel.clip));
+ xev.property = xsre->property;
}
/* all done, send a notification to the listener */
- res = XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev);
- switch(res) {
- case 0:
- case BadValue:
- case BadWindow:
- fprintf(stderr, "Error in selection_requested, XSendEvent");
- }
+ if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+ fprintf(stderr, "Error sending SelectionNotify event\n");
}
-static void selcopy(char *str) {
+static void xsetsel(char *str) {
/* register the selection for both the clipboard and the primary */
Atom clipboard;
- int res;
free(sel.clip);
sel.clip = str;
- res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
- switch(res) {
- case BadAtom:
- case BadWindow:
- fprintf(stderr, "Invalid copy, XSetSelectionOwner");
- return;
- }
+ XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
- res = XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
- switch(res) {
- case BadAtom:
- case BadWindow:
- fprintf(stderr, "Invalid copy, XSetSelectionOwner");
- return;
- }
+ XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
XFlush(xw.dis);
}
selpaste();
} else {
if(b==1)
- selcopy(getseltext());
+ selcopy();
}
draw(1);
}
static void bmotion(XEvent *e) {
if (sel.mode) {
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
- draw(1);
+ /* XXX: draw() can't keep up, disabled for now.
+ selection is visible on button release.
+ draw(1); */
}
}
void
ttyread(void) {
- char buf[BUFSIZ];
- int ret;
+ char buf[BUFSIZ], *ptr;
+ char s[UTF_SIZ];
+ int ret, br;
+ static int buflen = 0;
+ long u;
- if((ret = read(cmdfd, buf, LEN(buf))) < 0)
+ if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
die("Couldn't read from shell: %s\n", SERRNO);
- else
- tputs(buf, ret);
+ else {
+ buflen += ret;
+ for(ptr=buf; buflen>=UTF_SIZ||canstou(ptr,buflen); buflen-=br) {
+ br = stou(ptr, &u);
+ utos(&u, s);
+ tputc(s);
+ ptr += br;
+ }
+ memcpy(buf, ptr, buflen);
+ }
}
void
}
void
-tsetchar(char c) {
+tsetchar(char *c) {
term.line[term.c.y][term.c.x] = term.c.attr;
- term.line[term.c.y][term.c.x].c = c;
+ memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
term.line[term.c.y][term.c.x].state |= GLYPH_SET;
}
case 'J': /* ED -- Clear screen */
switch(escseq.arg[0]) {
case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+ if(term.c.y < term.row-1)
+ tclearregion(0, term.c.y+1, term.col-1, term.row-1);
break;
case 1: /* above */
- tclearregion(0, 0, term.c.x, term.c.y);
+ if(term.c.y > 1)
+ tclearregion(0, 0, term.col-1, term.c.y-1);
+ tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
}
void
-tputc(char c) {
+tputc(char *c) {
+ char ascii = *c;
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
- escseq.buf[escseq.len++] = c;
- if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+ escseq.buf[escseq.len++] = ascii;
+ if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
term.esc = 0;
csiparse(), csihandle();
}
/* TODO: handle other OSC */
} else if(term.esc & ESC_OSC) {
- if(c == ';') {
+ if(ascii == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
}
} else if(term.esc & ESC_TITLE) {
- if(c == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+ if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
term.esc = 0;
term.title[term.titlelen] = '\0';
XStoreName(xw.dis, xw.win, term.title);
} else {
- term.title[term.titlelen++] = c;
+ term.title[term.titlelen++] = ascii;
}
} else if(term.esc & ESC_ALTCHARSET) {
- switch(c) {
+ switch(ascii) {
case '0': /* Line drawing crap */
term.c.attr.mode |= ATTR_GFX;
break;
term.c.attr.mode &= ~ATTR_GFX;
break;
default:
- printf("esc unhandled charset: ESC ( %c\n", c);
+ printf("esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
} else {
- switch(c) {
+ switch(ascii) {
case '[':
term.esc |= ESC_CSI;
break;
term.esc = 0;
break;
default:
- fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
+ fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+ (unsigned char) ascii, isprint(ascii)?ascii:'.');
term.esc = 0;
}
}
} else {
- switch(c) {
+ switch(ascii) {
case '\t':
tputtab();
break;
}
}
-void
-tputs(char *s, int len) {
- for(; len > 0; len--)
- tputc(*s++);
-}
-
-void
+int
tresize(int col, int row) {
int i, x;
int minrow = MIN(row, term.row);
int slide = term.c.y - row + 1;
if(col < 1 || row < 1)
- return;
+ return 0;
/* free unneeded rows */
i = 0;
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);
- xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ 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
void
xhints(void)
{
- XClassHint class = {TNAME, TNAME};
+ XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints size = {
.flags = PSize | PResizeInc | PBaseSize,
XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
}
+void
+xsetfontinfo(FontInfo *fi)
+{
+ XFontStruct **xfonts;
+ int fnum;
+ int i;
+ char **fontnames;
+
+ fi->lbearing = 0;
+ fi->rbearing = 0;
+ fi->ascent = 0;
+ fi->descent = 0;
+ fnum = XFontsOfFontSet(fi->fs, &xfonts, &fontnames);
+ for(i=0; i<fnum; i++,xfonts++,fontnames++) {
+ puts(*fontnames);
+ if(fi->ascent < (*xfonts)->ascent)
+ fi->ascent = (*xfonts)->ascent;
+ if(fi->descent < (*xfonts)->descent)
+ fi->descent = (*xfonts)->descent;
+ if(fi->rbearing < (*xfonts)->max_bounds.rbearing)
+ fi->rbearing = (*xfonts)->max_bounds.rbearing;
+ if(fi->lbearing < (*xfonts)->min_bounds.lbearing)
+ fi->lbearing = (*xfonts)->min_bounds.lbearing;
+ }
+}
+
void
xinit(void) {
XSetWindowAttributes attrs;
+ char **mc;
+ char *ds;
+ int nmc;
if(!(xw.dis = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dis);
/* font */
- if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
- die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
+ if ((dc.font.fs = XCreateFontSet(xw.dis, FONT, &mc, &nmc, &ds)) == NULL ||
+ (dc.bfont.fs = XCreateFontSet(xw.dis, BOLDFONT, &mc, &nmc, &ds)) == NULL)
+ die("Can't load font %s\n", dc.font.fs ? BOLDFONT : FONT);
+ xsetfontinfo(&dc.font);
+ xsetfontinfo(&dc.bfont);
/* XXX: Assuming same size for bold font */
- xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
- xw.ch = dc.font->ascent + dc.font->descent;
+ xw.cw = dc.font.rbearing - dc.font.lbearing;
+ xw.ch = dc.font.ascent + dc.font.descent;
/* colors */
xw.cmap = XDefaultColormap(xw.dis, xw.scr);
}
void
-xdraws(char *s, Glyph base, int x, int y, int len) {
+xdraws(char *s, Glyph base, int x, int y, int cl, int sl) {
unsigned long xfg, xbg;
- int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw;
+ int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = cl*xw.cw;
int i;
if(base.mode & ATTR_REVERSE)
XSetBackground(xw.dis, dc.gc, xbg);
XSetForeground(xw.dis, dc.gc, xfg);
-
+
if(base.mode & ATTR_GFX)
- for(i = 0; i < len; i++) {
+ for(i = 0; i < cl; i++) {
char c = gfx[(unsigned int)s[i] % 256];
if(c)
s[i] = c;
s[i] -= 0x5f;
}
- XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
- XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
+ XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.fs : dc.font.fs,
+ dc.gc, winx, winy, s, sl);
if(base.mode & ATTR_UNDERLINE)
XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
xdrawcursor(void) {
static int oldx = 0;
static int oldy = 0;
- Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0};
+ int sl;
+ Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
LIMIT(oldx, 0, term.col-1);
LIMIT(oldy, 0, term.row-1);
if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
- g.c = term.line[term.c.y][term.c.x].c;
-
+ memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
+
/* remove the old cursor */
- if(term.line[oldy][oldx].state & GLYPH_SET)
- xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
- else
+ if(term.line[oldy][oldx].state & GLYPH_SET) {
+ sl = slen(term.line[oldy][oldx].c);
+ xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
+ } else
xclear(oldx, oldy, oldx, oldy);
/* draw the new one */
if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
- xdraws(&g.c, g, term.c.x, term.c.y, 1);
+ sl = slen(g.c);
+ xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
oldx = term.c.x, oldy = term.c.y;
}
}
/* basic drawing routines */
void
xdrawc(int x, int y, Glyph g) {
+ int sl = slen(g.c);
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.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+ XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
+ dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
}
void
/* optimized drawing routine */
void
draw(int redraw_all) {
- int i, x, y, ox;
+ int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
xclear(0, 0, term.col-1, term.row-1);
for(y = 0; y < term.row; y++) {
base = term.line[y][0];
- i = ox = 0;
+ ic = ib = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
- if(sel.bx!=-1 && new.c && selected(x, y))
+ if(sel.bx!=-1 && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE;
- if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
- i >= DRAW_BUF_SIZ)) {
- xdraws(buf, base, ox, y, i);
- i = 0;
+ if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+ ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+ xdraws(buf, base, ox, y, ic, ib);
+ ic = ib = 0;
}
if(new.state & GLYPH_SET) {
- if(i == 0) {
+ if(ib == 0) {
ox = x;
base = new;
}
- buf[i++] = new.c;
+ sl = slen(new.c);
+ memcpy(buf+ib, new.c, sl);
+ ib += sl;
+ ++ic;
}
}
- if(i > 0)
- xdraws(buf, base, ox, y, i);
+ if(ib > 0)
+ xdraws(buf, base, ox, y, ic, ib);
}
xdrawcursor();
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
row = (xw.h - 2*BORDER) / xw.ch;
if(col == term.col && row == term.row)
return;
- tresize(col, row);
+ if(tresize(col, row))
+ draw(SCREEN_REDRAW);
ttyresize(col, row);
xresize(col, row);
}
case 't':
if(++i < argc) opt_title = argv[i];
break;
+ case 'c':
+ if(++i < argc) opt_class = argv[i];
+ break;
case 'e':
if(++i < argc) opt_cmd = argv[i];
break;