Mercurial > dwm-meillo
annotate event.c @ 145:774754477c35
applied Cedric's NumLock patch
| author | arg@10ksloc.org |
|---|---|
| date | Tue, 01 Aug 2006 12:41:38 +0200 |
| parents | e61447a7f249 |
| children | f328ce9c558c |
| rev | line source |
|---|---|
| 5 | 1 /* |
| 2 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com> | |
| 3 * See LICENSE file for license details. | |
| 4 */ | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
5 #include "dwm.h" |
| 5 | 6 |
| 7 #include <stdlib.h> | |
| 8 #include <X11/keysym.h> | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
9 #include <X11/Xatom.h> |
| 5 | 10 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
80
diff
changeset
|
11 /* CUSTOMIZE */ |
| 114 | 12 |
| 13 typedef struct { | |
| 14 unsigned long mod; | |
| 15 KeySym keysym; | |
| 16 void (*func)(Arg *arg); | |
| 17 Arg arg; | |
| 18 } Key; | |
| 19 | |
| 111 | 20 const char *browse[] = { "firefox", NULL }; |
| 21 const char *gimp[] = { "gimp", NULL }; | |
| 143 | 22 const char *term[] = { /*"xterm", NULL };*/ |
|
137
77922a389fa8
simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents:
133
diff
changeset
|
23 "urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", |
| 111 | 24 "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL |
| 25 }; | |
| 123 | 26 const char *xlock[] = { "xlock", NULL }; |
| 75 | 27 |
| 114 | 28 static Key key[] = { |
| 123 | 29 /* modifier key function arguments */ |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
30 { MODKEY, XK_0, view, { .i = Tfnord } }, |
| 123 | 31 { MODKEY, XK_1, view, { .i = Tdev } }, |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
32 { MODKEY, XK_2, view, { .i = Tnet } }, |
| 123 | 33 { MODKEY, XK_3, view, { .i = Twork } }, |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
34 { MODKEY, XK_4, view, { .i = Tmisc} }, |
|
144
e61447a7f249
applied Jukkas prev/next patch with XK_{h,l}
arg@10ksloc.org
parents:
143
diff
changeset
|
35 { MODKEY, XK_h, viewprev, { 0 } }, |
| 123 | 36 { MODKEY, XK_j, focusnext, { 0 } }, |
| 37 { MODKEY, XK_k, focusprev, { 0 } }, | |
|
144
e61447a7f249
applied Jukkas prev/next patch with XK_{h,l}
arg@10ksloc.org
parents:
143
diff
changeset
|
38 { MODKEY, XK_l, viewnext, { 0 } }, |
|
124
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
39 { MODKEY, XK_m, togglemax, { 0 } }, |
|
75576e44c1d8
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
arg@10ksloc.org
parents:
123
diff
changeset
|
40 { MODKEY, XK_space, togglemode, { 0 } }, |
| 123 | 41 { MODKEY, XK_Return, zoom, { 0 } }, |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
42 { MODKEY|ControlMask, XK_0, appendtag, { .i = Tfnord } }, |
|
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
43 { MODKEY|ControlMask, XK_1, appendtag, { .i = Tdev } }, |
|
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
44 { MODKEY|ControlMask, XK_2, appendtag, { .i = Tnet } }, |
|
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
45 { MODKEY|ControlMask, XK_3, appendtag, { .i = Twork } }, |
|
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
46 { MODKEY|ControlMask, XK_4, appendtag, { .i = Tmisc } }, |
|
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
47 { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tfnord } }, |
| 123 | 48 { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
49 { MODKEY|ShiftMask, XK_2, replacetag, { .i = Tnet } }, |
| 123 | 50 { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, |
|
130
30d1302dbe3b
sanitization of several clunky stuff, removed heretag (rarely of use), simplified pop(), changed shortcuts to always contain MODKEY
arg@10ksloc.org
parents:
125
diff
changeset
|
51 { MODKEY|ShiftMask, XK_4, replacetag, { .i = Tmisc } }, |
| 123 | 52 { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, |
| 139 | 53 { MODKEY|ShiftMask, XK_q, quit, { 0 } }, |
| 54 { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, | |
| 123 | 55 { MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } }, |
| 56 { MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } }, | |
| 57 { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, | |
| 75 | 58 }; |
| 59 | |
| 145 | 60 #define NumLockMask Mod2Mask |
| 61 unsigned int valid_mask = 255 & ~( NumLockMask | LockMask); | |
| 62 | |
| 125 | 63 /* END CUSTOMIZE */ |
| 64 | |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
80
diff
changeset
|
65 /* static */ |
| 75 | 66 |
| 77 | 67 static void |
| 68 movemouse(Client *c) | |
| 69 { | |
| 70 int x1, y1, ocx, ocy, di; | |
| 71 unsigned int dui; | |
| 72 Window dummy; | |
| 123 | 73 XEvent ev; |
| 77 | 74 |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
75 ocx = c->x; |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
76 ocy = c->y; |
| 77 | 77 if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, |
| 123 | 78 None, cursor[CurMove], CurrentTime) != GrabSuccess) |
| 77 | 79 return; |
| 80 XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); | |
| 81 for(;;) { | |
| 82 XMaskEvent(dpy, MouseMask | ExposureMask, &ev); | |
| 83 switch (ev.type) { | |
| 84 default: break; | |
| 85 case Expose: | |
| 86 handler[Expose](&ev); | |
| 87 break; | |
| 88 case MotionNotify: | |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
89 XSync(dpy, False); |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
90 c->x = ocx + (ev.xmotion.x - x1); |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
91 c->y = ocy + (ev.xmotion.y - y1); |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
92 resize(c, False, TopLeft); |
| 77 | 93 break; |
| 94 case ButtonRelease: | |
| 95 XUngrabPointer(dpy, CurrentTime); | |
| 96 return; | |
| 97 } | |
| 98 } | |
| 99 } | |
| 100 | |
| 101 static void | |
| 102 resizemouse(Client *c) | |
| 103 { | |
| 104 int ocx, ocy; | |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
105 Corner sticky; |
| 123 | 106 XEvent ev; |
| 77 | 107 |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
108 ocx = c->x; |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
109 ocy = c->y; |
| 77 | 110 if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, |
| 111 None, cursor[CurResize], CurrentTime) != GrabSuccess) | |
| 112 return; | |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
113 XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); |
| 77 | 114 for(;;) { |
| 115 XMaskEvent(dpy, MouseMask | ExposureMask, &ev); | |
| 116 switch(ev.type) { | |
| 117 default: break; | |
| 118 case Expose: | |
| 119 handler[Expose](&ev); | |
| 120 break; | |
| 121 case MotionNotify: | |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
122 XSync(dpy, False); |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
123 c->w = abs(ocx - ev.xmotion.x); |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
124 c->h = abs(ocy - ev.xmotion.y); |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
125 c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w; |
|
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
126 c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h; |
| 105 | 127 if(ocx <= ev.xmotion.x) |
| 128 sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft; | |
| 129 else | |
| 130 sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight; | |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
131 resize(c, True, sticky); |
| 77 | 132 break; |
| 133 case ButtonRelease: | |
| 134 XUngrabPointer(dpy, CurrentTime); | |
| 135 return; | |
| 136 } | |
| 137 } | |
| 138 } | |
| 73 | 139 |
| 140 static void | |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
141 buttonpress(XEvent *e) |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
142 { |
| 73 | 143 int x; |
| 144 Arg a; | |
| 123 | 145 Client *c; |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
146 XButtonPressedEvent *ev = &e->xbutton; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
147 |
| 73 | 148 if(barwin == ev->window) { |
|
80
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
149 switch(ev->button) { |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
150 default: |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
151 x = 0; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
152 for(a.i = 0; a.i < TLast; a.i++) { |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
153 x += textw(tags[a.i]); |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
154 if(ev->x < x) { |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
155 view(&a); |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
156 break; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
157 } |
| 73 | 158 } |
|
80
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
159 break; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
160 case Button4: |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
161 a.i = (tsel + 1 < TLast) ? tsel + 1 : 0; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
162 view(&a); |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
163 break; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
164 case Button5: |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
165 a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1; |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
166 view(&a); |
|
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
167 break; |
| 73 | 168 } |
| 169 } | |
|
58
1269bd127551
made barclick to select the specific tag
Anselm R. Garbe <garbeam@wmii.de>
parents:
55
diff
changeset
|
170 else if((c = getclient(ev->window))) { |
| 143 | 171 focus(c); |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
172 switch(ev->button) { |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
173 default: |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
174 break; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
175 case Button1: |
| 133 | 176 if(!c->ismax && (arrange == dofloat || c->isfloat)) { |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
177 higher(c); |
|
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
178 movemouse(c); |
|
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
179 } |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
180 break; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
181 case Button2: |
|
26
e8f627998d6f
simplified several portions of code through replacing rect structs with x,y,h,w counterparts (much more readable)
Anselm R. Garbe <garbeam@wmii.de>
parents:
25
diff
changeset
|
182 lower(c); |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
183 break; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
184 case Button3: |
| 133 | 185 if(!c->ismax && (arrange == dofloat || c->isfloat)) { |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
186 higher(c); |
|
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
187 resizemouse(c); |
|
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
188 } |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
189 break; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
190 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
191 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
192 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
193 |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
194 static void |
| 5 | 195 configurerequest(XEvent *e) |
| 196 { | |
| 123 | 197 Client *c; |
| 5 | 198 XConfigureRequestEvent *ev = &e->xconfigurerequest; |
| 199 XWindowChanges wc; | |
| 200 | |
| 201 ev->value_mask &= ~CWSibling; | |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
202 if((c = getclient(ev->window))) { |
| 29 | 203 gravitate(c, True); |
| 5 | 204 if(ev->value_mask & CWX) |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
205 c->x = ev->x; |
| 5 | 206 if(ev->value_mask & CWY) |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
207 c->y = ev->y; |
| 5 | 208 if(ev->value_mask & CWWidth) |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
209 c->w = ev->width; |
| 5 | 210 if(ev->value_mask & CWHeight) |
|
115
329fd7dae530
removed c->f{x,y,w,h} and c->t{x,y,w,h} in favor for the new rule handling remembering two kinds of geometries is unnecessary, removed the randomized (x,y) setting on dofloat startup, was kind too random und unpredictable
arg@10ksloc.org
parents:
114
diff
changeset
|
211 c->h = ev->height; |
| 29 | 212 if(ev->value_mask & CWBorderWidth) |
| 55 | 213 c->border = 1; |
| 29 | 214 gravitate(c, False); |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
215 resize(c, True, TopLeft); |
| 5 | 216 } |
| 217 | |
| 218 wc.x = ev->x; | |
| 219 wc.y = ev->y; | |
| 220 wc.width = ev->width; | |
| 221 wc.height = ev->height; | |
| 25 | 222 wc.border_width = 1; |
| 5 | 223 wc.sibling = None; |
| 224 wc.stack_mode = Above; | |
| 225 ev->value_mask &= ~CWStackMode; | |
| 226 ev->value_mask |= CWBorderWidth; | |
| 227 XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); | |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
228 XSync(dpy, False); |
| 5 | 229 } |
| 230 | |
| 231 static void | |
| 232 destroynotify(XEvent *e) | |
| 233 { | |
| 234 Client *c; | |
| 235 XDestroyWindowEvent *ev = &e->xdestroywindow; | |
| 236 | |
| 11 | 237 if((c = getclient(ev->window))) |
| 238 unmanage(c); | |
| 5 | 239 } |
| 240 | |
| 241 static void | |
| 242 enternotify(XEvent *e) | |
| 243 { | |
| 123 | 244 Client *c; |
| 5 | 245 XCrossingEvent *ev = &e->xcrossing; |
| 246 | |
| 143 | 247 if(ev->detail == NotifyInferior) |
| 5 | 248 return; |
| 249 | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
250 if((c = getclient(ev->window))) |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
251 focus(c); |
|
26
e8f627998d6f
simplified several portions of code through replacing rect structs with x,y,h,w counterparts (much more readable)
Anselm R. Garbe <garbeam@wmii.de>
parents:
25
diff
changeset
|
252 else if(ev->window == root) |
| 31 | 253 issel = True; |
| 5 | 254 } |
| 255 | |
| 256 static void | |
| 257 expose(XEvent *e) | |
| 258 { | |
| 123 | 259 Client *c; |
| 5 | 260 XExposeEvent *ev = &e->xexpose; |
| 261 | |
| 262 if(ev->count == 0) { | |
| 70 | 263 if(barwin == ev->window) |
| 74 | 264 drawstatus(); |
| 75 | 265 else if((c = getctitle(ev->window))) |
| 74 | 266 drawtitle(c); |
| 5 | 267 } |
| 268 } | |
| 269 | |
| 270 static void | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
271 keypress(XEvent *e) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
272 { |
|
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
273 static unsigned int len = sizeof(key) / sizeof(key[0]); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
274 unsigned int i; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
275 KeySym keysym; |
| 123 | 276 XKeyEvent *ev = &e->xkey; |
| 145 | 277 ev->state &= valid_mask; |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
278 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
279 keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
280 for(i = 0; i < len; i++) |
| 145 | 281 if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
282 if(key[i].func) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
283 key[i].func(&key[i].arg); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
284 return; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
285 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
286 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
287 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
288 static void |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
289 leavenotify(XEvent *e) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
290 { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
291 XCrossingEvent *ev = &e->xcrossing; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
292 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
293 if((ev->window == root) && !ev->same_screen) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
294 issel = True; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
295 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
296 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
297 static void |
| 5 | 298 maprequest(XEvent *e) |
| 299 { | |
| 123 | 300 static XWindowAttributes wa; |
| 5 | 301 XMapRequestEvent *ev = &e->xmaprequest; |
| 302 | |
| 303 if(!XGetWindowAttributes(dpy, ev->window, &wa)) | |
| 304 return; | |
| 305 | |
| 306 if(wa.override_redirect) { | |
| 307 XSelectInput(dpy, ev->window, | |
| 308 (StructureNotifyMask | PropertyChangeMask)); | |
| 309 return; | |
| 310 } | |
| 311 | |
|
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
312 if(!getclient(ev->window)) |
|
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
313 manage(ev->window, &wa); |
| 5 | 314 } |
| 315 | |
| 316 static void | |
| 317 propertynotify(XEvent *e) | |
| 318 { | |
| 123 | 319 Client *c; |
| 53 | 320 Window trans; |
| 123 | 321 XPropertyEvent *ev = &e->xproperty; |
| 5 | 322 |
| 323 if(ev->state == PropertyDelete) | |
| 324 return; /* ignore */ | |
| 325 | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
326 if((c = getclient(ev->window))) { |
| 77 | 327 if(ev->atom == wmatom[WMProtocols]) { |
| 75 | 328 c->proto = getproto(c->win); |
|
30
2e0fb4130bfb
new stuff, fixed several issues
Anselm R. Garbe <garbeam@wmii.de>
parents:
29
diff
changeset
|
329 return; |
|
2e0fb4130bfb
new stuff, fixed several issues
Anselm R. Garbe <garbeam@wmii.de>
parents:
29
diff
changeset
|
330 } |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
331 switch (ev->atom) { |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
332 default: break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
333 case XA_WM_TRANSIENT_FOR: |
| 53 | 334 XGetTransientForHint(dpy, c->win, &trans); |
|
80
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
335 if(!c->isfloat && (c->isfloat = (trans != 0))) |
| 53 | 336 arrange(NULL); |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
337 break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
338 case XA_WM_NORMAL_HINTS: |
| 74 | 339 setsize(c); |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
340 break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
341 } |
| 77 | 342 if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { |
| 74 | 343 settitle(c); |
| 344 drawtitle(c); | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
345 } |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
346 } |
| 5 | 347 } |
| 348 | |
| 349 static void | |
| 350 unmapnotify(XEvent *e) | |
| 351 { | |
| 352 Client *c; | |
| 353 XUnmapEvent *ev = &e->xunmap; | |
| 354 | |
|
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
355 if((c = getclient(ev->window))) |
|
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
356 unmanage(c); |
| 5 | 357 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
358 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
80
diff
changeset
|
359 /* extern */ |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
360 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
361 void (*handler[LASTEvent]) (XEvent *) = { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
362 [ButtonPress] = buttonpress, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
363 [ConfigureRequest] = configurerequest, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
364 [DestroyNotify] = destroynotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
365 [EnterNotify] = enternotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
366 [LeaveNotify] = leavenotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
367 [Expose] = expose, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
368 [KeyPress] = keypress, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
369 [MapRequest] = maprequest, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
370 [PropertyNotify] = propertynotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
371 [UnmapNotify] = unmapnotify |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
372 }; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
373 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
374 void |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
375 grabkeys() |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
376 { |
|
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
377 static unsigned int len = sizeof(key) / sizeof(key[0]); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
378 unsigned int i; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
379 KeyCode code; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
380 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
381 for(i = 0; i < len; i++) { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
382 code = XKeysymToKeycode(dpy, key[i].keysym); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
383 XUngrabKey(dpy, code, key[i].mod, root); |
| 145 | 384 if (NumLockMask) |
| 385 { | |
| 386 XUngrabKey(dpy, code, key[i].mod | NumLockMask, root); | |
| 387 XUngrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root); | |
| 388 } | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
389 XGrabKey(dpy, code, key[i].mod, root, True, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
390 GrabModeAsync, GrabModeAsync); |
| 145 | 391 if (NumLockMask) |
| 392 { | |
| 393 XGrabKey(dpy, code, key[i].mod | NumLockMask, root, True, | |
| 394 GrabModeAsync, GrabModeAsync); | |
| 395 XGrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root, True, | |
| 396 GrabModeAsync, GrabModeAsync); | |
| 397 } | |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
398 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
399 } |