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

Minor cleanup

This commit is contained in:
neauoire 2022-03-28 10:31:31 -07:00
parent 2074c2cbd6
commit 21d8f344ac
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/uxn11.c
View File

@ -105,30 +105,20 @@ hide_cursor(void)
XFreePixmap(display, bitmap); XFreePixmap(display, bitmap);
} }
/* /usr/include/X11/keysymdef.h */ /* usr/include/X11/keysymdef.h */
#define XK_Escape 0xff1b
#define XK_Left 0xff51
#define XK_Up 0xff52
#define XK_Right 0xff53
#define XK_Down 0xff54
#define XK_Home 0xff50
#define XK_Shift 0xffe1
#define XK_Control 0xffe3
#define XK_Alt 0xffe9
static Uint8 static Uint8
get_button(KeySym sym) get_button(KeySym sym)
{ {
switch(sym) { switch(sym) {
case XK_Up: return 0x10; case 0xff52: return 0x10; /* Up */
case XK_Down: return 0x20; case 0xff54: return 0x20; /* Down */
case XK_Left: return 0x40; case 0xff51: return 0x40; /* Left */
case XK_Right: return 0x80; case 0xff53: return 0x80; /* Right */
case XK_Control: return 0x01; case 0xffe3: return 0x01; /* Control */
case XK_Alt: return 0x02; case 0xffe9: return 0x02; /* Alt */
case XK_Shift: return 0x04; case 0xffe1: return 0x04; /* Shift */
case XK_Home: return 0x08; case 0xff50: return 0x08; /* Home */
} }
return 0x00; return 0x00;
} }
@ -149,18 +139,16 @@ processEvent(void)
exit(0); exit(0);
} break; } break;
case KeyPress: { case KeyPress: {
XKeyPressedEvent *e = (XKeyPressedEvent *)&ev;
KeySym sym; KeySym sym;
char buf[7]; char buf[7];
XLookupString(e, buf, 7, &sym, 0); XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
controller_down(devctrl, get_button(sym)); controller_down(devctrl, get_button(sym));
controller_key(devctrl, sym < 0x80 ? sym : buf[0]); controller_key(devctrl, sym < 0x80 ? sym : buf[0]);
} break; } break;
case KeyRelease: { case KeyRelease: {
XKeyPressedEvent *e = (XKeyPressedEvent *)&ev;
KeySym sym; KeySym sym;
char buf[7]; char buf[7];
XLookupString(e, buf, 7, &sym, 0); XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
controller_up(devctrl, get_button(sym)); controller_up(devctrl, get_button(sym));
} break; } break;
case ButtonPress: { case ButtonPress: {
@ -197,10 +185,10 @@ start(Uxn *u, char *rom)
/* mouse */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo); /* mouse */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo);
/* file0 */ uxn_port(u, 0xa, file_dei, file_deo); /* file0 */ uxn_port(u, 0xa, file_dei, file_deo);
/* file1 */ uxn_port(u, 0xb, file_dei, file_deo); /* file1 */ uxn_port(u, 0xb, file_dei, file_deo);
/* empty */ uxn_port(u, 0xc, datetime_dei, nil_deo); /* datetime */ uxn_port(u, 0xc, datetime_dei, nil_deo);
/* empty */ uxn_port(u, 0xd, nil_dei, nil_deo); /* empty */ uxn_port(u, 0xd, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0xe, nil_dei, nil_deo); /* reserved */ uxn_port(u, 0xe, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0xf, nil_dei, nil_deo); /* reserved */ uxn_port(u, 0xf, nil_dei, nil_deo);
screen_resize(&uxn_screen, WIDTH, HEIGHT); screen_resize(&uxn_screen, WIDTH, HEIGHT);
if(!uxn_eval(u, PAGE_PROGRAM)) if(!uxn_eval(u, PAGE_PROGRAM))
return error("Boot", "Failed to start rom."); return error("Boot", "Failed to start rom.");