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