fixed several things, nearly feature complete

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 1db3d96..937bee2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -9,7 +9,7 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "wm.h"
+#include "dwm.h"
 
 /* local functions */
 static void buttonpress(XEvent *e);
@@ -51,7 +51,7 @@ buttonpress(XEvent *e)
        Client *c;
 
        if((c = getclient(ev->window))) {
-               raise(c);
+               craise(c);
                switch(ev->button) {
                default:
                        break;
@@ -77,6 +77,7 @@ configurerequest(XEvent *e)
 
        ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
+               gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)
@@ -85,6 +86,9 @@ configurerequest(XEvent *e)
                        c->w = ev->width;
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = ev->border_width;
+               gravitate(c, False);
        }
 
        wc.x = ev->x;
@@ -122,7 +126,7 @@ enternotify(XEvent *e)
        if((c = getclient(ev->window)))
                focus(c);
        else if(ev->window == root)
-               sel_screen = True;
+               issel = True;
 }
 
 static void
@@ -131,7 +135,7 @@ leavenotify(XEvent *e)
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen)
-               sel_screen = True;
+               issel = True;
 }
 
 static void
@@ -143,8 +147,6 @@ expose(XEvent *e)
        if(ev->count == 0) {
                if((c = gettitle(ev->window)))
                        draw_client(c);
-               else if(ev->window == barwin)
-                       draw_bar();
        }
 }
 
@@ -182,11 +184,11 @@ propertynotify(XEvent *e)
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
-       if(ev->atom == wm_atom[WMProtocols]) {
-               c->proto = win_proto(c->win);
-               return;
-       }
        if((c = getclient(ev->window))) {
+               if(ev->atom == wm_atom[WMProtocols]) {
+                       c->proto = win_proto(c->win);
+                       return;
+               }
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
@@ -199,10 +201,7 @@ propertynotify(XEvent *e)
                }
                if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
                        update_name(c);
-                       if(c == stack)
-                               draw_bar();
-                       else
-                               draw_client(c);
+                       draw_client(c);
                }
        }
 }