X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fuilib%2Fuilib.cpp;h=72da1de0a652fbab16f82759326ae06bcce38db2;hb=66dab04732db09384c0031d3271a78533811a184;hp=eb49165a8969a7834150db2929ef0eb3c6de289e;hpb=c52a4bd4da209e657018e8d799dcb488cd848e4c;p=xonotic%2Fnetradiant.git diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp index eb49165a..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,11 +29,40 @@ namespace ui { gtk_main(); } + void process() + { + while (gtk_events_pending()) { + gtk_main_iteration(); + } + } + Widget root; - alert_response Widget::alert(std::string text, std::string title, alert_type type, alert_icon icon) +#define IMPL(T, F) template<> _IMPL(T, F) +#define _IMPL(T, F) struct verify { using self = T; static self test(self it) { return self(F(it)); } } + + template + struct verify; + + template _IMPL(T,); + +#define this (verify::test(*static_cast(this))) + + IMPL(Editable, GTK_EDITABLE); + + void IEditable::editable(bool value) { - auto ret = gtk_MessageBox(*this, text.c_str(), + gtk_editable_set_editable(GTK_EDITABLE(this), value); + } + + IMPL(Widget, GTK_WIDGET); + + Widget::Widget() : Widget(nullptr) + {} + + alert_response IWidget::alert(std::string text, std::string title, alert_type type, alert_icon icon) + { + auto ret = gtk_MessageBox(this, text.c_str(), title.c_str(), type == alert_type::OK ? eMB_OK : type == alert_type::OKCANCEL ? eMB_OKCANCEL : @@ -49,36 +85,74 @@ namespace ui { alert_response::OK; } - const char *Widget::file_dialog(bool open, const char *title, const char *path, - const char *pattern, bool want_load, bool want_import, - bool want_save) + const char * + IWidget::file_dialog(bool open, const char *title, const char *path, const char *pattern, bool want_load, + bool want_import, bool want_save) + { + return ::file_dialog(this, open, title, path, pattern, want_load, want_import, want_save); + } + + bool IWidget::visible() + { + return gtk_widget_get_visible(this) != 0; + } + + void IWidget::show() + { + gtk_widget_show(this); + } + + Dimensions IWidget::dimensions() { - return ::file_dialog(*this, open, title, path, pattern, want_load, want_import, want_save); + GtkAllocation allocation; + gtk_widget_get_allocation(this, &allocation); + return Dimensions{allocation.width, allocation.height}; } - Window::Window(window_type type) - : Window(GTK_WINDOW(gtk_window_new( + 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 : type == window_type::POPUP ? GTK_WINDOW_POPUP : - GTK_WINDOW_TOPLEVEL))) - { }; + GTK_WINDOW_TOPLEVEL + ))) + {} - Window Window::create_dialog_window(const char *title, void func(), void *data, int default_w, int default_h) + Window IWindow::create_dialog_window(const char *title, void func(), void *data, int default_w, int default_h) { - return Window(::create_dialog_window(*this, title, func, data, default_w, default_h)); + return Window(::create_dialog_window(this, title, func, data, default_w, default_h)); } - Window Window::create_modal_dialog_window(const char *title, ui_modal &dialog, int default_w, int default_h) + Window IWindow::create_modal_dialog_window(const char *title, ModalDialog &dialog, int default_w, int default_h) { - return Window(::create_modal_dialog_window(*this, title, dialog, default_w, default_h)); + return Window(::create_modal_dialog_window(this, title, dialog, default_w, default_h)); } - Window Window::create_floating_window(const char *title) + Window IWindow::create_floating_window(const char *title) { - return Window(::create_floating_window(title, *this)); + return Window(::create_floating_window(title, this)); } - std::uint64_t Window::on_key_press(bool (*f)(Widget widget, ui_evkey *event, void *extra), void *extra) + std::uint64_t IWindow::on_key_press(bool (*f)(Widget widget, _GdkEventKey *event, void *extra), void *extra) { using f_t = decltype(f); struct user_data { @@ -88,118 +162,235 @@ namespace ui { auto dtor = [](user_data *data, GClosure *) { delete data; }; - auto func = [](ui_widget *widget, GdkEventKey *event, user_data *args) -> bool { + auto func = [](_GtkWidget *widget, GdkEventKey *event, user_data *args) -> bool { return args->f(Widget(widget), event, args->extra); }; auto clos = g_cclosure_new(G_CALLBACK(+func), pass, reinterpret_cast(+dtor)); - return g_signal_connect_closure(G_OBJECT(*this), "key-press-event", clos, false); + return g_signal_connect_closure(G_OBJECT(this), "key-press-event", clos, false); } - AccelGroup::AccelGroup() : AccelGroup(GTK_ACCEL_GROUP(gtk_accel_group_new())) - { } + void IWindow::add_accel_group(AccelGroup group) + { + gtk_window_add_accel_group(this, group); + } - Adjustment::Adjustment(double value, - double lower, double upper, - double step_increment, double page_increment, - double page_size) - : Adjustment( - GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size))) - { } + 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))) - { } + {} - CellRendererText::CellRendererText() : CellRendererText(GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new())) - { } + IMPL(ToggleButton, GTK_TOGGLE_BUTTON); - ComboBoxText::ComboBoxText() : ComboBoxText(GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new())) - { } + 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))) - { } + {} - Entry::Entry() : Entry(GTK_ENTRY(gtk_entry_new())) - { } + IMPL(MenuItem, GTK_MENU_ITEM); - Entry::Entry(std::size_t max_length) : Entry() + MenuItem::MenuItem() : MenuItem(GTK_MENU_ITEM(gtk_menu_item_new())) + {} + + MenuItem::MenuItem(const char *label, bool mnemonic) : MenuItem( + 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_entry_set_max_length(*this, static_cast(max_length)); + gtk_scrolled_window_set_policy(this, static_cast(x), static_cast(y)); } - Frame::Frame(const char *label) : Frame(GTK_FRAME(gtk_frame_new(label))) - { } + 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))) - { } + {} - HScale::HScale(Adjustment adjustment) : HScale(GTK_HSCALE(gtk_hscale_new(adjustment))) - { } + IMPL(HPaned, GTK_HPANED); - HScale::HScale(double min, double max, double step) : HScale(GTK_HSCALE(gtk_hscale_new_with_range(min, max, step))) - { } + HPaned::HPaned() : HPaned(GTK_HPANED(gtk_hpaned_new())) + {} - Image::Image() : Image(GTK_IMAGE(gtk_image_new())) - { } + IMPL(VPaned, GTK_VPANED); - Label::Label(const char *label) : Label(GTK_LABEL(gtk_label_new(label))) - { } + VPaned::VPaned() : VPaned(GTK_VPANED(gtk_vpaned_new())) + {} + + IMPL(Menu, GTK_MENU); Menu::Menu() : Menu(GTK_MENU(gtk_menu_new())) - { } + {} - MenuItem::MenuItem(const char *label, bool mnemonic) : MenuItem( - GTK_MENU_ITEM((mnemonic ? gtk_menu_item_new_with_mnemonic : gtk_menu_item_new_with_label)(label))) - { } + IMPL(Table, GTK_TABLE); - HPaned::HPaned() : HPaned(GTK_HPANED(gtk_hpaned_new())) - { } + Table::Table(std::size_t rows, std::size_t columns, bool homogenous) : Table( + GTK_TABLE(gtk_table_new(rows, columns, homogenous)) + ) + {} - VPaned::VPaned() : VPaned(GTK_VPANED(gtk_vpaned_new())) - { } + IMPL(TextView, GTK_TEXT_VIEW); - ScrolledWindow::ScrolledWindow() : ScrolledWindow(GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(nullptr, nullptr))) - { } + 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())) + {} + + Entry::Entry(std::size_t max_length) : Entry() + { + gtk_entry_set_max_length(this, static_cast(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))) - { } + {} - Table::Table(std::size_t rows, std::size_t columns, bool homogenous) : Table( - GTK_TABLE(gtk_table_new(rows, columns, homogenous))) - { } + IMPL(HScale, GTK_HSCALE); - TextView::TextView() : TextView(GTK_TEXT_VIEW(gtk_text_view_new())) - { } + HScale::HScale(Adjustment adjustment) : HScale(GTK_HSCALE(gtk_hscale_new(adjustment))) + {} - TreePath::TreePath() : TreePath(gtk_tree_path_new()) - { } + HScale::HScale(double min, double max, double step) : HScale(GTK_HSCALE(gtk_hscale_new_with_range(min, max, step))) + {} - TreePath::TreePath(const char *path) : TreePath(gtk_tree_path_new_from_string(path)) - { } + IMPL(Adjustment, GTK_ADJUSTMENT); - TreeView::TreeView() : TreeView(GTK_TREE_VIEW(gtk_tree_view_new())) - { } + Adjustment::Adjustment(double value, + double lower, double upper, + double step_increment, double page_increment, + double page_size) + : Adjustment( + GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size))) + {} - TreeView::TreeView(TreeModel model) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new_with_model(model))) - { } + 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 attributes) : TreeViewColumn(gtk_tree_view_column_new_with_attributes(title, renderer, nullptr)) { for (auto &it : attributes) { - gtk_tree_view_column_add_attribute(*this, renderer, it.attribute, it.column); + gtk_tree_view_column_add_attribute(this, renderer, it.attribute, it.column); } }; - VBox::VBox(bool homogenous, int spacing) : VBox(GTK_VBOX(gtk_vbox_new(homogenous, spacing))) - { } + IMPL(AccelGroup, GTK_ACCEL_GROUP); + + AccelGroup::AccelGroup() : AccelGroup(GTK_ACCEL_GROUP(gtk_accel_group_new())) + {} + + 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 + }; }