wmii

commit 193dbc69fc8471019dbbaf63d2f9504ed97938c8
parent ae89ad3d798d6459894077e2d79de725a58dc9ac
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Mon, 27 Mar 2006 11:55:41 +0200

several fixes


Diffstat:
cmd/wm/bar.c
 | 
9
++++-----
cmd/wm/fs.c
 | 
2
+-
cmd/wm/wm.h
 | 
2
+-
rc/wmiirc
 | 
8
+++++++-

4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/cmd/wm/bar.c b/cmd/wm/bar.c
@@ -29,7 +29,7 @@ comp_label_name(const void *l1, const void *l2)
 }
 
 Label *
-get_label(char *name)
+get_label(char *name, Bool intern)
 {
 	static unsigned int id = 1;
 	Label *l = name2label(name);
@@ -38,6 +38,7 @@ get_label(char *name)
 		return l;
 	l = cext_emallocz(sizeof(Label));
 	l->id = id++;
+	l->intern = intern;
 	cext_strlcpy(l->name, name, sizeof(l->name));
 	cext_strlcpy(l->colstr, def.selcolor, sizeof(l->colstr));
 	l->color = def.sel;
@@ -210,15 +211,13 @@ update_bar_tags()
 		}
 	}
 	for(i = 0; i < ntag; i++) {
-		l = get_label(tag[i]);
-		l->intern = True;
+		l = get_label(tag[i], True);
 		cext_strlcpy(l->data, tag[i], sizeof(l->data));
 	}
 	for(i = 0; i < nview; i++) {
 		View *v = view[i];
 		tags2str(vname, sizeof(vname), v->tag, v->ntag);
-		l = get_label(vname);
-		l->intern = True;
+		l = get_label(vname, True);
 		cext_strlcpy(l->data, vname, sizeof(l->data));
 	}
 	draw_bar();
diff --git a/cmd/wm/fs.c b/cmd/wm/fs.c
@@ -635,7 +635,7 @@ xcreate(IXPConn *c, Fcall *fcall)
 	type = qpath_type(m->qid.path);
 	switch(type) {
 	case FsDbar:
-		get_label(fcall->name);
+		get_label(fcall->name, False);
 		break;
 	default:
 		return Enofile;
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -213,7 +213,7 @@ char *mode2str(int mode);
 Bool clientofarea(Area *a, Client *c);
 
 /* bar.c */
-Label *get_label(char *name);
+Label *get_label(char *name, Bool intern);
 void destroy_label(Label *l);
 void draw_bar();
 int lid2index(unsigned short id);
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -48,13 +48,15 @@ $MODKEY-Control-q,y
 $MODKEY-Control-p
 $MODKEY-Control-a
 $MODKEY-Control-t
-$MODKEY-t
+$MODKEY-Control-h
+$MODKEY-Control-l
 $MODKEY-Shift-h
 $MODKEY-Shift-l
 $MODKEY-Shift-j
 $MODKEY-Shift-k
 $MODKEY-space
 $MODKEY-Shift-space
+$MODKEY-t
 $MODKEY-h
 $MODKEY-l
 $MODKEY-j
@@ -122,6 +124,10 @@ do
 			xwrite /view/sel/mode equal;;
 		$MODKEY-n)
 			xwrite /view/sel/sel/ctl sendto new;;
+		$MODKEY-Control-h)
+			xwrite /view/sel/sel/ctl sendto prev;;
+		$MODKEY-Control-l)
+			xwrite /view/sel/sel/ctl sendto next;;
 		$MODKEY-Shift-h)
 			xwrite /view/sel/sel/ctl swap prev;;
 		$MODKEY-Shift-l)