Mercurial > repos > blastem

annotate nuklear_ui/blastem_nuklear.c @ 2313:ef5dc4d02d27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix goof in right analog stick mapping UI
author Michael Pavone <pavone@retrodev.com>
date Thu, 30 Mar 2023 20:20:25 -0700
parents 3f2ecd156453
children e836cf11783b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
34 static ui_image **ui_images, *controller_360, *controller_ps4,
2020
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 {
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
72
1474
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
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
75 static char *browser_cur_path;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
76 static const char *browser_label;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
77 static const char *browser_setting_path;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
78 static const char **browser_ext_list;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
79 static uint32_t browser_num_exts;
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
80 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
81 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
82 static dir_entry *entries;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
83 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
84 static int32_t selected_entry = -1;
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
85 static const char **ext_list;
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
86 static uint32_t num_exts;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
87 static uint8_t got_ext_list;
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
88 if (!browser_cur_path) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
89 get_initial_browse_path(&browser_cur_path);
1481
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
90 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
91 if (!entries) {
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
92 entries = get_dir_list(browser_cur_path, &num_entries);
1484
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
93 if (entries) {
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
94 sort_dir_list(entries, num_entries);
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
95 }
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
96 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
97 //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
98 //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
99 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
100 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
101 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
102 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
103 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
104 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
105 }
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
106 if (!browser_ext_list) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
107 if (!got_ext_list) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
108 ext_list = (const char **)get_extension_list(config, &num_exts);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
109 got_ext_list = 1;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
110 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
111 browser_ext_list = ext_list;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
112 browser_num_exts = num_exts;
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
113 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
114 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
115 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
116 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
117 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
118 int32_t old_selected = selected_entry;
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
119 const char *parts[] = {browser_label, ": ", browser_cur_path};
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
120 char *title = alloc_concat_m(3, parts);
2016
2d8748e0ccb2 Show current path in file browser
Michael Pavone <pavone@retrodev.com>
parents: 2015
diff changeset
121 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
122 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
123 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
124 {
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
125 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
126 continue;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
127 }
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
128 if (browser_num_exts && !entries[i].is_dir && !path_matches_extensions(entries[i].name, browser_ext_list, browser_num_exts)) {
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
129 continue;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
130 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
131 int selected = i == selected_entry;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
132 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
133 if (selected) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
134 selected_entry = i;
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
135 } else if (i == selected_entry) {
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
136 selected_entry = -1;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
137 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
138 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
139 nk_group_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
140 }
2016
2d8748e0ccb2 Show current path in file browser
Michael Pavone <pavone@retrodev.com>
parents: 2015
diff changeset
141 free(title);
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
142 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
143 if (nk_button_label(context, "Back")) {
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
144 browser_ext_list = NULL;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
145 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
146 }
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
147 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
148 if (selected_entry < 0) {
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
149 selected_entry = old_selected;
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
150 }
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
151 char *full_path = path_append(browser_cur_path, entries[selected_entry].name);
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
152 if (entries[selected_entry].is_dir) {
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
153 free(browser_cur_path);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
154 browser_cur_path = full_path;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
155 free_dir_list(entries, num_entries);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
156 entries = NULL;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
157 } else {
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
158 if(normal_open) {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
159 if (current_system) {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
160 current_system->next_rom = full_path;
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
161 current_system->request_exit(current_system);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
162 } else {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
163 init_system_with_media(full_path, SYSTEM_UNKNOWN);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
164 free(full_path);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
165 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
166
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
167 clear_view_stack();
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
168 show_play_view();
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
169 } else if (browser_setting_path) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
170 config = tern_insert_path(config, browser_setting_path, (tern_val){.ptrval = full_path}, TVAL_PTR);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
171 config_dirty = 1;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
172 browser_ext_list = NULL;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
173 pop_view();
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
174 } else {
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
175 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
176 free(full_path);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
177
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
178 clear_view_stack();
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
179 show_play_view();
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
180 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
181 }
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
182 selected_entry = -1;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
183 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
184 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
185 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
186 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
187
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
188 void view_load(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
189 {
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
190 browser_label = "Select ROM";
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
191 view_file_browser(context, 1);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
192 }
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
193
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
194 void view_lock_on(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
195 {
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
196 browser_label = "Select ROM";
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
197 view_file_browser(context, 0);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
198 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
199
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
200 void view_file_settings(struct nk_context *context)
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
201 {
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
202 view_file_browser(context, 0);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
203 }
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
204
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
205 void view_about(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
206 {
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
207 const char *lines[] = {
1815
7f4fac75b484 Update version number for nightly builds
Mike Pavone <pavone@retrodev.com>
parents: 1814
diff changeset
208 "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
209 "Copyright 2012-2019 Michael Pavone",
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
210 "",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
211 "BlastEm is a high performance open source",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
212 "(GPLv3) Genesis/Megadrive emulator",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
213 };
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
214 const uint32_t NUM_LINES = sizeof(lines)/sizeof(*lines);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
215 const char *thanks[] = {
1661
c3c3b65f17aa Updated special thanks
Mike Pavone <pavone@retrodev.com>
parents: 1660
diff changeset
216 "Nemesis: Documentation and test ROMs",
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
217 "Charles MacDonald: Documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
218 "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
219 "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
220 "Alexey Khokholov: YM3438 Die Analysis",
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
221 "Bart Trzynadlowski: Documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
222 "KanedaFR: Hosting the best Sega forum",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
223 "Titan: Awesome demos and documentation",
1661
c3c3b65f17aa Updated special thanks
Mike Pavone <pavone@retrodev.com>
parents: 1660
diff changeset
224 "flamewing: BCD info and test ROM",
c3c3b65f17aa Updated special thanks
Mike Pavone <pavone@retrodev.com>
parents: 1660
diff changeset
225 "r57shell: Opcode size test ROM",
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
226 "micky: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
227 "Sasha: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
228 "lol-frank: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
229 "Sik: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
230 "Tim Lawrence : Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
231 "ComradeOj: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
232 "Vladikcomper: Testing"
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
233 };
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
234 const uint32_t NUM_THANKS = sizeof(thanks)/sizeof(*thanks);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
235 uint32_t width = render_width();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
236 uint32_t height = render_height();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
237 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
238 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
239 for (uint32_t i = 0; i < NUM_LINES; i++)
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
240 {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
241 nk_label(context, lines[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
242 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
243 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
244 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
245 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
246 for (uint32_t i = 0; i < NUM_THANKS; i++)
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
247 {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
248 nk_label(context, thanks[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
249 }
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
250 nk_group_end(context);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
251 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
252 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
253 if (nk_button_label(context, "Back")) {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
254 pop_view();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
255 }
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
256 nk_end(context);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
257 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
258 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
259
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
260 typedef struct {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
261 const char *title;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
262 view_fun next_view;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
263 } menu_item;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
264
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
265 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
266 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
267
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
268 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
269 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
270 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
271 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
272 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
273 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
274 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
275 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
276 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
277 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
278 }
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 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
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 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
282 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
283 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
284 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
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 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
288 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
289 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
290 if (nk_button_label(context, "Back")) {
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
291 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
292 }
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
293 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
294 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
295 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
296 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
297 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
298 } 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
299 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
300 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
301 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
302 }
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
303 }
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
304 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
305 }
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
306 }
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
307
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
308 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
309 {
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
310 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
311 }
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
312
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
313 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
314 {
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
315 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
316 }
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
317
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
318 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
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 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
321 {
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
322 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
323 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
324 const uint32_t button_space = 6;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
325
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
326 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
327 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
328 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
329 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
330 uint32_t left = width/2 - button_width/2;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
331
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
332 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
333 for (uint32_t i = 0; i < num_entries; i++)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
334 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
335 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
336 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
337 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
338 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
339 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
340 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
341 slots = NULL;
1672
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
342 } 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
343 clear_view_stack();
1672
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
344 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
345 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
346 } 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
347 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
348 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
349 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
350 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
351 nk_layout_space_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
352 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
353
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
354 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
355 {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
356 if (valtype != TVAL_PTR) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
357 return;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
358 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
359 tern_node **binding_lookup = data;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
360 *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
361 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
362
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
363 static int32_t keycode;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
364 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
365 static uint8_t bind_click_release, click;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
366 char *set_label;
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
367 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
368 {
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
369 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
370 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
371 nk_layout_row_static(context, context->style.font->height, render_width()/2 - 80, 2);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
372
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
373 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
374 {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
375 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
376 const char *label = label_alloc;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
377 if (!label) {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
378 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
379 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
380 nk_label(context, label, NK_TEXT_LEFT);
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
381 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
382 set_binding = binds[i];
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
383 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
384 bind_click_release = 0;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
385 keycode = 0;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
386 }
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
387 if (label_alloc) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
388 free(label_alloc);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
389 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
390 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
391 nk_group_end(context);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
392 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
393 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
394
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
395 static char *get_key_name(int32_t keycode)
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
396 {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
397 char *name = NULL;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
398 if (keycode > ' ' && keycode < 0x80) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
399 //key corresponds to a printable non-whitespace character
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
400 name = malloc(2);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
401 name[0] = keycode;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
402 name[1] = 0;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
403 } else {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
404 switch (keycode)
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
405 {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
406 case RENDERKEY_UP: name = "up"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
407 case RENDERKEY_DOWN: name = "down"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
408 case RENDERKEY_LEFT: name = "left"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
409 case RENDERKEY_RIGHT: name = "right"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
410 case '\r': name = "enter"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
411 case ' ': name = "space"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
412 case '\t': name = "tab"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
413 case '\b': name = "backspace"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
414 case RENDERKEY_ESC: name = "esc"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
415 case RENDERKEY_DEL: name = "delete"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
416 case RENDERKEY_LSHIFT: name = "lshift"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
417 case RENDERKEY_RSHIFT: name = "rshift"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
418 case RENDERKEY_LCTRL: name = "lctrl"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
419 case RENDERKEY_RCTRL: name = "rctrl"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
420 case RENDERKEY_LALT: name = "lalt"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
421 case RENDERKEY_RALT: name = "ralt"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
422 case RENDERKEY_HOME: name = "home"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
423 case RENDERKEY_END: name = "end"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
424 case RENDERKEY_PAGEUP: name = "pageup"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
425 case RENDERKEY_PAGEDOWN: name = "pagedown"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
426 case RENDERKEY_F1: name = "f1"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
427 case RENDERKEY_F2: name = "f2"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
428 case RENDERKEY_F3: name = "f3"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
429 case RENDERKEY_F4: name = "f4"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
430 case RENDERKEY_F5: name = "f5"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
431 case RENDERKEY_F6: name = "f6"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
432 case RENDERKEY_F7: name = "f7"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
433 case RENDERKEY_F8: name = "f8"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
434 case RENDERKEY_F9: name = "f9"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
435 case RENDERKEY_F10: name = "f10"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
436 case RENDERKEY_F11: name = "f11"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
437 case RENDERKEY_F12: name = "f12"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
438 case RENDERKEY_SELECT: name = "select"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
439 case RENDERKEY_PLAY: name = "play"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
440 case RENDERKEY_SEARCH: name = "search"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
441 case RENDERKEY_BACK: name = "back"; break;
1549
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
442 case RENDERKEY_NP0: name = "np0"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
443 case RENDERKEY_NP1: name = "np1"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
444 case RENDERKEY_NP2: name = "np2"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
445 case RENDERKEY_NP3: name = "np3"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
446 case RENDERKEY_NP4: name = "np4"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
447 case RENDERKEY_NP5: name = "np5"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
448 case RENDERKEY_NP6: name = "np6"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
449 case RENDERKEY_NP7: name = "np7"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
450 case RENDERKEY_NP8: name = "np8"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
451 case RENDERKEY_NP9: name = "np9"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
452 case RENDERKEY_NP_DIV: name = "np/"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
453 case RENDERKEY_NP_MUL: name = "np*"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
454 case RENDERKEY_NP_MIN: name = "np-"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
455 case RENDERKEY_NP_PLUS: name = "np+"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
456 case RENDERKEY_NP_ENTER: name = "npenter"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
457 case RENDERKEY_NP_STOP: name = "np."; break;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
458 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
459 if (name) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
460 name = strdup(name);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
461 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
462 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
463 return name;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
464 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
465
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
466 void view_key_bindings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
467 {
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
468 static const char *controller1_binds[] = {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
469 "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
470 "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
471 "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
472 "gamepads.1.start", "gamepads.1.mode"
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
473 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
474 static const char *controller2_binds[] = {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
475 "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
476 "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
477 "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
478 "gamepads.2.start", "gamepads.2.mode"
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
479 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
480 static const char *general_binds[] = {
2306
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
481 "ui.menu", "ui.save_state", "ui.load_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
482 "ui.screenshot", "ui.vgm_log", "ui.sms_pause", "ui.toggle_keyboard_captured", "ui.release_mouse", "ui.exit"
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
483 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
484 static const char *general_names[] = {
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
485 "Show Menu", "Quick Save", "Quick Load", "Toggle Fullscreen", "Soft Reset", "Reload Media",
2306
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
486 "Internal Screenshot", "Toggle VGM Log", "SMS Pause", "Capture Keyboard", "Release Mouse", "Exit"
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
487 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
488 static const char *speed_binds[] = {
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
489 "ui.next_speed", "ui.prev_speed",
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
490 "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
491 "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
492 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
493 static const char *speed_names[] = {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
494 "Next", "Previous",
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
495 "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
496 "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
497 };
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
498 static const char *debug_binds[] = {
1660
c6cc2dae262f Updated binding UI to reflect new VDP debug options
Mike Pavone <pavone@retrodev.com>
parents: 1658
diff changeset
499 "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
500 "ui.compositing_debug", "ui.vdp_debug_mode"
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
501 };
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
502 const char *debug_names[] = {
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
503 "CPU Debugger", "Plane Debugger", "VRAM Debugger", "CRAM Debugger",
1660
c6cc2dae262f Updated binding UI to reflect new VDP debug options
Mike Pavone <pavone@retrodev.com>
parents: 1658
diff changeset
504 "Layer Debugger", "Cycle Mode/Pal"
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
505 };
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
506 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
507 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
508 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
509 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
510 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
511 static tern_node *binding_lookup;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
512 if (!binding_lookup) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
513 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
514 if (bindings) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
515 tern_foreach(bindings, binding_loop, &binding_lookup);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
516 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
517 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
518 uint32_t width = render_width();
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
519 uint32_t height = render_height();
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
520 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
521 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
522 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
523 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
524 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
525 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
526 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
527 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
528 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
529 }
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
530 nk_end(context);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
531 }
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
532 if (set_binding && nk_begin(context, "Set Binding", nk_rect(width/4, height/4, width/2/*width*3/4*/, height/2), NK_WINDOW_TITLE | NK_WINDOW_BORDER)) {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
533 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
534 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
535 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
536 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
537 free(set_label);
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
538 set_binding = set_label = NULL;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
539 } else if (keycode) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
540 char *name = get_key_name(keycode);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
541 if (name) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
542 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
543 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
544 if (old) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
545 uint32_t suffix_len = strlen(old) + 1;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
546 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
547 memcpy(old_path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
548 memcpy(old_path + prefix_len, old, suffix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
549 old_path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
550 tern_val old_val;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
551 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
552 free(old_val.ptrval);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
553 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
554 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
555 uint32_t suffix_len = strlen(name) + 1;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
556 char *path = malloc(prefix_len + suffix_len + 1);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
557 memcpy(path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
558 memcpy(path + prefix_len, name, suffix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
559 path[prefix_len + suffix_len] = 0;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
560
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
561 config_dirty = 1;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
562 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
563 free(path);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
564 free(name);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
565 tern_free(binding_lookup);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
566 binding_lookup = NULL;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
567 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
568 free(set_label);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
569 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
570 } 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
571 bind_click_release = 1;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
572 }
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
573 nk_end(context);
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
574 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
575 }
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
576
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
577 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
578 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
579 //#define MIN_BIND_BOX_WIDTH 140
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
580 #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
581
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
582 #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
583 #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
584 #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
585 #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
586 enum {
2310
b0ec82a59472 Fix analog stick directions being messed up in controller binding UI
Michael Pavone <pavone@retrodev.com>
parents: 2308
diff changeset
587 DOWN, UP,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
588 };
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
589
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
590 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
591 [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
592 [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
593 [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
594 [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
595 [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
596 [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
597 [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
598 [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
599 [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
600 [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
601 };
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
602
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
603 typedef struct {
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
604 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
605 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
606 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
607 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
608 } 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
609
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
610 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
611
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
612 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
613 {
1625
6130e1e72151 Show user friendly names for binding options in controller bind config
Michael Pavone <pavone@retrodev.com>
parents: 1624
diff changeset
614 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
615 if (!conf_names) {
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, "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
617 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
618 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
619 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
620 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
621 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
622 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
623 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
624 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
625 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
626 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
627 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
628 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
629 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
630 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
631 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
632 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
633 conf_names = tern_insert_ptr(conf_names, "ui.vgm_log", "Toggle VGM Log");
2306
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
634 conf_names = tern_insert_ptr(conf_names, "ui.menu", "Show Menu");
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
635 conf_names = tern_insert_ptr(conf_names, "ui.exit", "Exit");
1625
6130e1e72151 Show user friendly names for binding options in controller bind config
Michael Pavone <pavone@retrodev.com>
parents: 1624
diff changeset
636 conf_names = tern_insert_ptr(conf_names, "ui.save_state", "Quick Save");
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
637 conf_names = tern_insert_ptr(conf_names, "ui.load_state", "Quick Load");
1625
6130e1e72151 Show user friendly names for binding options in controller bind config
Michael Pavone <pavone@retrodev.com>
parents: 1624
diff changeset
638 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
639 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
640 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
641 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
642 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
643 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
644 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
645 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
646 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
647 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
648 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
649 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
650 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
651 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
652 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
653 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
654 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
655 }
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
656 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
657 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
658
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
659 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
660 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
661 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
662 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
663 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
664 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
665 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
666 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
667 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
668 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
669 *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
670 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
671 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
672 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
673 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
674 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
675 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
676 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
677
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
678 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
679 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
680 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
681 "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
682 "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
683 "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
684 "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
685 "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
686 "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
687 "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
688 "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
689 "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
690 "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
691 "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
692 "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
693 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
694 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
695 "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
696 "ui.reload",
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
697 "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
698 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
699 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
700 "ui.save_state",
2162
1270fe86eb89 Add Quick Load binding
Michael Pavone <pavone@retrodev.com>
parents: 2156
diff changeset
701 "ui.load_state",
2306
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
702 "ui.menu",
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
703 "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
704 "ui.screenshot",
2306
62f316b76e9a Migrate ui.exit to ui.menu and create a new ui.exit for quitting
Michael Pavone <pavone@retrodev.com>
parents: 2299
diff changeset
705 "ui.exit",
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
706 "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
707 "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
708 };
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
709 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
710 "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
711 "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
712 "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
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 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
715 "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
716 "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
717 "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
718 "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
719 "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
720 "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
721 "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
722 "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
723 "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
724 "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
725 "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
726 "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
727 };
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
728
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
729 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
730 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
731 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
732 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
733 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
734 bind_option_group(context, "Speed Control", speeds, sizeof(speeds)/sizeof(*speeds));
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
735
2311
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
736 nk_layout_row_static(context, context->style.font->height, (render_width() - 80)/4, 2);
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
737 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
738 pop_view();
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
739 }
2311
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
740 if (nk_button_label(context, "Clear")) {
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
741 *current_bind_dest = NULL;
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
742 controller_binding_changed = 1;
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
743 pop_view();
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
744 }
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
745 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
746 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
747 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
748
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
749 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
750 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
751 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
752 float row_height = font->height * 2;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
753
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
754 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
755 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
756 float max_width = 0.0f;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
757
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
758 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
759 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
760 {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
761 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
762 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
763 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
764 } else if (binds[i] & STICKDIR) {
2311
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
765 static char const * dirs[] = {"Down", "Up", "Right", "Left"};
1626
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
766 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
767 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
768 } else {
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
769 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
770 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
771 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
772 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
773 skipped++;
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
774 continue;
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
775 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
776 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
777 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
778 }
2c3536082c0f Add new view for selecting a new binding for a gamepad button
Michael Pavone <pavone@retrodev.com>
parents: 1625
diff changeset
779 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
780 nk_group_begin(context, name, NK_WINDOW_BORDER | NK_WINDOW_NO_SCROLLBAR);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
781
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
782 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
783 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
784 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
785 {
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
786 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
787 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
788 }
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
789 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
790 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
791 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
792 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
793 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
794 }
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
795 }
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 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
797 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
798 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
799 }
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
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 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
802 {
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 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
804 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
805 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
806 }
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 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
808 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
809 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
810 }
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 }
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
812
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
813 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
814 {
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
815 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
816 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
817 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
818 }
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
819 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
820 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
821 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
822 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
823 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
824 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
825 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
826 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
827 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
828 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
829 } 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
830 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
831 }
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
832 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
833 {
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
834 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
835 case SDL_CONTROLLER_AXIS_LEFTY:
2311
07aeea6cb068 Fix analog stick UI for real. Allow clearing a controller binding
Michael Pavone <pavone@retrodev.com>
parents: 2310
diff changeset
836 bindings->left_stick[(SDL_CONTROLLER_AXIS_LEFTY - axis) * 2 + is_negative] = val.ptrval;
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
837 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
838 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
839 case SDL_CONTROLLER_AXIS_RIGHTY:
2313
ef5dc4d02d27 Fix goof in right analog stick mapping UI
Michael Pavone <pavone@retrodev.com>
parents: 2312
diff changeset
840 bindings->right_stick[(SDL_CONTROLLER_AXIS_RIGHTY - axis) * 2 + is_negative] = val.ptrval;
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
841 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
842 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
843 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
844 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
845 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
846 }
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
847 }
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
848
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
849 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
850 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
851 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
852 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
853 DEFAULT,
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
854 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
855 };
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
856
84ef1eb2c96a Added 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 //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
858 //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
859 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
860 "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
861 "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
862 "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
863 "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
864 "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
865 "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
866 "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
867 "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
868 };
84ef1eb2c96a Added 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
84ef1eb2c96a Added 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 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
871 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
872 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
873 {
84ef1eb2c96a Added 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 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
875 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
876 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
877 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
878 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
879 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
880 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
881 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
882 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
883 full_key[axes_key_size + prefix_len + 1 + suffix_len + 1] = 0;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
884
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
885 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
886 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
887 } 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
888 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
889 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
890 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
891 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
892 }
84ef1eb2c96a Added 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 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
894
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
895 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
896 }
84ef1eb2c96a Added 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 }
84ef1eb2c96a Added 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
84ef1eb2c96a Added 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 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
900 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
901 {
84ef1eb2c96a Added 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 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
903 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
904 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
905 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
906 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
907 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
908 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
909 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
910 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
911 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
912 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
913 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
914 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
915 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
916 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
917 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
918 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
919 }
84ef1eb2c96a Added 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 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
921 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
922 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
923 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
924 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
925 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
926 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
927 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
928 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
929 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
930 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
931 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
932 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
933 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
934 memcpy(button_key + pad_key_size, button_base, sizeof(button_base));
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
935
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
936 char *final_key;
2307
a8080240cb92 Fix silly bug I introduced when trying to fix the problem from the SDL2 upgrade
Michael Pavone <pavone@retrodev.com>
parents: 2306
diff changeset
937 for (int i = 0; i < SDL_CONTROLLER_BUTTON_MAX; 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
938 {
84ef1eb2c96a Added 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 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
940 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
941 size_t base_key_len;
2299
a1c9edf44c7e Fix a place I missed a problem from the SDL2 upgrade
Michael Pavone <pavone@retrodev.com>
parents: 2294
diff changeset
942 if ( i < SDL_CONTROLLER_BUTTON_DPAD_UP || i > SDL_CONTROLLER_BUTTON_DPAD_RIGHT) {
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
943 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
944 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
945 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
946 } 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
947 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
948 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
949 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
950 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
951 }
84ef1eb2c96a Added 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 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
953 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
954 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
955 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
956 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
957 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
958 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
959 } 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
960 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
961 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
962 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
963 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
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 }
84ef1eb2c96a Added 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 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
967 }
84ef1eb2c96a Added 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 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
969 free(dpad_key);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
970
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
971 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
972 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
973 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
974 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
975 memcpy(axes_key + pad_key_size, axes_base, sizeof(axes_base));
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
976
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
977 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
978 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
979 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
980 {
84ef1eb2c96a Added 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 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
982 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
983 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
984 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
985 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
986 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
987 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
988 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
989 } 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
990 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
991 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
992 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
993 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
994 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
995 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
996 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
997 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
998 free(axes_key);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
999
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
1000 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
1001 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
1002 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
1003 }
2312
3f2ecd156453 Fix use after free when re-entering controller binding UI after saving bindings
Michael Pavone <pavone@retrodev.com>
parents: 2311
diff changeset
1004 free(bindings);
3f2ecd156453 Fix use after free when re-entering controller binding UI after saving bindings
Michael Pavone <pavone@retrodev.com>
parents: 2311
diff changeset
1005 bindings = NULL;
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
1006 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
1007 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
1008 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
1009
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
1010 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
1011 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
1012 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
1013 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
1014 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
1015 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
1016 options[SIMILAR_CONTROLLERS].title = make_human_readable_type_name(&selected_controller_info);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1017
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
1018 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
1019 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
1020 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
1021 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
1022 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
1023 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
1024
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
1025 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
1026 {
2020
e42c45ff06d5 Add Genesis 6-button contoller image
Michael Pavone <pavone@retrodev.com>
parents: 2018
diff changeset
1027 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
1028 if (info->type == TYPE_PSX) {
e42c45ff06d5 Add Genesis 6-button contoller image
Michael Pavone <pavone@retrodev.com>
parents: 2018
diff changeset
1029 return controller_ps4_6b;
e42c45ff06d5 Add Genesis 6-button contoller image
Michael Pavone <pavone@retrodev.com>
parents: 2018
diff changeset
1030 } else {
e42c45ff06d5 Add Genesis 6-button contoller image
Michael Pavone <pavone@retrodev.com>
parents: 2018
diff changeset
1031 return controller_gen_6b;
e42c45ff06d5 Add Genesis 6-button contoller image
Michael Pavone <pavone@retrodev.com>
parents: 2018
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 } 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
1034 return controller_ps4;
2003
4c418ee9a9d8 Added Wii U controller image
Mike Pavone <pavone@retrodev.com>
parents: 1980
diff changeset
1035 } else if (info->type == TYPE_NINTENDO) {
4c418ee9a9d8 Added Wii U controller image
Mike Pavone <pavone@retrodev.com>
parents: 1980
diff changeset
1036 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
1037 } 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
1038 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
1039 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
1040 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
1041
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
1042 void view_controller_bindings(struct nk_context *context)
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1043 {
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1044 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
1045 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
1046 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
1047 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
1048 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
1049 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
1050 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
1051 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
1052 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
1053 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
1054 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
1055 {
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
1056 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
1057 }
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
1058 }
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
1059 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1060
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
1061 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
1062 def_font->handle.height *= 0.5f;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1063
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
1064 uint32_t avail_height = render_height() - 2 * orig_height;
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1065 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
1066 ui_image *controller_image = select_best_image(&selected_controller_info);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1067
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
1068 float controller_ratio = (float)controller_image->width / (float)controller_image->height;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1069
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
1070 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
1071 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
1072 + def_font->handle.width(font->userdata, font->height, "Internal Screenshot", strlen("Internal Screenshot"));
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1073
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1074 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
1075 desired_width = render_width() - 2.5f*MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1076 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1077
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1078 if (desired_width / desired_height > controller_ratio) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1079 desired_width = desired_height * controller_ratio;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1080 } else {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1081 desired_height = desired_width / controller_ratio;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1082 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1083 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
1084 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
1085 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
1086 float img_bot = img_top + desired_height;
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1087 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
1088 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
1089 nk_image(context, controller_image->ui);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1090
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1091 float bind_box_width = (render_width() - img_right) * 0.8f;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1092 if (bind_box_width < MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1093 bind_box_width = render_width() - img_right;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1094 if (bind_box_width > MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1095 bind_box_width = MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1096 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1097 } else if (bind_box_width > MAX_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1098 bind_box_width = MAX_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1099 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1100 float bind_box_left;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1101 if (bind_box_width >= (render_width() - img_right)) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1102 bind_box_left = img_right;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1103 } else {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1104 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
1105 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1106
1647
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1107 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
1108 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
1109 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1110 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1111 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1112 SDL_CONTROLLER_BUTTON_Y
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1113 });
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1114 } else {
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1115 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
1116 SDL_CONTROLLER_BUTTON_A,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1117 SDL_CONTROLLER_BUTTON_B,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1118 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
1119 SDL_CONTROLLER_BUTTON_X,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1120 SDL_CONTROLLER_BUTTON_Y,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1121 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
1122 });
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1123 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1124
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
1125 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
1126 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
1127 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
1128 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
1129 });
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
1130 } 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
1131 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width,
2219
ff700f50541c Fix duplicated right trigger mapping button in bindings for 8-button Genesis style controllers
Michael Pavone <pavone@retrodev.com>
parents: 2202
diff changeset
1132 selected_controller_info.variant == VARIANT_6B_RIGHT ? 2 : 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
1133 (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
1134 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
1135 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
1136 });
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
1137 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1138
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
1139 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
1140 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
1141 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
1142 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
1143 });
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1144
1647
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1145 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
1146 {
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1147 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
1148 RIGHTSTICK | UP,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1149 RIGHTSTICK | DOWN,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1150 RIGHTSTICK | LEFT,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1151 RIGHTSTICK | RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1152 SDL_CONTROLLER_BUTTON_RIGHTSTICK
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1153 });
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1154 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1155
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1156 bind_box_left -= img_right;
1647
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1157 float dpad_left, dpad_top;
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1158 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
1159 {
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1160 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
1161 LEFTSTICK | UP,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1162 LEFTSTICK | DOWN,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1163 LEFTSTICK | LEFT,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1164 LEFTSTICK | RIGHT,
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1165 SDL_CONTROLLER_BUTTON_LEFTSTICK
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1166 });
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1167 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
1168 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
1169 } else {
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1170 dpad_left = bind_box_left;
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1171 dpad_top = img_top;
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1172 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1173
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
1174 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
1175 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
1176 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
1177 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
1178 });
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
1179 } else {
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1180 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width,
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1181 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
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
1182 (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
1183 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
1184 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
1185 });
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
1186 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1187
1647
5a662692c215 Update binding UI for non-standard controller layouts
Michael Pavone <pavone@retrodev.com>
parents: 1646
diff changeset
1188 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
1189 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
1190 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
1191 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
1192 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
1193 });
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1194
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
1195 nk_layout_space_end(context);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1196
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
1197 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
1198 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
1199 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
1200 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
1201 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
1202 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
1203 }
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
1204 }
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
1205 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
1206 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1207 }
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1208
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
1209 static int current_button;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1210 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
1211 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
1212 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
1213 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
1214 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
1215 static size_t mapping_pos;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1216
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1217 static void start_mapping(void)
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1218 {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1219 const char *name;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1220 mapping_string[mapping_pos++] = ',';
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1221 if (current_button != SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1222 name = SDL_GameControllerGetStringForButton(current_button);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1223 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1224 name = SDL_GameControllerGetStringForAxis(current_axis);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1225 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1226 size_t namesz = strlen(name);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1227 memcpy(mapping_string + mapping_pos, name, namesz);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1228 mapping_pos += namesz;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1229 mapping_string[mapping_pos++] = ':';
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1230 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1231
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1232 static uint8_t initial_controller_config;
1605
f7b1d983d5c0 Bump up pause between mapping inputs
Michael Pavone <pavone@retrodev.com>
parents: 1604
diff changeset
1233 #define QUIET_FRAMES 9
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1234 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
1235 {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1236 char buffer[512];
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1237 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
1238 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
1239 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1240
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1241 nk_layout_space_begin(context, NK_STATIC, render_height() - context->style.font->height, 3);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1242
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1243 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1244 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
1245 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1246 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
1247 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1248
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1249 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
1250 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
1251 float width = render_width() - context->style.font->height;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1252
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1253 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
1254 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
1255 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
1256 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
1257 nk_label(context, "OR", NK_TEXT_CENTERED);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1258
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1259 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
1260 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
1261 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
1262 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1263
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1264 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
1265 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
1266 --quiet;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1267 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1268 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
1269 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
1270 start_mapping();
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1271 mapping_string[mapping_pos++] = 'b';
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1272 if (button_pressed > 9) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1273 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
1274 }
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1275 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
1276 last_button = button_pressed;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1277 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
1278 button_a = button_pressed;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1279 }
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 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1281 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
1282 } 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
1283 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
1284 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
1285 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
1286 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
1287 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
1288 added_mapping = 1;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1289
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1290 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
1291 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
1292 } 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
1293 axis_moved != last_axis || (
34370330eaf3 Support controllers that have their dpad mapped to an axis
Michael Pavone <pavone@retrodev.com>
parents: 1798
diff changeset
1294 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
1295 )
34370330eaf3 Support controllers that have their dpad mapped to an axis
Michael Pavone <pavone@retrodev.com>
parents: 1798
diff changeset
1296 )) {
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1297 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
1298 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
1299 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
1300 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
1301 }
1666
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1302 mapping_string[mapping_pos++] = 'a';
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1303 if (axis_moved > 9) {
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1304 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
1305 }
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1306 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
1307 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
1308 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
1309 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1310 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
1311 }
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1312 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1313
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
1314 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
1315 quiet = QUIET_FRAMES;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1316 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1317 current_button++;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1318 if (current_button == SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1319 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
1320 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
1321 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
1322 }
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
1323 } 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
1324 added_mapping = 0;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1325 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1326 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1327 current_axis++;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1328 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
1329 button_a = -1;
a1e0ed70ad82 Allow skipping buttons/axes in controller SDL2 mapping UI
Mike Pavone <pavone@retrodev.com>
parents: 1664
diff changeset
1330 button_a_axis = -1;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1331 mapping_string[mapping_pos] = 0;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1332 save_controller_mapping(selected_controller, mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1333 free(mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1334 pop_view();
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1335 if (initial_controller_config) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1336 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
1337 controller_binding_changed = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1338 }
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
1339 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
1340 } 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
1341 added_mapping = 0;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1342 }
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
1343 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1344 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1345 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
1346 hat_moved = -1;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1347 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
1348 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
1349 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1350 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1351
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1352 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
1353 {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1354 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
1355 button_pressed = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1356 last_button = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1357 last_hat = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1358 axis_moved = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1359 last_axis = -1;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1360 last_axis_value = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1361 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
1362 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
1363 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
1364 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
1365 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
1366 {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1367 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
1368 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
1369 c = ' ';
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1370 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1371 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
1372 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1373
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1374 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
1375 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1376
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1377 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
1378 {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1379 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
1380 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
1381 nk_layout_row_static(context, context->style.font->height*1.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
1382 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
1383 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
1384 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
1385 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
1386 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
1387 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
1388 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
1389 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
1390 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1391 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
1392 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
1393 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
1394 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1395 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
1396 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
1397 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
1398 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1399 } 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
1400 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
1401 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
1402 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
1403 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1404 char buffer[512];
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1405 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1406 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER),
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
1407 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
1408 );
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1409 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
1410 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
1411 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
1412 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1413 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1414 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_LEFTSHOULDER),
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
1415 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
1416 );
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 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
1418 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
1419 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
1420 }
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1421 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1422 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
1423 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1424 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
1425 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
1426 pop_view();
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1427 if (initial_controller_config) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1428 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
1429 if (controller) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1430 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
1431 controller_binding_changed = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1432 SDL_GameControllerClose(controller);
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1433 } else {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1434 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
1435 }
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1436 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1437 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1438 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1439
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
1440 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
1441 {
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 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
1443 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
1444 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
1445 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
1446 {
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 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
1448 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
1449 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
1450 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
1451 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
1452 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
1453 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
1454 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
1455 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
1456 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
1457 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
1458 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
1459 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
1460 } 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
1461 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
1462 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1463 }
8a64d86cc362 Use different variants for Genesis controllers to better represent what types are out there
Michael Pavone <pavone@retrodev.com>
parents: 2014
diff changeset
1464 } 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
1465 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
1466 }
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
1467 }
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
1468 }
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
1469 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
1470 }
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
1471 }
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
1472
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
1473 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
1474 {
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
1475 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
1476 controller_type_group(context, "Xbox", TYPE_XBOX, SUBTYPE_XBOX, (const char *[]){
2220
dd9d43c67986 Add support for newer controller types. Fix crash caused by new controller button types introduced in 2.0.12 and support mapping them
Michael Pavone <pavone@retrodev.com>
parents: 2219
diff changeset
1477 "Original", "Xbox 360", "Xbox One/Series", "Xbox Elite"
dd9d43c67986 Add support for newer controller types. Fix crash caused by new controller button types introduced in 2.0.12 and support mapping them
Michael Pavone <pavone@retrodev.com>
parents: 2219
diff changeset
1478 }, 4);
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
1479 controller_type_group(context, "Playstation", TYPE_PSX, SUBTYPE_PS3, (const char *[]){
2220
dd9d43c67986 Add support for newer controller types. Fix crash caused by new controller button types introduced in 2.0.12 and support mapping them
Michael Pavone <pavone@retrodev.com>
parents: 2219
diff changeset
1480 "PS3", "PS4", "PS5"
dd9d43c67986 Add support for newer controller types. Fix crash caused by new controller button types introduced in 2.0.12 and support mapping them
Michael Pavone <pavone@retrodev.com>
parents: 2219
diff changeset
1481 }, 3);
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
1482 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
1483 "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
1484 }, 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
1485 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
1486 "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
1487 }, 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
1488 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
1489 }
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
1490 }
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
1491
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
1492 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
1493 {
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
1494 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
1495 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
1496 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
1497 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
1498 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
1499 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
1500 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
1501 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
1502 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
1503 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
1504 float change_type_ratio = (float)change_type_width / total;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1505
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1506
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1507 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
1508 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
1509 {
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
1510 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
1511 if (joy) {
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1512 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
1513 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
1514 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
1515 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
1516 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
1517 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
1518 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
1519 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
1520 } 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
1521 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
1522 }
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1523 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
1524 int button_area_width = render_width() - image_width - 2 * context->style.font->height;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1525
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1526 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
1527 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
1528 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
1529 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
1530 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
1531 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
1532 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
1533 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1534 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1535 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
1536 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
1537 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1538 } else {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1539 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
1540 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
1541 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
1542 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
1543 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1544 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
1545 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
1546 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
1547 }
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1548 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
1549 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
1550 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
1551 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
1552 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1553 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1554 initial_controller_config = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1555 show_mapping_view();
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1556 }
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1557 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
1558 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
1559 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
1560 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
1561 selected_controller = i;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1562 selected_controller_info = info;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1563 initial_controller_config = 0;
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1564 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
1565 }
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
1566 }
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1567 //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
1568 }
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
1569 }
1859
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1570 if (!found_controller) {
52f136052ab0 Allow changing SDL2 mapping and controller type after initial configuration
Michael Pavone <pavone@retrodev.com>
parents: 1858
diff changeset
1571 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
1572 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
1573 }
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
1574 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
1575 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
1576 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
1577 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
1578 }
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
1579 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
1580 }
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
1581 }
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
1582
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1583 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
1584 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1585 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
1586 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1587 uint8_t newval = nk_check_label(context, "", curval);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1588 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
1589 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1590 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
1591 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1592 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1593
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1594 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
1595 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1596 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1597 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1598 uint32_t curval;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1599 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
1600 uint32_t len = strlen(curstr);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1601 if (len > 11) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1602 len = 11;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1603 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1604 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
1605 memset(buffer+len, 0, sizeof(buffer)-len);
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1606 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
1607 buffer[len] = 0;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1608 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
1609 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1610 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
1611 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1612 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1613
1853
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1614 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
1615 {
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1616 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
1617 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
1618 uint32_t len = strlen(curstr);
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1619 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
1620 char *buffer = malloc(buffer_len);
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1621 memcpy(buffer, curstr, len);
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1622 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
1623 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
1624 buffer[len] = 0;
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1625 if (strcmp(buffer, curstr)) {
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1626 config_dirty = 1;
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1627 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
1628 }
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1629 free(buffer);
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1630 }
9b2acecf8124 Allow game save path to be edited from UI
Michael Pavone <pavone@retrodev.com>
parents: 1852
diff changeset
1631
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1632 void settings_path(struct nk_context *context, char *label, char *path, char *def, const char **exts, uint32_t num_exts)
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1633 {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1634 nk_label(context, label, NK_TEXT_LEFT);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1635 char *curstr = tern_find_path_default(config, path, (tern_val){.ptrval = def}, TVAL_PTR).ptrval;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1636 uint32_t len = strlen(curstr);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1637 uint32_t buffer_len = len > 100 ? len + 1 : 101;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1638 char *buffer = malloc(buffer_len);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1639 memcpy(buffer, curstr, len);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1640 memset(buffer+len, 0, buffer_len-len);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1641 nk_edit_string(context, NK_EDIT_SIMPLE, buffer, &len, buffer_len-1, nk_filter_default);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1642 buffer[len] = 0;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1643 if (strcmp(buffer, curstr)) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1644 config_dirty = 1;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1645 config = tern_insert_path(config, path, (tern_val){.ptrval = strdup(buffer)}, TVAL_PTR);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1646 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1647
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1648 nk_spacing(context, 1);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1649 if (nk_button_label(context, "Browse")) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1650 browser_label = label;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1651 browser_setting_path = path;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1652 browser_ext_list = exts;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1653 browser_num_exts = num_exts;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1654 if (is_absolute_path(buffer)) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1655 browser_cur_path = path_dirname(buffer);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1656 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1657 push_view(view_file_settings);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1658 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1659 free(buffer);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1660 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
1661
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1662 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
1663 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1664 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
1665 int curval = curstr ? atoi(curstr) : def;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1666 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1667 int val = curval;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1668 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
1669 if (val != curval) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1670 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1671 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
1672 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1673 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
1674 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1675 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1676
1796
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1677 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
1678 {
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1679 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
1680 float curval = curstr ? atof(curstr) : def;
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1681 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
1682 float val = curval;
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1683 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
1684 if (val != curval) {
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1685 char buffer[64];
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1686 sprintf(buffer, "%f", val);
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1687 config_dirty = 1;
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1688 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
1689 }
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1690 }
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1790
diff changeset
1691
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1692 typedef struct {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1693 char *fragment;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1694 char *vertex;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1695 } shader_prog;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1696
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1697 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
1698 {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1699 uint32_t num_progs = *num_existing;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1700 uint32_t prog_storage = *storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1701 uint32_t starting = num_progs;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1702
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1703 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
1704 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1705 continue;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1706 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1707 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
1708 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1709 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
1710 uint8_t dupe = 0;;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1711 for (uint32_t j = 0; j < starting; j++) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1712 if (!strcmp(entries[i].name, progs[j].fragment)) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1713 dupe = 1;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1714 break;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1715 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1716 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1717 if (!dupe) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1718 if (num_progs == prog_storage) {
1493
24f44f26b74d Fix buffer overrun in video settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1492
diff changeset
1719 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
1720 progs = realloc(progs, sizeof(*progs) * prog_storage);
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1721 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1722 progs[num_progs].vertex = NULL;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1723 progs[num_progs++].fragment = strdup(entries[i].name);
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1724 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1725 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1726 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1727 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1728
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1729 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
1730 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1731 continue;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1732 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1733 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
1734 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1735 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
1736 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
1737 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
1738 progs[j].vertex = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1739 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1740 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1741 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1742 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1743 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1744 free_dir_list(entries, num_entries);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1745 *num_existing = num_progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1746 *storage = prog_storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1747 return progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1748 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1749
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1750 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
1751 {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1752 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
1753 size_t num_entries;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1754 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
1755 free(shader_dir);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1756 shader_prog *progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1757 uint32_t num_progs = 0, prog_storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1758 if (num_entries) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1759 progs = calloc(num_entries, sizeof(shader_prog));
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1760 prog_storage = num_entries;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1761 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
1762 } else {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1763 progs = NULL;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1764 prog_storage = 0;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1765 }
1693
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1681
diff changeset
1766 #ifdef DATA_PATH
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1681
diff changeset
1767 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
1768 #else
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1769 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
1770 #endif
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1771 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
1772 free(shader_dir);
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1773 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
1774 *num_out = num_progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1775 return progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1776 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1777
1499
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1778 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
1779 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1780 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
1781 int32_t selected = -1;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1782 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1783 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1784 if (!strcmp(setting, options[i])) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1785 selected = i;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1786 break;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1787 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1788 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1789 if (selected == -1) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1790 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1791 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1792 if (!strcmp(def, options[i])) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1793 selected = i;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1794 break;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1795 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1796 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1797 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1798 return selected;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1799 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1800
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1801 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
1802 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1803 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
1804 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
1805 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
1806 config_dirty = 1;
1499
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1807 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
1808 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1809 return next;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1810 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1811
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1812 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
1813 {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1814 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
1815 }
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1816
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1817 void view_video_settings(struct nk_context *context)
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1818 {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1819 const char *vsync_opts[] = {"on", "off", "tear"};
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1820 const char *vsync_opt_names[] = {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1821 "On",
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1822 "Off",
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1823 "On, tear if late"
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 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
1826 static shader_prog *progs;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1827 static char **prog_names;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1828 static uint32_t num_progs;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1829 static uint32_t selected_prog;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1830 static int32_t selected_vsync = -1;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1831 if (selected_vsync < 0) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1832 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
1833 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1834 if(!progs) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1835 progs = get_shader_list(&num_progs);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1836 prog_names = calloc(num_progs, sizeof(char*));
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1837 for (uint32_t i = 0; i < num_progs; i++)
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1838 {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1839 prog_names[i] = basename_no_extension(progs[i].fragment);;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1840 uint32_t len = strlen(prog_names[i]);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1841 if (len > 2) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1842 prog_names[i][len-2] = 0;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1843 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1844 if (!progs[i].vertex) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1845 progs[i].vertex = strdup("default.v.glsl");
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1846 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1847 if (!strcmp(
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1848 progs[i].fragment,
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1849 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
1850 )) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1851 selected_prog = i;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1852 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1853 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1854 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1855 uint32_t width = render_width();
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1856 uint32_t height = render_height();
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1857 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
1858 if (desired_width > width) {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1859 desired_width = width;
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1860 }
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1861 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
1862 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
1863 settings_toggle(context, "Fullscreen", "video\0fullscreen\0", 0);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1864 settings_toggle(context, "Open GL", "video\0gl\0", 1);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1865 settings_toggle(context, "Scanlines", "video\0scanlines\0", 0);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1866 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
1867 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
1868 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
1869 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
1870 if (next_selected != selected_prog) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1871 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
1872 config_dirty = 1;
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1873 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
1874 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
1875 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1876 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
1877 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
1878 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
1879 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
1880 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
1881 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
1882 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
1883 settings_int_property(context, "", "Right", "video\0pal\0overscan\0right\0", 14, 0, 32);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1884
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1885 if (nk_button_label(context, "Back")) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1886 pop_view();
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1887 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1888 nk_end(context);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1889 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1890 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1891
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1892 void view_audio_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1893 {
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1894 const char *rates[] = {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1895 "192000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1896 "96000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1897 "48000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1898 "44100",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1899 "22050"
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1900 };
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1901 const char *sizes[] = {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1902 "1024",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1903 "512",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1904 "256",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1905 "128",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1906 "64"
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1907 };
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
1908 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
1909 "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
1910 "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
1911 };
5278b6e44fc1 Optionally emulate the offset around zero in the imperfect DAC of a discrete YM2612
Michael Pavone <pavone@retrodev.com>
parents: 1796
diff changeset
1912 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
1913 "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
1914 "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
1915 };
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1916 const uint32_t num_rates = sizeof(rates)/sizeof(*rates);
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1917 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
1918 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
1919 static int32_t selected_rate = -1;
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1920 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
1921 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
1922 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
1923 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
1924 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
1925 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
1926 }
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1927 uint32_t width = render_width();
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1928 uint32_t height = render_height();
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1929 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
1930 if (desired_width > width) {
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1931 desired_width = width;
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1932 }
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1933 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
1934 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
1935 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
1936 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
1937 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
1938 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
1939 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
1940 settings_float_property(context, "", "PSG", "audio\0psg_gain\0", 0, -30.0f, 30.0f, 0.5f);
2277
9e578fd493e1 Implement gain control for Ricoh PCM and CDDA with defaults based on Model 2 Sega CD
Michael Pavone <pavone@retrodev.com>
parents: 2247
diff changeset
1941 settings_float_property(context, "", "RF5C164", "audio\0rf5c164_gain\0", -6.0f, -30.0f, 30.0f, 0.5f);
9e578fd493e1 Implement gain control for Ricoh PCM and CDDA with defaults based on Model 2 Sega CD
Michael Pavone <pavone@retrodev.com>
parents: 2247
diff changeset
1942 settings_float_property(context, "", "CDDA", "audio\0cdd_gain\0", -9.5f, -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
1943 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
1944 if (nk_button_label(context, "Back")) {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1945 pop_view();
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1946 }
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1947 nk_end(context);
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1948 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1949 }
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1950 typedef struct {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1951 const char **models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1952 const char **names;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1953 uint32_t num_models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1954 uint32_t storage;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1955 uint8_t genesis_only;
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1956 } model_foreach_state;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1957 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
1958 {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1959 if (valtype != TVAL_NODE) {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1960 return;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1961 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1962 if (!strcmp(tern_find_ptr_default(val.ptrval, "show", "yes"), "no")) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1963 return;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1964 }
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1965 model_foreach_state *state = data;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1966 if (state->genesis_only && strcmp(tern_find_ptr_default(val.ptrval, "vdp", "genesis"), "genesis")) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1967 return;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1968 }
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1969 if (state->num_models == state->storage) {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1970 state->storage *= 2;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1971 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
1972 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
1973 }
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1974 char *def = strdup(key);
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1975 state->models[state->num_models] = def;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1976 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
1977 }
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1978
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1979 typedef struct {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1980 const char **models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1981 const char **names;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1982 } models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1983
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1984 models get_models(uint32_t *num_out, uint8_t genesis_only)
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1985 {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1986 tern_node *systems = get_systems_config();
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1987 model_foreach_state state = {
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1988 .models = calloc(4, sizeof(char *)),
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1989 .names = calloc(4, sizeof(char *)),
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1990 .num_models = 0,
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1991 .storage = 4,
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
1992 .genesis_only = genesis_only
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1993 };
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1994 tern_foreach(systems, model_iter, &state);
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1995 *num_out = state.num_models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1996 return (models){
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1997 .models = state.models,
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1998 .names = state.names
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
1999 };
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2000 }
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2001
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2002 void view_system_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2003 {
1568
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2004 const char *sync_opts[] = {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2005 "video",
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2006 "audio"
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2007 };
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2008 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
2009 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
2010 if (selected_sync < 0) {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
2011 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
2012 }
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2013 const char *regions[] = {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2014 "J - Japan",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2015 "U - Americas",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2016 "E - Europe"
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2017 };
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2018 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
2019 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
2020 static int32_t selected_region = -1;
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2021 if (selected_region < 0) {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2022 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
2023 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2024 static const char **model_opts, **sms_model_opts;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2025 static const char **model_names, **sms_model_names;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2026 static uint32_t num_models, num_sms_models;
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2027 if (!model_opts) {
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2028 models m = get_models(&num_models, 1);
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2029 model_opts = m.models;
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2030 model_names = m.names;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2031 m = get_models(&num_sms_models, 0);
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2032 sms_model_opts = m.models;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2033 sms_model_names = m.names;
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2034 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2035 static uint8_t old_show_sms;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2036 uint8_t show_sms = current_system && current_system->type == SYSTEM_SMS;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2037
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2038 static int32_t selected_model = -1;
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2039 if (selected_model < 0 || show_sms != old_show_sms) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2040 if (show_sms) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2041 selected_model = find_match(sms_model_opts, num_sms_models, "sms\0system\0model\0", "md1va3");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2042 } else {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2043 selected_model = find_match(model_opts, num_models, "system\0model\0", "md1va3");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2044 }
1900
93960907807a Added UI for selecting configured model
Michael Pavone <pavone@retrodev.com>
parents: 1862
diff changeset
2045 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2046
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2047 static const char *formats[] = {
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2048 "native",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2049 "gst"
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2050 };
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2051 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
2052 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
2053 if (selected_format < 0) {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
2054 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
2055 }
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2056 static const char *ram_inits[] = {
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2057 "zero",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2058 "random"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2059 };
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2060 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
2061 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
2062 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
2063 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
2064 }
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2065 static const char *io_opts_1[] = {
1789
b3eb74936f18 Fix off by one in IO device UI
Michael Pavone <pavone@retrodev.com>
parents: 1693
diff changeset
2066 "none",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2067 "gamepad2.1",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2068 "gamepad3.1",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2069 "gamepad6.1",
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2070 "sega_multitap.1",
2238
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2071 "ea_multitap_port_a",
1575
ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1573
diff changeset
2072 "mouse.1",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2073 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2074 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2075 };
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2076 static const char *io_opts_2[] = {
1789
b3eb74936f18 Fix off by one in IO device UI
Michael Pavone <pavone@retrodev.com>
parents: 1693
diff changeset
2077 "none",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2078 "gamepad2.2",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2079 "gamepad3.2",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2080 "gamepad6.2",
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2081 "sega_multitap.1",
2238
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2082 "ea_multitap_port_b",
1575
ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1573
diff changeset
2083 "mouse.1",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2084 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2085 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2086 };
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2087 static const char *type_names[sizeof(io_opts_1)/sizeof(*io_opts_1)];
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2088 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
2089 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
2090 const uint32_t num_io = sizeof(io_opts_1)/sizeof(*io_opts_1);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2091 if (selected_io_1 < 0 || selected_io_2 < 0 || show_sms != old_show_sms) {
2235
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2092 type_names[0] = device_type_names[IO_NONE];
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2093 type_names[1] = device_type_names[IO_GAMEPAD2];
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2094 type_names[2] = device_type_names[IO_GAMEPAD3];
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2095 type_names[3] = device_type_names[IO_GAMEPAD6];
93918a6a8ab7 Initial support for Sega multi-tap
Michael Pavone <pavone@retrodev.com>
parents: 2220
diff changeset
2096 type_names[4] = device_type_names[IO_SEGA_MULTI];
2238
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2097 type_names[5] = device_type_names[IO_EA_MULTI_A];
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2098 type_names[6] = device_type_names[IO_MOUSE];
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2099 type_names[7] = device_type_names[IO_SATURN_KEYBOARD];
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2100 type_names[8] = device_type_names[IO_XBAND_KEYBOARD];
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2101 if (show_sms) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2102 selected_io_1 = find_match(io_opts_1, num_io, "sms\0io\0devices\0""1\0", "gamepad2.1");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2103 selected_io_2 = find_match(io_opts_2, num_io, "sms\0io\0devices\0""2\0", "gamepad2.2");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2104 } else {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2105 selected_io_1 = find_match(io_opts_1, num_io, "io\0devices\0""1\0", "gamepad6.1");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2106 selected_io_2 = find_match(io_opts_2, num_io, "io\0devices\0""2\0", "gamepad6.2");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2107 }
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
2108 }
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2109 old_show_sms = show_sms;
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2110
1498
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2111 uint32_t width = render_width();
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2112 uint32_t height = render_height();
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
2113 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
2114 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
2115 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2116
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2117 if (show_sms) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2118 selected_model = settings_dropdown_ex(context, "Model", sms_model_opts, sms_model_names, num_sms_models, selected_model, "sms\0system\0model\0");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2119 } else {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2120 selected_model = settings_dropdown_ex(context, "Model", model_opts, model_names, num_models, selected_model, "system\0model\0");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2121 }
2238
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2122 int32_t old_selected = selected_io_1;
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2123 char *config_path1, *config_path2;
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2124 if (show_sms) {
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2125 config_path1 = "sms\0io\0devices\0""1\0";
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2126 config_path2 = "sms\0io\0devices\0""2\0";
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2127 } else {
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2128 config_path1 = "io\0devices\0""1\0";
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2129 config_path2 = "io\0devices\0""2\0";
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2130 }
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2131 selected_io_1 = settings_dropdown_ex(context, "IO Port 1 Device", io_opts_1, type_names, num_io, selected_io_1, config_path1);
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2132 if (old_selected != selected_io_1 && selected_io_1 != selected_io_2 && !strcmp(io_opts_1[selected_io_1], "ea_multitap_port_a")) {
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2133 selected_io_2 = selected_io_1;
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2134 config = tern_insert_path(config, config_path2, (tern_val){.ptrval = strdup(io_opts_2[selected_io_2])}, TVAL_PTR);
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2135 }
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2136 old_selected = selected_io_2;
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2137 selected_io_2 = settings_dropdown_ex(context, "IO Port 2 Device", io_opts_2, type_names, num_io, selected_io_2, config_path2);
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2138 if (old_selected != selected_io_2 && selected_io_1 != selected_io_2 && !strcmp(io_opts_2[selected_io_2], "ea_multitap_port_b")) {
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2139 selected_io_1 = selected_io_2;
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2140 config = tern_insert_path(config, config_path1, (tern_val){.ptrval = strdup(io_opts_1[selected_io_1])}, TVAL_PTR);
0a107b2d5837 Add support for EA 4-way Play
Michael Pavone <pavone@retrodev.com>
parents: 2235
diff changeset
2141 }
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
2142 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
2143 selected_sync = settings_dropdown(context, "Sync Source", sync_opts, num_sync_opts, selected_sync, "system\0sync_source\0");
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2144 if (!show_sms) {
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2145 settings_int_property(context, "68000 Clock Divider", "", "clocks\0m68k_divider\0", 7, 1, 53);
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2146 selected_format = settings_dropdown(context, "Save State Format", formats, num_formats, selected_format, "ui\0state_format\0");
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2147 }
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
2148 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
2149 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
2150 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
2151 settings_string(context, "Game Save Path", "ui\0save_path\0", "$USERDATA/blastem/$ROMNAME");
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2152
1498
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2153 if (nk_button_label(context, "Back")) {
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2154 pop_view();
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2155 }
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2156 nk_end(context);
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
2157 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2158 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2159
2018
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2160 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
2161 {
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2162 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
2163 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
2164 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
2165 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
2166 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
2167 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
2168 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
2169 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
2170 pop_view();
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2171 }
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2172 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
2173 delete_custom_config();
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2174 config = load_config();
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2175 delete_controller_info();
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2176 config_dirty = 1;
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2177 pop_view();
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2178 }
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2179 nk_end(context);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2180 }
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2181 }
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2182
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2183 void view_bios_settings(struct nk_context *context)
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2184 {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2185 if (nk_begin(context, "Firmware", nk_rect(0, 0, render_width(), render_height()), 0)) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2186 uint32_t desired_width = context->style.font->height * 10;
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2187 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2188 static const char* exts[] = {"md", "bin", "smd"};
2247
08a16de0e4cb Fix settings save path of TMSS ROM setting
Michael Pavone <pavone@retrodev.com>
parents: 2238
diff changeset
2189 settings_path(context, "TMSS ROM", "system\0tmss_path\0", "tmss.md", exts, 3);
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2190 settings_path(context, "US CD BIOS", "system\0scd_bios_us\0", "cdbios.md", exts, 3);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2191 settings_path(context, "JP CD BIOS", "system\0scd_bios_jp\0", "cdbios.md", exts, 3);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2192 settings_path(context, "EU CD BIOS", "system\0scd_bios_eu\0", "cdbios.md", exts, 3);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2193 if (nk_button_label(context, "Back")) {
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2194 pop_view();
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2195 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2196 nk_end(context);
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2197 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2198 }
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2199
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2200 void view_back(struct nk_context *context)
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2201 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2202 pop_view();
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2203 pop_view();
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2204 current_view(context);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2205 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2206
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2207 void view_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2208 {
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2209 static menu_item items[] = {
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2210 {"Key Bindings", view_key_bindings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2211 {"Controllers", view_controllers},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2212 {"Video", view_video_settings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2213 {"Audio", view_audio_settings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2214 {"System", view_system_settings},
2156
237068a25523 Added UI for setting firmware paths
Michael Pavone <pavone@retrodev.com>
parents: 2022
diff changeset
2215 {"Firmware", view_bios_settings},
2018
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2017
diff changeset
2216 {"Reset to Defaults", view_confirm_reset},
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
2217 {"Back", view_back}
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2218 };
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2219
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2220 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
2221 menu(context, sizeof(items)/sizeof(*items), items, NULL);
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2222 nk_end(context);
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2223 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2224 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2225
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
2226 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
2227 {
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
2228 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
2229 }
84ef1eb2c96a Added code for actually saving new controller bindings to an appropriate key in the config file
Michael Pavone <pavone@retrodev.com>
parents: 1626
diff changeset
2230
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2231 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
2232 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2233 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
2234 {"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
2235 {"Load ROM", view_load},
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
2236 {"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
2237 {"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
2238 {"Load State", view_load_state},
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2239 {"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
2240 {"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
2241 };
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2242
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2243 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
2244 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
2245 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
2246 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2247 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2248
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2249 void view_menu(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2250 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2251 static menu_item items[] = {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2252 {"Load ROM", view_load},
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
2253 {"Settings", view_settings},
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2254 {"About", view_about},
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2255 {"Exit", NULL}
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2256 };
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2257
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2258 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
2259 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
2260 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2261 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2262 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2263
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2264 void blastem_nuklear_render(void)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2265 {
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2266 if (current_view != view_play) {
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2267 nk_input_end(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2268 current_view(context);
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2269 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2270 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
2271 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
2272 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
2273 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2274 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2275 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
2276 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2277 }
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2278 nk_input_begin(context);
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2279 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2280 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2281
1486
a6881d0d76d0 Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents: 1485
diff changeset
2282 void ui_idle_loop(void)
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2283 {
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1859
diff changeset
2284 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
2285 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
2286 static uint32_t last;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2287 while (current_view != view_play)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2288 {
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
2289 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
2290 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
2291 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
2292 }
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
2293 last = current;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2294 render_update_display();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2295 }
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
2296 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
2297 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
2298 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
2299 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
2300 }
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1859
diff changeset
2301 render_enable_gamepad_events(0);
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2302 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2303 static void handle_event(SDL_Event *event)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2304 {
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
2305 if (event->type == SDL_KEYDOWN) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
2306 keycode = event->key.keysym.sym;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
2307 }
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
2308 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
2309 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
2310 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
2311 else if (event->type == SDL_JOYHATMOTION) {
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2312 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
2313 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
2314 }
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2315 else if (event->type == SDL_JOYAXISMOTION) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2316 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
2317 axis_moved = event->jaxis.axis;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2318 axis_value = event->jaxis.value;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2319 }
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
2320 } 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
2321 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
2322 } 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
2323 click = 0;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
2324 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2325 nk_sdl_handle_event(event);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2326 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2327
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2328 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
2329 {
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
2330 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
2331 {
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
2332 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
2333 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
2334 }
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2335 }
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
2336
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2337 #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
2338 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
2339 {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
2340 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
2341 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
2342 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
2343 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
2344 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
2345 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
2346 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
2347 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2348 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
2349 #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
2350 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
2351 #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
2352 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
2353 }
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2354 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2355
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2356 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
2357 {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2358 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
2359 fbimg->pixels = buf;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2360 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
2361 fbimg->w = width;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2362 fbimg->h = height;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2363 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
2364 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
2365 }
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
2366
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
2367 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
2368 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2369 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
2370 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2371 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
2372 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2373 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2374 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
2375 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2376 }
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
2377 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
2378 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
2379 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
2380 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
2381 }
2294
7e995fb948c3 Make UI font less comically large
Michael Pavone <pavone@retrodev.com>
parents: 2277
diff changeset
2382 def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, render_height() / 24, 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
2383 free(font);
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2384 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2385 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
2386 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2387 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2388 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
2389 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2390 }
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2391 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
2392 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
2393 {
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2394 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2395 if (fb_context) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2396 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2397 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
2398 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2399 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2400 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
2401 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2402 #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
2403 }
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
2404 }
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
2405
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
2406 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
2407 {
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
2408 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
2409 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
2410 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
2411 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
2412 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
2413 .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
2414 };
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
2415 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
2416 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
2417 .r = 255, .g = 128, .b = 0, .a = 255
58b6f5d918f4 Minor improvements to keyboard navigation
Michael Pavone <pavone@retrodev.com>
parents: 1853
diff changeset
2418 };
58b6f5d918f4 Minor improvements to keyboard navigation
Michael Pavone <pavone@retrodev.com>
parents: 1853
diff changeset
2419 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
2420 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
2421 }
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
2422
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2423 static void fb_resize(void)
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2424 {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2425 nk_rawfb_resize_fb(fb_context, NULL, render_width(), render_height(), 0);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2426 style_init();
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2427 texture_init();
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2428 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2429
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
2430 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
2431 {
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
2432 context = nk_sdl_init(render_get_window());
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2433 #ifndef DISABLE_OPENGL
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2434 if (render_has_gl()) {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2435 nk_sdl_device_create();
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2436 } else {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2437 #endif
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2438 fb_context = nk_rawfb_init(NULL, context, render_width(), render_height(), 0);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2439 render_set_ui_fb_resize_handler(fb_resize);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2440 #ifndef DISABLE_OPENGL
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2441 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2307
diff changeset
2442 #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
2443 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
2444 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
2445 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
2446
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2447 void show_pause_menu(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2448 {
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
2449 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
2450 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
2451 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
2452 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
2453 current_view = view_pause;
1841
5d10b8494b02 WIP keyboard nav for Nuklear menus
Michael Pavone <pavone@retrodev.com>
parents: 1831
diff changeset
2454 context->input.selected_widget = 0;
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1910
diff changeset
2455 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
2456 } 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
2457 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
2458 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
2459 }
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2460 }
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2461
1581
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
2462 void show_play_view(void)
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
2463 {
1672
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2464 set_content_binding_state(1);
1581
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
2465 current_view = view_play;
1841
5d10b8494b02 WIP keyboard nav for Nuklear menus
Michael Pavone <pavone@retrodev.com>
parents: 1831
diff changeset
2466 context->input.selected_widget = 0;
1581
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
2467 }
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
2468
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2469 static uint8_t active;
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2470 uint8_t is_nuklear_active(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2471 {
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2472 return active;
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2473 }
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2474
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
2475 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
2476 {
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2477 /*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
2478 //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
2479 return 0;
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2480 }*/
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
2481 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
2482 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
2483 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
2484 }
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
2485 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
2486 }
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
2487
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2488 static void persist_config_exit(void)
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2489 {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2490 if (config_dirty) {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2491 persist_config(config);
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2492 }
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2493 }
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2494
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
2495 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
2496 {
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
2497 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
2498 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
2499 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
2500 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
2501 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
2502 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
2503 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
2504 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
2505 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
2506 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
2507 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2508 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
2509 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
2510 {
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2511 uint32_t pixel = *cur;
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2512 *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
2513 }
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1647
diff changeset
2514 #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
2515 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
2516 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
2517 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
2518 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
2519 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
2520 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
2521 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
2522 } 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
2523 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
2524 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
2525 }
60b199cbb3f7 Added PS4 6-button fighting pad image and cleaned up controller image handling code
Michael Pavone <pavone@retrodev.com>
parents: 1645
diff changeset
2526
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2527 void blastem_nuklear_init(uint8_t file_loaded)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2528 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2529 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
2530 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2531 if (render_has_gl()) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2532 nk_sdl_device_create();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2533 } else {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2534 #endif
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2535 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
2536 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
2537 #ifndef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2538 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1816
diff changeset
2539 #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
2540 style_init();
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2541
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
2542 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
2543 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
2544 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
2545 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
2546 controller_gen_6b = load_ui_image("images/genesis_6b.png");
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2547
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
2548 texture_init();
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2549
1672
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2550 if (file_loaded) {
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2551 current_view = view_play;
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2552 } else {
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2553 current_view = view_menu;
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2554 set_content_binding_state(0);
12d0c7c4ad80 Disable most bindings when UI is active
Michael Pavone <pavone@retrodev.com>
parents: 1666
diff changeset
2555 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2556 render_set_ui_render_fun(blastem_nuklear_render);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2557 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
2558 render_set_gl_context_handlers(context_destroyed, context_created);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2559
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
2560 atexit(persist_config_exit);
2202
ee6d30c56eeb Add separate model/IO selection settings for SMS/GG
Michael Pavone <pavone@retrodev.com>
parents: 2162
diff changeset
2561
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
2562 active = 1;
1486
a6881d0d76d0 Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents: 1485
diff changeset
2563 ui_idle_loop();
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
2564 }