#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"
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;
}
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 */
enum tilda_window_properties {
TILDA_WINDOW_NUMBER = 1,
+ TILDA_WINDOW_CONTROLLER,
TILDA_WINDOW_KEY,
/* Somewhat of a "poison" value, incase we don't set this */
self->number = 0xdeadbeef;
+ self->controller = NULL;
self->state = WINDOW_UP;
}
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);
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;
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);
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)
{
* 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);
}
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,