about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--client.c8
-rw-r--r--dwm.h2
-rw-r--r--tag.c10
3 files changed, 10 insertions, 10 deletions
diff --git a/client.c b/client.c
index 4f2a69c..586a87f 100644
--- a/client.c
+++ b/client.c
@@ -199,7 +199,7 @@ void
 manage(Window w, XWindowAttributes *wa)
 {
 	unsigned int i;
-	Client *c, *tc;
+	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
 
@@ -238,11 +238,7 @@ manage(Window w, XWindowAttributes *wa)
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
 	grabbuttons(c, False);
-	if((tc = getclient(trans))) /* inherit tags */
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = tc->tags[i];
-	else
-		settags(c);
+	settags(c, getclient(trans));
 	if(!c->isfloat)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
diff --git a/dwm.h b/dwm.h
index 9f1e7bf..eba3a6a 100644
--- a/dwm.h
+++ b/dwm.h
@@ -115,7 +115,7 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
 extern void initrregs();
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
-extern void settags(Client *c);
+extern void settags(Client *c, Client *trans);
 extern void tag(Arg *arg);
 extern void toggletag(Arg *arg);
 
diff --git a/tag.c b/tag.c
index 9e997f9..fafc2c5 100644
--- a/tag.c
+++ b/tag.c
@@ -76,15 +76,19 @@ initrregs()
 }
 
 void
-settags(Client *c)
+settags(Client *c, Client *trans)
 {
 	char prop[512];
 	unsigned int i, j;
 	regmatch_t tmp;
-	Bool matched = False;
+	Bool matched = trans != NULL;
 	XClassHint ch;
 
-	if(XGetClassHint(dpy, c->win, &ch)) {
+	if(matched) {
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
+	}
+	else if(XGetClassHint(dpy, c->win, &ch)) {
 		snprintf(prop, sizeof(prop), "%s:%s:%s",
 				ch.res_class ? ch.res_class : "",
 				ch.res_name ? ch.res_name : "", c->name);
4 +0100 committer hut <hut@lavabit.com> 2009-12-25 21:55:04 +0100 updated pydoc pages' href='/akspecs/ranger/commit/doc/ranger.fsobject.loader.html?h=v1.5.5&id=f07bb12fc5c59430e995a64956b36331ce3629b9'>f07bb12f ^
34a60763 ^
f07bb12f ^

























34a60763 ^
f07bb12f ^




34a60763 ^
f07bb12f ^














34a60763 ^
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