chore: add change network i18n

Author: qkdreyer

package/garlicui/src/gui.c

@@ -44,6 +44,30 @@ static SDL_Surface * gui_render_menu_legend_surface(struct gui_context * context
 	return icon_circled_text(context->fonts.small, context->colors.legend.foreground, context->colors.legend.background, gettext("Menu"), 0, (localization_font_height() + SCREEN_MARGIN) * context->surfaces.scale_factor, (SCREEN_MARGIN >> 1) * context->surfaces.scale_factor, icon_load("hamburger.svg", DEFAULT_BAR_ICON_HEIGHT * context->surfaces.scale_factor, DEFAULT_BAR_ICON_HEIGHT * context->surfaces.scale_factor, &context->colors.legend.foreground), 1);
 }
 
+/**
+ * @brief Renders the osk key surface.
+ */
+static SDL_Surface * gui_render_osk_key(struct gui_context * context, const char * key, int index)
+{
+	SDL_Surface * text_surface = TTF_RenderUTF8_Blended(context->fonts.small, gettext(key), SDL_ToSDLColor(context->colors.osk.foreground));
+	SDL_Surface * surface = context->surfaces.overlays.osk.surface;
+
+	// Render the description text onto the surface
+	SDL_Rect text_position;
+	int x = surface->w / OSK_COLS;
+	int y = surface->h / OSK_ROWS;
+
+	text_position.x = x * (index % OSK_COLS) + ((x - text_surface->w) >> 1);
+	text_position.y = y * (index / OSK_COLS | 0) + ((y - text_surface->h) >> 1);
+	text_position.w = text_surface->w;
+	text_position.h = text_surface->h;
+
+	SDL_BlitSurfaceAlpha(text_surface, NULL, surface, &text_position);
+
+	// Free the description text surface
+	SDL_FreeSurface(text_surface);
+}
+
 /**
  * @brief Triggers the invalidate callback.
  */
@@ -412,7 +436,7 @@ struct gui_context * gui_create_context(int argc, char * argv[])
 		}
 
 		// Create a 32bpp double-buffered screen surface
-		context->surfaces.screen = SDL_SetVideoMode(info->current_w, info->current_h, 32, SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_FULLSCREEN);
+		context->surfaces.screen = SDL_SetVideoMode(SCALING_REFERENCE_WIDTH, SCALING_REFERENCE_HEIGHT, 32, SDL_HWSURFACE | SDL_DOUBLEBUF);
 
 		// If 32bpp isn't available...
 		if (context->surfaces.screen == NULL)
@@ -463,6 +487,14 @@ struct gui_context * gui_create_context(int argc, char * argv[])
 		GET_RGB_COMPONENTS(context->colors.notch.foreground, r, g, b);
 		context->colors.notch.foreground = SDL_MapRGB(context->surfaces.screen->format, r, g, b);
 
+		// Set the osk background color
+		GET_RGB_COMPONENTS(context->colors.osk.background, r, g, b);
+		context->colors.osk.background = SDL_MapRGB(context->surfaces.screen->format, r, g, b);
+
+		// Set the osk foreground color
+		GET_RGB_COMPONENTS(context->colors.osk.foreground, r, g, b);
+		context->colors.osk.foreground = SDL_MapRGB(context->surfaces.screen->format, r, g, b);
+
 		// Calculate the scale factor
 		context->surfaces.scale_factor = SCALE_FACTOR_HEIGHT(context->surfaces.screen->h, SCALING_REFERENCE_HEIGHT);
 
@@ -556,6 +588,16 @@ struct gui_context * gui_create_context(int argc, char * argv[])
 			goto free_menu_action_surface;
 		}
 
