5 files changed, 13 insertions, 42 deletions

diff --git a/config.def.h b/config.def.h
index 85a1d17..546edda 100644
--- a/config.def.h
+++ b/config.def.h
@@ -82,9 +82,6 @@ char *termname = "st-256color";
  */
 unsigned int tabspaces = 8;
 
-/* bg opacity */
-float alpha = 0.8;
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
         /* 8 normal colors */
@@ -112,7 +109,6 @@ static const char *colorname[] = {
         /* more colors can be added after 255 to use with DefaultXX */
         "#cccccc",
         "#555555",
-    "black",
 };
 
 
@@ -121,7 +117,7 @@ static const char *colorname[] = {
  * foreground, background, cursor, reverse cursor
  */
 unsigned int defaultfg = 7;
-unsigned int defaultbg = 258;
+unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
 static unsigned int defaultrcs = 257;
 
diff --git a/config.h b/config.h
index 0c73d67..363b2b9 100644
--- a/config.h
+++ b/config.h
@@ -87,9 +87,6 @@ char *termname = "st-256color";
  */
 unsigned int tabspaces = 8;
  
-/* bg opacity */
-float alpha = 0.8;
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
         /* 8 normal colors */
@@ -117,7 +114,6 @@ static const char *colorname[] = {
         /* more colors can be added after 255 to use with DefaultXX */
         "#cccccc",
         "#555555",
-    "black",
 };
 
 
@@ -126,7 +122,7 @@ static const char *colorname[] = {
  * foreground, background, cursor, reverse cursor
  */
 unsigned int defaultfg = 7;
-unsigned int defaultbg = 258;
+unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
 static unsigned int defaultrcs = 257;
 
diff --git a/config.mk b/config.mk
index 814a051..5d202e5 100644
--- a/config.mk
+++ b/config.mk
@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
 INCS = -I$(X11INC) \
        `$(PKG_CONFIG) --cflags fontconfig` \
        `$(PKG_CONFIG) --cflags freetype2`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
        `$(PKG_CONFIG) --libs fontconfig` \
        `$(PKG_CONFIG) --libs freetype2`
 
diff --git a/st.h b/st.h
index 64e6ea3..a1928ca 100644
--- a/st.h
+++ b/st.h
@@ -121,4 +121,3 @@ extern char *termname;
 extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
-extern float alpha;
diff --git a/x.c b/x.c
index 5afa802..57f6f1b 100644
--- a/x.c
+++ b/x.c
@@ -105,7 +105,6 @@ typedef struct {
         XSetWindowAttributes attrs;
         int scr;
         int isfixed; /* is fixed geometry? */
-    int depth; /* bit depth */
         int l, t; /* left and top offset */
         int gm; /* geometry mask */
 } XWindow;
@@ -245,7 +244,6 @@ static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
 
-static char *opt_alpha = NULL;
 static char *opt_class = NULL;
 static char **opt_cmd  = NULL;
 static char *opt_embed = NULL;
@@ -724,7 +722,7 @@ xresize(int col, int row)
 
         XFreePixmap(xw.dpy, xw.buf);
         xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-                        xw.depth);
+            DefaultDepth(xw.dpy, xw.scr));
         XftDrawChange(xw.draw, xw.buf);
         xclear(0, 0, win.w, win.h);
 
@@ -784,13 +782,6 @@ xloadcols(void)
                         else
                                 die("could not allocate color %d\n", i);
                 }
-
-        /* set alpha value of bg color */
-        if (opt_alpha)
-                alpha = strtof(opt_alpha, NULL);
-        dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-        dc.col[defaultbg].pixel &= 0x00FFFFFF;
-        dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
         loaded = 1;
 }
 
@@ -1196,23 +1187,11 @@ xinit(int cols, int rows)
         Window parent;
         pid_t thispid = getpid();
         XColor xmousefg, xmousebg;
-        XWindowAttributes attr;
-        XVisualInfo vis;
 
         if (!(xw.dpy = XOpenDisplay(NULL)))
                 die("can't open display\n");
         xw.scr = XDefaultScreen(xw.dpy);
-
-        if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-                parent = XRootWindow(xw.dpy, xw.scr);
-                xw.depth = 32;
-        } else {
-                XGetWindowAttributes(xw.dpy, parent, &attr);
-                xw.depth = attr.depth;
-        }
-
-        XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-        xw.vis = vis.visual;
+    xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
         /* font */
         if (!FcInit())
@@ -1225,7 +1204,7 @@ xinit(int cols, int rows)
         xloadsparefonts();
 
         /* colors */
-        xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
+    xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
         xloadcols();
 
         /* adjust fixed window geometry */
@@ -1245,15 +1224,19 @@ xinit(int cols, int rows)
                 | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
         xw.attrs.colormap = xw.cmap;
 
+    if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+        parent = XRootWindow(xw.dpy, xw.scr);
         xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
-                        win.w, win.h, 0, xw.depth, InputOutput,
+            win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                         xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
                         | CWEventMask | CWColormap, &xw.attrs);
 
         memset(&gcvalues, 0, sizeof(gcvalues));
         gcvalues.graphics_exposures = False;
-    xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-    dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
+    dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+        &gcvalues);
+    xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
+        DefaultDepth(xw.dpy, xw.scr));
         XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
         XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
@@ -2098,9 +2081,6 @@ main(int argc, char *argv[])
         case 'a':
                 allowaltscreen = 0;
                 break;
-        case 'A':
-                opt_alpha = EARGF(usage());
-                break;
         case 'c':
                 opt_class = EARGF(usage());
                 break;