Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Call xsetenv() in main process instead of child
[st.git]
/
x.c
diff --git
a/x.c
b/x.c
index
c484dfc
..
df2a88c
100644
(file)
--- 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 int xgeommasktogravity(int);
static int xloadfont(Font *, FcPattern *);
static void xunloadfont(Font *);
+static void xsetenv(void);
static void expose(XEvent *);
static void visibility(XEvent *);
static void expose(XEvent *);
static void visibility(XEvent *);
@@
-1487,12
+1488,6
@@
xbell(int vol)
XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
}
XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
}
-unsigned long
-xwinid(void)
-{
- return xw.win;
-}
-
void
focus(XEvent *ev)
{
void
focus(XEvent *ev)
{
@@
-1765,6
+1760,7
@@
run:
XSetLocaleModifiers("");
tnew(MAX(cols, 1), MAX(rows, 1));
xinit();
XSetLocaleModifiers("");
tnew(MAX(cols, 1), MAX(rows, 1));
xinit();
+ xsetenv();
selinit();
run();
selinit();
run();