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/init - Fixed bad stderr for 'exec' commands
[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
5a8fe08
..
82cedc2
100644
(file)
--- a/
Usermode/Applications/axwin3_src/Interface/main.c
+++ b/
Usermode/Applications/axwin3_src/Interface/main.c
@@
-20,6
+20,9
@@
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);
+void update_time(void);
// === GLOBALS ===
tHWND gSidebar;
// === GLOBALS ===
tHWND gSidebar;
@@
-27,8
+30,10
@@
tAxWin3_Widget *gSidebarRoot;
tHWND gSystemMenu;
tHWND gRunDialog;
tAxWin3_Widget *gRunInput;
tHWND gSystemMenu;
tHWND gRunDialog;
tAxWin3_Widget *gRunInput;
+tAxWin3_Widget *gTimeDisplay;
int giScreenWidth;
int giScreenHeight;
int giScreenWidth;
int giScreenHeight;
+char **gEnvion;
// === CODE ===
int systembutton_fire(tAxWin3_Widget *Widget)
// === CODE ===
int systembutton_fire(tAxWin3_Widget *Widget)
@@
-38,8
+43,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);
@@
-93,9
+99,10
@@
void create_sidebar(void)
ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH,
"Version/Time"
);
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");
+ gTimeDisplay = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Time");
+ AxWin3_Widget_SetSize(gTimeDisplay, 20);
+ //AxWin3_Widget_SetText(gTimeDisplay, "--:--");
+ update_time();
// Turn off decorations
AxWin3_DecorateWindow(gSidebar, 0);
// Turn off decorations
AxWin3_DecorateWindow(gSidebar, 0);
@@
-105,15
+112,25
@@
void create_sidebar(void)
}
}
+void update_time(void)
+{
+ char tmpbuf[2+1+2+1] = "--:--";
+ //strftime(tmpbuf, sizeof(tmpbuf), "%H:%M", NULL);
+ AxWin3_Widget_SetText(gTimeDisplay, tmpbuf);
+}
+
void mainmenu_app_textedit(void *unused)
{
void mainmenu_app_textedit(void *unused)
{
- _SysDebug("TODO: Launch text editor");
-// spawn("/Acess/Apps/AxWin/3.0/ate");
+// _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)
{
}
void mainmenu_app_terminal(void *unused)
{
- _SysDebug("TODO: Launch terminal emulator");
+ _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)
}
void mainmenu_run_dialog(void *unused)
@@
-140,6
+157,10
@@
int run_dorun(tAxWin3_Widget *unused)
_SysDebug("DoRun pressed");
char *cmd = AxWin3_Widget_GetText(gRunInput);
_SysDebug("Command string '%s'", cmd);
_SysDebug("DoRun pressed");
char *cmd = AxWin3_Widget_GetText(gRunInput);
_SysDebug("Command string '%s'", cmd);
+
+ // TODO: Parse the command string into components
+ // TODO: Call _SysSpawn
+
AxWin3_ShowWindow(gRunDialog, 0);
return 0;
}
AxWin3_ShowWindow(gRunDialog, 0);
return 0;
}
UCC
git Repository :: git.ucc.asn.au