+		// Render the osk overlay
+		context->surfaces.overlays.osk.surface = icon_rounded_rectangle(context->surfaces.screen->w, context->surfaces.screen->h >> 1, 1, &context->colors.notch.background);
+
+		// We failed to render the osk overlay
+		if (context->surfaces.overlays.osk.surface == NULL)
+		{
+			// No use continuing if we're missing overlays
+			goto free_notch_overlay_surface;
+		}
+
 		// Calculate the garlic icon position
 		context->surfaces.bars.top.logo.position.x = SCREEN_MARGIN * context->surfaces.scale_factor;
 		context->surfaces.bars.top.logo.position.y = SCREEN_MARGIN * context->surfaces.scale_factor;
@@ -586,12 +628,23 @@ struct gui_context * gui_create_context(int argc, char * argv[])
 		context->surfaces.overlays.notch.position.w = context->surfaces.overlays.notch.surface->w;
 		context->surfaces.overlays.notch.position.h = context->surfaces.overlays.notch.surface->h;
 
+		// Calculate the osk overlay position
+		context->surfaces.overlays.osk.position.x = 0;
+		context->surfaces.overlays.osk.position.y = context->surfaces.screen->h - context->surfaces.overlays.osk.surface->h;
+		context->surfaces.overlays.osk.position.w = context->surfaces.overlays.osk.surface->w;
+		context->surfaces.overlays.osk.position.h = context->surfaces.overlays.osk.surface->h;
+
+		for (int i = 0, n = OSK_COLS * OSK_ROWS; i < n; i++)
+		{
+			gui_render_osk_key(context, lowercase_grid[i], i);
+		}
+
 #ifndef __MACOSX__
 		// We couldn't enumerate the joysticks
 		if (SDL_NumJoysticks() <= 0)
 		{
 			// No use going further if we have no way of controlling the UI
-			goto free_notch_overlay_surface;
+			goto free_osk_overlay_surface;
 		}
 
 		// Open the internal joystick
@@ -692,6 +745,10 @@ struct gui_context * gui_create_context(int argc, char * argv[])
 	SDL_JoystickClose(context->inputs.internal.joystick);
 #endif
 
+free_osk_overlay_surface:
+	// Free the osk overlay
+	SDL_FreeSurface(context->surfaces.overlays.osk.surface);
+
 free_notch_overlay_surface:
 	// Free the notch overlay
 	SDL_FreeSurface(context->surfaces.overlays.notch.surface);
@@ -1512,8 +1569,15 @@ void gui_update(struct gui_context * context)
 					active_context_menu = active_context_menu->parent;
 				}
 
+				// We're currently inside an OSK
+				if (context->osk_active)
+				{
+					// Deactivate the OSK
+					context->osk_active = 0;
+				}
+
 				// We're currently inside a context menu
-				if (active_context_menu != NULL)
+				else if (active_context_menu != NULL)
 				{
 					// Get the context menu
 					struct gui_node * context_menu = context->menu.active;
@@ -1820,6 +1884,13 @@ void gui_render(struct gui_context * context)
 		SDL_BlitSurface(context->surfaces.bars.bottom.actions.menu.surface, NULL, context->surfaces.screen, &context->surfaces.bars.bottom.actions.menu.position);
 	}
 
+	// We need to render the osk
+	if (context->osk_active)
+	{
+		// Render the osk
+		SDL_BlitSurface(context->surfaces.overlays.osk.surface, NULL, context->surfaces.screen, &context->surfaces.overlays.osk.position);
+	}
+
 	// Flip the front and back buffer
 	SDL_Flip(context->surfaces.screen);
 }
@@ -1844,6 +1915,8 @@ void gui_read_configuration(struct gui_context * context)
 	context->colors.icon.foreground = 0x000000;
 	context->colors.notch.background = 0x000000;
 	context->colors.notch.foreground = 0xffffff;
+	context->colors.osk.background = 0x000000;
+	context->colors.osk.foreground = 0xffffff;
 
 	// We managed to load the XML document
 	if (document != NULL)
@@ -1957,6 +2030,12 @@ void gui_read_configuration(struct gui_context * context)
 		// Get the notch foreground color
 		context->colors.notch.foreground = io_get_skin_color(document, "Notch", "Foreground", 0xffffff);
 
