annotate nuklear_ui/blastem_nuklear.c @ 1624:7bbe0bfedb58

Handle looking up dpad config in binding UI. Fix left/right stick config display in binding UI
author Michael Pavone <pavone@retrodev.com>
date Thu, 25 Oct 2018 19:12:40 -0700
parents 18a946ec74c8
children 6130e1e72151
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
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
3
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
4 #include <stdlib.h>
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
5 #include <limits.h>
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
6 #include "blastem_nuklear.h"
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
7 #include "font.h"
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
8 #include "../render.h"
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
9 #include "../render_sdl.h"
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
10 #include "../util.h"
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
11 #include "../paths.h"
1478
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
12 #include "../saves.h"
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
13 #include "../blastem.h"
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
14 #include "../config.h"
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
15 #include "../io.h"
1569
0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI
Michael Pavone <pavone@retrodev.com>
parents: 1568
diff changeset
16 #include "../png.h"
1596
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
17 #include "../controller_info.h"
1623
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
18 #include "../bindings.h"
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
19
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
20 static struct nk_context *context;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
21
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
22 typedef void (*view_fun)(struct nk_context *);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
23 static view_fun current_view;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
24 static view_fun *previous_views;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
25 static uint32_t view_storage;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
26 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
27 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
28 static uint8_t config_dirty;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
29
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
30 static void push_view(view_fun new_view)
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
31 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
32 if (num_prev == view_storage) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
33 view_storage = view_storage ? 2*view_storage : 2;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
34 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
35 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
36 previous_views[num_prev++] = current_view;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
37 current_view = new_view;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
38 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
39
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
40 static void pop_view()
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
41 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
42 if (num_prev) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
43 current_view = previous_views[--num_prev];
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
44 }
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
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
47 static void clear_view_stack()
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
48 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
49 num_prev = 0;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
50 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
51
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
52 void view_play(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
53 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
54
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
55 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
56
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
57 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
58 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
59 static char *current_path;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
60 static dir_entry *entries;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
61 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
62 static int32_t selected_entry = -1;
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
63 static char **ext_list;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
64 static uint32_t num_exts;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
65 static uint8_t got_ext_list;
1481
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
66 if (!current_path) {
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
67 get_initial_browse_path(&current_path);
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
68 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
69 if (!entries) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
70 entries = get_dir_list(current_path, &num_entries);
1484
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
71 if (entries) {
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
72 sort_dir_list(entries, num_entries);
d82af64c94d2 Sort directory listing in Nuklear UI file browser
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
73 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
74 }
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
75 if (!got_ext_list) {
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
76 ext_list = get_extension_list(config, &num_exts);
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
77 got_ext_list = 1;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
78 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
79 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
80 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
81 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
82 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
83 int32_t old_selected = selected_entry;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
84 if (nk_group_begin(context, "Select ROM", NK_WINDOW_BORDER | NK_WINDOW_TITLE)) {
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
85 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
86 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
87 {
1485
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
88 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
89 continue;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
90 }
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
91 if (num_exts && !entries[i].is_dir && !path_matches_extensions(entries[i].name, ext_list, num_exts)) {
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
92 continue;
369da70ee2c2 Filter file list in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1484
diff changeset
93 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
94 int selected = i == selected_entry;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
95 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
96 if (selected) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
97 selected_entry = i;
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
98 } else if (i == selected_entry) {
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
99 selected_entry = -1;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
100 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
101 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
102 nk_group_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
103 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
104 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
105 if (nk_button_label(context, "Back")) {
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
106 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
107 }
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
108 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
109 if (selected_entry < 0) {
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
110 selected_entry = old_selected;
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
111 }
1481
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
112 char *full_path = path_append(current_path, entries[selected_entry].name);
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
113 if (entries[selected_entry].is_dir) {
1481
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
114 free(current_path);
77a401044935 Fix directory navigation in ROM file chooser in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1478
diff changeset
115 current_path = full_path;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
116 free_dir_list(entries, num_entries);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
117 entries = NULL;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
118 } else {
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
119 if(normal_open) {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
120 if (current_system) {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
121 current_system->next_rom = full_path;
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
122 current_system->request_exit(current_system);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
123 } else {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
124 init_system_with_media(full_path, SYSTEM_UNKNOWN);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
125 free(full_path);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
126 }
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
127 } else {
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
128 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
129 free(full_path);
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents: 1482
diff changeset
130 }
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
131 clear_view_stack();
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
132 current_view = view_play;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
133 }
1554
87350caf6dab Allow double click to open ROM in file browser
Michael Pavone <pavone@retrodev.com>
parents: 1553
diff changeset
134 selected_entry = -1;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
135 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
136 nk_end(context);
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
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
140 void view_load(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
141 {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
142 view_file_browser(context, 1);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
143 }
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
144
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
145 void view_lock_on(struct nk_context *context)
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
146 {
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
147 view_file_browser(context, 0);
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
148 }
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
149
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
150 void view_about(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
151 {
1526
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
152 const char *lines[] = {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
153 "BlastEm v0.6.0",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
154 "Copyright 2012-2017 Michael Pavone",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
155 "",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
156 "BlastEm is a high performance open source",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
157 "(GPLv3) Genesis/Megadrive emulator",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
158 };
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
159 const uint32_t NUM_LINES = sizeof(lines)/sizeof(*lines);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
160 const char *thanks[] = {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
161 "Nemesis: Documentatino and test ROMs",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
162 "Charles MacDonald: Documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
163 "Eke-Eke: Documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
164 "Bart Trzynadlowski: Documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
165 "KanedaFR: Hosting the best Sega forum",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
166 "Titan: Awesome demos and documentation",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
167 "micky: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
168 "Sasha: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
169 "lol-frank: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
170 "Sik: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
171 "Tim Lawrence : Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
172 "ComradeOj: Testing",
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
173 "Vladikcomper: Testing"
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
174 };
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
175 const uint32_t NUM_THANKS = sizeof(thanks)/sizeof(*thanks);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
176 uint32_t width = render_width();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
177 uint32_t height = render_height();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
178 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
179 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
180 for (uint32_t i = 0; i < NUM_LINES; i++)
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
181 {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
182 nk_label(context, lines[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
183 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
184 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
185 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
186 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
187 for (uint32_t i = 0; i < NUM_THANKS; i++)
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
188 {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
189 nk_label(context, thanks[i], NK_TEXT_LEFT);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
190 }
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
191 nk_group_end(context);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
192 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
193 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
194 if (nk_button_label(context, "Back")) {
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
195 pop_view();
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
196 }
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
197 nk_end(context);
9bea1a199f15 Filled in About view
Michael Pavone <pavone@retrodev.com>
parents: 1522
diff changeset
198 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
199 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
200
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
201 typedef struct {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
202 const char *title;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
203 view_fun next_view;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
204 } menu_item;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
205
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
206 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
207 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
208
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
209 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
210 {
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
211 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
212 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
213 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
214 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
215 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
216 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
217 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
218 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
219 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
220 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
221 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
222 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
223 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
224 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
225 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
226 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
227 }
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
228 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
229 }
1579
f66290afae65 Add some basic scaling to rest of UI
Michael Pavone <pavone@retrodev.com>
parents: 1578
diff changeset
230 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
231 if (nk_button_label(context, "Back")) {
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
232 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
233 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
234 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
235 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
236 current_system->load_state(current_system, selected_slot);
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
237 current_view = view_play;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
238 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
239 } 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
240 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
241 current_system->save_state = selected_slot + 1;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
242 current_view = view_play;
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
243 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
244 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
245 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
246 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
247 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
248
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
249 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
250 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
251 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
252 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
253
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
254 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
255 {
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
256 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
257 }
da1dce39e846 Refactored save slot related logic to reduce duplication and allow reuse in new UI. Get state loading/saving mostly working in new UI
Michael Pavone <pavone@retrodev.com>
parents: 1477
diff changeset
258
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
259 static void menu(struct nk_context *context, uint32_t num_entries, const menu_item *items)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
260 {
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
261 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
262 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
263 const uint32_t button_space = 6;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
264
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
265 uint32_t width = render_width();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
266 uint32_t height = render_height();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
267 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
268 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
269 uint32_t left = width/2 - button_width/2;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
270
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
271 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
272 for (uint32_t i = 0; i < num_entries; i++)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
273 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
274 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
275 if (nk_button_label(context, items[i].title)) {
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
276 push_view(items[i].next_view);
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
277 if (!current_view) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
278 exit(0);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
279 }
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
280 if (current_view == view_save_state || current_view == view_load_state) {
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 free_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
282 slots = NULL;
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 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
284 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
285 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
286 nk_layout_space_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
287 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
288
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
289 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
290 {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
291 if (valtype != TVAL_PTR) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
292 return;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
293 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
294 tern_node **binding_lookup = data;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
295 *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
296 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
297
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
298 static int32_t keycode;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
299 static const char *set_binding;
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
300 char *set_label;
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
301 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
302 {
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
303 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
304 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
305 nk_layout_row_static(context, context->style.font->height, render_width()/2 - 80, 2);
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
306
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
307 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
308 {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
309 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
310 const char *label = label_alloc;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
311 if (!label) {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
312 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
313 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
314 nk_label(context, label, NK_TEXT_LEFT);
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
315 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
316 set_binding = binds[i];
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
317 set_label = strdup(label);
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
318 keycode = 0;
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
319 }
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
320 if (label_alloc) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
321 free(label_alloc);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
322 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
323 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
324 nk_group_end(context);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
325 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
326 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
327
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
328 static char *get_key_name(int32_t keycode)
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
329 {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
330 char *name = NULL;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
331 if (keycode > ' ' && keycode < 0x80) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
332 //key corresponds to a printable non-whitespace character
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
333 name = malloc(2);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
334 name[0] = keycode;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
335 name[1] = 0;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
336 } else {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
337 switch (keycode)
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
338 {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
339 case RENDERKEY_UP: name = "up"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
340 case RENDERKEY_DOWN: name = "down"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
341 case RENDERKEY_LEFT: name = "left"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
342 case RENDERKEY_RIGHT: name = "right"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
343 case '\r': name = "enter"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
344 case ' ': name = "space"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
345 case '\t': name = "tab"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
346 case '\b': name = "backspace"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
347 case RENDERKEY_ESC: name = "esc"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
348 case RENDERKEY_DEL: name = "delete"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
349 case RENDERKEY_LSHIFT: name = "lshift"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
350 case RENDERKEY_RSHIFT: name = "rshift"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
351 case RENDERKEY_LCTRL: name = "lctrl"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
352 case RENDERKEY_RCTRL: name = "rctrl"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
353 case RENDERKEY_LALT: name = "lalt"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
354 case RENDERKEY_RALT: name = "ralt"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
355 case RENDERKEY_HOME: name = "home"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
356 case RENDERKEY_END: name = "end"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
357 case RENDERKEY_PAGEUP: name = "pageup"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
358 case RENDERKEY_PAGEDOWN: name = "pagedown"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
359 case RENDERKEY_F1: name = "f1"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
360 case RENDERKEY_F2: name = "f2"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
361 case RENDERKEY_F3: name = "f3"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
362 case RENDERKEY_F4: name = "f4"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
363 case RENDERKEY_F5: name = "f5"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
364 case RENDERKEY_F6: name = "f6"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
365 case RENDERKEY_F7: name = "f7"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
366 case RENDERKEY_F8: name = "f8"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
367 case RENDERKEY_F9: name = "f9"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
368 case RENDERKEY_F10: name = "f10"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
369 case RENDERKEY_F11: name = "f11"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
370 case RENDERKEY_F12: name = "f12"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
371 case RENDERKEY_SELECT: name = "select"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
372 case RENDERKEY_PLAY: name = "play"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
373 case RENDERKEY_SEARCH: name = "search"; break;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
374 case RENDERKEY_BACK: name = "back"; break;
1549
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
375 case RENDERKEY_NP0: name = "np0"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
376 case RENDERKEY_NP1: name = "np1"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
377 case RENDERKEY_NP2: name = "np2"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
378 case RENDERKEY_NP3: name = "np3"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
379 case RENDERKEY_NP4: name = "np4"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
380 case RENDERKEY_NP5: name = "np5"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
381 case RENDERKEY_NP6: name = "np6"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
382 case RENDERKEY_NP7: name = "np7"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
383 case RENDERKEY_NP8: name = "np8"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
384 case RENDERKEY_NP9: name = "np9"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
385 case RENDERKEY_NP_DIV: name = "np/"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
386 case RENDERKEY_NP_MUL: name = "np*"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
387 case RENDERKEY_NP_MIN: name = "np-"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
388 case RENDERKEY_NP_PLUS: name = "np+"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
389 case RENDERKEY_NP_ENTER: name = "npenter"; break;
577253765192 Allow numpad keys to be mapped
Michael Pavone <pavone@retrodev.com>
parents: 1545
diff changeset
390 case RENDERKEY_NP_STOP: name = "np."; break;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
391 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
392 if (name) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
393 name = strdup(name);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
394 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
395 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
396 return name;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
397 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
398
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
399 void view_key_bindings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
400 {
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
401 const char *controller1_binds[] = {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
402 "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
403 "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
404 "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
405 "gamepads.1.start", "gamepads.1.mode"
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
406 };
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
407 const char *controller2_binds[] = {
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
408 "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
409 "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
410 "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
411 "gamepads.2.start", "gamepads.2.mode"
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
412 };
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
413 const char *general_binds[] = {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
414 "ui.exit", "ui.save_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
415 "ui.screenshot", "ui.sms_pause", "ui.toggle_keyboard_cpatured", "ui.release_mouse"
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
416 };
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
417 const char *general_names[] = {
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
418 "Show Menu", "Quick Save", "Toggle Fullscreen", "Soft Reset", "Reload Media",
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
419 "Internal Screenshot", "SMS Pause", "Capture Keyboard", "Release Mouse"
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
420 };
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
421 const char *speed_binds[] = {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
422 "ui.next_speed", "ui.prev_speed",
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
423 "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
424 "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
425 };
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
426 const char *speed_names[] = {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
427 "Next", "Previous",
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
428 "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
429 "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
430 };
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
431 const char *debug_binds[] = {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
432 "ui.enter_debugger", "ui.vdp_debug_mode", "ui.vdp_debug_pal"
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
433 };
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
434 const char *debug_names[] = {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
435 "Enter Debugger", "VDP Debug Mode", "Debug Palette"
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
436 };
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
437 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
438 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
439 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
440 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
441 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
442 static tern_node *binding_lookup;
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
443 if (!binding_lookup) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
444 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
445 if (bindings) {
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
446 tern_foreach(bindings, binding_loop, &binding_lookup);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
447 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
448 }
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
449 uint32_t width = render_width();
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
450 uint32_t height = render_height();
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
451 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
452 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
453 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
454 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
455 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
456 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
457 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
458 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
459 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
460 }
1520
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
461 nk_end(context);
cb3c6395b28c Initial work on keyboard binding settings view
Michael Pavone <pavone@retrodev.com>
parents: 1501
diff changeset
462 }
1521
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
463 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
464 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
465 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
466 nk_label(context, set_label, NK_TEXT_CENTERED);
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
467 if (nk_button_label(context, "Cancel")) {
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
468 free(set_label);
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
469 set_binding = set_label = NULL;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
470 } else if (keycode) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
471 char *name = get_key_name(keycode);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
472 if (name) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
473 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
474 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
475 if (old) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
476 uint32_t suffix_len = strlen(old) + 1;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
477 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
478 memcpy(old_path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
479 memcpy(old_path + prefix_len, old, suffix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
480 old_path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
481 tern_val old_val;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
482 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
483 free(old_val.ptrval);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
484 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
485 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
486 uint32_t suffix_len = strlen(name) + 1;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
487 char *path = malloc(prefix_len + suffix_len + 1);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
488 memcpy(path, "bindings\0keys\0", prefix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
489 memcpy(path + prefix_len, name, suffix_len);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
490 path[prefix_len + suffix_len] = 0;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
491
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
492 config_dirty = 1;
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
493 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
494 free(path);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
495 free(name);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
496 tern_free(binding_lookup);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
497 binding_lookup = NULL;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
498 }
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
499 free(set_label);
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
500 set_binding = set_label = NULL;
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 nk_end(context);
a51721408c15 More fleshed out keyboard bindings view
Michael Pavone <pavone@retrodev.com>
parents: 1520
diff changeset
503 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
504 }
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
505
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
506 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
507 static controller_info selected_controller_info;
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
508 static struct nk_image controller_360_image, controller_ps4_image;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
509 static uint32_t controller_360_width, controller_360_height, controller_ps4_width, controller_ps4_height;
1572
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size
Michael Pavone <pavone@retrodev.com>
parents: 1571
diff changeset
510 //#define MIN_BIND_BOX_WIDTH 140
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
511 #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
512
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
513 #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
514 #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
515 #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
516 #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
517 enum {
1623
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
518 UP,DOWN,RIGHT,LEFT,NUM_AXIS_DIRS
1598
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
519 };
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
520
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
521 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
522 [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
523 [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
524 [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
525 [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
526 [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
527 [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
528 [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
529 [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
530 [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
531 [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
532 };
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
533
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
534 typedef struct {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
535 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
536 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
537 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
538 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
539 } 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
540
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
541 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)
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
542 {
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
543 const struct nk_user_font *font = context->style.font;
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
544 float row_height = font->height * 2;
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
545
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
546 char const **labels = calloc(sizeof(char *), num_binds);
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
547 char const **conf_vals = calloc(sizeof(char *), num_binds);
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
548 float max_width = 0.0f;
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
549
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
550 int skipped = 0;
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
551 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
552 {
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
553 if (binds[i] & AXIS) {
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
554 labels[i] = get_axis_label(&selected_controller_info, binds[i] & ~AXIS);
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
555 conf_vals[i] = bindings->triggers[(binds[i] & ~AXIS) - SDL_CONTROLLER_AXIS_TRIGGERLEFT];
1598
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
556 } else if (binds[i] & STICKDIR) {
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
557 static char const * dirs[] = {"Up", "Down", "Right", "Left"};
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
558 labels[i] = dirs[binds[i] & 3];
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
559 conf_vals[i] = (binds[i] & LEFTSTICK ? bindings->left_stick : bindings->right_stick)[binds[i] & 3];
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
560 } else {
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
561 labels[i] = get_button_label(&selected_controller_info, binds[i]);
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
562 conf_vals[i] = bindings->button_binds[binds[i]];
1599
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
563 }
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
564 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
565 skipped++;
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
566 continue;
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
567 }
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
568 float lb_width = font->width(font->userdata, font->height, labels[i], strlen(labels[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
569 max_width = max_width < lb_width ? lb_width : max_width;
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
570 }
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
571 nk_layout_space_push(context, nk_rect(x, y, width, (num_binds - skipped) * (row_height + 4) + 4));
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
572 nk_group_begin(context, name, NK_WINDOW_BORDER | NK_WINDOW_NO_SCROLLBAR);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
573
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
574 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
575 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
576 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
577 {
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
578 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
579 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
580 }
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 nk_label(context, labels[i], NK_TEXT_LEFT);
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
582 nk_button_label(context, conf_vals[i] ? conf_vals[i] : "None");
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
583 }
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
584 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
585 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
586 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
587 }
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
588
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
589 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
590 {
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
591 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
592 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
593 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
594 }
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
595 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
596 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
597 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
598 }
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
599 }
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
600
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
601 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
602 {
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
603 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
604 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
605 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
606 }
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
607 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
608 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
609 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
610 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
611 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
612 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
613 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
614 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
615 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
616 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
617 } 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
618 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
619 }
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
620 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
621 {
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
622 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
623 case SDL_CONTROLLER_AXIS_LEFTY:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
624 bindings->left_stick[(axis - SDL_CONTROLLER_AXIS_LEFTX) * 2 + is_negative] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
625 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
626 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
627 case SDL_CONTROLLER_AXIS_RIGHTY:
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
628 bindings->right_stick[(axis - SDL_CONTROLLER_AXIS_RIGHTX) * 2 + is_negative] = val.ptrval;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using
Michael Pavone <pavone@retrodev.com>
parents: 1609
diff changeset
629 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
630 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
631 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
632 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
633 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
634 }
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
635 }
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
636
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
637 void view_controller_bindings(struct nk_context *context)
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
638 {
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
639 static pad_bind_config *bindings;
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
640 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
641 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
642 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
643 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
644 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
645 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
646 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
647 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
648 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
649 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
650 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
651 {
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
652 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
653 }
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
654 }
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
655 }
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
656
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
657 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
658 def_font->handle.height *= 0.5f;
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size
Michael Pavone <pavone@retrodev.com>
parents: 1571
diff changeset
659
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
660 uint32_t avail_height = render_height() - 2 * orig_height;
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
661 float desired_width = render_width() * 0.5f, desired_height = avail_height * 0.5f;
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
662 uint32_t controller_width, controller_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
663 if (selected_controller_info.type == TYPE_PSX) {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
664 controller_width = controller_ps4_width;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
665 controller_height = controller_ps4_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
666 } else {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
667 controller_width = controller_360_width;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
668 controller_height = controller_360_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
669 }
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
670
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
671 float controller_ratio = (float)controller_width / (float)controller_height;
1572
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size
Michael Pavone <pavone@retrodev.com>
parents: 1571
diff changeset
672
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
673 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
674 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
675 + def_font->handle.width(font->userdata, font->height, "Internal Screenshot", strlen("Internal Screenshot"));
5efeca06d942 Scale UI font size based on window size and start basing widget sizes based on font size
Michael Pavone <pavone@retrodev.com>
parents: 1571
diff changeset
676
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
677 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
678 desired_width = render_width() - 2.5f*MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
679 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
680
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
681 if (desired_width / desired_height > controller_ratio) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
682 desired_width = desired_height * controller_ratio;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
683 } else {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
684 desired_height = desired_width / controller_ratio;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
685 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
686 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
687 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
688 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
689 float img_bot = img_top + desired_height;
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
690 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
691 nk_layout_space_push(context, nk_rect(img_left, img_top, desired_width, desired_height));
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
692 nk_image(context, selected_controller_info.type == TYPE_PSX ? controller_ps4_image : controller_360_image);
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
693
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
694 float bind_box_width = (render_width() - img_right) * 0.8f;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
695 if (bind_box_width < MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
696 bind_box_width = render_width() - img_right;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
697 if (bind_box_width > MIN_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
698 bind_box_width = MIN_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
699 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
700 } else if (bind_box_width > MAX_BIND_BOX_WIDTH) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
701 bind_box_width = MAX_BIND_BOX_WIDTH;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
702 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
703 float bind_box_left;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
704 if (bind_box_width >= (render_width() - img_right)) {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
705 bind_box_left = img_right;
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
706 } else {
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
707 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
708 }
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
709
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
710 binding_box(context, bindings, "Action Buttons", bind_box_left, img_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
711 SDL_CONTROLLER_BUTTON_A,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
712 SDL_CONTROLLER_BUTTON_B,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
713 SDL_CONTROLLER_BUTTON_X,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
714 SDL_CONTROLLER_BUTTON_Y
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
715 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
716
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
717 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width, 2, (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
718 SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
719 AXIS | SDL_CONTROLLER_AXIS_TRIGGERRIGHT
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
720 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
721
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
722 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
723 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
724 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
725 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
726 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
727
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
728 binding_box(context, bindings, "Right Stick", img_right - desired_width/3, img_bot, bind_box_width, 5, (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
729 RIGHTSTICK | 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
730 RIGHTSTICK | 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
731 RIGHTSTICK | 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
732 RIGHTSTICK | 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
733 SDL_CONTROLLER_BUTTON_RIGHTSTICK
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
734 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
735
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
736
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
737 bind_box_left -= img_right;
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
738 binding_box(context, bindings, "Left Stick", bind_box_left, img_top, bind_box_width, 5, (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
739 LEFTSTICK | 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
740 LEFTSTICK | 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
741 LEFTSTICK | 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
742 LEFTSTICK | 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
743 SDL_CONTROLLER_BUTTON_LEFTSTICK
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
744 });
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
745
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
746 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width, 2, (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
747 SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
748 AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
749 });
5e2af89c3467 Made controller binding page more resolution independent. Added binding boxes for all buttons/axes
Michael Pavone <pavone@retrodev.com>
parents: 1596
diff changeset
750
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
751 binding_box(context, bindings, "D-pad", img_left - desired_width/6, img_bot + font->height * 1.5, 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
752 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
753 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
754 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
755 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
756 });
1571
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
757
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
758 nk_layout_space_end(context);
3def7b216a5b WIP controller binding view
Michael Pavone <pavone@retrodev.com>
parents: 1570
diff changeset
759
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
760 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
761 nk_layout_row_static(context, orig_height + 4, (render_width() - 2*orig_height) / 4, 1);
1545
3faf917bab56 Add back button to Key binding view and add a window and back button to empty controller view so you can always get back to the main menu
Michael Pavone <pavone@retrodev.com>
parents: 1527
diff changeset
762 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
763 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
764 }
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
765 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
766 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
767 }
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
768
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
769 static int current_button;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
770 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
771 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
772 static int hat_moved, hat_value, last_hat, last_hat_value;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
773 static int axis_moved, axis_value, last_axis;
1600
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
774 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
775 static size_t mapping_pos;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
776
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
777 static void start_mapping(void)
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
778 {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
779 const char *name;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
780 mapping_string[mapping_pos++] = ',';
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
781 if (current_button != SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
782 name = SDL_GameControllerGetStringForButton(current_button);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
783 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
784 name = SDL_GameControllerGetStringForAxis(current_axis);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
785 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
786 size_t namesz = strlen(name);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
787 memcpy(mapping_string + mapping_pos, name, namesz);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
788 mapping_pos += namesz;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
789 mapping_string[mapping_pos++] = ':';
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
790 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
791
1605
f7b1d983d5c0 Bump up pause between mapping inputs
Michael Pavone <pavone@retrodev.com>
parents: 1604
diff changeset
792 #define QUIET_FRAMES 9
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
793 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
794 {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
795 char buffer[512];
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
796 static int quiet;
1600
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
797 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
798 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
799 nk_layout_row_static(context, render_height() - context->style.font->height, render_width() - context->style.font->height, 1);
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
800 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
801 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
802 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
803 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
804 }
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
805 nk_label(context, buffer, NK_TEXT_CENTERED);
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
806 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
807 --quiet;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
808 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
809 if (button_pressed >= 0 && button_pressed != last_button) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
810 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
811 mapping_string[mapping_pos++] = 'b';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
812 if (button_pressed > 9) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
813 mapping_string[mapping_pos++] = '0' + button_pressed / 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
814 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
815 mapping_string[mapping_pos++] = '0' + button_pressed % 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
816 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
817 last_button = button_pressed;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
818 } 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
819 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
820 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
821 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
822 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
823 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
824 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
825
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
826 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
827 last_hat_value = hat_value;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
828 } else if (axis_moved >= 0 && abs(axis_value) > 1000 && axis_moved != last_axis) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
829 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
830 mapping_string[mapping_pos++] = 'a';
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
831 if (axis_moved > 9) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
832 mapping_string[mapping_pos++] = '0' + axis_moved / 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
833 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
834 mapping_string[mapping_pos++] = '0' + axis_moved % 10;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
835 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
836 last_axis = axis_moved;
1600
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
837 }
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
838 }
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
839
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
840 if (added_mapping) {
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
841 quiet = QUIET_FRAMES;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
842 if (current_button < SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
843 current_button++;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
844 if (current_button == SDL_CONTROLLER_BUTTON_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
845 current_axis = 0;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
846 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
847 } else {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
848 current_axis++;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
849 if (current_axis == SDL_CONTROLLER_AXIS_MAX) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
850 mapping_string[mapping_pos] = 0;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
851 save_controller_mapping(selected_controller, mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
852 free(mapping_string);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
853 pop_view();
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
854 push_view(view_controller_bindings);
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
855 }
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
856 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
857 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
858 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
859 hat_moved = -1;
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
860 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
861 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
862 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
863 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
864
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
865 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
866 {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
867 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
868 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
869 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
870 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
871 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
872 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
873 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
874 if (nk_button_label(context, "4 face buttons")) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
875 selected_controller_info.variant = VARIANT_NORMAL;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
876 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
877 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
878 char buffer[512];
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
879 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
880 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER),
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
881 get_axis_label(&selected_controller_info, SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
882 );
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
883 if (nk_button_label(context, buffer)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
884 selected_controller_info.variant = VARIANT_6B_RIGHT;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
885 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
886 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
887 snprintf(buffer, sizeof(buffer), "6 face buttons including %s and %s",
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
888 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_LEFTSHOULDER),
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
889 get_button_label(&selected_controller_info, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
890 );
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
891 if (nk_button_label(context, buffer)) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
892 selected_controller_info.variant = VARIANT_6B_BUMPERS;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
893 selected = 1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
894 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
895 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
896 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
897 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
898 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
899 pop_view();
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
900 SDL_GameController *controller = render_get_controller(selected_controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
901 if (controller) {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
902 push_view(view_controller_bindings);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
903 SDL_GameControllerClose(controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
904 } else {
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
905 current_button = SDL_CONTROLLER_BUTTON_A;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
906 button_pressed = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
907 last_button = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
908 last_hat = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
909 axis_moved = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
910 last_axis = -1;
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
911 SDL_Joystick *joy = render_get_joystick(selected_controller);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
912 const char *name = SDL_JoystickName(joy);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
913 size_t namesz = strlen(name);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
914 mapping_string = malloc(512 + namesz);
1604
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
915 for (mapping_pos = 0; mapping_pos < namesz; mapping_pos++)
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
916 {
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
917 char c = name[mapping_pos];
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
918 if (c == ',' || c == '\n' || c == '\r') {
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
919 c = ' ';
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
920 }
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
921 mapping_string[mapping_pos] = c;
68b05322d971 Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
Michael Pavone <pavone@retrodev.com>
parents: 1602
diff changeset
922 }
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
923
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
924 push_view(view_controller_mappings);
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
925 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
926 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
927 }
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
928
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
929 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
930 {
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
931 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
932 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
933 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
934 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
935 {
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
936 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
937 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
938 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
939 pop_view();
1602
b452887f85b4 Basic UI for selecting layout variants + minor fix to SDL2 mapping generation UI
Michael Pavone <pavone@retrodev.com>
parents: 1601
diff changeset
940 push_view(view_controller_variant);
1599
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
941 }
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
942 }
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
943 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
944 }
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
945 }
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
946
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
947 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
948 {
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
949 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
950 controller_type_group(context, "Xbox", TYPE_XBOX, SUBTYPE_XBOX, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
951 "Original", "Xbox 360", "Xbox One"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
952 }, 3);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
953 controller_type_group(context, "Playstation", TYPE_PSX, SUBTYPE_PS3, (const char *[]){
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
954 "PS3", "PS4"
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
955 }, 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
956 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
957 "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
958 }, 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
959 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
960 "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
961 }, 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
962 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
963 }
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
964 }
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
965
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
966 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
967 {
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
968 if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
969 int height = (render_width() - 2*context->style.font->height) / MAX_JOYSTICKS;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
970 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
971 {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
972 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
973 if (joy) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
974 controller_info info = get_controller_info(i);
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
975 uint32_t controller_width, controller_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
976 if (info.type == TYPE_PSX) {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
977 controller_width = controller_ps4_width;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
978 controller_height = controller_ps4_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
979 } else {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
980 controller_width = controller_360_width;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
981 controller_height = controller_360_height;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
982 }
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
983 int image_width = height * controller_width / controller_height;
1596
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
984 nk_layout_row_begin(context, NK_STATIC, height, 2);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
985 nk_layout_row_push(context, image_width);
1599
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
986 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
987 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
988 } 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
989 nk_image(context, info.type == TYPE_PSX ? controller_ps4_image : controller_360_image);
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
990 }
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
991 nk_layout_row_push(context, render_width() - image_width - 2 * context->style.font->height);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
992 if (nk_button_label(context, info.name)) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
993 selected_controller = i;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
994 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
995 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
996 push_view(view_controller_type);
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
997 } else {
1fc61c844ec5 Allow selecting controller type when controllers have an SDL 2 mapping, but heuristics fail to idenify details
Michael Pavone <pavone@retrodev.com>
parents: 1598
diff changeset
998 push_view(view_controller_bindings);
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
999 }
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
1000
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
1001 }
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
1002 nk_layout_row_end(context);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
Michael Pavone <pavone@retrodev.com>
parents: 1593
diff changeset
1003 }
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
1004 }
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
1005 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
1006 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
1007 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
1008 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
1009 }
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
1010 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
1011 }
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
1012 }
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
1013
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1014 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
1015 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1016 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
1017 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1018 uint8_t newval = nk_check_label(context, "", curval);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1019 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
1020 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1021 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
1022 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1023 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1024
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1025 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
1026 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1027 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1028 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1029 uint32_t curval;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1030 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
1031 uint32_t len = strlen(curstr);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1032 if (len > 11) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1033 len = 11;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1034 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1035 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
1036 memset(buffer+len, 0, sizeof(buffer)-len);
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1037 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
1038 buffer[len] = 0;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1039 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
1040 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1041 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
1042 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1043 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1044
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1045 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
1046 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1047 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
1048 int curval = curstr ? atoi(curstr) : def;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1049 nk_label(context, label, NK_TEXT_LEFT);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1050 int val = curval;
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1051 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
1052 if (val != curval) {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1053 char buffer[12];
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1054 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
1055 config_dirty = 1;
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1056 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
1057 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1058 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1059
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1060 typedef struct {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1061 char *fragment;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1062 char *vertex;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1063 } shader_prog;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1064
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1065 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
1066 {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1067 uint32_t num_progs = *num_existing;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1068 uint32_t prog_storage = *storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1069 uint32_t starting = num_progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1070
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1071 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
1072 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1073 continue;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1074 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1075 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
1076 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1077 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
1078 uint8_t dupe = 0;;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1079 for (uint32_t j = 0; j < starting; j++) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1080 if (!strcmp(entries[i].name, progs[j].fragment)) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1081 dupe = 1;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1082 break;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1083 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1084 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1085 if (!dupe) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1086 if (num_progs == prog_storage) {
1493
24f44f26b74d Fix buffer overrun in video settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1492
diff changeset
1087 prog_storage = prog_storage ? prog_storage*2 : 4;
1492
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1088 progs = realloc(progs, sizeof(progs) * prog_storage);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1089 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1090 progs[num_progs].vertex = NULL;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1091 progs[num_progs++].fragment = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1092 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1093 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1094 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1095 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1096
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1097 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
1098 if (entries[i].is_dir) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1099 continue;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1100 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1101 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
1102 uint32_t len = strlen(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1103 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
1104 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
1105 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
1106 progs[j].vertex = strdup(entries[i].name);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1107 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1108 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1109 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1110 free(no_ext);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1111 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1112 free_dir_list(entries, num_entries);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1113 *num_existing = num_progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1114 *storage = prog_storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1115 return progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1116 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1117
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1118 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
1119 {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1120 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
1121 size_t num_entries;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1122 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
1123 free(shader_dir);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1124 shader_prog *progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1125 uint32_t num_progs = 0, prog_storage;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1126 if (num_entries) {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1127 progs = calloc(num_entries, sizeof(shader_prog));
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1128 prog_storage = num_entries;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1129 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
1130 } else {
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1131 progs = NULL;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1132 prog_storage = 0;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1133 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1134 shader_dir = path_append(get_exe_dir(), "shaders");
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1135 entries = get_dir_list(shader_dir, &num_entries);
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1136 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
1137 *num_out = num_progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1138 return progs;
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1139 }
bdeb2a1d0385 Add shader selector to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1491
diff changeset
1140
1499
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1141 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
1142 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1143 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
1144 int32_t selected = -1;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1145 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1146 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1147 if (!strcmp(setting, options[i])) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1148 selected = i;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1149 break;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1150 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1151 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1152 if (selected == -1) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1153 for (uint32_t i = 0; i < num_options; i++)
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1154 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1155 if (!strcmp(def, options[i])) {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1156 selected = i;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1157 break;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1158 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1159 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1160 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1161 return selected;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1162 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1163
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1164 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
1165 {
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1166 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
1167 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
1168 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
1169 config_dirty = 1;
1499
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1170 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
1171 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1172 return next;
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1173 }
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1174
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1175 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
1176 {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1177 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
1178 }
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1179
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1180 void view_video_settings(struct nk_context *context)
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1181 {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1182 const char *vsync_opts[] = {"on", "off", "tear"};
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1183 const char *vsync_opt_names[] = {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1184 "On",
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1185 "Off",
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1186 "On, tear if late"
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1187 };
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1188 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
1189 static shader_prog *progs;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1190 static char **prog_names;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1191 static uint32_t num_progs;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1192 static uint32_t selected_prog;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1193 static int32_t selected_vsync = -1;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1194 if (selected_vsync < 0) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1195 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
1196 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1197 if(!progs) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1198 progs = get_shader_list(&num_progs);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1199 prog_names = calloc(num_progs, sizeof(char*));
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1200 for (uint32_t i = 0; i < num_progs; i++)
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1201 {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1202 prog_names[i] = basename_no_extension(progs[i].fragment);;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1203 uint32_t len = strlen(prog_names[i]);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1204 if (len > 2) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1205 prog_names[i][len-2] = 0;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1206 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1207 if (!progs[i].vertex) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1208 progs[i].vertex = strdup("default.v.glsl");
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1209 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1210 if (!strcmp(
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1211 progs[i].fragment,
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1212 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
1213 )) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1214 selected_prog = i;
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1215 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1216 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1217 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1218 uint32_t width = render_width();
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1219 uint32_t height = render_height();
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1220 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
1221 if (desired_width > width) {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1222 desired_width = width;
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1223 }
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1224 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
1225 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
1226 settings_toggle(context, "Fullscreen", "video\0fullscreen\0", 0);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1227 settings_toggle(context, "Open GL", "video\0gl\0", 1);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1228 settings_toggle(context, "Scanlines", "video\0scanlines\0", 0);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1229 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
1230 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
1231 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
1232 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
1233 if (next_selected != selected_prog) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1234 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
1235 config_dirty = 1;
1553
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1236 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
1237 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
1238 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1239 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
1240 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
1241 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
1242 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
1243 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
1244 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
1245 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
1246 settings_int_property(context, "", "Right", "video\0pal\0overscan\0right\0", 14, 0, 32);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1247
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1248 if (nk_button_label(context, "Back")) {
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1249 pop_view();
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1250 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1251 nk_end(context);
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1252 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1253 }
723c00950f41 Added vsync to video settings
Michael Pavone <pavone@retrodev.com>
parents: 1549
diff changeset
1254
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1255 void view_audio_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1256 {
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1257 const char *rates[] = {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1258 "192000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1259 "96000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1260 "48000",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1261 "44100",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1262 "22050"
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1263 };
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1264 const char *sizes[] = {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1265 "1024",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1266 "512",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1267 "256",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1268 "128",
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1269 "64"
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1270 };
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1271 const uint32_t num_rates = sizeof(rates)/sizeof(*rates);
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1272 const uint32_t num_sizes = sizeof(sizes)/sizeof(*sizes);
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1273 static int32_t selected_rate = -1;
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1274 static int32_t selected_size = -1;
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1275 if (selected_rate < 0 || selected_size < 0) {
1499
756f8616d1bf Refactor basic settings dropdowns
Michael Pavone <pavone@retrodev.com>
parents: 1498
diff changeset
1276 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
1277 selected_size = find_match(sizes, num_sizes, "audio\0buffer\0", "512");
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1278 }
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1279 uint32_t width = render_width();
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1280 uint32_t height = render_height();
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1281 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
1282 if (desired_width > width) {
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1283 desired_width = width;
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1284 }
1494
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1285 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
1286 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
1287 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
1288 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
1289 settings_int_input(context, "Lowpass Cutoff Hz", "audio\0lowpass_cutoff\0", "3390");
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1290 if (nk_button_label(context, "Back")) {
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1291 pop_view();
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1292 }
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1293 nk_end(context);
8be6ea919300 Fleshed out audio settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1493
diff changeset
1294 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1295 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1296 void view_system_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1297 {
1568
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1298 const char *sync_opts[] = {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1299 "video",
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1300 "audio"
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1301 };
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1302 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
1303 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
1304 if (selected_sync < 0) {
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1305 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
1306 }
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1307 const char *regions[] = {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1308 "J - Japan",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1309 "U - Americas",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1310 "E - Europe"
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1311 };
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1312 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
1313 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
1314 static int32_t selected_region = -1;
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1315 if (selected_region < 0) {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1316 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
1317 }
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1318 const char *formats[] = {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1319 "native",
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1320 "gst"
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1321 };
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1322 const uint32_t num_formats = sizeof(formats)/sizeof(*formats);
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1323 int32_t selected_format = -1;
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1324 if (selected_format < 0) {
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1325 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
1326 }
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1327 const char *ram_inits[] = {
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1328 "zero",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1329 "random"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1330 };
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1331 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
1332 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
1333 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
1334 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
1335 }
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1336 const char *io_opts_1[] = {
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1337 "gamepad2.1",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1338 "gamepad3.1",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1339 "gamepad6.1",
1575
ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1573
diff changeset
1340 "mouse.1",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1341 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1342 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1343 };
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1344 const char *io_opts_2[] = {
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1345 "gamepad2.2",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1346 "gamepad3.2",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1347 "gamepad6.2",
1575
ccb3a8ae7ad0 Fix config value set when "Mega Mouse" is selected in settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1573
diff changeset
1348 "mouse.1",
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1349 "saturn keyboard",
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1350 "xband keyboard"
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1351 };
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1352 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
1353 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
1354 const uint32_t num_io = sizeof(io_opts_1)/sizeof(*io_opts_1);
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1355 if (selected_io_1 < 0 || selected_io_2 < 0) {
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1356 selected_io_1 = find_match(io_opts_1, num_io, "io\0devices\0""1\0", "gamepad6.1");
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1357 selected_io_2 = find_match(io_opts_2, num_io, "io\0devices\0""2\0", "gamepad6.2");
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1358 }
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1359
1498
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1360 uint32_t width = render_width();
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1361 uint32_t height = render_height();
1578
aaa28c9bf67d Basic interface scaling for rest of settings UI
Michael Pavone <pavone@retrodev.com>
parents: 1577
diff changeset
1362 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
1363 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
1364 nk_layout_row_static(context, context->style.font->height, desired_width, 2);
1568
d14490dee01f Add sync_source to default.cfg and the Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1554
diff changeset
1365 selected_sync = settings_dropdown(context, "Sync Source", sync_opts, num_sync_opts, selected_sync, "system\0sync_source\0");
1498
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1366 settings_int_property(context, "68000 Clock Divider", "", "clocks\0m68k_divider\0", 7, 1, 53);
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1367 settings_toggle(context, "Remember ROM Path", "ui\0remember_path\0", 1);
1500
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1368 selected_region = settings_dropdown_ex(context, "Default Region", region_codes, regions, num_regions, selected_region, "system\0default_region\0");
39a199dca772 Added dropdowns for default region and savestate format
Michael Pavone <pavone@retrodev.com>
parents: 1499
diff changeset
1369 selected_format = settings_dropdown(context, "Save State Format", formats, num_formats, selected_format, "ui\0state_format\0");
1501
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1370 selected_init = settings_dropdown(context, "Initial RAM Value", ram_inits, num_inits, selected_init, "system\0ram_init\0");
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1371 selected_io_1 = settings_dropdown_ex(context, "IO Port 1 Device", io_opts_1, device_type_names, num_io, selected_io_1, "io\0devices\0""1\0");
31a2997b745e Added RAM init and IO port config to system settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1500
diff changeset
1372 selected_io_2 = settings_dropdown_ex(context, "IO Port 2 Device", io_opts_2, device_type_names, num_io, selected_io_2, "io\0devices\0""2\0");
1498
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1373 if (nk_button_label(context, "Back")) {
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1374 pop_view();
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1375 }
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1376 nk_end(context);
050a5b032bc5 Initial work on system menu
Michael Pavone <pavone@retrodev.com>
parents: 1494
diff changeset
1377 }
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1378 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1379
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1380 void view_back(struct nk_context *context)
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1381 {
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1382 pop_view();
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1383 pop_view();
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1384 current_view(context);
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1385 }
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1386
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1387 void view_settings(struct nk_context *context)
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1388 {
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1389 static menu_item items[] = {
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1390 {"Key Bindings", view_key_bindings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1391 {"Controllers", view_controllers},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1392 {"Video", view_video_settings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1393 {"Audio", view_audio_settings},
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1394 {"System", view_system_settings},
1491
e890971f3757 Somewhat fleshed out video settings view
Michael Pavone <pavone@retrodev.com>
parents: 1490
diff changeset
1395 {"Back", view_back}
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1396 };
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1397
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1398 if (nk_begin(context, "Settings Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1399 menu(context, sizeof(items)/sizeof(*items), items);
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1400 nk_end(context);
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1401 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1402 }
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1403
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1404 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
1405 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1406 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
1407 {"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
1408 {"Load ROM", view_load},
1487
6a35815cc409 Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1486
diff changeset
1409 {"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
1410 {"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
1411 {"Load State", view_load_state},
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1412 {"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
1413 {"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
1414 };
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1415
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1416 if (nk_begin(context, "Main Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1417 menu(context, sizeof(items)/sizeof(*items), items);
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1418 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
1419 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1420 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1421
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1422 void view_menu(struct nk_context *context)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1423 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1424 static menu_item items[] = {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1425 {"Load ROM", view_load},
1490
919c0c33885e Initial work on settings menu
Michael Pavone <pavone@retrodev.com>
parents: 1487
diff changeset
1426 {"Settings", view_settings},
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1427 {"About", view_about},
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1428 {"Exit", NULL}
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1429 };
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1430
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1431 if (nk_begin(context, "Main Menu", nk_rect(0, 0, render_width(), render_height()), 0)) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1432 menu(context, sizeof(items)/sizeof(*items), items);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1433 nk_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1434 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1435 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1436
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1437 void blastem_nuklear_render(void)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1438 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1439 nk_input_end(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1440 current_view(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1441 nk_sdl_render(NK_ANTI_ALIASING_ON, 512 * 1024, 128 * 1024);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1442 nk_input_begin(context);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1443 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1444
1486
a6881d0d76d0 Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents: 1485
diff changeset
1445 void ui_idle_loop(void)
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1446 {
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
1447 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
1448 static uint32_t last;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1449 while (current_view != view_play)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1450 {
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
1451 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
1452 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
1453 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
1454 }
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
1455 last = current;
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1456 render_update_display();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1457 }
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
1458 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
1459 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
1460 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
1461 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
1462 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1463 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1464 static void handle_event(SDL_Event *event)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1465 {
1522
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
1466 if (event->type == SDL_KEYDOWN) {
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
1467 keycode = event->key.keysym.sym;
63659fb92db4 Key binding menu is now functional
Michael Pavone <pavone@retrodev.com>
parents: 1521
diff changeset
1468 }
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
1469 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
1470 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
1471 }
7f39c40b4b25 WIP UI for creating an SDL2 mapping for controllers that don't have one
Michael Pavone <pavone@retrodev.com>
parents: 1599
diff changeset
1472 else if (event->type == SDL_JOYHATMOTION) {
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1473 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
1474 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
1475 }
1601
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1476 else if (event->type == SDL_JOYAXISMOTION) {
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1477 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
1478 axis_moved = event->jaxis.axis;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1479 axis_value = event->jaxis.value;
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1480 }
da04dd9c89ad SDL2 mapping UI now handles axes
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1481 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1482 nk_sdl_handle_event(event);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1483 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1484
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1485 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
1486 {
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
1487 nk_sdl_shutdown();
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1488 }
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
1489
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1490 static uint32_t *controller_360_buf, *controller_ps4_buf;
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1491
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1492 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
1493 {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1494 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
1495 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
1496 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
1497 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
1498 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
1499 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
1500 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 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
1501 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE, buf);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1502 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
1503 }
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
1504
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
1505 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
1506 {
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1507 struct nk_font_atlas *atlas;
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1508 nk_sdl_font_stash_begin(&atlas);
1527
4f6e8acd7b6a Added support for TTC and dfont format true type fonts. More robust font selection on Windows
Michael Pavone <pavone@retrodev.com>
parents: 1526
diff changeset
1509 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
1510 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
1511 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
1512 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
1513 }
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
1514 def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, render_height() / 16, NULL);
1593
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1581
diff changeset
1515 free(font);
1476
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1516 nk_sdl_font_stash_end();
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1517 nk_style_set_font(context, &def_font->handle);
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
1518 if (controller_360_buf) {
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1519 controller_360_image = load_image_texture(controller_360_buf, controller_360_width, controller_360_height);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1520 }
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1521 if (controller_ps4_buf) {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1522 controller_ps4_image = load_image_texture(controller_ps4_buf, controller_ps4_width, controller_ps4_height);
1570
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated
Michael Pavone <pavone@retrodev.com>
parents: 1569
diff changeset
1523 }
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
1524 }
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
1525
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
1526 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
1527 {
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
1528 context = nk_sdl_init(render_get_window());
1570
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated
Michael Pavone <pavone@retrodev.com>
parents: 1569
diff changeset
1529 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
1530 }
0646ae0987c3 Fix UI rendering in fullscreen and wome initial work on the "pause" menu
Michael Pavone <pavone@retrodev.com>
parents: 1475
diff changeset
1531
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1532 void show_pause_menu(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1533 {
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1534 context->style.window.background = nk_rgba(0, 0, 0, 128);
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1535 context->style.window.fixed_background = nk_style_item_color(nk_rgba(0, 0, 0, 128));
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1536 current_view = view_pause;
1486
a6881d0d76d0 Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents: 1485
diff changeset
1537 current_system->request_exit(current_system);
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1538 }
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1539
1581
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
1540 void show_play_view(void)
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
1541 {
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
1542 current_view = view_play;
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
1543 }
7121daaa48c2 Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents: 1579
diff changeset
1544
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1545 static uint8_t active;
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1546 uint8_t is_nuklear_active(void)
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1547 {
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1548 return active;
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1549 }
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1550
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
1551 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
1552 {
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
1553 if (!render_has_gl()) {
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents: 1482
diff changeset
1554 //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
1555 return 0;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents: 1482
diff changeset
1556 }
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
1557 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
1558 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
1559 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
1560 }
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
1561 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
1562 }
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
1563
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1564 static void persist_config_exit(void)
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1565 {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1566 if (config_dirty) {
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1567 persist_config(config);
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1568 }
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1569 }
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1570
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1571 void blastem_nuklear_init(uint8_t file_loaded)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1572 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1573 context = nk_sdl_init(render_get_window());
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1574
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
1575 uint32_t buf_size;
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
1576 uint8_t *buf = (uint8_t *)read_bundled_file("images/360.png", &buf_size);
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
1577 if (buf) {
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
1578 controller_360_buf = load_png(buf, buf_size, &controller_360_width, &controller_360_height);
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
1579 free(buf);
1609
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1580 }
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1581 buf = (uint8_t *)read_bundled_file("images/ps4.png", &buf_size);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1582 if (buf) {
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1583 controller_ps4_buf = load_png(buf, buf_size, &controller_ps4_width, &controller_ps4_height);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1584 free(buf);
9c8f58740450 Added PS4 controller image. Added code to use PS4 image for Playstation controllers
Michael Pavone <pavone@retrodev.com>
parents: 1606
diff changeset
1585 }
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
1586 texture_init();
bc96bb3a0998 Use read_bundle_file for controller PNG. Re-upload texture when GL context is recreated
Michael Pavone <pavone@retrodev.com>
parents: 1569
diff changeset
1587
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1588 current_view = file_loaded ? view_play : view_menu;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1589 render_set_ui_render_fun(blastem_nuklear_render);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1590 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
1591 render_set_gl_context_handlers(context_destroyed, context_created);
1569
0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI
Michael Pavone <pavone@retrodev.com>
parents: 1568
diff changeset
1592
1577
69d624271cf8 Persist config on exit if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1575
diff changeset
1593 atexit(persist_config_exit);
1569
0ec89dadb36d Add code for loading PNG images. Added 360 controller image. WIP work on gamepad mapping UI
Michael Pavone <pavone@retrodev.com>
parents: 1568
diff changeset
1594
1477
1cdd7f492af8 Pause menu now triggered on ui.exit event
Michael Pavone <pavone@retrodev.com>
parents: 1476
diff changeset
1595 active = 1;
1486
a6881d0d76d0 Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents: 1485
diff changeset
1596 ui_idle_loop();
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
diff changeset
1597 }