added TOPBAR option for making the bar appear what the user likes

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 97fdbaf..68f60c7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -141,15 +141,15 @@ setup(void) {
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
-                       CopyFromParent, DefaultVisual(dpy, screen),
+       barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
        /* windowarea */
        wax = sx;
-       way = sy + bh;
+       way = sy + (TOPBAR ? bh : 0);
        wah = sh - bh;
        waw = sw;
        /* pixmap for everything */
@@ -172,24 +172,6 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
-int
-getproto(Window w) {
-       int i, format, protos, status;
-       unsigned long extra, res;
-       Atom *protocols, real;
-
-       protos = 0;
-       status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
-                       XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
-       if(status != Success || protocols == 0)
-               return protos;
-       for(i = 0; i < res; i++)
-               if(protocols[i] == wmatom[WMDelete])
-                       protos |= PROTODELWIN;
-       free(protocols);
-       return protos;
-}
-
 void
 sendevent(Window w, Atom a, long value) {
        XEvent e;