Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Move X-specific selection info into XSelection
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
a332ac9
..
9f506b1
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-44,6
+44,11
@@
typedef struct {
signed char crlf; /* crlf mode */
} Key;
signed char crlf; /* crlf mode */
} Key;
+/* X modifiers */
+#define XK_ANY_MOD UINT_MAX
+#define XK_NO_MOD 0
+#define XK_SWITCH_MOD (1<<13)
+
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
@@
-89,6
+94,9
@@
typedef struct {
typedef struct {
Atom xtarget;
typedef struct {
Atom xtarget;
+ char *primary, *clipboard;
+ struct timespec tclick1;
+ struct timespec tclick2;
} XSelection;
/* Font structure */
} XSelection;
/* Font structure */
@@
-229,11
+237,11
@@
clipcopy(const Arg *dummy)
{
Atom clipboard;
{
Atom clipboard;
- if (sel.clipboard != NULL)
- free(sel.clipboard);
+ if (
x
sel.clipboard != NULL)
+ free(
x
sel.clipboard);
- if (sel.primary != NULL) {
-
sel.clipboard = xstrdup(
sel.primary);
+ if (
x
sel.primary != NULL) {
+
xsel.clipboard = xstrdup(x
sel.primary);
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
}
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
}
@@
-271,7
+279,6
@@
zoomabs(const Arg *arg)
xunloadfonts();
xloadfonts(usedfont, arg->f);
cresize(0, 0);
xunloadfonts();
xloadfonts(usedfont, arg->f);
cresize(0, 0);
- ttyresize(win.tw, win.th);
redraw();
xhints();
}
redraw();
xhints();
}
@@
-423,9
+430,9
@@
bpress(XEvent *e)
* If the user clicks below predefined timeouts specific
* snapping behaviour is exposed.
*/
* If the user clicks below predefined timeouts specific
* snapping behaviour is exposed.
*/
- if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+ if (TIMEDIFF(now,
x
sel.tclick2) <= tripleclicktimeout) {
sel.snap = SNAP_LINE;
sel.snap = SNAP_LINE;
- } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+ } else if (TIMEDIFF(now,
x
sel.tclick1) <= doubleclicktimeout) {
sel.snap = SNAP_WORD;
} else {
sel.snap = 0;
sel.snap = SNAP_WORD;
} else {
sel.snap = 0;
@@
-435,8
+442,8
@@
bpress(XEvent *e)
if (sel.snap != 0)
sel.mode = SEL_READY;
tsetdirt(sel.nb.y, sel.ne.y);
if (sel.snap != 0)
sel.mode = SEL_READY;
tsetdirt(sel.nb.y, sel.ne.y);
-
sel.tclick2 =
sel.tclick1;
- sel.tclick1 = now;
+
xsel.tclick2 = x
sel.tclick1;
+
x
sel.tclick1 = now;
}
}
}
}
@@
-590,9
+597,9
@@
selrequest(XEvent *e)
*/
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
if (xsre->selection == XA_PRIMARY) {
*/
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
if (xsre->selection == XA_PRIMARY) {
- seltext = sel.primary;
+ seltext =
x
sel.primary;
} else if (xsre->selection == clipboard) {
} else if (xsre->selection == clipboard) {
- seltext = sel.clipboard;
+ seltext =
x
sel.clipboard;
} else {
fprintf(stderr,
"Unhandled clipboard selection 0x%lx\n",
} else {
fprintf(stderr,
"Unhandled clipboard selection 0x%lx\n",
@@
-616,8
+623,8
@@
selrequest(XEvent *e)
void
setsel(char *str, Time t)
{
void
setsel(char *str, Time t)
{
- free(sel.primary);
- sel.primary = str;
+ free(
x
sel.primary);
+
x
sel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
@@
-690,6
+697,7
@@
cresize(int width, int height)
tresize(col, row);
xresize(col, row);
tresize(col, row);
xresize(col, row);
+ ttyresize(win.tw, win.th);
}
void
}
void
@@
-1122,6
+1130,10
@@
xinit(void)
xhints();
XSync(xw.dpy, False);
xhints();
XSync(xw.dpy, False);
+ clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
+ clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2);
+ xsel.primary = NULL;
+ xsel.clipboard = NULL;
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
if (xsel.xtarget == None)
xsel.xtarget = XA_STRING;
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
if (xsel.xtarget == None)
xsel.xtarget = XA_STRING;
@@
-1413,7
+1425,6
@@
xdrawcursor(void)
static int oldx = 0, oldy = 0;
int curx;
Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
static int oldx = 0, oldy = 0;
int curx;
Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
- int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
Color drawcol;
LIMIT(oldx, 0, term.col-1);
Color drawcol;
LIMIT(oldx, 0, term.col-1);
@@
-1429,7
+1440,7
@@
xdrawcursor(void)
/* remove the old cursor */
og = term.line[oldy][oldx];
/* remove the old cursor */
og = term.line[oldy][oldx];
- if (
ena_sel &&
selected(oldx, oldy))
+ if (selected(oldx, oldy))
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, oldx, oldy);
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, oldx, oldy);
@@
-1443,7
+1454,7
@@
xdrawcursor(void)
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
g.bg = defaultfg;
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
g.bg = defaultfg;
- if (
ena_sel &&
selected(term.c.x, term.c.y)) {
+ if (selected(term.c.x, term.c.y)) {
drawcol = dc.col[defaultcs];
g.fg = defaultrcs;
} else {
drawcol = dc.col[defaultcs];
g.fg = defaultrcs;
} else {
@@
-1451,7
+1462,7
@@
xdrawcursor(void)
g.fg = defaultcs;
}
} else {
g.fg = defaultcs;
}
} else {
- if (
ena_sel &&
selected(term.c.x, term.c.y)) {
+ if (selected(term.c.x, term.c.y)) {
drawcol = dc.col[defaultrcs];
g.fg = defaultfg;
g.bg = defaultrcs;
drawcol = dc.col[defaultrcs];
g.fg = defaultfg;
g.bg = defaultrcs;
@@
-1550,7
+1561,6
@@
drawregion(int x1, int y1, int x2, int y2)
int i, x, y, ox, numspecs;
Glyph base, new;
XftGlyphFontSpec *specs;
int i, x, y, ox, numspecs;
Glyph base, new;
XftGlyphFontSpec *specs;
- int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
if (!(win.state & WIN_VISIBLE))
return;
if (!(win.state & WIN_VISIBLE))
return;
@@
-1569,7
+1579,7
@@
drawregion(int x1, int y1, int x2, int y2)
new = term.line[y][x];
if (new.mode == ATTR_WDUMMY)
continue;
new = term.line[y][x];
if (new.mode == ATTR_WDUMMY)
continue;
- if (
ena_sel &&
selected(x, y))
+ if (selected(x, y))
new.mode ^= ATTR_REVERSE;
if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y);
new.mode ^= ATTR_REVERSE;
if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y);
@@
-1789,7
+1799,6
@@
resize(XEvent *e)
return;
cresize(e->xconfigure.width, e->xconfigure.height);
return;
cresize(e->xconfigure.width, e->xconfigure.height);
- ttyresize(win.tw, win.th);
}
void
}
void
@@
-1818,9
+1827,8
@@
run(void)
}
} while (ev.type != MapNotify);
}
} while (ev.type != MapNotify);
- cresize(w, h);
ttynew(opt_line, opt_io, opt_cmd);
ttynew(opt_line, opt_io, opt_cmd);
-
ttyresize(win.tw, win.t
h);
+
cresize(w,
h);
clock_gettime(CLOCK_MONOTONIC, &last);
lastblink = last;
clock_gettime(CLOCK_MONOTONIC, &last);
lastblink = last;