Merge 76b8ee08ef244537c4050bb99346a550c7d5222d into 30e4f119d3952ea124b62a779132b6914baba842

cmd-display-menu.c

@@ -54,7 +54,7 @@ const struct cmd_entry cmd_display_popup_entry = {
 	.name = "display-popup",
 	.alias = "popup",
 
-	.args = { "Bb:Cc:d:e:Eh:s:S:t:T:w:x:y:", 0, -1, NULL },
+	.args = { "Bb:Cc:Dd:e:Eh:s:S:t:T:w:x:y:", 0, -1, NULL },
 	.usage = "[-BCE] [-b border-lines] [-c target-client] "
 		 "[-d start-directory] [-e environment] [-h height] "
 		 "[-s style] [-S border-style] " CMD_TARGET_PANE_USAGE
@@ -301,7 +301,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	struct options_entry	*oe;
 
 
-	if (tc->overlay_draw != NULL)
+	if ((tc->overlay_draw != NULL) && (tc->flags & CLIENT_OVERLAYFOCUSED))
 		return (CMD_RETURN_NORMAL);
 
 	if (args_has(args, 'C')) {
@@ -484,6 +484,8 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 		flags |= POPUP_CLOSEEXITZERO;
 	else if (args_has(args, 'E'))
 		flags |= POPUP_CLOSEEXIT;
+	if (args_has(args, 'D'))
+		item = NULL;
 	if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
 	    argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0) {
 		cmd_free_argv(argc, argv);
@@ -498,5 +500,8 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 	free(cwd);
 	free(title);
 	cmd_free_argv(argc, argv);
+	if (args_has(args, 'D'))
+		return (CMD_RETURN_NORMAL);
+	else
 		return (CMD_RETURN_WAIT);
 }

menu.c

@@ -421,10 +421,6 @@ chosen:
 	    return (1);
 	}
 
-	if (md->item != NULL)
-		event = cmdq_get_event(md->item);
-	else
-		event = NULL;
 	state = cmdq_new_state(&md->fs, event, 0);
 
 	status = cmd_parse_and_append(item->command, NULL, c, state, &error);
@@ -544,12 +540,17 @@ menu_display(struct menu *menu, int flags, int starting_choice,
     void *data)
 {
 	struct menu_data	*md;
+	struct window		*w = c->session->curw->window;
 
 	md = menu_prepare(menu, flags, starting_choice, item, px, py, c, lines,
 	    style, selected_style, border_style, fs, cb, data);
 	if (md == NULL)
 		return (-1);
+	w->md = md;
+	c->flags |= CLIENT_REDRAWWINDOW;
+	/*
 	server_client_set_overlay(c, 0, NULL, menu_mode_cb, menu_draw_cb,
 	    menu_key_cb, menu_free_cb, NULL, md);
-	return (0);
+	*/
+	return (1);
 }

popup.c

@@ -218,6 +218,7 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
 	u_int			 i, px = pd->px, py = pd->py;
 	struct colour_palette	*palette = &pd->palette;
 	struct grid_cell	 defaults;
+	struct window		*w = c->session->curw->window;
 
 	screen_init(&s, pd->sx, pd->sy, 0);
 	screen_write_start(&ctx, &s);
@@ -244,6 +245,9 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
 	if (pd->md != NULL) {
 		c->overlay_check = menu_check_cb;
 		c->overlay_data = pd->md;
+	} else if (w->md != NULL) {
+		c->overlay_check = menu_check_cb;
+		c->overlay_data = w->md;
 	} else {
 		c->overlay_check = NULL;
 		c->overlay_data = NULL;
@@ -257,6 +261,10 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
 		c->overlay_check = NULL;
 		c->overlay_data = NULL;
 		menu_draw_cb(c, pd->md, rctx);
+	} else	if (w->md != NULL) {
+		c->overlay_check = NULL;
+		c->overlay_data = NULL;
+		menu_draw_cb(c, w->md, rctx);
 	}
 	c->overlay_check = popup_check_cb;
 	c->overlay_data = pd;
@@ -511,10 +519,13 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 		    m->x > pd->px + pd->sx - 1 ||
 		    m->y < pd->py ||
 		    m->y > pd->py + pd->sy - 1) {
-			if (MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3)
+			if ((c->flags & CLIENT_OVERLAYFOCUSED) &&
+			    (MOUSE_BUTTONS(m->b) & MOUSE_BUTTON_3))
 				goto menu;
+			c->flags &= ~CLIENT_OVERLAYFOCUSED;
 			return (0);
 		}
+		c->flags |= CLIENT_OVERLAYFOCUSED;
 		if (pd->border_lines != BOX_LINES_NONE) {
 			if (m->x == pd->px)
 				border = LEFT;
@@ -561,6 +572,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 			bufferevent_write(job_get_event(pd->job), buf, len);
 			return (0);
 		}
+		if (c->flags & CLIENT_OVERLAYFOCUSED)
 			input_key(&pd->s, job_get_event(pd->job), event->key);
 	}
 	return (0);
