circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-06 16:18:48 +00:00
Code Issues Projects Releases Wiki Activity

rename CLIENT_OVERLAYPOPUP_FOCUSED to CLIENT_OVERLAYFOCUSED

Browse Source
This commit is contained in:
Michael Grant 2025-03-27 14:34:35 +00:00
parent f6818a097f
commit 6ab507c9ce
3 changed files with 8 additions and 8 deletions

8
popup.c
View File

@ -513,10 +513,10 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
m->y > pd->py + pd->sy - 1) { m->y > pd->py + pd->sy - 1) {
if (MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3) if (MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3)
goto menu; goto menu;
c->flags &= ~CLIENT_OVERLAYPOPUP_FOCUSED; c->flags &= ~CLIENT_OVERLAYFOCUSED;
return (0); return (0);
} }
c->flags |= CLIENT_OVERLAYPOPUP_FOCUSED; c->flags |= CLIENT_OVERLAYFOCUSED;
if (pd->border_lines != BOX_LINES_NONE) { if (pd->border_lines != BOX_LINES_NONE) {
if (m->x == pd->px) if (m->x == pd->px)
border = LEFT; border = LEFT;
@ -563,7 +563,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
bufferevent_write(job_get_event(pd->job), buf, len); bufferevent_write(job_get_event(pd->job), buf, len);
return (0); return (0);
} }
if (c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) if (c->flags & CLIENT_OVERLAYFOCUSED)
input_key(&pd->s, job_get_event(pd->job), event->key); input_key(&pd->s, job_get_event(pd->job), event->key);
} }
return (0); return (0);
@ -728,7 +728,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, 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); popup_draw_cb, popup_key_cb, popup_free_cb, popup_resize_cb, pd);
c->flags |= CLIENT_OVERLAYPOPUP_FOCUSED; c->flags |= CLIENT_OVERLAYFOCUSED;
return (0); return (0);
} }

6
server-client.c
View File

@ -2630,7 +2630,7 @@ server_client_handle_key(struct client *c, struct key_event *event)
if (c->overlay_key != NULL) { if (c->overlay_key != NULL) {
done = c->overlay_key(c, c->overlay_data, event); done = c->overlay_key(c, c->overlay_data, event);
TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) { TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
if (~c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) if (~c->flags & CLIENT_OVERLAYFOCUSED)
goto focused; goto focused;
} }
if (done) if (done)
@ -2933,7 +2933,7 @@ server_client_reset_state(struct client *c)
tty->flags &= ~TTY_BLOCK; tty->flags &= ~TTY_BLOCK;
/* Get mode from overlay if any, else from screen. */ /* Get mode from overlay if any, else from screen. */
if (c->overlay_draw != NULL && c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) { if (c->overlay_draw != NULL && c->flags & CLIENT_OVERLAYFOCUSED) {
if (c->overlay_mode != NULL) if (c->overlay_mode != NULL)
s = c->overlay_mode(c, c->overlay_data, &cx, &cy); s = c->overlay_mode(c, c->overlay_data, &cx, &cy);
} else if (c->prompt_string == NULL) } else if (c->prompt_string == NULL)
@ -2964,7 +2964,7 @@ server_client_reset_state(struct client *c)
cy = tty->sy - n; cy = tty->sy - n;
} }
cx = c->prompt_cursor; cx = c->prompt_cursor;
} else if (c->overlay_draw == NULL || ~c->flags & CLIENT_OVERLAYPOPUP_FOCUSED) { } else if (c->overlay_draw == NULL || ~c->flags & CLIENT_OVERLAYFOCUSED) {
cursor = 0; cursor = 0;
tty_window_offset(tty, &ox, &oy, &sx, &sy); tty_window_offset(tty, &ox, &oy, &sx, &sy);
if (wp->xoff + s->cx >= ox && wp->xoff + s->cx <= ox + sx && if (wp->xoff + s->cx >= ox && wp->xoff + s->cx <= ox + sx &&

2
tmux.h
View File

@ -1982,7 +1982,7 @@ struct client {
#define CLIENT_ASSUMEPASTING 0x2000000000ULL #define CLIENT_ASSUMEPASTING 0x2000000000ULL
#define CLIENT_REDRAWSCROLLBARS 0x4000000000ULL #define CLIENT_REDRAWSCROLLBARS 0x4000000000ULL
#define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL #define CLIENT_NO_DETACH_ON_DESTROY 0x8000000000ULL
#define CLIENT_OVERLAYPOPUP_FOCUSED 0x10000000000ULL #define CLIENT_OVERLAYFOCUSED 0x10000000000ULL
#define CLIENT_ALLREDRAWFLAGS \ #define CLIENT_ALLREDRAWFLAGS \
(CLIENT_REDRAWWINDOW| \ (CLIENT_REDRAWWINDOW| \
CLIENT_REDRAWSTATUS| \ CLIENT_REDRAWSTATUS| \