snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify expressions in tputc()

Browse source
This commit is contained in:
Roberto E. Vargas Caballero 2014-04-27 10:25:15 +02:00
parent 17290f493b
commit a8a9e66a7d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
st.c
View file

@ -2445,6 +2445,7 @@ tputc(char *c, int len) {
bool control; bool control;
long unicodep; long unicodep;
int width; int width;
Glyph *gp;
if(len == 1) { if(len == 1) {
width = 1; width = 1;
@ -2607,16 +2608,15 @@ tputc(char *c, int len) {
return; return;
if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
selclear(NULL); 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) { if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col)
memmove(&term.line[term.c.y][term.c.x+1], memmove(gp+1, gp, (term.col - term.c.x - 1) * sizeof(Glyph));
&term.line[term.c.y][term.c.x],
(term.col - term.c.x - 1) * sizeof(Glyph));
}
if(term.c.x+width > term.col) if(term.c.x+width > term.col)
tnewline(1); tnewline(1);
@ -2624,10 +2624,10 @@ tputc(char *c, int len) {
tsetchar(c, &term.c.attr, term.c.x, term.c.y); tsetchar(c, &term.c.attr, term.c.x, term.c.y);
if(width == 2) { 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'; gp[1].c[0] = '\0';
term.line[term.c.y][term.c.x+1].mode = ATTR_WDUMMY; gp[1].mode = ATTR_WDUMMY;
} }
} }
if(term.c.x+width < term.col) { if(term.c.x+width < term.col) {