X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fuilib%2Fuilib.cpp;h=72da1de0a652fbab16f82759326ae06bcce38db2;hb=66dab04732db09384c0031d3271a78533811a184;hp=dc0b93f29e9bfa9e81fdb9fe0a77f82c9690c699;hpb=335990b4b52a2f97a879afb68cff9bea05f05884;p=xonotic%2Fnetradiant.git

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index dc0b93f2..72da1de0 100644
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -11,10 +11,17 @@
 
 namespace ui {
 
-    void init(int argc, char *argv[])
+    bool init(int *argc, char **argv[], char const *parameter_string, char const **error)
     {
         gtk_disable_setlocale();
-        gtk_init(&argc, &argv);
+        static GOptionEntry entries[] = {{NULL}};
+        char const *translation_domain = NULL;
+        GError *gerror = NULL;
+        bool ret = gtk_init_with_args(argc, argv, parameter_string, entries, translation_domain, &gerror) != 0;
+        if (!ret) {
+            *error = gerror->message;
+        }
+        return ret;
     }
 
     void main()
@@ -22,15 +29,34 @@ namespace ui {
         gtk_main();
     }
 
-    Widget root{nullptr};
+    void process()
+    {
+        while (gtk_events_pending()) {
+            gtk_main_iteration();
+        }
+    }
+
+    Widget root;
 
-#define this (*static_cast<self>(this))
+#define IMPL(T, F) template<> _IMPL(T, F)
+#define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self(F(it)); } }
+
+    template<class T>
+    struct verify;
+
+    template<class T> _IMPL(T,);
+
+#define this (verify<self>::test(*static_cast<self>(this)))
+
+    IMPL(Editable, GTK_EDITABLE);
 
     void IEditable::editable(bool value)
     {
         gtk_editable_set_editable(GTK_EDITABLE(this), value);
     }
 
+    IMPL(Widget, GTK_WIDGET);
+
     Widget::Widget() : Widget(nullptr)
     {}
 
@@ -66,8 +92,43 @@ namespace ui {
         return ::file_dialog(this, open, title, path, pattern, want_load, want_import, want_save);
     }
 
-    Window::Window() : Window(nullptr)
-    {}
+    bool IWidget::visible()
+    {
+        return gtk_widget_get_visible(this) != 0;
+    }
+
+    void IWidget::show()
+    {
+        gtk_widget_show(this);
+    }
+
+    Dimensions IWidget::dimensions()
+    {
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(this, &allocation);
+        return Dimensions{allocation.width, allocation.height};
+    }
+
+    void IWidget::dimensions(int width, int height)
+    {
+        gtk_widget_set_size_request(this, width, height);
+    }
+
+    IMPL(Container, GTK_CONTAINER);
+
+    void IContainer::add(Widget widget)
+    {
+        gtk_container_add(this, widget);
+    }
+
+    void IContainer::remove(Widget widget)
+    {
+        gtk_container_remove(this, widget);
+    }
+
+    IMPL(Bin, GTK_BIN);
+
+    IMPL(Window, GTK_WINDOW);
 
     Window::Window(window_type type) : Window(GTK_WINDOW(gtk_window_new(
             type == window_type::TOP ? GTK_WINDOW_TOPLEVEL :
@@ -113,27 +174,42 @@ namespace ui {
         gtk_window_add_accel_group(this, group);
     }
 
+    IMPL(Alignment, GTK_ALIGNMENT);
+
     Alignment::Alignment(float xalign, float yalign, float xscale, float yscale)
             : Alignment(GTK_ALIGNMENT(gtk_alignment_new(xalign, yalign, xscale, yscale)))
     {}
 
+    IMPL(Frame, GTK_FRAME);
+
     Frame::Frame(const char *label) : Frame(GTK_FRAME(gtk_frame_new(label)))
     {}
 
+    IMPL(Button, GTK_BUTTON);
+
     Button::Button() : Button(GTK_BUTTON(gtk_button_new()))
     {}
 
     Button::Button(const char *label) : Button(GTK_BUTTON(gtk_button_new_with_label(label)))
     {}
 
+    IMPL(ToggleButton, GTK_TOGGLE_BUTTON);
+
     bool IToggleButton::active()
     {
         return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(this)) != 0;
     }
 
+    IMPL(CheckButton, GTK_CHECK_BUTTON);
+
+    CheckButton::CheckButton() : CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new()))
+    {}
+
     CheckButton::CheckButton(const char *label) : CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new_with_label(label)))
     {}
 
+    IMPL(MenuItem, GTK_MENU_ITEM);
+
     MenuItem::MenuItem() : MenuItem(GTK_MENU_ITEM(gtk_menu_item_new()))
     {}
 
@@ -141,50 +217,92 @@ namespace ui {
             GTK_MENU_ITEM((mnemonic ? gtk_menu_item_new_with_mnemonic : gtk_menu_item_new_with_label)(label)))
     {}
 
+    IMPL(TearoffMenuItem, GTK_TEAROFF_MENU_ITEM);
+
     TearoffMenuItem::TearoffMenuItem() : TearoffMenuItem(GTK_TEAROFF_MENU_ITEM(gtk_tearoff_menu_item_new()))
     {}
 
+    IMPL(ComboBoxText, GTK_COMBO_BOX_TEXT);
+
     ComboBoxText::ComboBoxText() : ComboBoxText(GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new()))
     {}
 
+    IMPL(ScrolledWindow, GTK_SCROLLED_WINDOW);
+
     ScrolledWindow::ScrolledWindow() : ScrolledWindow(GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(nullptr, nullptr)))
     {}
 
