From b5d4aeb5da52e0a97deecc5880c416a1b121c41c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 13 Nov 2015 20:04:44 +0100 Subject: [PATCH] (keyboard_event_apple.c) Style nits --- input/drivers_keyboard/keyboard_event_apple.c | 146 +++++++++--------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index 9bd9e79933..8c252352cc 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -36,14 +36,14 @@ * check keycode.h for license. */ static const unsigned char MAC_NATIVE_TO_HID[128] = { - 4, 22, 7, 9, 11, 10, 29, 27, 6, 25,255, 5, 20, 26, 8, 21, - 28, 23, 30, 31, 32, 33, 35, 34, 46, 38, 36, 45, 37, 39, 48, 18, - 24, 47, 12, 19, 40, 15, 13, 52, 14, 51, 49, 54, 56, 17, 16, 55, - 43, 44, 53, 42,255, 41,231,227,225, 57,226,224,229,230,228,255, -108, 99,255, 85,255, 87,255, 83,255,255,255, 84, 88,255, 86,109, -110,103, 98, 89, 90, 91, 92, 93, 94, 95,111, 96, 97,255,255,255, - 62, 63, 64, 60, 65, 66,255, 68,255,104,107,105,255, 67,255, 69, -255,106,117, 74, 75, 76, 61, 77, 59, 78, 58, 80, 79, 81, 82,255 + 4, 22, 7, 9, 11, 10, 29, 27, 6, 25,255, 5, 20, 26, 8, 21, + 28, 23, 30, 31, 32, 33, 35, 34, 46, 38, 36, 45, 37, 39, 48, 18, + 24, 47, 12, 19, 40, 15, 13, 52, 14, 51, 49, 54, 56, 17, 16, 55, + 43, 44, 53, 42,255, 41,231,227,225, 57,226,224,229,230,228,255, + 108, 99,255, 85,255, 87,255, 83,255,255,255, 84, 88,255, 86,109, + 110,103, 98, 89, 90, 91, 92, 93, 94, 95,111, 96, 97,255,255,255, + 62, 63, 64, 60, 65, 66,255, 68,255,104,107,105,255, 67,255, 69, + 255,106,117, 74, 75, 76, 61, 77, 59, 78, 58, 80, 79, 81, 82,255 }; #define HIDKEY(X) (X < 128) ? MAC_NATIVE_TO_HID[X] : 0 @@ -74,7 +74,7 @@ static bool handle_small_keyboard(unsigned* code, bool down) driver_t *driver = driver_get_ptr(); cocoa_input_data_t *apple = (cocoa_input_data_t*)driver->input_data; unsigned translated_code = 0; - + if (!map_initialized) { int i; @@ -89,15 +89,15 @@ static bool handle_small_keyboard(unsigned* code, bool down) *code = 0; return true; } - + translated_code = (*code < 128) ? mapping[*code] : 0; - + /* Allow old keys to be released. */ if (!down && apple->key_state[*code]) return false; if ((!down && apple->key_state[translated_code]) || - apple->small_keyboard_active) + apple->small_keyboard_active) { *code = translated_code; return true; @@ -110,8 +110,8 @@ extern const struct rarch_key_map rarch_key_map_apple_hid[]; typedef struct icade_map { - bool up; - enum retro_key key; + bool up; + enum retro_key key; } icade_map_t; #define MAX_ICADE_PROFILES 2 @@ -121,67 +121,67 @@ static icade_map_t icade_maps[MAX_ICADE_PROFILES][MAX_ICADE_KEYS]; static bool handle_icade_event(unsigned *code, bool *keydown) { - static bool initialized = false; - bool ret = false; - unsigned kb_type_idx = 1; - - if (!initialized) - { - unsigned i; - unsigned j = 0; - - for (j = 0; j < MAX_ICADE_PROFILES; j++) - { - for (i = 0; i < MAX_ICADE_KEYS; i++) - { + static bool initialized = false; + bool ret = false; + unsigned kb_type_idx = 1; + + if (!initialized) + { + unsigned i; + unsigned j = 0; + + for (j = 0; j < MAX_ICADE_PROFILES; j++) + { + for (i = 0; i < MAX_ICADE_KEYS; i++) + { icade_maps[j][i].key = RETROK_UNKNOWN; icade_maps[j][i].up = false; - } - } - - /* iPega PG-9017 */ - j = 1; - - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_a)].key = RETROK_LEFT; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_c)].key = RETROK_RIGHT; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_d)].key = RETROK_RIGHT; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_e)].key = RETROK_UP; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_f)].key = RETROK_z; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_h)].key = RETROK_x; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_i)].key = RETROK_q; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_j)].key = RETROK_a; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_k)].key = RETROK_w; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_m)].key = RETROK_q; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_n)].key = RETROK_a; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_p)].key = RETROK_w; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_q)].key = RETROK_LEFT; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_r)].key = RETROK_x; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_u)].key = RETROK_z; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_w)].key = RETROK_UP; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_x)].key = RETROK_DOWN; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_z)].key = RETROK_DOWN; - - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_c)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_e)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_f)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_m)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_n)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_p)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_q)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_r)].up = true; - icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_z)].up = true; - - initialized = true; - } + } + } + + /* iPega PG-9017 */ + j = 1; + + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_a)].key = RETROK_LEFT; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_c)].key = RETROK_RIGHT; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_d)].key = RETROK_RIGHT; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_e)].key = RETROK_UP; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_f)].key = RETROK_z; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_h)].key = RETROK_x; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_i)].key = RETROK_q; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_j)].key = RETROK_a; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_k)].key = RETROK_w; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_m)].key = RETROK_q; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_n)].key = RETROK_a; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_p)].key = RETROK_w; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_q)].key = RETROK_LEFT; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_r)].key = RETROK_x; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_u)].key = RETROK_z; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_w)].key = RETROK_UP; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_x)].key = RETROK_DOWN; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_z)].key = RETROK_DOWN; + + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_c)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_e)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_f)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_m)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_n)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_p)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_q)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_r)].up = true; + icade_maps[j][input_keymaps_translate_rk_to_keysym(RETROK_z)].up = true; + + initialized = true; + } if ((*code < 0x20) && (icade_maps[kb_type_idx][*code].key != RETROK_UNKNOWN)) { - *keydown = icade_maps[kb_type_idx][*code].up ? false : true; - ret = true; - *code = input_keymaps_translate_rk_to_keysym(icade_maps[kb_type_idx][*code].key); + *keydown = icade_maps[kb_type_idx][*code].up ? false : true; + ret = true; + *code = input_keymaps_translate_rk_to_keysym(icade_maps[kb_type_idx][*code].key); } - - return ret; + + return ret; } #endif @@ -201,9 +201,9 @@ void cocoa_input_keyboard_event(bool down, if (settings->input.icade_enable) { if (handle_icade_event(&code, &down)) - character = 0; + character = 0; else - code = 0; + code = 0; } else if (settings->input.small_keyboard_enable) { @@ -211,12 +211,12 @@ void cocoa_input_keyboard_event(bool down, character = 0; } #endif - + if (code == 0 || code >= MAX_KEYS) return; apple->key_state[code] = down; - + input_keyboard_event(down, input_keymaps_translate_keysym_to_rk(code), character, (enum retro_mod)mod, device);