mirror of
https://github.com/tmux/tmux.git
synced 2024-10-31 22:58:49 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
588865152a
2
client.c
2
client.c
@ -251,7 +251,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
|
||||
/* Set up the initial command. */
|
||||
if (shell_command != NULL) {
|
||||
msg = MSG_SHELL;
|
||||
flags = CLIENT_STARTSERVER;
|
||||
flags |= CLIENT_STARTSERVER;
|
||||
} else if (argc == 0) {
|
||||
msg = MSG_COMMAND;
|
||||
flags |= CLIENT_STARTSERVER;
|
||||
|
26
tmux.h
26
tmux.h
@ -104,24 +104,24 @@ struct winlink;
|
||||
#define VISUAL_BOTH 2
|
||||
|
||||
/* Special key codes. */
|
||||
#define KEYC_NONE 0xffff00000000ULL
|
||||
#define KEYC_UNKNOWN 0xfffe00000000ULL
|
||||
#define KEYC_BASE 0x000010000000ULL
|
||||
#define KEYC_USER 0x000020000000ULL
|
||||
#define KEYC_NONE 0x00ff000000000ULL
|
||||
#define KEYC_UNKNOWN 0x00fe000000000ULL
|
||||
#define KEYC_BASE 0x0001000000000ULL
|
||||
#define KEYC_USER 0x0002000000000ULL
|
||||
|
||||
/* Key modifier bits. */
|
||||
#define KEYC_ESCAPE 0x0100000000000ULL
|
||||
#define KEYC_CTRL 0x0200000000000ULL
|
||||
#define KEYC_SHIFT 0x0400000000000ULL
|
||||
#define KEYC_XTERM 0x0800000000000ULL
|
||||
#define KEYC_LITERAL 0x1000000000000ULL
|
||||
|
||||
/* Available user keys. */
|
||||
#define KEYC_NUSER 1000
|
||||
|
||||
/* Key modifier bits. */
|
||||
#define KEYC_ESCAPE 0x200000000000ULL
|
||||
#define KEYC_CTRL 0x400000000000ULL
|
||||
#define KEYC_SHIFT 0x800000000000ULL
|
||||
#define KEYC_XTERM 0x1000000000000ULL
|
||||
#define KEYC_LITERAL 0x2000000000000ULL
|
||||
|
||||
/* Mask to obtain key w/o modifiers. */
|
||||
#define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_XTERM|KEYC_LITERAL)
|
||||
#define KEYC_MASK_KEY (~KEYC_MASK_MOD)
|
||||
#define KEYC_MASK_MOD 0xff00000000000ULL
|
||||
#define KEYC_MASK_KEY 0x00fffffffffffULL
|
||||
|
||||
/* Is this a mouse key? */
|
||||
#define KEYC_IS_MOUSE(key) (((key) & KEYC_MASK_KEY) >= KEYC_MOUSE && \
|
||||
|
Loading…
Reference in New Issue
Block a user