tcleanup. refactored dirt-related function. - st - [fork] customized build of s… | |
git clone git://src.adamsgaard.dk/st | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit cfea72c7b48261006079a327a9ce1adbe2bdc3e3 | |
parent 6c0a1eff2fb2419b9bbfb545d0cf21a2e524efb2 | |
Author: Aurélien Aptel <[email protected]> | |
Date: Mon, 27 Feb 2012 12:44:02 +0100 | |
cleanup. refactored dirt-related function. | |
Diffstat: | |
M st.c | 50 ++++++++++++++++++++---------… | |
1 file changed, 33 insertions(+), 17 deletions(-) | |
--- | |
diff --git a/st.c b/st.c | |
t@@ -259,6 +259,7 @@ static void tsetattr(int*, int); | |
static void tsetchar(char*); | |
static void tsetscroll(int, int); | |
static void tswapscreen(void); | |
+static void tsetdirt(int, int); | |
static void tfulldirt(void); | |
static void ttynew(void); | |
t@@ -446,8 +447,8 @@ utf8size(char *s) { | |
void | |
selinit(void) { | |
- sel.tclick1.tv_sec = 0; | |
- sel.tclick1.tv_usec = 0; | |
+ memset(&sel.tclick1, 0, sizeof(sel.tclick1)); | |
+ memset(&sel.tclick2, 0, sizeof(sel.tclick2)); | |
sel.mode = 0; | |
sel.bx = -1; | |
sel.clip = NULL; | |
t@@ -520,8 +521,7 @@ bpress(XEvent *e) { | |
mousereport(e); | |
else if(e->xbutton.button == Button1) { | |
if(sel.bx != -1) | |
- for(int i=sel.b.y; i<=sel.e.y; i++) | |
- term.dirty[i] = 1; | |
+ tsetdirt(sel.b.y, sel.e.y); | |
sel.mode = 1; | |
sel.ex = sel.bx = X2COL(e->xbutton.x); | |
sel.ey = sel.by = Y2ROW(e->xbutton.y); | |
t@@ -531,21 +531,28 @@ bpress(XEvent *e) { | |
void | |
selcopy(void) { | |
char *str, *ptr; | |
- int x, y, sz, sl, ls = 0; | |
+ int x, y, bufsize, is_selected = 0; | |
if(sel.bx == -1) | |
str = NULL; | |
+ | |
else { | |
- sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; | |
- ptr = str = malloc(sz); | |
+ bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; | |
+ ptr = str = malloc(bufsize); | |
+ | |
+ /* append every set & selected glyph to the selection */ | |
for(y = 0; y < term.row; y++) { | |
- for(x = 0; x < term.col; x++) | |
- if(term.line[y][x].state & GLYPH_SET && (ls = … | |
- sl = utf8size(term.line[y][x].c); | |
- memcpy(ptr, term.line[y][x].c, sl); | |
- ptr += sl; | |
+ for(x = 0; x < term.col; x++) { | |
+ is_selected = selected(x, y); | |
+ if((term.line[y][x].state & GLYPH_SET) && is_s… | |
+ int size = utf8size(term.line[y][x].c); | |
+ memcpy(ptr, term.line[y][x].c, size); | |
+ ptr += size; | |
} | |
- if(ls && y < sel.e.y) | |
+ } | |
+ | |
+ /* \n at the end of every selected line except for the… | |
+ if(is_selected && y < sel.e.y) | |
*ptr++ = '\n'; | |
} | |
*ptr = 0; | |
t@@ -687,8 +694,7 @@ bmotion(XEvent *e) { | |
if(oldey != sel.ey || oldex != sel.ex) { | |
int starty = MIN(oldey, sel.ey); | |
int endy = MAX(oldey, sel.ey); | |
- for(int i = starty; i <= endy; i++) | |
- term.dirty[i] = 1; | |
+ tsetdirt(starty, endy); | |
draw(); | |
} | |
} | |
t@@ -813,14 +819,24 @@ ttyresize(int x, int y) { | |
} | |
void | |
-tfulldirt(void) | |
+tsetdirt(int top, int bot) | |
{ | |
int i; | |
- for(i = 0; i < term.row; i++) | |
+ | |
+ LIMIT(top, 0, term.row-1); | |
+ LIMIT(bot, 0, term.row-1); | |
+ | |
+ for(i = top; i <= bot; i++) | |
term.dirty[i] = 1; | |
} | |
void | |
+tfulldirt(void) | |
+{ | |
+ tsetdirt(0, term.row-1); | |
+} | |
+ | |
+void | |
tcursor(int mode) { | |
static TCursor c; | |