about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2008-09-06 08:59:51 +0100
committerAnselm R Garbe <garbeam@gmail.com>2008-09-06 08:59:51 +0100
commit9a4d07d9de31c7bf3fba83c66d1a09d63848adfc (patch)
treee5acb2bd054a6a6dce72cbab3def80cc3da2604d
parent30410108eb7e9e8b977d448f611659d58b2a6992 (diff)
downloaddwm-9a4d07d9de31c7bf3fba83c66d1a09d63848adfc.tar.gz
applied Martin Hurton's checkotherwm simplification
-rw-r--r--dwm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dwm.c b/dwm.c
index 4ed5760..e7804dc 100644
--- a/dwm.c
+++ b/dwm.c
@@ -337,15 +337,14 @@ buttonpress(XEvent *e) {
 void
 checkotherwm(void) {
 	otherwm = False;
-	XSetErrorHandler(xerrorstart);
+	xerrorxlib = XSetErrorHandler(xerrorstart);
 
 	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
 		die("dwm: another window manager is already running\n");
-	XSetErrorHandler(NULL);
-	xerrorxlib = XSetErrorHandler(xerror);
+	XSetErrorHandler(xerror);
 	XSync(dpy, False);
 }
 
@@ -1625,7 +1624,7 @@ updatesizehints(Client *c) {
 	else
 		c->maxa = c->mina = 0.0;
 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-			&& c->maxw == c->minw && c->maxh == c->minh);
+	             && c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void
4d82'>^
c09bf8d ^
dc5d967 ^
c09bf8d ^


29355bd ^
c09bf8d ^
29355bd ^

c09bf8d ^
4881857 ^
2e834e9 ^


9833610 ^
2e834e9 ^

b55bd70 ^
2e834e9 ^
39677ec ^
8a34fa5 ^
4250c26 ^
4d67199 ^
61a1910 ^

39677ec ^
8a34fa5 ^
650a1fb ^


8a34fa5 ^
9e8b325 ^
8a34fa5 ^
4d67199 ^
28a5219 ^



4d67199 ^
28a5219 ^
4d67199 ^
650a1fb ^
8a34fa5 ^
b55bd70 ^
9833610 ^
b55bd70 ^
7e597ae ^
9833610 ^
8a34fa5 ^
9833610 ^
b55bd70 ^
7e597ae ^

c73d5cb ^
19fd903 ^

4881857 ^
7739e6b ^
6458803 ^
8a34fa5 ^
4881857 ^
19fd903 ^

6e72d78 ^

8a34fa5 ^
bf35794 ^
c09bf8d ^

6b25d06 ^
4688ad1 ^
c09bf8d ^

b355755 ^
c09bf8d ^
b55bd70 ^
78f4b51 ^
c09bf8d ^
78f4b51 ^
e995c1b ^
c09bf8d ^
e995c1b ^
0045ad8 ^
e369292 ^
c09bf8d ^
3c35b90 ^
7e597ae ^

3c35b90 ^
7e597ae ^
0045ad8 ^
2dd5212 ^
7e597ae ^
78f4b51 ^
4688ad1 ^
3c35b90 ^
e6cbe9c ^
c09bf8d ^

9e8b325 ^
ca65478 ^
9e8b325 ^
dc5d967 ^
9e8b325 ^
e81eb46 ^

8a34fa5 ^


8a34fa5 ^
ca65478 ^
d42c3ba ^
d7e1708 ^
8a34fa5 ^
8a8b795 ^
9e8b325 ^


8a34fa5 ^



8a34fa5 ^
9e8b325 ^
8a34fa5 ^


9e8b325 ^







8a34fa5 ^



9e8b325 ^


a308b75 ^
ac6e34e ^
9e8b325 ^

8a34fa5 ^
9e8b325 ^
8a34fa5 ^
adaa28a ^

ca65478 ^
adaa28a ^

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
171
172
173
174
175