Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
fix regression by selecting clipboard text
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
d205ca7
..
c343ba2
100644
(file)
--- a/
x.c
+++ b/
x.c
@@
-1,15
+1,15
@@
/* See LICENSE for license details. */
#include <errno.h>
/* See LICENSE for license details. */
#include <errno.h>
+#include <math.h>
+#include <limits.h>
#include <locale.h>
#include <signal.h>
#include <locale.h>
#include <signal.h>
-#include <stdint.h>
#include <sys/select.h>
#include <time.h>
#include <unistd.h>
#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <sys/select.h>
#include <time.h>
#include <unistd.h>
#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
@@
-75,6
+75,15
@@
typedef XftColor Color;
typedef XftGlyphFontSpec GlyphFontSpec;
/* Purely graphic info */
typedef XftGlyphFontSpec GlyphFontSpec;
/* Purely graphic info */
+typedef struct {
+ int tw, th; /* tty width and height */
+ int w, h; /* window width and height */
+ int ch; /* char height */
+ int cw; /* char width */
+ int mode; /* window state/mode flags */
+ int cursor; /* cursor style */
+} TermWindow;
+
typedef struct {
Display *dpy;
Colormap cmap;
typedef struct {
Display *dpy;
Colormap cmap;
@@
-130,17
+139,19
@@
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
static void xdrawglyph(Glyph, int, int);
static void xclear(int, int, int, int);
static int xgeommasktogravity(int);
static void xdrawglyph(Glyph, int, int);
static void xclear(int, int, int, int);
static int xgeommasktogravity(int);
-static void xinit(
void
);
+static void xinit(
int, int
);
static void cresize(int, int);
static void xresize(int, int);
static void cresize(int, int);
static void xresize(int, int);
+static void xhints(void);
+static int xloadcolor(int, const char *, Color *);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
-static int
x2col(int
);
-static int
y2row(int
);
+static int
evcol(XEvent *
);
+static int
evrow(XEvent *
);
static void expose(XEvent *);
static void visibility(XEvent *);
static void expose(XEvent *);
static void visibility(XEvent *);
@@
-227,13
+238,15
@@
static char *opt_line = NULL;
static char *opt_name = NULL;
static char *opt_title = NULL;
static char *opt_name = NULL;
static char *opt_title = NULL;
+static int oldbutton = 3; /* button event on startup: 3 = release */
+
void
clipcopy(const Arg *dummy)
{
Atom clipboard;
void
clipcopy(const Arg *dummy)
{
Atom clipboard;
- if (xsel.clipboard != NULL)
-
free(xsel.clipboard)
;
+ free(xsel.clipboard);
+
xsel.clipboard = NULL
;
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
@@
-296,21
+309,19
@@
zoomreset(const Arg *arg)
}
int
}
int
-
x2col(int x
)
+
evcol(XEvent *e
)
{
{
- x -= borderpx;
- x /= win.cw;
-
- return LIMIT(x, 0, term.col-1);
+ int x = e->xbutton.x - borderpx;
+ LIMIT(x, 0, win.tw - 1);
+ return x / win.cw;
}
int
}
int
-
y2row(int y
)
+
evrow(XEvent *e
)
{
{
- y -= borderpx;
- y /= win.ch;
-
- return LIMIT(y, 0, term.row-1);
+ int y = e->xbutton.y - borderpx;
+ LIMIT(y, 0, win.th - 1);
+ return y / win.ch;
}
void
}
void
@@
-325,7
+336,7
@@
mousesel(XEvent *e, int done)
break;
}
}
break;
}
}
- selextend(
x2col(e->xbutton.x), y2row(e->xbutton.y
), seltype, done);
+ selextend(
evcol(e), evrow(e
), seltype, done);
if (done)
setsel(getsel(), e->xbutton.time);
}
if (done)
setsel(getsel(), e->xbutton.time);
}
@@
-333,9
+344,8
@@
mousesel(XEvent *e, int done)
void
mousereport(XEvent *e)
{
void
mousereport(XEvent *e)
{
- int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
- button = e->xbutton.button, state = e->xbutton.state,
- len;
+ int len, x = evcol(e), y = evrow(e),
+ button = e->xbutton.button, state = e->xbutton.state;
char buf[40];
static int ox, oy;
char buf[40];
static int ox, oy;
@@
-430,7
+440,7
@@
bpress(XEvent *e)
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
- selstart(
x2col(e->xbutton.x), y2row(e->xbutton.y
), snap);
+ selstart(
evcol(e), evrow(e
), snap);
}
}
}
}
@@
-454,18
+464,16
@@
selnotify(XEvent *e)
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
- Atom type, incratom, property;
+ Atom type, incratom, property
= None
;
incratom = XInternAtom(xw.dpy, "INCR", 0);
ofs = 0;
incratom = XInternAtom(xw.dpy, "INCR", 0);
ofs = 0;
- if (e->type == SelectionNotify)
{
+ if (e->type == SelectionNotify)
property = e->xselection.property;
property = e->xselection.property;
- } else if(e->type == PropertyNotify) {
+ else if (e->type == PropertyNotify)
property = e->xproperty.atom;
property = e->xproperty.atom;
- } else {
- return;
- }
+
if (property == None)
return;
if (property == None)
return;
@@
-610,12
+618,15
@@
selrequest(XEvent *e)
void
setsel(char *str, Time t)
{
void
setsel(char *str, Time t)
{
+ if (!str)
+ return;
+
free(xsel.primary);
xsel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
free(xsel.primary);
xsel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
- selclear
_(NULL
);
+ selclear
(
);
}
void
}
void
@@
-773,7
+784,7
@@
xhints(void)
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
XWMHints wm = {.flags = InputHint, .input = 1};
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
XWMHints wm = {.flags = InputHint, .input = 1};
- XSizeHints *sizeh
= NULL
;
+ XSizeHints *sizeh;
sizeh = XAllocSizeHints();
sizeh = XAllocSizeHints();
@@
-894,7
+905,6
@@
xloadfonts(char *fontstr, double fontsize)
{
FcPattern *pattern;
double fontval;
{
FcPattern *pattern;
double fontval;
- float ceilf(float);
if (fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
if (fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
@@
-984,7
+994,7
@@
xunloadfonts(void)
}
void
}
void
-xinit(
void
)
+xinit(
int cols, int rows
)
{
XGCValues gcvalues;
Cursor cursor;
{
XGCValues gcvalues;
Cursor cursor;
@@
-1009,8
+1019,8
@@
xinit(void)
xloadcols();
/* adjust fixed window geometry */
xloadcols();
/* adjust fixed window geometry */
- win.w = 2 * borderpx +
term.col
* win.cw;
- win.h = 2 * borderpx +
term.row
* win.ch;
+ win.w = 2 * borderpx +
cols
* win.cw;
+ win.h = 2 * borderpx +
rows
* win.ch;
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
@@
-1042,7
+1052,7
@@
xinit(void)
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
/* font spec buffer */
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
/* font spec buffer */
- xw.specbuf = xmalloc(
term.col
* sizeof(GlyphFontSpec));
+ xw.specbuf = xmalloc(
cols
* sizeof(GlyphFontSpec));
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
@@
-1337,15
+1347,16
@@
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
/* Intelligent cleaning up of the borders. */
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
/* Intelligent cleaning up of the borders. */
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
- winy + win.ch + ((y >= term.row-1)? win.h : 0));
+ winy + win.ch +
+ ((winy + win.ch >= borderpx + win.th)? win.h : 0));
}
}
- if (
x + charlen >= term.col
) {
+ if (
winx + width >= borderpx + win.tw
) {
xclear(winx + width, (y == 0)? 0 : winy, win.w,
xclear(winx + width, (y == 0)? 0 : winy, win.w,
- ((
y >= term.row-1
)? win.h : (winy + win.ch)));
+ ((
winy + win.ch >= borderpx + win.th
)? win.h : (winy + win.ch)));
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
- if (
y == term.row-1
)
+ if (
winy + win.ch >= borderpx + win.th
)
xclear(winx, winy + win.ch, winx + width, win.h);
/* Clean up the region we want to draw to. */
xclear(winx, winy + win.ch, winx + width, win.h);
/* Clean up the region we want to draw to. */
@@
-1396,12
+1407,13
@@
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, ox, oy);
og.mode ^= ATTR_REVERSE;
xdrawglyph(og, ox, oy);
+ if (IS_SET(MODE_HIDE))
+ return;
+
/*
* Select the right color for the right mode.
*/
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
/*
* Select the right color for the right mode.
*/
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
- g.fg = defaultbg;
- g.bg = defaultcs;
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
@@
-1415,22
+1427,20
@@
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
}
} else {
if (selected(cx, cy)) {
}
} else {
if (selected(cx, cy)) {
- drawcol = dc.col[defaultrcs];
g.fg = defaultfg;
g.bg = defaultrcs;
} else {
g.fg = defaultfg;
g.bg = defaultrcs;
} else {
- drawcol = dc.col[defaultcs];
+ g.fg = defaultbg;
+ g.bg = defaultcs;
}
}
+ drawcol = dc.col[g.bg];
}
}
- if (IS_SET(MODE_HIDE))
- return;
-
/* draw the new one */
if (IS_SET(MODE_FOCUSED)) {
switch (win.cursor) {
/* draw the new one */
if (IS_SET(MODE_FOCUSED)) {
switch (win.cursor) {
- case 7: /* st extension: snowman */
-
utf8decode("☃", &g.u, UTF_SIZ)
;
+ case 7: /* st extension: snowman
(U+2603)
*/
+
g.u = 0x2603
;
case 0: /* Blinking Block */
case 1: /* Blinking Block (Default) */
case 2: /* Steady Block */
case 0: /* Blinking Block */
case 1: /* Blinking Block (Default) */
case 2: /* Steady Block */
@@
-1485,7
+1495,7
@@
void
xsettitle(char *p)
{
XTextProperty prop;
xsettitle(char *p)
{
XTextProperty prop;
- DEFAULT(p,
"st"
);
+ DEFAULT(p,
opt_title
);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop);
@@
-1734,8
+1744,7
@@
cmessage(XEvent *e)
win.mode &= ~MODE_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
win.mode &= ~MODE_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
- /* Send SIGHUP to shell */
- kill(pid, SIGHUP);
+ ttyhangup();
exit(0);
}
}
exit(0);
}
}
@@
-1756,6
+1765,7
@@
run(void)
int w = win.w, h = win.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
int w = win.w, h = win.h;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
+ int ttyfd;
struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
long deltatime;
struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
long deltatime;
@@
-1775,7
+1785,7
@@
run(void)
}
} while (ev.type != MapNotify);
}
} while (ev.type != MapNotify);
- tty
new(opt_line
, opt_io, opt_cmd);
+ tty
fd = ttynew(opt_line, shell
, opt_io, opt_cmd);
cresize(w, h);
clock_gettime(CLOCK_MONOTONIC, &last);
cresize(w, h);
clock_gettime(CLOCK_MONOTONIC, &last);
@@
-1783,15
+1793,15
@@
run(void)
for (xev = actionfps;;) {
FD_ZERO(&rfd);
for (xev = actionfps;;) {
FD_ZERO(&rfd);
- FD_SET(
cmd
fd, &rfd);
+ FD_SET(
tty
fd, &rfd);
FD_SET(xfd, &rfd);
FD_SET(xfd, &rfd);
- if (pselect(MAX(xfd,
cmd
fd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
+ if (pselect(MAX(xfd,
tty
fd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
- if (FD_ISSET(
cmd
fd, &rfd)) {
+ if (FD_ISSET(
tty
fd, &rfd)) {
ttyread();
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
ttyread();
if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
@@
-1835,7
+1845,7
@@
run(void)
if (xev && !FD_ISSET(xfd, &rfd))
xev--;
if (xev && !FD_ISSET(xfd, &rfd))
xev--;
- if (!FD_ISSET(
cmd
fd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+ if (!FD_ISSET(
tty
fd, &rfd) && !FD_ISSET(xfd, &rfd)) {
if (blinkset) {
if (TIMEDIFF(now, lastblink) \
> blinktimeout) {
if (blinkset) {
if (TIMEDIFF(now, lastblink) \
> blinktimeout) {
@@
-1922,16
+1932,18
@@
main(int argc, char *argv[])
} ARGEND;
run:
} ARGEND;
run:
- if (argc > 0) {
- /* eat all remaining arguments */
+ if (argc > 0) /* eat all remaining arguments */
opt_cmd = argv;
opt_cmd = argv;
- if (!opt_title && !opt_line)
- opt_title = basename(xstrdup(argv[0]));
- }
+
+ if (!opt_title)
+ opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
+
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
- tnew(MAX(cols, 1), MAX(rows, 1));
- xinit();
+ cols = MAX(cols, 1);
+ rows = MAX(rows, 1);
+ tnew(cols, rows);
+ xinit(cols, rows);
xsetenv();
selinit();
run();
xsetenv();
selinit();
run();