repos/blastem: nuklear_ui/blastem

annotate nuklear_ui/blastem_nuklear.c @ 2022:380bc5d4a2cf

Fix format of axis mapping strings for axes that map to a d-pad

author	Michael Pavone <pavone@retrodev.com>
date	Tue, 24 Nov 2020 23:15:25 -0800
parents	e42c45ff06d5
children	237068a25523

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
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	3 #define NK_RAWFB_IMPLEMENTATION
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	4 #define RAWFB_RGBX_8888
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	5
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	6 #include <stdlib.h>
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	7 #include <limits.h>
1827 c945a25aa75c Fix windows build Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	8 #include <math.h>
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	9 #include "blastem_nuklear.h"
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	10 #include "nuklear_rawfb.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	11 #include "font.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	12 #include "../render.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	13 #include "../render_sdl.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	14 #include "../util.h"
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	15 #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	16 #include "../saves.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	17 #include "../blastem.h"
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	18 #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	19 #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	20 #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	21 #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	22 #include "../bindings.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	23
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	24 static struct nk_context *context;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	25 static struct rawfb_context *fb_context;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	26
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	27 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	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 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	30 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	31 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	32 } 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	33
2020 e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	34 static ui_image *ui_images, controller_360, *controller_ps4,
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	35 controller_ps4_6b, controller_wiiu, *controller_gen_6b;
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	36 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	37
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	38 typedef void (view_fun)(struct nk_context );
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	39 static view_fun current_view;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	40 static view_fun *previous_views;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	41 static uint32_t view_storage;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	42 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	43 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	44 static uint8_t config_dirty;
1491 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 static void push_view(view_fun new_view)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	47 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	48 if (num_prev == view_storage) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	49 view_storage = view_storage ? 2*view_storage : 2;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	50 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	51 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	52 previous_views[num_prev++] = current_view;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	53 current_view = new_view;
1841 5d10b8494b02 WIP keyboard nav for Nuklear menus Michael Pavone <pavone@retrodev.com> parents: 1831 diff changeset	54 context->input.selected_widget = 0;
1491 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 pop_view()
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 if (num_prev) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	60 current_view = previous_views[--num_prev];
1841 5d10b8494b02 WIP keyboard nav for Nuklear menus Michael Pavone <pavone@retrodev.com> parents: 1831 diff changeset	61 context->input.selected_widget = 0;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	62 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	63 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	64
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	65 static void clear_view_stack()
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	66 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	67 num_prev = 0;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	68 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	69
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	70 void view_play(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	71 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	72
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	73 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	74
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	75 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	76 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	77 static char *current_path;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	78 static dir_entry *entries;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	79 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	80 static int32_t selected_entry = -1;
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	81 static char **ext_list;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	82 static uint32_t num_exts;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	83 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	84 if (!current_path) {
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	85 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	86 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	87 if (!entries) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	88 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	89 if (entries) {
d82af64c94d2 Sort directory listing in Nuklear UI file browser Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	90 sort_dir_list(entries, num_entries);
d82af64c94d2 Sort directory listing in Nuklear UI file browser Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	91 }
2017 8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	92 if (!num_entries) {
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	93 //get_dir_list can fail if the user doesn't have permission
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	94 //for the current folder, make sure they can still navigate up
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	95 free_dir_list(entries, num_entries);
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	96 entries = calloc(1, sizeof(dir_entry));
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	97 entries[0].name = strdup("..");
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	98 entries[0].is_dir = 1;
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	99 num_entries = 1;
8e7b06ade815 Prevent user from getting stuck in directories they don't have permission to read in ROM browser Michael Pavone <pavone@retrodev.com> parents: 2016 diff changeset	100 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	101 }
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	102 if (!got_ext_list) {
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	103 ext_list = get_extension_list(config, &num_exts);
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	104 got_ext_list = 1;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	105 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	106 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	107 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	108 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	109 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	110 int32_t old_selected = selected_entry;
2016 2d8748e0ccb2 Show current path in file browser Michael Pavone <pavone@retrodev.com> parents: 2015 diff changeset	111 char *title = alloc_concat("Select ROM: ", current_path);
2d8748e0ccb2 Show current path in file browser Michael Pavone <pavone@retrodev.com> parents: 2015 diff changeset	112 if (nk_group_begin(context, title, 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	113 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	114 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	115 {
1485 369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	116 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	117 continue;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	118 }
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	119 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	120 continue;
369da70ee2c2 Filter file list in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1484 diff changeset	121 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	122 int selected = i == selected_entry;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	123 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	124 if (selected) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	125 selected_entry = i;
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	126 } else if (i == selected_entry) {
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	127 selected_entry = -1;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	128 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	129 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	130 nk_group_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	131 }
2016 2d8748e0ccb2 Show current path in file browser Michael Pavone <pavone@retrodev.com> parents: 2015 diff changeset	132 free(title);
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	133 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	134 if (nk_button_label(context, "Back")) {
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	135 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	136 }
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	137 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	138 if (selected_entry < 0) {
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	139 selected_entry = old_selected;
87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	140 }
1481 77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	141 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	142 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	143 free(current_path);
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1478 diff changeset	144 current_path = full_path;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	145 free_dir_list(entries, num_entries);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	146 entries = NULL;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	147 } else {
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	148 if(normal_open) {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	149 if (current_system) {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	150 current_system->next_rom = full_path;
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	151 current_system->request_exit(current_system);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	152 } else {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	153 init_system_with_media(full_path, SYSTEM_UNKNOWN);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	154 free(full_path);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	155 }
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	156 } else {
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	157 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	158 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	159 }
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	160 clear_view_stack();
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	161 show_play_view();
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	162 }
1554 87350caf6dab Allow double click to open ROM in file browser Michael Pavone <pavone@retrodev.com> parents: 1553 diff changeset	163 selected_entry = -1;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	164 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	165 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	166 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	167 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	168
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	169 void view_load(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	170 {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	171 view_file_browser(context, 1);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	172 }
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	173
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	174 void view_lock_on(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	175 {
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	176 view_file_browser(context, 0);
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	177 }
6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	178
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	179 void view_about(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	180 {
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	181 const char *lines[] = {
1815 7f4fac75b484 Update version number for nightly builds Mike Pavone <pavone@retrodev.com> parents: 1814 diff changeset	182 "BlastEm v0.6.3-pre",
1812 8aeac7bd9fa7 Update version number, special thanks, CHANGELOG and README in preparation for possible 0.6.2 release Michael Pavone <pavone@retrodev.com> parents: 1811 diff changeset	183 "Copyright 2012-2019 Michael Pavone",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	184 "",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	185 "BlastEm is a high performance open source",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	186 "(GPLv3) Genesis/Megadrive emulator",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	187 };
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	188 const uint32_t NUM_LINES = sizeof(lines)/sizeof(*lines);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	189 const char *thanks[] = {
1661 c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	190 "Nemesis: Documentation and test ROMs",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	191 "Charles MacDonald: Documentation",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	192 "Eke-Eke: Documentation",
1812 8aeac7bd9fa7 Update version number, special thanks, CHANGELOG and README in preparation for possible 0.6.2 release Michael Pavone <pavone@retrodev.com> parents: 1811 diff changeset	193 "Sauraen: YM2612/YM2203 Die Analysis",
8aeac7bd9fa7 Update version number, special thanks, CHANGELOG and README in preparation for possible 0.6.2 release Michael Pavone <pavone@retrodev.com> parents: 1811 diff changeset	194 "Alexey Khokholov: YM3438 Die Analysis",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	195 "Bart Trzynadlowski: Documentation",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	196 "KanedaFR: Hosting the best Sega forum",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	197 "Titan: Awesome demos and documentation",
1661 c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	198 "flamewing: BCD info and test ROM",
c3c3b65f17aa Updated special thanks Mike Pavone <pavone@retrodev.com> parents: 1660 diff changeset	199 "r57shell: Opcode size test ROM",
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	200 "micky: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	201 "Sasha: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	202 "lol-frank: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	203 "Sik: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	204 "Tim Lawrence : Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	205 "ComradeOj: Testing",
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	206 "Vladikcomper: Testing"
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	207 };
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	208 const uint32_t NUM_THANKS = sizeof(thanks)/sizeof(*thanks);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	209 uint32_t width = render_width();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	210 uint32_t height = render_height();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	211 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	212 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	213 for (uint32_t i = 0; i < NUM_LINES; i++)
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	214 {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	215 nk_label(context, lines[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	216 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	217 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	218 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	219 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	220 for (uint32_t i = 0; i < NUM_THANKS; i++)
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	221 {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	222 nk_label(context, thanks[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	223 }
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	224 nk_group_end(context);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	225 }
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, context->style.font->height * 1.75, width/3, 1);
1526 9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	227 if (nk_button_label(context, "Back")) {
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	228 pop_view();
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	229 }
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	230 nk_end(context);
9bea1a199f15 Filled in About view Michael Pavone <pavone@retrodev.com> parents: 1522 diff changeset	231 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	232 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	233
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	234 typedef struct {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	235 const char *title;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	236 view_fun next_view;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	237 } menu_item;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	238
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	239 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	240 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	241
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	242 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	243 {
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	244 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	245 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	246 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	247 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	248 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	249 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	250 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	251 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	252 }
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 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	254 {
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 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	256 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	257 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	258 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	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 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	262 }
1579 f66290afae65 Add some basic scaling to rest of UI Michael Pavone <pavone@retrodev.com> parents: 1578 diff changeset	263 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	264 if (nk_button_label(context, "Back")) {
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	265 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	266 }
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 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	268 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	269 current_system->load_state(current_system, selected_slot);
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	270 show_play_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	271 }
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	272 } 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	273 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	274 current_system->save_state = selected_slot + 1;
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	275 show_play_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	276 }
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	277 }
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	278 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	279 }
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	280 }
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	281
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	282 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	283 {
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	284 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	285 }
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	286
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	287 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	288 {
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	289 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	290 }
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	291
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	292 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	293
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 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	295 {
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	296 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	297 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	298 const uint32_t button_space = 6;
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 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	301 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	302 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	303 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	304 uint32_t left = width/2 - button_width/2;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	305
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	306 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	307 for (uint32_t i = 0; i < num_entries; i++)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	308 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	309 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	310 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	311 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	312 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	313 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	314 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	315 slots = NULL;
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	316 } else if (current_view == view_play) {
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	317 clear_view_stack();
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	318 set_content_binding_state(1);
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	319 }
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	320 } 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	321 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	322 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	323 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	324 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	325 nk_layout_space_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	326 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	327
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	328 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	329 {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	330 if (valtype != TVAL_PTR) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	331 return;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	332 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	333 tern_node **binding_lookup = data;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	334 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	335 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	336
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	337 static int32_t keycode;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	338 static const char *set_binding;
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	339 static uint8_t bind_click_release, click;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	340 char *set_label;
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	341 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	342 {
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	343 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	344 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	345 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	346
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	347 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	348 {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	349 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	350 const char *label = label_alloc;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	351 if (!label) {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	352 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	353 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	354 nk_label(context, label, NK_TEXT_LEFT);
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	355 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	356 set_binding = binds[i];
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	357 set_label = strdup(label);
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	358 bind_click_release = 0;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	359 keycode = 0;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	360 }
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	361 if (label_alloc) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	362 free(label_alloc);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	363 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	364 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	365 nk_group_end(context);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	366 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	367 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	368
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	369 static char *get_key_name(int32_t keycode)
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	370 {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	371 char *name = NULL;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	372 if (keycode > ' ' && keycode < 0x80) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	373 //key corresponds to a printable non-whitespace character
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	374 name = malloc(2);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	375 name[0] = keycode;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	376 name[1] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	377 } else {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	378 switch (keycode)
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	379 {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	380 case RENDERKEY_UP: name = "up"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	381 case RENDERKEY_DOWN: name = "down"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	382 case RENDERKEY_LEFT: name = "left"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	383 case RENDERKEY_RIGHT: name = "right"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	384 case '\r': name = "enter"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	385 case ' ': name = "space"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	386 case '\t': name = "tab"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	387 case '\b': name = "backspace"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	388 case RENDERKEY_ESC: name = "esc"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	389 case RENDERKEY_DEL: name = "delete"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	390 case RENDERKEY_LSHIFT: name = "lshift"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	391 case RENDERKEY_RSHIFT: name = "rshift"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	392 case RENDERKEY_LCTRL: name = "lctrl"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	393 case RENDERKEY_RCTRL: name = "rctrl"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	394 case RENDERKEY_LALT: name = "lalt"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	395 case RENDERKEY_RALT: name = "ralt"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	396 case RENDERKEY_HOME: name = "home"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	397 case RENDERKEY_END: name = "end"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	398 case RENDERKEY_PAGEUP: name = "pageup"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	399 case RENDERKEY_PAGEDOWN: name = "pagedown"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	400 case RENDERKEY_F1: name = "f1"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	401 case RENDERKEY_F2: name = "f2"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	402 case RENDERKEY_F3: name = "f3"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	403 case RENDERKEY_F4: name = "f4"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	404 case RENDERKEY_F5: name = "f5"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	405 case RENDERKEY_F6: name = "f6"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	406 case RENDERKEY_F7: name = "f7"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	407 case RENDERKEY_F8: name = "f8"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	408 case RENDERKEY_F9: name = "f9"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	409 case RENDERKEY_F10: name = "f10"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	410 case RENDERKEY_F11: name = "f11"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	411 case RENDERKEY_F12: name = "f12"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	412 case RENDERKEY_SELECT: name = "select"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	413 case RENDERKEY_PLAY: name = "play"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	414 case RENDERKEY_SEARCH: name = "search"; break;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	415 case RENDERKEY_BACK: name = "back"; break;
1549 577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	416 case RENDERKEY_NP0: name = "np0"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	417 case RENDERKEY_NP1: name = "np1"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	418 case RENDERKEY_NP2: name = "np2"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	419 case RENDERKEY_NP3: name = "np3"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	420 case RENDERKEY_NP4: name = "np4"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	421 case RENDERKEY_NP5: name = "np5"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	422 case RENDERKEY_NP6: name = "np6"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	423 case RENDERKEY_NP7: name = "np7"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	424 case RENDERKEY_NP8: name = "np8"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	425 case RENDERKEY_NP9: name = "np9"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	426 case RENDERKEY_NP_DIV: name = "np/"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	427 case RENDERKEY_NP_MUL: name = "np*"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	428 case RENDERKEY_NP_MIN: name = "np-"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	429 case RENDERKEY_NP_PLUS: name = "np+"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	430 case RENDERKEY_NP_ENTER: name = "npenter"; break;
577253765192 Allow numpad keys to be mapped Michael Pavone <pavone@retrodev.com> parents: 1545 diff changeset	431 case RENDERKEY_NP_STOP: name = "np."; break;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	432 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	433 if (name) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	434 name = strdup(name);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	435 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	436 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	437 return name;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	438 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	439
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	440 void view_key_bindings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	441 {
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	442 const char *controller1_binds[] = {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	443 "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	444 "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	445 "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	446 "gamepads.1.start", "gamepads.1.mode"
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	447 };
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	448 const char *controller2_binds[] = {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	449 "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	450 "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	451 "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	452 "gamepads.2.start", "gamepads.2.mode"
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	453 };
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	454 const char *general_binds[] = {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	455 "ui.exit", "ui.save_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
1910 ee178f08611b Expose vgm toggle keybind in settings UI Michael Pavone <pavone@retrodev.com> parents: 1900 diff changeset	456 "ui.screenshot", "ui.vgm_log", "ui.sms_pause", "ui.toggle_keyboard_cpatured", "ui.release_mouse"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	457 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	458 const char *general_names[] = {
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	459 "Show Menu", "Quick Save", "Toggle Fullscreen", "Soft Reset", "Reload Media",
1910 ee178f08611b Expose vgm toggle keybind in settings UI Michael Pavone <pavone@retrodev.com> parents: 1900 diff changeset	460 "Internal Screenshot", "Toggle VGM Log", "SMS Pause", "Capture Keyboard", "Release Mouse"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	461 };
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	462 const char *speed_binds[] = {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	463 "ui.next_speed", "ui.prev_speed",
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	464 "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	465 "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	466 };
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	467 const char *speed_names[] = {
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	468 "Next", "Previous",
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	469 "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	470 "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	471 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	472 const char *debug_binds[] = {
1660 c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	473 "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	474 "ui.compositing_debug", "ui.vdp_debug_mode"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	475 };
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	476 const char *debug_names[] = {
1660 c6cc2dae262f Updated binding UI to reflect new VDP debug options Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	477 "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	478 "Layer Debugger", "Cycle Mode/Pal"
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	479 };
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	480 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	481 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	482 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	483 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	484 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	485 static tern_node *binding_lookup;
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	486 if (!binding_lookup) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	487 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	488 if (bindings) {
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	489 tern_foreach(bindings, binding_loop, &binding_lookup);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	490 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	491 }
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	492 uint32_t width = render_width();
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	493 uint32_t height = render_height();
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	494 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	495 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	496 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	497 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	498 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	499 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	500 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	501 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	502 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	503 }
1520 cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	504 nk_end(context);
cb3c6395b28c Initial work on keyboard binding settings view Michael Pavone <pavone@retrodev.com> parents: 1501 diff changeset	505 }
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	506 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	507 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	508 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	509 nk_label(context, set_label, NK_TEXT_CENTERED);
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	510 if (nk_button_label(context, "Cancel") && bind_click_release) {
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	511 free(set_label);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	512 set_binding = set_label = NULL;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	513 } else if (keycode) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	514 char *name = get_key_name(keycode);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	515 if (name) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	516 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	517 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	518 if (old) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	519 uint32_t suffix_len = strlen(old) + 1;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	520 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	521 memcpy(old_path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	522 memcpy(old_path + prefix_len, old, suffix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	523 old_path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	524 tern_val old_val;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	525 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	526 free(old_val.ptrval);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	527 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	528 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	529 uint32_t suffix_len = strlen(name) + 1;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	530 char *path = malloc(prefix_len + suffix_len + 1);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	531 memcpy(path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	532 memcpy(path + prefix_len, name, suffix_len);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	533 path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	534
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	535 config_dirty = 1;
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	536 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	537 free(path);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	538 free(name);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	539 tern_free(binding_lookup);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	540 binding_lookup = NULL;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	541 }
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	542 free(set_label);
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	543 set_binding = set_label = NULL;
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	544 } else if (!click) {
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	545 bind_click_release = 1;
1521 a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	546 }
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	547 nk_end(context);
a51721408c15 More fleshed out keyboard bindings view Michael Pavone <pavone@retrodev.com> parents: 1520 diff changeset	548 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	549 }
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	550
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	551 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	552 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	553 //#define MIN_BIND_BOX_WIDTH 140
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	554 #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	555
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	556 #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	557 #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	558 #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	559 #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	560 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	561 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	562 };
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	563
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	564 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	565 [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	566 [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	567 [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	568 [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	569 [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	570 [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	571 [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	572 [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	573 [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	574 [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	575 };
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	576
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	577 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	578 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	579 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	580 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	581 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	582 } 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	583
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	584 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	585
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	586 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	587 {
1625 6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	588 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	589 if (!conf_names) {
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, "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	591 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	592 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	593 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	594 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	595 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	596 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	597 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	598 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	599 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	600 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	601 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	602 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	603 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	604 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	605 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	606 conf_names = tern_insert_ptr(conf_names, "ui.screenshot", "Take Screenshot");
1910 ee178f08611b Expose vgm toggle keybind in settings UI Michael Pavone <pavone@retrodev.com> parents: 1900 diff changeset	607 conf_names = tern_insert_ptr(conf_names, "ui.vgm_log", "Toggle VGM Log");
1625 6130e1e72151 Show user friendly names for binding options in controller bind config Michael Pavone <pavone@retrodev.com> parents: 1624 diff changeset	608 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	609 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	610 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	611 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	612 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	613 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	614 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	615 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	616 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	617 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	618 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	619 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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 }
1626 2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	628 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	629 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	630
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	631 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	632 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	633 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	634 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	635 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	636 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	637 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	638 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	639 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	640 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	641 *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	642 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	643 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	644 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	645 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	646 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	647 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	648 }
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 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	651 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	652 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	653 "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	654 "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	655 "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	656 "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	657 "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	658 "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	659 "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	660 "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	661 "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	662 "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	663 "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	664 "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	665 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	666 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	667 "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	668 "ui.reload",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	669 "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	670 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	671 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	672 "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	673 "ui.exit",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	674 "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	675 "ui.screenshot",
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	676 "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	677 "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	678 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	679 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	680 "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	681 "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	682 "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	683 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	684 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	685 "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	686 "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	687 "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	688 "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	689 "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	690 "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	691 "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	692 "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	693 "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	694 "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	695 "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	696 "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	697 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	698
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	699 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	700 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	701 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	702 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	703 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	704 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	705
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	706 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	707 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	708 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	709 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	710 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	711 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	712 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	713
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	714 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	715 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	716 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	717 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	718
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	719 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	720 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	721 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	722
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	723 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	724 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	725 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	726 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	727 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	728 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	729 } 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	730 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	731 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	732 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	733 } else {
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	734 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	735 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	736 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	737 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	738 skipped++;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	739 continue;
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	740 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	741 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	742 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	743 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button Michael Pavone <pavone@retrodev.com> parents: 1625 diff changeset	744 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	745 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	746
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	747 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	748 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	749 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	750 {
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	751 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	752 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	753 }
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 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	755 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	756 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	757 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	758 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	759 }
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	760 }
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 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	762 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	763 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	764 }
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
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 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	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 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	769 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	770 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	771 }
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 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	773 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	774 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	775 }
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 }
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
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 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	779 {
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 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	781 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	782 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	783 }
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	784 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	785 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	786 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	787 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	788 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	789 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	790 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	791 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	792 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	793 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	794 } 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	795 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	796 }
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	797 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	798 {
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	799 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	800 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	801 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	802 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	803 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	804 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	805 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	806 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	807 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	808 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	809 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	810 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	811 }
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	812 }
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes Michael Pavone <pavone@retrodev.com> parents: 1596 diff changeset	813
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	814 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	815 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	816 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	817 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	818 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	819 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	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
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 //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	823 //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	824 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	825 "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	826 "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	827 "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	828 "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	829 "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	830 "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	831 "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	832 "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	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 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	836 {
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 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	838 {
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 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	840 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	841 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	842 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	843 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	844 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	845 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	846 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	847 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	848 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	849
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 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	851 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	852 } 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	853 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	854 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	855 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	856 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	857 }
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 }
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
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 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	861 }
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 }
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
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 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	865 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	866 {
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 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	868 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	869 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	870 {
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 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	872 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	873 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	874 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	875 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	876 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	877 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	878 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	879 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	880 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	881 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	882 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	883 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	884 }
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 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	886 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	887 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	888 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	889 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	890 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	891 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	892 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	893 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	894 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	895 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	896 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	897 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	898 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	899 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	900
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 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	902 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	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 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	905 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	906 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	907 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	908 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	909 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	910 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	911
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
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 } 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	914 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	915 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	916 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	917 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	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 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	920 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	921 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	922 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	923 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	924 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	925 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	926 } 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	927 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	928 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	929 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	930 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	931 }
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 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	934 }
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 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	936 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	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 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	939 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	940 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	941 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	942 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	943
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 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	945 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	946 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	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 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	949 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	950 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	951 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	952 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	953 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	954 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	955 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	956 } 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	957 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	958 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	959 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	960 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	961 }
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	962 }
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	963 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	964 }
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	965 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	966
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	967 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	968 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	969 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	970 }
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	971 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	972 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	973 }
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	974
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	975 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	976 {
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	977 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	978 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	979 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	980 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	981 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	982
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	983 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	984 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	985 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	986 }
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	987 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	988 }
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	989
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	990 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	991 {
2020 e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	992 if (info->variant != VARIANT_NORMAL \|\| info->type == TYPE_SEGA) {
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	993 if (info->type == TYPE_PSX) {
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	994 return controller_ps4_6b;
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	995 } else {
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	996 return controller_gen_6b;
e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 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 } 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	999 return controller_ps4;
2003 4c418ee9a9d8 Added Wii U controller image Mike Pavone <pavone@retrodev.com> parents: 1980 diff changeset	1000 } else if (info->type == TYPE_NINTENDO) {
4c418ee9a9d8 Added Wii U controller image Mike Pavone <pavone@retrodev.com> parents: 1980 diff changeset	1001 return controller_wiiu;
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	1002 } 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	1003 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	1004 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1005 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	1006
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	1007 void view_controller_bindings(struct nk_context *context)
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1008 {
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1009 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	1010 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	1011 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	1012 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	1013 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	1014 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	1015 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	1016 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	1017 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	1018 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	1019 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	1020 {
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	1021 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	1022 }
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	1023 }
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	1024 }
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	1025
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	1026 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	1027 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	1028
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	1029 uint32_t avail_height = render_height() - 2 * orig_height;
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1030 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	1031 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	1032
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	1033 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	1034
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	1035 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	1036 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	1037 + 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	1038
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1039 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	1040 desired_width = render_width() - 2.5f*MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1041 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1042
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1043 if (desired_width / desired_height > controller_ratio) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1044 desired_width = desired_height * controller_ratio;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1045 } else {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1046 desired_height = desired_width / controller_ratio;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1047 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1048 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	1049 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	1050 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	1051 float img_bot = img_top + desired_height;
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1052 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	1053 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	1054 nk_image(context, controller_image->ui);
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1055
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1056 float bind_box_width = (render_width() - img_right) * 0.8f;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1057 if (bind_box_width < MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1058 bind_box_width = render_width() - img_right;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1059 if (bind_box_width > MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1060 bind_box_width = MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1061 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1062 } else if (bind_box_width > MAX_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1063 bind_box_width = MAX_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1064 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1065 float bind_box_left;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1066 if (bind_box_width >= (render_width() - img_right)) {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1067 bind_box_left = img_right;
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1068 } else {
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1069 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	1070 }
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1071
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1072 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	1073 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	1074 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1075 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1076 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1077 SDL_CONTROLLER_BUTTON_Y
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1078 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1079 } else {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1080 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	1081 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1082 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1083 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	1084 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1085 SDL_CONTROLLER_BUTTON_Y,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1086 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	1087 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1088 }
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	1089
1816 1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1090 if (selected_controller_info.variant == VARIANT_NORMAL) {
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1091 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width, 2, (int[]){
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1092 SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1093 AXIS \| SDL_CONTROLLER_AXIS_TRIGGERRIGHT
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1094 });
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1095 } else {
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1096 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1097 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1098 (int[]){
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1099 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSHOULDER : AXIS \| SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1100 AXIS \| SDL_CONTROLLER_AXIS_TRIGGERLEFT
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1101 });
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1102 }
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	1103
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	1104 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	1105 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	1106 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	1107 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	1108 });
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
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1110 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	1111 {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1112 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	1113 RIGHTSTICK \| UP,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1114 RIGHTSTICK \| DOWN,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1115 RIGHTSTICK \| LEFT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1116 RIGHTSTICK \| RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1117 SDL_CONTROLLER_BUTTON_RIGHTSTICK
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1118 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1119 }
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1120
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1121 bind_box_left -= img_right;
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1122 float dpad_left, dpad_top;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1123 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	1124 {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1125 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	1126 LEFTSTICK \| UP,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1127 LEFTSTICK \| DOWN,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1128 LEFTSTICK \| LEFT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1129 LEFTSTICK \| RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1130 SDL_CONTROLLER_BUTTON_LEFTSTICK
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1131 });
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1132 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	1133 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	1134 } else {
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1135 dpad_left = bind_box_left;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1136 dpad_top = img_top;
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1137 }
5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1138
1816 1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1139 if (selected_controller_info.variant == VARIANT_NORMAL) {
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1140 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width, 2, (int[]){
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1141 SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1142 AXIS \| SDL_CONTROLLER_AXIS_TRIGGERLEFT
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1143 });
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1144 } else {
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1145 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1146 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1147 (int[]){
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1148 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSTICK : AXIS \| SDL_CONTROLLER_AXIS_TRIGGERLEFT,
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1149 SDL_CONTROLLER_BUTTON_RIGHTSTICK
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1150 });
1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1151 }
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1152
1647 5a662692c215 Update binding UI for non-standard controller layouts Michael Pavone <pavone@retrodev.com> parents: 1646 diff changeset	1153 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	1154 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	1155 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	1156 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	1157 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	1158 });
1571 3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1159
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1160 nk_layout_space_end(context);
3def7b216a5b WIP controller binding view Michael Pavone <pavone@retrodev.com> parents: 1570 diff changeset	1161
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	1162 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	1163 nk_layout_row_static(context, orig_height + 4, (render_width() - 2*orig_height) / 4, 1);
1816 1db1510c7506 Fix bumper/trigger binding boxes for "normal" style conntrollers. Change label of "Back" button to "Save" when there are unsaved changes in controller binding Mike Pavone <pavone@retrodev.com> parents: 1815 diff changeset	1164 if (nk_button_label(context, controller_binding_changed ? "Save" : "Back")) {
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	1165 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	1166 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	1167 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	1168 }
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	1169 }
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	1170 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	1171 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1172 }
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1173
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	1174 static int current_button;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1175 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	1176 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	1177 static int hat_moved, hat_value, last_hat, last_hat_value;
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1178 static int axis_moved, axis_value, last_axis, last_axis_value;
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	1179 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	1180 static size_t mapping_pos;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1181
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1182 static void start_mapping(void)
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1183 {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1184 const char *name;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1185 mapping_string[mapping_pos++] = ',';
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1186 if (current_button != SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1187 name = SDL_GameControllerGetStringForButton(current_button);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1188 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1189 name = SDL_GameControllerGetStringForAxis(current_axis);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1190 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1191 size_t namesz = strlen(name);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1192 memcpy(mapping_string + mapping_pos, name, namesz);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1193 mapping_pos += namesz;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1194 mapping_string[mapping_pos++] = ':';
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1195 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1196
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1197 static uint8_t initial_controller_config;
1605 f7b1d983d5c0 Bump up pause between mapping inputs Michael Pavone <pavone@retrodev.com> parents: 1604 diff changeset	1198 #define QUIET_FRAMES 9
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1199 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	1200 {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1201 char buffer[512];
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1202 static int quiet, button_a = -1, button_a_axis = -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	1203 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	1204 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1205
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1206 nk_layout_space_begin(context, NK_STATIC, render_height() - context->style.font->height, 3);
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1207
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1208 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1209 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	1210 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1211 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	1212 }
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1213
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1214 float height = context->style.font->height * 1.25;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1215 float top = render_height()/2 - 1.5 * height;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1216 float width = render_width() - context->style.font->height;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1217
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1218 nk_layout_space_push(context, nk_rect(0, top, width, height));
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	1219 nk_label(context, buffer, NK_TEXT_CENTERED);
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1220 if (current_button > SDL_CONTROLLER_BUTTON_B) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1221 nk_layout_space_push(context, nk_rect(0, top + height, width, height));
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1222 nk_label(context, "OR", NK_TEXT_CENTERED);
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1223
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1224 nk_layout_space_push(context, nk_rect(0, top + 2.0 * height, width, height));
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1225 snprintf(buffer, sizeof(buffer), "Press Button %s to skip", get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_A));
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1226 nk_label(context, buffer, NK_TEXT_CENTERED);
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1227 }
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1228
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1229 nk_layout_space_end(context);
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1230 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	1231 --quiet;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1232 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1233 if (button_pressed >= 0 && button_pressed != last_button) {
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1234 if (current_button <= SDL_CONTROLLER_BUTTON_B \|\| button_pressed != button_a) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1235 start_mapping();
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1236 mapping_string[mapping_pos++] = 'b';
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1237 if (button_pressed > 9) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1238 mapping_string[mapping_pos++] = '0' + button_pressed / 10;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1239 }
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1240 mapping_string[mapping_pos++] = '0' + button_pressed % 10;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1241 last_button = button_pressed;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1242 if (current_button == SDL_CONTROLLER_BUTTON_A) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1243 button_a = button_pressed;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1244 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1245 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1246 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	1247 } 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	1248 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	1249 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	1250 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	1251 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	1252 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	1253 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	1254
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1255 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	1256 last_hat_value = hat_value;
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1257 } else if (axis_moved >= 0 && abs(axis_value) > 1000 && (
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1258 axis_moved != last_axis \|\| (
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1259 axis_value/abs(axis_value) != last_axis_value/abs(axis_value) && current_button >= SDL_CONTROLLER_BUTTON_DPAD_UP
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1260 )
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1261 )) {
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1262 if (current_button <= SDL_CONTROLLER_BUTTON_B \|\| axis_moved != button_a_axis) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1263 start_mapping();
2022 380bc5d4a2cf Fix format of axis mapping strings for axes that map to a d-pad Michael Pavone <pavone@retrodev.com> parents: 2020 diff changeset	1264 if (current_button >= SDL_CONTROLLER_BUTTON_DPAD_UP) {
380bc5d4a2cf Fix format of axis mapping strings for axes that map to a d-pad Michael Pavone <pavone@retrodev.com> parents: 2020 diff changeset	1265 mapping_string[mapping_pos++] = axis_value >= 0 ? '+' : '-';
380bc5d4a2cf Fix format of axis mapping strings for axes that map to a d-pad Michael Pavone <pavone@retrodev.com> parents: 2020 diff changeset	1266 }
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1267 mapping_string[mapping_pos++] = 'a';
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1268 if (axis_moved > 9) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1269 mapping_string[mapping_pos++] = '0' + axis_moved / 10;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1270 }
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1271 mapping_string[mapping_pos++] = '0' + axis_moved % 10;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1272 last_axis = axis_moved;
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1798 diff changeset	1273 last_axis_value = axis_value;
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1274 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1275 added_mapping = 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	1276 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1277 }
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	1278
1806 396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1279 while (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	1280 quiet = QUIET_FRAMES;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1281 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1282 current_button++;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1283 if (current_button == SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1284 current_axis = 0;
1806 396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1285 if (get_axis_label(&selected_controller_info, current_axis)) {
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1286 added_mapping = 0;
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1287 }
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1288 } else if (get_button_label(&selected_controller_info, current_button)) {
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1289 added_mapping = 0;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1290 }
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1291 } else {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1292 current_axis++;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1293 if (current_axis == SDL_CONTROLLER_AXIS_MAX) {
1666 a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1294 button_a = -1;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI Mike Pavone <pavone@retrodev.com> parents: 1664 diff changeset	1295 button_a_axis = -1;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1296 mapping_string[mapping_pos] = 0;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1297 save_controller_mapping(selected_controller, mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1298 free(mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1299 pop_view();
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1300 if (initial_controller_config) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1301 push_view(view_controller_bindings);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1302 controller_binding_changed = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1303 }
1806 396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1304 added_mapping = 0;
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1305 } else if (get_axis_label(&selected_controller_info, current_axis)) {
396369ab481a Skip buttons or axes in the mapping UI that have no label for the selected controller type Michael Pavone <pavone@retrodev.com> parents: 1804 diff changeset	1306 added_mapping = 0;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1307 }
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	1308 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1309 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1310 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	1311 hat_moved = -1;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1312 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	1313 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	1314 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1315 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	1316
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1317 static void show_mapping_view(void)
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1318 {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1319 current_button = SDL_CONTROLLER_BUTTON_A;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1320 button_pressed = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1321 last_button = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1322 last_hat = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1323 axis_moved = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1324 last_axis = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1325 last_axis_value = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1326 SDL_Joystick *joy = render_get_joystick(selected_controller);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1327 const char *name = SDL_JoystickName(joy);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1328 size_t namesz = strlen(name);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1329 mapping_string = malloc(512 + namesz);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1330 for (mapping_pos = 0; mapping_pos < namesz; mapping_pos++)
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1331 {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1332 char c = name[mapping_pos];
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1333 if (c == ',' \|\| c == '\n' \|\| c == '\r') {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1334 c = ' ';
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1335 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1336 mapping_string[mapping_pos] = c;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1337 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1338
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1339 push_view(view_controller_mappings);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1340 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1341
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1342 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	1343 {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1344 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	1345 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	1346 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	1347 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	1348 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	1349 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	1350 nk_label(context, "", NK_TEXT_CENTERED);
2015 8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1351 if (selected_controller_info.subtype == SUBTYPE_GENESIS) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1352 if (nk_button_label(context, "3 button")) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1353 selected_controller_info.variant = VARIANT_3BUTTON;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1354 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1355 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1356 if (nk_button_label(context, "Standard 6 button")) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1357 selected_controller_info.variant = VARIANT_6B_BUMPERS;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1358 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1359 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1360 if (nk_button_label(context, "6 button with 2 shoulder buttons")) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1361 selected_controller_info.variant = VARIANT_8BUTTON;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1362 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1363 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1364 } else {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1365 if (nk_button_label(context, "4 face buttons")) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1366 selected_controller_info.variant = VARIANT_NORMAL;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1367 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1368 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1369 char buffer[512];
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1370 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1371 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER),
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1372 get_axis_label(&selected_controller_info, SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1373 );
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1374 if (nk_button_label(context, buffer)) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1375 selected_controller_info.variant = VARIANT_6B_RIGHT;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1376 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1377 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1378 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1379 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_LEFTSHOULDER),
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1380 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1381 );
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1382 if (nk_button_label(context, buffer)) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1383 selected_controller_info.variant = VARIANT_6B_BUMPERS;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1384 selected = 1;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1385 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1386 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1387 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	1388 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1389 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	1390 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	1391 pop_view();
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1392 if (initial_controller_config) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1393 SDL_GameController *controller = render_get_controller(selected_controller);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1394 if (controller) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1395 push_view(view_controller_bindings);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1396 controller_binding_changed = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1397 SDL_GameControllerClose(controller);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1398 } else {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1399 show_mapping_view();
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	1400 }
1602 b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1401 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1402 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1403 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1404
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI Michael Pavone <pavone@retrodev.com> parents: 1601 diff changeset	1405 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	1406 {
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	1407 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	1408 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	1409 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	1410 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	1411 {
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	1412 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	1413 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	1414 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	1415 pop_view();
2015 8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1416 if (selected_controller_info.subtype == SUBTYPE_SATURN) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1417 selected_controller_info.variant = VARIANT_6B_BUMPERS;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1418 save_controller_info(selected_controller, &selected_controller_info);
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1419 if (initial_controller_config) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1420 SDL_GameController *controller = render_get_controller(selected_controller);
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1421 if (controller) {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1422 push_view(view_controller_bindings);
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1423 controller_binding_changed = 0;
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1424 SDL_GameControllerClose(controller);
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1425 } else {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1426 show_mapping_view();
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1427 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1428 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1429 } else {
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1430 push_view(view_controller_variant);
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there Michael Pavone <pavone@retrodev.com> parents: 2014 diff changeset	1431 }
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	1432 }
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	1433 }
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	1434 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	1435 }
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	1436 }
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	1437
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	1438 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	1439 {
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	1440 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	1441 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	1442 "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	1443 }, 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	1444 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	1445 "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	1446 }, 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	1447 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	1448 "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	1449 }, 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	1450 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	1451 "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	1452 }, 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	1453 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	1454 }
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	1455 }
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	1456
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	1457 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	1458 {
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	1459 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1460 int height = (render_height() - 2*context->style.font->height) / 5;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1461 int inner_height = height - context->style.window.spacing.y;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1462 const struct nk_user_font *font = context->style.font;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1463 int bindings_width = font->width(font->userdata, font->height, "Bindings", strlen("Bindings")) + context->style.button.padding.x * 2;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1464 int remap_width = font->width(font->userdata, font->height, "Remap", strlen("Remap")) + context->style.button.padding.x * 2;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1465 int change_type_width = font->width(font->userdata, font->height, "Change Type", strlen("Change Type")) + context->style.button.padding.x * 2;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1466 int total = bindings_width + remap_width + change_type_width;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1467 float bindings_ratio = (float)bindings_width / total;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1468 float remap_ratio = (float)remap_width / total;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1469 float change_type_ratio = (float)change_type_width / total;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1470
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1471
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1472 uint8_t found_controller = 0;
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	1473 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	1474 {
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	1475 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	1476 if (joy) {
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1477 found_controller = 1;
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	1478 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	1479 ui_image *controller_image = select_best_image(&info);
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1480 int image_width = inner_height * controller_image->width / controller_image->height;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1481 nk_layout_space_begin(context, NK_STATIC, height, INT_MAX);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1482 nk_layout_space_push(context, nk_rect(context->style.font->height / 2, 0, image_width, inner_height));
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	1483 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	1484 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	1485 } 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	1486 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	1487 }
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1488 int button_start = image_width + context->style.font->height;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1489 int button_area_width = render_width() - image_width - 2 * context->style.font->height;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1490
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1491 nk_layout_space_push(context, nk_rect(button_start, 0, button_area_width, inner_height/2));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1492 nk_label(context, info.name, NK_TEXT_CENTERED);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1493 const struct nk_user_font *font = context->style.font;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1494 if (info.type == TYPE_UNKNOWN \|\| info.type == TYPE_GENERIC_MAPPING) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1495 int button_width = font->width(font->userdata, font->height, "Configure", strlen("Configure"));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1496 nk_layout_space_push(context, nk_rect(button_start, height/2, button_width, inner_height/2));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1497 if (nk_button_label(context, "Configure")) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1498 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1499 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1500 initial_controller_config = 1;
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	1501 push_view(view_controller_type);
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1502 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1503 } else {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1504 button_area_width -= 2 * context->style.window.spacing.x;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1505 bindings_width = bindings_ratio * button_area_width;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1506 nk_layout_space_push(context, nk_rect(button_start, height/2, bindings_width, inner_height/2));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1507 if (nk_button_label(context, "Bindings")) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1508 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1509 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	1510 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	1511 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	1512 }
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1513 button_start += bindings_width + context->style.window.spacing.x;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1514 remap_width = remap_ratio * button_area_width;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1515 nk_layout_space_push(context, nk_rect(button_start, height/2, remap_width, inner_height/2));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1516 if (nk_button_label(context, "Remap")) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1517 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1518 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1519 initial_controller_config = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1520 show_mapping_view();
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1521 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1522 button_start += remap_width + context->style.window.spacing.x;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1523 change_type_width = change_type_ratio * button_area_width;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1524 nk_layout_space_push(context, nk_rect(button_start, height/2, change_type_width, inner_height/2));
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1525 if (nk_button_label(context, "Change Type")) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1526 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1527 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1528 initial_controller_config = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1529 push_view(view_controller_type);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1530 }
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	1531 }
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1532 //nk_layout_row_end(context);
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	1533 }
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	1534 }
1859 52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1535 if (!found_controller) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1536 nk_layout_row_static(context, context->style.font->height, render_width() - 2 * context->style.font->height, 1);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1537 nk_label(context, "No controllers detected", NK_TEXT_CENTERED);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration Michael Pavone <pavone@retrodev.com> parents: 1858 diff changeset	1538 }
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	1539 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	1540 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	1541 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	1542 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	1543 }
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	1544 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	1545 }
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	1546 }
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	1547
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1548 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	1549 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1550 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	1551 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1552 uint8_t newval = nk_check_label(context, "", curval);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1553 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	1554 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1555 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	1556 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1557 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1558
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1559 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	1560 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1561 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1562 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1563 uint32_t curval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1564 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	1565 uint32_t len = strlen(curstr);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1566 if (len > 11) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1567 len = 11;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1568 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1569 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	1570 memset(buffer+len, 0, sizeof(buffer)-len);
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1571 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	1572 buffer[len] = 0;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1573 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	1574 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1575 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	1576 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1577 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1578
1853 9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1579 void settings_string(struct nk_context context, char label, char path, char def)
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1580 {
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1581 nk_label(context, label, NK_TEXT_LEFT);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1582 char *curstr = tern_find_path_default(config, path, (tern_val){.ptrval = def}, TVAL_PTR).ptrval;
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1583 uint32_t len = strlen(curstr);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1584 uint32_t buffer_len = len > 100 ? len + 1 : 101;
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1585 char *buffer = malloc(buffer_len);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1586 memcpy(buffer, curstr, len);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1587 memset(buffer+len, 0, buffer_len-len);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1588 nk_edit_string(context, NK_EDIT_SIMPLE, buffer, &len, buffer_len-1, nk_filter_default);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1589 buffer[len] = 0;
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1590 if (strcmp(buffer, curstr)) {
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1591 config_dirty = 1;
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1592 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(buffer)}, TVAL_PTR);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1593 }
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1594 free(buffer);
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1595 }
9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	1596
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1597 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	1598 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1599 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	1600 int curval = curstr ? atoi(curstr) : def;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1601 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1602 int val = curval;
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1603 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	1604 if (val != curval) {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1605 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1606 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	1607 config_dirty = 1;
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1608 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	1609 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1610 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	1611
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1612 void settings_float_property(struct nk_context context, char label, char name, char path, float def, float min, float max, float step)
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1613 {
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1614 char *curstr = tern_find_path(config, path, TVAL_PTR).ptrval;
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1615 float curval = curstr ? atof(curstr) : def;
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1616 nk_label(context, label, NK_TEXT_LEFT);
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1617 float val = curval;
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1618 nk_property_float(context, name, min, &val, max, step, step);
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1619 if (val != curval) {
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1620 char buffer[64];
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1621 sprintf(buffer, "%f", val);
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1622 config_dirty = 1;
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1623 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(buffer)}, TVAL_PTR);
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1624 }
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1625 }
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1626
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1627 typedef struct {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1628 char *fragment;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1629 char *vertex;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1630 } shader_prog;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1631
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1632 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	1633 {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1634 uint32_t num_progs = *num_existing;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1635 uint32_t prog_storage = *storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1636 uint32_t starting = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1637
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1638 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	1639 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1640 continue;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1641 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1642 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	1643 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1644 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	1645 uint8_t dupe = 0;;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1646 for (uint32_t j = 0; j < starting; j++) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1647 if (!strcmp(entries[i].name, progs[j].fragment)) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1648 dupe = 1;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1649 break;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1650 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1651 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1652 if (!dupe) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1653 if (num_progs == prog_storage) {
1493 24f44f26b74d Fix buffer overrun in video settings menu Michael Pavone <pavone@retrodev.com> parents: 1492 diff changeset	1654 prog_storage = prog_storage ? prog_storage*2 : 4;
1857 1844cf5a4045 Fix buffer overrun in shader list UI Michael Pavone <pavone@retrodev.com> parents: 1855 diff changeset	1655 progs = realloc(progs, sizeof(progs) prog_storage);
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1656 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1657 progs[num_progs].vertex = NULL;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1658 progs[num_progs++].fragment = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1659 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1660 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1661 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1662 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1663
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1664 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	1665 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1666 continue;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1667 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1668 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	1669 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1670 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	1671 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	1672 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	1673 progs[j].vertex = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1674 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1675 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1676 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1677 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1678 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1679 free_dir_list(entries, num_entries);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1680 *num_existing = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1681 *storage = prog_storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1682 return progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1683 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1684
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1685 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	1686 {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1687 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	1688 size_t num_entries;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1689 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	1690 free(shader_dir);
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1691 shader_prog *progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1692 uint32_t num_progs = 0, prog_storage;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1693 if (num_entries) {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1694 progs = calloc(num_entries, sizeof(shader_prog));
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1695 prog_storage = num_entries;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1696 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	1697 } else {
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1698 progs = NULL;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1699 prog_storage = 0;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1700 }
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1681 diff changeset	1701 #ifdef DATA_PATH
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1681 diff changeset	1702 shader_dir = path_append(DATA_PATH, "shaders");
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1681 diff changeset	1703 #else
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1704 shader_dir = path_append(get_exe_dir(), "shaders");
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1681 diff changeset	1705 #endif
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1706 entries = get_dir_list(shader_dir, &num_entries);
1858 dda7479f3bbb Fix a couple of small memory leaks Michael Pavone <pavone@retrodev.com> parents: 1857 diff changeset	1707 free(shader_dir);
1492 bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1708 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	1709 *num_out = num_progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1710 return progs;
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1711 }
bdeb2a1d0385 Add shader selector to video settings Michael Pavone <pavone@retrodev.com> parents: 1491 diff changeset	1712
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1713 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	1714 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1715 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	1716 int32_t selected = -1;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1717 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1718 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1719 if (!strcmp(setting, options[i])) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1720 selected = i;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1721 break;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1722 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1723 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1724 if (selected == -1) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1725 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1726 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1727 if (!strcmp(def, options[i])) {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1728 selected = i;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1729 break;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1730 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1731 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1732 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1733 return selected;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1734 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1735
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1736 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	1737 {
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1738 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	1739 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	1740 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	1741 config_dirty = 1;
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1742 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	1743 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1744 return next;
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1745 }
756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1746
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1747 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	1748 {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1749 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	1750 }
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1751
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1752 void view_video_settings(struct nk_context *context)
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1753 {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1754 const char *vsync_opts[] = {"on", "off", "tear"};
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1755 const char *vsync_opt_names[] = {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1756 "On",
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1757 "Off",
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1758 "On, tear if late"
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1759 };
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1760 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	1761 static shader_prog *progs;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1762 static char **prog_names;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1763 static uint32_t num_progs;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1764 static uint32_t selected_prog;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1765 static int32_t selected_vsync = -1;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1766 if (selected_vsync < 0) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1767 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	1768 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1769 if(!progs) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1770 progs = get_shader_list(&num_progs);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1771 prog_names = calloc(num_progs, sizeof(char*));
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1772 for (uint32_t i = 0; i < num_progs; i++)
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1773 {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1774 prog_names[i] = basename_no_extension(progs[i].fragment);;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1775 uint32_t len = strlen(prog_names[i]);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1776 if (len > 2) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1777 prog_names[i][len-2] = 0;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1778 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1779 if (!progs[i].vertex) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1780 progs[i].vertex = strdup("default.v.glsl");
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1781 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1782 if (!strcmp(
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1783 progs[i].fragment,
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1784 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	1785 )) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1786 selected_prog = i;
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1787 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1788 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1789 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1790 uint32_t width = render_width();
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1791 uint32_t height = render_height();
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1792 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	1793 if (desired_width > width) {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1794 desired_width = width;
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	1795 }
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1796 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	1797 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	1798 settings_toggle(context, "Fullscreen", "video\0fullscreen\0", 0);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1799 settings_toggle(context, "Open GL", "video\0gl\0", 1);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1800 settings_toggle(context, "Scanlines", "video\0scanlines\0", 0);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1801 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	1802 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	1803 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	1804 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	1805 if (next_selected != selected_prog) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1806 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	1807 config_dirty = 1;
1553 723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1808 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	1809 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	1810 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1811 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	1812 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	1813 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	1814 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	1815 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	1816 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	1817 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	1818 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	1819
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1820 if (nk_button_label(context, "Back")) {
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1821 pop_view();
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1822 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1823 nk_end(context);
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1824 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1825 }
723c00950f41 Added vsync to video settings Michael Pavone <pavone@retrodev.com> parents: 1549 diff changeset	1826
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1827 void view_audio_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1828 {
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1829 const char *rates[] = {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1830 "192000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1831 "96000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1832 "48000",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1833 "44100",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1834 "22050"
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1835 };
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1836 const char *sizes[] = {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1837 "1024",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1838 "512",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1839 "256",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1840 "128",
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1841 "64"
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1842 };
1798 5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1843 const char *dac[] = {
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1844 "zero_offset",
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1845 "linear"
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1846 };
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1847 const char *dac_desc[] = {
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1848 "Zero Offset",
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1849 "Linear"
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1850 };
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1851 const uint32_t num_rates = sizeof(rates)/sizeof(*rates);
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1852 const uint32_t num_sizes = sizeof(sizes)/sizeof(*sizes);
1798 5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1853 const uint32_t num_dacs = sizeof(dac)/sizeof(*dac);
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1854 static int32_t selected_rate = -1;
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1855 static int32_t selected_size = -1;
1798 5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1856 static int32_t selected_dac = -1;
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1857 if (selected_rate < 0 \|\| selected_size < 0 \|\| selected_dac < 0) {
1499 756f8616d1bf Refactor basic settings dropdowns Michael Pavone <pavone@retrodev.com> parents: 1498 diff changeset	1858 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	1859 selected_size = find_match(sizes, num_sizes, "audio\0buffer\0", "512");
1798 5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1860 selected_dac = find_match(dac, num_dacs, "audio\0fm_dac\0", "zero_offset");
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1861 }
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1862 uint32_t width = render_width();
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1863 uint32_t height = render_height();
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1864 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	1865 if (desired_width > width) {
aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1866 desired_width = width;
aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	1867 }
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1868 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	1869 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	1870 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	1871 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	1872 settings_int_input(context, "Lowpass Cutoff Hz", "audio\0lowpass_cutoff\0", "3390");
1811 af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	1873 settings_float_property(context, "Gain (dB)", "Overall", "audio\0gain\0", 0, -30.0f, 30.0f, 0.5f);
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1874 settings_float_property(context, "", "FM", "audio\0fm_gain\0", 0, -30.0f, 30.0f, 0.5f);
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1790 diff changeset	1875 settings_float_property(context, "", "PSG", "audio\0psg_gain\0", 0, -30.0f, 30.0f, 0.5f);
1798 5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612 Michael Pavone <pavone@retrodev.com> parents: 1796 diff changeset	1876 selected_dac = settings_dropdown_ex(context, "FM DAC", dac, dac_desc, num_dacs, selected_dac, "audio\0fm_dac\0");
1494 8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1877 if (nk_button_label(context, "Back")) {
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1878 pop_view();
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1879 }
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1880 nk_end(context);
8be6ea919300 Fleshed out audio settings menu Michael Pavone <pavone@retrodev.com> parents: 1493 diff changeset	1881 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1882 }
1900 93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1883 typedef struct {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1884 const char **models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1885 const char **names;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1886 uint32_t num_models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1887 uint32_t storage;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1888 } model_foreach_state;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1889 void model_iter(char key, tern_val val, uint8_t valtype, void data)
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1890 {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1891 if (valtype != TVAL_NODE) {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1892 return;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1893 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1894 model_foreach_state *state = data;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1895 if (state->num_models == state->storage) {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1896 state->storage *= 2;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1897 state->models = realloc(state->models, state->storage * sizeof(char *));
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1898 state->names = realloc(state->names, state->storage * sizeof(char *));
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1899 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1900 char *def = strdup(key);
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1901 state->models[state->num_models] = def;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1902 state->names[state->num_models++] = tern_find_ptr_default(val.ptrval, "name", def);
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1903 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1904
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1905 typedef struct {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1906 const char **models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1907 const char **names;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1908 } models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1909
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1910 models get_models(uint32_t *num_out)
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1911 {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1912 tern_node *systems = get_systems_config();
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1913 model_foreach_state state = {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1914 .models = calloc(4, sizeof(char *)),
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1915 .names = calloc(4, sizeof(char *)),
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1916 .num_models = 0,
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1917 .storage = 4
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1918 };
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1919 tern_foreach(systems, model_iter, &state);
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1920 *num_out = state.num_models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1921 return (models){
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1922 .models = state.models,
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1923 .names = state.names
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1924 };
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1925 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1926
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1927 void view_system_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	1928 {
1568 d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1929 const char *sync_opts[] = {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1930 "video",
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1931 "audio"
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1932 };
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1933 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	1934 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	1935 if (selected_sync < 0) {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	1936 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	1937 }
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1938 const char *regions[] = {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1939 "J - Japan",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1940 "U - Americas",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1941 "E - Europe"
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1942 };
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1943 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	1944 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	1945 static int32_t selected_region = -1;
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1946 if (selected_region < 0) {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1947 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	1948 }
1900 93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1949 static const char **model_opts;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1950 static const char **model_names;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1951 static uint32_t num_models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1952 if (!model_opts) {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1953 models m = get_models(&num_models);
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1954 model_opts = m.models;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1955 model_names = m.names;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1956 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1957 static int32_t selected_model = -1;
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1958 if (selected_model < 0) {
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1959 selected_model = find_match(model_opts, num_models, "system\0model\0", "md1va3");
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1960 }
93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1961
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1962 const char *formats[] = {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1963 "native",
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1964 "gst"
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1965 };
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1966 const uint32_t num_formats = sizeof(formats)/sizeof(*formats);
1900 93960907807a Added UI for selecting configured model Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1967 static int32_t selected_format = -1;
1500 39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1968 if (selected_format < 0) {
39a199dca772 Added dropdowns for default region and savestate format Michael Pavone <pavone@retrodev.com> parents: 1499 diff changeset	1969 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	1970 }
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1971 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	1972 "zero",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1973 "random"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1974 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1975 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	1976 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	1977 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	1978 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	1979 }
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1980 const char *io_opts_1[] = {
1789 b3eb74936f18 Fix off by one in IO device UI Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1981 "none",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1982 "gamepad2.1",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1983 "gamepad3.1",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1984 "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	1985 "mouse.1",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1986 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1987 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1988 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1989 const char *io_opts_2[] = {
1789 b3eb74936f18 Fix off by one in IO device UI Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1990 "none",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1991 "gamepad2.2",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1992 "gamepad3.2",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1993 "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	1994 "mouse.1",
1501 31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1995 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1996 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1997 };
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	1998 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	1999 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	2000 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	2001 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	2002 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	2003 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	2004 }
31a2997b745e Added RAM init and IO port config to system settings menu Michael Pavone <pavone@retrodev.com> parents: 1500 diff changeset	2005
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2006 uint32_t width = render_width();
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2007 uint32_t height = render_height();
1578 aaa28c9bf67d Basic interface scaling for rest of settings UI Michael Pavone <pavone@retrodev.com> parents: 1577 diff changeset	2008 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	2009 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	2010 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
2014 9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2011
9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2012 selected_model = settings_dropdown_ex(context, "Model", model_opts, model_names, num_models, selected_model, "system\0model\0");
9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2013 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");
9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2014 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");
9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2015 selected_region = settings_dropdown_ex(context, "Default Region", region_codes, regions, num_regions, selected_region, "system\0default_region\0");
1568 d14490dee01f Add sync_source to default.cfg and the Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1554 diff changeset	2016 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	2017 settings_int_property(context, "68000 Clock Divider", "", "clocks\0m68k_divider\0", 7, 1, 53);
2014 9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2018 selected_format = settings_dropdown(context, "Save State Format", formats, num_formats, selected_format, "ui\0state_format\0");
9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2019 selected_init = settings_dropdown(context, "Initial RAM Value", ram_inits, num_inits, selected_init, "system\0ram_init\0");
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2020 settings_toggle(context, "Remember ROM Path", "ui\0remember_path\0", 1);
1852 a4cae960fd08 Allow config file to be saved with executable for "portable" setups Michael Pavone <pavone@retrodev.com> parents: 1841 diff changeset	2021 settings_toggle(context, "Save config with EXE", "ui\0config_in_exe_dir\0", 0);
1853 9b2acecf8124 Allow game save path to be edited from UI Michael Pavone <pavone@retrodev.com> parents: 1852 diff changeset	2022 settings_string(context, "Game Save Path", "ui\0save_path\0", "$USERDATA/blastem/$ROMNAME");
2014 9ca255be938d Reorder system settings so that more common options are near the top and none of the dropdowns get cut off Michael Pavone <pavone@retrodev.com> parents: 2003 diff changeset	2023
1498 050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2024 if (nk_button_label(context, "Back")) {
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2025 pop_view();
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2026 }
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2027 nk_end(context);
050a5b032bc5 Initial work on system menu Michael Pavone <pavone@retrodev.com> parents: 1494 diff changeset	2028 }
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2029 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2030
2018 193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2031 void view_confirm_reset(struct nk_context *context)
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2032 {
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2033 if (nk_begin(context, "Reset Confirm", nk_rect(0, 0, render_width(), render_height()), 0)) {
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2034 uint32_t desired_width = context->style.font->height * 20;
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2035 nk_layout_row_static(context, context->style.font->height, desired_width, 1);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2036 nk_label(context, "This will reset all settings and controller", NK_TEXT_LEFT);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2037 nk_label(context, "mappings back to the defaults.", NK_TEXT_LEFT);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2038 nk_label(context, "Are you sure you want to proceed?", NK_TEXT_LEFT);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2039 nk_layout_row_static(context, context->style.font->height * 1.5, desired_width / 2, 2);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2040 if (nk_button_label(context, "Maybe not")) {
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2041 pop_view();
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2042 }
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2043 if (nk_button_label(context, "Yep, delete it all")) {
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2044 delete_custom_config();
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2045 config = load_config();
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2046 delete_controller_info();
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2047 config_dirty = 1;
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2048 pop_view();
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2049 }
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2050 nk_end(context);
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2051 }
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2052 }
193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2053
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2054 void view_back(struct nk_context *context)
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2055 {
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2056 pop_view();
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2057 pop_view();
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2058 current_view(context);
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2059 }
e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2060
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2061 void view_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2062 {
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2063 static menu_item items[] = {
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2064 {"Key Bindings", view_key_bindings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2065 {"Controllers", view_controllers},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2066 {"Video", view_video_settings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2067 {"Audio", view_audio_settings},
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2068 {"System", view_system_settings},
2018 193b804c9845 Add a UI button to reset config to defaults Michael Pavone <pavone@retrodev.com> parents: 2017 diff changeset	2069 {"Reset to Defaults", view_confirm_reset},
1491 e890971f3757 Somewhat fleshed out video settings view Michael Pavone <pavone@retrodev.com> parents: 1490 diff changeset	2070 {"Back", view_back}
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2071 };
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2072
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2073 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	2074 menu(context, sizeof(items)/sizeof(*items), items, NULL);
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2075 nk_end(context);
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2076 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2077 }
919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2078
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	2079 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	2080 {
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	2081 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	2082 }
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	2083
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2084 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	2085 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2086 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	2087 {"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	2088 {"Load ROM", view_load},
1487 6a35815cc409 Enable lock-on in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1486 diff changeset	2089 {"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	2090 {"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	2091 {"Load State", view_load_state},
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2092 {"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	2093 {"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	2094 };
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2095
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2096 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	2097 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	2098 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	2099 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2100 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2101
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2102 void view_menu(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2103 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2104 static menu_item items[] = {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2105 {"Load ROM", view_load},
1490 919c0c33885e Initial work on settings menu Michael Pavone <pavone@retrodev.com> parents: 1487 diff changeset	2106 {"Settings", view_settings},
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2107 {"About", view_about},
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2108 {"Exit", NULL}
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2109 };
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2110
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2111 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	2112 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	2113 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2114 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2115 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2116
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2117 void blastem_nuklear_render(void)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2118 {
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2119 if (current_view != view_play) {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2120 nk_input_end(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2121 current_view(context);
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2122 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2123 fb_context->fb.pixels = render_get_framebuffer(FRAMEBUFFER_UI, &fb_context->fb.pitch);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2124 nk_rawfb_render(fb_context, nk_rgb(0,0,0), 0);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2125 render_framebuffer_updated(FRAMEBUFFER_UI, render_width());
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2126 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2127 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2128 nk_sdl_render(NK_ANTI_ALIASING_ON, 512 * 1024, 128 * 1024);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2129 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2130 }
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2131 nk_input_begin(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2132 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2133 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2134
1486 a6881d0d76d0 Pause game execution when in the new UI pause menu Michael Pavone <pavone@retrodev.com> parents: 1485 diff changeset	2135 void ui_idle_loop(void)
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2136 {
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1859 diff changeset	2137 render_enable_gamepad_events(1);
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	2138 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	2139 static uint32_t last;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2140 while (current_view != view_play)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2141 {
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	2142 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	2143 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	2144 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	2145 }
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	2146 last = current;
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2147 render_update_display();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2148 }
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	2149 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	2150 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	2151 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	2152 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	2153 }
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1859 diff changeset	2154 render_enable_gamepad_events(0);
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2155 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2156 static void handle_event(SDL_Event *event)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2157 {
1522 63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	2158 if (event->type == SDL_KEYDOWN) {
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	2159 keycode = event->key.keysym.sym;
63659fb92db4 Key binding menu is now functional Michael Pavone <pavone@retrodev.com> parents: 1521 diff changeset	2160 }
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	2161 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	2162 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	2163 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one Michael Pavone <pavone@retrodev.com> parents: 1599 diff changeset	2164 else if (event->type == SDL_JOYHATMOTION) {
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2165 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	2166 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	2167 }
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2168 else if (event->type == SDL_JOYAXISMOTION) {
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2169 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	2170 axis_moved = event->jaxis.axis;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2171 axis_value = event->jaxis.value;
da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2172 }
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2173 } else if (event->type == SDL_MOUSEBUTTONDOWN && event->button.button == 0) {
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2174 click = 1;
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2175 } else if (event->type == SDL_MOUSEBUTTONUP && event->button.button == 0) {
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2176 click = 0;
1601 da04dd9c89ad SDL2 mapping UI now handles axes Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	2177 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2178 nk_sdl_handle_event(event);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2179 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2180
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2181 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	2182 {
1681 3f1c8258e20f Hopefully fix Nuklear assert when loading ROM after changing video settings that some users are reporting Michael Pavone <pavone@retrodev.com> parents: 1675 diff changeset	2183 if (context)
3f1c8258e20f Hopefully fix Nuklear assert when loading ROM after changing video settings that some users are reporting Michael Pavone <pavone@retrodev.com> parents: 1675 diff changeset	2184 {
3f1c8258e20f Hopefully fix Nuklear assert when loading ROM after changing video settings that some users are reporting Michael Pavone <pavone@retrodev.com> parents: 1675 diff changeset	2185 nk_sdl_shutdown();
3f1c8258e20f Hopefully fix Nuklear assert when loading ROM after changing video settings that some users are reporting Michael Pavone <pavone@retrodev.com> parents: 1675 diff changeset	2186 context = NULL;
3f1c8258e20f Hopefully fix Nuklear assert when loading ROM after changing video settings that some users are reporting Michael Pavone <pavone@retrodev.com> parents: 1675 diff changeset	2187 }
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2188 }
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	2189
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2190 static void fb_resize(void)
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2191 {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2192 nk_rawfb_resize_fb(fb_context, NULL, render_width(), render_height(), 0);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2193 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2194
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2195 #ifndef DISABLE_OPENGL
1609 9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	2196 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	2197 {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers Michael Pavone <pavone@retrodev.com> parents: 1606 diff changeset	2198 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	2199 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	2200 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	2201 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	2202 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	2203 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	2204 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	2205 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2206 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	2207 #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	2208 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	2209 #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	2210 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	2211 }
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2212 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2213
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2214 static struct nk_image load_image_rawfb(uint32_t *buf, uint32_t width, uint32_t height)
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2215 {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2216 struct rawfb_image *fbimg = calloc(1, sizeof(struct rawfb_image));
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2217 fbimg->pixels = buf;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2218 fbimg->pitch = width * sizeof(uint32_t);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2219 fbimg->w = width;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2220 fbimg->h = height;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2221 fbimg->format = NK_FONT_ATLAS_RGBA32;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2222 return nk_image_ptr(fbimg);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2223 }
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	2224
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	2225 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	2226 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2227 struct nk_font_atlas *atlas;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2228 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2229 nk_rawfb_font_stash_begin(fb_context, &atlas);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2230 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2231 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2232 nk_sdl_font_stash_begin(&atlas);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2233 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2234 }
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	2235 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	2236 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	2237 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	2238 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	2239 }
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	2240 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	2241 free(font);
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2242 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2243 nk_rawfb_font_stash_end(fb_context);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2244 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2245 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2246 nk_sdl_font_stash_end();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2247 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2248 }
1476 0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2249 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	2250 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	2251 {
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2252 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2253 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2254 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2255 ui_images[i]->ui = load_image_rawfb(ui_images[i]->image_data, ui_images[i]->width, ui_images[i]->height);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2256 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2257 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2258 ui_images[i]->ui = load_image_texture(ui_images[i]->image_data, ui_images[i]->width, ui_images[i]->height);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2259 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2260 #endif
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	2261 }
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	2262 }
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	2263
1811 af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2264 static void style_init(void)
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2265 {
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2266 context->style.checkbox.padding.x = render_height() / 120;
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2267 context->style.checkbox.padding.y = render_height() / 120;
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2268 context->style.checkbox.border = render_height() / 240;
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2269 context->style.checkbox.cursor_normal.type = NK_STYLE_ITEM_COLOR;
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2270 context->style.checkbox.cursor_normal.data.color = (struct nk_color){
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2271 .r = 255, .g = 128, .b = 0, .a = 255
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2272 };
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2273 context->style.checkbox.cursor_hover = context->style.checkbox.cursor_normal;
1854 58b6f5d918f4 Minor improvements to keyboard navigation Michael Pavone <pavone@retrodev.com> parents: 1853 diff changeset	2274 context->style.property.inc_button.text_hover = (struct nk_color){
58b6f5d918f4 Minor improvements to keyboard navigation Michael Pavone <pavone@retrodev.com> parents: 1853 diff changeset	2275 .r = 255, .g = 128, .b = 0, .a = 255
58b6f5d918f4 Minor improvements to keyboard navigation Michael Pavone <pavone@retrodev.com> parents: 1853 diff changeset	2276 };
58b6f5d918f4 Minor improvements to keyboard navigation Michael Pavone <pavone@retrodev.com> parents: 1853 diff changeset	2277 context->style.property.dec_button.text_hover = context->style.property.inc_button.text_hover;
1855 92532eb6986d Make combo boxes keyboard navigable Michael Pavone <pavone@retrodev.com> parents: 1854 diff changeset	2278 context->style.combo.button.text_hover = context->style.property.inc_button.text_hover;
1811 af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2279 }
af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2280
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	2281 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	2282 {
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	2283 context = nk_sdl_init(render_get_window());
1831 478ab1f4ff94 Fix regression in handling of context recreation in Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1827 diff changeset	2284 nk_sdl_device_create();
1811 af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2285 style_init();
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	2286 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	2287 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu Michael Pavone <pavone@retrodev.com> parents: 1475 diff changeset	2288
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2289 void show_pause_menu(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2290 {
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2291 if (current_view == view_play) {
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2292 set_content_binding_state(0);
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2293 context->style.window.background = nk_rgba(0, 0, 0, 128);
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2294 context->style.window.fixed_background = nk_style_item_color(nk_rgba(0, 0, 0, 128));
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2295 current_view = view_pause;
1841 5d10b8494b02 WIP keyboard nav for Nuklear menus Michael Pavone <pavone@retrodev.com> parents: 1831 diff changeset	2296 context->input.selected_widget = 0;
1980 81df9aa2de9b Less hacky run on audio thread mode Michael Pavone <pavone@retrodev.com> parents: 1910 diff changeset	2297 system_request_exit(current_system, 1);
1814 8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2298 } else if (current_system && !set_binding) {
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2299 clear_view_stack();
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2300 show_play_view();
8db3c043be00 Fix crash when pressing escape with no ROM loaded. Fix immediate cancel in keybinding view when mouse happens to be where the cancel button appears Mike Pavone <pavone@retrodev.com> parents: 1812 diff changeset	2301 }
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2302 }
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2303
1581 7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	2304 void show_play_view(void)
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	2305 {
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2306 set_content_binding_state(1);
1581 7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	2307 current_view = view_play;
1841 5d10b8494b02 WIP keyboard nav for Nuklear menus Michael Pavone <pavone@retrodev.com> parents: 1831 diff changeset	2308 context->input.selected_widget = 0;
1581 7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	2309 }
7121daaa48c2 Fix drag and drop when using Nuklear UI Michael Pavone <pavone@retrodev.com> parents: 1579 diff changeset	2310
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2311 static uint8_t active;
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2312 uint8_t is_nuklear_active(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2313 {
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2314 return active;
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2315 }
1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2316
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	2317 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	2318 {
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2319 /*if (!render_has_gl()) {
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	2320 //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	2321 return 0;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2322 }*/
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	2323 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	2324 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	2325 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	2326 }
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	2327 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	2328 }
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	2329
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2330 static void persist_config_exit(void)
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2331 {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2332 if (config_dirty) {
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2333 persist_config(config);
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2334 }
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2335 }
69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2336
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	2337 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	2338 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	2339 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	2340 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	2341 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	2342 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	2343 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	2344 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	2345 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	2346 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	2347 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	2348 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	2349 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2350 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	2351 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	2352 {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2353 uint32_t pixel = *cur;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2354 *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	2355 }
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1647 diff changeset	2356 #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	2357 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	2358 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	2359 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	2360 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	2361 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	2362 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	2363 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	2364 } 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	2365 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	2366 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	2367 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code Michael Pavone <pavone@retrodev.com> parents: 1645 diff changeset	2368
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2369 void blastem_nuklear_init(uint8_t file_loaded)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2370 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2371 context = nk_sdl_init(render_get_window());
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2372 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2373 if (render_has_gl()) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2374 nk_sdl_device_create();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2375 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2376 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2377 fb_context = nk_rawfb_init(NULL, context, render_width(), render_height(), 0);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2378 render_set_ui_fb_resize_handler(fb_resize);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2379 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2380 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1816 diff changeset	2381 #endif
1811 af14c21939f6 Add unit to gain label and change color of checkbox selected state to hopefully make it more clear Michael Pavone <pavone@retrodev.com> parents: 1807 diff changeset	2382 style_init();
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2383
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	2384 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	2385 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	2386 controller_ps4_6b = load_ui_image("images/ps4_6b.png");
2003 4c418ee9a9d8 Added Wii U controller image Mike Pavone <pavone@retrodev.com> parents: 1980 diff changeset	2387 controller_wiiu = load_ui_image("images/wiiu.png");
2020 e42c45ff06d5 Add Genesis 6-button contoller image Michael Pavone <pavone@retrodev.com> parents: 2018 diff changeset	2388 controller_gen_6b = load_ui_image("images/genesis_6b.png");
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	2389
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	2390 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	2391
1672 12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2392 if (file_loaded) {
12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2393 current_view = view_play;
12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2394 } else {
12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2395 current_view = view_menu;
12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2396 set_content_binding_state(0);
12d0c7c4ad80 Disable most bindings when UI is active Michael Pavone <pavone@retrodev.com> parents: 1666 diff changeset	2397 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2398 render_set_ui_render_fun(blastem_nuklear_render);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2399 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	2400 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	2401
1577 69d624271cf8 Persist config on exit if config has changed Michael Pavone <pavone@retrodev.com> parents: 1575 diff changeset	2402 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	2403
1477 1cdd7f492af8 Pause menu now triggered on ui.exit event Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	2404 active = 1;
1486 a6881d0d76d0 Pause game execution when in the new UI pause menu Michael Pavone <pavone@retrodev.com> parents: 1485 diff changeset	2405 ui_idle_loop();
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: diff changeset	2406 }

Mercurial > repos > blastem

annotate nuklear_ui/blastem_nuklear.c @ 2022:380bc5d4a2cf