Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-11-16 00:01:10 +00:00
commit 1686a15fb6

14
tmux.h
View File

@ -60,12 +60,6 @@ struct tmuxproc;
/* Automatic name refresh interval, in microseconds. Must be < 1 second. */
#define NAME_INTERVAL 500000
/*
* UTF-8 data size. This must be big enough to hold combined characters as well
* as single.
*/
#define UTF8_SIZE 9
/*
* READ_SIZE is the maximum size of data to hold from a pty (the event high
* watermark). READ_BACKOFF is the amount of data waiting to be output to a tty
@ -128,7 +122,7 @@ struct tmuxproc;
* A single key. This can be ASCII or Unicode or one of the keys starting at
* KEYC_BASE.
*/
typedef uint64_t key_code;
typedef unsigned long long key_code;
/* Special key codes. */
enum {
@ -620,7 +614,11 @@ struct mode_key_table {
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON)
/* A single UTF-8 character. */
/*
* A single UTF-8 character. UTF8_SIZE must be big enough to hold at least one
* combining character as well.
*/
#define UTF8_SIZE 9
struct utf8_data {
u_char data[UTF8_SIZE];