several fixes

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 37196d1..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;
@@ -126,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
@@ -135,7 +135,7 @@ leavenotify(XEvent *e)
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen)
-               sel_screen = True;
+               issel = True;
 }
 
 static void
@@ -147,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();
        }
 }
 
@@ -203,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);
                }
        }
 }