From 0996291d91e6d0176acd5f2d6a96fac16c2e5abf Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 1 Aug 2017 12:25:08 -0400 Subject: [PATCH] libui: Changes for LIBUI --- command.c | 36 ++++++++++++++++++------------------ retroarch.c | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/command.c b/command.c index ca21d18931..a6eeed80ea 100644 --- a/command.c +++ b/command.c @@ -1857,7 +1857,7 @@ bool command_event(enum event_command cmd, void *data) return false; #endif #ifdef HAVE_NETWORKING - /* Only enable state manager if netplay is not underway + /* Only enable state manager if netplay is not underway TODO: Add a setting for these tweaks */ if (settings->bools.rewind_enable && !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL)) @@ -1886,7 +1886,7 @@ bool command_event(enum event_command cmd, void *data) #ifdef HAVE_THREADS { #ifdef HAVE_NETWORKING - /* Only enable state manager if netplay is not underway + /* Only enable state manager if netplay is not underway TODO: Add a setting for these tweaks */ settings_t *settings = config_get_ptr(); if (settings->uints.autosave_interval != 0 @@ -2124,7 +2124,7 @@ bool command_event(enum event_command cmd, void *data) * need to make sure to keep a copy */ struct retro_hw_render_callback hwr_copy; struct retro_hw_render_callback *hwr = video_driver_get_hw_context(); - const struct retro_hw_render_context_negotiation_interface *iface = + const struct retro_hw_render_context_negotiation_interface *iface = video_driver_get_context_negotiation_interface(); memcpy(&hwr_copy, hwr, sizeof(hwr_copy)); @@ -2197,7 +2197,7 @@ bool command_event(enum event_command cmd, void *data) RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED)); command_event(CMD_EVENT_AUDIO_STOP, NULL); - runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1, + runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1, 1, true); if (!is_idle) @@ -2280,15 +2280,15 @@ bool command_event(enum event_command cmd, void *data) command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); - if (!init_netplay(NULL, hostname ? hostname : + if (!init_netplay(NULL, hostname ? hostname : settings->paths.netplay_server, settings->uints.netplay_port)) { command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); return false; } - - /* Disable rewind & sram autosave if it was enabled + + /* Disable rewind & sram autosave if it was enabled TODO: Add a setting for these tweaks */ state_manager_event_deinit(); #ifdef HAVE_THREADS @@ -2306,12 +2306,12 @@ bool command_event(enum event_command cmd, void *data) command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); - RARCH_LOG("[netplay] connecting to %s:%d\n", - hostname->elems[0].data, !string_is_empty(hostname->elems[1].data) + RARCH_LOG("[netplay] connecting to %s:%d\n", + hostname->elems[0].data, !string_is_empty(hostname->elems[1].data) ? atoi(hostname->elems[1].data) : 55435); - if (!init_netplay(NULL, hostname->elems[0].data, - !string_is_empty(hostname->elems[1].data) + if (!init_netplay(NULL, hostname->elems[0].data, + !string_is_empty(hostname->elems[1].data) ? atoi(hostname->elems[1].data) : 55435)) { command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); @@ -2321,7 +2321,7 @@ bool command_event(enum event_command cmd, void *data) string_list_free(hostname); - /* Disable rewind if it was enabled + /* Disable rewind if it was enabled TODO: Add a setting for these tweaks */ state_manager_event_deinit(); #ifdef HAVE_THREADS @@ -2339,12 +2339,12 @@ bool command_event(enum event_command cmd, void *data) command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); - RARCH_LOG("[netplay] connecting to %s:%d\n", - hostname->elems[0].data, !string_is_empty(hostname->elems[1].data) + RARCH_LOG("[netplay] connecting to %s:%d\n", + hostname->elems[0].data, !string_is_empty(hostname->elems[1].data) ? atoi(hostname->elems[1].data) : 55435); if (!init_netplay_deferred(hostname->elems[0].data, - !string_is_empty(hostname->elems[1].data) + !string_is_empty(hostname->elems[1].data) ? atoi(hostname->elems[1].data) : 55435)) { command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); @@ -2354,7 +2354,7 @@ bool command_event(enum event_command cmd, void *data) string_list_free(hostname); - /* Disable rewind if it was enabled + /* Disable rewind if it was enabled TODO: Add a setting for these tweaks */ state_manager_event_deinit(); #ifdef HAVE_THREADS @@ -2531,7 +2531,7 @@ bool command_event(enum event_command cmd, void *data) { static bool game_focus_state = false; intptr_t mode = (intptr_t)data; - + /* mode = -1: restores current game focus state * mode = 1: force set game focus, instead of toggling * any other: toggle @@ -2593,7 +2593,7 @@ bool command_event(enum event_command cmd, void *data) command_event_restore_default_shader_preset(); break; case CMD_EVENT_LIBUI_TEST: -#if 0 +#if 1 libui_main(); #endif break; diff --git a/retroarch.c b/retroarch.c index 7def51cb4b..0ed0d74c0d 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2402,7 +2402,7 @@ static enum runloop_state runloop_check_state( current_input, RARCH_GRAB_MOUSE_TOGGLE); if (pressed && !old_pressed) -#if 1 +#if 0 command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL); #else command_event(CMD_EVENT_LIBUI_TEST, NULL);