X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/80f70f1c224ec6fb10f04c29ea2205f47ae553ff..cfe897554d4467fdf4c002429370fc7716e419bc:/st.c?ds=sidebyside
diff --git a/st.c b/st.c
index 665dc1a..a5cca17 100644
--- a/st.c
+++ b/st.c
@@ -125,6 +125,15 @@ typedef struct {
GC gc;
} DC;
+/* TODO: use better name for vars... */
+typedef struct {
+ int mode;
+ int bx, by;
+ int ex, ey;
+ struct {int x, y;} b, e;
+ char *clip;
+} Selection;
+
#include "config.h"
static void die(const char *errstr, ...);
@@ -177,9 +186,9 @@ static char* kmap(KeySym);
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 *) = {
@@ -200,23 +209,23 @@ static Term term;
static CSIEscape escseq;
static int cmdfd;
static pid_t pid;
+static Selection sel;
-/* selection */
-// TODO: use X11 clipboard
-static int selmode = 0;
-static int selbx = -1, selby;
-static int selex, seley;
-int sb[2], se[2];
-static const char *clipboard = NULL;
+void
+selinit(void) {
+ sel.mode = 0;
+ sel.bx = -1;
+ sel.clip = NULL;
+}
static inline int selected(int x, int y) {
- if ((seley==y && selby==y)) {
- int bx = MIN(selbx, selex);
- int ex = MAX(selbx, selex);
- return (x>=bx && x<=ex);
+ if(sel.ey == y && sel.by == y) {
+ int bx = MIN(sel.bx, sel.ex);
+ int ex = MAX(sel.bx, sel.ex);
+ return BETWEEN(x, bx, ex);
}
- return (((y>sb[1] && y<se[1]) || (y==se[1] && x<=se[0])) || \
- (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1])));
+ return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
+ || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
}
static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -224,76 +233,66 @@ static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
*b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
*x = e->xbutton.x/xw.cw;
*y = e->xbutton.y/xw.ch;
- sb[0] = selby<seley?selbx:selex;
- sb[1] = MIN(selby, seley);
- se[0] = selby<seley?selex:selbx;
- se[1] = MAX(selby, seley);
+ sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+ sel.b.y = MIN(sel.by, sel.ey);
+ sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+ sel.e.y = MAX(sel.by, sel.ey);
}
static void bpress(XEvent *e) {
- selmode = 1;
- selex = selbx = e->xbutton.x/xw.cw;
- seley = selby = e->xbutton.y/xw.ch;
+ sel.mode = 1;
+ sel.ex = sel.bx = e->xbutton.x/xw.cw;
+ sel.ey = sel.by = e->xbutton.y/xw.ch;
}
static char *getseltext() {
char *str, *ptr;
int ls, x, y, sz;
- if(selbx==-1)
+ if(sel.bx == -1)
return NULL;
- sz = ((xw.w/xw.ch) * (se[1]-sb[1]+2));
- ptr = str = malloc (sz);
+ sz = (term.col+1) * (sel.e.y-sel.b.y+1);
+ 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++;
- }
+ 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++;
}
*ptr = 0;
return str;
}
-static void clipboard_copy(const char *str) {
- free((void *)clipboard);
- clipboard = str;
+/* TODO: use X11 clipboard */
+static void selcopy(char *str) {
+ free(sel.clip);
+ sel.clip = str;
}
-static void clipboard_paste() {
- if(clipboard)
- ttywrite(clipboard, strlen(clipboard));
+static void selpaste() {
+ if(sel.clip)
+ ttywrite(sel.clip, strlen(sel.clip));
}
-// TODO: doubleclick to select word
+/* TODO: doubleclick to select word */
static void brelease(XEvent *e) {
int b;
- selmode = 0;
- getbuttoninfo(e, &b, &selex, &seley);
- if(b==4)
- tscrollup(1);
- else
- if(b==5)
- tscrolldown(1);
- else
- if(selbx==selex && selby==seley) {
- selbx = -1;
+ sel.mode = 0;
+ getbuttoninfo(e, &b, &sel.ex, &sel.ey);
+ if(sel.bx==sel.ex && sel.by==sel.ey) {
+ sel.bx = -1;
if(b==2)
- clipboard_paste();
+ selpaste();
} else {
if(b==1)
- clipboard_copy(getseltext());
+ selcopy(getseltext());
}
draw(1);
}
static void bmotion(XEvent *e) {
- if (selmode) {
- getbuttoninfo(e, NULL, &selex, &seley);
+ if (sel.mode) {
+ getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
draw(1);
}
}
@@ -784,7 +783,6 @@ csihandle(void) {
case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1);
break;
- case 3: /* XXX: erase saved lines (xterm) */
default:
goto unknown;
}
@@ -1025,7 +1023,7 @@ tputc(char c) {
term.mode &= ~MODE_APPKEYPAD;
term.esc = 0;
break;
- case '7': /* DECSC -- Save Cursor*/
+ case '7': /* DECSC -- Save Cursor */
tcursor(CURSOR_SAVE);
term.esc = 0;
break;
@@ -1096,7 +1094,7 @@ tresize(int col, int row) {
/* resize to new height */
term.line = realloc(term.line, row * sizeof(Line));
- term.alt = realloc(term.alt, row * sizeof(Line));
+ term.alt = realloc(term.alt, row * sizeof(Line));
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
@@ -1212,9 +1210,14 @@ xinit(void) {
xw.bufw = xw.w - 2*BORDER;
xw.bufh = xw.h - 2*BORDER;
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
- xw.hasfocus = 1;
/* gc */
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+
+ /* event mask */
+ XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
+ | StructureNotifyMask | FocusChangeMask | PointerMotionMask
+ | ButtonPressMask | ButtonReleaseMask);
+
XMapWindow(xw.dis, xw.win);
xhints();
XStoreName(xw.dis, xw.win, "st");
@@ -1312,7 +1315,7 @@ draw(int redraw_all) {
i = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
- if(selbx!=-1 && new.c && selected(x, y))
+ if(sel.bx!=-1 && new.c && selected(x, y))
new.mode ^= ATTR_REVERSE;
if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
i >= DRAW_BUF_SIZ)) {
@@ -1398,7 +1401,7 @@ kpress(XEvent *ev) {
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);
@@ -1433,12 +1436,6 @@ run(void) {
XEvent ev;
fd_set rfd;
int xfd = XConnectionNumber(xw.dis);
- long mask = ExposureMask | KeyPressMask | StructureNotifyMask
- | FocusChangeMask | PointerMotionMask | ButtonPressMask
- | ButtonReleaseMask;
-
- XSelectInput(xw.dis, xw.win, mask);
- XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */
for(;;) {
FD_ZERO(&rfd);
@@ -1471,6 +1468,7 @@ main(int argc, char *argv[]) {
tnew(80, 24);
ttynew();
xinit();
+ selinit();
run();
return 0;
}