From 23c458e88a5f0119fc17869d2562464e1b553fb5 Mon Sep 17 00:00:00 2001 From: "K. Lange" Date: Mon, 21 May 2018 08:12:02 +0900 Subject: [PATCH] wip file browser, help browser (blank apps) --- apps/file-browser.c | 175 +++++++++++++++++++++++++++++++++++++++ apps/help-browser.c | 171 ++++++++++++++++++++++++++++++++++++++ base/usr/share/demo.menu | 3 +- 3 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 apps/file-browser.c create mode 100644 apps/help-browser.c diff --git a/apps/file-browser.c b/apps/file-browser.c new file mode 100644 index 00000000..c1f4e5e3 --- /dev/null +++ b/apps/file-browser.c @@ -0,0 +1,175 @@ +#include + +#include +#include +#include +#include +#include + +#define APPLICATION_TITLE "File Browser" + +static yutani_t * yctx; +static yutani_window_t * main_window; +static gfx_context_t * ctx; + +static int application_running = 1; + +static struct menu_bar menu_bar = {0}; +static struct menu_bar_entries menu_entries[] = { + {"File", "file"}, + {"Go", "go"}, + {"Help", "help"}, + {NULL, NULL}, +}; + +static void _menu_action_exit(struct MenuEntry * entry) { + application_running = 0; +} + +static void redraw_window(void) { + draw_fill(ctx, rgb(255,255,255)); + + render_decorations(main_window, ctx, APPLICATION_TITLE); + + menu_bar.x = decor_left_width; + menu_bar.y = decor_top_height; + menu_bar.width = ctx->width - decor_width(); + menu_bar_render(&menu_bar, ctx); + + flip(ctx); + yutani_flip(yctx, main_window); +} + +static void resize_finish(int w, int h) { + yutani_window_resize_accept(yctx, main_window, w, h); + reinit_graphics_yutani(ctx, main_window); + + redraw_window(); + yutani_window_resize_done(yctx, main_window); + + yutani_flip(yctx, main_window); +} + +static void _menu_action_input_path(struct MenuEntry * entry) { + +} + +static void _menu_action_navigate(struct MenuEntry * entry) { + /* go to entry->action */ +} + +static void _menu_action_up(struct MenuEntry * entry) { + /* go up */ +} + +static void _menu_action_help(struct MenuEntry * entry) { + /* show help documentation */ +} + +static void _menu_action_about(struct MenuEntry * entry) { + /* Show About dialog */ +} + +int main(int argc, char * argv[]) { + + yctx = yutani_init(); + init_decorations(); + main_window = yutani_window_create(yctx, 640, 480); + yutani_window_move(yctx, main_window, yctx->display_width / 2 - main_window->width / 2, yctx->display_height / 2 - main_window->height / 2); + ctx = init_graphics_yutani_double_buffer(main_window); + + yutani_window_advertise_icon(yctx, main_window, APPLICATION_TITLE, "folder"); + + menu_bar.entries = menu_entries; + menu_bar.redraw_callback = redraw_window; + + menu_bar.set = menu_set_create(); + + struct MenuList * m = menu_create(); /* File */ + menu_insert(m, menu_create_normal("exit",NULL,"Exit", _menu_action_exit)); + menu_set_insert(menu_bar.set, "file", m); + + m = menu_create(); /* Go */ + menu_insert(m, menu_create_normal("open",NULL,"Path...", _menu_action_input_path)); + menu_insert(m, menu_create_separator()); + menu_insert(m, menu_create_normal("home",getenv("HOME"),"Home",_menu_action_navigate)); + menu_insert(m, menu_create_normal(NULL,"/","File System",_menu_action_navigate)); + menu_insert(m, menu_create_normal("up",NULL,"Up",_menu_action_up)); + menu_set_insert(menu_bar.set, "go", m); + + m = menu_create(); + menu_insert(m, menu_create_normal("help",NULL,"Contents",_menu_action_help)); + menu_insert(m, menu_create_separator()); + menu_insert(m, menu_create_normal("star",NULL,"About " APPLICATION_TITLE,_menu_action_about)); + menu_set_insert(menu_bar.set, "help", m); + + redraw_window(); + + while (application_running) { + yutani_msg_t * m = yutani_poll(yctx); + while (m) { + menu_process_event(yctx, m); + switch (m->type) { + case YUTANI_MSG_KEY_EVENT: + { + struct yutani_msg_key_event * ke = (void*)m->data; + if (ke->event.action == KEY_ACTION_DOWN && ke->event.keycode == 'q') { + _menu_action_exit(NULL); + } + } + break; + case YUTANI_MSG_WINDOW_FOCUS_CHANGE: + { + struct yutani_msg_window_focus_change * wf = (void*)m->data; + yutani_window_t * win = hashmap_get(yctx->windows, (void*)wf->wid); + if (win) { + win->focused = wf->focused; + redraw_window(); + } + } + break; + case YUTANI_MSG_RESIZE_OFFER: + { + struct yutani_msg_window_resize * wr = (void*)m->data; + if (wr->wid == main_window->wid) { + resize_finish(wr->width, wr->height); + } + } + break; + case YUTANI_MSG_WINDOW_MOUSE_EVENT: + { + struct yutani_msg_window_mouse_event * me = (void*)m->data; + yutani_window_t * win = hashmap_get(yctx->windows, (void*)me->wid); + + if (win == main_window) { + int result = decor_handle_event(yctx, m); + switch (result) { + case DECOR_CLOSE: + _menu_action_exit(NULL); + break; + case DECOR_RIGHT: + /* right click in decoration, show appropriate menu */ + decor_show_default_menu(main_window, main_window->x + me->new_x, main_window->y + me->new_y); + break; + default: + /* Other actions */ + break; + } + + /* Menu bar */ + menu_bar_mouse_event(yctx, main_window, &menu_bar, me, me->new_x, me->new_y); + } + } + break; + case YUTANI_MSG_WINDOW_CLOSE: + case YUTANI_MSG_SESSION_END: + _menu_action_exit(NULL); + break; + default: + break; + } + free(m); + m = yutani_poll_async(yctx); + } + } +} diff --git a/apps/help-browser.c b/apps/help-browser.c new file mode 100644 index 00000000..c8e657eb --- /dev/null +++ b/apps/help-browser.c @@ -0,0 +1,171 @@ +#include + +#include +#include +#include +#include +#include + +#define APPLICATION_TITLE "Help Browser" + +static yutani_t * yctx; +static yutani_window_t * main_window; +static gfx_context_t * ctx; + +static int application_running = 1; + +static struct menu_bar menu_bar = {0}; +static struct menu_bar_entries menu_entries[] = { + {"File", "file"}, + {"Go", "go"}, + {"Help", "help"}, + {NULL, NULL}, +}; + +static void _menu_action_exit(struct MenuEntry * entry) { + application_running = 0; +} + +static void redraw_window(void) { + draw_fill(ctx, rgb(255,255,255)); + + render_decorations(main_window, ctx, APPLICATION_TITLE); + + menu_bar.x = decor_left_width; + menu_bar.y = decor_top_height; + menu_bar.width = ctx->width - decor_width(); + menu_bar_render(&menu_bar, ctx); + + flip(ctx); + yutani_flip(yctx, main_window); +} + +static void resize_finish(int w, int h) { + yutani_window_resize_accept(yctx, main_window, w, h); + reinit_graphics_yutani(ctx, main_window); + + redraw_window(); + yutani_window_resize_done(yctx, main_window); + + yutani_flip(yctx, main_window); +} + +static void _menu_action_navigate(struct MenuEntry * entry) { + /* go to entry->action */ +} + +static void _menu_action_back(struct MenuEntry * entry) { + /* go back */ +} + +static void _menu_action_forward(struct MenuEntry * entry) { + /* go forward */ +} + +static void _menu_action_about(struct MenuEntry * entry) { + /* Show About dialog */ +} + +int main(int argc, char * argv[]) { + + yctx = yutani_init(); + init_decorations(); + main_window = yutani_window_create(yctx, 640, 480); + yutani_window_move(yctx, main_window, yctx->display_width / 2 - main_window->width / 2, yctx->display_height / 2 - main_window->height / 2); + ctx = init_graphics_yutani_double_buffer(main_window); + + yutani_window_advertise_icon(yctx, main_window, APPLICATION_TITLE, "help"); + + menu_bar.entries = menu_entries; + menu_bar.redraw_callback = redraw_window; + + menu_bar.set = menu_set_create(); + + struct MenuList * m = menu_create(); /* File */ + menu_insert(m, menu_create_normal("exit",NULL,"Exit", _menu_action_exit)); + menu_set_insert(menu_bar.set, "file", m); + + m = menu_create(); /* Go */ + menu_insert(m, menu_create_normal("home","0_index.trt","Home",_menu_action_navigate)); + menu_insert(m, menu_create_normal("bookmark","special:contents","Topics",_menu_action_navigate)); + menu_insert(m, menu_create_separator()); + menu_insert(m, menu_create_normal("back",NULL,"Back",_menu_action_back)); + menu_insert(m, menu_create_normal("forward",NULL,"Forward",_menu_action_forward)); + menu_set_insert(menu_bar.set, "go", m); + + m = menu_create(); + menu_insert(m, menu_create_normal("help","help_browser.trt","Contents",_menu_action_navigate)); + menu_insert(m, menu_create_separator()); + menu_insert(m, menu_create_normal("star",NULL,"About " APPLICATION_TITLE,_menu_action_about)); + menu_set_insert(menu_bar.set, "help", m); + + redraw_window(); + + while (application_running) { + yutani_msg_t * m = yutani_poll(yctx); + while (m) { + menu_process_event(yctx, m); + switch (m->type) { + case YUTANI_MSG_KEY_EVENT: + { + struct yutani_msg_key_event * ke = (void*)m->data; + if (ke->event.action == KEY_ACTION_DOWN && ke->event.keycode == 'q') { + _menu_action_exit(NULL); + } + } + break; + case YUTANI_MSG_WINDOW_FOCUS_CHANGE: + { + struct yutani_msg_window_focus_change * wf = (void*)m->data; + yutani_window_t * win = hashmap_get(yctx->windows, (void*)wf->wid); + if (win) { + win->focused = wf->focused; + redraw_window(); + } + } + break; + case YUTANI_MSG_RESIZE_OFFER: + { + struct yutani_msg_window_resize * wr = (void*)m->data; + if (wr->wid == main_window->wid) { + resize_finish(wr->width, wr->height); + } + } + break; + case YUTANI_MSG_WINDOW_MOUSE_EVENT: + { + struct yutani_msg_window_mouse_event * me = (void*)m->data; + yutani_window_t * win = hashmap_get(yctx->windows, (void*)me->wid); + + if (win == main_window) { + int result = decor_handle_event(yctx, m); + switch (result) { + case DECOR_CLOSE: + _menu_action_exit(NULL); + break; + case DECOR_RIGHT: + /* right click in decoration, show appropriate menu */ + decor_show_default_menu(main_window, main_window->x + me->new_x, main_window->y + me->new_y); + break; + default: + /* Other actions */ + break; + } + + /* Menu bar */ + menu_bar_mouse_event(yctx, main_window, &menu_bar, me, me->new_x, me->new_y); + } + } + break; + case YUTANI_MSG_WINDOW_CLOSE: + case YUTANI_MSG_SESSION_END: + _menu_action_exit(NULL); + break; + default: + break; + } + free(m); + m = yutani_poll_async(yctx); + } + } +} diff --git a/base/usr/share/demo.menu b/base/usr/share/demo.menu index 5b6a7d16..6e2e913d 100644 --- a/base/usr/share/demo.menu +++ b/base/usr/share/demo.menu @@ -2,10 +2,11 @@ &accessories,folder,Accessories &demos,folder,Demos - -#help,help,Help +help-browser,help,Help Browser about,star,About ToaruOS log-out,exit,Log Out :accessories +file-browser,folder,File Browser terminal,utilities-terminal,Terminal :demos &decorated,folder,Decorated