struct _GtkItem;
struct _GtkLabel;
struct _GtkListStore;
+struct _GtkTreeIter;
struct _GtkMenu;
struct _GtkMenuBar;
struct _GtkMenuItem;
struct _GtkTreeModel;
struct _GtkTreePath;
struct _GtkTreeSelection;
+struct _GtkTreeStore;
struct _GtkTreeView;
struct _GtkTreeViewColumn;
struct _GtkVBox;
namespace ui {
- void init(int argc, char *argv[]);
+ bool init(int *argc, char **argv[], char const *parameter_string, char const **error);
void main();
void process();
- extern class Widget root;
-
- enum class alert_type {
- OK,
- OKCANCEL,
- YESNO,
- YESNOCANCEL,
- NOYES,
- };
-
- enum class alert_icon {
- Default,
- Error,
- Warning,
- Question,
- Asterisk,
- };
-
- enum class alert_response {
- OK,
- CANCEL,
- YES,
- NO,
- };
-
enum class window_type {
TOP,
POPUP
NEVER
};
+ enum class Packing {
+ START,
+ END
+ };
+
namespace details {
enum class Convert {
};
}
- extern struct Null {} null;
+ const struct Null {} null = {};
+ const struct New_t {} New = {};
class Object :
public details::Convertible<Object, _GtkObject *, details::Convert::Explicit>,
using native = _GtkObject *;
native _handle;
- Object(native h) : _handle(h)
+ explicit Object(native h) : _handle(h)
{}
explicit operator bool() const
void unref()
{ g_object_unref(_handle); }
+ void ref()
+ { g_object_ref(_handle); }
+
template<class Lambda>
gulong connect(char const *detailed_signal, Lambda &&c_handler, void *data);
public: \
using self = name *; \
using native = T *; \
- explicit name(native h) : super(reinterpret_cast<super::native>(h)) {} \
- explicit name(Null n) : name((native) nullptr) {} \
+ protected: \
+ explicit name(native h) noexcept : super(reinterpret_cast<super::native>(h)) {} \
+ public: \
+ explicit name(Null n) noexcept : name((native) nullptr) {} \
+ explicit name(New_t); \
+ static name from(native h) { return name(h); } \
+ static name from(void *ptr) { return name((native) ptr); } \
ctors \
}; \
inline bool operator<(name self, name other) { return self._handle < other._handle; } \
);
WRAP(Editable, Object, _GtkEditable, (),
- Editable();
,
void editable(bool value);
);
// GObject
+ struct Dimensions {
+ int width;
+ int height;
+ };
+
+ class Window;
WRAP(Widget, Object, _GtkWidget, (),
- Widget();
,
- alert_response alert(
- std::string text,
- std::string title = "NetRadiant",
- alert_type type = alert_type::OK,
- alert_icon icon = alert_icon::Default
- );
+ Window window();
const char *file_dialog(
bool open,
const char *title,
bool want_import = false,
bool want_save = false
);
+ bool visible();
+ void visible(bool shown);
void show();
+ void hide();
+ Dimensions dimensions();
+ void dimensions(int width, int height);
+ void destroy();
);
WRAP(Container, Widget, _GtkContainer, (),
class AccelGroup;
WRAP(Window, Bin, _GtkWindow, (),
- Window(window_type type);
+ explicit Window(window_type type);
,
Window create_dialog_window(
const char *title,
);
WRAP(Frame, Bin, _GtkFrame, (),
- Frame(const char *label = nullptr);
+ explicit Frame(const char *label = nullptr);
,
);
WRAP(Button, Bin, _GtkButton, (),
- Button();
- Button(const char *label);
+ explicit Button(const char *label);
,
);
WRAP(ToggleButton, Button, _GtkToggleButton, (),
,
- bool active();
+ bool active() const;
+ void active(bool value);
);
WRAP(CheckButton, ToggleButton, _GtkCheckButton, (),
- CheckButton(const char *label);
+ explicit CheckButton(const char *label);
,
);
);
WRAP(MenuItem, Item, _GtkMenuItem, (),
- MenuItem();
- MenuItem(const char *label, bool mnemonic = false);
+ explicit MenuItem(const char *label, bool mnemonic = false);
,
);
);
WRAP(TearoffMenuItem, MenuItem, _GtkTearoffMenuItem, (),
- TearoffMenuItem();
,
);
);
WRAP(ComboBoxText, ComboBox, _GtkComboBoxText, (),
- ComboBoxText();
,
);
);
WRAP(ScrolledWindow, Bin, _GtkScrolledWindow, (),
- ScrolledWindow();
,
+ void overflow(Policy x, Policy y);
);
WRAP(Box, Container, _GtkBox, (),
,
+ void pack_start(ui::Widget child, bool expand, bool fill, unsigned int padding);
+ void pack_end(ui::Widget child, bool expand, bool fill, unsigned int padding);
+ void set_child_packing(ui::Widget child, bool expand, bool fill, unsigned int padding, ui::Packing packing);
);
WRAP(VBox, Box, _GtkVBox, (),
);
WRAP(HPaned, Paned, _GtkHPaned, (),
- HPaned();
,
);
WRAP(VPaned, Paned, _GtkVPaned, (),
- VPaned();
,
);
);
WRAP(Menu, MenuShell, _GtkMenu, (),
- Menu();
,
);
+ struct TableAttach {
+ unsigned int left, right, top, bottom;
+ };
+
+ struct TableAttachOptions {
+ // todo: type safety
+ unsigned int x, y;
+ };
+
+ struct TablePadding {
+ unsigned int x, y;
+ };
+
WRAP(Table, Container, _GtkTable, (),
Table(std::size_t rows, std::size_t columns, bool homogenous);
,
+ // 5 = expand | fill
+ void attach(Widget child, TableAttach attach, TableAttachOptions options = {5, 5}, TablePadding padding = {0, 0});
);
WRAP(TextView, Container, _GtkTextView, (),
- TextView();
,
+ void text(char const *str);
);
WRAP(Toolbar, Container, _GtkToolbar, (),
class TreeModel;
WRAP(TreeView, Widget, _GtkTreeView, (),
- TreeView();
TreeView(TreeModel model);
,
);
);
WRAP(Label, Widget, _GtkLabel, (),
- Label(const char *label);
+ explicit Label(const char *label);
,
+ void text(char const *str);
);
WRAP(Image, Widget, _GtkImage, (),
- Image();
,
);
WRAP(Entry, Widget, _GtkEntry, (IEditable, ICellEditable),
- Entry();
- Entry(std::size_t max_length);
+ explicit Entry(std::size_t max_length);
,
+ char const *text();
+ void text(char const *str);
);
class Adjustment;
);
WRAP(HScale, Scale, _GtkHScale, (),
- HScale(Adjustment adjustment);
+ explicit HScale(Adjustment adjustment);
HScale(double min, double max, double step);
,
);
);
WRAP(CellRendererText, CellRenderer, _GtkCellRendererText, (),
- CellRendererText();
,
);
);
WRAP(AccelGroup, Object, _GtkAccelGroup, (),
- AccelGroup();
,
);
WRAP(ListStore, Object, _GtkListStore, (ITreeModel),
,
void clear();
+
+ template<class... T>
+ void append(T... args);
+
+ void append();
+ );
+
+ WRAP(TreeStore, Object, _GtkTreeStore, (ITreeModel),
+ ,
);
WRAP(TreeSelection, Object, _GtkTreeSelection, (),
// GBoxed
WRAP(TreePath, Object, _GtkTreePath, (),
- TreePath();
- TreePath(const char *path);
+ explicit TreePath(const char *path);
,
);
#undef WRAP
+ // global
+
+ enum class alert_response {
+ OK,
+ CANCEL,
+ YES,
+ NO,
+ };
+
+ enum class alert_type {
+ OK,
+ OKCANCEL,
+ YESNO,
+ YESNOCANCEL,
+ NOYES,
+ };
+
+ enum class alert_icon {
+ Default,
+ Error,
+ Warning,
+ Question,
+ Asterisk,
+ };
+
+ extern class Window root;
+
+ alert_response alert(
+ Window parent,
+ std::string text,
+ std::string title = RADIANT_NAME,
+ alert_type type = alert_type::OK,
+ alert_icon icon = alert_icon::Default
+ );
+
// callbacks
namespace {
GtkCallback cb = [](_GtkWidget *widget, void *data) -> void {
using Function = typename std::decay<Lambda>::type;
Function *f = static_cast<Function *>(data);
- (*f)(Widget(widget));
+ (*f)(Widget::from(widget));
};
gtk_container_foreach(this, cb, &lambda);
}
+ namespace {
+ extern "C" {
+ void gtk_list_store_insert_with_values(_GtkListStore *, _GtkTreeIter *, gint position, ...);
+ }
+ }
+
+ template<class... T>
+ void IListStore::append(T... args) {
+ static_assert(sizeof...(args) % 2 == 0, "received an odd number of arguments");
+ gtk_list_store_insert_with_values(this, NULL, -1, args..., -1);
+ }
+
#undef this
}
projects / xonotic / netradiant.git / blobdiff