Mercurial > repos > blastem

changeset 1521:a51721408c15 nuklear_ui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fleshed out keyboard bindings view
author Michael Pavone <pavone@retrodev.com>
date Mon, 05 Feb 2018 23:39:14 -0800
parents cb3c6395b28c
children 63659fb92db4
files nuklear_ui/blastem_nuklear.c
diffstat 1 files changed, 48 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/nuklear_ui/blastem_nuklear.c	Fri Feb 02 09:24:01 2018 -0800
+++ b/nuklear_ui/blastem_nuklear.c	Mon Feb 05 23:39:14 2018 -0800
@@ -235,24 +235,29 @@
 	*binding_lookup = tern_insert_ptr(*binding_lookup, val.ptrval, strdup(key));
 }
 
-void binding_group(struct nk_context *context, char *name, const char **binds, uint32_t num_binds, tern_node *binding_lookup)
+static const char *set_binding;
+char *set_label;
+void binding_group(struct nk_context *context, char *name, const char **binds, const char **bind_names, uint32_t num_binds, tern_node *binding_lookup)
 {
-	nk_layout_row_static(context, 34*num_binds+30, render_width() - 80, 1);
+	nk_layout_row_static(context, 34*num_binds+60, render_width() - 80, 1);
 	if (nk_group_begin(context, name, NK_WINDOW_TITLE)) {
 		nk_layout_row_static(context, 30, render_width()/2 - 80, 2);
 		
 		for (int i = 0; i < num_binds; i++)
 		{
-			char *label_alloc = path_extension(binds[i]);
+			char *label_alloc = bind_names ? NULL : path_extension(binds[i]);
 			const char *label = label_alloc;
 			if (!label) {
-				label = binds[i];
+				label = bind_names ? bind_names[i] : binds[i];
 			}
 			nk_label(context, label, NK_TEXT_LEFT);
+			if (nk_button_label(context, tern_find_ptr_default(binding_lookup, binds[i], "Not Set"))) {
+				set_binding = binds[i];
+				set_label = strdup(label);
+			}
 			if (label_alloc) {
 				free(label_alloc);
 			}
-			nk_button_label(context, tern_find_ptr_default(binding_lookup, binds[i], "Not Set"));
 		}
 		nk_group_end(context);
 	}
@@ -261,25 +266,46 @@
 void view_key_bindings(struct nk_context *context)
 {
 	const char *controller1_binds[] = {
-		"gamepads.1.up", "gamepads.1.down", "gamepads.1.left", "gamepads.1.right"
+		"gamepads.1.up", "gamepads.1.down", "gamepads.1.left", "gamepads.1.right",
 		"gamepads.1.a", "gamepads.1.b", "gamepads.1.c",
 		"gamepads.1.x", "gamepads.1.y", "gamepads.1.z",
 		"gamepads.1.start", "gamepads.1.mode"
 	};
 	const char *controller2_binds[] = {
-		"gamepads.2.up", "gamepads.2.down", "gamepads.2.left", "gamepads.2.right"
+		"gamepads.2.up", "gamepads.2.down", "gamepads.2.left", "gamepads.2.right",
 		"gamepads.2.a", "gamepads.2.b", "gamepads.2.c",
 		"gamepads.2.x", "gamepads.2.y", "gamepads.2.z",
 		"gamepads.2.start", "gamepads.2.mode"
 	};
+	const char *general_binds[] = {
+		"ui.exit", "ui.save_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
+		"ui.screenshot", "ui.sms_pause", "ui.toggle_keyboard_cpatured", "ui.release_mouse"
+	};
+	const char *general_names[] = {
+		"Show Menu", "Quick Save", "Toggle Fullscreen", "Soft Reset", "Reload Media"
+		"Internal Screenshot", "SMS Pause", "Capture Keyboard", "Release Mouse"
+	};
 	const char *speed_binds[] = {
 		"ui.next_speed", "ui.prev_speed",
 		"ui.set_speed.0", "ui.set_speed.1", "ui.set_speed.2" ,"ui.set_speed.3", "ui.set_speed.4",
 		"ui.set_speed.5", "ui.set_speed.6", "ui.set_speed.7" ,"ui.set_speed.8", "ui.set_speed.9",
 	};
+	const char *speed_names[] = {
+		"Next", "Previous",
+		"Default Speed", "Set Speed 1", "Set Speed 2", "Set Speed 3", "Set Speed 4",
+		"Set Speed 5", "Set Speed 6", "Set Speed 7", "Set Speed 8", "Set Speed 9"
+	};
+	const char *debug_binds[] = {
+		"ui.enter_debugger", "ui.vdp_debug_mode", "ui.vdp_debug_pal"
+	};
+	const char *debug_names[] = {
+		"Enter Debugger", "VDP Debug Mode", "Debug Palette"
+	};
 	const uint32_t NUM_C1_BINDS = sizeof(controller1_binds)/sizeof(*controller1_binds);
 	const uint32_t NUM_C2_BINDS = sizeof(controller2_binds)/sizeof(*controller2_binds);
 	const uint32_t NUM_SPEED_BINDS = sizeof(speed_binds)/sizeof(*speed_binds);
+	const uint32_t NUM_GEN_BINDS = sizeof(general_binds)/sizeof(*general_binds);
+	const uint32_t NUM_DBG_BINDS = sizeof(debug_binds)/sizeof(*debug_binds);
 	static tern_node *binding_lookup;
 	if (!binding_lookup) {
 		tern_node *bindings = tern_find_path(config, "bindings\0keys\0", TVAL_NODE).ptrval;
@@ -290,12 +316,24 @@
 	uint32_t width = render_width();
 	uint32_t height = render_height();
 	if (nk_begin(context, "Keyboard Bindings", nk_rect(0, 0, width, height), 0)) {
-		binding_group(context, "Controller 1", controller1_binds, NUM_C1_BINDS, binding_lookup);
-		binding_group(context, "Controller 2", controller2_binds, NUM_C2_BINDS, binding_lookup);
-		binding_group(context, "Speed Control", speed_binds, NUM_SPEED_BINDS, binding_lookup);
+		binding_group(context, "Controller 1", controller1_binds, NULL, NUM_C1_BINDS, binding_lookup);
+		binding_group(context, "Controller 2", controller2_binds, NULL, NUM_C2_BINDS, binding_lookup);
+		binding_group(context, "General", general_binds, general_names, NUM_GEN_BINDS, binding_lookup);
+		binding_group(context, "Speed Control", speed_binds, speed_names, NUM_SPEED_BINDS, binding_lookup);
+		binding_group(context, "Debug", debug_binds, debug_names, NUM_DBG_BINDS, binding_lookup);
 		
 		nk_end(context);
 	}
+	if (set_binding && nk_begin(context, "Set Binding", nk_rect(width/4, height/4, width/2/*width*3/4*/, height/2), NK_WINDOW_TITLE | NK_WINDOW_BORDER)) {
+		nk_layout_row_static(context, 30, width/2-30, 1);
+		nk_label(context, "Press new key for", NK_TEXT_CENTERED);
+		nk_label(context, set_label, NK_TEXT_CENTERED);
+		if (nk_button_label(context, "Cancel")) {
+			free(set_label);
+			set_binding = set_label = NULL;
+		}
+		nk_end(context);
+	}
 }
 void view_controllers(struct nk_context *context)
 {