[wimenu] Add paste key binding.

cmd/menu/Makefile

@@ -11,7 +11,7 @@ bindings.c: keys.txt Makefile
 
 TARG =	wimenu
 HFILES=	dat.h fns.h
-TAGFILES= dat.h
+TAGFILES= dat.h $(ROOT)/include/*.h $(ROOT)/include/stuff/*.h
 
 PACKAGES += $(X11PACKAGES)
 

cmd/menu/dat.h

@@ -38,6 +38,7 @@ enum {
 	LLITERAL,
 	LNEXT,
 	LNEXTPAGE,
+	LPASTE,
 	LPREV,
 	LPREVPAGE,
 	LREJECT,

cmd/menu/keys.c

@@ -84,6 +84,7 @@ char *symtab[] = {
 	"literal",
 	"next",
 	"nextpage",
+	"paste",
 	"prev",
 	"prevpage",
 	"reject",

cmd/menu/keys.txt

@@ -34,6 +34,8 @@ Tab          Complete next
 Control-i           Complete next
 Mod1-l              Complete next
 
+Mod1-p	            Paste PRIMARY
+
 Shift-Tab           Complete prev
 Control-Shift-i     Complete prev
 Mod1-h              Complete prev

cmd/menu/main.c

@@ -172,6 +172,11 @@ init_screens(void) {
 	menu_show();
 }
 
+ErrorCode ignored_xerrors[] = {
+	{ 0, BadWindow },
+	{ X_GetAtomName, BadAtom },
+};
+
 int
 main(int argc, char *argv[]) {
 	static char *address;

cmd/menu/menu.c

@@ -213,6 +213,13 @@ selectitem(Item *i) {
 	}
 }
 
+static void
+paste(void *aux, char *str) {
+	if(str)
+		caret_insert(str, false);
+	menu_draw();
+}
+
 static bool
 kdown_event(Window *w, void *aux, XKeyEvent *e) {
 	char **action, **p;
@@ -321,6 +328,9 @@ kdown_event(Window *w, void *aux, XKeyEvent *e) {
 			caret_move(FORWARD, amount);
 			update_input();
 			break;
+		case LPASTE:
+			getselection(action[1] ? action[1] : "PRIMARY", paste, nil);
+			break;
 		case LREJECT:
 			srv.running = false;
 			result = 1;

include/stuff/x11.h

@@ -277,6 +277,7 @@ ulong	getproperty(Window*, char *prop, char *type, Atom *actual, ulong offset, u
 Rectangle	getwinrect(Window*);
 int	grabkeyboard(Window*);
 int	grabpointer(Window*, Window *confine, Cursor, int mask);
+void	getselection(char*, void (*)(void*, char*), void*);
 bool	havexft(void);
 void	initdisplay(void);
 KeyCode	keycode(const char*);

lib/libstuff/Makefile

@@ -96,6 +96,7 @@ OBJ=\
 	x11/ignored_xerrors	\
 	x11/freestringlist	\
 	x11/initdisplay	\
+	x11/selection	\
 	x11/sendevent	\
 	x11/sendmessage	\
 	x11/sync	\

lib/libstuff/x11/selection.c

@@ -0,0 +1,63 @@
+/* Copyright ©2010 Kris Maglione <maglione.k at Gmail>
+ * See LICENSE file for license details.
+ */
+#include "x11.h"
+
+static Handlers handlers;
+
+typedef struct Data	Data;
+
+struct Data {
+	long	selection;
+	void	(*callback)(void*, char*);
+	void*	aux;
+};
+
+static bool
+_getselection(Window *w, long selection, char *type) {
+	XConvertSelection(display, selection, xatom(type),
+			  selection, w->xid, CurrentTime);
+	return true;
+}
+
+void
+getselection(char *selection, void (*callback)(void*, char*), void *aux) {
+	Window *w;
+	Data *d;
+
+	d = emallocz(sizeof *d);
+	d->selection = xatom(selection);
+	d->callback = callback;
+	d->aux = aux;
+
+	w = createwindow(&scr.root, Rect(0, 0, 1, 1), 0, InputOnly, nil, 0);
+	w->aux = d;
+	sethandler(w, &handlers);
+
+	_getselection(w, d->selection, "UTF8_STRING");
+}
+
+static bool
+selection_event(Window *w, void *aux, XSelectionEvent *ev) {
+	Data *d;
+	char **ret;
+
+	d = aux;
+	if(ev->property == None && ev->target != xatom("STRING"))
+		return _getselection(w, d->selection, "STRING");
+	else if(ev->property == None)
+		d->callback(d->aux, nil);
+	else {
+		getprop_textlist(w, atomname(ev->property), &ret);
+		delproperty(w, atomname(ev->property));
+		d->callback(d->aux, ret ? *ret : nil);
+		free(ret);
+	}
+	destroywindow(w);
+	return false;
+}
+
+static Handlers handlers = {
+	.selection = selection_event,
+};
+

lib/libstuff/x11/xatom.c