@@ -725,6 +737,7 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
 
 	server_client_set_overlay(c, 0, popup_check_cb, popup_mode_cb,
 	    popup_draw_cb, popup_key_cb, popup_free_cb, popup_resize_cb, pd);
+	c->flags |= CLIENT_OVERLAYFOCUSED;
 	return (0);
 }
 

screen-redraw.c

@@ -857,6 +857,9 @@ screen_redraw_draw_panes(struct screen_redraw_ctx *ctx)
 		if (window_pane_visible(wp))
 			screen_redraw_draw_pane(ctx, wp);
 	}
+
+	if (w->md != NULL)
+		w->menu_draw_cb(c, w->md, ctx);
 }
 
 /* Draw the status line. */
@@ -1018,6 +1021,7 @@ screen_redraw_draw_scrollbar(struct screen_redraw_ctx *ctx,
 	struct tty		*tty = &c->tty;
 	struct grid_cell	 gc, slgc, *gcp;
 	struct style		*sb_style = &wp->scrollbar_style;
+	struct overlay_ranges	 r;
 	u_int			 i, j, imax, jmax;
 	u_int			 sb_w = sb_style->width, sb_pad = sb_style->pad;
 	int			 px, py, ox = ctx->ox, oy = ctx->oy;
@@ -1046,6 +1050,16 @@ screen_redraw_draw_scrollbar(struct screen_redraw_ctx *ctx,
 			    py < yoff - oy - 1 ||
 			    py >= sy || py < 0)
 				continue;
+			if (c->overlay_check != NULL) {
+				c->overlay_check(c, c->overlay_data, px, py, 1, &r);
+				if (r.nx[0] + r.nx[1] == 0)
+					continue;
+			}
+			if (wp->window->md != NULL) {
+				menu_check_cb(c, wp->window->md, px, py, 1, &r);
+				if (r.nx[0] + r.nx[1] == 0)
+					continue;
+			}
 			tty_cursor(tty, px, py);
 			if ((sb_pos == PANE_SCROLLBARS_LEFT &&
 			    i >= sb_w && i < sb_w + sb_pad) ||

server-client.c

@@ -2598,6 +2598,7 @@ paste_key:
 out:
 	if (s != NULL && key != KEYC_FOCUS_OUT)
 		server_client_update_latest(c);
+
 	free(event->buf);
 	free(event);
 	return (CMD_RETURN_NORMAL);
@@ -2608,7 +2609,10 @@ int
 server_client_handle_key(struct client *c, struct key_event *event)
 {
 	struct session		*s = c->session;
+	struct window		*w = s->curw->window;
 	struct cmdq_item	*item;
+	struct window_pane	*wp;
+	int			done;
 
 	/* Check the client is good to accept input. */
 	if (s == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS))
@@ -2625,17 +2629,27 @@ server_client_handle_key(struct client *c, struct key_event *event)
 				return (0);
 			status_message_clear(c);
 		}
-		if (c->overlay_key != NULL) {
+		if (w->md != NULL) {
-			switch (c->overlay_key(c, c->overlay_data, event)) {
+			done = w->menu_key_cb(c, w->md, event);
-			case 0:
+			if (done) {
-				return (0);
+				w->menu_free_cb(c, w->md);
-			case 1:
+				w->md = NULL;
-				server_client_clear_overlay(c);
+				c->flags |= CLIENT_REDRAWWINDOW;
-				return (0);
 			}
 		}
+		else if (c->overlay_key != NULL) {
+			done = c->overlay_key(c, c->overlay_data, event);
+			if (done)
 				server_client_clear_overlay(c);
-		if (c->prompt_string != NULL) {
+			else {
+				TAILQ_FOREACH(wp, &w->panes, entry) {
+					if (~c->flags & CLIENT_OVERLAYFOCUSED)
+						goto focused;
+				}
+			}
+			return (0);
+		}
+focused:	if (c->prompt_string != NULL) {
 			if (status_prompt_key(c, event->key) == 0)
 				return (0);
 		}
@@ -2885,6 +2899,25 @@ out:
 		bufferevent_enable(wp->event, EV_READ);
 }
 
+
+static int
+server_client_check_overlay(struct client *c, u_int px, u_int py)
+{
+	struct overlay_ranges	r;
+
+	/*
+	 * A unit width range will always return nx[2] == 0 from a check, even
+	 * with multiple overlays, so it's sufficient to check just the first
+	 * two entries.
+	 */
+	if (c->overlay_check == NULL)
+		return (0);
+	c->overlay_check(c, c->overlay_data, px, py, 1, &r);
+	if (r.nx[0] + r.nx[1] == 0)
+		return (0);
+	return (1);
+}
+
 /*
  * Update cursor position and mode settings. The scroll region and attributes
  * are cleared when idle (waiting for an event) as this is the most likely time
@@ -2894,6 +2927,7 @@ out:
  * tty_region/tty_reset/tty_update_mode already take care of not resetting
  * things that are already in their default state.
  */
+
 static void
 server_client_reset_state(struct client *c)
 {
@@ -2913,9 +2947,11 @@ server_client_reset_state(struct client *c)
 	tty->flags &= ~TTY_BLOCK;
 
 	/* Get mode from overlay if any, else from screen. */
-	if (c->overlay_draw != NULL) {
+	if (c->overlay_draw != NULL && c->flags & CLIENT_OVERLAYFOCUSED) {
 		if (c->overlay_mode != NULL)
 			s = c->overlay_mode(c, c->overlay_data, &cx, &cy);
+	} else if (w->md != NULL) {
+		s = w->menu_mode_cb(c, w->md, &cx, &cy);
 	} else if (c->prompt_string == NULL)
 		s = wp->screen;
 	else
@@ -2944,18 +2980,22 @@ server_client_reset_state(struct client *c)
 				cy = tty->sy - n;
 		}
 		cx = c->prompt_cursor;
-	} else if (c->overlay_draw == NULL) {
+	} else if (c->overlay_draw == NULL || ~c->flags & CLIENT_OVERLAYFOCUSED) {
 		cursor = 0;
 		tty_window_offset(tty, &ox, &oy, &sx, &sy);
 		if (wp->xoff + s->cx >= ox && wp->xoff + s->cx <= ox + sx &&
 		    wp->yoff + s->cy >= oy && wp->yoff + s->cy <= oy + sy) {
-			cursor = 1;
-
 			cx = wp->xoff + s->cx - ox;
 			cy = wp->yoff + s->cy - oy;
 
 			if (status_at_line(c) == 0)
 				cy += status_line_size(c);
+
+			if (c->overlay_draw != NULL &&
+			    !server_client_check_overlay(c, cx, cy))
+				cursor = 0;
+			else
+				cursor = 1;
 		}
 		if (!cursor)
 			mode &= ~MODE_CURSOR;

tmux.1

@@ -6921,7 +6921,7 @@ forwards any input read from stdin to the empty pane given by
 .Ar target-pane .
 .Tg popup
 .It Xo Ic display-popup
-.Op Fl BCE
+.Op Fl BCDE
 .Op Fl b Ar border-lines
 .Op Fl c Ar target-client
 .Op Fl d Ar start-directory
@@ -6944,7 +6944,6 @@ Display a popup running
 when omitted) on
 .Ar target-client .
 A popup is a rectangular box drawn over the top of any panes.
-Panes are not updated while a popup is present.
 .Pp
 .Fl E
 closes the popup automatically when
@@ -7003,6 +7002,12 @@ is a format for the popup title (see
 The
 .Fl C
 flag closes any popup on the client.
+.Pp
+The
+.Fl D
+flag causes the command not to block and wait for the
+.Ar shell-command
+to exit.
 .Tg showphist
 .It Xo Ic show-prompt-history
 .Op Fl T Ar prompt-type

tmux.h

@@ -1225,6 +1225,13 @@ TAILQ_HEAD(window_panes, window_pane);
 RB_HEAD(window_pane_tree, window_pane);
 
 /* Window structure. */
+struct key_event;
+typedef struct screen *(*window_menu_mode_cb)(struct client *, void *, u_int *,
+	    u_int *);
+typedef void (*window_menu_draw_cb)(struct client *, void *,
+	    struct screen_redraw_ctx *);
+typedef int (*window_menu_key_cb)(struct client *, void *, struct key_event *);
+typedef void (*window_menu_free_cb)(struct client *, void *);
 struct window {
 	u_int			 id;
 	void			*latest;
@@ -1247,6 +1254,12 @@ struct window {
 	struct layout_cell	*saved_layout_root;
 	char			*old_layout;
 
+	struct menu_data	*md;
+	window_menu_mode_cb	 menu_mode_cb;
+	window_menu_draw_cb	 menu_draw_cb;
+	window_menu_key_cb	 menu_key_cb;
+	window_menu_free_cb	 menu_free_cb;
+
 	u_int			 sx;
 	u_int			 sy;
 	u_int			 manual_sx;
@@ -1983,6 +1996,7 @@ struct client {
 #define CLIENT_ASSUMEPASTING 0x2000000000ULL
 #define CLIENT_REDRAWSCROLLBARS 0x4000000000ULL
 #define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL
+#define CLIENT_OVERLAYFOCUSED 0x10000000000ULL
 #define CLIENT_ALLREDRAWFLAGS		\
 	(CLIENT_REDRAWWINDOW|		\
 	 CLIENT_REDRAWSTATUS|		\

window.c

@@ -319,6 +319,12 @@ window_create(u_int sx, u_int sy, u_int xpixel, u_int ypixel)
 	w->xpixel = xpixel;
 	w->ypixel = ypixel;
 
+	w->md = NULL;
+	w->menu_mode_cb = menu_mode_cb;
+	w->menu_draw_cb = menu_draw_cb;
+	w->menu_key_cb = menu_key_cb;
+	w->menu_free_cb = menu_free_cb;
+
 	w->options = options_create(global_w_options);
 
 	w->references = 0;