Mercurial > hg > toolkit / changeset

--- a/application/main.c	Sun Sep 22 18:16:14 2024 +0200
+++ b/application/main.c	Sun Sep 22 19:47:26 2024 +0200
@@ -163,6 +163,11 @@
     }
     
     ui_toolbar_item("Test", .label = "Test", .icon = "terminal", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test2", .label = "Test 2", .icon = "terminal", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test3", .label = "Test 3", .icon = "terminal", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test4", .label = "Test 4", .icon = "terminal", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test5", .label = "Test 5", .icon = "terminal", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test6", .label = "Test 6", .icon = "terminal", .onclick = action_toolbar_button);
     ui_toolbar_toggleitem("Toggle", .label = "Toggle", .onchange = action_toolbar_button);
     ui_toolbar_menu("Menu", .label = "Menu") {
         ui_menuitem("Secondary Test", NULL, NULL);
@@ -172,9 +177,16 @@
     }
     
     ui_toolbar_add_default("Test", UI_TOOLBAR_LEFT);
+    ui_toolbar_add_default("Test6", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("Toggle", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("Menu", UI_TOOLBAR_LEFT);
     
+    ui_toolbar_add_default("Test2", UI_TOOLBAR_CENTER);
+    ui_toolbar_add_default("Test3", UI_TOOLBAR_CENTER);
+    
+    ui_toolbar_add_default("Test4", UI_TOOLBAR_RIGHT);
+    ui_toolbar_add_default("Test5", UI_TOOLBAR_RIGHT);
+    
     ui_main();
     
     return (EXIT_SUCCESS);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/gtk/headerbar.c	Sun Sep 22 19:47:26 2024 +0200
@@ -0,0 +1,124 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2024 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 "headerbar.h"
+
+
+
+#if GTK_MAJOR_VERSION >= 3
+
+#ifdef UI_LIBADWAITA
+#define UI_HEADERBAR AdwHeaderBar*
+#define UI_HEADERBAR_CAST(h) ADW_HEADER_BAR(h)
+#define UI_HEADERBAR_PACK_START(h, w) adw_header_bar_pack_start(ADW_HEADER_BAR(h), w)
+#define UI_HEADERBAR_PACK_END(h, w) adw_header_bar_pack_end(ADW_HEADER_BAR(h), w)
+#define UI_HEADERBAR_SET_TITLE_WIDGET(h, w) adw_header_bar_set_title_widget(ADW_HEADER_BAR(h), w)
+#else
+#define UI_HEADERBAR GtkHeaderBar*
+#define UI_HEADERBAR_CAST(h) GTK_HEADER_BAR(h)
+#define UI_HEADERBAR_PACK_START(h, w) gtk_header_bar_pack_start(GTK_HEADER_BAR(h), w)
+#define UI_HEADERBAR_PACK_END(h, w) gtk_header_bar_pack_end(GTK_HEADER_BAR(h), w)
+#define UI_HEADERBAR_SET_TITLE_WIDGET(h, w) gtk_header_bar_set_title_widget(GTK_HEADER_BAR(h), w)
+#endif
+    
+void ui_fill_headerbar(UiObject *obj, GtkWidget *headerbar) {
+    CxMap *items = uic_get_toolbar_items();
+    CxList *left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
+    CxList *center_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
+    CxList *right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
+    
+    ui_headerbar_add_items(obj, headerbar, left_defaults, UI_TOOLBAR_LEFT);
+    ui_headerbar_add_items(obj, headerbar, center_defaults, UI_TOOLBAR_CENTER);
+    ui_headerbar_add_items(obj, headerbar, right_defaults, UI_TOOLBAR_RIGHT);
+}
+
+static void create_item(UiObject *obj, GtkWidget *headerbar, GtkWidget *box, UiToolbarItemI *i, enum UiToolbarPos pos) {
+    switch(i->type) {
+        case UI_TOOLBAR_ITEM: {
+            ui_add_headerbar_item(headerbar, box, (UiToolbarItem*)i, obj, pos);
+            break;
+        }
+        case UI_TOOLBAR_TOGGLEITEM: {
+            //add_toolitem_toggle_widget(tb, (UiToolbarToggleItem*)i, obj);
+            break;
+        }
+        case UI_TOOLBAR_MENU: {
+            //add_toolitem_menu_widget(tb, (UiToolbarMenuItem*)i, obj);
+            break;
+        }
+        default: fprintf(stderr, "toolbar item type unimplemented: %d\n", (int)i->type);
+    }
+}
+
+static void headerbar_add(GtkWidget *headerbar, GtkWidget *box, GtkWidget *item, enum UiToolbarPos pos) {
+    switch(pos) {
+        case UI_TOOLBAR_LEFT: {
+            UI_HEADERBAR_PACK_START(headerbar, item);
+            break;
+        }
+        case UI_TOOLBAR_CENTER: {
+            
+#if GTK_MAJOR_VERSION >= 4
+            gtk_box_append(GTK_BOX(box), item);
+#else
+            gtk_box_pack_start(GTK_BOX(box), item, 0, 0, 0)
+#endif
+            break;
+        }
+        case UI_TOOLBAR_RIGHT: {
+            UI_HEADERBAR_PACK_END(headerbar, item);
+            break;
+        }
+    }
+}
+
+void ui_headerbar_add_items(UiObject *obj, GtkWidget *headerbar, CxList *items, enum UiToolbarPos pos) {
+    GtkWidget *box = NULL;
+    
+    if(pos == UI_TOOLBAR_CENTER && cxListSize(items) > 0) {
+        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+        UI_HEADERBAR_SET_TITLE_WIDGET(headerbar, box);
+    }
+    
+    CxIterator i = pos == UI_TOOLBAR_RIGHT ? cxListBackwardsIterator(items) : cxListIterator(items);
+    cx_foreach(char*, def, i) {
+        UiToolbarItemI* item = uic_toolbar_get_item(def);
+        if (!item) {
+            fprintf(stderr, "unknown toolbar item: %s\n", def);
+            continue;
+        }
+        create_item(obj, headerbar, box, item, pos);
+    }
+}
+
+void ui_add_headerbar_item(GtkWidget *headerbar, GtkWidget *box, UiToolbarItem *item, UiObject *obj, enum UiToolbarPos pos) {
+    GtkWidget *button = gtk_button_new_with_label(item->args.label);
+    headerbar_add(headerbar, box, button, pos);
+}
+    
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/gtk/headerbar.h	Sun Sep 22 19:47:26 2024 +0200
@@ -0,0 +1,56 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2024 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 HEADERBAR_H
+#define HEADERBAR_H
+
+#include "toolkit.h"
+#include "../ui/toolbar.h"
+#include "../common/toolbar.h"
+#include <cx/list.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if GTK_MAJOR_VERSION >= 3
+    
+void ui_fill_headerbar(UiObject *obj, GtkWidget *headerbar);
+
+void ui_headerbar_add_items(UiObject *obj, GtkWidget *headerbar, CxList *items, enum UiToolbarPos pos);
+
+void ui_add_headerbar_item(GtkWidget *headerbar, GtkWidget *box, UiToolbarItem *item, UiObject *obj, enum UiToolbarPos pos);
+    
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HEADERBAR_H */
+

--- a/ui/gtk/objs.mk	Sun Sep 22 18:16:14 2024 +0200
+++ b/ui/gtk/objs.mk	Sun Sep 22 19:47:26 2024 +0200
@@ -44,6 +44,7 @@
 GTKOBJ += range.o
 GTKOBJ += entry.o
 GTKOBJ += dnd.o
+GTKOBJ += headerbar.o
 
 TOOLKITOBJS += $(GTKOBJ:%=$(GTK_OBJPRE)%)
 TOOLKITSOURCE += $(GTKOBJ:%.o=gtk/%.c)

--- a/ui/gtk/toolkit.h	Sun Sep 22 18:16:14 2024 +0200
+++ b/ui/gtk/toolkit.h	Sun Sep 22 19:47:26 2024 +0200
@@ -85,14 +85,20 @@
 #define UI_GTK_SINCE_V4(st) st
 #define UI_GTK_SINCE_V3(st) 
 #define UI_GTK_V2(st)
+#define UI_GTK_V3(st)
+#define UI_GTK_V4(st) st
 #elif GTK_MAJOR_VERSION >= 3
 #define UI_GTK_SINCE_V4(st) st
 #define UI_GTK_SINCE_V3(st) st 
 #define UI_GTK_V2(st)
+#define UI_GTK_V3(st) st
+#define UI_GTK_V4(st)
 #else
 #define UI_GTK_SINCE_V4(st) 
 #define UI_GTK_SINCE_V3(st) 
 #define UI_GTK_V2(st) st
+#define UI_GTK_V3(st) 
+#define UI_GTK_V4(st)
 #endif
 
 

--- a/ui/gtk/window.c	Sun Sep 22 18:16:14 2024 +0200
+++ b/ui/gtk/window.c	Sun Sep 22 19:47:26 2024 +0200
@@ -41,6 +41,7 @@
 #include "menu.h"
 #include "toolbar.h"
 #include "container.h"
+#include "headerbar.h"
 
 static int nwindows = 0;
 
@@ -117,6 +118,8 @@
     
     GtkWidget *headerbar = adw_header_bar_new();
     adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar);
+    
+    ui_fill_headerbar(obj, headerbar);
 #elif GTK_MAJOR_VERSION >= 4
     WINDOW_SET_CONTENT(obj->widget, vbox);
 #else