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

add -2x and -3x to uxn11

This commit is contained in:
~d6 2023-12-09 23:44:03 -05:00
parent 768b99d1db
commit c92249da5b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/uxn11.c
View File

@ -4,6 +4,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#include <string.h>
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <unistd.h> #include <unistd.h>
#include <poll.h> #include <poll.h>
@ -33,6 +34,7 @@ static XImage *ximage;
static Display *display; static Display *display;
static Window window; static Window window;
static char *loaded_rom; static char *loaded_rom;
static int init_scale;
#define WIDTH (64 * 8) #define WIDTH (64 * 8)
#define HEIGHT (40 * 8) #define HEIGHT (40 * 8)
@ -229,7 +231,7 @@ emu_init(void)
display = XOpenDisplay(NULL); display = XOpenDisplay(NULL);
if(!display) if(!display)
return system_error("X11", "Could not open display"); return system_error("X11", "Could not open display");
screen_resize(WIDTH, HEIGHT, 1); screen_resize(WIDTH, HEIGHT, init_scale);
init_console(); init_console();
return 1; return 1;
} }
@ -310,11 +312,14 @@ main(int argc, char **argv)
{ {
Uxn u = {0}; Uxn u = {0};
int i = 1; int i = 1;
init_scale = 1;
if(i == argc) if(i == argc)
return system_error("usage", "uxn11 [-v] file.rom [args...]"); return system_error("usage", "uxn11 [-v] file.rom [args...]");
/* Read flags */ /* Read flags */
if(argv[i][0] == '-' && argv[i][1] == 'v') if(argv[i][0] == '-' && argv[i][1] == 'v')
return system_version("Uxn11 - Graphical Varvara Emulator", "12 Nov 2023"); return system_version("Uxn11 - Graphical Varvara Emulator", "12 Nov 2023");
if(strcmp(argv[i], "-2x") == 0 || strcmp(argv[i], "-3x") == 0)
init_scale = argv[i++][1] - '0';
if(!emu_init()) if(!emu_init())
return system_error("Init", "Failed to initialize varvara."); return system_error("Init", "Failed to initialize varvara.");
if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++])) if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))