diff options
| author | Pierre Ossman <ossman@cendio.se> | 2023-01-05 16:56:14 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2023-01-05 16:56:14 +0100 |
| commit | 27262aeabf3e4d8e29d8f64dbbe48441b80ce387 (patch) | |
| tree | 67c0e1be485483604ffbcd1fca97e425a9f34886 /vncviewer/win32.c | |
| parent | 4701b05b7829f355c7dd4a78f0e194f232872f76 (diff) | |
| parent | 7a36fb8ca702fdf6548d3a791896a161c94af5b4 (diff) | |
| download | tigervnc-27262aeabf3e4d8e29d8f64dbbe48441b80ce387.tar.gz tigervnc-27262aeabf3e4d8e29d8f64dbbe48441b80ce387.zip | |
Merge branch 'wextra' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'vncviewer/win32.c')
| -rw-r--r-- | vncviewer/win32.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vncviewer/win32.c b/vncviewer/win32.c index c4a68b67..77366f96 100644 --- a/vncviewer/win32.c +++ b/vncviewer/win32.c @@ -59,11 +59,13 @@ static int is_system_hotkey(int vkCode) { case VK_TAB: if (GetAsyncKeyState(VK_MENU) & 0x8000) return 1; + break; case VK_ESCAPE: if (GetAsyncKeyState(VK_MENU) & 0x8000) return 1; if (GetAsyncKeyState(VK_CONTROL) & 0x8000) return 1; + break; } return 0; } @@ -140,7 +142,7 @@ void win32_disable_lowlevel_keyboard(HWND hwnd) } // Layout independent keys -static const int vkey_map[][3] = { +static const UINT vkey_map[][3] = { { VK_CANCEL, NoSymbol, XK_Break }, { VK_BACK, XK_BackSpace, NoSymbol }, { VK_TAB, XK_Tab, NoSymbol }, @@ -231,7 +233,7 @@ static const int vkey_map[][3] = { // Layout dependent keys, but without useful symbols // Japanese -static const int vkey_map_jp[][3] = { +static const UINT vkey_map_jp[][3] = { { VK_KANA, XK_Hiragana_Katakana, NoSymbol }, { VK_KANJI, XK_Kanji, NoSymbol }, { VK_OEM_ATTN, XK_Eisu_toggle, NoSymbol }, @@ -246,12 +248,12 @@ static const int vkey_map_jp[][3] = { }; // Korean -static const int vkey_map_ko[][3] = { +static const UINT vkey_map_ko[][3] = { { VK_HANGUL, XK_Hangul, NoSymbol }, { VK_HANJA, XK_Hangul_Hanja, NoSymbol }, }; -static int lookup_vkey_map(UINT vkey, int extended, const int map[][3], size_t size) +static int lookup_vkey_map(UINT vkey, int extended, const UINT map[][3], size_t size) { size_t i; |