Faris
/
st
mirror of git://git.suckless.org/st
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use one global struct instead of many vars for selection. Cleanup.

This commit is contained in:
Aurélien Aptel 2010-08-31 15:36:13 +02:00
parent 80f70f1c22
commit ee858b4805
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
st.c
View File

@ -125,6 +125,14 @@ typedef struct {
GC gc; GC gc;
} DC; } DC;
typedef struct {
int mode;
int bx, by;
int ex, ey;
int b[2], e[2];
char *clip;
} Selection;
#include "config.h" #include "config.h"
static void die(const char *errstr, ...); static void die(const char *errstr, ...);
@ -200,23 +208,18 @@ static Term term;
static CSIEscape escseq; static CSIEscape escseq;
static int cmdfd; static int cmdfd;
static pid_t pid; static pid_t pid;
static Selection sel;
/* selection */ /* TODO: use X11 clipboard */
// 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;
static inline int selected(int x, int y) { static inline int selected(int x, int y) {
if ((seley==y && selby==y)) { if ((sel.ey==y && sel.by==y)) {
int bx = MIN(selbx, selex); int bx = MIN(sel.bx, sel.ex);
int ex = MAX(selbx, selex); int ex = MAX(sel.bx, sel.ex);
return (x>=bx && x<=ex); return (x>=bx && x<=ex);
} }
return (((y>sb[1] && y<se[1]) || (y==se[1] && x<=se[0])) || \ return (((y>sel.b[1] && y<sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) || \
(y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1]))); (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1])));
} }
static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) { static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@ -224,24 +227,24 @@ 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; *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
*x = e->xbutton.x/xw.cw; *x = e->xbutton.x/xw.cw;
*y = e->xbutton.y/xw.ch; *y = e->xbutton.y/xw.ch;
sb[0] = selby<seley?selbx:selex; sel.b[0] = sel.by<sel.ey?sel.bx:sel.ex;
sb[1] = MIN(selby, seley); sel.b[1] = MIN(sel.by, sel.ey);
se[0] = selby<seley?selex:selbx; sel.e[0] = sel.by<sel.ey?sel.ex:sel.bx;
se[1] = MAX(selby, seley); sel.e[1] = MAX(sel.by, sel.ey);
} }
static void bpress(XEvent *e) { static void bpress(XEvent *e) {
selmode = 1; sel.mode = 1;
selex = selbx = e->xbutton.x/xw.cw; sel.ex = sel.bx = e->xbutton.x/xw.cw;
seley = selby = e->xbutton.y/xw.ch; sel.ey = sel.by = e->xbutton.y/xw.ch;
} }
static char *getseltext() { static char *getseltext() {
char *str, *ptr; char *str, *ptr;
int ls, x, y, sz; int ls, x, y, sz;
if(selbx==-1) if(sel.bx==-1)
return NULL; return NULL;
sz = ((xw.w/xw.ch) * (se[1]-sb[1]+2)); sz = ((xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2));
ptr = str = malloc (sz); ptr = str = malloc (sz);
for(y = 0; y < term.row; y++) { for(y = 0; y < term.row; y++) {
for(x = 0; x < term.col; x++) { for(x = 0; x < term.col; x++) {
@ -259,29 +262,29 @@ static char *getseltext() {
return str; return str;
} }
static void clipboard_copy(const char *str) { static void clipboard_copy(char *str) {
free((void *)clipboard); free(sel.clip);
clipboard = str; sel.clip = str;
} }
static void clipboard_paste() { static void clipboard_paste() {
if(clipboard) if(sel.clip)
ttywrite(clipboard, strlen(clipboard)); ttywrite(sel.clip, strlen(sel.clip));
} }
// TODO: doubleclick to select word // TODO: doubleclick to select word
static void brelease(XEvent *e) { static void brelease(XEvent *e) {
int b; int b;
selmode = 0; sel.mode = 0;
getbuttoninfo(e, &b, &selex, &seley); getbuttoninfo(e, &b, &sel.ex, &sel.ey);
if(b==4) if(b==4)
tscrollup(1); tscrollup(1);
else else
if(b==5) if(b==5)
tscrolldown(1); tscrolldown(1);
else else
if(selbx==selex && selby==seley) { if(sel.bx==sel.ex && sel.by==sel.ey) {
selbx = -1; sel.bx = -1;
if(b==2) if(b==2)
clipboard_paste(); clipboard_paste();
} else { } else {
@ -292,8 +295,8 @@ static void brelease(XEvent *e) {
} }
static void bmotion(XEvent *e) { static void bmotion(XEvent *e) {
if (selmode) { if (sel.mode) {
getbuttoninfo(e, NULL, &selex, &seley); getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
draw(1); draw(1);
} }
} }
@ -784,7 +787,6 @@ csihandle(void) {
case 2: /* all */ case 2: /* all */
tclearregion(0, 0, term.col-1, term.row-1); tclearregion(0, 0, term.col-1, term.row-1);
break; break;
case 3: /* XXX: erase saved lines (xterm) */
default: default:
goto unknown; goto unknown;
} }
@ -1312,7 +1314,7 @@ draw(int redraw_all) {
i = ox = 0; i = ox = 0;
for(x = 0; x < term.col; x++) { for(x = 0; x < term.col; x++) {
new = term.line[y][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; new.mode ^= ATTR_REVERSE;
if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) || if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
i >= DRAW_BUF_SIZ)) { i >= DRAW_BUF_SIZ)) {