commit 8aeda81

Devine Lu Linvega  ·  2025-04-08 23:37:20 +0000 UTC
parent a67c290 
Merged emu_resize and screen_resize
3 files changed,  +6, -12
M src/devices/screen.c
M src/devices/screen.h
M src/uxn11.c
M src/devices/screen.c
+0, -9 
 1@@ -78,15 +78,6 @@ screen_apply(int width, int height)
 2 	uxn_screen.resize = 1;
 3 }
 4 
 5-void
 6-screen_resize(void)
 7-{
 8-	Uint32 *pixels;
 9-	uxn_screen.pixels = realloc(uxn_screen.pixels, uxn_screen.width * uxn_screen.height * sizeof(Uint32) * uxn_screen.zoom * uxn_screen.zoom);
10-	uxn_screen.resize = 0;
11-	emu_resize(uxn_screen.width, uxn_screen.height);
12-}
13-
14 void
15 screen_redraw(void)
16 {
M src/devices/screen.h
+0, -1 
1@@ -20,7 +20,6 @@ extern int emu_resize(int width, int height);
2 int screen_changed(void);
3 void screen_palette(void);
4 void screen_apply(int width, int height);
5-void screen_resize(void);
6 void screen_redraw(void);
7 
8 Uint8 screen_dei(Uint8 addr);
M src/uxn11.c
+6, -2 
 1@@ -73,6 +73,10 @@ emu_deo(Uint8 addr, Uint8 value)
 2 int
 3 emu_resize(int width, int height)
 4 {
 5+	Uint32 *pixels;
 6+	uxn_screen.pixels = realloc(uxn_screen.pixels, uxn_screen.width * uxn_screen.height * sizeof(Uint32) * uxn_screen.zoom * uxn_screen.zoom);
 7+	uxn_screen.resize = 0;
 8+
 9 	width *= uxn_screen.zoom, height *= uxn_screen.zoom;
10 	XResizeWindow(display, window, width, height);
11 	ximage = XCreateImage(display, DefaultVisual(display, 0), DefaultDepth(display, DefaultScreen(display)), ZPixmap, 0, (char *)uxn_screen.pixels, width, height, 32, 0);
12@@ -97,7 +101,7 @@ static void
13 emu_rescale(void)
14 {
15 	uxn_screen.zoom = uxn_screen.zoom >= 3 ? 1 : uxn_screen.zoom + 1;
16-	screen_resize();
17+	emu_resize(uxn_screen.width, uxn_screen.height);
18 }
19 
20 static Uint8
21@@ -243,7 +247,7 @@ emu_run(void)
22 		if(poll(&fds[1], 1, 0)) {
23 			read(fds[1].fd, expirations, 8);
24 			if(uxn_screen.resize)
25-				screen_resize();
26+				emu_resize(uxn_screen.width, uxn_screen.height);
27 			if(uxn_screen.vector)
28 				uxn_eval(uxn_screen.vector);
29 			if(uxn_screen.x2 && uxn_screen.y2 && screen_changed()) {