+    void IScrolledWindow::overflow(Policy x, Policy y)
+    {
+        gtk_scrolled_window_set_policy(this, static_cast<GtkPolicyType>(x), static_cast<GtkPolicyType>(y));
+    }
+
+    IMPL(VBox, GTK_VBOX);
+
     VBox::VBox(bool homogenous, int spacing) : VBox(GTK_VBOX(gtk_vbox_new(homogenous, spacing)))
     {}
 
+    IMPL(HBox, GTK_HBOX);
+
     HBox::HBox(bool homogenous, int spacing) : HBox(GTK_HBOX(gtk_hbox_new(homogenous, spacing)))
     {}
 
+    IMPL(HPaned, GTK_HPANED);
+
     HPaned::HPaned() : HPaned(GTK_HPANED(gtk_hpaned_new()))
     {}
 
+    IMPL(VPaned, GTK_VPANED);
+
     VPaned::VPaned() : VPaned(GTK_VPANED(gtk_vpaned_new()))
     {}
 
+    IMPL(Menu, GTK_MENU);
+
     Menu::Menu() : Menu(GTK_MENU(gtk_menu_new()))
     {}
 
+    IMPL(Table, GTK_TABLE);
+
     Table::Table(std::size_t rows, std::size_t columns, bool homogenous) : Table(
             GTK_TABLE(gtk_table_new(rows, columns, homogenous))
     )
     {}
 
+    IMPL(TextView, GTK_TEXT_VIEW);
+
     TextView::TextView() : TextView(GTK_TEXT_VIEW(gtk_text_view_new()))
     {}
 
+    void ITextView::text(char const *str)
+    {
+        GtkTextBuffer *buffer = gtk_text_view_get_buffer(this);
+        gtk_text_buffer_set_text(buffer, str, -1);
+    }
+
     TreeView::TreeView() : TreeView(GTK_TREE_VIEW(gtk_tree_view_new()))
     {}
 
     TreeView::TreeView(TreeModel model) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)))
     {}
 
+    IMPL(Label, GTK_LABEL);
+
     Label::Label(const char *label) : Label(GTK_LABEL(gtk_label_new(label)))
     {}
 
+    void ILabel::text(char const *str)
+    {
+        gtk_label_set_text(this, str);
+    }
+
+    IMPL(Image, GTK_IMAGE);
+
     Image::Image() : Image(GTK_IMAGE(gtk_image_new()))
     {}
 
+    IMPL(Entry, GTK_ENTRY);
+
     Entry::Entry() : Entry(GTK_ENTRY(gtk_entry_new()))
     {}
 
@@ -193,16 +311,32 @@ namespace ui {
         gtk_entry_set_max_length(this, static_cast<gint>(max_length));
     }
 
+    char const *IEntry::text()
+    {
+        return gtk_entry_get_text(this);
+    }
+
+    void IEntry::text(char const *str)
+    {
+        return gtk_entry_set_text(this, str);
+    }
+
+    IMPL(SpinButton, GTK_SPIN_BUTTON);
+
     SpinButton::SpinButton(Adjustment adjustment, double climb_rate, std::size_t digits) : SpinButton(
             GTK_SPIN_BUTTON(gtk_spin_button_new(adjustment, climb_rate, digits)))
     {}
 
+    IMPL(HScale, GTK_HSCALE);
+
     HScale::HScale(Adjustment adjustment) : HScale(GTK_HSCALE(gtk_hscale_new(adjustment)))
     {}
 
     HScale::HScale(double min, double max, double step) : HScale(GTK_HSCALE(gtk_hscale_new_with_range(min, max, step)))
     {}
 
+    IMPL(Adjustment, GTK_ADJUSTMENT);
+
     Adjustment::Adjustment(double value,
                            double lower, double upper,
                            double step_increment, double page_increment,
@@ -211,9 +345,13 @@ namespace ui {
             GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size)))
     {}
 
+    IMPL(CellRendererText, GTK_CELL_RENDERER_TEXT);
+
     CellRendererText::CellRendererText() : CellRendererText(GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()))
     {}
 
+    IMPL(TreeViewColumn, GTK_TREE_VIEW_COLUMN);
+
     TreeViewColumn::TreeViewColumn(const char *title, CellRenderer renderer,
                                    std::initializer_list<TreeViewColumnAttribute> attributes)
             : TreeViewColumn(gtk_tree_view_column_new_with_attributes(title, renderer, nullptr))
@@ -223,17 +361,36 @@ namespace ui {
         }
     };
 
+    IMPL(AccelGroup, GTK_ACCEL_GROUP);
+
     AccelGroup::AccelGroup() : AccelGroup(GTK_ACCEL_GROUP(gtk_accel_group_new()))
     {}
 
-    void IListStore::clear() {
+    IMPL(ListStore, GTK_LIST_STORE);
+
+    void IListStore::clear()
+    {
         gtk_list_store_clear(this);
     }
 
+    // IMPL(TreePath, GTK_TREE_PATH);
+
     TreePath::TreePath() : TreePath(gtk_tree_path_new())
     {}
 
     TreePath::TreePath(const char *path) : TreePath(gtk_tree_path_new_from_string(path))
     {}
 
+    // Custom
+
+    guint IGLArea::on_render(GCallback pFunction, void *data)
+    {
+#if GTK_TARGET == 3
+        return this.connect("render", pFunction, data);
+#endif
+#if GTK_TARGET == 2
+        return this.connect("expose_event", pFunction, data);
+#endif
+    };
+
 }