Merge branch 'obsd-master'

Conflicts:
	client.c
This commit is contained in:
Thomas Adam
2014-08-09 20:31:36 +01:00
17 changed files with 249 additions and 189 deletions

95
tmux.h
View File

@ -192,14 +192,6 @@ enum key_code {
KEYC_F10,
KEYC_F11,
KEYC_F12,
KEYC_F13,
KEYC_F14,
KEYC_F15,
KEYC_F16,
KEYC_F17,
KEYC_F18,
KEYC_F19,
KEYC_F20,
KEYC_IC,
KEYC_DC,
KEYC_HOME,
@ -305,26 +297,69 @@ enum tty_code_code {
TTYC_KEND5,
TTYC_KEND6,
TTYC_KEND7,
TTYC_KF1, /* key_f1, k1 */
TTYC_KF10, /* key_f10, k; */
TTYC_KF11, /* key_f11, F1 */
TTYC_KF12, /* key_f12, F2 */
TTYC_KF13, /* key_f13, F3 */
TTYC_KF14, /* key_f14, F4 */
TTYC_KF15, /* key_f15, F5 */
TTYC_KF16, /* key_f16, F6 */
TTYC_KF17, /* key_f17, F7 */
TTYC_KF18, /* key_f18, F8 */
TTYC_KF19, /* key_f19, F9 */
TTYC_KF2, /* key_f2, k2 */
TTYC_KF20, /* key_f20, F10 */
TTYC_KF3, /* key_f3, k3 */
TTYC_KF4, /* key_f4, k4 */
TTYC_KF5, /* key_f5, k5 */
TTYC_KF6, /* key_f6, k6 */
TTYC_KF7, /* key_f7, k7 */
TTYC_KF8, /* key_f8, k8 */
TTYC_KF9, /* key_f9, k9 */
TTYC_KF1,
TTYC_KF10,
TTYC_KF11,
TTYC_KF12,
TTYC_KF13,
TTYC_KF14,
TTYC_KF15,
TTYC_KF16,
TTYC_KF17,
TTYC_KF18,
TTYC_KF19,
TTYC_KF2,
TTYC_KF20,
TTYC_KF21,
TTYC_KF22,
TTYC_KF23,
TTYC_KF24,
TTYC_KF25,
TTYC_KF26,
TTYC_KF27,
TTYC_KF28,
TTYC_KF29,
TTYC_KF3,
TTYC_KF30,
TTYC_KF31,
TTYC_KF32,
TTYC_KF33,
TTYC_KF34,
TTYC_KF35,
TTYC_KF36,
TTYC_KF37,
TTYC_KF38,
TTYC_KF39,
TTYC_KF4,
TTYC_KF40,
TTYC_KF41,
TTYC_KF42,
TTYC_KF43,
TTYC_KF44,
TTYC_KF45,
TTYC_KF46,
TTYC_KF47,
TTYC_KF48,
TTYC_KF49,
TTYC_KF5,
TTYC_KF50,
TTYC_KF51,
TTYC_KF52,
TTYC_KF53,
TTYC_KF54,
TTYC_KF55,
TTYC_KF56,
TTYC_KF57,
TTYC_KF58,
TTYC_KF59,
TTYC_KF6,
TTYC_KF60,
TTYC_KF61,
TTYC_KF62,
TTYC_KF63,
TTYC_KF7,
TTYC_KF8,
TTYC_KF9,
TTYC_KHOM2,
TTYC_KHOM3,
TTYC_KHOM4,
@ -644,13 +679,13 @@ struct mode_key_table {
#define MODE_WRAP 0x10 /* whether lines wrap */
#define MODE_MOUSE_STANDARD 0x20
#define MODE_MOUSE_BUTTON 0x40
#define MODE_MOUSE_ANY 0x80
/* 0x80 unused */
#define MODE_MOUSE_UTF8 0x100
#define MODE_MOUSE_SGR 0x200
#define MODE_BRACKETPASTE 0x400
#define MODE_FOCUSON 0x800
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON)
/* A single UTF-8 character. */
struct utf8_data {