X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FInterface%2Fmain.c;h=5f323e46131c5a21a4887c60c5fe54d7ce3a0eb2;hb=b806b8f55067584cb90fe20277235369a1111c66;hp=4e4833be04a8a1f4e02330244e2faac832ffab63;hpb=82a4f841eafaff80b7dc258099abd865faaa0467;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c index 4e4833be..5f323e46 100644 --- a/Usermode/Applications/axwin3_src/Interface/main.c +++ b/Usermode/Applications/axwin3_src/Interface/main.c @@ -5,32 +5,61 @@ * main.c * - Interface core */ +#include #include #include #include +#include -#define SIDEBAR_WIDTH 36 +#define SIDEBAR_WIDTH 40 +#define RUN_WIDTH 200 +#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); +void update_time(void); // === GLOBALS === tHWND gSidebar; tAxWin3_Widget *gSidebarRoot; +tHWND gSystemMenu; +tHWND gRunDialog; +tAxWin3_Widget *gRunInput; +tAxWin3_Widget *gTimeDisplay; + int giScreenWidth; + int giScreenHeight; +char **gEnvion; // === CODE === -int sidebar_callback(tHWND Window, int Length, void *Data) +int systembutton_fire(tAxWin3_Widget *Widget) { + _SysDebug("SystemButton pressed"); + AxWin3_Menu_ShowAt(gSystemMenu, SIDEBAR_WIDTH, 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); + + // TODO: Register to be told when the display layout changes + AxWin3_GetDisplayDims(0, NULL, NULL, &giScreenWidth, &giScreenHeight); create_sidebar(); + 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(); @@ -42,14 +71,14 @@ void create_sidebar(void) tAxWin3_Widget *btn, *txt, *ele; // Create sidebar - // TODO: Get screen dimensions somehow - gSidebar = AxWin3_Widget_CreateWindow(NULL, SIDEBAR_WIDTH, 480, ELEFLAG_VERTICAL); + gSidebar = AxWin3_Widget_CreateWindow(NULL, SIDEBAR_WIDTH, giScreenHeight, ELEFLAG_VERTICAL); AxWin3_MoveWindow(gSidebar, 0, 0); gSidebarRoot = AxWin3_Widget_GetRoot(gSidebar); // - Main menu btn = AxWin3_Widget_AddWidget(gSidebarRoot, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, "SystemButton"); AxWin3_Widget_SetSize(btn, SIDEBAR_WIDTH); + AxWin3_Widget_SetFireHandler(btn, systembutton_fire); txt = AxWin3_Widget_AddWidget(btn, ELETYPE_IMAGE, 0, "SystemLogo"); AxWin3_Widget_SetText(txt, "file:///Acess/Apps/AxWin/3.0/AcessLogoSmall.sif"); @@ -65,13 +94,107 @@ void create_sidebar(void) AxWin3_Widget_SetSize(ele, 4); // > Version/Time - ele = AxWin3_Widget_AddWidget(gSidebarRoot, ELETYPE_BOX, ELEFLAG_VERTICAL|ELEFLAG_NOSTRETCH, "Version/Time"); - txt = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String"); - AxWin3_Widget_SetSize(txt, 20); - AxWin3_Widget_SetText(txt, "2.0"); + ele = AxWin3_Widget_AddWidget(gSidebarRoot, + ELETYPE_BOX, + ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH, + "Version/Time" + ); + 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); // Show! AxWin3_ShowWindow(gSidebar, 1); } +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) +{ +// _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) +{ + AxWin3_ShowWindow(gRunDialog, 1); + AxWin3_FocusWindow(gRunDialog); +} + +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); +} + +// -------------------------------------------------------------------- +// "Run" Dialog box +// -------------------------------------------------------------------- +int run_dorun(tAxWin3_Widget *unused) +{ + _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; +} + +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_ALIGN_CENTER, "_btn"); + AxWin3_Widget_SetFireHandler(ret, handler); + 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; +} + +void create_run_dialog(void) +{ + tAxWin3_Widget *root, *box; + + 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, ELEFLAG_NOSTRETCH, "Input"); + AxWin3_Widget_SetFireHandler(gRunInput, run_dorun); + + box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER, "Button Area"); + make_textbutton(box, "Ok", run_dorun); + make_textbutton(box, "Cancel", run_close); +} +