about summary refs log tree commit diff stats
path: root/event.c
diff options
context:
space:
mode:
Diffstat (limited to 'event.c')
-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;
.0&id=f07bb12fc5c59430e995a64956b36331ce3629b9'>f07bb12f ^
4c13e1f2 ^




f07bb12f ^
4c13e1f2 ^

f07bb12f ^







4c13e1f2 ^
f07bb12f ^





















4c13e1f2 ^
f07bb12f ^
34a60763 ^
f07bb12f ^


62cd83ba ^

f07bb12f ^






4c13e1f2 ^

f07bb12f ^


4c13e1f2 ^

f07bb12f ^



4c13e1f2 ^


f07bb12f ^











f07bb12f ^















4c13e1f2 ^




34a60763 ^
4c13e1f2 ^
34a60763 ^
4c13e1f2 ^



f07bb12f ^
62cd83ba ^
f07bb12f ^


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