repos/blastem: nuklear_ui/blastem

annotate nuklear_ui/blastem_nuklear.c @ 2401:34b4ff091891

Fix crash when loading a subsequent ROM after lock-on

author	Michael Pavone <pavone@retrodev.com>
date	Mon, 01 Jan 2024 19:27:31 -0800
parents	a71176b9903d
children	130106f5c87a

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

Mercurial > repos > blastem

annotate nuklear_ui/blastem_nuklear.c @ 2401:34b4ff091891