Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Fix portability problem in techo()
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
9a41c5b
..
d8ff30b
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-76,8
+76,7
@@
char *argv0;
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) ((term.mode & (flag)) != 0)
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) ((term.mode & (flag)) != 0)
-#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
-#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
@@
-91,14
+90,17
@@
char *argv0;
enum glyph_attribute {
ATTR_NULL = 0,
enum glyph_attribute {
ATTR_NULL = 0,
- ATTR_
REVERSE
= 1,
- ATTR_
UNDERLINE
= 2,
- ATTR_
BOLD
= 4,
- ATTR_
ITALIC
= 8,
+ ATTR_
BOLD
= 1,
+ ATTR_
FAINT
= 2,
+ ATTR_
ITALIC
= 4,
+ ATTR_
UNDERLINE
= 8,
ATTR_BLINK = 16,
ATTR_BLINK = 16,
- ATTR_WRAP = 32,
- ATTR_WIDE = 64,
- ATTR_WDUMMY = 128,
+ ATTR_REVERSE = 32,
+ ATTR_INVISIBLE = 64,
+ ATTR_STRUCK = 128,
+ ATTR_WRAP = 256,
+ ATTR_WIDE = 512,
+ ATTR_WDUMMY = 1024,
};
enum cursor_movement {
};
enum cursor_movement {
@@
-180,7
+182,6
@@
typedef unsigned short ushort;
typedef XftDraw *Draw;
typedef XftColor Color;
typedef XftDraw *Draw;
typedef XftColor Color;
-typedef Colormap Colormap;
typedef struct {
char c[UTF_SIZ]; /* character code */
typedef struct {
char c[UTF_SIZ]; /* character code */
@@
-295,8
+296,8
@@
typedef struct {
char *clip;
Atom xtarget;
bool alt;
char *clip;
Atom xtarget;
bool alt;
- struct time
val
tclick1;
- struct time
val
tclick2;
+ struct time
spec
tclick1;
+ struct time
spec
tclick2;
} Selection;
typedef union {
} Selection;
typedef union {
@@
-373,6
+374,7
@@
static void tdeletechar(int);
static void tdeleteline(int);
static void tinsertblank(int);
static void tinsertblankline(int);
static void tdeleteline(int);
static void tinsertblank(int);
static void tinsertblankline(int);
+static int tlinelen(int);
static void tmoveto(int, int);
static void tmoveato(int, int);
static void tnew(int, int);
static void tmoveto(int, int);
static void tmoveato(int, int);
static void tnew(int, int);
@@
-380,7
+382,7
@@
static void tnewline(int);
static void tputtab(int);
static void tputc(char *, int);
static void treset(void);
static void tputtab(int);
static void tputc(char *, int);
static void treset(void);
-static
int
tresize(int, int);
+static
void
tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int *, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int *, int);
@@
-402,6
+404,7
@@
static void ttyread(void);
static void ttyresize(void);
static void ttysend(char *, size_t);
static void ttywrite(const char *, size_t);
static void ttyresize(void);
static void ttysend(char *, size_t);
static void ttywrite(const char *, size_t);
+static void tstrsequence(uchar c);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
@@
-670,7
+673,7
@@
static void
selnormalize(void) {
int i;
selnormalize(void) {
int i;
- if(sel.ob.y == sel.oe.y) {
+ if(sel.ob.y == sel.oe.y
|| sel.type == SEL_RECTANGULAR
) {
sel.nb.x = MIN(sel.ob.x, sel.oe.x);
sel.ne.x = MAX(sel.ob.x, sel.oe.x);
} else {
sel.nb.x = MIN(sel.ob.x, sel.oe.x);
sel.ne.x = MAX(sel.ob.x, sel.oe.x);
} else {
@@
-703,6
+706,9
@@
selected(int x, int y) {
void
selsnap(int mode, int *x, int *y, int direction) {
void
selsnap(int mode, int *x, int *y, int direction) {
+ int newx, newy, xt, yt;
+ Glyph *gp;
+
switch(mode) {
case SNAP_WORD:
/*
switch(mode) {
case SNAP_WORD:
/*
@@
-710,36
+716,31
@@
selsnap(int mode, int *x, int *y, int direction) {
* beginning of a line.
*/
for(;;) {
* beginning of a line.
*/
for(;;) {
- if(direction < 0 && *x <= 0) {
- if(*y > 0 && term.line[*y - 1][term.col-1].mode
-
& ATTR_WRAP
) {
-
*y -= 1
;
-
*x = term.col-1
;
- } else {
+ newx = *x + direction;
+ newy = *y;
+
if(!BETWEEN(newx, 0, term.col - 1)
) {
+
newy += direction
;
+
newx = (newx + term.col) % term.col
;
+ if (!BETWEEN(newy, 0, term.row - 1))
break;
break;
- }
- }
- if(direction > 0 && *x >= term.col-1) {
- if(*y < term.row-1 && term.line[*y][*x].mode
- & ATTR_WRAP) {
- *y += 1;
- *x = 0;
- } else {
+
+ if(direction > 0)
+ yt = *y, xt = *x;
+ else
+ yt = newy, xt = newx;
+ if(!(term.line[yt][xt].mode & ATTR_WRAP))
break;
break;
- }
}
}
- if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
- *x += direction;
- continue;
- }
+ if (newx >= tlinelen(newy))
+ break;
- if(*x >= tlinelen(*y) || strchr(worddelimiters,
- term.line[*y][*x+direction].c[0])) {
+ gp = &term.line[newy][newx];
+ if (!(gp->mode & ATTR_WDUMMY) && strchr(worddelimiters, gp->c[0]))
break;
break;
- }
- *x += direction;
+ *x = newx;
+ *y = newy;
}
break;
case SNAP_LINE:
}
break;
case SNAP_LINE:
@@
-863,7
+864,7
@@
mousereport(XEvent *e) {
void
bpress(XEvent *e) {
void
bpress(XEvent *e) {
- struct time
val
now;
+ struct time
spec
now;
Mousekey *mk;
if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
Mousekey *mk;
if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
@@
-880,7
+881,7
@@
bpress(XEvent *e) {
}
if(e->xbutton.button == Button1) {
}
if(e->xbutton.button == Button1) {
-
gettimeofday(&now, NULL
);
+
clock_gettime(CLOCK_MONOTONIC, &now
);
/* Clear previous selection, logically and visually. */
selclear(NULL);
/* Clear previous selection, logically and visually. */
selclear(NULL);
@@
-920,7
+921,7
@@
bpress(XEvent *e) {
char *
getsel(void) {
char *str, *ptr;
char *
getsel(void) {
char *str, *ptr;
- int
x, y, bufsize, size, i, ex
;
+ int
y, bufsize, size, lastx, linelen
;
Glyph *gp, *last;
if(sel.ob.x == -1)
Glyph *gp, *last;
if(sel.ob.x == -1)
@@
-931,16
+932,19
@@
getsel(void) {
/* append every set & selected glyph to the selection */
for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
/* append every set & selected glyph to the selection */
for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
- gp = &term.line[y][0];
- last = &gp[term.col-1];
+ linelen = tlinelen(y);
- while(last >= gp && !(selected(last - gp, y) &&
- strcmp(last->c, " ") != 0)) {
- --last;
+ if(sel.type == SEL_RECTANGULAR) {
+ gp = &term.line[y][sel.nb.x];
+ lastx = sel.ne.x;
+ } else {
+ gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
+ lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
}
}
+ last = &term.line[y][MIN(lastx, linelen-1)];
- for(
x = 0; gp <= last; x++,
++gp) {
- if(
!selected(x, y) || (gp->mode & ATTR_WDUMMY)
)
+ for(
; gp <= last;
++gp) {
+ if(
gp->mode & ATTR_WDUMMY
)
continue;
size = utf8len(gp->c);
continue;
size = utf8len(gp->c);
@@
-957,23
+961,8
@@
getsel(void) {
* st.
* FIXME: Fix the computer world.
*/
* st.
* FIXME: Fix the computer world.
*/
- if(
y < sel.ne.y && !(x > 0 && (gp-1)->mode & ATTR_WRAP)
)
+ if(
sel.ne.y > y || lastx >= linelen
)
*ptr++ = '\n';
*ptr++ = '\n';
-
- /*
- * If the last selected line expands in the selection
- * after the visible text '\n' is appended.
- */
- if(y == sel.ne.y) {
- i = term.col;
- while(--i > 0 && term.line[y][i].c[0] == ' ')
- /* nothing */;
- ex = sel.ne.x;
- if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
- ex = sel.nb.x;
- if(i < ex)
- *ptr++ = '\n';
- }
}
*ptr = 0;
return str;
}
*ptr = 0;
return str;
@@
-1187,16
+1176,15
@@
execsh(void) {
void
sigchld(int a) {
void
sigchld(int a) {
- int stat
= 0
;
+ int stat
, ret
;
if(waitpid(pid, &stat, 0) < 0)
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
if(waitpid(pid, &stat, 0) < 0)
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
- if(WIFEXITED(stat)) {
- exit(WEXITSTATUS(stat));
- } else {
- exit(EXIT_FAILURE);
- }
+ ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
+ if (ret != EXIT_SUCCESS)
+ die("child finished with error '%d'\n", stat);
+ exit(EXIT_SUCCESS);
}
void
}
void
@@
-1565,6
+1553,7
@@
tsetchar(char *c, Glyph *attr, int x, int y) {
void
tclearregion(int x1, int y1, int x2, int y2) {
int x, y, temp;
void
tclearregion(int x1, int y1, int x2, int y2) {
int x, y, temp;
+ Glyph *gp;
if(x1 > x2)
temp = x1, x1 = x2, x2 = temp;
if(x1 > x2)
temp = x1, x1 = x2, x2 = temp;
@@
-1579,10
+1568,13
@@
tclearregion(int x1, int y1, int x2, int y2) {
for(y = y1; y <= y2; y++) {
term.dirty[y] = 1;
for(x = x1; x <= x2; x++) {
for(y = y1; y <= y2; y++) {
term.dirty[y] = 1;
for(x = x1; x <= x2; x++) {
+ gp = &term.line[y][x];
if(selected(x, y))
selclear(NULL);
if(selected(x, y))
selclear(NULL);
- term.line[y][x] = term.c.attr;
- memcpy(term.line[y][x].c, " ", 2);
+ gp->fg = term.c.attr.fg;
+ gp->bg = term.c.attr.bg;
+ gp->mode = 0;
+ memcpy(gp->c, " ", 2);
}
}
}
}
}
}
@@
-1688,15
+1680,24
@@
tsetattr(int *attr, int l) {
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
- term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE \
- | ATTR_BOLD | ATTR_ITALIC \
- | ATTR_BLINK);
+ term.c.attr.mode &= ~(
+ ATTR_BOLD |
+ ATTR_FAINT |
+ ATTR_ITALIC |
+ ATTR_UNDERLINE |
+ ATTR_BLINK |
+ ATTR_REVERSE |
+ ATTR_INVISIBLE |
+ ATTR_STRUCK );
term.c.attr.fg = defaultfg;
term.c.attr.bg = defaultbg;
break;
case 1:
term.c.attr.mode |= ATTR_BOLD;
break;
term.c.attr.fg = defaultfg;
term.c.attr.bg = defaultbg;
break;
case 1:
term.c.attr.mode |= ATTR_BOLD;
break;
+ case 2:
+ term.c.attr.mode |= ATTR_FAINT;
+ break;
case 3:
term.c.attr.mode |= ATTR_ITALIC;
break;
case 3:
term.c.attr.mode |= ATTR_ITALIC;
break;
@@
-1704,15
+1705,21
@@
tsetattr(int *attr, int l) {
term.c.attr.mode |= ATTR_UNDERLINE;
break;
case 5: /* slow blink */
term.c.attr.mode |= ATTR_UNDERLINE;
break;
case 5: /* slow blink */
+ /* FALLTHROUGH */
case 6: /* rapid blink */
term.c.attr.mode |= ATTR_BLINK;
break;
case 7:
term.c.attr.mode |= ATTR_REVERSE;
break;
case 6: /* rapid blink */
term.c.attr.mode |= ATTR_BLINK;
break;
case 7:
term.c.attr.mode |= ATTR_REVERSE;
break;
- case 21:
+ case 8:
+ term.c.attr.mode |= ATTR_INVISIBLE;
+ break;
+ case 9:
+ term.c.attr.mode |= ATTR_STRUCK;
+ break;
case 22:
case 22:
- term.c.attr.mode &= ~
ATTR_BOLD
;
+ term.c.attr.mode &= ~
(ATTR_BOLD | ATTR_FAINT)
;
break;
case 23:
term.c.attr.mode &= ~ATTR_ITALIC;
break;
case 23:
term.c.attr.mode &= ~ATTR_ITALIC;
@@
-1721,12
+1728,17
@@
tsetattr(int *attr, int l) {
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
case 25:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
case 25:
- case 26:
term.c.attr.mode &= ~ATTR_BLINK;
break;
case 27:
term.c.attr.mode &= ~ATTR_REVERSE;
break;
term.c.attr.mode &= ~ATTR_BLINK;
break;
case 27:
term.c.attr.mode &= ~ATTR_REVERSE;
break;
+ case 28:
+ term.c.attr.mode &= ~ATTR_INVISIBLE;
+ break;
+ case 29:
+ term.c.attr.mode &= ~ATTR_STRUCK;
+ break;
case 38:
if ((idx = tdefcolor(attr, &i, l)) >= 0)
term.c.attr.fg = idx;
case 38:
if ((idx = tdefcolor(attr, &i, l)) >= 0)
term.c.attr.fg = idx;
@@
-2262,12
+2274,10
@@
tdumpline(int n) {
Glyph *bp, *end;
bp = &term.line[n][0];
Glyph *bp, *end;
bp = &term.line[n][0];
- end = &bp[term.col-1];
- while(end > bp && !strcmp(" ", end->c))
- --end;
- if(bp != end || strcmp(bp->c, " ")) {
+ end = &bp[MIN(tlinelen(n), term.col) - 1];
+ if(bp != end || bp->c[0] != ' ') {
for( ;bp <= end; ++bp)
for( ;bp <= end; ++bp)
- tprinter(bp->c,
str
len(bp->c));
+ tprinter(bp->c,
utf8
len(bp->c));
}
tprinter("\n", 1);
}
}
tprinter("\n", 1);
}
@@
-2301,13
+2311,13
@@
techo(char *buf, int len) {
for(; len > 0; buf++, len--) {
char c = *buf;
for(; len > 0; buf++, len--) {
char c = *buf;
- if(ISCONTROL(c)) { /* control code */
+ if(ISCONTROL(
(uchar)
c)) { /* control code */
if(c & 0x80) {
c &= 0x7f;
tputc("^", 1);
tputc("[", 1);
} else if(c != '\n' && c != '\r' && c != '\t') {
if(c & 0x80) {
c &= 0x7f;
tputc("^", 1);
tputc("[", 1);
} else if(c != '\n' && c != '\r' && c != '\t') {
- c ^=
'\x40'
;
+ c ^=
0x40
;
tputc("^", 1);
}
tputc(&c, 1);
tputc("^", 1);
}
tputc(&c, 1);
@@
-2321,19
+2331,39
@@
techo(char *buf, int len) {
void
tdeftran(char ascii) {
void
tdeftran(char ascii) {
- char c, (*bp)[2];
- static char tbl[][2] = {
- {'0', CS_GRAPHIC0}, {'B', CS_USA},
- {0, 0}
- };
+ static char cs[] = "0B";
+ static int vcs[] = {CS_GRAPHIC0, CS_USA};
+ char *p;
- for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp)
- /* nothing */;
-
- if (c == 0)
+ if((p = strchr(cs, ascii)) == NULL) {
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
- else
- term.trantbl[term.icharset] = (*bp)[1];
+ } else {
+ term.trantbl[term.icharset] = vcs[p - cs];
+ }
+}
+
+void
+tstrsequence(uchar c) {
+ if (c & 0x80) {
+ switch (c) {
+ case 0x90: /* DCS -- Device Control String */
+ c = 'P';
+ break;
+ case 0x9f: /* APC -- Application Program Command */
+ c = '_';
+ break;
+ case 0x9e: /* PM -- Privacy Message */
+ c = '^';
+ break;
+ case 0x9d: /* OSC -- Operating System Command */
+ c = ']';
+ break;
+ }
+ }
+ strreset();
+ strescseq.type = c;
+ term.esc |= ESC_STR;
+ return;
}
void
}
void
@@
-2390,20
+2420,30
@@
tcontrolcode(uchar ascii) {
case 0177: /* DEL (IGNORED) */
return;
case 0x84: /* TODO: IND */
case 0177: /* DEL (IGNORED) */
return;
case 0x84: /* TODO: IND */
- case 0x85: /* TODO: NEL */
- case 0x88: /* TODO: HTS */
+ break;
+ case 0x85: /* NEL -- Next line */
+ tnewline(1); /* always go to first col */
+ break;
+ case 0x88: /* HTS -- Horizontal tab stop */
+ term.tabs[term.c.x] = 1;
+ break;
case 0x8d: /* TODO: RI */
case 0x8e: /* TODO: SS2 */
case 0x8f: /* TODO: SS3 */
case 0x8d: /* TODO: RI */
case 0x8e: /* TODO: SS2 */
case 0x8f: /* TODO: SS3 */
- case 0x90: /* TODO: DCS */
case 0x98: /* TODO: SOS */
case 0x98: /* TODO: SOS */
- case 0x9a: /* TODO: DECID */
+ break;
+ case 0x9a: /* DECID -- Identify Terminal */
+ ttywrite(VT102ID, sizeof(VT102ID) - 1);
+ break;
case 0x9b: /* TODO: CSI */
case 0x9c: /* TODO: ST */
case 0x9b: /* TODO: CSI */
case 0x9c: /* TODO: ST */
- case 0x9d: /* TODO: OSC */
- case 0x9e: /* TODO: PM */
- case 0x9f: /* TODO: APC */
break;
break;
+ case 0x90: /* DCS -- Device Control String */
+ case 0x9f: /* APC -- Application Program Command */
+ case 0x9e: /* PM -- Privacy Message */
+ case 0x9d: /* OSC -- Operating System Command */
+ tstrsequence(ascii);
+ return;
}
/* only CAN, SUB, \a and C1 chars interrupt a sequence */
term.esc &= ~(ESC_STR_END|ESC_STR);
}
/* only CAN, SUB, \a and C1 chars interrupt a sequence */
term.esc &= ~(ESC_STR_END|ESC_STR);
@@
-2519,9
+2559,7
@@
tputc(char *c, int len) {
case '^': /* PM -- Privacy Message */
case ']': /* OSC -- Operating System Command */
case 'k': /* old title set compatibility */
case '^': /* PM -- Privacy Message */
case ']': /* OSC -- Operating System Command */
case 'k': /* old title set compatibility */
- strreset();
- strescseq.type = ascii;
- term.esc |= ESC_STR;
+ tstrsequence(ascii);
return;
case '(': /* set primary charset G0 */
case ')': /* set secondary charset G1 */
return;
case '(': /* set primary charset G0 */
case ')': /* set secondary charset G1 */
@@
-2618,7
+2656,7
@@
tputc(char *c, int len) {
}
}
}
}
-int
+void
tresize(int col, int row) {
int i;
int minrow = MIN(row, term.row);
tresize(int col, int row) {
int i;
int minrow = MIN(row, term.row);
@@
-2628,8
+2666,11
@@
tresize(int col, int row) {
Line *orig;
TCursor c;
Line *orig;
TCursor c;
- if(col < 1 || row < 1)
- return 0;
+ if(col < 1 || row < 1) {
+ fprintf(stderr,
+ "tresize: error resizing to %dx%d\n", col, row);
+ return;
+ }
/* free unneeded rows */
i = 0;
/* free unneeded rows */
i = 0;
@@
-2659,14
+2700,12
@@
tresize(int col, int row) {
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
- term.dirty[i] = 1;
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
}
/* allocate any new rows */
for(/* i == minrow */; i < row; i++) {
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
}
/* allocate any new rows */
for(/* i == minrow */; i < row; i++) {
- term.dirty[i] = 1;
term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph));
}
term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph));
}
@@
-2686,7
+2725,7
@@
tresize(int col, int row) {
tsetscroll(0, row-1);
/* make use of the LIMIT in tmoveto */
tmoveto(term.c.x, term.c.y);
tsetscroll(0, row-1);
/* make use of the LIMIT in tmoveto */
tmoveto(term.c.x, term.c.y);
- /* Clearing both screens */
+ /* Clearing both screens
(it makes dirty all lines)
*/
orig = term.line;
c = term.c;
do {
orig = term.line;
c = term.c;
do {
@@
-2700,8
+2739,6
@@
tresize(int col, int row) {
tcursor(CURSOR_LOAD);
} while(orig != term.line);
term.c = c;
tcursor(CURSOR_LOAD);
} while(orig != term.line);
term.c = c;
-
- return (slide > 0);
}
void
}
void
@@
-2902,6
+2939,7
@@
xloadfonts(char *fontstr, double fontsize) {
FcPattern *pattern;
FcResult r_sz, r_psz;
double fontval;
FcPattern *pattern;
FcResult r_sz, r_psz;
double fontval;
+ float ceilf(float);
if(fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
if(fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
@@
-2947,8
+2985,8
@@
xloadfonts(char *fontstr, double fontsize) {
}
/* Setting character width and height. */
}
/* Setting character width and height. */
- xw.cw =
CEIL
(dc.font.width * cwscale);
- xw.ch =
CEIL
(dc.font.height * chscale);
+ xw.cw =
ceilf
(dc.font.width * cwscale);
+ xw.ch =
ceilf
(dc.font.height * chscale);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
@@
-3003,6
+3041,7
@@
xzoom(const Arg *arg) {
xloadfonts(usedfont, usedfontsize + arg->i);
cresize(0, 0);
redraw(0);
xloadfonts(usedfont, usedfontsize + arg->i);
cresize(0, 0);
redraw(0);
+ xhints();
}
void
}
void
@@
-3166,7
+3205,7
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
* change basic system colors [0-7]
* to bright system colors [8-15]
*/
* change basic system colors [0-7]
* to bright system colors [8-15]
*/
- if(BETWEEN(base.fg, 0, 7))
+ if(BETWEEN(base.fg, 0, 7)
&& !(base.mode & ATTR_FAINT)
)
fg = &dc.col[base.fg + 8];
if(base.mode & ATTR_ITALIC) {
fg = &dc.col[base.fg + 8];
if(base.mode & ATTR_ITALIC) {
@@
-3210,9
+3249,20
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
bg = temp;
}
bg = temp;
}
+ if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
+ colfg.red = fg->color.red / 2;
+ colfg.green = fg->color.green / 2;
+ colfg.blue = fg->color.blue / 2;
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+ fg = &revfg;
+ }
+
if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
fg = bg;
if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
fg = bg;
+ if(base.mode & ATTR_INVISIBLE)
+ fg = bg;
+
/* Intelligent cleaning up of the borders. */
if(x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
/* Intelligent cleaning up of the borders. */
if(x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
@@
-3255,28
+3305,22
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
bytelen -= u8cblen;
doesexist = XftCharExists(xw.dpy, font->match, unicodep);
bytelen -= u8cblen;
doesexist = XftCharExists(xw.dpy, font->match, unicodep);
- if(oneatatime || !doesexist || bytelen <= 0) {
- if(oneatatime || bytelen <= 0) {
- if(doesexist) {
- u8fl++;
- u8fblen += u8cblen;
- }
- }
-
- if(u8fl > 0) {
- XftDrawStringUtf8(xw.draw, fg,
- font->match, xp,
- winy + font->ascent,
- (FcChar8 *)u8fs,
- u8fblen);
- xp += xw.cw * u8fl;
-
- }
- break;
+ if(doesexist) {
+ u8fl++;
+ u8fblen += u8cblen;
+ if(!oneatatime && bytelen > 0)
+ continue;
}
}
- u8fl++;
- u8fblen += u8cblen;
+ if(u8fl > 0) {
+ XftDrawStringUtf8(xw.draw, fg,
+ font->match, xp,
+ winy + font->ascent,
+ (FcChar8 *)u8fs,
+ u8fblen);
+ xp += xw.cw * u8fl;
+ }
+ break;
}
if(doesexist) {
if(oneatatime)
}
if(doesexist) {
if(oneatatime)
@@
-3363,6
+3407,11
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
width, 1);
}
width, 1);
}
+ if(base.mode & ATTR_STRUCK) {
+ XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3,
+ width, 1);
+ }
+
/* Reset clip to none. */
XftDrawSetClip(xw.draw, 0);
}
/* Reset clip to none. */
XftDrawSetClip(xw.draw, 0);
}
@@
-3724,11
+3773,14
@@
run(void) {
int w = xw.w, h = xw.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
int w = xw.w, h = xw.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
- struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+ struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
+ long deltatime;
/* Waiting for window mapping */
while(1) {
XNextEvent(xw.dpy, &ev);
/* Waiting for window mapping */
while(1) {
XNextEvent(xw.dpy, &ev);
+ if(XFilterEvent(&ev, None))
+ continue;
if(ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;
if(ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;
@@
-3740,17
+3792,15
@@
run(void) {
ttynew();
cresize(w, h);
ttynew();
cresize(w, h);
-
gettimeofday(&last, NULL
);
+
clock_gettime(CLOCK_MONOTONIC, &last
);
lastblink = last;
for(xev = actionfps;;) {
lastblink = last;
for(xev = actionfps;;) {
- long deltatime;
-
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- if(
select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv
) < 0) {
+ if(
pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL
) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
if(errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
@@
-3767,9
+3817,9
@@
run(void) {
if(FD_ISSET(xfd, &rfd))
xev = actionfps;
if(FD_ISSET(xfd, &rfd))
xev = actionfps;
-
gettimeofday(&now, NULL
);
+
clock_gettime(CLOCK_MONOTONIC, &now
);
drawtimeout.tv_sec = 0;
drawtimeout.tv_sec = 0;
- drawtimeout.tv_
usec = (1000/xfps) * 1000
;
+ drawtimeout.tv_
nsec = (1000/xfps) * 1E6
;
tv = &drawtimeout;
dodraw = 0;
tv = &drawtimeout;
dodraw = 0;
@@
-3804,9
+3854,9
@@
run(void) {
if(blinkset) {
if(TIMEDIFF(now, lastblink) \
> blinktimeout) {
if(blinkset) {
if(TIMEDIFF(now, lastblink) \
> blinktimeout) {
- drawtimeout.tv_
usec = 1
;
+ drawtimeout.tv_
nsec = 1000
;
} else {
} else {
- drawtimeout.tv_
usec = (1000
* \
+ drawtimeout.tv_
nsec = (1E6
* \
(blinktimeout - \
TIMEDIFF(now,
lastblink)));
(blinktimeout - \
TIMEDIFF(now,
lastblink)));