Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Simplify expressions in tputc()
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
0425c72
..
548e0c2
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-70,8
+70,9
@@
char *argv0;
#define LEN(a) (sizeof(a) / sizeof(a)[0])
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
#define LEN(a) (sizeof(a) / sizeof(a)[0])
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
-#define ISCONTROLC0(c) (BETWEEN((uchar) (c), 0, 0x1f))
-#define ISCONTROLC1(c) (BETWEEN((uchar) (c), 0x80, 0x9f))
+#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f))
+#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
+#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
#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)
@@
-393,6
+394,7
@@
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
static bool tcontrolcode(uchar );
static void tfulldirt(void);
static void techo(char *, int);
static bool tcontrolcode(uchar );
+static void tdectest(char );
static int32_t tdefcolor(int *, int *, int);
static void tselcs(void);
static void tdeftran(char);
static int32_t tdefcolor(int *, int *, int);
static void tselcs(void);
static void tdeftran(char);
@@
-402,7
+404,6
@@
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 inline bool iscontrol(char);
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);
@@
-2086,8
+2087,8
@@
csihandle(void) {
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
term.c.y+1, term.c.x+1);
ttywrite(buf, len);
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
term.c.y+1, term.c.x+1);
ttywrite(buf, len);
- break;
}
}
+ break;
case 'r': /* DECSTBM -- Set Scrolling Region */
if(csiescseq.priv) {
goto unknown;
case 'r': /* DECSTBM -- Set Scrolling Region */
if(csiescseq.priv) {
goto unknown;
@@
-2300,17
+2301,12
@@
tputtab(int n) {
tmoveto(x, term.c.y);
}
tmoveto(x, term.c.y);
}
-static inline bool
-iscontrol(char c) {
- return ISCONTROLC0(c) || ISCONTROLC1(c);
-}
-
void
techo(char *buf, int len) {
for(; len > 0; buf++, len--) {
char c = *buf;
void
techo(char *buf, int len) {
for(; len > 0; buf++, len--) {
char c = *buf;
- if(
iscontrol
(c)) { /* control code */
+ if(
ISCONTROL
(c)) { /* control code */
if(c & 0x80) {
c &= 0x7f;
tputc("^", 1);
if(c & 0x80) {
c &= 0x7f;
tputc("^", 1);
@@
-2430,25
+2426,40
@@
tcontrolcode(uchar ascii) {
return 1;
}
return 1;
}
+void
+tdectest(char c) {
+ static char E[UTF_SIZ] = "E";
+ int x, y;
+
+ if(c == '8') { /* DEC screen alignment test. */
+ for(x = 0; x < term.col; ++x) {
+ for(y = 0; y < term.row; ++y)
+ tsetchar(E, &term.c.attr, x, y);
+ }
+ }
+}
+
void
tputc(char *c, int len) {
uchar ascii;
bool control;
long unicodep;
int width;
void
tputc(char *c, int len) {
uchar ascii;
bool control;
long unicodep;
int width;
+ Glyph *gp;
if(len == 1) {
width = 1;
if(len == 1) {
width = 1;
- ascii = *c;
+
unicodep =
ascii = *c;
} else {
utf8decode(c, &unicodep, UTF_SIZ);
width = wcwidth(unicodep);
} else {
utf8decode(c, &unicodep, UTF_SIZ);
width = wcwidth(unicodep);
+ control = ISCONTROLC1(unicodep);
ascii = unicodep;
}
ascii = unicodep;
}
- control = iscontrol(ascii) && width == 1;
if(IS_SET(MODE_PRINT))
tprinter(c, len);
if(IS_SET(MODE_PRINT))
tprinter(c, len);
+ control = ISCONTROL(unicodep);
/*
* STR sequence must be checked before anything else
/*
* STR sequence must be checked before anything else
@@
-2460,7
+2471,7
@@
tputc(char *c, int len) {
if(width == 1 &&
(ascii == '\a' || ascii == 030 ||
ascii == 032 || ascii == 033 ||
if(width == 1 &&
(ascii == '\a' || ascii == 030 ||
ascii == 032 || ascii == 033 ||
- ISCONTROLC1(
ascii
))) {
+ ISCONTROLC1(
unicodep
))) {
term.esc &= ~ESC_STR;
term.esc |= ESC_STR_END;
} else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
term.esc &= ~ESC_STR;
term.esc |= ESC_STR_END;
} else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
@@
-2508,15
+2519,7
@@
tputc(char *c, int len) {
tdeftran(ascii);
tselcs();
} else if(term.esc & ESC_TEST) {
tdeftran(ascii);
tselcs();
} else if(term.esc & ESC_TEST) {
- if(ascii == '8') { /* DEC screen alignment test. */
- char E[UTF_SIZ] = "E";
- int x, y;
-
- for(x = 0; x < term.col; ++x) {
- for(y = 0; y < term.row; ++y)
- tsetchar(E, &term.c.attr, x, y);
- }
- }
+ tdectest(ascii);
} else {
switch(ascii) {
case '[':
} else {
switch(ascii) {
case '[':
@@
-2605,16
+2608,15
@@
tputc(char *c, int len) {
return;
if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
selclear(NULL);
return;
if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
selclear(NULL);
+
+ gp = &term.line[term.c.y][term.c.x];
if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
-
term.line[term.c.y][term.c.x].
mode |= ATTR_WRAP;
+
gp->
mode |= ATTR_WRAP;
tnewline(1);
}
tnewline(1);
}
- if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
- memmove(&term.line[term.c.y][term.c.x+1],
- &term.line[term.c.y][term.c.x],
- (term.col - term.c.x - 1) * sizeof(Glyph));
- }
+ if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col)
+ memmove(gp+1, gp, (term.col - term.c.x - 1) * sizeof(Glyph));
if(term.c.x+width > term.col)
tnewline(1);
if(term.c.x+width > term.col)
tnewline(1);
@@
-2622,10
+2624,10
@@
tputc(char *c, int len) {
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
if(width == 2) {
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
if(width == 2) {
-
term.line[term.c.y][term.c.x].
mode |= ATTR_WIDE;
+
gp->
mode |= ATTR_WIDE;
if(term.c.x+1 < term.col) {
if(term.c.x+1 < term.col) {
-
term.line[term.c.y][term.c.x+
1].c[0] = '\0';
-
term.line[term.c.y][term.c.x+
1].mode = ATTR_WDUMMY;
+
gp[
1].c[0] = '\0';
+
gp[
1].mode = ATTR_WDUMMY;
}
}
if(term.c.x+width < term.col) {
}
}
if(term.c.x+width < term.col) {