repos/blastem: nuklear_ui/blastem

annotate nuklear_ui/blastem_nuklear.c @ 1662:35c308355bfb

Updated README

author	Mike Pavone <pavone@retrodev.com>
date	Sun, 30 Dec 2018 23:05:39 -0800
parents	c3c3b65f17aa
children	cc5107def372

rev	line source
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1 #define NK_IMPLEMENTATION
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2 #define NK_SDL_GLES2_IMPLEMENTATION
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	3
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	4 #include <stdlib.h>
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	5 #include <limits.h>
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	6 #include "blastem_nuklear.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	7 #include "font.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	8 #include "../render.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	9 #include "../render_sdl.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	10 #include "../util.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	11 #include "../paths.h"
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	12 #include "../saves.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	13 #include "../blastem.h"
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	14 #include "../config.h"
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	15 #include "../io.h"
1569 0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI Michael Pavone <pavone@retrodev.com> parents: 1568 diff changeset	16 #include "../png.h"
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	17 #include "../controller_info.h"
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	18 #include "../bindings.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	19
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	20 static struct nk_context *context;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	21
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	22 typedef struct
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	23 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	24 uint32_t *image_data;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	25 uint32_t width, height;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	26 struct nk_image ui;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	27 } ui_image;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	28
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	29 static ui_image *ui_images, controller_360, controller_ps4, controller_ps4_6b;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	30 static uint32_t num_ui_images, ui_image_storage;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	31
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	32 typedef void (view_fun)(struct nk_context );
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	33 static view_fun current_view;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	34 static view_fun *previous_views;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	35 static uint32_t view_storage;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	36 static uint32_t num_prev;
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	37 static struct nk_font *def_font;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	38 static uint8_t config_dirty;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	39
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	40 static void push_view(view_fun new_view)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	41 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	42 if (num_prev == view_storage) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	43 view_storage = view_storage ? 2*view_storage : 2;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	44 previous_views = realloc(previous_views, view_storage*sizeof(view_fun));
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	45 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	46 previous_views[num_prev++] = current_view;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	47 current_view = new_view;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	48 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	49
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	50 static void pop_view()
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	51 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	52 if (num_prev) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	53 current_view = previous_views[--num_prev];
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	54 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	55 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	56
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	57 static void clear_view_stack()
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	58 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	59 num_prev = 0;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	60 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	61
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	62 void view_play(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	63 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	64
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	65 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	66
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	67 void view_file_browser(struct nk_context *context, uint8_t normal_open)
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	68 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	69 static char *current_path;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	70 static dir_entry *entries;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	71 static size_t num_entries;
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	72 static int32_t selected_entry = -1;
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	73 static char **ext_list;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	74 static uint32_t num_exts;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	75 static uint8_t got_ext_list;
1481 77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	76 if (!current_path) {
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	77 get_initial_browse_path(&current_path);
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	78 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	79 if (!entries) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	80 entries = get_dir_list(current_path, &num_entries);
1484 d82af64c94d2 Sort directory listing in Nuklear UI file browser Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	81 if (entries) {
d82af64c94d2 Sort directory listing in Nuklear UI file browser Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	82 sort_dir_list(entries, num_entries);
d82af64c94d2 Sort directory listing in Nuklear UI file browser Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	83 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	84 }
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	85 if (!got_ext_list) {
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	86 ext_list = get_extension_list(config, &num_exts);
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	87 got_ext_list = 1;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	88 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	89 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	90 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	91 if (nk_begin(context, "Load ROM", nk_rect(0, 0, width, height), 0)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	92 nk_layout_row_static(context, height - context->style.font->height * 3, width - 60, 1);
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	93 int32_t old_selected = selected_entry;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	94 if (nk_group_begin(context, "Select ROM", NK_WINDOW_BORDER \| NK_WINDOW_TITLE)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	95 nk_layout_row_static(context, context->style.font->height - 2, width-100, 1);
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	96 for (int32_t i = 0; i < num_entries; i++)
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	97 {
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	98 if (entries[i].name[0] == '.' && entries[i].name[1] != '.') {
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	99 continue;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	100 }
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	101 if (num_exts && !entries[i].is_dir && !path_matches_extensions(entries[i].name, ext_list, num_exts)) {
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	102 continue;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	103 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	104 int selected = i == selected_entry;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	105 nk_selectable_label(context, entries[i].name, NK_TEXT_ALIGN_LEFT, &selected);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	106 if (selected) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	107 selected_entry = i;
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	108 } else if (i == selected_entry) {
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	109 selected_entry = -1;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	110 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	111 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	112 nk_group_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	113 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	114 nk_layout_row_static(context, context->style.font->height * 1.75, width > 600 ? 300 : width / 2, 2);
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	115 if (nk_button_label(context, "Back")) {
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	116 pop_view();
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	117 }
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	118 if (nk_button_label(context, "Open") \|\| (old_selected >= 0 && selected_entry < 0)) {
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	119 if (selected_entry < 0) {
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	120 selected_entry = old_selected;
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	121 }
1481 77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	122 char *full_path = path_append(current_path, entries[selected_entry].name);
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	123 if (entries[selected_entry].is_dir) {
1481 77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	124 free(current_path);
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	125 current_path = full_path;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	126 free_dir_list(entries, num_entries);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	127 entries = NULL;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	128 } else {
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	129 if(normal_open) {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	130 if (current_system) {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	131 current_system->next_rom = full_path;
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	132 current_system->request_exit(current_system);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	133 } else {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	134 init_system_with_media(full_path, SYSTEM_UNKNOWN);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	135 free(full_path);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	136 }
1483 001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	137 } else {
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	138 lockon_media(full_path);
1483 001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	139 free(full_path);
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	140 }
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	141 clear_view_stack();
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	142 current_view = view_play;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	143 }
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	144 selected_entry = -1;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	145 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	146 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	147 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	148 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	149
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	150 void view_load(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	151 {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	152 view_file_browser(context, 1);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	153 }
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	154
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	155 void view_lock_on(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	156 {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	157 view_file_browser(context, 0);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	158 }
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	159
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	160 void view_about(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	161 {
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	162 const char *lines[] = {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	163 "BlastEm v0.6.0",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	164 "Copyright 2012-2017 Michael Pavone",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	165 "",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	166 "BlastEm is a high performance open source",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	167 "(GPLv3) Genesis/Megadrive emulator",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	168 };
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	169 const uint32_t NUM_LINES = sizeof(lines)/sizeof(*lines);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	170 const char *thanks[] = {
1661 c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	171 "Nemesis: Documentation and test ROMs",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	172 "Charles MacDonald: Documentation",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	173 "Eke-Eke: Documentation",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	174 "Bart Trzynadlowski: Documentation",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	175 "KanedaFR: Hosting the best Sega forum",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	176 "Titan: Awesome demos and documentation",
1661 c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	177 "flamewing: BCD info and test ROM",
c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	178 "r57shell: Opcode size test ROM",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	179 "micky: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	180 "Sasha: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	181 "lol-frank: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	182 "Sik: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	183 "Tim Lawrence : Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	184 "ComradeOj: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	185 "Vladikcomper: Testing"
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	186 };
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	187 const uint32_t NUM_THANKS = sizeof(thanks)/sizeof(*thanks);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	188 uint32_t width = render_width();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	189 uint32_t height = render_height();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	190 if (nk_begin(context, "About", nk_rect(0, 0, width, height), 0)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	191 nk_layout_row_static(context, context->style.font->height, width-40, 1);
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	192 for (uint32_t i = 0; i < NUM_LINES; i++)
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	193 {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	194 nk_label(context, lines[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	195 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	196 nk_layout_row_static(context, height - (context->style.font->height * 2 + 20) - (context->style.font->height +4)*NUM_LINES, width-40, 1);
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	197 if (nk_group_begin(context, "Special Thanks", NK_WINDOW_TITLE)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	198 nk_layout_row_static(context, context->style.font->height, width - 80, 1);
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	199 for (uint32_t i = 0; i < NUM_THANKS; i++)
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	200 {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	201 nk_label(context, thanks[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	202 }
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	203 nk_group_end(context);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	204 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	205 nk_layout_row_static(context, context->style.font->height * 1.75, width/3, 1);
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	206 if (nk_button_label(context, "Back")) {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	207 pop_view();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	208 }
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	209 nk_end(context);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	210 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	211 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	212
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	213 typedef struct {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	214 const char *title;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	215 view_fun next_view;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	216 } menu_item;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	217
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	218 static save_slot_info *slots;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	219 static uint32_t num_slots, selected_slot;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	220
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	221 void view_choose_state(struct nk_context *context, uint8_t is_load)
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	222 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	223 uint32_t width = render_width();
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	224 uint32_t height = render_height();
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	225 if (nk_begin(context, "Slot Picker", nk_rect(0, 0, width, height), 0)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	226 nk_layout_row_static(context, height - context->style.font->height * 3, width - 60, 1);
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	227 if (nk_group_begin(context, "Select Save Slot", NK_WINDOW_BORDER \| NK_WINDOW_TITLE)) {
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	228 nk_layout_row_static(context, context->style.font->height - 2, width-100, 1);
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	229 if (!slots) {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	230 slots = get_slot_info(current_system, &num_slots);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	231 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	232 for (uint32_t i = 0; i < num_slots; i++)
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	233 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	234 int selected = i == selected_slot;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	235 nk_selectable_label(context, slots[i].desc, NK_TEXT_ALIGN_LEFT, &selected);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	236 if (selected && (slots[i].modification_time \|\| !is_load)) {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	237 selected_slot = i;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	238 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	239 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	240 nk_group_end(context);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	241 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	242 nk_layout_row_static(context, context->style.font->height * 1.75, width > 600 ? 300 : width / 2, 2);
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	243 if (nk_button_label(context, "Back")) {
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	244 pop_view();
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	245 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	246 if (is_load) {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	247 if (nk_button_label(context, "Load")) {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	248 current_system->load_state(current_system, selected_slot);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	249 current_view = view_play;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	250 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	251 } else {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	252 if (nk_button_label(context, "Save")) {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	253 current_system->save_state = selected_slot + 1;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	254 current_view = view_play;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	255 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	256 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	257 nk_end(context);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	258 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	259 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	260
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	261 void view_save_state(struct nk_context *context)
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	262 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	263 view_choose_state(context, 0);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	264 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	265
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	266 void view_load_state(struct nk_context *context)
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	267 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	268 view_choose_state(context, 1);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	269 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	270
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	271 typedef void (*menu_handler)(uint32_t index);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	272
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	273 static void menu(struct nk_context context, uint32_t num_entries, const menu_item items, menu_handler handler)
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	274 {
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	275 const uint32_t button_height = context->style.font->height * 1.75;
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	276 const uint32_t ideal_button_width = context->style.font->height * 10;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	277 const uint32_t button_space = 6;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	278
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	279 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	280 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	281 uint32_t top = height/2 - (button_height * num_entries)/2;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	282 uint32_t button_width = width > ideal_button_width ? ideal_button_width : width;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	283 uint32_t left = width/2 - button_width/2;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	284
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	285 nk_layout_space_begin(context, NK_STATIC, top + button_height * num_entries, num_entries);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	286 for (uint32_t i = 0; i < num_entries; i++)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	287 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	288 nk_layout_space_push(context, nk_rect(left, top + i * button_height, button_width, button_height-button_space));
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	289 if (nk_button_label(context, items[i].title)) {
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	290 if (items[i].next_view) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	291 push_view(items[i].next_view);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	292 if (current_view == view_save_state \|\| current_view == view_load_state) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	293 free_slot_info(slots);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	294 slots = NULL;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	295 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	296 } else {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	297 handler(i);
1478 da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI Michael Pavone <pavone@retrodev.com> parents: 1477 diff changeset	298 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	299 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	300 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	301 nk_layout_space_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	302 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	303
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	304 void binding_loop(char key, tern_val val, uint8_t valtype, void data)
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	305 {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	306 if (valtype != TVAL_PTR) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	307 return;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	308 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	309 tern_node **binding_lookup = data;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	310 binding_lookup = tern_insert_ptr(binding_lookup, val.ptrval, strdup(key));
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	311 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	312
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	313 static int32_t keycode;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	314 static const char *set_binding;
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	315 char *set_label;
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	316 void binding_group(struct nk_context context, char name, const char binds, const char bind_names, uint32_t num_binds, tern_node *binding_lookup)
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	317 {
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	318 nk_layout_row_static(context, (context->style.font->height + 4)*num_binds+context->style.font->height+30, render_width() - 80, 1);
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	319 if (nk_group_begin(context, name, NK_WINDOW_TITLE)) {
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	320 nk_layout_row_static(context, context->style.font->height, render_width()/2 - 80, 2);
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	321
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	322 for (int i = 0; i < num_binds; i++)
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	323 {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	324 char *label_alloc = bind_names ? NULL : path_extension(binds[i]);
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	325 const char *label = label_alloc;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	326 if (!label) {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	327 label = bind_names ? bind_names[i] : binds[i];
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	328 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	329 nk_label(context, label, NK_TEXT_LEFT);
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	330 if (nk_button_label(context, tern_find_ptr_default(binding_lookup, binds[i], "Not Set"))) {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	331 set_binding = binds[i];
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	332 set_label = strdup(label);
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	333 keycode = 0;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	334 }
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	335 if (label_alloc) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	336 free(label_alloc);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	337 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	338 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	339 nk_group_end(context);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	340 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	341 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	342
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	343 static char *get_key_name(int32_t keycode)
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	344 {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	345 char *name = NULL;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	346 if (keycode > ' ' && keycode < 0x80) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	347 //key corresponds to a printable non-whitespace character
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	348 name = malloc(2);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	349 name[0] = keycode;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	350 name[1] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	351 } else {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	352 switch (keycode)
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	353 {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	354 case RENDERKEY_UP: name = "up"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	355 case RENDERKEY_DOWN: name = "down"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	356 case RENDERKEY_LEFT: name = "left"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	357 case RENDERKEY_RIGHT: name = "right"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	358 case '\r': name = "enter"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	359 case ' ': name = "space"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	360 case '\t': name = "tab"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	361 case '\b': name = "backspace"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	362 case RENDERKEY_ESC: name = "esc"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	363 case RENDERKEY_DEL: name = "delete"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	364 case RENDERKEY_LSHIFT: name = "lshift"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	365 case RENDERKEY_RSHIFT: name = "rshift"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	366 case RENDERKEY_LCTRL: name = "lctrl"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	367 case RENDERKEY_RCTRL: name = "rctrl"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	368 case RENDERKEY_LALT: name = "lalt"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	369 case RENDERKEY_RALT: name = "ralt"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	370 case RENDERKEY_HOME: name = "home"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	371 case RENDERKEY_END: name = "end"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	372 case RENDERKEY_PAGEUP: name = "pageup"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	373 case RENDERKEY_PAGEDOWN: name = "pagedown"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	374 case RENDERKEY_F1: name = "f1"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	375 case RENDERKEY_F2: name = "f2"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	376 case RENDERKEY_F3: name = "f3"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	377 case RENDERKEY_F4: name = "f4"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	378 case RENDERKEY_F5: name = "f5"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	379 case RENDERKEY_F6: name = "f6"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	380 case RENDERKEY_F7: name = "f7"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	381 case RENDERKEY_F8: name = "f8"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	382 case RENDERKEY_F9: name = "f9"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	383 case RENDERKEY_F10: name = "f10"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	384 case RENDERKEY_F11: name = "f11"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	385 case RENDERKEY_F12: name = "f12"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	386 case RENDERKEY_SELECT: name = "select"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	387 case RENDERKEY_PLAY: name = "play"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	388 case RENDERKEY_SEARCH: name = "search"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	389 case RENDERKEY_BACK: name = "back"; break;
1549 577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	390 case RENDERKEY_NP0: name = "np0"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	391 case RENDERKEY_NP1: name = "np1"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	392 case RENDERKEY_NP2: name = "np2"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	393 case RENDERKEY_NP3: name = "np3"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	394 case RENDERKEY_NP4: name = "np4"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	395 case RENDERKEY_NP5: name = "np5"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	396 case RENDERKEY_NP6: name = "np6"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	397 case RENDERKEY_NP7: name = "np7"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	398 case RENDERKEY_NP8: name = "np8"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	399 case RENDERKEY_NP9: name = "np9"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	400 case RENDERKEY_NP_DIV: name = "np/"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	401 case RENDERKEY_NP_MUL: name = "np*"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	402 case RENDERKEY_NP_MIN: name = "np-"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	403 case RENDERKEY_NP_PLUS: name = "np+"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	404 case RENDERKEY_NP_ENTER: name = "npenter"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	405 case RENDERKEY_NP_STOP: name = "np."; break;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	406 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	407 if (name) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	408 name = strdup(name);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	409 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	410 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	411 return name;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	412 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	413
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	414 void view_key_bindings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	415 {
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	416 const char *controller1_binds[] = {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	417 "gamepads.1.up", "gamepads.1.down", "gamepads.1.left", "gamepads.1.right",
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	418 "gamepads.1.a", "gamepads.1.b", "gamepads.1.c",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	419 "gamepads.1.x", "gamepads.1.y", "gamepads.1.z",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	420 "gamepads.1.start", "gamepads.1.mode"
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	421 };
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	422 const char *controller2_binds[] = {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	423 "gamepads.2.up", "gamepads.2.down", "gamepads.2.left", "gamepads.2.right",
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	424 "gamepads.2.a", "gamepads.2.b", "gamepads.2.c",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	425 "gamepads.2.x", "gamepads.2.y", "gamepads.2.z",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	426 "gamepads.2.start", "gamepads.2.mode"
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	427 };
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	428 const char *general_binds[] = {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	429 "ui.exit", "ui.save_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	430 "ui.screenshot", "ui.sms_pause", "ui.toggle_keyboard_cpatured", "ui.release_mouse"
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	431 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	432 const char *general_names[] = {
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	433 "Show Menu", "Quick Save", "Toggle Fullscreen", "Soft Reset", "Reload Media",
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	434 "Internal Screenshot", "SMS Pause", "Capture Keyboard", "Release Mouse"
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	435 };
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	436 const char *speed_binds[] = {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	437 "ui.next_speed", "ui.prev_speed",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	438 "ui.set_speed.0", "ui.set_speed.1", "ui.set_speed.2" ,"ui.set_speed.3", "ui.set_speed.4",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	439 "ui.set_speed.5", "ui.set_speed.6", "ui.set_speed.7" ,"ui.set_speed.8", "ui.set_speed.9",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	440 };
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	441 const char *speed_names[] = {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	442 "Next", "Previous",
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	443 "Default Speed", "Set Speed 1", "Set Speed 2", "Set Speed 3", "Set Speed 4",
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	444 "Set Speed 5", "Set Speed 6", "Set Speed 7", "Set Speed 8", "Set Speed 9"
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	445 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	446 const char *debug_binds[] = {
1660 c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	447 "ui.enter_debugger", "ui.plane_debug", "ui.vram_debug", "ui.cram_debug",
c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	448 "ui.compositing_debug", "ui.vdp_debug_mode"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	449 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	450 const char *debug_names[] = {
1660 c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	451 "CPU Debugger", "Plane Debugger", "VRAM Debugger", "CRAM Debugger",
c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	452 "Layer Debugger", "Cycle Mode/Pal"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	453 };
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	454 const uint32_t NUM_C1_BINDS = sizeof(controller1_binds)/sizeof(*controller1_binds);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	455 const uint32_t NUM_C2_BINDS = sizeof(controller2_binds)/sizeof(*controller2_binds);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	456 const uint32_t NUM_SPEED_BINDS = sizeof(speed_binds)/sizeof(*speed_binds);
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	457 const uint32_t NUM_GEN_BINDS = sizeof(general_binds)/sizeof(*general_binds);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	458 const uint32_t NUM_DBG_BINDS = sizeof(debug_binds)/sizeof(*debug_binds);
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	459 static tern_node *binding_lookup;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	460 if (!binding_lookup) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	461 tern_node *bindings = tern_find_path(config, "bindings\0keys\0", TVAL_NODE).ptrval;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	462 if (bindings) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	463 tern_foreach(bindings, binding_loop, &binding_lookup);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	464 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	465 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	466 uint32_t width = render_width();
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	467 uint32_t height = render_height();
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	468 if (nk_begin(context, "Keyboard Bindings", nk_rect(0, 0, width, height), 0)) {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	469 binding_group(context, "Controller 1", controller1_binds, NULL, NUM_C1_BINDS, binding_lookup);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	470 binding_group(context, "Controller 2", controller2_binds, NULL, NUM_C2_BINDS, binding_lookup);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	471 binding_group(context, "General", general_binds, general_names, NUM_GEN_BINDS, binding_lookup);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	472 binding_group(context, "Speed Control", speed_binds, speed_names, NUM_SPEED_BINDS, binding_lookup);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	473 binding_group(context, "Debug", debug_binds, debug_names, NUM_DBG_BINDS, binding_lookup);
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	474 nk_layout_row_static(context, context->style.font->height * 1.1333, (render_width() - 80) / 2, 1);
1545 3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	475 if (nk_button_label(context, "Back")) {
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	476 pop_view();
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	477 }
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	478 nk_end(context);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	479 }
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	480 if (set_binding && nk_begin(context, "Set Binding", nk_rect(width/4, height/4, width/2/width3/4*/, height/2), NK_WINDOW_TITLE \| NK_WINDOW_BORDER)) {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	481 nk_layout_row_static(context, 30, width/2-30, 1);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	482 nk_label(context, "Press new key for", NK_TEXT_CENTERED);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	483 nk_label(context, set_label, NK_TEXT_CENTERED);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	484 if (nk_button_label(context, "Cancel")) {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	485 free(set_label);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	486 set_binding = set_label = NULL;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	487 } else if (keycode) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	488 char *name = get_key_name(keycode);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	489 if (name) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	490 uint32_t prefix_len = strlen("bindings") + strlen("keys") + 2;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	491 char * old = tern_find_ptr(binding_lookup, set_binding);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	492 if (old) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	493 uint32_t suffix_len = strlen(old) + 1;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	494 char *old_path = malloc(prefix_len + suffix_len + 1);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	495 memcpy(old_path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	496 memcpy(old_path + prefix_len, old, suffix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	497 old_path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	498 tern_val old_val;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	499 if (tern_delete_path(&config, old_path, &old_val) == TVAL_PTR) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	500 free(old_val.ptrval);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	501 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	502 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	503 uint32_t suffix_len = strlen(name) + 1;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	504 char *path = malloc(prefix_len + suffix_len + 1);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	505 memcpy(path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	506 memcpy(path + prefix_len, name, suffix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	507 path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	508
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	509 config_dirty = 1;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	510 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(set_binding)}, TVAL_PTR);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	511 free(path);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	512 free(name);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	513 tern_free(binding_lookup);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	514 binding_lookup = NULL;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	515 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	516 free(set_label);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	517 set_binding = set_label = NULL;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	518 }
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	519 nk_end(context);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	520 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	521 }
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	522
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	523 static int selected_controller;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	524 static controller_info selected_controller_info;
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	525 //#define MIN_BIND_BOX_WIDTH 140
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	526 #define MAX_BIND_BOX_WIDTH 350
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	527
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	528 #define AXIS 0x40000000
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	529 #define STICKDIR 0x30000000
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	530 #define LEFTSTICK 0x10000000
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	531 #define RIGHTSTICK 0x20000000
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	532 enum {
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	533 UP,DOWN,RIGHT,LEFT,NUM_AXIS_DIRS
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	534 };
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	535
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	536 static char * config_ps_names[] = {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	537 [SDL_CONTROLLER_BUTTON_A] = "cross",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	538 [SDL_CONTROLLER_BUTTON_B] = "circle",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	539 [SDL_CONTROLLER_BUTTON_X] = "square",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	540 [SDL_CONTROLLER_BUTTON_Y] = "triangle",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	541 [SDL_CONTROLLER_BUTTON_BACK] = "share",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	542 [SDL_CONTROLLER_BUTTON_START] = "options",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	543 [SDL_CONTROLLER_BUTTON_LEFTSHOULDER] = "l1",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	544 [SDL_CONTROLLER_BUTTON_RIGHTSHOULDER] = "r1",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	545 [SDL_CONTROLLER_BUTTON_LEFTSTICK] = "l3",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	546 [SDL_CONTROLLER_BUTTON_RIGHTSTICK] = "r3",
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	547 };
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	548
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	549 typedef struct {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	550 const char *button_binds[SDL_CONTROLLER_BUTTON_MAX];
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	551 const char *left_stick[NUM_AXIS_DIRS];
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	552 const char *right_stick[NUM_AXIS_DIRS];
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	553 const char *triggers[2];
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	554 } pad_bind_config;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	555
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	556 static const char **current_bind_dest;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	557
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	558 const char translate_binding_option(const char option)
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	559 {
1625 6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	560 static tern_node *conf_names;
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	561 if (!conf_names) {
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	562 conf_names = tern_insert_ptr(conf_names, "gamepads.n.up", "Pad Up");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	563 conf_names = tern_insert_ptr(conf_names, "gamepads.n.down", "Pad Down");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	564 conf_names = tern_insert_ptr(conf_names, "gamepads.n.left", "Pad Left");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	565 conf_names = tern_insert_ptr(conf_names, "gamepads.n.right", "Pad Right");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	566 conf_names = tern_insert_ptr(conf_names, "gamepads.n.a", "Pad A");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	567 conf_names = tern_insert_ptr(conf_names, "gamepads.n.b", "Pad B");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	568 conf_names = tern_insert_ptr(conf_names, "gamepads.n.c", "Pad C");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	569 conf_names = tern_insert_ptr(conf_names, "gamepads.n.x", "Pad X");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	570 conf_names = tern_insert_ptr(conf_names, "gamepads.n.y", "Pad Y");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	571 conf_names = tern_insert_ptr(conf_names, "gamepads.n.z", "Pad Z");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	572 conf_names = tern_insert_ptr(conf_names, "gamepads.n.start", "Pad Start");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	573 conf_names = tern_insert_ptr(conf_names, "gamepads.n.mode", "Pad Mode");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	574 conf_names = tern_insert_ptr(conf_names, "ui.release_mouse", "Release Mouse");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	575 conf_names = tern_insert_ptr(conf_names, "ui.vdp_debug_mode", "VDP Debug Mode");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	576 conf_names = tern_insert_ptr(conf_names, "ui.vdp_debug_pal", "VDP Debug Palette");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	577 conf_names = tern_insert_ptr(conf_names, "ui.enter_debugger", "Enter CPU Debugger");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	578 conf_names = tern_insert_ptr(conf_names, "ui.screenshot", "Take Screenshot");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	579 conf_names = tern_insert_ptr(conf_names, "ui.exit", "Show Menu");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	580 conf_names = tern_insert_ptr(conf_names, "ui.save_state", "Quick Save");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	581 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.0", "Set Speed 0");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	582 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.1", "Set Speed 1");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	583 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.2", "Set Speed 2");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	584 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.3", "Set Speed 3");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	585 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.4", "Set Speed 4");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	586 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.5", "Set Speed 5");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	587 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.6", "Set Speed 6");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	588 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.7", "Set Speed 7");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	589 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.8", "Set Speed 8");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	590 conf_names = tern_insert_ptr(conf_names, "ui.set_speed.9", "Set Speed 9");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	591 conf_names = tern_insert_ptr(conf_names, "ui.next_speed", "Next Speed");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	592 conf_names = tern_insert_ptr(conf_names, "ui.prev_speed", "Prev. Speed");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	593 conf_names = tern_insert_ptr(conf_names, "ui.toggle_fullscreen", "Toggle Fullscreen");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	594 conf_names = tern_insert_ptr(conf_names, "ui.soft_reset", "Soft Reset");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	595 conf_names = tern_insert_ptr(conf_names, "ui.reload", "Reload ROM");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	596 conf_names = tern_insert_ptr(conf_names, "ui.sms_pause", "SMS Pause");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	597 conf_names = tern_insert_ptr(conf_names, "ui.toggle_keyboard_captured", "Toggle Keyboard Capture");
6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	598 }
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	599 return tern_find_ptr_default(conf_names, option, (void *)option);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	600 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	601
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	602 static uint8_t controller_binding_changed;
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	603 static void bind_option_group(struct nk_context context, char name, const char **options, uint32_t num_options)
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	604 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	605 float margin = context->style.font->height * 2;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	606 nk_layout_row_static(context, (context->style.font->height + 3) * ((num_options + 2) / 3) + context->style.font->height*2.1, render_width() - margin, 1);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	607 if (nk_group_begin(context, name, NK_WINDOW_TITLE\|NK_WINDOW_NO_SCROLLBAR)) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	608 nk_layout_row_static(context, context->style.font->height, (render_width() - margin - context->style.font->height) / 3, 3);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	609 for (int i = 0; i < num_options; i++)
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	610 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	611 if (nk_button_label(context, translate_binding_option(options[i]))) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	612 *current_bind_dest = options[i];
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	613 controller_binding_changed = 1;
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	614 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	615 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	616 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	617 nk_group_end(context);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	618 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	619 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	620
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	621 static void view_button_binding(struct nk_context *context)
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	622 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	623 static const char *pad_opts[] = {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	624 "gamepads.n.up",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	625 "gamepads.n.down",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	626 "gamepads.n.left",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	627 "gamepads.n.right",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	628 "gamepads.n.a",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	629 "gamepads.n.b",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	630 "gamepads.n.c",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	631 "gamepads.n.x",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	632 "gamepads.n.y",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	633 "gamepads.n.z",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	634 "gamepads.n.start",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	635 "gamepads.n.mode"
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	636 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	637 static const char *system_buttons[] = {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	638 "ui.soft_reset",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	639 "ui.reload",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	640 "ui.sms_pause"
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	641 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	642 static const char *emu_control[] = {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	643 "ui.save_state",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	644 "ui.exit",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	645 "ui.toggle_fullscreen",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	646 "ui.screenshot",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	647 "ui.release_mouse",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	648 "ui.toggle_keyboard_captured"
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	649 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	650 static const char *debugger[] = {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	651 "ui.vdp_debug_mode",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	652 "ui.vdp_debug_pal",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	653 "ui.enter_debugger"
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	654 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	655 static const char *speeds[] = {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	656 "ui.next_speed",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	657 "ui.prev_speed",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	658 "ui.set_speed.0",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	659 "ui.set_speed.1",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	660 "ui.set_speed.2",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	661 "ui.set_speed.3",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	662 "ui.set_speed.4",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	663 "ui.set_speed.5",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	664 "ui.set_speed.6",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	665 "ui.set_speed.7",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	666 "ui.set_speed.8",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	667 "ui.set_speed.9"
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	668 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	669
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	670 if (nk_begin(context, "Button Binding", nk_rect(0, 0, render_width(), render_height()), 0)) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	671 bind_option_group(context, "Controller Buttons", pad_opts, sizeof(pad_opts)/sizeof(*pad_opts));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	672 bind_option_group(context, "System Buttons", system_buttons, sizeof(system_buttons)/sizeof(*system_buttons));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	673 bind_option_group(context, "Emulator Control", emu_control, sizeof(emu_control)/sizeof(*emu_control));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	674 bind_option_group(context, "Debugging", debugger, sizeof(debugger)/sizeof(*debugger));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	675 bind_option_group(context, "Speed Control", speeds, sizeof(speeds)/sizeof(*speeds));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	676
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	677 nk_layout_row_static(context, context->style.font->height, (render_width() - 80)/4, 1);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	678 if (nk_button_label(context, "Back")) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	679 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	680 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	681 nk_end(context);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	682 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	683 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	684
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	685 static void binding_box(struct nk_context context, pad_bind_config bindings, char name, float x, float y, float width, int num_binds, int binds)
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	686 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	687 const struct nk_user_font *font = context->style.font;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	688 float row_height = font->height * 2;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	689
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	690 char const *labels = calloc(sizeof(char ), num_binds);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	691 char const **conf_vals = calloc(sizeof(char ), num_binds);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	692 float max_width = 0.0f;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	693
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	694 int skipped = 0;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	695 for (int i = 0; i < num_binds; i++)
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	696 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	697 if (binds[i] & AXIS) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	698 labels[i] = get_axis_label(&selected_controller_info, binds[i] & ~AXIS);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	699 conf_vals[i] = &bindings->triggers[(binds[i] & ~AXIS) - SDL_CONTROLLER_AXIS_TRIGGERLEFT];
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	700 } else if (binds[i] & STICKDIR) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	701 static char const * dirs[] = {"Up", "Down", "Right", "Left"};
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	702 labels[i] = dirs[binds[i] & 3];
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	703 conf_vals[i] = &(binds[i] & LEFTSTICK ? bindings->left_stick : bindings->right_stick)[binds[i] & 3];
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	704 } else {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	705 labels[i] = get_button_label(&selected_controller_info, binds[i]);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	706 conf_vals[i] = &bindings->button_binds[binds[i]];
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	707 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	708 if (!labels[i]) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	709 skipped++;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	710 continue;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	711 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	712 float lb_width = font->width(font->userdata, font->height, labels[i], strlen(labels[i]));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	713 max_width = max_width < lb_width ? lb_width : max_width;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	714 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	715 nk_layout_space_push(context, nk_rect(x, y, width, (num_binds - skipped) * (row_height + 4) + 4));
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	716 nk_group_begin(context, name, NK_WINDOW_BORDER \| NK_WINDOW_NO_SCROLLBAR);
1625 6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	717
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	718 float widths[] = {max_width + 3, width - (max_width + 6)};
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	719 nk_layout_row(context, NK_STATIC, row_height, 2, widths);
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	720 for (int i = 0; i < num_binds; i++)
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	721 {
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	722 if (!labels[i]) {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	723 continue;
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	724 }
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	725 nk_label(context, labels[i], NK_TEXT_LEFT);
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	726 const char name = conf_vals[i] ? translate_binding_option(*conf_vals[i]) : "None";
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	727 if (nk_button_label(context, name)) {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	728 current_bind_dest = conf_vals[i];
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	729 push_view(view_button_binding);
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	730 }
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	731 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	732 free(labels);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	733 free(conf_vals);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	734 nk_group_end(context);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	735 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	736
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	737 static void button_iter(char key, tern_val val, uint8_t valtype, void data)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	738 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	739 pad_bind_config *bindings = data;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	740 if (valtype != TVAL_PTR) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	741 return;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	742 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	743 int button = render_lookup_button(key);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	744 if (button != SDL_CONTROLLER_BUTTON_INVALID) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	745 bindings->button_binds[button] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	746 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	747 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	748
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	749 static void axis_iter(char key, tern_val val, uint8_t valtype, void data)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	750 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	751 pad_bind_config *bindings = data;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	752 if (valtype != TVAL_PTR) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	753 return;
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	754 }
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	755 int axis;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	756 uint8_t is_negative = 0;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	757 char *period = strchr(key, '.');
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	758 if (period) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	759 char *tmp = malloc(period-key + 1);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	760 memcpy(tmp, key, period-key);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	761 tmp[period-key] = 0;
1624 7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	762 axis = render_lookup_axis(tmp);
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	763 free(tmp);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	764 is_negative = strcmp(period+1, "negative") == 0;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	765 } else {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	766 axis = render_lookup_axis(key);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	767 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	768 switch (axis)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	769 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	770 case SDL_CONTROLLER_AXIS_LEFTX:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	771 case SDL_CONTROLLER_AXIS_LEFTY:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	772 bindings->left_stick[(axis - SDL_CONTROLLER_AXIS_LEFTX) * 2 + is_negative] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	773 break;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	774 case SDL_CONTROLLER_AXIS_RIGHTX:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	775 case SDL_CONTROLLER_AXIS_RIGHTY:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	776 bindings->right_stick[(axis - SDL_CONTROLLER_AXIS_RIGHTX) * 2 + is_negative] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	777 break;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	778 case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	779 case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	780 bindings->triggers[axis-SDL_CONTROLLER_AXIS_TRIGGERLEFT] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	781 break;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	782 }
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	783 }
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	784
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	785 enum {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	786 SIMILAR_CONTROLLERS,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	787 IDENTICAL_CONTROLLERS,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	788 BY_INDEX,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	789 DEFAULT,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	790 NUM_DEST_TYPES
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	791 };
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	792
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	793 //it would be cleaner to generate this algorithmically for 4th and up,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	794 //but BlastEm only supports 8 controllers currently so it's not worth the effort
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	795 static const char *by_index_names[] = {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	796 "Use for 1st controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	797 "Use for 2nd controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	798 "Use for 3rd controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	799 "Use for 4th controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	800 "Use for 5th controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	801 "Use for 6th controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	802 "Use for 7th controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	803 "Use for 8th controller",
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	804 };
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	805
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	806 static void save_stick_binds(char axes_key, size_t axes_key_size, const char bindings, char prefix)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	807 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	808 for (int i = 0; i < NUM_AXIS_DIRS; i++)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	809 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	810 char axis = (i / 2) ? 'x' : 'y';
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	811 char *suffix = (i % 2) ? ".negative" : ".positive";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	812 size_t prefix_len = strlen(prefix), suffix_len = strlen(suffix);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	813 size_t full_key_size = axes_key_size + prefix_len + 1 + suffix_len + 2;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	814 char *full_key = malloc(full_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	815 memcpy(full_key, axes_key, axes_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	816 memcpy(full_key + axes_key_size, prefix, prefix_len);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	817 full_key[axes_key_size+prefix_len] = axis;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	818 memcpy(full_key + axes_key_size + prefix_len + 1, suffix, suffix_len +1);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	819 full_key[axes_key_size + prefix_len + 1 + suffix_len + 1] = 0;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	820
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	821 if (bindings[i]) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	822 tern_insert_path(config, full_key, (tern_val){.ptrval = strdup(bindings[i])}, TVAL_PTR);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	823 } else {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	824 tern_val prev_val;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	825 uint8_t prev_type = tern_delete_path(&config, full_key, &prev_val);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	826 if (prev_type == TVAL_PTR) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	827 free(prev_val.ptrval);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	828 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	829 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	830
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	831 free(full_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	832 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	833 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	834
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	835 static pad_bind_config *bindings;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	836 static void handle_dest_clicked(uint32_t dest)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	837 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	838 char key_buf[12];
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	839 char *key;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	840 switch (dest)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	841 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	842 case SIMILAR_CONTROLLERS:
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	843 key = make_controller_type_key(&selected_controller_info);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	844 break;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	845 case IDENTICAL_CONTROLLERS:
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	846 key = render_joystick_type_id(selected_controller);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	847 break;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	848 case BY_INDEX:
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	849 snprintf(key_buf, sizeof(key_buf), "%d", selected_controller);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	850 key = key_buf;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	851 break;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	852 default:
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	853 key = "default";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	854 break;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	855 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	856 static const char base_path[] = "bindings\0pads";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	857 size_t pad_key_size = sizeof(base_path) + strlen(key) + 1;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	858 char *pad_key = malloc(pad_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	859 memcpy(pad_key, base_path, sizeof(base_path));
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	860 strcpy(pad_key + sizeof(base_path), key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	861 static const char dpad_base[] = "dpads\0""0";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	862 size_t dpad_key_size = pad_key_size + sizeof(dpad_base);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	863 char *dpad_key = malloc(dpad_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	864 memcpy(dpad_key, pad_key, pad_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	865 memcpy(dpad_key + pad_key_size, dpad_base, sizeof(dpad_base));
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	866 static const char button_base[] = "buttons";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	867 size_t button_key_size = pad_key_size + sizeof(button_base);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	868 char *button_key = malloc(button_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	869 memcpy(button_key, pad_key, pad_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	870 memcpy(button_key + pad_key_size, button_base, sizeof(button_base));
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	871
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	872 char *final_key;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	873 for (int i = 0; i < SDL_CONTROLLER_BUTTON_MAX; i++)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	874 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	875 char *base;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	876 const char *suffix;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	877 size_t base_key_len;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	878 if ( i < SDL_CONTROLLER_BUTTON_DPAD_UP) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	879 suffix = SDL_GameControllerGetStringForButton(i);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	880 base_key_len = button_key_size;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	881 base = button_key;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	882
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	883
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	884 } else {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	885 static const char *dir_keys[] = {"up", "down", "left", "right"};
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	886 suffix = dir_keys[i - SDL_CONTROLLER_BUTTON_DPAD_UP];
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	887 base = dpad_key;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	888 base_key_len = dpad_key_size;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	889 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	890 size_t suffix_len = strlen(suffix);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	891 final_key = malloc(base_key_len + suffix_len + 2);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	892 memcpy(final_key, base, base_key_len);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	893 memcpy(final_key + base_key_len, suffix, suffix_len + 1);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	894 final_key[base_key_len + suffix_len + 1] = 0;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	895 if (bindings->button_binds[i]) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	896 tern_insert_path(config, final_key, (tern_val){.ptrval = strdup(bindings->button_binds[i])}, TVAL_PTR);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	897 } else {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	898 tern_val prev_val;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	899 uint8_t prev_type = tern_delete_path(&config, final_key, &prev_val);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	900 if (prev_type == TVAL_PTR) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	901 free(prev_val.ptrval);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	902 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	903 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	904 free(final_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	905 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	906 free(button_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	907 free(dpad_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	908
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	909 static const char axes_base[] = "axes";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	910 size_t axes_key_size = pad_key_size + sizeof(axes_base);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	911 char *axes_key = malloc(axes_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	912 memcpy(axes_key, pad_key, pad_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	913 memcpy(axes_key + pad_key_size, axes_base, sizeof(axes_base));
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	914
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	915 save_stick_binds(axes_key, axes_key_size,bindings->left_stick, "left");
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	916 save_stick_binds(axes_key, axes_key_size,bindings->right_stick, "right");
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	917 for (int i = SDL_CONTROLLER_AXIS_TRIGGERLEFT; i < SDL_CONTROLLER_AXIS_MAX; i++)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	918 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	919 const char *suffix = SDL_GameControllerGetStringForAxis(i);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	920 size_t suffix_len = strlen(suffix);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	921 final_key = malloc(axes_key_size + suffix_len + 2);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	922 memcpy(final_key, axes_key, axes_key_size);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	923 memcpy(final_key + axes_key_size, suffix, suffix_len + 1);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	924 final_key[axes_key_size + suffix_len + 1] = 0;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	925 if (bindings->triggers[i - SDL_CONTROLLER_AXIS_TRIGGERLEFT]) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	926 tern_insert_path(config, final_key, (tern_val){.ptrval = strdup(bindings->triggers[i - SDL_CONTROLLER_AXIS_TRIGGERLEFT])}, TVAL_PTR);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	927 } else {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	928 tern_val prev_val;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	929 uint8_t prev_type = tern_delete_path(&config, final_key, &prev_val);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	930 if (prev_type == TVAL_PTR) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	931 free(prev_val.ptrval);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	932 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	933 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	934 free(final_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	935 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	936 free(axes_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	937
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	938 free(pad_key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	939 if (dest == SIMILAR_CONTROLLERS) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	940 free(key);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	941 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	942 pop_view();
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	943 config_dirty = 1;
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	944 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	945
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	946 void view_select_binding_dest(struct nk_context *context)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	947 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	948 static menu_item options[NUM_DEST_TYPES];
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	949 options[IDENTICAL_CONTROLLERS].title = "Use for identical controllers";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	950 options[DEFAULT].title = "Use as default";
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	951 options[BY_INDEX].title = by_index_names[selected_controller];
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	952 options[SIMILAR_CONTROLLERS].title = make_human_readable_type_name(&selected_controller_info);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	953
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	954 if (nk_begin(context, "Select Binding Dest", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	955 menu(context, NUM_DEST_TYPES, options, handle_dest_clicked);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	956 nk_end(context);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	957 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	958 free((char *)options[SIMILAR_CONTROLLERS].title);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	959 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	960
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	961 static ui_image select_best_image(controller_info info)
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	962 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	963 if (info->variant != VARIANT_NORMAL) {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	964 return controller_ps4_6b;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	965 } else if (info->type == TYPE_PSX) {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	966 return controller_ps4;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	967 } else {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	968 return controller_360;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	969 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	970 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	971
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	972 void view_controller_bindings(struct nk_context *context)
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	973 {
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	974 if (nk_begin(context, "Controller Bindings", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	975 if (!bindings) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	976 bindings = calloc(1, sizeof(*bindings));
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	977 tern_node *pad = get_binding_node_for_pad(selected_controller);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	978 if (pad) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	979 tern_foreach(tern_find_node(pad, "buttons"), button_iter, bindings);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	980 tern_foreach(tern_find_node(pad, "axes"), axis_iter, bindings);
1624 7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	981 tern_node *dpad = tern_find_path(pad, "dpads\0" "0\0", TVAL_NODE).ptrval;
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	982 const char *dir_keys[] = {"up", "down", "right", "left"};
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	983 const int button_idx[] = {SDL_CONTROLLER_BUTTON_DPAD_UP, SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_LEFT};
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	984 for (int i = 0; i < NUM_AXIS_DIRS; i++)
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	985 {
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	986 bindings->button_binds[button_idx[i]] = tern_find_ptr(dpad, dir_keys[i]);
7bbe0bfedb58 Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	987 }
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	988 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	989 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	990
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	991 float orig_height = def_font->handle.height;
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	992 def_font->handle.height *= 0.5f;
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	993
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	994 uint32_t avail_height = render_height() - 2 * orig_height;
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	995 float desired_width = render_width() * 0.5f, desired_height = avail_height * 0.5f;
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	996 ui_image *controller_image = select_best_image(&selected_controller_info);
1609 9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	997
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	998 float controller_ratio = (float)controller_image->width / (float)controller_image->height;
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	999
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1000 const struct nk_user_font *font = context->style.font;
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1001 int MIN_BIND_BOX_WIDTH = font->width(font->userdata, font->height, "Right", strlen("Right"))
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1002 + def_font->handle.width(font->userdata, font->height, "Internal Screenshot", strlen("Internal Screenshot"));
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1003
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1004 if (render_width() - desired_width < 2.5f*MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1005 desired_width = render_width() - 2.5f*MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1006 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1007
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1008 if (desired_width / desired_height > controller_ratio) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1009 desired_width = desired_height * controller_ratio;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1010 } else {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1011 desired_height = desired_width / controller_ratio;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1012 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1013 float img_left = render_width() / 2.0f - desired_width / 2.0f;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1014 float img_top = avail_height / 2.0f - desired_height / 2.0f;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1015 float img_right = img_left + desired_width;
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1016 float img_bot = img_top + desired_height;
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1017 nk_layout_space_begin(context, NK_STATIC, avail_height, INT_MAX);
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1018 nk_layout_space_push(context, nk_rect(img_left, img_top, desired_width, desired_height));
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1019 nk_image(context, controller_image->ui);
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1020
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1021 float bind_box_width = (render_width() - img_right) * 0.8f;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1022 if (bind_box_width < MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1023 bind_box_width = render_width() - img_right;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1024 if (bind_box_width > MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1025 bind_box_width = MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1026 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1027 } else if (bind_box_width > MAX_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1028 bind_box_width = MAX_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1029 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1030 float bind_box_left;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1031 if (bind_box_width >= (render_width() - img_right)) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1032 bind_box_left = img_right;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1033 } else {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1034 bind_box_left = img_right + (render_width() - img_right) / 2.0f - bind_box_width / 2.0f;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1035 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1036
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1037 if (selected_controller_info.variant == VARIANT_NORMAL) {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1038 binding_box(context, bindings, "Action Buttons", bind_box_left, img_top, bind_box_width, 4, (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1039 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1040 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1041 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1042 SDL_CONTROLLER_BUTTON_Y
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1043 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1044 } else {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1045 binding_box(context, bindings, "Action Buttons", bind_box_left, img_top, bind_box_width, 6, (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1046 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1047 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1048 selected_controller_info.variant == VARIANT_6B_RIGHT ? AXIS \| SDL_CONTROLLER_AXIS_TRIGGERRIGHT : SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1049 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1050 SDL_CONTROLLER_BUTTON_Y,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1051 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_RIGHTSHOULDER : SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1052 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1053 }
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1054
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1055 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1056 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1057 (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1058 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSHOULDER : SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1059 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_RIGHTSHOULDER : AXIS \| SDL_CONTROLLER_AXIS_TRIGGERRIGHT
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1060 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1061
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1609 diff changeset	1062 binding_box(context, bindings, "Misc Buttons", (render_width() - bind_box_width) / 2, font->height/2, bind_box_width, 3, (int[]){
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1063 SDL_CONTROLLER_BUTTON_BACK,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1064 SDL_CONTROLLER_BUTTON_GUIDE,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1065 SDL_CONTROLLER_BUTTON_START
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1066 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1067
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1068 if (selected_controller_info.variant == VARIANT_NORMAL)
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1069 {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1070 binding_box(context, bindings, "Right Stick", img_right - desired_width/3, img_bot, bind_box_width, 5, (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1071 RIGHTSTICK \| UP,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1072 RIGHTSTICK \| DOWN,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1073 RIGHTSTICK \| LEFT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1074 RIGHTSTICK \| RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1075 SDL_CONTROLLER_BUTTON_RIGHTSTICK
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1076 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1077 }
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1078
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1079 bind_box_left -= img_right;
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1080 float dpad_left, dpad_top;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1081 if (selected_controller_info.variant == VARIANT_NORMAL)
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1082 {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1083 binding_box(context, bindings, "Left Stick", bind_box_left, img_top, bind_box_width, 5, (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1084 LEFTSTICK \| UP,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1085 LEFTSTICK \| DOWN,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1086 LEFTSTICK \| LEFT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1087 LEFTSTICK \| RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1088 SDL_CONTROLLER_BUTTON_LEFTSTICK
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1089 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1090 dpad_left = img_left - desired_width/6;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1091 dpad_top = img_bot + font->height * 1.5;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1092 } else {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1093 dpad_left = bind_box_left;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1094 dpad_top = img_top;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1095 }
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1096
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1097 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1098 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1099 (int[]){
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1100 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSTICK : SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1101 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_RIGHTSTICK : AXIS \| SDL_CONTROLLER_AXIS_TRIGGERLEFT
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1102 });
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1103
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1104 binding_box(context, bindings, "D-pad", dpad_left, dpad_top, bind_box_width, 4, (int[]){
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1105 SDL_CONTROLLER_BUTTON_DPAD_UP,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1106 SDL_CONTROLLER_BUTTON_DPAD_DOWN,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1107 SDL_CONTROLLER_BUTTON_DPAD_LEFT,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1108 SDL_CONTROLLER_BUTTON_DPAD_RIGHT
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1109 });
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1110
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1111 nk_layout_space_end(context);
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1112
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1113 def_font->handle.height = orig_height;
1598 5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	1114 nk_layout_row_static(context, orig_height + 4, (render_width() - 2*orig_height) / 4, 1);
1545 3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	1115 if (nk_button_label(context, "Back")) {
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	1116 pop_view();
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1117 if (controller_binding_changed) {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1118 push_view(view_select_binding_dest);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1119 }
1545 3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	1120 }
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	1121 nk_end(context);
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu Michael Pavone <pavone@retrodev.com> parents: 1527 diff changeset	1122 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1123 }
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1124
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1125 static int current_button;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1126 static int current_axis;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1127 static int button_pressed, last_button;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1128 static int hat_moved, hat_value, last_hat, last_hat_value;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1129 static int axis_moved, axis_value, last_axis;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1130 static char *mapping_string;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1131 static size_t mapping_pos;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1132
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1133 static void start_mapping(void)
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1134 {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1135 const char *name;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1136 mapping_string[mapping_pos++] = ',';
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1137 if (current_button != SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1138 name = SDL_GameControllerGetStringForButton(current_button);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1139 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1140 name = SDL_GameControllerGetStringForAxis(current_axis);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1141 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1142 size_t namesz = strlen(name);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1143 memcpy(mapping_string + mapping_pos, name, namesz);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1144 mapping_pos += namesz;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1145 mapping_string[mapping_pos++] = ':';
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1146 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1147
1605 f7b1d983d5c0 Bump up pause between mapping inputs Michael Pavone <pavone@retrodev.com> parents: 1604 diff changeset	1148 #define QUIET_FRAMES 9
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1149 static void view_controller_mappings(struct nk_context *context)
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1150 {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1151 char buffer[512];
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1152 static int quiet;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1153 uint8_t added_mapping = 0;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1154 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1155 nk_layout_row_static(context, render_height() - context->style.font->height, render_width() - context->style.font->height, 1);
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1156 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1157 snprintf(buffer, sizeof(buffer), "Press Button %s", get_button_label(&selected_controller_info, current_button));
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1158 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1159 snprintf(buffer, sizeof(buffer), "Move Axis %s", get_axis_label(&selected_controller_info, current_axis));
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1160 }
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1161 nk_label(context, buffer, NK_TEXT_CENTERED);
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1162 if (quiet) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1163 --quiet;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1164 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1165 if (button_pressed >= 0 && button_pressed != last_button) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1166 start_mapping();
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1167 mapping_string[mapping_pos++] = 'b';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1168 if (button_pressed > 9) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1169 mapping_string[mapping_pos++] = '0' + button_pressed / 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1170 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1171 mapping_string[mapping_pos++] = '0' + button_pressed % 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1172 added_mapping = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1173 last_button = button_pressed;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1174 } else if (hat_moved >= 0 && hat_value && (hat_moved != last_hat \|\| hat_value != last_hat_value)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1175 start_mapping();
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1176 mapping_string[mapping_pos++] = 'h';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1177 mapping_string[mapping_pos++] = '0' + hat_moved;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1178 mapping_string[mapping_pos++] = '.';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1179 mapping_string[mapping_pos++] = '0' + hat_value;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1180 added_mapping = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1181
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1182 last_hat = hat_moved;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1183 last_hat_value = hat_value;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1184 } else if (axis_moved >= 0 && abs(axis_value) > 1000 && axis_moved != last_axis) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1185 start_mapping();
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1186 mapping_string[mapping_pos++] = 'a';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1187 if (axis_moved > 9) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1188 mapping_string[mapping_pos++] = '0' + axis_moved / 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1189 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1190 mapping_string[mapping_pos++] = '0' + axis_moved % 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1191 added_mapping = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1192 last_axis = axis_moved;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1193 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1194 }
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1195
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1196 if (added_mapping) {
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1197 quiet = QUIET_FRAMES;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1198 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1199 current_button++;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1200 if (current_button == SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1201 current_axis = 0;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1202 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1203 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1204 current_axis++;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1205 if (current_axis == SDL_CONTROLLER_AXIS_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1206 mapping_string[mapping_pos] = 0;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1207 save_controller_mapping(selected_controller, mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1208 free(mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1209 pop_view();
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1210 push_view(view_controller_bindings);
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1211 controller_binding_changed = 0;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1212 }
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1213 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1214 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1215 button_pressed = -1;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1216 hat_moved = -1;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1217 axis_moved = -1;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1218 nk_end(context);
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1219 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1220 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1221
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1222 static void view_controller_variant(struct nk_context *context)
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1223 {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1224 uint8_t selected = 0;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1225 if (nk_begin(context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1226 nk_layout_row_static(context, context->style.font->height1.25, render_width() - context->style.font->height 2, 1);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1227 nk_label(context, "", NK_TEXT_CENTERED);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1228 nk_label(context, "Select the layout that", NK_TEXT_CENTERED);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1229 nk_label(context, "best matches your controller", NK_TEXT_CENTERED);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1230 nk_label(context, "", NK_TEXT_CENTERED);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1231 if (nk_button_label(context, "4 face buttons")) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1232 selected_controller_info.variant = VARIANT_NORMAL;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1233 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1234 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1235 char buffer[512];
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1236 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1237 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER),
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1238 get_axis_label(&selected_controller_info, SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1239 );
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1240 if (nk_button_label(context, buffer)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1241 selected_controller_info.variant = VARIANT_6B_RIGHT;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1242 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1243 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1244 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1245 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_LEFTSHOULDER),
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1246 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1247 );
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1248 if (nk_button_label(context, buffer)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1249 selected_controller_info.variant = VARIANT_6B_BUMPERS;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1250 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1251 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1252 nk_end(context);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1253 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1254 if (selected) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1255 save_controller_info(selected_controller, &selected_controller_info);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1256 pop_view();
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1257 SDL_GameController *controller = render_get_controller(selected_controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1258 if (controller) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1259 push_view(view_controller_bindings);
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1260 controller_binding_changed = 0;
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1261 SDL_GameControllerClose(controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1262 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1263 current_button = SDL_CONTROLLER_BUTTON_A;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1264 button_pressed = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1265 last_button = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1266 last_hat = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1267 axis_moved = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1268 last_axis = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1269 SDL_Joystick *joy = render_get_joystick(selected_controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1270 const char *name = SDL_JoystickName(joy);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1271 size_t namesz = strlen(name);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1272 mapping_string = malloc(512 + namesz);
1604 68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1273 for (mapping_pos = 0; mapping_pos < namesz; mapping_pos++)
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1274 {
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1275 char c = name[mapping_pos];
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1276 if (c == ',' \|\| c == '\n' \|\| c == '\r') {
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1277 c = ' ';
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1278 }
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1279 mapping_string[mapping_pos] = c;
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name Michael Pavone <pavone@retrodev.com> parents: 1602 diff changeset	1280 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1281
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1282 push_view(view_controller_mappings);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1283 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1284 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1285 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1286
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1287 static void controller_type_group(struct nk_context context, char name, int type_id, int first_subtype_id, const char **types, uint32_t num_types)
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1288 {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1289 nk_layout_row_static(context, (context->style.font->height + 3) * num_types + context->style.font->height, render_width() - 80, 1);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1290 if (nk_group_begin(context, name, NK_WINDOW_TITLE)) {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1291 nk_layout_row_static(context, context->style.font->height, render_width()/2 - 80, 2);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1292 for (int i = 0; i < num_types; i++)
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1293 {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1294 if (nk_button_label(context, types[i])) {
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1295 selected_controller_info.type = type_id;
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1296 selected_controller_info.subtype = first_subtype_id + i;
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1297 pop_view();
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1298 push_view(view_controller_variant);
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1299 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1300 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1301 nk_group_end(context);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1302 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1303 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1304
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1305 void view_controller_type(struct nk_context *context)
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1306 {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1307 if (nk_begin(context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1308 controller_type_group(context, "Xbox", TYPE_XBOX, SUBTYPE_XBOX, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1309 "Original", "Xbox 360", "Xbox One"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1310 }, 3);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1311 controller_type_group(context, "Playstation", TYPE_PSX, SUBTYPE_PS3, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1312 "PS3", "PS4"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1313 }, 2);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1314 controller_type_group(context, "Sega", TYPE_SEGA, SUBTYPE_GENESIS, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1315 "Genesis", "Saturn"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1316 }, 2);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1317 controller_type_group(context, "Nintendo", TYPE_NINTENDO, SUBTYPE_WIIU, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1318 "WiiU", "Switch"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1319 }, 2);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1320 nk_end(context);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1321 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1322 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1323
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1324 void view_controllers(struct nk_context *context)
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1325 {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1326 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1327 int height = (render_width() - 2*context->style.font->height) / MAX_JOYSTICKS;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1328 for (int i = 0; i < MAX_JOYSTICKS; i++)
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1329 {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1330 SDL_Joystick *joy = render_get_joystick(i);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1331 if (joy) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1332 controller_info info = get_controller_info(i);
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1333 ui_image *controller_image = select_best_image(&info);
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1334 int image_width = height * controller_image->width / controller_image->height;
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1335 nk_layout_row_begin(context, NK_STATIC, height, 2);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1336 nk_layout_row_push(context, image_width);
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1337 if (info.type == TYPE_UNKNOWN \|\| info.type == TYPE_GENERIC_MAPPING) {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1338 nk_label(context, "?", NK_TEXT_CENTERED);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1339 } else {
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1340 nk_image(context, controller_image->ui);
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1341 }
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1342 nk_layout_row_push(context, render_width() - image_width - 2 * context->style.font->height);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1343 if (nk_button_label(context, info.name)) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1344 selected_controller = i;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1345 selected_controller_info = info;
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1346 if (info.type == TYPE_UNKNOWN \|\| info.type == TYPE_GENERIC_MAPPING) {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1347 push_view(view_controller_type);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1348 } else {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1349 push_view(view_controller_bindings);
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1350 controller_binding_changed = 0;
1599 1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1351 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details Michael Pavone <pavone@retrodev.com> parents: 1598 diff changeset	1352
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1353 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1354 nk_layout_row_end(context);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1355 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1356 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1357 nk_layout_row_static(context, context->style.font->height, (render_width() - 2 * context->style.font->height) / 2, 2);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1358 nk_label(context, "", NK_TEXT_LEFT);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1359 if (nk_button_label(context, "Back")) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1360 pop_view();
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1361 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1362 nk_end(context);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1363 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1364 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	1365
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1366 void settings_toggle(struct nk_context context, char label, char *path, uint8_t def)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1367 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1368 uint8_t curval = !strcmp("on", tern_find_path_default(config, path, (tern_val){.ptrval = def ? "on": "off"}, TVAL_PTR).ptrval);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1369 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1370 uint8_t newval = nk_check_label(context, "", curval);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1371 if (newval != curval) {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1372 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1373 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(newval ? "on" : "off")}, TVAL_PTR);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1374 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1375 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1376
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1377 void settings_int_input(struct nk_context context, char label, char path, char def)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1378 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1379 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1380 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1381 uint32_t curval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1382 char *curstr = tern_find_path_default(config, path, (tern_val){.ptrval = def}, TVAL_PTR).ptrval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1383 uint32_t len = strlen(curstr);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1384 if (len > 11) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1385 len = 11;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1386 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1387 memcpy(buffer, curstr, len);
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1581 diff changeset	1388 memset(buffer+len, 0, sizeof(buffer)-len);
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1389 nk_edit_string(context, NK_EDIT_SIMPLE, buffer, &len, sizeof(buffer)-1, nk_filter_decimal);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1390 buffer[len] = 0;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1391 if (strcmp(buffer, curstr)) {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1392 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1393 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(buffer)}, TVAL_PTR);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1394 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1395 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1396
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1397 void settings_int_property(struct nk_context context, char label, char name, char path, int def, int min, int max)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1398 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1399 char *curstr = tern_find_path(config, path, TVAL_PTR).ptrval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1400 int curval = curstr ? atoi(curstr) : def;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1401 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1402 int val = curval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1403 nk_property_int(context, name, min, &val, max, 1, 1.0f);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1404 if (val != curval) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1405 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1406 sprintf(buffer, "%d", val);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1407 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1408 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(buffer)}, TVAL_PTR);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1409 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1410 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1411
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1412 typedef struct {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1413 char *fragment;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1414 char *vertex;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1415 } shader_prog;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1416
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1417 shader_prog get_shader_progs(dir_entry entries, size_t num_entries, shader_prog progs, uint32_t num_existing, uint32_t *storage)
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1418 {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1419 uint32_t num_progs = *num_existing;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1420 uint32_t prog_storage = *storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1421 uint32_t starting = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1422
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1423 for (uint32_t i = 0; i < num_entries; i++) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1424 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1425 continue;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1426 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1427 char *no_ext = basename_no_extension(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1428 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1429 if (no_ext[len-1] == 'f' && no_ext[len-2] == '.') {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1430 uint8_t dupe = 0;;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1431 for (uint32_t j = 0; j < starting; j++) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1432 if (!strcmp(entries[i].name, progs[j].fragment)) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1433 dupe = 1;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1434 break;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1435 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1436 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1437 if (!dupe) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1438 if (num_progs == prog_storage) {
1493 24f44f26b74d Fix buffer overrun in video settings menu Michael Pavone <pavone@retrodev.com> parents: 1492 diff changeset	1439 prog_storage = prog_storage ? prog_storage*2 : 4;
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1440 progs = realloc(progs, sizeof(progs) * prog_storage);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1441 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1442 progs[num_progs].vertex = NULL;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1443 progs[num_progs++].fragment = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1444 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1445 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1446 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1447 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1448
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1449 for (uint32_t i = 0; i < num_entries; i++) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1450 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1451 continue;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1452 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1453 char *no_ext = basename_no_extension(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1454 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1455 if (no_ext[len-1] == 'v' && no_ext[len-2] == '.') {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1456 for (uint32_t j = 0; j < num_progs; j++) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1457 if (!strncmp(no_ext, progs[j].fragment, len-1) && progs[j].fragment[len-1] == 'f' && progs[j].fragment[len] == '.') {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1458 progs[j].vertex = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1459 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1460 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1461 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1462 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1463 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1464 free_dir_list(entries, num_entries);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1465 *num_existing = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1466 *storage = prog_storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1467 return progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1468 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1469
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1470 shader_prog get_shader_list(uint32_t num_out)
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1471 {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1472 char *shader_dir = path_append(get_config_dir(), "shaders");
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1473 size_t num_entries;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1474 dir_entry *entries = get_dir_list(shader_dir, &num_entries);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1475 free(shader_dir);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1476 shader_prog *progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1477 uint32_t num_progs = 0, prog_storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1478 if (num_entries) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1479 progs = calloc(num_entries, sizeof(shader_prog));
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1480 prog_storage = num_entries;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1481 progs = get_shader_progs(entries, num_entries, progs, &num_progs, &prog_storage);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1482 } else {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1483 progs = NULL;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1484 prog_storage = 0;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1485 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1486 shader_dir = path_append(get_exe_dir(), "shaders");
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1487 entries = get_dir_list(shader_dir, &num_entries);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1488 progs = get_shader_progs(entries, num_entries, progs, &num_progs, &prog_storage);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1489 *num_out = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1490 return progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1491 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1492
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1493 int32_t find_match(const char *options, uint32_t num_options, char path, char *def)
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1494 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1495 char *setting = tern_find_path_default(config, path, (tern_val){.ptrval = def}, TVAL_PTR).ptrval;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1496 int32_t selected = -1;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1497 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1498 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1499 if (!strcmp(setting, options[i])) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1500 selected = i;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1501 break;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1502 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1503 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1504 if (selected == -1) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1505 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1506 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1507 if (!strcmp(def, options[i])) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1508 selected = i;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1509 break;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1510 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1511 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1512 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1513 return selected;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1514 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1515
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1516 int32_t settings_dropdown_ex(struct nk_context context, char label, const char options, const char opt_display, uint32_t num_options, int32_t current, char *path)
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1517 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1518 nk_label(context, label, NK_TEXT_LEFT);
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1519 int32_t next = nk_combo(context, opt_display, num_options, current, 30, nk_vec2(300, 300));
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1520 if (next != current) {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1521 config_dirty = 1;
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1522 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(options[next])}, TVAL_PTR);
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1523 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1524 return next;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1525 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1526
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1527 int32_t settings_dropdown(struct nk_context context, char label, const char *options, uint32_t num_options, int32_t current, char path)
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1528 {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1529 return settings_dropdown_ex(context, label, options, options, num_options, current, path);
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1530 }
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1531
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1532 void view_video_settings(struct nk_context *context)
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1533 {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1534 const char *vsync_opts[] = {"on", "off", "tear"};
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1535 const char *vsync_opt_names[] = {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1536 "On",
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1537 "Off",
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1538 "On, tear if late"
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1539 };
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1540 const uint32_t num_vsync_opts = sizeof(vsync_opts)/sizeof(*vsync_opts);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1541 static shader_prog *progs;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1542 static char **prog_names;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1543 static uint32_t num_progs;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1544 static uint32_t selected_prog;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1545 static int32_t selected_vsync = -1;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1546 if (selected_vsync < 0) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1547 selected_vsync = find_match(vsync_opts, num_vsync_opts, "video\0vsync\0", "off");
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1548 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1549 if(!progs) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1550 progs = get_shader_list(&num_progs);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1551 prog_names = calloc(num_progs, sizeof(char*));
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1552 for (uint32_t i = 0; i < num_progs; i++)
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1553 {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1554 prog_names[i] = basename_no_extension(progs[i].fragment);;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1555 uint32_t len = strlen(prog_names[i]);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1556 if (len > 2) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1557 prog_names[i][len-2] = 0;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1558 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1559 if (!progs[i].vertex) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1560 progs[i].vertex = strdup("default.v.glsl");
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1561 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1562 if (!strcmp(
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1563 progs[i].fragment,
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1564 tern_find_path_default(config, "video\0fragment_shader\0", (tern_val){.ptrval = "default.f.glsl"}, TVAL_PTR).ptrval
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1565 )) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1566 selected_prog = i;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1567 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1568 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1569 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1570 uint32_t width = render_width();
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1571 uint32_t height = render_height();
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1572 uint32_t desired_width = context->style.font->height * 10;
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1573 if (desired_width > width) {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1574 desired_width = width;
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1575 }
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1576 if (nk_begin(context, "Video Settings", nk_rect(0, 0, width, height), 0)) {
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1577 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1578 settings_toggle(context, "Fullscreen", "video\0fullscreen\0", 0);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1579 settings_toggle(context, "Open GL", "video\0gl\0", 1);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1580 settings_toggle(context, "Scanlines", "video\0scanlines\0", 0);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1581 selected_vsync = settings_dropdown_ex(context, "VSync", vsync_opts, vsync_opt_names, num_vsync_opts, selected_vsync, "video\0vsync\0");
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1582 settings_int_input(context, "Windowed Width", "video\0width\0", "640");
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1583 nk_label(context, "Shader", NK_TEXT_LEFT);
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1584 uint32_t next_selected = nk_combo(context, (const char **)prog_names, num_progs, selected_prog, context->style.font->height, nk_vec2(desired_width, desired_width));
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1585 if (next_selected != selected_prog) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1586 selected_prog = next_selected;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1587 config_dirty = 1;
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1588 config = tern_insert_path(config, "video\0fragment_shader\0", (tern_val){.ptrval = strdup(progs[next_selected].fragment)}, TVAL_PTR);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1589 config = tern_insert_path(config, "video\0vertex_shader\0", (tern_val){.ptrval = strdup(progs[next_selected].vertex)}, TVAL_PTR);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1590 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1591 settings_int_property(context, "NTSC Overscan", "Top", "video\0ntsc\0overscan\0top\0", 2, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1592 settings_int_property(context, "", "Bottom", "video\0ntsc\0overscan\0bottom\0", 17, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1593 settings_int_property(context, "", "Left", "video\0ntsc\0overscan\0left\0", 13, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1594 settings_int_property(context, "", "Right", "video\0ntsc\0overscan\0right\0", 14, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1595 settings_int_property(context, "PAL Overscan", "Top", "video\0pal\0overscan\0top\0", 2, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1596 settings_int_property(context, "", "Bottom", "video\0pal\0overscan\0bottom\0", 17, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1597 settings_int_property(context, "", "Left", "video\0pal\0overscan\0left\0", 13, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1598 settings_int_property(context, "", "Right", "video\0pal\0overscan\0right\0", 14, 0, 32);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1599
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1600 if (nk_button_label(context, "Back")) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1601 pop_view();
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1602 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1603 nk_end(context);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1604 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1605 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1606
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1607 void view_audio_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1608 {
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1609 const char *rates[] = {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1610 "192000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1611 "96000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1612 "48000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1613 "44100",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1614 "22050"
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1615 };
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1616 const char *sizes[] = {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1617 "1024",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1618 "512",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1619 "256",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1620 "128",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1621 "64"
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1622 };
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1623 const uint32_t num_rates = sizeof(rates)/sizeof(*rates);
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1624 const uint32_t num_sizes = sizeof(sizes)/sizeof(*sizes);
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1625 static int32_t selected_rate = -1;
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1626 static int32_t selected_size = -1;
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1627 if (selected_rate < 0 \|\| selected_size < 0) {
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1628 selected_rate = find_match(rates, num_rates, "autio\0rate\0", "48000");
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1629 selected_size = find_match(sizes, num_sizes, "audio\0buffer\0", "512");
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1630 }
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1631 uint32_t width = render_width();
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1632 uint32_t height = render_height();
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1633 uint32_t desired_width = context->style.font->height * 10;
aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1634 if (desired_width > width) {
aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1635 desired_width = width;
aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1636 }
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1637 if (nk_begin(context, "Audio Settings", nk_rect(0, 0, width, height), 0)) {
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1638 nk_layout_row_static(context, context->style.font->height , desired_width, 2);
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1639 selected_rate = settings_dropdown(context, "Rate in Hz", rates, num_rates, selected_rate, "audio\0rate\0");
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1640 selected_size = settings_dropdown(context, "Buffer Samples", sizes, num_sizes, selected_size, "audio\0buffer\0");
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1641 settings_int_input(context, "Lowpass Cutoff Hz", "audio\0lowpass_cutoff\0", "3390");
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1642 if (nk_button_label(context, "Back")) {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1643 pop_view();
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1644 }
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1645 nk_end(context);
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1646 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1647 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1648 void view_system_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1649 {
1568 d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1650 const char *sync_opts[] = {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1651 "video",
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1652 "audio"
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1653 };
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1654 const uint32_t num_sync_opts = sizeof(sync_opts)/sizeof(*sync_opts);
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1655 static int32_t selected_sync = -1;
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1656 if (selected_sync < 0) {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1657 selected_sync = find_match(sync_opts, num_sync_opts, "system\0sync_source\0", "video");
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1658 }
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1659 const char *regions[] = {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1660 "J - Japan",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1661 "U - Americas",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1662 "E - Europe"
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1663 };
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1664 const char *region_codes[] = {"J", "U", "E"};
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1665 const uint32_t num_regions = sizeof(regions)/sizeof(*regions);
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1666 static int32_t selected_region = -1;
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1667 if (selected_region < 0) {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1668 selected_region = find_match(region_codes, num_regions, "system\0default_region\0", "U");
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1669 }
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1670 const char *formats[] = {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1671 "native",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1672 "gst"
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1673 };
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1674 const uint32_t num_formats = sizeof(formats)/sizeof(*formats);
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1675 int32_t selected_format = -1;
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1676 if (selected_format < 0) {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1677 selected_format = find_match(formats, num_formats, "ui\0state_format\0", "native");
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1678 }
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1679 const char *ram_inits[] = {
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1680 "zero",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1681 "random"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1682 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1683 const uint32_t num_inits = sizeof(ram_inits)/sizeof(*ram_inits);
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1684 static int32_t selected_init = -1;
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1685 if (selected_init < 0) {
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1686 selected_init = find_match(ram_inits, num_inits, "system\0ram_init\0", "zero");
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1687 }
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1688 const char *io_opts_1[] = {
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1689 "gamepad2.1",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1690 "gamepad3.1",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1691 "gamepad6.1",
1575 ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI Michael Pavone <pavone@retrodev.com> parents: 1573 diff changeset	1692 "mouse.1",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1693 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1694 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1695 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1696 const char *io_opts_2[] = {
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1697 "gamepad2.2",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1698 "gamepad3.2",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1699 "gamepad6.2",
1575 ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI Michael Pavone <pavone@retrodev.com> parents: 1573 diff changeset	1700 "mouse.1",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1701 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1702 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1703 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1704 static int32_t selected_io_1 = -1;
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1705 static int32_t selected_io_2 = -1;
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1706 const uint32_t num_io = sizeof(io_opts_1)/sizeof(*io_opts_1);
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1707 if (selected_io_1 < 0 \|\| selected_io_2 < 0) {
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1708 selected_io_1 = find_match(io_opts_1, num_io, "io\0devices\0""1\0", "gamepad6.1");
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1709 selected_io_2 = find_match(io_opts_2, num_io, "io\0devices\0""2\0", "gamepad6.2");
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1710 }
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1711
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1712 uint32_t width = render_width();
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1713 uint32_t height = render_height();
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1714 uint32_t desired_width = context->style.font->height * 10;
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1715 if (nk_begin(context, "System Settings", nk_rect(0, 0, width, height), 0)) {
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1716 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
1568 d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1717 selected_sync = settings_dropdown(context, "Sync Source", sync_opts, num_sync_opts, selected_sync, "system\0sync_source\0");
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1718 settings_int_property(context, "68000 Clock Divider", "", "clocks\0m68k_divider\0", 7, 1, 53);
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1719 settings_toggle(context, "Remember ROM Path", "ui\0remember_path\0", 1);
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1720 selected_region = settings_dropdown_ex(context, "Default Region", region_codes, regions, num_regions, selected_region, "system\0default_region\0");
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1721 selected_format = settings_dropdown(context, "Save State Format", formats, num_formats, selected_format, "ui\0state_format\0");
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1722 selected_init = settings_dropdown(context, "Initial RAM Value", ram_inits, num_inits, selected_init, "system\0ram_init\0");
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1723 selected_io_1 = settings_dropdown_ex(context, "IO Port 1 Device", io_opts_1, device_type_names, num_io, selected_io_1, "io\0devices\0""1\0");
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1724 selected_io_2 = settings_dropdown_ex(context, "IO Port 2 Device", io_opts_2, device_type_names, num_io, selected_io_2, "io\0devices\0""2\0");
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1725 if (nk_button_label(context, "Back")) {
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1726 pop_view();
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1727 }
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1728 nk_end(context);
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	1729 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1730 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1731
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1732 void view_back(struct nk_context *context)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1733 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1734 pop_view();
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1735 pop_view();
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1736 current_view(context);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1737 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1738
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1739 void view_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1740 {
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1741 static menu_item items[] = {
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1742 {"Key Bindings", view_key_bindings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1743 {"Controllers", view_controllers},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1744 {"Video", view_video_settings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1745 {"Audio", view_audio_settings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1746 {"System", view_system_settings},
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1747 {"Back", view_back}
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1748 };
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1749
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1750 if (nk_begin(context, "Settings Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1751 menu(context, sizeof(items)/sizeof(*items), items, NULL);
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1752 nk_end(context);
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1753 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1754 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1755
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1756 void exit_handler(uint32_t index)
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1757 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1758 exit(0);
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1759 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1760
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1761 void view_pause(struct nk_context *context)
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1762 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1763 static menu_item items[] = {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1764 {"Resume", view_play},
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1765 {"Load ROM", view_load},
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	1766 {"Lock On", view_lock_on},
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1767 {"Save State", view_save_state},
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1768 {"Load State", view_load_state},
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1769 {"Settings", view_settings},
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1770 {"Exit", NULL}
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1771 };
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1772
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1773 if (nk_begin(context, "Main Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1774 menu(context, sizeof(items)/sizeof(*items), items, exit_handler);
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1775 nk_end(context);
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1776 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1777 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1778
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1779 void view_menu(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1780 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1781 static menu_item items[] = {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1782 {"Load ROM", view_load},
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1783 {"Settings", view_settings},
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1784 {"About", view_about},
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1785 {"Exit", NULL}
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1786 };
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1787
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1788 if (nk_begin(context, "Main Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
1645 84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file Michael Pavone <pavone@retrodev.com> parents: 1626 diff changeset	1789 menu(context, sizeof(items)/sizeof(*items), items, exit_handler);
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1790 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1791 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1792 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1793
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1794 void blastem_nuklear_render(void)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1795 {
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1796 if (current_view != view_play) {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1797 nk_input_end(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1798 current_view(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1799 nk_sdl_render(NK_ANTI_ALIASING_ON, 512 * 1024, 128 * 1024);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1800 nk_input_begin(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1801 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1802 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1803
1486 a6881d0d76d0 Pause game execution when in the new UI pause menu Michael Pavone <pavone@retrodev.com> parents: 1485 diff changeset	1804 void ui_idle_loop(void)
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1805 {
1482 2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1806 const uint32_t MIN_UI_DELAY = 15;
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1807 static uint32_t last;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1808 while (current_view != view_play)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1809 {
1482 2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1810 uint32_t current = render_elapsed_ms();
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1811 if ((current - last) < MIN_UI_DELAY) {
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1812 render_sleep_ms(MIN_UI_DELAY - (current - last) - 1);
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1813 }
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1481 diff changeset	1814 last = current;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1815 render_update_display();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1816 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1817 if (config_dirty) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1818 apply_updated_config();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1819 persist_config(config);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1820 config_dirty = 0;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1821 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1822 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1823 static void handle_event(SDL_Event *event)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1824 {
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	1825 if (event->type == SDL_KEYDOWN) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	1826 keycode = event->key.keysym.sym;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	1827 }
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1828 else if (event->type == SDL_JOYBUTTONDOWN) {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1829 button_pressed = event->jbutton.button;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1830 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1831 else if (event->type == SDL_JOYHATMOTION) {
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1832 hat_moved = event->jhat.hat;
1600 7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1833 hat_value = event->jhat.value;
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1834 }
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1835 else if (event->type == SDL_JOYAXISMOTION) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1836 if (event->jaxis.axis == axis_moved \|\| abs(event->jaxis.value) > abs(axis_value) \|\| abs(event->jaxis.value) > 1000) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1837 axis_moved = event->jaxis.axis;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1838 axis_value = event->jaxis.value;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1839 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1840 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1841 nk_sdl_handle_event(event);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1842 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1843
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1844 static void context_destroyed(void)
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1845 {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1846 nk_sdl_shutdown();
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1847 }
1570 bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1848
1609 9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1849 static struct nk_image load_image_texture(uint32_t *buf, uint32_t width, uint32_t height)
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1850 {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1851 GLuint tex;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1852 glGenTextures(1, &tex);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1853 glBindTexture(GL_TEXTURE_2D, tex);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1854 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1855 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1856 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1857 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1858 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1859 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1860 #else
1609 9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1861 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE, buf);
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1862 #endif
1609 9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1863 return nk_image_id((int)tex);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	1864 }
1570 bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1865
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1866 static void texture_init(void)
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1867 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1868 struct nk_font_atlas *atlas;
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1869 nk_sdl_font_stash_begin(&atlas);
1527 4f6e8acd7b6a Added support for TTC and dfont format true type fonts. More robust font selection on Windows Michael Pavone <pavone@retrodev.com> parents: 1526 diff changeset	1870 uint32_t font_size;
4f6e8acd7b6a Added support for TTC and dfont format true type fonts. More robust font selection on Windows Michael Pavone <pavone@retrodev.com> parents: 1526 diff changeset	1871 uint8_t *font = default_font(&font_size);
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1872 if (!font) {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1873 fatal_error("Failed to find default font path\n");
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1874 }
1572 5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size Michael Pavone <pavone@retrodev.com> parents: 1571 diff changeset	1875 def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, render_height() / 16, NULL);
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1581 diff changeset	1876 free(font);
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1877 nk_sdl_font_stash_end();
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1878 nk_style_set_font(context, &def_font->handle);
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1879 for (uint32_t i = 0; i < num_ui_images; i++)
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1880 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1881 ui_images[i]->ui = load_image_texture(ui_images[i]->image_data, ui_images[i]->width, ui_images[i]->height);
1570 bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1882 }
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1883 }
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1884
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1885 static void context_created(void)
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1886 {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1572 diff changeset	1887 context = nk_sdl_init(render_get_window());
1570 bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1888 texture_init();
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1889 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1890
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1891 void show_pause_menu(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1892 {
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1893 context->style.window.background = nk_rgba(0, 0, 0, 128);
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1894 context->style.window.fixed_background = nk_style_item_color(nk_rgba(0, 0, 0, 128));
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1895 current_view = view_pause;
1486 a6881d0d76d0 Pause game execution when in the new UI pause menu Michael Pavone <pavone@retrodev.com> parents: 1485 diff changeset	1896 current_system->request_exit(current_system);
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1897 }
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1898
1581 7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	1899 void show_play_view(void)
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	1900 {
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	1901 current_view = view_play;
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	1902 }
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	1903
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1904 static uint8_t active;
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1905 uint8_t is_nuklear_active(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1906 {
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1907 return active;
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1908 }
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1909
1483 001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1910 uint8_t is_nuklear_available(void)
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1911 {
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1912 if (!render_has_gl()) {
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1913 //currently no fallback if GL2 unavailable
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1914 return 0;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1915 }
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1916 char *style = tern_find_path(config, "ui\0style\0", TVAL_PTR).ptrval;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1917 if (!style) {
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1918 return 1;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1919 }
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1920 return strcmp(style, "rom") != 0;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1921 }
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1922
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1923 static void persist_config_exit(void)
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1924 {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1925 if (config_dirty) {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1926 persist_config(config);
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1927 }
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1928 }
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1929
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1930 ui_image load_ui_image(char name)
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1931 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1932 uint32_t buf_size;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1933 uint8_t buf = (uint8_t )read_bundled_file(name, &buf_size);
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1934 if (buf) {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1935 num_ui_images++;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1936 if (num_ui_images > ui_image_storage) {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1937 ui_image_storage = (ui_image_storage + 1) * 2;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1938 ui_images = realloc(ui_images, ui_image_storage * sizeof(*ui_images));
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1939 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1940 ui_image *this_image = ui_images[num_ui_images-1] = calloc(1, sizeof(ui_image));
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1941 this_image->image_data = load_png(buf, buf_size, &this_image->width, &this_image->height);
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1942 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1943 uint32_t *cur = this_image->image_data;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1944 for (int i = 0; i < this_image->width*this_image->height; i++, cur++)
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1945 {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1946 uint32_t pixel = *cur;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1947 *cur = (pixel & 0xFF00FF00) \| (pixel << 16 & 0xFF0000) \| (pixel >> 16 & 0xFF);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1948 }
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	1949 #endif
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1950 free(buf);
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1951 if (!this_image->image_data) {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1952 num_ui_images--;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1953 free(this_image);
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1954 return NULL;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1955 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1956 return this_image;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1957 } else {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1958 return NULL;
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1959 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1960 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1961
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1962 void blastem_nuklear_init(uint8_t file_loaded)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1963 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1964 context = nk_sdl_init(render_get_window());
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1965
1646 60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1966 controller_360 = load_ui_image("images/360.png");
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1967 controller_ps4 = load_ui_image("images/ps4.png");
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1968 controller_ps4_6b = load_ui_image("images/ps4_6b.png");
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1969
1570 bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1970 texture_init();
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated Michael Pavone <pavone@retrodev.com> parents: 1569 diff changeset	1971
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1972 current_view = file_loaded ? view_play : view_menu;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1973 render_set_ui_render_fun(blastem_nuklear_render);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1974 render_set_event_handler(handle_event);
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	1975 render_set_gl_context_handlers(context_destroyed, context_created);
1569 0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI Michael Pavone <pavone@retrodev.com> parents: 1568 diff changeset	1976
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1977 atexit(persist_config_exit);
1569 0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI Michael Pavone <pavone@retrodev.com> parents: 1568 diff changeset	1978
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1979 active = 1;
1486 a6881d0d76d0 Pause game execution when in the new UI pause menu Michael Pavone <pavone@retrodev.com> parents: 1485 diff changeset	1980 ui_idle_loop();
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	1981 }

Mercurial > repos > blastem

annotate nuklear_ui/blastem_nuklear.c @ 1662:35c308355bfb