d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destroy assets on emu_end

This commit is contained in:
neauoire 2023-08-16 13:37:17 -07:00
parent c09a047851
commit 8edf2da7c8
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/uxn11.c
View File

@ -90,6 +90,17 @@ emu_restart(Uxn *u, char *rom, int soft)
/* set window title */ /* set window title */
} }
static int
emu_end(Uxn *u)
{
free(u->ram);
XDestroyImage(ximage);
XDestroyWindow(display, window);
XCloseDisplay(display);
exit(0);
return u->dev[0x0f] & 0x7f;
}
static void static void
hide_cursor(void) hide_cursor(void)
{ {
@ -131,10 +142,7 @@ emu_event(Uxn *u)
XPutImage(display, window, DefaultGC(display, 0), ximage, 0, 0, PAD, PAD, uxn_screen.width, uxn_screen.height); XPutImage(display, window, DefaultGC(display, 0), ximage, 0, 0, PAD, PAD, uxn_screen.width, uxn_screen.height);
break; break;
case ClientMessage: { case ClientMessage: {
XDestroyImage(ximage); emu_end(u);
XDestroyWindow(display, window);
XCloseDisplay(display);
exit(0);
} break; } break;
case KeyPress: { case KeyPress: {
KeySym sym; KeySym sym;
@ -180,6 +188,9 @@ emu_event(Uxn *u)
static int static int
emu_init(void) emu_init(void)
{ {
display = XOpenDisplay(NULL);
if(!display)
return system_error("X11", "Could not open display");
screen_resize(WIDTH, HEIGHT); screen_resize(WIDTH, HEIGHT);
return 1; return 1;
} }
@ -196,7 +207,6 @@ emu_run(Uxn *u, char *rom)
/* display */ /* display */
Atom wmDelete; Atom wmDelete;
static Visual *visual; static Visual *visual;
display = XOpenDisplay(NULL);
visual = DefaultVisual(display, 0); visual = DefaultVisual(display, 0);
window = XCreateSimpleWindow(display, RootWindow(display, 0), 0, 0, uxn_screen.width * SCALE + PAD * 2, uxn_screen.height * SCALE + PAD * 2, 1, 0, 0); window = XCreateSimpleWindow(display, RootWindow(display, 0), 0, 0, uxn_screen.width * SCALE + PAD * 2, uxn_screen.height * SCALE + PAD * 2, 1, 0, 0);
if(visual->class != TrueColor) if(visual->class != TrueColor)
@ -240,15 +250,6 @@ emu_run(Uxn *u, char *rom)
return 1; return 1;
} }
static int
emu_end(Uxn *u)
{
XDestroyImage(ximage);
close(0);
free(u->ram);
return u->dev[0x0f] & 0x7f;
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {