aboutsummaryrefslogtreecommitdiff
path: root/x.c
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2017-10-10 10:30:23 -0500
committerDevin J. Pohly <djpohly@gmail.com>2018-02-25 21:53:24 -0600
commit3e44ee5569a81ba6f06e1ecd19bf0ceb1e97f18d (patch)
treef1ae3a269e18cdff7638c7fe9eabe9a2bbab24b8 /x.c
parent1f24bde82b19912c080fbb4a0b153a248cd6c6ea (diff)
downloadst-3e44ee5569a81ba6f06e1ecd19bf0ceb1e97f18d.tar.gz
st-3e44ee5569a81ba6f06e1ecd19bf0ceb1e97f18d.tar.bz2
Call xsetenv() in main process instead of child
This makes xsetenv internal to x.c, and allows iso14755's external command to use $WINDOWID instead of having to snprintf it again. (The same benefit will apply to the externalpipe patch.) The xwinid function is no longer needed. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'x.c')
-rw-r--r--x.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/x.c b/x.c
index c484dfc..df2a88c 100644
--- a/x.c
+++ b/x.c
@@ -89,6 +89,7 @@ static void xdrawcursor(void);
static int xgeommasktogravity(int);
static int xloadfont(Font *, FcPattern *);
static void xunloadfont(Font *);
+static void xsetenv(void);
static void expose(XEvent *);
static void visibility(XEvent *);
@@ -1487,12 +1488,6 @@ xbell(int vol)
XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
}
-unsigned long
-xwinid(void)
-{
- return xw.win;
-}
-
void
focus(XEvent *ev)
{
@@ -1765,6 +1760,7 @@ run:
XSetLocaleModifiers("");
tnew(MAX(cols, 1), MAX(rows, 1));
xinit();
+ xsetenv();
selinit();
run();