commit 21d8f34

Minor cleanup

 1@@ -105,30 +105,20 @@ hide_cursor(void)
 2 	XFreePixmap(display, bitmap);
 3 }
 4 
 5-/* /usr/include/X11/keysymdef.h */
 6-
 7-#define XK_Escape 0xff1b
 8-#define XK_Left 0xff51
 9-#define XK_Up 0xff52
10-#define XK_Right 0xff53
11-#define XK_Down 0xff54
12-#define XK_Home 0xff50
13-#define XK_Shift 0xffe1
14-#define XK_Control 0xffe3
15-#define XK_Alt 0xffe9
16+/* usr/include/X11/keysymdef.h */
17 
18 static Uint8
19 get_button(KeySym sym)
20 {
21 	switch(sym) {
22-	case XK_Up: return 0x10;
23-	case XK_Down: return 0x20;
24-	case XK_Left: return 0x40;
25-	case XK_Right: return 0x80;
26-	case XK_Control: return 0x01;
27-	case XK_Alt: return 0x02;
28-	case XK_Shift: return 0x04;
29-	case XK_Home: return 0x08;
30+	case 0xff52: return 0x10; /* Up */
31+	case 0xff54: return 0x20; /* Down */
32+	case 0xff51: return 0x40; /* Left */
33+	case 0xff53: return 0x80; /* Right */
34+	case 0xffe3: return 0x01; /* Control */
35+	case 0xffe9: return 0x02; /* Alt */
36+	case 0xffe1: return 0x04; /* Shift */
37+	case 0xff50: return 0x08; /* Home */
38 	}
39 	return 0x00;
40 }
41@@ -149,18 +139,16 @@ processEvent(void)
42 		exit(0);
43 	} break;
44 	case KeyPress: {
45-		XKeyPressedEvent *e = (XKeyPressedEvent *)&ev;
46 		KeySym sym;
47 		char buf[7];
48-		XLookupString(e, buf, 7, &sym, 0);
49+		XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
50 		controller_down(devctrl, get_button(sym));
51 		controller_key(devctrl, sym < 0x80 ? sym : buf[0]);
52 	} break;
53 	case KeyRelease: {
54-		XKeyPressedEvent *e = (XKeyPressedEvent *)&ev;
55 		KeySym sym;
56 		char buf[7];
57-		XLookupString(e, buf, 7, &sym, 0);
58+		XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
59 		controller_up(devctrl, get_button(sym));
60 	} break;
61 	case ButtonPress: {
62@@ -197,10 +185,10 @@ start(Uxn *u, char *rom)
63 	/* mouse    */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo);
64 	/* file0    */ uxn_port(u, 0xa, file_dei, file_deo);
65 	/* file1    */ uxn_port(u, 0xb, file_dei, file_deo);
66-	/* empty    */ uxn_port(u, 0xc, datetime_dei, nil_deo);
67+	/* datetime */ uxn_port(u, 0xc, datetime_dei, nil_deo);
68 	/* empty    */ uxn_port(u, 0xd, nil_dei, nil_deo);
69-	/* empty    */ uxn_port(u, 0xe, nil_dei, nil_deo);
70-	/* empty    */ uxn_port(u, 0xf, nil_dei, nil_deo);
71+	/* reserved */ uxn_port(u, 0xe, nil_dei, nil_deo);
72+	/* reserved */ uxn_port(u, 0xf, nil_dei, nil_deo);
73 	screen_resize(&uxn_screen, WIDTH, HEIGHT);
74 	if(!uxn_eval(u, PAGE_PROGRAM))
75 		return error("Boot", "Failed to start rom.");