[hackers] [st] Simplify expressions in tputc() || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Mon, 28 Apr 2014 18:44:10 +0200

commit a8a9e66a7d481c66bd9680ff0670c322bedd7ca7
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
Date: Sun Apr 27 10:25:15 2014 +0200

    Simplify expressions in tputc()

diff --git a/st.c b/st.c
index bd0c59e..548e0c2 100644
--- a/st.c
+++ b/st.c
_AT_@ -2445,6 +2445,7 @@ tputc(char *c, int len) {
         bool control;
         long unicodep;
         int width;
+ Glyph *gp;
 
         if(len == 1) {
                 width = 1;
_AT_@ -2607,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);
+
+ gp = &term.line[term.c.y][term.c.x];
         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);
         }
 
- 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);
_AT_@ -2624,10 +2624,10 @@ tputc(char *c, int len) {
         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) {
- term.line[term.c.y][term.c.x+1].c[0] = '
Received on Mon Apr 28 2014 - 18:44:10 CEST