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
hor hut <hut@lavabit.com> 2010-05-03 13:36:20 +0200 committer hut <hut@lavabit.com> 2010-05-03 23:58:07 +0200 Makefile: cleaned up, added automatic uninstall' href='/akspecs/ranger/commit/Makefile?h=v1.8.1&id=b0a216f59a7770f5ce35f4a56b5055c51ceec284'>b0a216f5 ^
2c5ea01d ^
b0a216f5 ^



3a1e1f28 ^
b0a216f5 ^


b06433bc ^
2c5ea01d ^
b0a216f5 ^

2c5ea01d ^
2c5ea01d ^
2c5ea01d ^
582f3519 ^
b06433bc ^
582f3519 ^

94c5d83e ^
dee6cfa6 ^
e9e4b4ff ^
b0a216f5 ^


e9e4b4ff ^





ad75190c ^
e9e4b4ff ^
e9e4b4ff ^
25a4162d ^
e9e4b4ff ^
fde932f2 ^
85fd5288 ^
4ade06a6 ^

85fd5288 ^
0c2c782d ^

636d9393 ^
b0a216f5 ^
b06433bc ^
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