diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-05-09 15:44:13 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-05-09 15:44:13 +0100 |
| commit | a651b08a2f95bb206ae6385801518f93fdd5000e (patch) | |
| tree | be8f2f1c33014e8524738174b54a967ab9fde362 /tmux.h | |
| parent | f3221941f27dbe4dbee550f72d42f268c228f5d1 (diff) | |
| parent | 18f36906a9e40ebcf9705fa9deb197bc4a1f813a (diff) | |
| download | rtmux-a651b08a2f95bb206ae6385801518f93fdd5000e.tar.gz rtmux-a651b08a2f95bb206ae6385801518f93fdd5000e.tar.bz2 rtmux-a651b08a2f95bb206ae6385801518f93fdd5000e.zip | |
Merge branch 'obsd-master'
Conflicts:
format.c
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 24 |
1 files changed, 14 insertions, 10 deletions
@@ -95,9 +95,10 @@ struct tmuxproc; #define KEYC_ESCAPE 0x200000000000ULL #define KEYC_CTRL 0x400000000000ULL #define KEYC_SHIFT 0x800000000000ULL +#define KEYC_XTERM 0x1000000000000ULL /* Mask to obtain key w/o modifiers. */ -#define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT) +#define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_XTERM) #define KEYC_MASK_KEY (~KEYC_MASK_MOD) /* Is this a mouse key? */ @@ -692,15 +693,18 @@ struct screen_write_ctx { * right function to handle input and output. */ struct window_mode { - struct screen *(*init)(struct window_pane *); - void (*free)(struct window_pane *); - void (*resize)(struct window_pane *, u_int, u_int); - void (*key)(struct window_pane *, struct client *, struct session *, - key_code, struct mouse_event *); - - const char *(*key_table)(struct window_pane *); - void (*command)(struct window_pane *, struct client *, - struct session *, struct args *, struct mouse_event *); + const char *name; + + struct screen *(*init)(struct window_pane *); + void (*free)(struct window_pane *); + void (*resize)(struct window_pane *, u_int, u_int); + void (*key)(struct window_pane *, struct client *, + struct session *, key_code, struct mouse_event *); + + const char *(*key_table)(struct window_pane *); + void (*command)(struct window_pane *, struct client *, + struct session *, struct args *, + struct mouse_event *); }; #define WINDOW_MODE_TIMEOUT 180 |