commit 0184577
Devie Lu Linvega
·
2025-12-26 18:53:54 +0000 UTC
parent f3e0b86
Cleaned up main
1 files changed,
+10,
-9
+10,
-9
1@@ -1132,7 +1132,7 @@ display_floating(void)
2 }
3
4 static unsigned int
5-display_init(void)
6+emu_init(void)
7 {
8 display = XOpenDisplay(NULL);
9 if(!display) return !fprintf(stderr, "Display: failed\n");
10@@ -1229,6 +1229,11 @@ emu_run(void)
11 console_input(0, CONSOLE_STD);
12 }
13 }
14+ if(ximage)
15+ XDestroyImage(ximage);
16+ XDestroyWindow(display, window);
17+ XCloseDisplay(display);
18+ console_close();
19 }
20
21 int
22@@ -1236,7 +1241,7 @@ main(int argc, char **argv)
23 {
24 int i = 1;
25 if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
26- return !fprintf(stdout, "Uxn11 - Varvara Emulator, 24 Dec 2025.\n");
27+ return !fprintf(stdout, "Uxn11 - Varvara Emulator, 26 Dec 2025.\n");
28 else if(argc == 1)
29 return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
30 else if(!system_boot(argv[i++], argc > 2))
31@@ -1251,13 +1256,9 @@ main(int argc, char **argv)
32 console_input('\n', i == argc - 1 ? CONSOLE_END : CONSOLE_EOA);
33 }
34 }
35- if(!display_init())
36- return !fprintf(stdout, "Could not open display.\n");
37+ /* Run */
38+ if(!emu_init())
39+ return !fprintf(stdout, "Could not initialize emulator.\n");
40 emu_run();
41- if(ximage)
42- XDestroyImage(ximage);
43- XDestroyWindow(display, window);
44- XCloseDisplay(display);
45- console_close();
46 return dev[0x0f] & 0x7f;
47 }