about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@10kloc.org>2006-09-01 15:31:59 +0200
committerAnselm R. Garbe <arg@10kloc.org>2006-09-01 15:31:59 +0200
commit6d22782e8f991a99f9adef56b2b729e5ab5454d2 (patch)
treee5cedb8d2c391a9c2f1c1494070c3b80271c6940
parent1836b6740d7fc1a2e7fa0343aa7de657592ebfeb (diff)
downloaddwm-6d22782e8f991a99f9adef56b2b729e5ab5454d2.tar.gz
simplified buttonpress
-rw-r--r--event.c35
1 files changed, 12 insertions, 23 deletions
diff --git a/event.c b/event.c
index a719bf2..e5ea712 100644
--- a/event.c
+++ b/event.c
@@ -109,19 +109,17 @@ buttonpress(XEvent *e)
 		for(a.i = 0; a.i < ntags; a.i++) {
 			x += textw(tags[a.i]);
 			if(ev->x < x) {
-				switch(ev->button) {
-				case Button1:
+				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
 						tag(&a);
 					else
 						view(&a);
-					break;
-				case Button3:
+				}
+				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
 						toggletag(&a);
 					else
 						toggleview(&a);
-					break;
 				}
 				return;
 			}
@@ -133,26 +131,17 @@ buttonpress(XEvent *e)
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY)
+		if(c->ismax || CLEANMASK(ev->state) != MODKEY)
 			return;
-		switch(ev->button) {
-		default:
-			break;
-		case Button1:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				restack(c);
-				movemouse(c);
-			}
-			break;
-		case Button2:
+		if((ev->button == Button1) && ((arrange == dofloat) || c->isfloat)) {
+			restack(c);
+			movemouse(c);
+		}
+		else if(ev->button == Button2)
 			zoom(NULL);
-			break;
-		case Button3:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				restack(c);
-				resizemouse(c);
-			}
-			break;
+		else if(ev->button == Button3 && ((arrange == dofloat) || c->isfloat)) {
+			restack(c);
+			resizemouse(c);
 		}
 	}
 }
e71f734138d3f49f56092688bb0623c6a2'>0128bee7 ^
02cf8f61 ^
0c0b9489 ^
0128bee7 ^
01c89bb5 ^
d46a05a8 ^
1c1b6c31 ^
3de15ddd ^
fa704bab ^
3de15ddd ^
d88232a3 ^
a1d7ed6e ^
9b83f114 ^
871c502d ^
1c1b6c31 ^
16246965 ^

20f94973 ^
a1d7ed6e ^
0c0b9489 ^
1c1b6c31 ^
9506fb8e ^
6f43de0a ^
a1d7ed6e ^
20f94973 ^
227f75db ^

fa704bab ^
d46a05a8 ^
0c0b9489 ^

4f1a6e67 ^




a1d7ed6e ^


a99d5019 ^



cb1ed288 ^

d46a05a8 ^
c834433a ^
d46a05a8 ^

a1d7ed6e ^

f2d8598d ^
a1d7ed6e ^

0128bee7 ^



f2d8598d ^
0128bee7 ^
f2d8598d ^
0a1bc759 ^
0c0b9489 ^



9506fb8e ^
20f94973 ^
0128bee7 ^
b4a0c387 ^
20f94973 ^
0c0b9489 ^




a9f69385 ^

16246965 ^



a1d7ed6e ^
ad1a4204 ^

b4b0eb24 ^
ad1a4204 ^



b4b0eb24 ^
a1d7ed6e ^
f8e96a97 ^

871c502d ^

361781cd ^







f2d8598d ^

361781cd ^




0cfc59d6 ^
361781cd ^
0cfc59d6 ^
361781cd ^
0cfc59d6 ^
361781cd ^
0cfc59d6 ^
361781cd ^
0cfc59d6 ^

319c55cb ^









0cfc59d6 ^



9b83f114 ^
0cfc59d6 ^
3937f010 ^


0a16f0da ^
3937f010 ^
f2d8598d ^
361781cd ^

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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170