X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FInterface%2Fmain.c;h=a098614712f79d4b09a21c66d49e3b404d252f66;hb=e3b5f81f2af81fbb2f2b0f449f71324e63f9a645;hp=61ba4ac3bf4c54c60e0792fa0f5466bc7f3401eb;hpb=fc0af40cd5affc1bd946fca84b641436dfc9592a;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index 61ba4ac3..a0986147 100644
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -11,14 +11,17 @@
 #include <axwin3/widget.h>
 #include <axwin3/menu.h>
 
-#define SIDEBAR_WIDTH	36
+#define SIDEBAR_WIDTH	40
 #define RUN_WIDTH	200
-#define RUN_HEIGHT	70
+#define RUN_HEIGHT	60
 
 // === PROTOTYPES ===
 void	create_sidebar(void);
 void	create_mainmenu(void);
 void	create_run_dialog(void);
+void	mainmenu_run_dialog(void *unused);
+void	mainmenu_app_terminal(void *unused);
+void	mainmenu_app_textedit(void *unused);
 
 // === GLOBALS ===
 tHWND	gSidebar;
@@ -28,6 +31,7 @@ tHWND	gRunDialog;
 tAxWin3_Widget	*gRunInput;
  int	giScreenWidth;
  int	giScreenHeight;
+char	**gEnvion;
 
 // === CODE ===
 int systembutton_fire(tAxWin3_Widget *Widget)
@@ -37,8 +41,9 @@ int systembutton_fire(tAxWin3_Widget *Widget)
 	return 0;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char **envp)
 {
+	gEnvion = envp;
 	// Connect to AxWin3 Server
 	AxWin3_Connect(NULL);
 
@@ -49,6 +54,10 @@ int main(int argc, char *argv[])
 	create_mainmenu();
 	create_run_dialog();
 	
+	AxWin3_RegisterAction(gSidebar, "Interface>Run", (tAxWin3_HotkeyCallback)mainmenu_run_dialog);
+	AxWin3_RegisterAction(gSidebar, "Interface>Terminal", (tAxWin3_HotkeyCallback)mainmenu_app_terminal);
+	AxWin3_RegisterAction(gSidebar, "Interface>TextEdit", (tAxWin3_HotkeyCallback)mainmenu_app_textedit);
+
 	// Idle loop
 	AxWin3_MainLoop();
 	
@@ -83,7 +92,11 @@ void create_sidebar(void)
 	AxWin3_Widget_SetSize(ele, 4);
 
 	// > Version/Time
-	ele = AxWin3_Widget_AddWidget(gSidebarRoot, ELETYPE_BOX, ELEFLAG_VERTICAL|ELEFLAG_NOSTRETCH, "Version/Time");
+	ele = AxWin3_Widget_AddWidget(gSidebarRoot,
+		ELETYPE_BOX,
+		ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH,
+		"Version/Time"
+		);
 	txt = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String");
 	AxWin3_Widget_SetSize(txt, 20);
 	AxWin3_Widget_SetText(txt, "3.0");
@@ -98,13 +111,22 @@ void create_sidebar(void)
 
 void mainmenu_app_textedit(void *unused)
 {
-	_SysDebug("TODO: Launch text editor");
+//	_SysDebug("TODO: Launch text editor");
+	const char	*args[] = {"ate",NULL};
+	_SysSpawn("/Acess/Apps/AxWin/3.0/ate", args, (const char **)gEnvion, 0, NULL, NULL);
+}
+
+void mainmenu_app_terminal(void *unused)
+{
+	_SysDebug("Launch terminal emulator");
+	const char	*args[] = {"terminal",NULL};
+	_SysSpawn("/Acess/Apps/AxWin/3.0/terminal", args, (const char **)gEnvion, 0, NULL, NULL);
 }
 
 void mainmenu_run_dialog(void *unused)
 {
-	_SysDebug("TODO: Show run dialog");
 	AxWin3_ShowWindow(gRunDialog, 1);
+	AxWin3_FocusWindow(gRunDialog);
 }
 
 void create_mainmenu(void)
@@ -112,19 +134,26 @@ void create_mainmenu(void)
 	gSystemMenu = AxWin3_Menu_Create(NULL);
 	
 	AxWin3_Menu_AddItem(gSystemMenu, "Text &Editor\tWin+E", mainmenu_app_textedit, NULL, 0, NULL);
+	AxWin3_Menu_AddItem(gSystemMenu, "&Terminal Emulator\tWin+T", mainmenu_app_terminal, NULL, 0, NULL);
 	AxWin3_Menu_AddItem(gSystemMenu, NULL, NULL, NULL, 0, NULL);
-	AxWin3_Menu_AddItem(gSystemMenu, "Run\tWin+R", mainmenu_run_dialog, NULL, 0, NULL);
+	AxWin3_Menu_AddItem(gSystemMenu, "&Run\tWin+R", mainmenu_run_dialog, NULL, 0, NULL);
 }
 
