dwm-meillo
diff event.c @ 143:36cabfe408cd
applied Sanders patches
author | arg@10ksloc.org |
---|---|
date | Tue, 01 Aug 2006 12:32:33 +0200 |
parents | 22213b9a2114 |
children | e61447a7f249 |
line diff
1.1 --- a/event.c Tue Aug 01 11:49:19 2006 +0200 1.2 +++ b/event.c Tue Aug 01 12:32:33 2006 +0200 1.3 @@ -8,9 +8,6 @@ 1.4 #include <X11/keysym.h> 1.5 #include <X11/Xatom.h> 1.6 1.7 -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) 1.8 -#define MouseMask (ButtonMask | PointerMotionMask) 1.9 - 1.10 /* CUSTOMIZE */ 1.11 1.12 typedef struct { 1.13 @@ -20,17 +17,13 @@ 1.14 Arg arg; 1.15 } Key; 1.16 1.17 -/* 1.18 const char *browse[] = { "firefox", NULL }; 1.19 const char *gimp[] = { "gimp", NULL }; 1.20 -*/ 1.21 -const char *term[] = { "xterm", NULL }; 1.22 -/* 1.23 +const char *term[] = { /*"xterm", NULL };*/ 1.24 "urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", 1.25 "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL 1.26 }; 1.27 const char *xlock[] = { "xlock", NULL }; 1.28 -*/ 1.29 1.30 static Key key[] = { 1.31 /* modifier key function arguments */ 1.32 @@ -57,11 +50,9 @@ 1.33 { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, 1.34 { MODKEY|ShiftMask, XK_q, quit, { 0 } }, 1.35 { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, 1.36 - /* 1.37 { MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } }, 1.38 { MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } }, 1.39 { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, 1.40 - */ 1.41 }; 1.42 1.43 /* END CUSTOMIZE */ 1.44 @@ -172,6 +163,7 @@ 1.45 } 1.46 } 1.47 else if((c = getclient(ev->window))) { 1.48 + focus(c); 1.49 switch(ev->button) { 1.50 default: 1.51 break; 1.52 @@ -247,7 +239,7 @@ 1.53 Client *c; 1.54 XCrossingEvent *ev = &e->xcrossing; 1.55 1.56 - if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) 1.57 + if(ev->detail == NotifyInferior) 1.58 return; 1.59 1.60 if((c = getclient(ev->window)))