From ff25b54c9f837ace420a178541b136fa4b0b1eee Mon Sep 17 00:00:00 2001 From: Olaf Wintermann Date: Fri, 3 Dec 2021 14:01:52 +0100 Subject: [PATCH] move menu initialization to separate file --- mizunara/Makefile | 1 + mizunara/main.c | 20 ++++---------------- mizunara/menu.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ mizunara/menu.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 16 deletions(-) create mode 100644 mizunara/menu.c create mode 100644 mizunara/menu.h diff --git a/mizunara/Makefile b/mizunara/Makefile index 5656808..327c556 100644 --- a/mizunara/Makefile +++ b/mizunara/Makefile @@ -32,6 +32,7 @@ include $(BUILD_ROOT)/config.mk CFLAGS += -I../ui/ -I../ucx -I.. SRC = main.c +SRC += menu.c OBJ = $(SRC:%.c=$(BUILD_ROOT)/build/mizunara/%.$(OBJ_EXT)) diff --git a/mizunara/main.c b/mizunara/main.c index ba20e28..9500f65 100644 --- a/mizunara/main.c +++ b/mizunara/main.c @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright 2017 Olaf Wintermann. All rights reserved. + * Copyright 2021 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -33,12 +33,12 @@ #include #include -void action_menu(UiEvent *event, void *userdata) { - -} +#include "menu.h" + void application_startup(UiEvent *event, void *data) { + setup_menu(); UiObject *obj = ui_window("Test", NULL); @@ -50,18 +50,6 @@ int main(int argc, char** argv) { ui_init("app1", argc, argv); ui_onstartup(application_startup, NULL); - // menu - ui_menu("File"); - ui_menuitem("Hello", action_menu, NULL); - ui_submenu("Submenu1"); - ui_submenu("Submenu2"); - ui_menuitem("item2", action_menu, NULL); - ui_submenu_end(); - ui_menuitem("item3", action_menu, NULL); - ui_submenu_end(); - ui_menuitem("item4", action_menu, NULL); - - ui_main(); return (EXIT_SUCCESS); diff --git a/mizunara/menu.c b/mizunara/menu.c new file mode 100644 index 0000000..2ba886b --- /dev/null +++ b/mizunara/menu.c @@ -0,0 +1,44 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2021 Olaf Wintermann. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "menu.h" + +#include +#include +#include + +static void action_menu(UiEvent *event, void *userdata) { + +} + + + +void setup_menu(void) { + ui_menu("File"); + ui_menuitem("Test", action_menu, NULL); +} diff --git a/mizunara/menu.h b/mizunara/menu.h new file mode 100644 index 0000000..1aba01e --- /dev/null +++ b/mizunara/menu.h @@ -0,0 +1,45 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2021 Olaf Wintermann. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef MZ_MENU_H +#define MZ_MENU_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +void setup_menu(void); + + +#ifdef __cplusplus +} +#endif + +#endif /* MZ_MENU_H */ + -- 2.43.5