Separate key flags and modifiers, log key flags, make the "xterm" flag

more explicit and fix M- keys with a leading escape.

1 files changed, 2 insertions, 2 deletions

diff --git a/popup.c b/popup.c
index 93ecd2a1..87658a6f 100644
--- a/popup.c
+++ b/popup.c
@@ -329,7 +329,7 @@ popup_key_cb(struct client *c, struct key_event *event)
 			bufferevent_write(job_get_event(pd->job), buf, len);
 			return (0);
 		}
-		input_key(NULL, &pd->s, job_get_event(pd->job), event->key);
+		input_key(&pd->s, job_get_event(pd->job), event->key);
 		return (0);
 	}
 
@@ -341,7 +341,7 @@ popup_key_cb(struct client *c, struct key_event *event)
 		format_defaults(ft, c, fs->s, fs->wl, fs->wp);
 	else
 		format_defaults(ft, c, NULL, NULL, NULL);
-	format_add(ft, "popup_key", "%s", key_string_lookup_key(event->key));
+	format_add(ft, "popup_key", "%s", key_string_lookup_key(event->key, 0));
 	if (KEYC_IS_MOUSE(event->key)) {
 		format_add(ft, "popup_mouse", "1");
 		format_add(ft, "popup_mouse_x", "%u", m->x - pd->px);