wmii

commit 9bfa6ce867b001ca9c47970c35418ea7019d2a66
parent 0f6a36936d24245def507e0ab554fc0ce4762a39
Author: Kris Maglione <kris@suckless.org>
Date:   Tue, 29 Jun 2010 13:40:51 -0400

Fix updating tags via /client/*/tags. Closes issue #200.

Diffstat:
cmd/wmii/fs.c
 | 
9
+++++++++
mk/python.mk
 | 
2
+-
rc/wmiirc.sh
 | 
6
+++---

3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cmd/wmii/fs.c b/cmd/wmii/fs.c
@@ -497,6 +497,15 @@ fs_write(Ixp9Req *r) {
 		return;
 	}
 
+	switch(f->tab.type) {
+        case FsFCtags:
+		r->ofcall.io.count = r->ifcall.io.count;
+		ixp_srv_data2cstring(r);
+		client_applytags(f->p.client, r->ifcall.io.data);
+		ixp_respond(r, nil);
+		return;
+	}
+
 	t = &actiontab[f->tab.type];
 	if(f->tab.type < nelem(actiontab)) {
 		if(t->msg) {
diff --git a/mk/python.mk b/mk/python.mk
@@ -6,7 +6,7 @@ clean: pyclean
 .py.install:
 	echo PYTHON install $* $(PYPREFIX)
 	DESTDIR=$(DESTDIR); \
-	$(DEBUG) $(PYTHON) $< install -cO1 --root=$${DESTDIR:-/} $(PYPREFIX)
+	$(DEBUG) $(PYTHON) $< install -c --root=$${DESTDIR:-/} $(PYPREFIX)
 pyclean:
 	echo CLEAN build/
 	rm -rf build
diff --git a/rc/wmiirc.sh b/rc/wmiirc.sh
@@ -131,7 +131,7 @@ Menu LBar-3-Delete
 	for c in $clients; do
 		if [ "$tag" = "$(wmiir read /client/$c/tags)" ]
 		then wmiir xwrite /client/$c/ctl kill
-		else wmiir xwrite /client/$c/tags -$tag
+		else wmiir xwrite /client/$c/ctl tags -$tag
 		fi
 		[ "$tag" = "$(wi_seltag)" ] &&
 			wmiir xwrite /ctl view $(wi_tags | wi_nexttag)
@@ -230,7 +230,7 @@ Key $MODKEY-t       # Change to another tag
 	wmiir xwrite /ctl view $(wi_tags | wimenu -h "${hist}.tags" -n 50) &
 Key $MODKEY-Shift-t # Retag the selected client
 	# Assumes left-to-right order of evaluation
-	wmiir xwrite /client/$(wi_selclient)/tags $(wi_tags | wimenu -h "${hist}.tags" -n 50) &
+	wmiir xwrite /client/$(wi_selclient)/ctl tags $(wi_tags | wimenu -h "${hist}.tags" -n 50) &
 Key $MODKEY-n	    # Move to the next tag
 	wmiir xwrite /ctl view $(wi_tags | wi_nexttag)
 Key $MODKEY-b	    # Move to the previous tag
@@ -241,7 +241,7 @@ Key $MODKEY-b	    # Move to the previous tag
 Key $MODKEY-$i		 # Move to the numbered view
 	wmiir xwrite /ctl view "$i"
 Key $MODKEY-Shift-$i     # Retag selected client with the numbered tag
-	wmiir xwrite /client/sel/tags "$i"
+	wmiir xwrite /client/sel/ctl tags "$i"
 !
 	done
 }