mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) You can now input nickname, IP address and TCP/UDP port

Browse Source 
with the keyboard
This commit is contained in:
twinaphex 2014-03-02 05:46:33 +01:00
parent 82b78c42f8
commit a58820d927
2 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/menu_common.c
View File

@ -1919,7 +1919,7 @@ void menu_populate_entries(void *data, unsigned menu_type)
file_list_push(rgui->selection_buf, "Overlay Options", RGUI_SETTINGS_OVERLAY_OPTIONS, 0);
#endif
#ifdef HAVE_NETPLAY
file_list_push(rgui->selection_buf, "Netplay Options (WIP)", RGUI_SETTINGS_NETPLAY_OPTIONS, 0);
file_list_push(rgui->selection_buf, "Netplay Options", RGUI_SETTINGS_NETPLAY_OPTIONS, 0);
#endif
file_list_push(rgui->selection_buf, "Path Options", RGUI_SETTINGS_PATH_OPTIONS, 0);
if (g_extern.main_is_init && !g_extern.libretro_dummy)

82
frontend/menu/menu_settings.c
View File

@ -20,9 +20,11 @@
#include "../../file.h"
#include "menu_common.h"
#include "menu_navigation.h"
#include "menu_input_line_cb.h"
#include "../../gfx/gfx_common.h"
#include "../../input/input_common.h"
#include "../../config.def.h"
#include "../../input/keyboard_line.h"
#ifdef HAVE_CONFIG_H
#include "../../config.h"
@ -403,6 +405,48 @@ static bool osk_callback_enter_filename_init(void *data)
#endif
#ifdef HAVE_NETPLAY
static void netplay_port_callback(void *userdata, const char *str)
{
rgui_handle_t *rgui = (rgui_handle_t*)userdata;
if (str && *str)
g_extern.netplay_port = atoi(str);
rgui->keyboard.display = false;
rgui->keyboard.label = NULL;
rgui->old_input_state = -1ULL; // Avoid triggering states on pressing return.
g_extern.system.key_event = menu_key_event;
}
static void netplay_ipaddress_callback(void *userdata, const char *str)
{
rgui_handle_t *rgui = (rgui_handle_t*)userdata;
if (str && *str)
strlcpy(g_extern.netplay_server, str, sizeof(g_extern.netplay_server));
rgui->keyboard.display = false;
rgui->keyboard.label = NULL;
rgui->old_input_state = -1ULL; // Avoid triggering states on pressing return.
g_extern.system.key_event = menu_key_event;
}
static void netplay_nickname_callback(void *userdata, const char *str)
{
rgui_handle_t *rgui = (rgui_handle_t*)userdata;
if (str && *str)
strlcpy(g_extern.netplay_nick, str, sizeof(g_extern.netplay_nick));
rgui->keyboard.display = false;
rgui->keyboard.label = NULL;
rgui->old_input_state = -1ULL; // Avoid triggering states on pressing return.
g_extern.system.key_event = menu_key_event;
}
#endif
#ifndef RARCH_DEFAULT_PORT
#define RARCH_DEFAULT_PORT 55435
#endif
int menu_set_settings(void *data, unsigned setting, unsigned action)
{
rgui_handle_t *rgui = (rgui_handle_t*)data;
@ -1739,7 +1783,16 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
}
break;
case RGUI_SETTINGS_NETPLAY_HOST_IP_ADDRESS:
//strlcpy(type_str, g_extern.netplay_server, type_str_size);
if (action == RGUI_ACTION_OK)
{
g_extern.system.key_event = NULL;
rgui->keyboard.display = true;
rgui->keyboard.label = "IP Address: ";
rgui->keyboard.buffer = input_keyboard_start_line(rgui, netplay_ipaddress_callback);
}
else if (action == RGUI_ACTION_START)
{
}
break;
case RGUI_SETTINGS_NETPLAY_DELAY_FRAMES:
if (action == RGUI_ACTION_LEFT)
@ -1753,10 +1806,29 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
g_extern.netplay_sync_frames = 0;
break;
case RGUI_SETTINGS_NETPLAY_TCP_UDP_PORT:
//snprintf(type_str, type_str_size, "%d", g_extern.netplay_port ? g_extern.netplay_port : RARCH_DEFAULT_PORT);
if (action == RGUI_ACTION_OK)
{
g_extern.system.key_event = NULL;
rgui->keyboard.display = true;
rgui->keyboard.label = "TCP/UDP Port: ";
rgui->keyboard.buffer = input_keyboard_start_line(rgui, netplay_port_callback);
}
else if (action == RGUI_ACTION_START)
{
g_extern.netplay_port = RARCH_DEFAULT_PORT;
}
break;
case RGUI_SETTINGS_NETPLAY_NICKNAME:
//snprintf(type_str, type_str_size, "%s", g_extern.netplay_nick);
if (action == RGUI_ACTION_OK)
{
g_extern.system.key_event = NULL;
rgui->keyboard.display = true;
rgui->keyboard.label = "Nickname: ";
rgui->keyboard.buffer = input_keyboard_start_line(rgui, netplay_nickname_callback);
}
else if (action == RGUI_ACTION_START)
{
}
break;
case RGUI_SETTINGS_NETPLAY_MODE:
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_LEFT || action == RGUI_ACTION_RIGHT)
@ -1778,10 +1850,6 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
return 0;
}
#ifndef RARCH_DEFAULT_PORT
#define RARCH_DEFAULT_PORT 55435
#endif
void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w, unsigned type)
{
switch (type)