about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2008-07-01 19:26:17 +0100
committerAnselm R Garbe <garbeam@gmail.com>2008-07-01 19:26:17 +0100
commit9bb0f20515023aa5471c628d01a6e65e93040dc1 (patch)
tree0ee468f33468739f035c44a9cd374a0bfd6a34cc
parent2431ae7df7f654f6dbe5e923fadf703eaa4a7bf4 (diff)
downloaddwm-9bb0f20515023aa5471c628d01a6e65e93040dc1.tar.gz
applied Frederik Ternerot's grabbuttons patch with slight modifications
-rw-r--r--dwm.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/dwm.c b/dwm.c
index 0691029..e135715 100644
--- a/dwm.c
+++ b/dwm.c
@@ -723,19 +723,18 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
-	int i, j;
-	uint buttons[]   = { Button1, Button2, Button3 };
-	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
+	uint i, j;
+	uint modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	if(focused)
+	if(focused) {
 		for(i = 0; i < LENGTH(buttons); i++)
-			for(j = 0; j < LENGTH(modifiers); j++)
-				XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-					BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-	else
+			if(buttons[i].click == ClkClientWin)
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+        } else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-			BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+		            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
k/mu/blame/cpp/034exclusive_container?h=main&id=30ab02977063217dcf16028d897a3e8cb0d9cff9'>^
ac0e9db5 ^
363be37f ^
69f3fb0a ^

ac0e9db5 ^
69f3fb0a ^




afa42503 ^


88be3dbc ^
69f3fb0a ^

5497090a ^


afa42503 ^
69f3fb0a ^







0acfaaef ^
0487a30e ^
363be37f ^
ac0e9db5 ^



0487a30e ^
69f3fb0a ^




6ea73c22 ^
7284d503 ^
dd994cda ^






363be37f ^
dd994cda ^
88be3dbc ^
dd994cda ^
5497090a ^


afa42503 ^
dd994cda ^


88be3dbc ^
dd994cda ^
5497090a ^


afa42503 ^
dd994cda ^


6ea73c22 ^


363be37f ^
dd994cda ^

0487a30e ^
ac0e9db5 ^
363be37f ^
eefde1b9 ^
35064671 ^
eefde1b9 ^


35064671 ^
eefde1b9 ^

ac0e9db5 ^
0487a30e ^
ac0e9db5 ^
0487a30e ^
dd994cda ^

0487a30e ^
dd994cda ^
0487a30e ^
827898fc ^
dd994cda ^

b98d3876 ^

















02a55f71 ^
















1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151