Make key_code unsigned long long not uint64_t which is more portable for

printf formats, and move UTF8_SIZE define down to near the rest of the
UTF-8 bits.
This commit is contained in:
nicm 2015-11-15 22:50:38 +00:00
parent a582b62287
commit 661d0dfac9

14
tmux.h
View File

@ -57,12 +57,6 @@ struct tmuxproc;
/* Automatic name refresh interval, in microseconds. Must be < 1 second. */ /* Automatic name refresh interval, in microseconds. Must be < 1 second. */
#define NAME_INTERVAL 500000 #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 * 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 * watermark). READ_BACKOFF is the amount of data waiting to be output to a tty
@ -125,7 +119,7 @@ struct tmuxproc;
* A single key. This can be ASCII or Unicode or one of the keys starting at * A single key. This can be ASCII or Unicode or one of the keys starting at
* KEYC_BASE. * KEYC_BASE.
*/ */
typedef uint64_t key_code; typedef unsigned long long key_code;
/* Special key codes. */ /* Special key codes. */
enum { enum {
@ -617,7 +611,11 @@ struct mode_key_table {
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON) #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 { struct utf8_data {
u_char data[UTF8_SIZE]; u_char data[UTF8_SIZE];