From 0cf1d86a3a6f0b9366893861f75a3a998a023bf6 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Wed, 23 Nov 2022 19:14:24 +0100 Subject: [PATCH] (input_driver.c) Turn bunch of functions static that are never accessed outside * Turn some variable / parameter names like 'joypad_driver_name' into 'joypad_drv_name' so they are less likely to conflict with symbol names --- gfx/drivers/sdl_dingux_gfx.c | 28 +++++----- gfx/drivers/sdl_rs90_gfx.c | 28 +++++----- gfx/drivers_font/gdi_font.c | 2 +- input/drivers/dinput.c | 12 ++-- input/input_driver.c | 94 +++++++++++++++++++++----------- input/input_driver.h | 103 ----------------------------------- 6 files changed, 98 insertions(+), 169 deletions(-) diff --git a/gfx/drivers/sdl_dingux_gfx.c b/gfx/drivers/sdl_dingux_gfx.c index 0e1988967e..08e3a05329 100644 --- a/gfx/drivers/sdl_dingux_gfx.c +++ b/gfx/drivers/sdl_dingux_gfx.c @@ -339,7 +339,7 @@ static void sdl_dingux_gfx_free(void *data) } static void sdl_dingux_input_driver_init( - const char *input_driver_name, const char *joypad_driver_name, + const char *input_drv_name, const char *joypad_drv_name, input_driver_t **input, void **input_data) { /* Sanity check */ @@ -351,13 +351,13 @@ static void sdl_dingux_input_driver_init( /* If input driver name is empty, cannot * initialise anything... */ - if (string_is_empty(input_driver_name)) + if (string_is_empty(input_drv_name)) return; - if (string_is_equal(input_driver_name, "sdl_dingux")) + if (string_is_equal(input_drv_name, "sdl_dingux")) { *input_data = input_driver_init_wrap(&input_sdl_dingux, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_sdl_dingux; @@ -366,10 +366,10 @@ static void sdl_dingux_input_driver_init( } #if defined(HAVE_SDL) || defined(HAVE_SDL2) - if (string_is_equal(input_driver_name, "sdl")) + if (string_is_equal(input_drv_name, "sdl")) { *input_data = input_driver_init_wrap(&input_sdl, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_sdl; @@ -379,10 +379,10 @@ static void sdl_dingux_input_driver_init( #endif #if defined(HAVE_UDEV) - if (string_is_equal(input_driver_name, "udev")) + if (string_is_equal(input_drv_name, "udev")) { *input_data = input_driver_init_wrap(&input_udev, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_udev; @@ -392,10 +392,10 @@ static void sdl_dingux_input_driver_init( #endif #if defined(__linux__) - if (string_is_equal(input_driver_name, "linuxraw")) + if (string_is_equal(input_drv_name, "linuxraw")) { *input_data = input_driver_init_wrap(&input_linuxraw, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_linuxraw; @@ -422,8 +422,8 @@ static void *sdl_dingux_gfx_init(const video_info_t *video, #endif enum dingux_ipu_filter_type ipu_filter_type = (enum dingux_ipu_filter_type) settings->uints.video_dingux_ipu_filter_type; - const char *input_driver_name = settings->arrays.input_driver; - const char *joypad_driver_name = settings->arrays.input_joypad_driver; + const char *input_drv_name = settings->arrays.input_driver; + const char *joypad_drv_name = settings->arrays.input_joypad_driver; uint32_t surface_flags = (video->vsync) ? (SDL_HWSURFACE | SDL_TRIPLEBUF | SDL_FULLSCREEN) : (SDL_HWSURFACE | SDL_FULLSCREEN); @@ -518,8 +518,8 @@ static void *sdl_dingux_gfx_init(const video_info_t *video, SDL_ShowCursor(SDL_DISABLE); - sdl_dingux_input_driver_init(input_driver_name, - joypad_driver_name, input, input_data); + sdl_dingux_input_driver_init(input_drv_name, + joypad_drv_name, input, input_data); /* Initialise OSD font */ sdl_dingux_init_font_color(vid); diff --git a/gfx/drivers/sdl_rs90_gfx.c b/gfx/drivers/sdl_rs90_gfx.c index 393714657d..0be78dbf20 100644 --- a/gfx/drivers/sdl_rs90_gfx.c +++ b/gfx/drivers/sdl_rs90_gfx.c @@ -724,7 +724,7 @@ static void sdl_rs90_gfx_free(void *data) } static void sdl_rs90_input_driver_init( - const char *input_driver_name, const char *joypad_driver_name, + const char *input_drv_name, const char *joypad_drv_name, input_driver_t **input, void **input_data) { /* Sanity check */ @@ -736,13 +736,13 @@ static void sdl_rs90_input_driver_init( /* If input driver name is empty, cannot * initialise anything... */ - if (string_is_empty(input_driver_name)) + if (string_is_empty(input_drv_name)) return; - if (string_is_equal(input_driver_name, "sdl_dingux")) + if (string_is_equal(input_drv_name, "sdl_dingux")) { *input_data = input_driver_init_wrap(&input_sdl_dingux, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_sdl_dingux; @@ -751,10 +751,10 @@ static void sdl_rs90_input_driver_init( } #if defined(HAVE_SDL) || defined(HAVE_SDL2) - if (string_is_equal(input_driver_name, "sdl")) + if (string_is_equal(input_drv_name, "sdl")) { *input_data = input_driver_init_wrap(&input_sdl, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_sdl; @@ -764,10 +764,10 @@ static void sdl_rs90_input_driver_init( #endif #if defined(HAVE_UDEV) - if (string_is_equal(input_driver_name, "udev")) + if (string_is_equal(input_drv_name, "udev")) { *input_data = input_driver_init_wrap(&input_udev, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_udev; @@ -777,10 +777,10 @@ static void sdl_rs90_input_driver_init( #endif #if defined(__linux__) - if (string_is_equal(input_driver_name, "linuxraw")) + if (string_is_equal(input_drv_name, "linuxraw")) { *input_data = input_driver_init_wrap(&input_linuxraw, - joypad_driver_name); + joypad_drv_name); if (*input_data) *input = &input_linuxraw; @@ -803,8 +803,8 @@ static void *sdl_rs90_gfx_init(const video_info_t *video, bool refresh_rate_valid = false; float hw_refresh_rate = 0.0f; #endif - const char *input_driver_name = settings->arrays.input_driver; - const char *joypad_driver_name = settings->arrays.input_joypad_driver; + const char *input_drv_name = settings->arrays.input_driver; + const char *joypad_drv_name = settings->arrays.input_joypad_driver; uint32_t surface_flags = (video->vsync) ? SDL_RS90_SURFACE_FLAGS_VSYNC_ON : SDL_RS90_SURFACE_FLAGS_VSYNC_OFF; @@ -899,8 +899,8 @@ static void *sdl_rs90_gfx_init(const video_info_t *video, SDL_ShowCursor(SDL_DISABLE); - sdl_rs90_input_driver_init(input_driver_name, - joypad_driver_name, input, input_data); + sdl_rs90_input_driver_init(input_drv_name, + joypad_drv_name, input, input_data); /* Initialise OSD font */ sdl_rs90_init_font_color(vid); diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c index 62c4b8455b..4a1649fb58 100644 --- a/gfx/drivers_font/gdi_font.c +++ b/gfx/drivers_font/gdi_font.c @@ -79,7 +79,7 @@ static void gdi_font_render_msg( const char *msg, const struct font_params *params) { - int i; + size_t i; char* msg_local; size_t msg_len; float x, y, scale, drop_mod, drop_alpha; diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index 794c0f5fc8..c3617e65ee 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -85,7 +85,7 @@ enum dinput_input_flags struct dinput_input { - char *joypad_driver_name; + char *joypad_drv_name; LPDIRECTINPUTDEVICE8 keyboard; LPDIRECTINPUTDEVICE8 mouse; const input_device_driver_t *joypad; @@ -143,7 +143,7 @@ static void *dinput_init(const char *joypad_driver) return NULL; if (!string_is_empty(joypad_driver)) - di->joypad_driver_name = strdup(joypad_driver); + di->joypad_drv_name = strdup(joypad_driver); #ifdef __cplusplus if (FAILED(IDirectInput8_CreateDevice(g_dinput_ctx, @@ -990,7 +990,7 @@ bool dinput_handle_message(void *data, /* TODO/FIXME: Don't destroy everything, let's just * handle new devices gracefully */ - joypad_driver_reinit(di, di->joypad_driver_name); + joypad_driver_reinit(di, di->joypad_drv_name); } } #endif @@ -1038,9 +1038,9 @@ static void dinput_free(void *data) if (di->mouse) IDirectInputDevice8_Release(di->mouse); - if (di->joypad_driver_name) - free(di->joypad_driver_name); - di->joypad_driver_name = NULL; + if (di->joypad_drv_name) + free(di->joypad_drv_name); + di->joypad_drv_name = NULL; free(di); diff --git a/input/input_driver.c b/input/input_driver.c index bf3581e6b9..cbc5689755 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -465,9 +465,9 @@ bool input_driver_set_sensor( /* If sensors are disabled, inhibit any enable * actions (but always allow disable actions) */ if (!sensors_enable && - ((action == RETRO_SENSOR_ACCELEROMETER_ENABLE) || - (action == RETRO_SENSOR_GYROSCOPE_ENABLE) || - (action == RETRO_SENSOR_ILLUMINANCE_ENABLE))) + ( (action == RETRO_SENSOR_ACCELEROMETER_ENABLE) + || (action == RETRO_SENSOR_GYROSCOPE_ENABLE) + || (action == RETRO_SENSOR_ILLUMINANCE_ENABLE))) return false; if ( (current_driver = input_driver_st.current_driver) && current_driver->set_sensor_state) @@ -523,7 +523,6 @@ const input_device_driver_t *input_joypad_init_driver( return input_joypad_init_first(data); /* fall back to first available driver */ } - bool input_driver_button_combo( unsigned mode, retro_time_t current_time, @@ -662,7 +661,7 @@ bool input_driver_button_combo( return false; } -int16_t input_state_wrap( +static int16_t input_state_wrap( input_driver_t *current_input, void *data, const input_device_driver_t *joypad, @@ -750,7 +749,7 @@ int16_t input_state_wrap( return ret; } -int16_t input_joypad_axis( +static int16_t input_joypad_axis( float input_analog_deadzone, float input_analog_sensitivity, const input_device_driver_t *drv, @@ -791,7 +790,26 @@ int16_t input_joypad_axis( return val; } -int16_t input_joypad_analog_button( +/** + * input_joypad_analog_button: + * @drv : Input device driver handle. + * @port : User number. + * @idx : Analog key index. + * E.g.: + * - RETRO_DEVICE_INDEX_ANALOG_LEFT + * - RETRO_DEVICE_INDEX_ANALOG_RIGHT + * @ident : Analog key identifier. + * E.g.: + * - RETRO_DEVICE_ID_ANALOG_X + * - RETRO_DEVICE_ID_ANALOG_Y + * @binds : Binds of user. + * + * Gets analog value of analog key identifiers @idx and @ident + * from user with number @port with provided keybinds (@binds). + * + * Returns: analog value on success, otherwise 0. + **/ +static int16_t input_joypad_analog_button( float input_analog_deadzone, float input_analog_sensitivity, const input_device_driver_t *drv, @@ -835,7 +853,7 @@ int16_t input_joypad_analog_button( return res; } -int16_t input_joypad_analog_axis( +static int16_t input_joypad_analog_axis( unsigned input_analog_dpad_mode, float input_analog_deadzone, float input_analog_sensitivity, @@ -3386,7 +3404,16 @@ void input_driver_deinit_command(input_driver_state_t *input_st) } #endif -bool input_keyboard_line_event( +/** + * input_keyboard_line_event: + * @state : Input keyboard line handle. + * @character : Inputted character. + * + * Called on every keyboard character event. + * + * Returns: true (1) on success, otherwise false (0). + **/ +static bool input_keyboard_line_event( input_driver_state_t *input_st, input_keyboard_line_t *state, uint32_t character) { @@ -3713,7 +3740,7 @@ void input_pad_connect(unsigned port, input_device_driver_t *driver) port, 0, 0); } -bool input_keys_pressed_other_sources( +static bool input_keys_pressed_other_sources( input_driver_state_t *input_st, unsigned i, input_bits_t* p_new_state) @@ -3743,10 +3770,15 @@ bool input_keys_pressed_other_sources( return false; } -void input_keys_pressed( +/** + * input_keys_pressed: + * + * Grab an input sample for this frame. + */ +static void input_keys_pressed( unsigned port, bool is_menu, - int input_hotkey_block_delay, + unsigned input_hotkey_block_delay, input_bits_t *p_new_state, const retro_keybind_set *binds, const struct retro_keybind *binds_norm, @@ -3774,7 +3806,7 @@ void input_keys_pressed( port, RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY)) { - if (input_st->input_hotkey_block_counter < (int)input_hotkey_block_delay) + if (input_st->input_hotkey_block_counter < input_hotkey_block_delay) input_st->input_hotkey_block_counter++; else input_st->flags |= INP_FLAG_BLOCK_LIBRETRO_INPUT; @@ -3829,8 +3861,8 @@ void input_keys_pressed( for (i = 0; i < RARCH_FIRST_META_KEY; i++) { if ( - (ret & (UINT64_C(1) << i)) || - input_keys_pressed_other_sources(input_st, + (ret & (UINT64_C(1) << i)) + || input_keys_pressed_other_sources(input_st, i, p_new_state)) { BIT256_SET_PTR(p_new_state, i); @@ -3877,7 +3909,7 @@ void input_keys_pressed( } } -int16_t input_state_device( +static int16_t input_state_device( input_driver_state_t *input_st, settings_t *settings, input_mapper_t *handle, @@ -4266,11 +4298,11 @@ void input_driver_poll(void) * when mapping analog stick to dpad input. */ for (i = 0; i < max_users; i++) { - joypad_info[i].axis_threshold = settings->floats.input_axis_threshold; - joypad_info[i].joy_idx = settings->uints.input_joypad_index[i]; - joypad_info[i].auto_binds = input_autoconf_binds[joypad_info[i].joy_idx]; + joypad_info[i].axis_threshold = settings->floats.input_axis_threshold; + joypad_info[i].joy_idx = settings->uints.input_joypad_index[i]; + joypad_info[i].auto_binds = input_autoconf_binds[joypad_info[i].joy_idx]; - input_st->turbo_btns.frame_enable[i] = (*input_st->libretro_input_binds[i])[RARCH_TURBO_ENABLE].valid ? + input_st->turbo_btns.frame_enable[i] = (*input_st->libretro_input_binds[i])[RARCH_TURBO_ENABLE].valid ? input_state_wrap( input_st->current_driver, input_st->current_data, @@ -4296,16 +4328,16 @@ void input_driver_poll(void) case ANALOG_DPAD_LSTICK: case ANALOG_DPAD_RSTICK: { - unsigned mapped_port = settings->uints.input_remap_ports[0]; + unsigned mapped_port = settings->uints.input_remap_ports[0]; if (input_st->analog_requested[mapped_port]) input_analog_dpad_mode = ANALOG_DPAD_NONE; } break; case ANALOG_DPAD_LSTICK_FORCED: - input_analog_dpad_mode = ANALOG_DPAD_LSTICK; + input_analog_dpad_mode = ANALOG_DPAD_LSTICK; break; case ANALOG_DPAD_RSTICK_FORCED: - input_analog_dpad_mode = ANALOG_DPAD_RSTICK; + input_analog_dpad_mode = ANALOG_DPAD_RSTICK; break; default: break; @@ -4328,13 +4360,13 @@ void input_driver_poll(void) if (input_remap_binds_enable) { #ifdef HAVE_OVERLAY - input_overlay_t *overlay_pointer = (input_overlay_t*)input_st->overlay_ptr; - bool poll_overlay = (overlay_pointer && + input_overlay_t *overlay_pointer = (input_overlay_t*)input_st->overlay_ptr; + bool poll_overlay = (overlay_pointer && (overlay_pointer->flags & INPUT_OVERLAY_ALIVE)); #endif - input_mapper_t *handle = &input_st->mapper; - float input_analog_deadzone = settings->floats.input_analog_deadzone; - float input_analog_sensitivity = settings->floats.input_analog_sensitivity; + input_mapper_t *handle = &input_st->mapper; + float input_analog_deadzone = settings->floats.input_analog_deadzone; + float input_analog_sensitivity = settings->floats.input_analog_sensitivity; for (i = 0; i < max_users; i++) { @@ -4353,10 +4385,10 @@ void input_driver_poll(void) input_analog_dpad_mode = ANALOG_DPAD_NONE; break; case ANALOG_DPAD_LSTICK_FORCED: - input_analog_dpad_mode = ANALOG_DPAD_LSTICK; + input_analog_dpad_mode = ANALOG_DPAD_LSTICK; break; case ANALOG_DPAD_RSTICK_FORCED: - input_analog_dpad_mode = ANALOG_DPAD_RSTICK; + input_analog_dpad_mode = ANALOG_DPAD_RSTICK; break; default: break; @@ -5555,7 +5587,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st, { int port; rarch_joypad_info_t joypad_info; - int block_delay = settings->uints.input_hotkey_block_delay; + unsigned block_delay = settings->uints.input_hotkey_block_delay; const input_device_driver_t *joypad = input_st->primary_joypad; #ifdef HAVE_MFI const input_device_driver_t diff --git a/input/input_driver.h b/input/input_driver.h index ffa71e0e53..705ed36868 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -864,62 +864,6 @@ bool input_driver_find_driver( const char *prefix, bool verbosity_enabled); -int16_t input_state_wrap( - input_driver_t *current_input, - void *data, - const input_device_driver_t *joypad, - const input_device_driver_t *sec_joypad, - rarch_joypad_info_t *joypad_info, - const retro_keybind_set *binds, - bool keyboard_mapping_blocked, - unsigned _port, - unsigned device, - unsigned idx, - unsigned id); - -int16_t input_joypad_axis( - float input_analog_deadzone, - float input_analog_sensitivity, - const input_device_driver_t *drv, - unsigned port, uint32_t joyaxis, float normal_mag); - -/** - * input_joypad_analog: - * @drv : Input device driver handle. - * @port : User number. - * @idx : Analog key index. - * E.g.: - * - RETRO_DEVICE_INDEX_ANALOG_LEFT - * - RETRO_DEVICE_INDEX_ANALOG_RIGHT - * @ident : Analog key identifier. - * E.g.: - * - RETRO_DEVICE_ID_ANALOG_X - * - RETRO_DEVICE_ID_ANALOG_Y - * @binds : Binds of user. - * - * Gets analog value of analog key identifiers @idx and @ident - * from user with number @port with provided keybinds (@binds). - * - * Returns: analog value on success, otherwise 0. - **/ -int16_t input_joypad_analog_button( - float input_analog_deadzone, - float input_analog_sensitivity, - const input_device_driver_t *drv, - rarch_joypad_info_t *joypad_info, - unsigned ident, - const struct retro_keybind *bind); - -int16_t input_joypad_analog_axis( - unsigned input_analog_dpad_mode, - float input_analog_deadzone, - float input_analog_sensitivity, - const input_device_driver_t *drv, - rarch_joypad_info_t *joypad_info, - unsigned idx, - unsigned ident, - const struct retro_keybind *binds); - void input_keyboard_line_append( struct input_keyboard_line *keyboard_line, const char *word, size_t len); @@ -970,19 +914,6 @@ bool input_key_pressed(int key, bool keyboard_pressed); bool input_set_rumble_state(unsigned port, enum retro_rumble_effect effect, uint16_t strength); -/** - * input_keyboard_line_event: - * @state : Input keyboard line handle. - * @character : Inputted character. - * - * Called on every keyboard character event. - * - * Returns: true (1) on success, otherwise false (0). - **/ -bool input_keyboard_line_event( - input_driver_state_t *input_st, - input_keyboard_line_t *state, uint32_t character); - bool input_set_rumble_gain(unsigned gain); float input_get_sensor_state(unsigned port, unsigned id); @@ -1033,21 +964,6 @@ void input_overlay_set_visibility(int overlay_idx, void input_overlay_init(void); #endif -bool input_keys_pressed_other_sources( - input_driver_state_t *input_st, - unsigned i, - input_bits_t* p_new_state); - -int16_t input_state_device( - input_driver_state_t *input_st, - settings_t *settings, - input_mapper_t *handle, - unsigned input_analog_dpad_mode, - int16_t ret, - unsigned port, unsigned device, - unsigned idx, unsigned id, - bool button_mask); - #ifdef HAVE_BSV_MOVIE void bsv_movie_frame_rewind(void); @@ -1081,25 +997,6 @@ void input_driver_poll(void); int16_t input_driver_state_wrapper(unsigned port, unsigned device, unsigned idx, unsigned id); -/** - * input_keys_pressed: - * - * Grab an input sample for this frame. - * - * Returns: Input sample containing a mask of all pressed keys. - */ -void input_keys_pressed( - unsigned port, - bool is_menu, - int input_hotkey_block_delay, - input_bits_t *p_new_state, - const retro_keybind_set *binds, - const struct retro_keybind *binds_norm, - const struct retro_keybind *binds_auto, - const input_device_driver_t *joypad, - const input_device_driver_t *sec_joypad, - rarch_joypad_info_t *joypad_info); - void input_driver_collect_system_input(input_driver_state_t *input_st, settings_t *settings, input_bits_t *current_bits);