Mercurial > aewl
annotate event.c @ 489:d34374cbe926
simplified mouse resizals
| author | arg@mmvi |
|---|---|
| date | Mon, 25 Sep 2006 21:19:18 +0200 |
| parents | 0d2559f46b9e |
| children | 303d3384720e |
| 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 #include <stdlib.h> |
| 7 #include <X11/keysym.h> | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
8 #include <X11/Xatom.h> |
| 5 | 9 |
|
146
f328ce9c558c
centralized/externalized configuration to config.h
arg@10ksloc.org
parents:
145
diff
changeset
|
10 /* static */ |
| 114 | 11 |
| 12 typedef struct { | |
| 13 unsigned long mod; | |
| 14 KeySym keysym; | |
| 15 void (*func)(Arg *arg); | |
| 16 Arg arg; | |
| 17 } Key; | |
| 18 | |
|
146
f328ce9c558c
centralized/externalized configuration to config.h
arg@10ksloc.org
parents:
145
diff
changeset
|
19 KEYS |
| 75 | 20 |
|
291
8e6e0aa5e2ae
removed NUMLOCKMASK, added dynamically calculated numlockmask instead
Anselm R.Garbe <arg@10ksloc.org>
parents:
288
diff
changeset
|
21 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) |
| 75 | 22 |
| 77 | 23 static void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
24 movemouse(Client *c) { |
| 77 | 25 int x1, y1, ocx, ocy, di; |
| 26 unsigned int dui; | |
| 27 Window dummy; | |
| 123 | 28 XEvent ev; |
| 77 | 29 |
|
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
|
30 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
|
31 ocy = c->y; |
|
148
5267e1204367
uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)
arg@10ksloc.org
parents:
146
diff
changeset
|
32 if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, |
| 123 | 33 None, cursor[CurMove], CurrentTime) != GrabSuccess) |
| 77 | 34 return; |
| 482 | 35 c->ismax = False; |
| 77 | 36 XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); |
| 37 for(;;) { | |
| 489 | 38 XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); |
| 77 | 39 switch (ev.type) { |
| 40 case Expose: | |
| 41 handler[Expose](&ev); | |
| 42 break; | |
| 43 case MotionNotify: | |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
44 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
|
45 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
|
46 c->y = ocy + (ev.xmotion.y - y1); |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
47 resize(c, False, TopLeft); |
| 77 | 48 break; |
| 49 case ButtonRelease: | |
| 50 XUngrabPointer(dpy, CurrentTime); | |
| 51 return; | |
| 52 } | |
| 53 } | |
| 54 } | |
| 55 | |
| 56 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
57 resizemouse(Client *c) { |
| 77 | 58 int ocx, ocy; |
|
268
a47b3b0d7bf4
applied Sanders LD and resize patches
Anselm R.Garbe <arg@10ksloc.org>
parents:
267
diff
changeset
|
59 int nw, nh; |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
60 Corner sticky; |
| 123 | 61 XEvent ev; |
| 77 | 62 |
|
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
|
63 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
|
64 ocy = c->y; |
|
148
5267e1204367
uppercasing all define'd values (uppercase-prefixed should only be enum field qualifiers)
arg@10ksloc.org
parents:
146
diff
changeset
|
65 if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, |
| 77 | 66 None, cursor[CurResize], CurrentTime) != GrabSuccess) |
| 67 return; | |
| 482 | 68 c->ismax = 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
|
69 XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); |
| 77 | 70 for(;;) { |
| 489 | 71 XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); |
| 77 | 72 switch(ev.type) { |
| 73 case Expose: | |
| 74 handler[Expose](&ev); | |
| 75 break; | |
| 76 case MotionNotify: | |
|
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
77 XSync(dpy, False); |
|
268
a47b3b0d7bf4
applied Sanders LD and resize patches
Anselm R.Garbe <arg@10ksloc.org>
parents:
267
diff
changeset
|
78 if((nw = abs(ocx - ev.xmotion.x))) |
| 478 | 79 c->w = nw; |
|
268
a47b3b0d7bf4
applied Sanders LD and resize patches
Anselm R.Garbe <arg@10ksloc.org>
parents:
267
diff
changeset
|
80 if((nh = abs(ocy - ev.xmotion.y))) |
| 478 | 81 c->h = nh; |
|
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
|
82 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
|
83 c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h; |
| 105 | 84 if(ocx <= ev.xmotion.x) |
| 85 sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft; | |
| 86 else | |
| 87 sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight; | |
|
99
a19556fe83b5
applied Sanders resize patch, fixed lower bug
arg@10ksloc.org
parents:
95
diff
changeset
|
88 resize(c, True, sticky); |
| 77 | 89 break; |
| 90 case ButtonRelease: | |
| 91 XUngrabPointer(dpy, CurrentTime); | |
| 92 return; | |
| 93 } | |
| 94 } | |
| 95 } | |
| 73 | 96 |
| 97 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
98 buttonpress(XEvent *e) { |
| 73 | 99 int x; |
| 100 Arg a; | |
| 123 | 101 Client *c; |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
102 XButtonPressedEvent *ev = &e->xbutton; |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
103 |
| 73 | 104 if(barwin == ev->window) { |
|
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
105 x = 0; |
|
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
106 for(a.i = 0; a.i < ntags; a.i++) { |
|
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
107 x += textw(tags[a.i]); |
|
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
108 if(ev->x < x) { |
| 399 | 109 if(ev->button == Button1) { |
| 398 | 110 if(ev->state & MODKEY) |
| 111 tag(&a); | |
| 112 else | |
| 113 view(&a); | |
| 399 | 114 } |
| 115 else if(ev->button == Button3) { | |
| 398 | 116 if(ev->state & MODKEY) |
| 117 toggletag(&a); | |
| 118 else | |
| 119 toggleview(&a); | |
|
394
1da9a6b94ca9
implemented Button2 press on tags for toggletag on the focused client
Anselm R. Garbe <arg@10kloc.org>
parents:
387
diff
changeset
|
120 } |
|
362
ba6c55e1b9b2
trying a different configuration
Anselm R. Garbe <arg@10kloc.org>
parents:
356
diff
changeset
|
121 return; |
| 73 | 122 } |
| 123 } | |
|
371
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
124 if(ev->x < x + bmw) { |
|
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
125 if(ev->button == Button1) |
|
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
126 togglemode(NULL); |
|
fc9d35252ab4
applied sanders somepatches.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
362
diff
changeset
|
127 } |
| 73 | 128 } |
|
58
1269bd127551
made barclick to select the specific tag
Anselm R. Garbe <garbeam@wmii.de>
parents:
55
diff
changeset
|
129 else if((c = getclient(ev->window))) { |
| 143 | 130 focus(c); |
|
473
2d8af0d7920d
implemented the maximization as I described on the mailinglist, this feels better to me.
arg@mmvi
parents:
466
diff
changeset
|
131 if(CLEANMASK(ev->state) != MODKEY) |
|
318
1b45d6f14fca
applied Sanders focus_* patches, removed the unnecessary clean-prefix from the new function names
Anselm R.Garbe <arg@10ksloc.org>
parents:
292
diff
changeset
|
132 return; |
|
400
052657ff2e7b
applied Sanders max_and_focus.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
399
diff
changeset
|
133 if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) { |
| 487 | 134 restack(); |
| 399 | 135 movemouse(c); |
| 136 } | |
| 137 else if(ev->button == Button2) | |
|
248
1227c21588e2
applied Sanders zoom_update patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
239
diff
changeset
|
138 zoom(NULL); |
|
400
052657ff2e7b
applied Sanders max_and_focus.patch
Anselm R. Garbe <arg@10kloc.org>
parents:
399
diff
changeset
|
139 else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) { |
| 487 | 140 restack(); |
| 399 | 141 resizemouse(c); |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
142 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
143 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
144 } |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
145 |
|
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
146 static void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
147 configurerequest(XEvent *e) { |
| 286 | 148 unsigned long newmask; |
| 123 | 149 Client *c; |
| 5 | 150 XConfigureRequestEvent *ev = &e->xconfigurerequest; |
| 489 | 151 XEvent synev; |
| 5 | 152 XWindowChanges wc; |
| 153 | |
|
18
1efa34c6e1b6
added mouse-based resizals
Anselm R. Garbe <garbeam@wmii.de>
parents:
16
diff
changeset
|
154 if((c = getclient(ev->window))) { |
| 488 | 155 c->ismax = False; |
| 29 | 156 gravitate(c, True); |
|
195
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
157 if(ev->value_mask & CWX) |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
158 c->x = ev->x; |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
159 if(ev->value_mask & CWY) |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
160 c->y = ev->y; |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
161 if(ev->value_mask & CWWidth) |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
162 c->w = ev->width; |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
163 if(ev->value_mask & CWHeight) |
|
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
164 c->h = ev->height; |
| 29 | 165 if(ev->value_mask & CWBorderWidth) |
|
164
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
166 c->border = ev->border_width; |
| 29 | 167 gravitate(c, False); |
|
164
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
168 wc.x = c->x; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
169 wc.y = c->y; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
170 wc.width = c->w; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
171 wc.height = c->h; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
172 newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth)); |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
173 if(newmask) |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
174 XConfigureWindow(dpy, c->win, newmask, &wc); |
| 489 | 175 else { |
| 176 synev.type = ConfigureNotify; | |
| 177 synev.xconfigure.display = dpy; | |
| 178 synev.xconfigure.event = c->win; | |
| 179 synev.xconfigure.window = c->win; | |
| 180 synev.xconfigure.x = c->x; | |
| 181 synev.xconfigure.y = c->y; | |
| 182 synev.xconfigure.width = c->w; | |
| 183 synev.xconfigure.height = c->h; | |
| 184 synev.xconfigure.border_width = c->border; | |
| 185 synev.xconfigure.above = None; | |
| 186 XSendEvent(dpy, c->win, True, NoEventMask, &synev); | |
| 187 } | |
|
195
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
188 XSync(dpy, False); |
| 385 | 189 if(c->isfloat) |
| 190 resize(c, False, TopLeft); | |
| 196 | 191 else |
| 192 arrange(NULL); | |
|
164
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
193 } |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
194 else { |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
195 wc.x = ev->x; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
196 wc.y = ev->y; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
197 wc.width = ev->width; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
198 wc.height = ev->height; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
199 wc.border_width = ev->border_width; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
200 wc.sibling = ev->above; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
201 wc.stack_mode = ev->detail; |
|
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
202 XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); |
|
195
97960220eb77
fixed xterm font change (all other related apps should work fine with this fix as well)
arg@10ksloc.org
parents:
178
diff
changeset
|
203 XSync(dpy, False); |
|
164
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
163
diff
changeset
|
204 } |
| 5 | 205 } |
| 206 | |
| 207 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
208 destroynotify(XEvent *e) { |
| 5 | 209 Client *c; |
| 210 XDestroyWindowEvent *ev = &e->xdestroywindow; | |
| 211 | |
| 11 | 212 if((c = getclient(ev->window))) |
| 213 unmanage(c); | |
| 5 | 214 } |
| 215 | |
| 216 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
217 enternotify(XEvent *e) { |
| 123 | 218 Client *c; |
| 5 | 219 XCrossingEvent *ev = &e->xcrossing; |
| 220 | |
|
232
98e9901b1dbb
disallow zoom on maximized clients
Anselm R.Garbe <arg@10ksloc.org>
parents:
231
diff
changeset
|
221 if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) |
| 5 | 222 return; |
| 223 | |
| 466 | 224 if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c)) |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
225 focus(c); |
|
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
226 else if(ev->window == root) { |
| 31 | 227 issel = True; |
|
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
228 XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); |
|
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
229 drawall(); |
|
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
230 } |
| 5 | 231 } |
| 232 | |
| 233 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
234 expose(XEvent *e) { |
| 123 | 235 Client *c; |
| 5 | 236 XExposeEvent *ev = &e->xexpose; |
| 237 | |
| 238 if(ev->count == 0) { | |
| 70 | 239 if(barwin == ev->window) |
| 74 | 240 drawstatus(); |
| 75 | 241 else if((c = getctitle(ev->window))) |
| 74 | 242 drawtitle(c); |
| 5 | 243 } |
| 244 } | |
| 245 | |
| 246 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
247 keypress(XEvent *e) { |
|
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
248 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
|
249 unsigned int i; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
250 KeySym keysym; |
| 123 | 251 XKeyEvent *ev = &e->xkey; |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
252 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
253 keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); |
| 275 | 254 for(i = 0; i < len; i++) { |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
255 if(keysym == key[i].keysym |
|
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
256 && CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) |
| 275 | 257 { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
258 if(key[i].func) |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
259 key[i].func(&key[i].arg); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
260 return; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
261 } |
| 275 | 262 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
263 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
264 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
265 static void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
266 leavenotify(XEvent *e) { |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
267 XCrossingEvent *ev = &e->xcrossing; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
268 |
|
239
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
269 if((ev->window == root) && !ev->same_screen) { |
|
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
270 issel = False; |
|
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
271 drawall(); |
|
e5390f8e06b9
applied sumik's multihead patch
Anselm R.Garbe <arg@10ksloc.org>
parents:
238
diff
changeset
|
272 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
273 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
274 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
275 static void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
276 mappingnotify(XEvent *e) { |
|
279
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
277 XMappingEvent *ev = &e->xmapping; |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
278 |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
279 XRefreshKeyboardMapping(ev); |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
280 if(ev->request == MappingKeyboard) |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
281 grabkeys(); |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
282 } |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
283 |
|
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
284 static void |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
285 maprequest(XEvent *e) { |
| 123 | 286 static XWindowAttributes wa; |
| 5 | 287 XMapRequestEvent *ev = &e->xmaprequest; |
| 288 | |
| 289 if(!XGetWindowAttributes(dpy, ev->window, &wa)) | |
| 290 return; | |
| 291 | |
| 292 if(wa.override_redirect) { | |
| 293 XSelectInput(dpy, ev->window, | |
| 294 (StructureNotifyMask | PropertyChangeMask)); | |
| 295 return; | |
| 296 } | |
| 297 | |
|
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
298 if(!getclient(ev->window)) |
|
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
299 manage(ev->window, &wa); |
| 5 | 300 } |
| 301 | |
| 302 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
303 propertynotify(XEvent *e) { |
| 123 | 304 Client *c; |
| 53 | 305 Window trans; |
| 123 | 306 XPropertyEvent *ev = &e->xproperty; |
| 5 | 307 |
| 308 if(ev->state == PropertyDelete) | |
| 309 return; /* ignore */ | |
| 310 | |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
311 if((c = getclient(ev->window))) { |
| 77 | 312 if(ev->atom == wmatom[WMProtocols]) { |
| 75 | 313 c->proto = getproto(c->win); |
|
30
2e0fb4130bfb
new stuff, fixed several issues
Anselm R. Garbe <garbeam@wmii.de>
parents:
29
diff
changeset
|
314 return; |
|
2e0fb4130bfb
new stuff, fixed several issues
Anselm R. Garbe <garbeam@wmii.de>
parents:
29
diff
changeset
|
315 } |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
316 switch (ev->atom) { |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
317 default: break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
318 case XA_WM_TRANSIENT_FOR: |
| 53 | 319 XGetTransientForHint(dpy, c->win, &trans); |
|
80
8125f908c80c
several additions in mouse handling ;)
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
320 if(!c->isfloat && (c->isfloat = (trans != 0))) |
| 53 | 321 arrange(NULL); |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
322 break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
323 case XA_WM_NORMAL_HINTS: |
|
454
ffb462fb7903
small change to comments, renamed two set* functions in client.c into update*
Anselm R. Garbe <arg@10kloc.org>
parents:
400
diff
changeset
|
324 updatesize(c); |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
325 break; |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
326 } |
| 77 | 327 if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { |
|
454
ffb462fb7903
small change to comments, renamed two set* functions in client.c into update*
Anselm R. Garbe <arg@10kloc.org>
parents:
400
diff
changeset
|
328 updatetitle(c); |
| 74 | 329 drawtitle(c); |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
330 } |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
11
diff
changeset
|
331 } |
| 5 | 332 } |
| 333 | |
| 334 static void | |
|
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
454
diff
changeset
|
335 unmapnotify(XEvent *e) { |
| 5 | 336 Client *c; |
| 337 XUnmapEvent *ev = &e->xunmap; | |
| 338 | |
|
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
339 if((c = getclient(ev->window))) |
|
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
340 unmanage(c); |
| 5 | 341 } |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
342 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
80
diff
changeset
|
343 /* extern */ |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
344 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
345 void (*handler[LASTEvent]) (XEvent *) = { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
346 [ButtonPress] = buttonpress, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
347 [ConfigureRequest] = configurerequest, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
348 [DestroyNotify] = destroynotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
349 [EnterNotify] = enternotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
350 [LeaveNotify] = leavenotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
351 [Expose] = expose, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
352 [KeyPress] = keypress, |
|
279
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
353 [MappingNotify] = mappingnotify, |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
354 [MapRequest] = maprequest, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
355 [PropertyNotify] = propertynotify, |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
356 [UnmapNotify] = unmapnotify |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
357 }; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
358 |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
359 void |
| 487 | 360 grabkeys(void) { |
|
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
361 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
|
362 unsigned int i; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
363 KeyCode code; |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
364 |
|
279
2cedfbefd025
added mappingnotify event for kb refreshes
Anselm R.Garbe <arg@10ksloc.org>
parents:
278
diff
changeset
|
365 XUngrabKey(dpy, AnyKey, AnyModifier, root); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
366 for(i = 0; i < len; i++) { |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
367 code = XKeysymToKeycode(dpy, key[i].keysym); |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
368 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
|
369 GrabModeAsync, GrabModeAsync); |
| 160 | 370 XGrabKey(dpy, code, key[i].mod | LockMask, root, True, |
| 371 GrabModeAsync, GrabModeAsync); | |
|
291
8e6e0aa5e2ae
removed NUMLOCKMASK, added dynamically calculated numlockmask instead
Anselm R.Garbe <arg@10ksloc.org>
parents:
288
diff
changeset
|
372 XGrabKey(dpy, code, key[i].mod | numlockmask, root, True, |
|
146
f328ce9c558c
centralized/externalized configuration to config.h
arg@10ksloc.org
parents:
145
diff
changeset
|
373 GrabModeAsync, GrabModeAsync); |
|
291
8e6e0aa5e2ae
removed NUMLOCKMASK, added dynamically calculated numlockmask instead
Anselm R.Garbe <arg@10ksloc.org>
parents:
288
diff
changeset
|
374 XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True, |
|
146
f328ce9c558c
centralized/externalized configuration to config.h
arg@10ksloc.org
parents:
145
diff
changeset
|
375 GrabModeAsync, GrabModeAsync); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
376 } |
|
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
377 } |
| 292 | 378 |
| 379 void | |
| 487 | 380 procevent(void) { |
| 292 | 381 XEvent ev; |
| 382 | |
| 383 while(XPending(dpy)) { | |
| 384 XNextEvent(dpy, &ev); | |
| 385 if(handler[ev.type]) | |
| 386 (handler[ev.type])(&ev); /* call handler */ | |
| 387 } | |
| 388 } |