about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-16 17:56:04 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-16 17:56:04 +0200
commitad2e77d6350b1f43513d052018735d2a8f949d78 (patch)
tree85e55198b8bf2c86f77d926d7e190b211630fd38
parenta20b10d01fab9e844ba7cd2cf694b45f61b89f7c (diff)
downloaddwm-ad2e77d6350b1f43513d052018735d2a8f949d78.tar.gz
fixed issue reported by sander
-rw-r--r--client.c4
-rw-r--r--tag.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/client.c b/client.c
index 269bf8c..050e8a3 100644
--- a/client.c
+++ b/client.c
@@ -261,6 +261,10 @@ manage(Window w, XWindowAttributes *wa)
 	if(trans && (tc = getclient(trans))) {
 		c->x = (tc->x + tc->w / 2) - (c->w / 2);
 		c->y = (tc->y + tc->h / 2) - (c->h / 2);
+		if(c->x < 0 || c->x >= sw)
+			c->x = (sw / 2) - (c->w / 2);
+		if(c->y < 0 || c->y >= sh)
+			c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
 	}
 	else {
 		c->x = (sw / 2) - (c->w / 2);
diff --git a/tag.c b/tag.c
index 841d0fc..cdb0f52 100644
--- a/tag.c
+++ b/tag.c
@@ -49,12 +49,11 @@ dofloat(Arg *arg)
 	}
 	if(!sel || !isvisible(sel))
 		sel = getnext(clients);
-	if(sel) {
+	if(sel)
 		focus(sel);
-		restack();
-	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
 }
 
 void
class='oid'>0c0b9489 ^
0128bee7 ^
01c89bb5 ^
d46a05a8 ^
1c1b6c31 ^
3de15ddd ^
fa704bab ^
3de15ddd ^
d88232a3 ^
a1d7ed6e ^
871c502d ^
1c1b6c31 ^
16246965 ^

20f94973 ^
a1d7ed6e ^
0c0b9489 ^
1c1b6c31 ^
9506fb8e ^
6f43de0a ^
a1d7ed6e ^
20f94973 ^
fa704bab ^
d46a05a8 ^
0c0b9489 ^

4f1a6e67 ^




a1d7ed6e ^


cb1ed288 ^

d46a05a8 ^
c834433a ^
d46a05a8 ^

a1d7ed6e ^

f2d8598d ^
a1d7ed6e ^

0128bee7 ^



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



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




16246965 ^



a1d7ed6e ^
ad1a4204 ^

b4b0eb24 ^
ad1a4204 ^



b4b0eb24 ^
a1d7ed6e ^
f8e96a97 ^

871c502d ^

361781cd ^







f2d8598d ^

361781cd ^




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





361781cd ^
0cfc59d6 ^



361781cd ^
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