From 0cce73e8ab2a9debf3568ac21b546a2fe8d553b4 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Thu, 10 Jul 2025 07:12:46 -0700 Subject: [PATCH] Format --- src/devices/system.c | 14 ++++++++------ src/uxnemu.c | 13 ++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/devices/system.c b/src/devices/system.c index ac25b82..bfd0640 100644 --- a/src/devices/system.c +++ b/src/devices/system.c @@ -104,23 +104,25 @@ system_expansion(const Uint16 exp) fprintf(stderr, "Unknown command: %s\n", &uxn.ram[exp]); } -char *metadata_read_name() { +char * +metadata_read_name() +{ int i; - if (metadata_addr == 0) + if(metadata_addr == 0) /* we probably do not have any metadata */ return metadata_buffer; - if (uxn.ram[metadata_addr] != 0x00) + if(uxn.ram[metadata_addr] != 0x00) /* metadata should start with a 0 */ return metadata_buffer; - for (i = 1; i < METADATA_LEN; i++) { + for(i = 1; i < METADATA_LEN; i++) { char c = uxn.ram[metadata_addr + i]; - if (c == 0x00 || c == 0x0a) + if(c == 0x00 || c == 0x0a) break; - metadata_buffer[i-1] = c; + metadata_buffer[i - 1] = c; } return metadata_buffer; } diff --git a/src/uxnemu.c b/src/uxnemu.c index ca6ae0f..5d05797 100644 --- a/src/uxnemu.c +++ b/src/uxnemu.c @@ -418,20 +418,15 @@ handle_events(void) } static int -emu_run(char *rom_path) +emu_run(void) { Uint64 next_refresh = 0; Uint64 frame_interval = SDL_GetPerformanceFrequency() / 60; Uint32 window_flags = SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI; + char *rom_name = metadata_read_name(); window_created = 1; if(fullscreen) window_flags = window_flags | SDL_WINDOW_FULLSCREEN_DESKTOP; - - char *window_name = rom_path; - char *rom_name = metadata_read_name(); - if (strlen(rom_name)) - window_name = rom_name; - emu_window = SDL_CreateWindow(rom_name, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, @@ -476,7 +471,7 @@ main(int argc, char **argv) /* flags */ if(argc > 1 && argv[i][0] == '-') { if(!strcmp(argv[i], "-v")) - return system_error("Uxn(gui) - Varvara Emulator", "30 Jun 2025."); + return system_error("Uxn(gui) - Varvara Emulator", "10 Jul 2025."); else if(!strcmp(argv[i], "-2x")) set_zoom(2, 0); else if(!strcmp(argv[i], "-3x")) @@ -493,7 +488,7 @@ main(int argc, char **argv) return system_error("usage:", "uxnemu [-v | -f | -2x | -3x] file.rom [args...]"); /* start */ console_arguments(i, argc, argv); - emu_run(rom_path); + emu_run(); /* end */ SDL_CloseAudioDevice(audio_id); #ifdef _WIN32