circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-04-16 03:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Reorganize structure of key_code so that it can be built directly by

Browse Source 
bitshifts rather than a load of huge switches, from Dane Jensen in
GitHub issue 4953.
This commit is contained in:
nicm
2026-03-31 11:46:43 +00:00
parent 022b5cf193
commit 2ff0dd3fef
4 changed files with 209 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
input-keys.c
View File

@@ -674,8 +674,7 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
} }
/* Ignore internal function key codes. */ /* Ignore internal function key codes. */
if ((key >= KEYC_BASE && key < KEYC_BASE_END) || if (KEYC_IS_USER(key) || KEYC_IS_SPECIAL(key) || KEYC_IS_MOUSE(key)) {
(key >= KEYC_USER && key < KEYC_USER_END)) {
log_debug("%s: ignoring key 0x%llx", __func__, key); log_debug("%s: ignoring key 0x%llx", __func__, key);
return (0); return (0);
} }

4
key-string.c
View File

@@ -202,7 +202,7 @@ key_string_search_table(const char *string)
return (key_string_table[i].key); return (key_string_table[i].key);
} }
if (sscanf(string, "User%u", &user) == 1 && user < KEYC_NUSER) if (sscanf(string, "User%u", &user) == 1 && user <= KEYC_NUSER)
return (KEYC_USER + user); return (KEYC_USER + user);
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
@@ -418,7 +418,7 @@ key_string_lookup_key(key_code key, int with_flags)
s = "MouseMoveBorder"; s = "MouseMoveBorder";
goto append; goto append;
} }
if (key >= KEYC_USER && key < KEYC_USER_END) { if (KEYC_IS_USER(key)) {
snprintf(tmp, sizeof tmp, "User%u", (u_int)(key - KEYC_USER)); snprintf(tmp, sizeof tmp, "User%u", (u_int)(key - KEYC_USER));
strlcat(out, tmp, sizeof out); strlcat(out, tmp, sizeof out);
goto out; goto out;

1490
server-client.c
View File

File diff suppressed because it is too large Load Diff

219
tmux.h
View File

@@ -120,18 +120,6 @@ struct winlink;
#define VISUAL_ON 1 #define VISUAL_ON 1
#define VISUAL_BOTH 2 #define VISUAL_BOTH 2
/* No key or unknown key. */
#define KEYC_NONE 0x000ff000000000ULL
#define KEYC_UNKNOWN 0x000fe000000000ULL
/*
* Base for special (that is, not Unicode) keys. An enum must be at most a
* signed int, so these are based in the highest Unicode PUA.
*/
#define KEYC_BASE 0x0000000010e000ULL
#define KEYC_USER 0x0000000010f000ULL
#define KEYC_USER_END (KEYC_USER + KEYC_NUSER)
/* Key modifier bits. */ /* Key modifier bits. */
#define KEYC_META 0x00100000000000ULL #define KEYC_META 0x00100000000000ULL
#define KEYC_CTRL 0x00200000000000ULL #define KEYC_CTRL 0x00200000000000ULL
@@ -147,45 +135,102 @@ struct winlink;
#define KEYC_SENT 0x40000000000000ULL #define KEYC_SENT 0x40000000000000ULL
/* Masks for key bits. */ /* Masks for key bits. */
#define KEYC_MASK_MODIFIERS 0x00f00000000000ULL #define KEYC_MASK_TYPE 0x0000ff00000000ULL
#define KEYC_MASK_MODIFIERS 0x00ff0000000000ULL
#define KEYC_MASK_FLAGS 0xff000000000000ULL #define KEYC_MASK_FLAGS 0xff000000000000ULL
#define KEYC_MASK_KEY 0x000fffffffffffULL #define KEYC_MASK_KEY 0x0000ffffffffffULL
/* Available user keys. */ #define KEYC_NUSER 1000
#define KEYC_NUSER 1000 #define KEYC_SHIFT_TYPE(t) ((unsigned long long)(t) << 32)
#define KEYC_IS_TYPE(k, t) (((k) & KEYC_MASK_TYPE) == KEYC_SHIFT_TYPE(t))
enum key_code_type {
KEYC_TYPE_UNICODE,
KEYC_TYPE_USER,
KEYC_TYPE_FUNCTION,
KEYC_TYPE_MOUSEMOVE,
KEYC_TYPE_MOUSEDOWN,
KEYC_TYPE_MOUSEUP,
KEYC_TYPE_MOUSEDRAG,
KEYC_TYPE_MOUSEDRAGEND,
KEYC_TYPE_WHEELDOWN,
KEYC_TYPE_WHEELUP,
KEYC_TYPE_SECONDCLICK,
KEYC_TYPE_DOUBLECLICK,
KEYC_TYPE_TRIPLECLICK,
KEYC_TYPE_NOTYPE /* end */
};
/* Is this a mouse key? */ enum key_code_mouse_location {
#define KEYC_IS_MOUSE(key) \ KEYC_MOUSE_LOCATION_PANE,
(((key) & KEYC_MASK_KEY) >= KEYC_MOUSE && \ KEYC_MOUSE_LOCATION_STATUS,
((key) & KEYC_MASK_KEY) < KEYC_BSPACE) KEYC_MOUSE_LOCATION_STATUS_LEFT,
KEYC_MOUSE_LOCATION_STATUS_RIGHT,
KEYC_MOUSE_LOCATION_STATUS_DEFAULT,
KEYC_MOUSE_LOCATION_BORDER,
KEYC_MOUSE_LOCATION_SCROLLBAR_UP,
KEYC_MOUSE_LOCATION_SCROLLBAR_SLIDER,
KEYC_MOUSE_LOCATION_SCROLLBAR_DOWN,
KEYC_MOUSE_LOCATION_NOWHERE /* end */
};
/* Is this a Unicode key? */ /* Is this a Unicode key? */
#define KEYC_IS_UNICODE(key) \ #define KEYC_IS_UNICODE(key) \
(((key) & KEYC_MASK_KEY) > 0x7f && \ (((key) & KEYC_MASK_TYPE) == KEYC_SHIFT_TYPE(KEYC_TYPE_UNICODE) && \
(((key) & KEYC_MASK_KEY) < KEYC_BASE || \ ((key) & KEYC_MASK_KEY) > 0x7f)
((key) & KEYC_MASK_KEY) >= KEYC_BASE_END) && \
(((key) & KEYC_MASK_KEY) < KEYC_USER || \ /* Is this a user key? */
((key) & KEYC_MASK_KEY) >= KEYC_USER_END)) #define KEYC_IS_USER(key) \
(((key) & KEYC_MASK_TYPE) == KEYC_SHIFT_TYPE(KEYC_TYPE_USER))
/* Is this a function key? */
#define KEYC_IS_SPECIAL(key) \
(((key) & KEYC_MASK_TYPE) == KEYC_SHIFT_TYPE(KEYC_TYPE_FUNCTION))
/* Is this a mouse key? */
#define KEYC_IS_MOUSE(key) \
(((key) & KEYC_MASK_KEY) == KEYC_MOUSE || \
(((key) & KEYC_MASK_TYPE) >= KEYC_SHIFT_TYPE(KEYC_TYPE_MOUSEMOVE) && \
((key) & KEYC_MASK_TYPE) <= KEYC_SHIFT_TYPE(KEYC_TYPE_TRIPLECLICK)))
/* Is this a paste key? */ /* Is this a paste key? */
#define KEYC_IS_PASTE(key) \ #define KEYC_IS_PASTE(key) \
(((key) & KEYC_MASK_KEY) == KEYC_PASTE_START || \ (((key) & KEYC_MASK_TYPE) == KEYC_SHIFT_TYPE(KEYC_TYPE_FUNCTION) && \
((key) & KEYC_MASK_KEY) == KEYC_PASTE_END) (((key) & KEYC_MASK_KEY) == KEYC_PASTE_START || \
((key) & KEYC_MASK_KEY) == KEYC_PASTE_END))
/* Multiple click timeout. */ /* Multiple click timeout. */
#define KEYC_CLICK_TIMEOUT 300 #define KEYC_CLICK_TIMEOUT 300
/* Bit shift for mouse events. */
#define KEYC_MOUSE_LOCATION_SHIFT 0
#define KEYC_MOUSE_BUTTON_SHIFT 8
/* Mouse key codes. */ /* Mouse key codes. */
#define KEYC_MOUSE_KEY(name) \ #define KEYC_MOUSE_KEYS(t) \
KEYC_ ## name ## _PANE, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, PANE), \
KEYC_ ## name ## _STATUS, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, STATUS), \
KEYC_ ## name ## _STATUS_LEFT, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, STATUS_LEFT), \
KEYC_ ## name ## _STATUS_RIGHT, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, STATUS_RIGHT), \
KEYC_ ## name ## _STATUS_DEFAULT, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, STATUS_DEFAULT), \
KEYC_ ## name ## _SCROLLBAR_UP, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, BORDER), \
KEYC_ ## name ## _SCROLLBAR_SLIDER, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, SCROLLBAR_UP), \
KEYC_ ## name ## _SCROLLBAR_DOWN, \ KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, SCROLLBAR_SLIDER), \
KEYC_ ## name ## _BORDER KEYC_MOUSE_KEY(KEYC_ ## t, KEYC_TYPE_ ## t, SCROLLBAR_DOWN)
#define KEYC_MOUSE_KEY(p, t, l) \
p ## _ ## l = KEYC_MAKE_MOUSE_KEY(t, 0, KEYC_MOUSE_LOCATION_ ## l), \
p ## 1_ ## l = KEYC_MAKE_MOUSE_KEY(t, 1, KEYC_MOUSE_LOCATION_ ## l), \
p ## 2_ ## l = KEYC_MAKE_MOUSE_KEY(t, 2, KEYC_MOUSE_LOCATION_ ## l), \
p ## 3_ ## l = KEYC_MAKE_MOUSE_KEY(t, 3, KEYC_MOUSE_LOCATION_ ## l), \
p ## 6_ ## l = KEYC_MAKE_MOUSE_KEY(t, 6, KEYC_MOUSE_LOCATION_ ## l), \
p ## 7_ ## l = KEYC_MAKE_MOUSE_KEY(t, 7, KEYC_MOUSE_LOCATION_ ## l), \
p ## 8_ ## l = KEYC_MAKE_MOUSE_KEY(t, 8, KEYC_MOUSE_LOCATION_ ## l), \
p ## 9_ ## l = KEYC_MAKE_MOUSE_KEY(t, 9, KEYC_MOUSE_LOCATION_ ## l), \
p ## 10_ ## l = KEYC_MAKE_MOUSE_KEY(t, 10, KEYC_MOUSE_LOCATION_ ## l), \
p ## 11_ ## l = KEYC_MAKE_MOUSE_KEY(t, 11, KEYC_MOUSE_LOCATION_ ## l)
#define KEYC_MAKE_MOUSE_KEY(t, b, l) \
((KEYC_SHIFT_TYPE(t)) | \
((unsigned long long)(b) << KEYC_MOUSE_BUTTON_SHIFT) | \
((unsigned long long)(l) << KEYC_MOUSE_LOCATION_SHIFT))
#define KEYC_MOUSE_STRING(name, s) \ #define KEYC_MOUSE_STRING(name, s) \
{ #s "Pane", KEYC_ ## name ## _PANE }, \ { #s "Pane", KEYC_ ## name ## _PANE }, \
{ #s "Status", KEYC_ ## name ## _STATUS }, \ { #s "Status", KEYC_ ## name ## _STATUS }, \
@@ -241,8 +286,15 @@ enum {
/* Special key codes. */ /* Special key codes. */
enum { enum {
/* User key code range. */
KEYC_USER = KEYC_SHIFT_TYPE(KEYC_TYPE_USER),
/* Functional key code range. */
KEYC_NONE = KEYC_SHIFT_TYPE(KEYC_TYPE_FUNCTION),
KEYC_UNKNOWN,
/* Focus events. */ /* Focus events. */
KEYC_FOCUS_IN = KEYC_BASE, KEYC_FOCUS_IN,
KEYC_FOCUS_OUT, KEYC_FOCUS_OUT,
/* "Any" key, used if not found in key table. */ /* "Any" key, used if not found in key table. */
@@ -252,77 +304,6 @@ enum {
KEYC_PASTE_START, KEYC_PASTE_START,
KEYC_PASTE_END, KEYC_PASTE_END,
/* Mouse keys. */
KEYC_MOUSE, /* unclassified mouse event */
KEYC_DRAGGING, /* dragging in progress */
KEYC_DOUBLECLICK, /* double click complete */
KEYC_MOUSE_KEY(MOUSEMOVE),
KEYC_MOUSE_KEY(MOUSEDOWN1),
KEYC_MOUSE_KEY(MOUSEDOWN2),
KEYC_MOUSE_KEY(MOUSEDOWN3),
KEYC_MOUSE_KEY(MOUSEDOWN6),
KEYC_MOUSE_KEY(MOUSEDOWN7),
KEYC_MOUSE_KEY(MOUSEDOWN8),
KEYC_MOUSE_KEY(MOUSEDOWN9),
KEYC_MOUSE_KEY(MOUSEDOWN10),
KEYC_MOUSE_KEY(MOUSEDOWN11),
KEYC_MOUSE_KEY(MOUSEUP1),
KEYC_MOUSE_KEY(MOUSEUP2),
KEYC_MOUSE_KEY(MOUSEUP3),
KEYC_MOUSE_KEY(MOUSEUP6),
KEYC_MOUSE_KEY(MOUSEUP7),
KEYC_MOUSE_KEY(MOUSEUP8),
KEYC_MOUSE_KEY(MOUSEUP9),
KEYC_MOUSE_KEY(MOUSEUP10),
KEYC_MOUSE_KEY(MOUSEUP11),
KEYC_MOUSE_KEY(MOUSEDRAG1),
KEYC_MOUSE_KEY(MOUSEDRAG2),
KEYC_MOUSE_KEY(MOUSEDRAG3),
KEYC_MOUSE_KEY(MOUSEDRAG6),
KEYC_MOUSE_KEY(MOUSEDRAG7),
KEYC_MOUSE_KEY(MOUSEDRAG8),
KEYC_MOUSE_KEY(MOUSEDRAG9),
KEYC_MOUSE_KEY(MOUSEDRAG10),
KEYC_MOUSE_KEY(MOUSEDRAG11),
KEYC_MOUSE_KEY(MOUSEDRAGEND1),
KEYC_MOUSE_KEY(MOUSEDRAGEND2),
KEYC_MOUSE_KEY(MOUSEDRAGEND3),
KEYC_MOUSE_KEY(MOUSEDRAGEND6),
KEYC_MOUSE_KEY(MOUSEDRAGEND7),
KEYC_MOUSE_KEY(MOUSEDRAGEND8),
KEYC_MOUSE_KEY(MOUSEDRAGEND9),
KEYC_MOUSE_KEY(MOUSEDRAGEND10),
KEYC_MOUSE_KEY(MOUSEDRAGEND11),
KEYC_MOUSE_KEY(WHEELUP),
KEYC_MOUSE_KEY(WHEELDOWN),
KEYC_MOUSE_KEY(SECONDCLICK1),
KEYC_MOUSE_KEY(SECONDCLICK2),
KEYC_MOUSE_KEY(SECONDCLICK3),
KEYC_MOUSE_KEY(SECONDCLICK6),
KEYC_MOUSE_KEY(SECONDCLICK7),
KEYC_MOUSE_KEY(SECONDCLICK8),
KEYC_MOUSE_KEY(SECONDCLICK9),
KEYC_MOUSE_KEY(SECONDCLICK10),
KEYC_MOUSE_KEY(SECONDCLICK11),
KEYC_MOUSE_KEY(DOUBLECLICK1),
KEYC_MOUSE_KEY(DOUBLECLICK2),
KEYC_MOUSE_KEY(DOUBLECLICK3),
KEYC_MOUSE_KEY(DOUBLECLICK6),
KEYC_MOUSE_KEY(DOUBLECLICK7),
KEYC_MOUSE_KEY(DOUBLECLICK8),
KEYC_MOUSE_KEY(DOUBLECLICK9),
KEYC_MOUSE_KEY(DOUBLECLICK10),
KEYC_MOUSE_KEY(DOUBLECLICK11),
KEYC_MOUSE_KEY(TRIPLECLICK1),
KEYC_MOUSE_KEY(TRIPLECLICK2),
KEYC_MOUSE_KEY(TRIPLECLICK3),
KEYC_MOUSE_KEY(TRIPLECLICK6),
KEYC_MOUSE_KEY(TRIPLECLICK7),
KEYC_MOUSE_KEY(TRIPLECLICK8),
KEYC_MOUSE_KEY(TRIPLECLICK9),
KEYC_MOUSE_KEY(TRIPLECLICK10),
KEYC_MOUSE_KEY(TRIPLECLICK11),
/* Backspace key. */ /* Backspace key. */
KEYC_BSPACE, KEYC_BSPACE,
@@ -375,8 +356,22 @@ enum {
KEYC_REPORT_DARK_THEME, KEYC_REPORT_DARK_THEME,
KEYC_REPORT_LIGHT_THEME, KEYC_REPORT_LIGHT_THEME,
/* End of special keys. */ /* Mouse state. */
KEYC_BASE_END KEYC_MOUSE, /* unclassified mouse event */
KEYC_DRAGGING, /* dragging in progress */
KEYC_DOUBLECLICK, /* double click complete */
/* Mouse key code ranges. Must be at the end. */
KEYC_MOUSE_KEYS(MOUSEMOVE),
KEYC_MOUSE_KEYS(WHEELDOWN),
KEYC_MOUSE_KEYS(WHEELUP),
KEYC_MOUSE_KEYS(MOUSEDOWN),
KEYC_MOUSE_KEYS(MOUSEUP),
KEYC_MOUSE_KEYS(MOUSEDRAG),
KEYC_MOUSE_KEYS(MOUSEDRAGEND),
KEYC_MOUSE_KEYS(SECONDCLICK),
KEYC_MOUSE_KEYS(DOUBLECLICK),
KEYC_MOUSE_KEYS(TRIPLECLICK),
}; };
/* Termcap codes. */ /* Termcap codes. */
@@ -1954,7 +1949,7 @@ struct client {
struct event repeat_timer; struct event repeat_timer;
struct event click_timer; struct event click_timer;
int click_where; int click_loc;
int click_wp; int click_wp;
u_int click_button; u_int click_button;
struct mouse_event click_event; struct mouse_event click_event;