X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=tilda-window.c;h=1ac2a14ce3960eeaa8429fb57717c4de66ff499f;hb=1cb6e4d2f7d79497dd89828665de713a6175445c;hp=87849d8fd0aa3bc645ced2c99b9fa7762dcd0022;hpb=93db48f0c2f7a1185d4da9d9ab7cde83b9a3aa94;p=tilda-gobject.git

diff --git a/tilda-window.c b/tilda-window.c
index 87849d8..1ac2a14 100644
--- a/tilda-window.c
+++ b/tilda-window.c
@@ -2,6 +2,7 @@
 #include <gdk/gdkx.h> /* for gdk_x11_window_set_user_time() */
 
 #include "tilda.h"
+#include "tilda-controller.h"
 #include "tilda-window.h"
 #include "tilda-window-dbus-glue.h"
 #include "tomboykeybinder.h"
@@ -76,7 +77,7 @@ tilda_window_close (TildaWindow *self)
 	debug_enter  ();
 	debug_assert (TILDA_IS_WINDOW(self));
 
-	tilda_del_window (self->number);
+	tilda_controller_delete_window (TILDA_CONTROLLER(self->controller), self->number);
 
 	return TRUE;
 }
@@ -156,7 +157,7 @@ tilda_window_remove_terminal (TildaWindow *self, gint terminal_number)
 			if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (self->notebook)) < 1)
 			{
 				debug_printf ("no terminals left, closing window %d\n", self->number);
-				tilda_del_window (self->number);
+				tilda_controller_delete_window (TILDA_CONTROLLER(self->controller), self->number);
 			}
 
 			/* Leave the loop, we're done */
@@ -350,6 +351,7 @@ static GObjectClass *parent_class = NULL;
 
 enum tilda_window_properties {
 	TILDA_WINDOW_NUMBER = 1,
+	TILDA_WINDOW_CONTROLLER,
 
 	TILDA_WINDOW_KEY,
 
@@ -388,6 +390,7 @@ tilda_window_instance_init (GTypeInstance *instance,
 
 	/* Somewhat of a "poison" value, incase we don't set this */
 	self->number = 0xdeadbeef;
+	self->controller = NULL;
 
 	self->state = WINDOW_UP;
 }
@@ -407,6 +410,11 @@ tilda_window_set_property (GObject      *object,
 			debug_printf ("window number: %d\n", self->number);
 			break;
 
+		case TILDA_WINDOW_CONTROLLER:
+			self->controller = g_value_get_pointer (value);
+			debug_printf ("window controller: 0x%x\n", self->controller);
+			break;
+
 		case TILDA_WINDOW_KEY:
 			tilda_window_try_to_bind_key (self, g_value_get_string (value));
 			debug_printf ("window key %s\n", self->key);
@@ -520,6 +528,10 @@ tilda_window_get_property (GObject    *object,
 			g_value_set_int (value, self->number);
 			break;
 
+		case TILDA_WINDOW_CONTROLLER:
+			g_value_set_pointer (value, self->controller);
+			break;
+
 		case TILDA_WINDOW_KEY:
 			g_value_set_string (value, self->key);
 			break;
@@ -620,7 +632,9 @@ tilda_window_constructor (GType                  type,
 	gtk_widget_show (self->notebook);
 
 	// FIXME: Remove these, and replace with reads from the config system
-	g_object_set (G_OBJECT(self), "key", "F2", NULL);
+	gchar *mykey = g_strdup_printf ("F%d", self->number+3); // TERRIBLE HACK
+	g_object_set (G_OBJECT(self), "key", mykey, NULL);
+	g_free (mykey);
 	g_object_set (G_OBJECT(self), "x-position", 0, "y-position", 0, NULL);
 	g_object_set (G_OBJECT(self), "height", 400, "width", 1680, NULL);
 	g_object_set (G_OBJECT(self), "keep-above", TRUE, "stick", TRUE, NULL);
@@ -645,15 +659,6 @@ tilda_window_constructor (GType                  type,
 	return obj;
 }
 
-static void
-my_unref (gpointer data, gpointer user_data)
-{
-	debug_enter ();
-
-	// FIXME: This function should probably be eliminated. It /is/ rather ugly
-	g_object_unref (G_OBJECT(data));
-}
-
 static void
 tilda_window_dispose (GObject *obj)
 {
@@ -674,9 +679,13 @@ tilda_window_dispose (GObject *obj)
 	 * NOTE: See the following for how to deal with GtkObject-derived things:
 	 * http://library.gnome.org/devel/gtk/unstable/GtkObject.html
 	 */
-	g_ptr_array_foreach (self->terms, my_unref, NULL);
+	g_ptr_array_foreach (self->terms, g_object_unref, NULL);
 	gtk_widget_destroy (self->window);
 
+	/* Unbind if we were set */
+	if (self->key)
+		tomboy_keybinder_unbind (self->key, tilda_window_keybinding_cb);
+
 	/* Chain up to the parent class */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
@@ -732,6 +741,15 @@ tilda_window_class_init (gpointer g_class,
 									 TILDA_WINDOW_NUMBER,
 									 pspec);
 
+	pspec = g_param_spec_pointer ("controller",
+								  _("Pointer to window's controlling TildaController"),
+								  NULL,
+								  G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+
+	g_object_class_install_property (gobject_class,
+									 TILDA_WINDOW_CONTROLLER,
+									 pspec);
+
 	pspec = g_param_spec_string ("key",
 								 _("Window's drop-down keybinding"),
 								 NULL,