@@ -24,7 +24,7 @@ atomname(ulong atom) {
 	e = map_get(&atomnamemap, atom, true);
 	if(*e == nil) {
 		*e = XGetAtomName(display, atom);
-		if(&e == nil) {
+		if(*e == nil) {
 			map_rm(&atomnamemap, atom);
 			return nil;
 		}

man/wimenu.1

@@ -85,6 +85,84 @@ as a menu option, and the text to the right is displayed when a
 selection is made.
 .RE
 
+.SH KEY BINDINGS
+.P
+\fBwimenu\fR's default key bindings are based largely on the
+movement keys of vi and the standard UNIX shell input bindings.
+
+.TP
+Return, C\-j, C\-m
+Accept the input, and select the first matching
+completion if the cursor is at the end of the input.
+.TP
+S\-Return, C\-S\-j, C\-S\-m
+Accept the input literally.
+.TP
+Esc, C\-[
+Quit without returning any output, and exit with
+non\-zero status.
+
+.TP
+A\-p
+Paste the PRIMARY selection.
+
+.TP
+Left, C\-b
+Move backward one character.
+.TP
+Right, C\-f
+Move forward one character.
+
+.TP
+A\-b
+Move backward one word.
+.TP
+A\-f
+Move forward one word.
+
+.TP
+C\-a
+Move to the begining of the line.
+.TP
+C\-e
+Move to the end of the line.
+
+.TP
+C\-p, up
+Move backward through the input history.
+.TP
+C\-n, up
+Move forward through the input history.
+
+.TP
+Backspace, C\-h
+Delete the previous character.
+.TP
+C\-Backspace, C\-w
+Delete the previous word.
+.TP
+C\-u
+Delete the previous portion of the line.
+
+.TP
+Tab, C\-i¸ A\-l
+Select the next completion.
+.TP
+S\-Tab, C\-S\-i, A\-h
+Select the previous completion.
+.TP
+PageUp, A\-k
+Select the previous completion page.
+.TP
+PageDown, A\-j
+Select the next completion page.
+.TP
+Home, A\-g
+Select the first completion page.
+.TP
+End, A\-S\-g
+Select the last completion page.
+
 .SH CUSTOM COMPLETION
 .P
 Custom, multipart completion data may be proveded by an

man/wimenu.man1

@@ -76,6 +76,63 @@ following. More advanced options are documented below.
 	as a menu option, and the text to the right is displayed when a
 	selection is made.
 
+= KEY BINDINGS =
+
+`wimenu`'s default key bindings are based largely on the
+movement keys of vi and the standard UNIX shell input bindings.
+
+: Return, C-j, C-m
+        Accept the input, and select the first matching
+        completion if the cursor is at the end of the input.
+: S-Return, C-S-j, C-S-m
+        Accept the input literally.
+: Esc, C-[
+        Quit without returning any output, and exit with
+        non-zero status.
+
+: A-p
+        Paste the PRIMARY selection.
+
+: Left, C-b
+        Move backward one character.
+: Right, C-f
+        Move forward one character.
+
+: A-b
+        Move backward one word.
+: A-f
+        Move forward one word.
+
+: C-a
+        Move to the begining of the line.
+: C-e
+        Move to the end of the line.
+
+: C-p, Up
+        Move backward through the input history.
+: C-n, Down
+        Move forward through the input history.
+
+: Backspace, C-h
+        Delete the previous character.
+: C-Backspace, C-w
+        Delete the previous word.
+: C-u
+        Delete the previous portion of the line.
+
+: Tab, C-i¸ A-l
+        Select the next completion.
+: S-Tab, C-S-i, A-h
+        Select the previous completion.
+: PageUp, A-k
+        Select the previous completion page.
+: PageDown, A-j
+        Select the next completion page.
+: Home, A-g
+        Select the first completion page.
+: End, A-S-g
+        Select the last completion page.
+:
 = CUSTOM COMPLETION =
 
 Custom, multipart completion data may be proveded by an

mk/common.mk

@@ -42,7 +42,7 @@ tags:
 		[ -f "$$f.c" ] && files="$$files $$f.c"; \
 	done; \
 	echo CTAGS $$files $(TAGFILES); \
-	$(DEBUG) $(CTAGS) $$files $(TAGFILES)
+	if [ -n "$$files" ]; then $(DEBUG) $(CTAGS) $$files $(TAGFILES); fi
 
 .PHONY: all options clean dist install uninstall depend cleandep tags
 .PHONY: simpleuninstall simpleinstall

mk/dir.mk

@@ -21,12 +21,15 @@ duninstall:
 	+dirs="$(INSTDIRS)"; $(MKSUBDIR)
 ddepend:
 	+dirs="$(DIRS)"; $(MKSUBDIR)
+dtags:
+	+dirs="$(DIRS)"; $(MKSUBDIR)
 
 all: dall
 clean: dclean
 install: dinstall
 uninstall: duninstall
 depend: ddepend
+tags: dtags
 
 INSTDIRS = $(DIRS)
 

mk/hdr.mk

@@ -34,7 +34,7 @@ CLEANNAME=$(SHELL) $(ROOT)/util/cleanname
 SOEXT=so
 TAGFILES=
 
-CTAGS=ctags
+CTAGS=ctags --fields=+S --c-kinds=+px
 
 PACKAGES =