+// --------------------------------------------------------------------
+// "Run" Dialog box
+// --------------------------------------------------------------------
 int run_dorun(tAxWin3_Widget *unused)
 {
-//	char *cmd = AxWin3_Widget_GetText(gRunInput);
+	_SysDebug("DoRun pressed");
+	char *cmd = AxWin3_Widget_GetText(gRunInput);
+	_SysDebug("Command string '%s'", cmd);
 	AxWin3_ShowWindow(gRunDialog, 0);
 	return 0;
 }
 
 int run_close(tAxWin3_Widget *unused)
 {
+	_SysDebug("Run diaglog closed");
 	AxWin3_ShowWindow(gRunDialog, 0);
 	return 0;
 }
@@ -132,10 +161,12 @@ int run_close(tAxWin3_Widget *unused)
 tAxWin3_Widget *make_textbutton(tAxWin3_Widget *Parent, const char *Label, tAxWin3_Widget_FireCb handler)
 {
 	tAxWin3_Widget	*ret, *txt;
-	ret = AxWin3_Widget_AddWidget(Parent, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, "_btn");
+	ret = AxWin3_Widget_AddWidget(Parent, ELETYPE_BUTTON, ELEFLAG_ALIGN_CENTER, "_btn");
 	AxWin3_Widget_SetFireHandler(ret, handler);
-	txt = AxWin3_Widget_AddWidget(ret, ELETYPE_TEXT, 0, "_txt");
+	AxWin3_Widget_AddWidget(ret, ELETYPE_NONE, 0, "_spacer1");
+	txt = AxWin3_Widget_AddWidget(ret, ELETYPE_TEXT, ELEFLAG_NOSTRETCH|ELEFLAG_NOEXPAND, "_txt");
 	AxWin3_Widget_SetText(txt, Label);
+	AxWin3_Widget_AddWidget(ret, ELETYPE_NONE, 0, "_spacer2");
 	return ret;
 }
 
@@ -145,14 +176,14 @@ void create_run_dialog(void)
 	
 	gRunDialog = AxWin3_Widget_CreateWindow(NULL, RUN_WIDTH, RUN_HEIGHT, ELEFLAG_VERTICAL);
 	AxWin3_SetWindowTitle(gRunDialog, "Run Program...");
-
 	AxWin3_MoveWindow(gRunDialog, giScreenWidth/2-RUN_WIDTH/2, giScreenHeight/2-RUN_HEIGHT/2);
+
 	root = AxWin3_Widget_GetRoot(gRunDialog);
 
-	gRunInput = AxWin3_Widget_AddWidget(root, ELETYPE_TEXTINPUT, 0, "Input");
+	gRunInput = AxWin3_Widget_AddWidget(root, ELETYPE_TEXTINPUT, ELEFLAG_NOSTRETCH, "Input");
 	AxWin3_Widget_SetFireHandler(gRunInput, run_dorun);
 	
-	box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH, "Button Area");
+	box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER, "Button Area");
 	make_textbutton(box, "Ok", run_dorun);
 	make_textbutton(box, "Cancel", run_close);
 }