automap on bottom. status bar on bottom when fullscreen.

elhobbs · May 8, 2017 · 0ac1bae · 0ac1bae
1 parent cdefba3
commit 0ac1bae
Show file tree

Hide file tree

Showing 16 changed files with 597 additions and 148 deletions.
diff --git a/Debug/prboom.log b/Debug/prboom.log
@@ -1,44 +1 @@
-  d_main.c
-  arm-none-eabi-gcc -MMD -MP -MF /c/devl/prboom3ds/build/d_main.d -g -Wall -O2 -mword-relocations -save-temps -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -I/c/devl/prboom3ds/include -I/c/devl/prboom3ds/src -I/c/devl/prboom3ds/arm9/include -I/c/devl/prboom3ds/arm11/include -I/c/devl/prboom3ds/khax -I/c/devkitPro/libctru/include -I/c/devl/prboom3ds/build -DARM11 -D_3DS -DHAVE_CONFIG_H -c /c/devl/prboom3ds/src/d_main.c -o d_main.o 
-  c:/devl/prboom3ds/src/d_main.c: In function 'D_PostEvent':
-  c:/devl/prboom3ds/src/d_main.c(160):6: warning: value computed is not used [-Wunused-value]
-      ) ||
-        ^~
-  c:/devl/prboom3ds/src/d_main.c: In function 'D_Wipe':
-  c:/devl/prboom3ds/src/d_main.c(194):4: warning: implicit declaration of function 'copy_screen' [-Wimplicit-function-declaration]
-      copy_screen(GFX_LEFT);
-      ^~~~~~~~~~~
-  c:/devl/prboom3ds/src/d_main.c: In function 'D_Display':
-  c:/devl/prboom3ds/src/d_main.c(240):5: warning: case label value is less than minimum value for type
-       case -1:
-       ^~~~
-  c:/devl/prboom3ds/src/d_main.c: In function 'CheckIWAD':
-  c:/devl/prboom3ds/src/d_main.c(652):9: warning: implicit declaration of function 'access_3ds' [-Wimplicit-function-declaration]
-     if ( !access_3ds (iwadname,R_OK) )
-           ^~~~~~~~~~
-  c:/devl/prboom3ds/src/d_main.c: In function 'find_wads':
-  c:/devl/prboom3ds/src/d_main.c(804):22: warning: assignment makes integer from pointer without a cast [-Wint-conversion]
-     wads_found_path[i] = iwad;
-                        ^
-  c:/devl/prboom3ds/src/d_main.c: In function 'ds_game_choose':
-  c:/devl/prboom3ds/src/d_main.c(889):26: warning: return makes pointer from integer without a cast [-Wint-conversion]
-      return wads_found_path[wads_found[pos]];
-             ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
-  c:/devl/prboom3ds/src/d_main.c(882):8: warning: unused variable 'dhcp' [-Wunused-variable]
-      int dhcp = 0;
-          ^~~~
-  ds_main.c
-  arm-none-eabi-gcc -MMD -MP -MF /c/devl/prboom3ds/build/ds_main.d -g -Wall -O2 -mword-relocations -save-temps -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -I/c/devl/prboom3ds/include -I/c/devl/prboom3ds/src -I/c/devl/prboom3ds/arm9/include -I/c/devl/prboom3ds/arm11/include -I/c/devl/prboom3ds/khax -I/c/devkitPro/libctru/include -I/c/devl/prboom3ds/build -DARM11 -D_3DS -DHAVE_CONFIG_H -c /c/devl/prboom3ds/arm9/source/ds_main.c -o ds_main.o 
-  c:/devl/prboom3ds/arm9/source/ds_main.c: In function 'sys_init':
-  c:/devl/prboom3ds/arm9/source/ds_main.c(80):2: warning: implicit declaration of function 'dkeyboard_init' [-Wimplicit-function-declaration]
-    dkeyboard_init();
-    ^~~~~~~~~~~~~~
-  c:/devl/prboom3ds/arm9/source/ds_main.c: In function 'main':
-  c:/devl/prboom3ds/arm9/source/ds_main.c(138):10: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
-     myargv = argv;
-            ^
-  c:/devl/prboom3ds/arm9/source/ds_main.c(142):10: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
-     myargv = "\0\0\0\0";// argv;
-            ^
-  linking prboom3ds.elf
-  built ... prboom3ds.3dsx
+  make[1]: Nothing to be done for `all'.
diff --git a/arm11/include/keyboard.h b/arm11/include/keyboard.h
@@ -1,4 +1,69 @@
 #pragma once
 
-void dkeyboard_draw();
-void dkeyboard_input();
+#define	KEY_AUX1			207
+#define	KEY_AUX2			208
+#define	KEY_AUX3			209
+#define	KEY_AUX4			210
+#define	KEY_AUX5			211
+#define	KEY_AUX6			212
+#define	KEY_AUX7			213
+#define	KEY_AUX8			214
+
+#define KEY_TAB        9
+#define KEY_CAPSLOCK   0xba                                        // phares
+#define KEY_RCTRL      (0x80+0x1d)
+#define KEY_RALT       (0x80+0x38)
+#define KEY_RSHIFT     (0x80+0x36)
+
+//
+// most key data are simple ascii (uppercased)
+//
+#define	KEY_RIGHTARROW		0xae
+#define	KEY_LEFTARROW		0xac
+#define	KEY_UPARROW			0xad
+#define	KEY_DOWNARROW		0xaf
+#define	KEY_ESCAPE			27
+#define	KEY_ENTER			13
+#define	KEY_F1				(0x80+0x3b)
+#define	KEY_F2				(0x80+0x3c)
+#define	KEY_F3				(0x80+0x3d)
+#define	KEY_F4				(0x80+0x3e)
+#define	KEY_F5				(0x80+0x3f)
+#define	KEY_F6				(0x80+0x40)
+#define	KEY_F7				(0x80+0x41)
+#define	KEY_F8				(0x80+0x42)
+#define	KEY_F9				(0x80+0x43)
+#define	KEY_F10				(0x80+0x44)
+#define	KEY_F11				(0x80+0x57)
+#define	KEY_F12				(0x80+0x58)
+
+#define	KEY_BACKSPACE		127
+#define	KEY_PAUSE			0xff
+
+#define KEY_EQUALS			0x3d
+#define KEY_MINUS			0x2d
+
+#define	KEY_RSHIFT			(0x80+0x36)
+#define	KEY_RCTRL			(0x80+0x1d)
+#define	KEY_RALT			(0x80+0x38)
+
+#define	KEY_LALT			KEY_RALT
+
+#define KEY_FIVE			0x35
+#define KEY_SIX				0x36
+#define KEY_SEVEN			0x37
+#define KEY_EIGHT			0x38
+#define KEY_NINE			0x39
+#define KEY_ZERO			0x30
+#define KEY_BACKSLASH		0x5C
+
+typedef struct {
+	int x, y, type, dx, dy, key;
+	char *text, *shift_text;
+} sregion_t;
+
+extern sregion_t key_button_array[];
+
+void keyboard_draw();
+void keyboard_input();
+int keyboard_top();