+		// Get the osk background color
+		context->colors.osk.background = io_get_skin_color(document, "Keyboard", "Background", 0x000000);
+
+		// Get the osk foreground color
+		context->colors.osk.foreground = io_get_skin_color(document, "Keyboard", "Foreground", 0xffffff);
+
 		// Free the XML document
 		xmlFreeDoc(document);
 	}

package/garlicui/src/gui.h

@@ -19,6 +19,7 @@ struct gui_context;
 #include "retroarch.h"
 #include "localization.h"
 #include "network.h"
+#include "osk.h"
 
 /**
  * @brief The reference width used for scaling.
@@ -230,7 +231,32 @@ struct gui_context;
 /**
  * @brief Represents a network setter.
  */
-#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETTER 23
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETTER 23 // TODO
+
+/**
+ * @brief The network setup menu node type.
+ */
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETUP_MENU 24
+
+/**
+ * @brief The network setup ssid setter.
+ */
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETUP_SSID_SETTER 25
+
+/**
+ * @brief The network setup security menu node type.
+ */
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETUP_SECURITY_MENU 26
+
+/**
+ * @brief The network setup security setter.
+ */
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETUP_SECURITY_SETTER 27
+
+/**
+ * @brief The network setup password setter.
+ */
+#define NODE_TYPE_CONTEXT_MENU_NETWORK_SETUP_PASSWORD_SETTER 28
 
 /**
  * The supported buttons.
@@ -327,6 +353,7 @@ struct gui_context_bar_surfaces
 struct gui_context_overlay_surfaces
 {
 	struct gui_context_surface notch; /** The scroll letter notch */
+	struct gui_context_surface osk; /** The on-screen keyboard */
 };
 
 /**
@@ -369,6 +396,7 @@ struct gui_context_colors
 	struct gui_context_bgfg_color legend; /** The legend colors */
 	struct gui_context_bgfg_color icon; /** The icon colors */
 	struct gui_context_bgfg_color notch; /** The notch colors */
+	struct gui_context_bgfg_color osk; /** The on-screen keyboard colors */
 };
 
 /**
@@ -463,6 +491,8 @@ struct gui_context_settings
 	char locale[16]; /** The user's current locale setting (intentionally 1 frame late so surfaces can be re-rendered) */
 	char ui_state[128 + PATH_MAX * 2]; /** The UI state of the previous GarlicUI instance (populated on load, restored post-main-menu activation) */
 	int resume; /** The auto-resume flag */
+	int network_ap_count; /** The number of user's network access points */
+	struct network_access_point ** network_aps; /** The user's network access points */
 };
 
 /**
@@ -489,6 +519,7 @@ struct gui_context
 	struct gui_context_status status; /** The context status */
 	struct gui_context_settings settings; /** The context settings */
 	struct gui_context_node_tree menu; /** The menu tree nodes */
+	bool osk_active; /** The on-screen keyboard active flag */
 };
 
 /**
@@ -550,8 +581,26 @@ struct gui_locale_menu_node_data
 struct gui_network_menu_node_data
 {
 	struct gui_menu_node_data base; /** The base menu data */
-	struct network_access_point * access_point; /** The network access point */
-	char psk[64]; /** The network password */
+	int network_ap_count; /** The number of network access points */
+	struct network_access_point ** network_aps; /** The network access points */
+};
+
+/**
+ * @brief A data structure holding network setup data.
+ */
+struct gui_network_setup_menu_node_data
+{
+	struct gui_menu_node_data base; /** The base menu data */
+	struct network_access_point * network_ap; /** The network access point */
+};
+
+/**
+ * @brief A data structure holding network setup security data.
+ */
+struct gui_network_setup_security_menu_node_data
+{
+	struct gui_menu_node_data base; /** The base menu data */
+	char * security; /** The current security setting */
 };
 
 /**

package/garlicui/src/gui_menu.c

@@ -462,4 +462,4 @@ void gui_render_vertical_scrolling_list_menu(struct gui_node * this)
 			}
 		}
 	}
-}
+}