mirror of git://git.suckless.org/st
utf8 support! print text in delicious unicode greatness! all hail to the glorious Damian Okrasa for the patch!
TERM set back to xterm. changed default fonts. Note: drawing is now (even) slower.
This commit is contained in:
parent
f8d22ad159
commit
db3a27c8e6
29
config.def.h
29
config.def.h
|
@ -1,7 +1,7 @@
|
||||||
#define TAB 8
|
#define TAB 8
|
||||||
#define TNAME "st-256color"
|
#define TNAME "xterm"
|
||||||
#define FONT "-misc-*-medium-r-semicondensed-*-13-*-*-*-*-*-iso8859-*"
|
#define FONT "-*-*-medium-r-*-*-*-120-75-75-*-60-*-*"
|
||||||
#define BOLDFONT "-misc-*-bold-r-semicondensed-*-13-*-*-*-*-*-iso8859-*"
|
#define BOLDFONT "-*-*-bold-r-*-*-*-120-75-75-*-60-*-*"
|
||||||
#define BORDER 2
|
#define BORDER 2
|
||||||
#define SHELL "/bin/sh"
|
#define SHELL "/bin/sh"
|
||||||
|
|
||||||
|
@ -55,31 +55,8 @@ static Key key[] = {
|
||||||
|
|
||||||
/* Line drawing characters (sometime specific to each font...) */
|
/* Line drawing characters (sometime specific to each font...) */
|
||||||
static char gfx[] = {
|
static char gfx[] = {
|
||||||
['`'] = 0x01,
|
|
||||||
['a'] = 0x02,
|
|
||||||
['f'] = 'o',
|
['f'] = 'o',
|
||||||
['g'] = '+',
|
['g'] = '+',
|
||||||
['i'] = '#',
|
['i'] = '#',
|
||||||
['j'] = 0x0B,
|
|
||||||
['k'] = 0x0C,
|
|
||||||
['l'] = 0x0D,
|
|
||||||
['m'] = 0x0E,
|
|
||||||
['n'] = 0x0F,
|
|
||||||
['o'] = 0x10,
|
|
||||||
['p'] = 0x11,
|
|
||||||
['q'] = 0x12,
|
|
||||||
['r'] = 0x13,
|
|
||||||
['s'] = 0x14,
|
|
||||||
['t'] = 0x15,
|
|
||||||
['u'] = 0x16,
|
|
||||||
['v'] = 0x17,
|
|
||||||
['w'] = 0x18,
|
|
||||||
['x'] = 0x19,
|
|
||||||
['y'] = 0x1A,
|
|
||||||
['z'] = 0x1B,
|
|
||||||
['{'] = 0x1C,
|
|
||||||
['|'] = 0x1D,
|
|
||||||
['}'] = 0x1E,
|
|
||||||
['~'] = 0x1F,
|
|
||||||
[255] = 0,
|
[255] = 0,
|
||||||
};
|
};
|
||||||
|
|
322
st.c
322
st.c
|
@ -38,6 +38,7 @@
|
||||||
#define ESC_BUF_SIZ 256
|
#define ESC_BUF_SIZ 256
|
||||||
#define ESC_ARG_SIZ 16
|
#define ESC_ARG_SIZ 16
|
||||||
#define DRAW_BUF_SIZ 1024
|
#define DRAW_BUF_SIZ 1024
|
||||||
|
#define UTF_SIZ 4
|
||||||
|
|
||||||
#define SERRNO strerror(errno)
|
#define SERRNO strerror(errno)
|
||||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||||
|
@ -61,8 +62,11 @@ enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
|
||||||
enum { SCREEN_UPDATE, SCREEN_REDRAW };
|
enum { SCREEN_UPDATE, SCREEN_REDRAW };
|
||||||
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
|
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 {
|
typedef struct {
|
||||||
char c; /* character code */
|
char c[UTF_SIZ]; /* character code */
|
||||||
char mode; /* attribute flags */
|
char mode; /* attribute flags */
|
||||||
int fg; /* foreground */
|
int fg; /* foreground */
|
||||||
int bg; /* background */
|
int bg; /* background */
|
||||||
|
@ -127,11 +131,19 @@ typedef struct {
|
||||||
char s[ESC_BUF_SIZ];
|
char s[ESC_BUF_SIZ];
|
||||||
} Key;
|
} Key;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
XFontSet fs;
|
||||||
|
short lbearing;
|
||||||
|
short rbearing;
|
||||||
|
int ascent;
|
||||||
|
int descent;
|
||||||
|
} FontInfo;
|
||||||
|
|
||||||
/* Drawing Context */
|
/* Drawing Context */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
unsigned long col[256];
|
unsigned long col[256];
|
||||||
XFontStruct* font;
|
FontInfo font;
|
||||||
XFontStruct* bfont;
|
FontInfo bfont;
|
||||||
GC gc;
|
GC gc;
|
||||||
} DC;
|
} DC;
|
||||||
|
|
||||||
|
@ -167,14 +179,13 @@ 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(void);
|
||||||
static void tputc(char);
|
static void tputc(char*);
|
||||||
static void tputs(char*, int);
|
|
||||||
static void treset(void);
|
static void treset(void);
|
||||||
static int tresize(int, int);
|
static int tresize(int, int);
|
||||||
static void tscrollup(int, int);
|
static void tscrollup(int, int);
|
||||||
static void tscrolldown(int, int);
|
static void tscrolldown(int, 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);
|
||||||
static void tswapscreen(void);
|
static void tswapscreen(void);
|
||||||
|
|
||||||
|
@ -183,7 +194,7 @@ static void ttyread(void);
|
||||||
static void ttyresize(int, int);
|
static void ttyresize(int, int);
|
||||||
static void ttywrite(const char *, size_t);
|
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 xhints(void);
|
||||||
static void xclear(int, int, int, int);
|
static void xclear(int, int, int, int);
|
||||||
static void xdrawcursor(void);
|
static void xdrawcursor(void);
|
||||||
|
@ -205,6 +216,11 @@ static void bmotion(XEvent *);
|
||||||
static void selection_notify(XEvent *);
|
static void selection_notify(XEvent *);
|
||||||
static void selection_request(XEvent *);
|
static void selection_request(XEvent *);
|
||||||
|
|
||||||
|
static int stou(char *, long *);
|
||||||
|
static int utos(long *, char *);
|
||||||
|
static int slen(char *);
|
||||||
|
static int canstou(char *, int);
|
||||||
|
|
||||||
static void (*handler[LASTEvent])(XEvent *) = {
|
static void (*handler[LASTEvent])(XEvent *) = {
|
||||||
[KeyPress] = kpress,
|
[KeyPress] = kpress,
|
||||||
[ConfigureNotify] = resize,
|
[ConfigureNotify] = resize,
|
||||||
|
@ -231,6 +247,133 @@ static Selection sel;
|
||||||
static char *opt_cmd = NULL;
|
static char *opt_cmd = NULL;
|
||||||
static char *opt_title = NULL;
|
static char *opt_title = 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;
|
||||||
|
int n;
|
||||||
|
|
||||||
|
c = *s;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
slen(char *s)
|
||||||
|
{
|
||||||
|
unsigned char c;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
selinit(void) {
|
selinit(void) {
|
||||||
sel.mode = 0;
|
sel.mode = 0;
|
||||||
|
@ -268,15 +411,18 @@ static void bpress(XEvent *e) {
|
||||||
|
|
||||||
static char *getseltext() {
|
static char *getseltext() {
|
||||||
char *str, *ptr;
|
char *str, *ptr;
|
||||||
int ls, x, y, sz;
|
int ls, x, y, sz, sl;
|
||||||
if(sel.bx == -1)
|
if(sel.bx == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
sz = (term.col+1) * (sel.e.y-sel.b.y+1);
|
sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
|
||||||
ptr = str = malloc(sz);
|
ptr = str = malloc(sz);
|
||||||
for(y = 0; y < term.row; y++) {
|
for(y = 0; y < term.row; y++) {
|
||||||
for(x = 0; x < term.col; x++)
|
for(x = 0; x < term.col; x++)
|
||||||
if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
|
if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
|
||||||
*ptr = term.line[y][x].c, ptr++;
|
sl = slen(term.line[y][x].c);
|
||||||
|
memcpy(ptr, term.line[y][x].c, sl);
|
||||||
|
ptr += sl;
|
||||||
|
}
|
||||||
if(ls)
|
if(ls)
|
||||||
*ptr = '\n', ptr++;
|
*ptr = '\n', ptr++;
|
||||||
}
|
}
|
||||||
|
@ -476,13 +622,24 @@ dump(char c) {
|
||||||
|
|
||||||
void
|
void
|
||||||
ttyread(void) {
|
ttyread(void) {
|
||||||
char buf[BUFSIZ];
|
char buf[BUFSIZ], *ptr;
|
||||||
int ret;
|
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);
|
die("Couldn't read from shell: %s\n", SERRNO);
|
||||||
else
|
else {
|
||||||
tputs(buf, ret);
|
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
|
||||||
|
@ -622,9 +779,9 @@ tmoveto(int x, int y) {
|
||||||
}
|
}
|
||||||
|
|
||||||
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] = 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;
|
term.line[term.c.y][term.c.x].state |= GLYPH_SET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1025,30 +1182,31 @@ tputtab(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tputc(char c) {
|
tputc(char *c) {
|
||||||
|
char ascii = *c;
|
||||||
if(term.esc & ESC_START) {
|
if(term.esc & ESC_START) {
|
||||||
if(term.esc & ESC_CSI) {
|
if(term.esc & ESC_CSI) {
|
||||||
escseq.buf[escseq.len++] = c;
|
escseq.buf[escseq.len++] = ascii;
|
||||||
if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
|
if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
|
||||||
term.esc = 0;
|
term.esc = 0;
|
||||||
csiparse(), csihandle();
|
csiparse(), csihandle();
|
||||||
}
|
}
|
||||||
/* TODO: handle other OSC */
|
/* TODO: handle other OSC */
|
||||||
} else if(term.esc & ESC_OSC) {
|
} else if(term.esc & ESC_OSC) {
|
||||||
if(c == ';') {
|
if(ascii == ';') {
|
||||||
term.titlelen = 0;
|
term.titlelen = 0;
|
||||||
term.esc = ESC_START | ESC_TITLE;
|
term.esc = ESC_START | ESC_TITLE;
|
||||||
}
|
}
|
||||||
} else if(term.esc & 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.esc = 0;
|
||||||
term.title[term.titlelen] = '\0';
|
term.title[term.titlelen] = '\0';
|
||||||
XStoreName(xw.dis, xw.win, term.title);
|
XStoreName(xw.dis, xw.win, term.title);
|
||||||
} else {
|
} else {
|
||||||
term.title[term.titlelen++] = c;
|
term.title[term.titlelen++] = ascii;
|
||||||
}
|
}
|
||||||
} else if(term.esc & ESC_ALTCHARSET) {
|
} else if(term.esc & ESC_ALTCHARSET) {
|
||||||
switch(c) {
|
switch(ascii) {
|
||||||
case '0': /* Line drawing crap */
|
case '0': /* Line drawing crap */
|
||||||
term.c.attr.mode |= ATTR_GFX;
|
term.c.attr.mode |= ATTR_GFX;
|
||||||
break;
|
break;
|
||||||
|
@ -1056,11 +1214,11 @@ tputc(char c) {
|
||||||
term.c.attr.mode &= ~ATTR_GFX;
|
term.c.attr.mode &= ~ATTR_GFX;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
printf("esc unhandled charset: ESC ( %c\n", c);
|
printf("esc unhandled charset: ESC ( %c\n", ascii);
|
||||||
}
|
}
|
||||||
term.esc = 0;
|
term.esc = 0;
|
||||||
} else {
|
} else {
|
||||||
switch(c) {
|
switch(ascii) {
|
||||||
case '[':
|
case '[':
|
||||||
term.esc |= ESC_CSI;
|
term.esc |= ESC_CSI;
|
||||||
break;
|
break;
|
||||||
|
@ -1109,12 +1267,13 @@ tputc(char c) {
|
||||||
term.esc = 0;
|
term.esc = 0;
|
||||||
break;
|
break;
|
||||||
default:
|
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;
|
term.esc = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch(c) {
|
switch(ascii) {
|
||||||
case '\t':
|
case '\t':
|
||||||
tputtab();
|
tputtab();
|
||||||
break;
|
break;
|
||||||
|
@ -1151,12 +1310,6 @@ tputc(char c) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
tputs(char *s, int len) {
|
|
||||||
for(; len > 0; len--)
|
|
||||||
tputc(*s++);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
tresize(int col, int row) {
|
tresize(int col, int row) {
|
||||||
int i, x;
|
int i, x;
|
||||||
|
@ -1308,21 +1461,53 @@ xhints(void)
|
||||||
XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
|
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
|
void
|
||||||
xinit(void) {
|
xinit(void) {
|
||||||
XSetWindowAttributes attrs;
|
XSetWindowAttributes attrs;
|
||||||
|
char **mc;
|
||||||
|
char *ds;
|
||||||
|
int nmc;
|
||||||
|
|
||||||
if(!(xw.dis = XOpenDisplay(NULL)))
|
if(!(xw.dis = XOpenDisplay(NULL)))
|
||||||
die("Can't open display\n");
|
die("Can't open display\n");
|
||||||
xw.scr = XDefaultScreen(xw.dis);
|
xw.scr = XDefaultScreen(xw.dis);
|
||||||
|
|
||||||
/* font */
|
/* font */
|
||||||
if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
|
if ((dc.font.fs = XCreateFontSet(xw.dis, FONT, &mc, &nmc, &ds)) == NULL ||
|
||||||
die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
|
(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 */
|
/* XXX: Assuming same size for bold font */
|
||||||
xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
|
xw.cw = dc.font.rbearing - dc.font.lbearing;
|
||||||
xw.ch = dc.font->ascent + dc.font->descent;
|
xw.ch = dc.font.ascent + dc.font.descent;
|
||||||
|
|
||||||
/* colors */
|
/* colors */
|
||||||
xw.cmap = XDefaultColormap(xw.dis, xw.scr);
|
xw.cmap = XDefaultColormap(xw.dis, xw.scr);
|
||||||
|
@ -1366,9 +1551,9 @@ xinit(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
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;
|
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;
|
int i;
|
||||||
|
|
||||||
if(base.mode & ATTR_REVERSE)
|
if(base.mode & ATTR_REVERSE)
|
||||||
|
@ -1378,9 +1563,9 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
|
||||||
|
|
||||||
XSetBackground(xw.dis, dc.gc, xbg);
|
XSetBackground(xw.dis, dc.gc, xbg);
|
||||||
XSetForeground(xw.dis, dc.gc, xfg);
|
XSetForeground(xw.dis, dc.gc, xfg);
|
||||||
|
|
||||||
if(base.mode & ATTR_GFX)
|
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];
|
char c = gfx[(unsigned int)s[i] % 256];
|
||||||
if(c)
|
if(c)
|
||||||
s[i] = c;
|
s[i] = c;
|
||||||
|
@ -1388,8 +1573,8 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
|
||||||
s[i] -= 0x5f;
|
s[i] -= 0x5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
|
XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.fs : dc.font.fs,
|
||||||
XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
|
dc.gc, winx, winy, s, sl);
|
||||||
|
|
||||||
if(base.mode & ATTR_UNDERLINE)
|
if(base.mode & ATTR_UNDERLINE)
|
||||||
XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
|
XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
|
||||||
|
@ -1399,23 +1584,26 @@ void
|
||||||
xdrawcursor(void) {
|
xdrawcursor(void) {
|
||||||
static int oldx = 0;
|
static int oldx = 0;
|
||||||
static int oldy = 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(oldx, 0, term.col-1);
|
||||||
LIMIT(oldy, 0, term.row-1);
|
LIMIT(oldy, 0, term.row-1);
|
||||||
|
|
||||||
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;
|
memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
|
||||||
|
|
||||||
/* remove the old cursor */
|
/* remove the old cursor */
|
||||||
if(term.line[oldy][oldx].state & GLYPH_SET)
|
if(term.line[oldy][oldx].state & GLYPH_SET) {
|
||||||
xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
|
sl = slen(term.line[oldy][oldx].c);
|
||||||
else
|
xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
|
||||||
|
} else
|
||||||
xclear(oldx, oldy, oldx, oldy);
|
xclear(oldx, oldy, oldx, oldy);
|
||||||
|
|
||||||
/* draw the new one */
|
/* draw the new one */
|
||||||
if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
|
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;
|
oldx = term.c.x, oldy = term.c.y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1424,11 +1612,12 @@ xdrawcursor(void) {
|
||||||
/* basic drawing routines */
|
/* basic drawing routines */
|
||||||
void
|
void
|
||||||
xdrawc(int x, int y, Glyph g) {
|
xdrawc(int x, int y, Glyph g) {
|
||||||
|
int sl = slen(g.c);
|
||||||
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
|
XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
|
||||||
XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
|
XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
|
||||||
XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
|
XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
|
||||||
XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
|
XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
|
||||||
XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
|
dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1450,7 +1639,7 @@ draw(int dummy) {
|
||||||
/* optimized drawing routine */
|
/* optimized drawing routine */
|
||||||
void
|
void
|
||||||
draw(int redraw_all) {
|
draw(int redraw_all) {
|
||||||
int i, x, y, ox;
|
int ic, ib, x, y, ox, sl;
|
||||||
Glyph base, new;
|
Glyph base, new;
|
||||||
char buf[DRAW_BUF_SIZ];
|
char buf[DRAW_BUF_SIZ];
|
||||||
|
|
||||||
|
@ -1460,26 +1649,29 @@ draw(int redraw_all) {
|
||||||
xclear(0, 0, term.col-1, term.row-1);
|
xclear(0, 0, term.col-1, term.row-1);
|
||||||
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;
|
ic = ib = ox = 0;
|
||||||
for(x = 0; x < term.col; x++) {
|
for(x = 0; x < term.col; x++) {
|
||||||
new = term.line[y][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;
|
new.mode ^= ATTR_REVERSE;
|
||||||
if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
|
if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
|
||||||
i >= DRAW_BUF_SIZ)) {
|
ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
|
||||||
xdraws(buf, base, ox, y, i);
|
xdraws(buf, base, ox, y, ic, ib);
|
||||||
i = 0;
|
ic = ib = 0;
|
||||||
}
|
}
|
||||||
if(new.state & GLYPH_SET) {
|
if(new.state & GLYPH_SET) {
|
||||||
if(i == 0) {
|
if(ib == 0) {
|
||||||
ox = x;
|
ox = x;
|
||||||
base = new;
|
base = new;
|
||||||
}
|
}
|
||||||
buf[i++] = new.c;
|
sl = slen(new.c);
|
||||||
|
memcpy(buf+ib, new.c, sl);
|
||||||
|
ib += sl;
|
||||||
|
++ic;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(i > 0)
|
if(ib > 0)
|
||||||
xdraws(buf, base, ox, y, i);
|
xdraws(buf, base, ox, y, ic, ib);
|
||||||
}
|
}
|
||||||
xdrawcursor();
|
xdrawcursor();
|
||||||
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
|
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
|
||||||
|
|
Loading…
Reference in New Issue