wmii

commit 8ad02afad2e5f9959c0fb26b02bca6fb9557854f
parent 01caae704088b190152565ad361f5942b06549a3
Author: garbeam <garbeam@wmii.de>
Date:   Thu, 12 Jan 2006 19:03:49 +0200

several other fixes concerning the borken sloppy crap


Diffstat:
cmd/wm/client.c
 | 
5
++---
cmd/wm/event.c
 | 
1
-
cmd/wm/page.c
 | 
3
++-
cmd/wm/wm.h
 | 
2
+-

4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -29,13 +29,12 @@ void
 focus_client(Client * c)
 {
     Frame *f = 0;
-	/*
 	static Client *old = nil;
 
 	if(old && (old != c)) {
 		ungrab_client(old, AnyModifier, AnyButton);
 		grab_client(old, AnyModifier, AnyButton);
-	}*/
+	}
 	
     /* sel client */
 	ungrab_client(c, AnyModifier, AnyButton);
@@ -47,7 +46,7 @@ focus_client(Client * c)
     XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
     invoke_wm_event(def[WM_EVENT_CLIENT_UPDATE]);
-	/*old = c;*/
+	old = c;
 }
 
 void
diff --git a/cmd/wm/event.c b/cmd/wm/event.c
@@ -66,7 +66,6 @@ handle_buttonpress(XEvent * e)
         if(c->frame) {          /* client is attached */
 			focus_layout(c->frame->layout);
 			focus_client(c);
-			c->frame->layout->def->focus(c->frame, False);
             ev->state &= valid_mask;
             if(ev->state & Mod1Mask) {
                 Align align;
diff --git a/cmd/wm/page.c b/cmd/wm/page.c
@@ -135,7 +135,8 @@ focus_page(Page * p)
     def[WM_SEL_PAGE]->content = p->file[P_PREFIX]->content;
     invoke_wm_event(def[WM_EVENT_PAGE_UPDATE]);
     focus_layout(sel_layout());
-    XChangeProperty(dpy, root, net_atoms[NET_CURRENT_DESKTOP], XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &(selpage->index), 1);
+    XChangeProperty(dpy, root, net_atoms[NET_CURRENT_DESKTOP], XA_CARDINAL,
+			        32, PropModeReplace, (unsigned char *) &(selpage->index), 1);
 }
 
 XRectangle *
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -84,7 +84,7 @@ enum {
 #define GAP                    5
 
 #define ROOT_MASK              SubstructureRedirectMask
-#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask | ButtonPressMask)
+#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask)
 
 typedef struct Page Page;
 typedef struct AttachQueue AttachQueue;