From f90c15fef15ee1d47f565e2a48e2edd91d5617ca Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 22 Apr 2015 23:03:32 -0400
Subject: [PATCH] Started rewriting window.c. More TODOs.

---
 new/box.c         |  1 +
 new/unix/window.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 new/unix/window.c

diff --git a/new/box.c b/new/box.c
index 49e08404..a1438486 100644
--- a/new/box.c
+++ b/new/box.c
@@ -2,6 +2,7 @@
 #include "ui.h"
 #include "uipriv.h"
 
+// TODO remove these
 typedef struct box box;
 typedef struct boxControl boxControl;
 
diff --git a/new/unix/window.c b/new/unix/window.c
new file mode 100644
index 00000000..9735a3c1
--- /dev/null
+++ b/new/unix/window.c
@@ -0,0 +1,67 @@
+// 22 april 2015
+#include "uipriv_unix.h"
+
+struct window {
+	uiWindow w;
+
+	// the window itself, preconverted to the various GTK+ types
+	GtkWidget *widget;
+	GtkContainer *container;
+	GtkWindow *window;
+
+	// the main content widget of the GtkWindow
+	GtkWidget *vboxwidget;
+	GtkContainer *vboxcontainer;
+	GtkBox *vbox;
+
+	// the OS container for the uiWindow
+	uiOSContainer *content;
+
+	int margined;
+};
+
+uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubars)
+{
+	struct window *w;
+
+	w = uiNew(struct window);
+
+	w->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	w->container = GTK_CONTAINER(w->widget);
+	w->window = GTK_WINDOW(w->widget);
+
+	w->vboxwidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+	w->vboxcontainer = GTK_CONTAINER(w->vboxwidget);
+	w->vbox = GTK_BOX(w->vboxwidget);
+
+	// set the vbox as the GtkWindow child
+	gtk_container_add(w->container, w->vboxwidget);
+
+	// TODO menus
+
+	// and add the OS container
+	w->content = uiNewOSContainer((uintptr_t) (w->vboxcontainer));
+	gtk_widget_set_hexpand(GTK_WIDGET(w->content), TRUE);
+	gtk_widget_set_halign(GTK_WIDGET(w->content), GTK_ALIGN_FILL);
+	gtk_widget_set_vexpand(GTK_WIDGET(w->content), TRUE);
+	gtk_widget_set_valign(GTK_WIDGET(w->content), GTK_ALL_FILL);
+
+	// show everything in the vbox, but not the GtkWindow itself
+	gtk_widget_show_all(w->vboxwidget);
+
+	// and connect our OnClosing() event
+	g_signal_connect(w->TODO
+
+	uiWindow(w)->Destroy = windowDestroy;
+	uiWindow(w)->Handle = windowHandle;
+	uiWindow(w)->Title = windowTitle;
+	uiWindow(w)->SetTitle = windowSetTitle;
+	uiWindow(w)->Show = windowShow;
+	uiWindow(w)->Hide = windowHide;
+	uiWindow(w)->OnClosing = windowOnClosing;
+	uiWindow(w)->SetChild = windowSetChild;
+	uiWindow(w)->Margined = windowMargined;
+	uiWindow(w)->SetMargined = windowSetMargined;
+
+	return uiWindow(w);
+}