git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/AxWin3 - Updated clientside IPC code to allow select() usage by client
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
Interface
/
main.c
diff --git
a/Usermode/Applications/axwin3_src/Interface/main.c
b/Usermode/Applications/axwin3_src/Interface/main.c
index
fd4ff3f
..
e8b5834
100644
(file)
--- a/
Usermode/Applications/axwin3_src/Interface/main.c
+++ b/
Usermode/Applications/axwin3_src/Interface/main.c
@@
-20,6
+20,8
@@
void create_sidebar(void);
void create_mainmenu(void);
void create_run_dialog(void);
void mainmenu_run_dialog(void *unused);
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;
// === GLOBALS ===
tHWND gSidebar;
@@
-29,6
+31,7
@@
tHWND gRunDialog;
tAxWin3_Widget *gRunInput;
int giScreenWidth;
int giScreenHeight;
tAxWin3_Widget *gRunInput;
int giScreenWidth;
int giScreenHeight;
+char **gEnvion;
// === CODE ===
int systembutton_fire(tAxWin3_Widget *Widget)
// === CODE ===
int systembutton_fire(tAxWin3_Widget *Widget)
@@
-38,8
+41,9
@@
int systembutton_fire(tAxWin3_Widget *Widget)
return 0;
}
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);
// Connect to AxWin3 Server
AxWin3_Connect(NULL);
@@
-51,8
+55,8
@@
int main(int argc, char *argv[])
create_run_dialog();
AxWin3_RegisterAction(gSidebar, "Interface>Run", (tAxWin3_HotkeyCallback)mainmenu_run_dialog);
create_run_dialog();
AxWin3_RegisterAction(gSidebar, "Interface>Run", (tAxWin3_HotkeyCallback)mainmenu_run_dialog);
-
// AxWin3_RegisterAction(gSidebar, "Interface>Terminal",
mainmenu_app_terminal);
-
// AxWin3_RegisterAction(gSidebar, "Interface>TextEdit",
mainmenu_app_textedit);
+
AxWin3_RegisterAction(gSidebar, "Interface>Terminal", (tAxWin3_HotkeyCallback)
mainmenu_app_terminal);
+
AxWin3_RegisterAction(gSidebar, "Interface>TextEdit", (tAxWin3_HotkeyCallback)
mainmenu_app_textedit);
// Idle loop
AxWin3_MainLoop();
// Idle loop
AxWin3_MainLoop();
@@
-107,7
+111,9
@@
void create_sidebar(void)
void mainmenu_app_textedit(void *unused)
{
void mainmenu_app_textedit(void *unused)
{
- _SysDebug("TODO: Launch text editor");
+ const char *args[] = {"ate",NULL};
+// _SysDebug("TODO: Launch text editor");
+ _SysSpawn("/Acess/Apps/AxWin/3.0/ate", args, (const char **)gEnvion, 0, NULL, NULL);
}
void mainmenu_app_terminal(void *unused)
}
void mainmenu_app_terminal(void *unused)
@@
-118,6
+124,7
@@
void mainmenu_app_terminal(void *unused)
void mainmenu_run_dialog(void *unused)
{
AxWin3_ShowWindow(gRunDialog, 1);
void mainmenu_run_dialog(void *unused)
{
AxWin3_ShowWindow(gRunDialog, 1);
+ AxWin3_FocusWindow(gRunDialog);
}
void create_mainmenu(void)
}
void create_mainmenu(void)
UCC
git Repository :: git.ucc.asn.au