diff options
author | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2014-04-25 17:24:12 +0200 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2014-04-25 17:25:59 +0200 |
commit | 6b7f63bac597ca03e18fe63ad522b4d1bded08d1 (patch) | |
tree | cc883bfef81e58f1d8b39f109b05959c5660354b | |
parent | 80b32af794b659cb15745cfb2a19fce0829c42c7 (diff) | |
download | st-6b7f63bac597ca03e18fe63ad522b4d1bded08d1.tar.gz st-6b7f63bac597ca03e18fe63ad522b4d1bded08d1.zip |
Simplify a bit more tdeletechar and tinsertblank
The large and repeated expression used in memmove to indirect
the line can be simplified using a pointer, that makes more
clear where begins and where ends the movement.
-rw-r--r-- | st.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1587,30 +1587,32 @@ tclearregion(int x1, int y1, int x2, int y2) { | |||
1587 | void | 1587 | void |
1588 | tdeletechar(int n) { | 1588 | tdeletechar(int n) { |
1589 | int dst, src, size; | 1589 | int dst, src, size; |
1590 | Glyph *line; | ||
1590 | 1591 | ||
1591 | LIMIT(n, 0, term.col - term.c.x); | 1592 | LIMIT(n, 0, term.col - term.c.x); |
1592 | 1593 | ||
1593 | dst = term.c.x; | 1594 | dst = term.c.x; |
1594 | src = term.c.x + n; | 1595 | src = term.c.x + n; |
1595 | size = term.col - src; | 1596 | size = term.col - src; |
1597 | line = term.line[term.c.y]; | ||
1596 | 1598 | ||
1597 | memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], | 1599 | memmove(&line[dst], &line[src], size * sizeof(Glyph)); |
1598 | size * sizeof(Glyph)); | ||
1599 | tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); | 1600 | tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); |
1600 | } | 1601 | } |
1601 | 1602 | ||
1602 | void | 1603 | void |
1603 | tinsertblank(int n) { | 1604 | tinsertblank(int n) { |
1604 | int dst, src, size; | 1605 | int dst, src, size; |
1606 | Glyph *line; | ||
1605 | 1607 | ||
1606 | LIMIT(n, 0, term.col - term.c.x); | 1608 | LIMIT(n, 0, term.col - term.c.x); |
1607 | 1609 | ||
1608 | dst = term.c.x + n; | 1610 | dst = term.c.x + n; |
1609 | src = term.c.x; | 1611 | src = term.c.x; |
1610 | size = term.col - dst; | 1612 | size = term.col - dst; |
1613 | line = term.line[term.c.y]; | ||
1611 | 1614 | ||
1612 | memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], | 1615 | memmove(&line[dst], &line[src], size * sizeof(Glyph)); |
1613 | size * sizeof(Glyph)); | ||
1614 | tclearregion(src, term.c.y, dst - 1, term.c.y); | 1616 | tclearregion(src, term.c.y, dst - 1, term.c.y); |
1615 | } | 1617 | } |
1616 | 1618 | ||