about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@suckless.org>2007-02-13 22:53:58 +0100
committerAnselm R. Garbe <arg@suckless.org>2007-02-13 22:53:58 +0100
commit7a095d0ce241698d8b3ea896499031f1d72b622e (patch)
tree5f39870e3768273bee1784009f377459daff0f25
parent5052c538d9c14b46f298240cefa8a0062323d249 (diff)
downloaddwm-7a095d0ce241698d8b3ea896499031f1d72b622e.tar.gz
I didn't knew of c->isfixed, that should fix Jukkas issue with gkrellm ;)
-rw-r--r--event.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/event.c b/event.c
index 8a3d99a..a2df33f 100644
--- a/event.c
+++ b/event.c
@@ -156,8 +156,9 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
-				!c->isfixed) {
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)
+				&& !c->isfixed)
+		{
 			restack();
 			resizemouse(c);
 		}
@@ -173,18 +174,19 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
 		c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border;
-		if((!c->isfloat && (arrange != dofloat))
-			|| ((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))))
-			configure(c);
-		else {
+		if(c->isfixed || c->isfloat || (arrange == dofloat)) {
 			c->x = (ev->value_mask & CWX) ? ev->x : c->x;
 			c->y = (ev->value_mask & CWY) ? ev->y : c->y;
 			c->w = (ev->value_mask & CWWidth) ? ev->width : c->w;
 			c->h = (ev->value_mask & CWHeight) ? ev->height : c->h;
+			if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight)))
+				configure(c);
 			resize(c, False);
 			if(!isvisible(c))
 				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 		}
+		else
+			configure(c);
 	}
 	else {
 		wc.x = ev->x;
/a> 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
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202