pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix segfault when selecting big buffers
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
1497dd2
..
c2f294a
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-185,9
+185,9
@@
static char* kmap(KeySym);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
-static void brelease(XEvent *
e
);
-static void bpress(XEvent *
e
);
-static void bmotion(XEvent *
e
);
+static void brelease(XEvent *);
+static void bpress(XEvent *);
+static void bmotion(XEvent *);
static void (*handler[LASTEvent])(XEvent *) = {
static void (*handler[LASTEvent])(XEvent *) = {
@@
-210,6
+210,13
@@
static int cmdfd;
static pid_t pid;
static Selection sel;
static pid_t pid;
static Selection sel;
+void
+selinit(void) {
+ sel.mode = 0;
+ sel.bx = -1;
+ sel.clip = NULL;
+}
+
static inline int selected(int x, int y) {
if ((sel.ey==y && sel.by==y)) {
int bx = MIN(sel.bx, sel.ex);
static inline int selected(int x, int y) {
if ((sel.ey==y && sel.by==y)) {
int bx = MIN(sel.bx, sel.ex);
@@
-242,31
+249,27
@@
static char *getseltext() {
int ls, x, y, sz;
if(sel.bx==-1)
return NULL;
int ls, x, y, sz;
if(sel.bx==-1)
return NULL;
- sz = ((
xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2
));
+ sz = ((
term.col+1) * (sel.e[1]-sel.b[1]+1
));
ptr = str = malloc (sz);
for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) {
ptr = str = malloc (sz);
for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) {
- if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y))) {
- *ptr = term.line[y][x].c;
- ptr++;
- }
- }
- if (ls) {
- *ptr = '\n';
- ptr++;
+ if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y)))
+ *ptr = term.line[y][x].c, ptr++;
}
}
+ if (ls)
+ *ptr = '\n', ptr++;
}
*ptr = 0;
return str;
}
/* TODO: use X11 clipboard */
}
*ptr = 0;
return str;
}
/* TODO: use X11 clipboard */
-static void
clipboard_
copy(char *str) {
+static void
sel
copy(char *str) {
free(sel.clip);
sel.clip = str;
}
free(sel.clip);
sel.clip = str;
}
-static void
clipboard_
paste() {
+static void
sel
paste() {
if(sel.clip)
ttywrite(sel.clip, strlen(sel.clip));
}
if(sel.clip)
ttywrite(sel.clip, strlen(sel.clip));
}
@@
-276,19
+279,13
@@
static void brelease(XEvent *e) {
int b;
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
int b;
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
- if(b==4)
- tscrollup(1);
- else
- if(b==5)
- tscrolldown(1);
- else
if(sel.bx==sel.ex && sel.by==sel.ey) {
sel.bx = -1;
if(b==2)
if(sel.bx==sel.ex && sel.by==sel.ey) {
sel.bx = -1;
if(b==2)
-
clipboard_
paste();
+
sel
paste();
} else {
if(b==1)
} else {
if(b==1)
-
clipboard_
copy(getseltext());
+
sel
copy(getseltext());
}
draw(1);
}
}
draw(1);
}
@@
-1404,7
+1401,7
@@
kpress(XEvent *ev) {
break;
case XK_Insert:
if(shift)
break;
case XK_Insert:
if(shift)
-
draw(1), puts("draw!")/* XXX: paste X clipboard */
;
+
selpaste(), draw(1)
;
break;
default:
fprintf(stderr, "errkey: %d\n", (int)ksym);
break;
default:
fprintf(stderr, "errkey: %d\n", (int)ksym);
@@
-1471,6
+1468,7
@@
main(int argc, char *argv[]) {
tnew(80, 24);
ttynew();
xinit();
tnew(80, 24);
ttynew();
xinit();
+ selinit();
run();
return 0;
}
run();
return 0;
}