circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Add a separate mode struct for the active window mode if any.

Browse Source
This commit is contained in:
nicm
2019-03-07 20:24:21 +00:00
parent 3c24bc5617
commit f98c66ece8
12 changed files with 638 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
window-client.c
View File

@ -25,12 +25,12 @@
#include "tmux.h"
static struct screen *window_client_init(struct window_pane *,
static struct screen *window_client_init(struct window_mode_entry *,
struct cmd_find_state *, struct args *);
static void window_client_free(struct window_pane *);
static void window_client_resize(struct window_pane *, u_int,
static void window_client_free(struct window_mode_entry *);
static void window_client_resize(struct window_mode_entry *, u_int,
u_int);
static void window_client_key(struct window_pane *,
static void window_client_key(struct window_mode_entry *,
struct client *, struct session *,
struct winlink *, key_code, struct mouse_event *);
@ -236,13 +236,14 @@ window_client_draw(__unused void *modedata, void *itemdata,
}
static struct screen *
window_client_init(struct window_pane *wp, __unused struct cmd_find_state *fs,
struct args *args)
window_client_init(struct window_mode_entry *wme,
__unused struct cmd_find_state *fs, struct args *args)
{
struct window_pane *wp = wme->wp;
struct window_client_modedata *data;
struct screen *s;
wp->modedata = data = xcalloc(1, sizeof *data);
wme->data = data = xcalloc(1, sizeof *data);
if (args == NULL || !args_has(args, 'F'))
data->format = xstrdup(WINDOW_CLIENT_DEFAULT_FORMAT);
@ -265,9 +266,9 @@ window_client_init(struct window_pane *wp, __unused struct cmd_find_state *fs,
}
static void
window_client_free(struct window_pane *wp)
window_client_free(struct window_mode_entry *wme)
{
struct window_client_modedata *data = wp->modedata;
struct window_client_modedata *data = wme->data;
u_int i;
if (data == NULL)
@ -286,9 +287,9 @@ window_client_free(struct window_pane *wp)
}
static void
window_client_resize(struct window_pane *wp, u_int sx, u_int sy)
window_client_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
{
struct window_client_modedata *data = wp->modedata;
struct window_client_modedata *data = wme->data;
mode_tree_resize(data->data, sx, sy);
}
@ -311,11 +312,12 @@ window_client_do_detach(void* modedata, void *itemdata,
}
static void
window_client_key(struct window_pane *wp, struct client *c,
window_client_key(struct window_mode_entry *wme, struct client *c,
__unused struct session *s, __unused struct winlink *wl, key_code key,
struct mouse_event *m)
{
struct window_client_modedata *data = wp->modedata;
struct window_pane *wp = wme->wp;
struct window_client_modedata *data = wme->data;
struct mode_tree_data *mtd = data->data;
struct window_client_itemdata *item;
int finished;