commit f6daa294fa57c9b720f7e6792986e4e0230ea3c9
Author: FRIGN <[email protected]>
Date:   Thu Sep 17 13:14:41 2015 +0200

    st argbb - Add 0.6 patch and cleanup git-patches
    
    We only need one git-patch and don't want to wake up one day
    and have 20 different git-versions lying around.

diff --git a/st.suckless.org/patches/argbbg.md 
b/st.suckless.org/patches/argbbg.md
index 064a521..4abfe34 100644
--- a/st.suckless.org/patches/argbbg.md
+++ b/st.suckless.org/patches/argbbg.md
@@ -15,13 +15,11 @@ Note that **you need an X composite manager** to make this 
patch effective. (e.g
 ## Download ##
  * [st-0.4.1-argbbg.diff](st-0.4.1-argbbg.diff)
  * [st-0.5-argbbg.diff](st-0.5-argbbg.diff)
- * [st-git-20141122-argbbg.diff](st-git-20141122-argbbg.diff)
- * [st-git-20150611-argbbg.diff](st-git-20150611-argbbg.diff)
+ * [st-0.6-argbbg.diff](st-0.6-argbbg.diff)
  * [st-git-20150910-argbbg.diff](st-git-20150910-argbbg.diff)
 
 ## Authors ##
  * Eon S. Jeon - [email protected]
  * pr - [email protected] (st-0.5 port)
- * Juan Aguilar - [email protected] (st-git-20141122 port)
- * Laslo Hunhold - [email protected] (st-git-20150601 port)
+ * Laslo Hunhold - [email protected] (st-0.6 port)
  * David Phillips - [email protected] (st-git-20150910 port)
diff --git a/st.suckless.org/patches/st-0.6-argbbg.diff 
b/st.suckless.org/patches/st-0.6-argbbg.diff
new file mode 100644
index 0000000..4db4442
--- /dev/null
+++ b/st.suckless.org/patches/st-0.6-argbbg.diff
@@ -0,0 +1,170 @@
+diff --git a/config.def.h b/config.def.h
+index 64e75b8..9a27c14 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -58,6 +58,8 @@ static char termname[] = "st-256color";
+ 
+ static unsigned int tabspaces = 8;
+ 
++/* bg opacity */
++static const int alpha = 0xdd;
+ 
+ /* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+@@ -85,6 +87,7 @@ static const char *colorname[] = {
+ 
+       /* more colors can be added after 255 to use with DefaultXX */
+       "#cccccc",
++      "black",
+ };
+ 
+ 
+@@ -93,7 +96,7 @@ static const char *colorname[] = {
+  * foreground, background, cursor
+  */
+ static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
++static unsigned int defaultbg = 257;
+ static unsigned int defaultcs = 256;
+ 
+ /*
+diff --git a/config.mk b/config.mk
+index 67844dc..005b1c6 100644
+--- a/config.mk
++++ b/config.mk
+@@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib
+ INCS = -I. -I/usr/include -I${X11INC} \
+        `pkg-config --cflags fontconfig` \
+        `pkg-config --cflags freetype2`
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
++LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft 
-lXrender\
+        `pkg-config --libs fontconfig`  \
+        `pkg-config --libs freetype2`
+ 
+diff --git a/st.c b/st.c
+index b89d094..d212134 100644
+--- a/st.c
++++ b/st.c
+@@ -61,6 +61,7 @@ char *argv0;
+ #define XK_ANY_MOD    UINT_MAX
+ #define XK_NO_MOD     0
+ #define XK_SWITCH_MOD (1<<13)
++#define OPAQUE 0Xff
+ 
+ /* macros */
+ #define MIN(a, b)  ((a) < (b) ? (a) : (b))
+@@ -77,6 +78,7 @@ char *argv0;
+ #define IS_SET(flag) ((term.mode & (flag)) != 0)
+ #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + 
(t1.tv_nsec-t2.tv_nsec)/1E6)
+ #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
++#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
+ 
+ #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
+ #define IS_TRUECOL(x)    (1 << 24 & (x))
+@@ -265,6 +267,7 @@ typedef struct {
+       int w, h; /* window width and height */
+       int ch; /* char height */
+       int cw; /* char width  */
++      int depth; /*  bit depth */
+       char state; /* focus, redraw, visible */
+       int cursor; /* cursor style */
+ } XWindow;
+@@ -2895,8 +2898,7 @@ xresize(int col, int row) {
+       xw.th = MAX(1, row * xw.ch);
+ 
+       XFreePixmap(xw.dpy, xw.buf);
+-      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+-                      DefaultDepth(xw.dpy, xw.scr));
++      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
+       XftDrawChange(xw.draw, xw.buf);
+       xclear(0, 0, xw.w, xw.h);
+ }
+@@ -2946,6 +2948,14 @@ xloadcols(void) {
+                       else
+                               die("Could not allocate color %d
", i);
+               }
++
++      /* set alpha value of bg color */
++      if (USE_ARGB) {
++              dc.col[defaultbg].color.alpha = (0xffff * alpha) / OPAQUE; 
//0xcccc;
++              dc.col[defaultbg].pixel &= 0x00111111;
++              dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000;
++      }
++
+       loaded = true;
+ }
+ 
+@@ -3189,7 +3199,38 @@ xinit(void) {
+       if(!(xw.dpy = XOpenDisplay(NULL)))
+               die("Can't open display
");
+       xw.scr = XDefaultScreen(xw.dpy);
+-      xw.vis = XDefaultVisual(xw.dpy, xw.scr);
++      xw.depth = (USE_ARGB) ? 32: XDefaultDepth(xw.dpy, xw.scr);
++      if (! USE_ARGB)
++              xw.vis = XDefaultVisual(xw.dpy, xw.scr);
++      else {
++              XVisualInfo *vis;
++              XRenderPictFormat *fmt;
++              int nvi;
++              int i;
++
++              XVisualInfo tpl = {
++                      .screen = xw.scr,
++                      .depth = 32,
++                      .class = TrueColor
++              };
++
++              vis = XGetVisualInfo(xw.dpy, VisualScreenMask | VisualDepthMask 
| VisualClassMask, &tpl, &nvi);
++              xw.vis = NULL;
++              for(i = 0; i < nvi; i ++) {
++                      fmt = XRenderFindVisualFormat(xw.dpy, vis[i].visual);
++                      if (fmt->type == PictTypeDirect && 
fmt->direct.alphaMask) {
++                              xw.vis = vis[i].visual;
++                              break;
++                      }
++              }
++
++              XFree(vis);
++
++              if (! xw.vis) {
++                      fprintf(stderr, "Couldn't find ARGB visual.
");
++                      exit(1);
++              }
++      }
+ 
+       /* font */
+       if(!FcInit())
+@@ -3199,7 +3240,10 @@ xinit(void) {
+       xloadfonts(usedfont, 0);
+ 
+       /* colors */
+-      xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
++      if (! USE_ARGB)
++              xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
++      else
++              xw.cmap = XCreateColormap(xw.dpy, XRootWindow(xw.dpy, xw.scr), 
xw.vis, None);
+       xloadcols();
+ 
+       /* adjust fixed window geometry */
+@@ -3222,16 +3266,17 @@ xinit(void) {
+       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,
+-                      xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), 
InputOutput,
++                      xw.w, xw.h, 0, xw.depth, InputOutput,
+                       xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
+                       | CWEventMask | CWColormap, &xw.attrs);
+ 
+       memset(&gcvalues, 0, sizeof(gcvalues));
+       gcvalues.graphics_exposures = False;
+-      dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
++      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
++      dc.gc = XCreateGC(xw.dpy,
++                      (USE_ARGB)? xw.buf: parent,
++                      GCGraphicsExposures,
+                       &gcvalues);
+-      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+-                      DefaultDepth(xw.dpy, xw.scr));
+       XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
+       XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+ 
diff --git a/st.suckless.org/patches/st-git-20141122-argbbg.diff 
b/st.suckless.org/patches/st-git-20141122-argbbg.diff
deleted file mode 100644
index add8aad..0000000
--- a/st.suckless.org/patches/st-git-20141122-argbbg.diff
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1667ed6..09b8fd3 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -52,6 +52,8 @@ static char termname[] = "st-256color";
- 
- static unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+static const int alpha = 0xdd;
- 
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
-@@ -79,6 +81,7 @@ static const char *colorname[] = {
- 
-       /* more colors can be added after 255 to use with DefaultXX */
-       "#cccccc",
-+      "black",
- };
- 
- 
-@@ -87,7 +90,7 @@ static const char *colorname[] = {
-  * foreground, background, cursor
-  */
- static unsigned int defaultfg = 7;
--static unsigned int defaultbg = 0;
-+static unsigned int defaultbg = 257;
- static unsigned int defaultcs = 256;
- 
- /*
-diff --git a/config.mk b/config.mk
-index 298484e..69baf24 100644
---- a/config.mk
-+++ b/config.mk
-@@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib
- INCS = -I. -I/usr/include -I${X11INC} \
-        `pkg-config --cflags fontconfig` \
-        `pkg-config --cflags freetype2`
--LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
-+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft 
-lXrender\
-        `pkg-config --libs fontconfig`  \
-        `pkg-config --libs freetype2`
- 
-diff --git a/st.c b/st.c
-index fc91334..d4f0642 100644
---- a/st.c
-+++ b/st.c
-@@ -62,6 +62,7 @@ char *argv0;
- #define XK_ANY_MOD    UINT_MAX
- #define XK_NO_MOD     0
- #define XK_SWITCH_MOD (1<<13)
-+#define OPAQUE 0Xff
- 
- #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
- 
-@@ -79,6 +80,7 @@ char *argv0;
- #define IS_SET(flag) ((term.mode & (flag)) != 0)
- #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + 
(t1.tv_nsec-t2.tv_nsec)/1E6)
- #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-+#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
- 
- #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
- #define IS_TRUECOL(x)    (1 << 24 & (x))
-@@ -258,6 +260,7 @@ typedef struct {
-       int w, h; /* window width and height */
-       int ch; /* char height */
-       int cw; /* char width  */
-+      int depth; /*  bit depth */
-       char state; /* focus, redraw, visible */
- } XWindow;
- 
-@@ -2786,8 +2789,7 @@ xresize(int col, int row) {
-       xw.th = MAX(1, row * xw.ch);
- 
-       XFreePixmap(xw.dpy, xw.buf);
--      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
--                      DefaultDepth(xw.dpy, xw.scr));
-+      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
-       XftDrawChange(xw.draw, xw.buf);
-       xclear(0, 0, xw.w, xw.h);
- }
-@@ -2827,6 +2829,13 @@ xloadcols(void) {
-                       die("Could not allocate color %d
", i);
-       }
- 
-+      /*  set alpha value of bg color */
-+      if (USE_ARGB) {
-+              dc.col[defaultbg].color.alpha = (0xffff * alpha) / OPAQUE; 
//0xcccc;
-+              dc.col[defaultbg].pixel &= 0x00111111;
-+              dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000;
-+      }
-+
-       /* load colors [232-255] ; grayscale */
-       for(; i < 256; i++) {
-               color.red = color.green = color.blue = 0x0808 + 0x0a0a * 
(i-(6*6*6+16));
-@@ -3114,7 +3123,38 @@ xinit(void) {
-       if(!(xw.dpy = XOpenDisplay(NULL)))
-               die("Can't open display
");
-       xw.scr = XDefaultScreen(xw.dpy);
--      xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+      xw.depth = (USE_ARGB) ? 32: XDefaultDepth(xw.dpy, xw.scr);
-+      if (! USE_ARGB)
-+              xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+      else {
-+              XVisualInfo *vis;
-+              XRenderPictFormat *fmt;
-+              int nvi;
-+              int i;
-+
-+              XVisualInfo tpl = {
-+                      .screen = xw.scr,
-+                      .depth = 32,
-+                      .class = TrueColor
-+              };
-+
-+              vis = XGetVisualInfo(xw.dpy, VisualScreenMask | VisualDepthMask 
| VisualClassMask, &tpl, &nvi);
-+              xw.vis = NULL;
-+              for(i = 0; i < nvi; i ++) {
-+                      fmt = XRenderFindVisualFormat(xw.dpy, vis[i].visual);
-+                      if (fmt->type == PictTypeDirect && 
fmt->direct.alphaMask) {
-+                              xw.vis = vis[i].visual;
-+                              break;
-+                      }
-+              }
-+
-+              XFree(vis);
-+
-+              if (! xw.vis) {
-+                      fprintf(stderr, "Couldn't find ARGB visual.
");
-+                      exit(1);
-+              }
-+      }
- 
-       /* font */
-       if(!FcInit())
-@@ -3124,7 +3164,10 @@ xinit(void) {
-       xloadfonts(usedfont, 0);
- 
-       /* colors */
--      xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+      if (! USE_ARGB)
-+              xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+      else
-+              xw.cmap = XCreateColormap(xw.dpy, XRootWindow(xw.dpy, xw.scr), 
xw.vis, None);
-       xloadcols();
- 
-       /* adjust fixed window geometry */
-@@ -3147,16 +3190,17 @@ xinit(void) {
-       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,
--                      xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), 
InputOutput,
-+                      xw.w, xw.h, 0, xw.depth, InputOutput,
-                       xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
-                       | CWEventMask | CWColormap, &xw.attrs);
- 
-       memset(&gcvalues, 0, sizeof(gcvalues));
-       gcvalues.graphics_exposures = False;
--      dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
-+      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
-+      dc.gc = XCreateGC(xw.dpy,
-+                      (USE_ARGB)? xw.buf: parent,
-+                      GCGraphicsExposures,
-                       &gcvalues);
--      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
--                      DefaultDepth(xw.dpy, xw.scr));
-       XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
-       XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
- 
diff --git a/st.suckless.org/patches/st-git-20150611-argbbg.diff 
b/st.suckless.org/patches/st-git-20150611-argbbg.diff
deleted file mode 100644
index 817c502..0000000
--- a/st.suckless.org/patches/st-git-20150611-argbbg.diff
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index bb5596e..11ab57f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -58,6 +58,8 @@ static char termname[] = "st-256color";
- 
- static unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+static const int alpha = 0xdd;
- 
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
-@@ -85,6 +87,7 @@ static const char *colorname[] = {
- 
-       /* more colors can be added after 255 to use with DefaultXX */
-       "#cccccc",
-+      "black",
- };
- 
- 
-@@ -93,7 +96,7 @@ static const char *colorname[] = {
-  * foreground, background, cursor
-  */
- static unsigned int defaultfg = 7;
--static unsigned int defaultbg = 0;
-+static unsigned int defaultbg = 257;
- static unsigned int defaultcs = 256;
- 
- /*
-diff --git a/config.mk b/config.mk
-index 3026d87..f20d222 100644
---- a/config.mk
-+++ b/config.mk
-@@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib
- INCS = -I. -I/usr/include -I${X11INC} \
-        `pkg-config --cflags fontconfig` \
-        `pkg-config --cflags freetype2`
--LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
-+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft 
-lXrender\
-        `pkg-config --libs fontconfig`  \
-        `pkg-config --libs freetype2`
- 
-diff --git a/st.c b/st.c
-index 3dd5caf..dfa51b7 100644
---- a/st.c
-+++ b/st.c
-@@ -61,6 +61,7 @@ char *argv0;
- #define XK_ANY_MOD    UINT_MAX
- #define XK_NO_MOD     0
- #define XK_SWITCH_MOD (1<<13)
-+#define OPAQUE 0Xff
- 
- /* macros */
- #define MIN(a, b)  ((a) < (b) ? (a) : (b))
-@@ -77,6 +78,7 @@ char *argv0;
- #define IS_SET(flag) ((term.mode & (flag)) != 0)
- #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + 
(t1.tv_nsec-t2.tv_nsec)/1E6)
- #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-+#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
- 
- #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
- #define IS_TRUECOL(x)    (1 << 24 & (x))
-@@ -265,6 +267,7 @@ typedef struct {
-       int w, h; /* window width and height */
-       int ch; /* char height */
-       int cw; /* char width  */
-+      int depth; /*  bit depth */
-       char state; /* focus, redraw, visible */
-       int cursor; /* cursor style */
- } XWindow;
-@@ -2895,8 +2898,7 @@ xresize(int col, int row) {
-       xw.th = MAX(1, row * xw.ch);
- 
-       XFreePixmap(xw.dpy, xw.buf);
--      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
--                      DefaultDepth(xw.dpy, xw.scr));
-+      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
-       XftDrawChange(xw.draw, xw.buf);
-       xclear(0, 0, xw.w, xw.h);
- }
-@@ -2946,6 +2948,14 @@ xloadcols(void) {
-                       else
-                               die("Could not allocate color %d
", i);
-               }
-+
-+      /* set alpha value of bg color */
-+      if (USE_ARGB) {
-+              dc.col[defaultbg].color.alpha = (0xffff * alpha) / OPAQUE; 
//0xcccc;
-+              dc.col[defaultbg].pixel &= 0x00111111;
-+              dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000;
-+      }
-+
-       loaded = true;
- }
- 
-@@ -3190,7 +3200,38 @@ xinit(void) {
-       if(!(xw.dpy = XOpenDisplay(NULL)))
-               die("Can't open display
");
-       xw.scr = XDefaultScreen(xw.dpy);
--      xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+      xw.depth = (USE_ARGB) ? 32: XDefaultDepth(xw.dpy, xw.scr);
-+      if (! USE_ARGB)
-+              xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+      else {
-+              XVisualInfo *vis;
-+              XRenderPictFormat *fmt;
-+              int nvi;
-+              int i;
-+
-+              XVisualInfo tpl = {
-+                      .screen = xw.scr,
-+                      .depth = 32,
-+                      .class = TrueColor
-+              };
-+
-+              vis = XGetVisualInfo(xw.dpy, VisualScreenMask | VisualDepthMask 
| VisualClassMask, &tpl, &nvi);
-+              xw.vis = NULL;
-+              for(i = 0; i < nvi; i ++) {
-+                      fmt = XRenderFindVisualFormat(xw.dpy, vis[i].visual);
-+                      if (fmt->type == PictTypeDirect && 
fmt->direct.alphaMask) {
-+                              xw.vis = vis[i].visual;
-+                              break;
-+                      }
-+              }
-+
-+              XFree(vis);
-+
-+              if (! xw.vis) {
-+                      fprintf(stderr, "Couldn't find ARGB visual.
");
-+                      exit(1);
-+              }
-+      }
- 
-       /* font */
-       if(!FcInit())
-@@ -3200,7 +3241,10 @@ xinit(void) {
-       xloadfonts(usedfont, 0);
- 
-       /* colors */
--      xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+      if (! USE_ARGB)
-+              xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+      else
-+              xw.cmap = XCreateColormap(xw.dpy, XRootWindow(xw.dpy, xw.scr), 
xw.vis, None);
-       xloadcols();
- 
-       /* adjust fixed window geometry */
-@@ -3223,16 +3267,17 @@ xinit(void) {
-       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,
--                      xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), 
InputOutput,
-+                      xw.w, xw.h, 0, xw.depth, InputOutput,
-                       xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
-                       | CWEventMask | CWColormap, &xw.attrs);
- 
-       memset(&gcvalues, 0, sizeof(gcvalues));
-       gcvalues.graphics_exposures = False;
--      dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
-+      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth);
-+      dc.gc = XCreateGC(xw.dpy,
-+                      (USE_ARGB)? xw.buf: parent,
-+                      GCGraphicsExposures,
-                       &gcvalues);
--      xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
--                      DefaultDepth(xw.dpy, xw.scr));
-       XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
-       XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
- 


Reply via email to