X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fmain.c;h=0996f909ac1136955222130645d94a2609b7bfc9;hb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;hp=b6fcf497a48817c1a7539ed55d113dbd76347bf1;hpb=7c00f2f9205aeb803f0499c9e88c98048830bea6;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/main.c b/Usermode/Applications/axwin3_src/WM/main.c
index b6fcf497..0996f909 100644
--- a/Usermode/Applications/axwin3_src/WM/main.c
+++ b/Usermode/Applications/axwin3_src/WM/main.c
@@ -9,6 +9,7 @@
 #include <acess/sys.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <axwin3/keysyms.h>
 
 // === IMPORTS ===
 extern void	Video_Setup(void);
@@ -16,7 +17,9 @@ extern void	WM_Initialise(void);
 extern int	Renderer_Menu_Init(void);
 extern int	Renderer_Widget_Init(void);
 extern int	Renderer_Background_Init(void);
+extern int	Renderer_Framebuffer_Init(void);
 extern void	WM_Update(void);
+extern void	WM_Hotkey_Register(int nKeys, uint32_t *Keys, const char *ActionName);
 
 // === PROTOTYPES ===
 void	ParseCommandline(int argc, char **argv);
@@ -29,6 +32,7 @@ const char	*gsMouseDevice = NULL;
  int	giScreenHeight = 480;
 
  int	giTerminalFD = -1;
+ int	giTerminalFD_Input = 0;
  int	giMouseFD = -1;
 
 #define __INSTALL_ROOT	"/Acess/Apps/AxWin/3.0"
@@ -49,7 +53,7 @@ int main(int argc, char *argv[])
 		gsTerminalDevice = "/Devices/VTerm/6";
 	}
 	if( gsMouseDevice == NULL ) {
-		gsMouseDevice = "/Devices/PS2Mouse";
+		gsMouseDevice = "/Devices/Mouse/system";
 	}
 	
 	Video_Setup();
@@ -59,7 +63,13 @@ int main(int argc, char *argv[])
 	Renderer_Menu_Init();
 	Renderer_Widget_Init();
 	Renderer_Background_Init();
+	Renderer_Framebuffer_Init();
 	WM_Initialise();
+
+	// TODO: Config
+	uint32_t	keys[4];
+	keys[0] = KEYSYM_LEFTGUI;	keys[1] = KEYSYM_r;
+	WM_Hotkey_Register(2, keys, "Interface>Run");
 	
 	// Spawn interface root
 	if( clone(CLONE_VM, 0) == 0 )