aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commands.c3
-rw-r--r--main.c18
2 files changed, 19 insertions, 2 deletions
diff --git a/commands.c b/commands.c
index 42e78da..8ab1247 100644
--- a/commands.c
+++ b/commands.c
@@ -37,6 +37,7 @@ void animate(void);
void slideshow(void);
void set_timeout(timeout_f, int, bool);
void reset_timeout(timeout_f);
+void handle_key_handler(bool);
extern appmode_t mode;
extern img_t img;
@@ -114,7 +115,7 @@ bool cg_toggle_bar(arg_t _)
bool cg_prefix_external(arg_t _)
{
- extprefix = true;
+ handle_key_handler(true);
return false;
}
diff --git a/main.c b/main.c
index 220743b..f3eeb0a 100644
--- a/main.c
+++ b/main.c
@@ -469,6 +469,22 @@ Bool is_input_ev(Display *dpy, XEvent *ev, XPointer arg)
return ev->type == ButtonPress || ev->type == KeyPress;
}
+void handle_key_handler(bool init)
+{
+ extprefix = init;
+ if (win.bar.h == 0)
+ return;
+ if (init) {
+ close_info();
+ snprintf(win.bar.l.buf, win.bar.l.size, "Getting key handler input "
+ "(%s to abort)...", XKeysymToString(keyhandler_abort));
+ } else { /* abort */
+ open_info();
+ update_info();
+ }
+ win_draw(&win);
+}
+
void run_key_handler(const char *key, unsigned int mask)
{
pid_t pid;
@@ -588,7 +604,7 @@ void on_keypress(XKeyEvent *kev)
if (IsModifierKey(ksym))
return;
if (extprefix && ksym == keyhandler_abort && MODMASK(kev->state) == 0) {
- extprefix = False;
+ handle_key_handler(false);
} else if (extprefix) {
run_key_handler(XKeysymToString(ksym), kev->state & ~sh);
extprefix = False;