Call xsetenv() in main process instead of child

[st.git] / x.c

diff --git a/x.c b/x.c
index 474d73b..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 *);


@@ -1193,6 +1194,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;

+               colfg.alpha = fg->color.alpha;

                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }
                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }


@@ -1486,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)
 {


@@ -1764,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();