Remove old main() functions
[tilda-gobject.git] / tilda-window.c
index 95d5cea..85fa02b 100644 (file)
@@ -10,6 +10,9 @@
 static TildaTerminal *
 tilda_window_find_current_terminal (TildaWindow *self)
 {
+       debug_enter();
+       debug_assert (TILDA_IS_WINDOW(self));
+
        gint i;
        TildaTerminal *ret;
        gint current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK(self->notebook));
@@ -23,13 +26,16 @@ tilda_window_find_current_terminal (TildaWindow *self)
                        return ret;
        }
 
-       g_printerr ("FIXME: unable to find current terminal!\n");
+       debug_printf ("ERROR: unable to find current terminal!\n");
        return NULL;
 }
 
 static gint
 tilda_window_find_next_free_terminal_number (TildaWindow *tw)
 {
+       debug_enter ();
+       debug_assert (TILDA_IS_WINDOW(tw));
+
        gint i, j;
        gboolean found;
 
@@ -58,6 +64,9 @@ tilda_window_find_next_free_terminal_number (TildaWindow *tw)
 static gboolean
 tilda_window_add_term (TildaWindow *tw)
 {
+       debug_enter ();
+       debug_assert (TILDA_IS_WINDOW(tw));
+
        gint number;
        TildaTerminal *tt;
 
@@ -89,6 +98,10 @@ tilda_window_add_term (TildaWindow *tw)
 gboolean
 tilda_window_remove_term (TildaWindow *tw, gint terminal_number)
 {
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(tw));
+       debug_assert (terminal_number >= 0);
+
        gint i;
 
        for (i=0; i<tw->terms->len; ++i)
@@ -102,7 +115,7 @@ tilda_window_remove_term (TildaWindow *tw, gint terminal_number)
                        /* Make sure the index was valid */
                        if (notebook_index == -1)
                        {
-                               g_printerr ("DEBUG ERROR: Bad Notebook Tab\n");
+                               debug_printf ("ERROR: Bad Notebook Tab\n");
                                return FALSE;
                        }
 
@@ -138,6 +151,9 @@ tilda_window_remove_term (TildaWindow *tw, gint terminal_number)
 static void
 tilda_window_setup_real_transparency (TildaWindow *self)
 {
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(self));
+
        GdkScreen *screen;
        GdkColormap *colormap;
 
@@ -156,35 +172,81 @@ tilda_window_setup_real_transparency (TildaWindow *self)
        self->have_real_transparency = FALSE;
 }
 
+/* Center the given TildaWindow in the horizontal axis */
+static void
+tilda_window_center_horizontally (TildaWindow *self)
+{
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(self));
+
+       const gint screen_center = gdk_screen_width() / 2;
+       const gint tilda_center  = self->width / 2;
+       const gint center_coord  = screen_center - tilda_center;
+
+       g_object_set (G_OBJECT(self), "x-position", center_coord, NULL);
+}
+
+/* Center the given TildaWindow in the vertical axis */
+static void
+tilda_window_center_vertically (TildaWindow *self)
+{
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(self));
+
+       const gint screen_center = gdk_screen_height() / 2;
+       const gint tilda_center  = self->height / 2;
+       const gint center_coord  = screen_center - tilda_center;
+
+       g_object_set (G_OBJECT(self), "y-position", center_coord, NULL);
+}
+
 static void
 tilda_window_keybinding_cb (const gchar *keystr, gpointer data)
 {
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(data));
+
        TildaWindow *self = TILDA_WINDOW(data);
        TildaTerminal *tt;
-       g_print ("tilda_window_keybinding_cb() called! -- window %d\n", self->number);
 
        // FIXME: this doesn't handle animation!
 
        switch (self->state)
        {
-               case WINDOW_UP:
-                       /* Pull Down */
-                       tomboy_window_present_hardcore (GTK_WINDOW(self->window));
-                       self->state = WINDOW_DOWN;
-
-                       // Focusing the term here works perfectly, near as I can tell
+               case WINDOW_UP: /* Pull the window up */
+
+                       /* Bugfix: having this here keeps the tilda window from being
+                        * hidden if you turn off "stick", pull it down on workspace 1,
+                        * switch to workspace 2, then pull it up and back down. Without
+                        * this, something in metacity (at least) hides the window. Stupid. */
+                       gtk_window_deiconify (GTK_WINDOW(self->window));
+
+                       /* Re-set the window properties that do not linger after hiding the
+                        * window. I know this looks stupid, but it keeps all of the state-
+                        * changing code in the place it belongs: the property-setting code. */
+                       g_object_set (G_OBJECT(self),
+                                       "keep-above", self->keep_above,
+                                       "stick", self->stick,
+                                       NULL);
+                       gtk_window_present_with_time (GTK_WINDOW(self->window),
+                                                                                 tomboy_keybinder_get_current_event_time());
+
+                       /* Focusing the term here works perfectly, near as I can tell */
                        tt = tilda_window_find_current_terminal (self);
                        gtk_widget_grab_focus (GTK_WIDGET(tt->vte_term));
+
+                       self->state = WINDOW_DOWN;
                        break;
 
-               case WINDOW_DOWN:
-                       /* Pull Up */
+               case WINDOW_DOWN: /* Pull the window up */
+
                        gtk_widget_hide (GTK_WIDGET(self->window));
+
                        self->state = WINDOW_UP;
                        break;
 
                default:
-                       g_printerr ("FIXME: the window is in a bad state!\n");
+                       debug_printf ("ERROR: Window is in a bad state!\n");
 
                        /* Pretend we're down, for good measure.... */
                        self->state = WINDOW_DOWN;
@@ -200,6 +262,9 @@ tilda_window_keybinding_cb (const gchar *keystr, gpointer data)
 static gboolean
 tilda_window_try_to_bind_key (TildaWindow *self, const gchar *new_key)
 {
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(self));
+
        gboolean ret = FALSE;
 
        /* Make sure the new key is not null in any way */
@@ -240,6 +305,9 @@ tilda_window_try_to_bind_key (TildaWindow *self, const gchar *new_key)
 static void
 tilda_window_dbus_register_object (TildaWindow *tw)
 {
+       debug_enter  ();
+       debug_assert (TILDA_IS_WINDOW(tw));
+
        gchar *object_path;
 
        // Register this object with DBus
@@ -270,7 +338,7 @@ enum tilda_window_properties {
 
        TILDA_WINDOW_KEEP_ABOVE,
        TILDA_WINDOW_SKIP_TASKBAR_HINT,
-       TILDA_WINDOW_PINNED,
+       TILDA_WINDOW_STICK,
        TILDA_WINDOW_HIDDEN_AT_START,
        TILDA_WINDOW_CENTERED_HORIZONTALLY,
        TILDA_WINDOW_CENTERED_VERTICALLY,
@@ -282,6 +350,8 @@ static void
 tilda_window_instance_init (GTypeInstance *instance,
                                                        gpointer       g_class)
 {
+       debug_enter ();
+
        TildaWindow *self = (TildaWindow *) instance;
        self->dispose_has_run = FALSE;
 
@@ -308,89 +378,99 @@ tilda_window_set_property (GObject      *object,
 
                case TILDA_WINDOW_NUMBER:
                        self->number = g_value_get_int (value);
-                       g_print ("window number: %d\n", self->number);
+                       debug_printf ("window number: %d\n", self->number);
                        break;
 
                case TILDA_WINDOW_KEY:
                        tilda_window_try_to_bind_key (self, g_value_get_string (value));
-                       g_print ("window key: %s\n", self->key);
+                       debug_printf ("window key %s\n", self->key);
                        break;
 
                case TILDA_WINDOW_HEIGHT:
                        self->height = g_value_get_int (value);
                        gtk_widget_set_size_request (self->window, self->width, self->height);
                        gtk_window_resize (GTK_WINDOW(self->window), self->width, self->height);
-                       g_print ("window height: %d\n", self->height);
+                       debug_printf ("window height: %d\n", self->height);
                        break;
 
                case TILDA_WINDOW_WIDTH:
                        self->width = g_value_get_int (value);
                        gtk_widget_set_size_request (self->window, self->width, self->height);
                        gtk_window_resize (GTK_WINDOW(self->window), self->width, self->height);
-                       g_print ("window width: %d\n", self->width);
+                       debug_printf ("window width: %d\n", self->width);
                        break;
 
                case TILDA_WINDOW_X_POSITION:
                        self->x_position = g_value_get_int (value);
                        gtk_window_move (GTK_WINDOW(self->window), self->x_position, self->y_position);
-                       g_print ("window x position: %d\n", self->x_position);
+                       debug_printf ("window x position: %d\n", self->x_position);
                        break;
 
                case TILDA_WINDOW_Y_POSITION:
                        self->y_position = g_value_get_int (value);
                        gtk_window_move (GTK_WINDOW(self->window), self->x_position, self->y_position);
-                       g_print ("window y position: %d\n", self->y_position);
+                       debug_printf ("window y position: %d\n", self->y_position);
                        break;
 
                case TILDA_WINDOW_TAB_POSITION:
                        self->tab_position = g_value_get_int (value);
-                       g_print ("window tab position: %d\n", self->tab_position);
+                       gtk_notebook_set_tab_pos (GTK_NOTEBOOK(self->notebook), self->tab_position);
+                       debug_printf ("window tab position: %d\n", self->tab_position);
                        break;
 
                case TILDA_WINDOW_ANIMATION_ORIENTATION:
                        self->animation_orientation = g_value_get_int (value);
-                       g_print ("window animation orientation: %d\n", self->animation_orientation);
+                       debug_printf ("window animation orientation: %d\n", self->animation_orientation);
                        break;
 
                case TILDA_WINDOW_ANIMATION_DELAY:
                        self->animation_delay = g_value_get_int (value);
-                       g_print ("window animation delay: %d\n", self->animation_delay);
+                       debug_printf ("window animation delay: %d\n", self->animation_delay);
                        break;
 
                case TILDA_WINDOW_KEEP_ABOVE:
                        self->keep_above = g_value_get_boolean (value);
-                       g_print ("window keep above: %d\n", self->keep_above);
+                       gtk_window_set_keep_above (GTK_WINDOW(self->window), self->keep_above);
+                       debug_printf ("window keep above: %d\n", self->keep_above);
                        break;
 
                case TILDA_WINDOW_SKIP_TASKBAR_HINT:
                        self->skip_taskbar_hint = g_value_get_boolean (value);
                        gtk_window_set_skip_taskbar_hint (GTK_WINDOW(self->window), self->skip_taskbar_hint);
-                       g_print ("window skip taskbar hint: %d\n", self->skip_taskbar_hint);
+                       debug_printf ("window skip taskbar hint: %d\n", self->skip_taskbar_hint);
                        break;
 
-               case TILDA_WINDOW_PINNED:
-                       self->pinned = g_value_get_boolean (value);
-                       g_print ("window pinned: %d\n", self->pinned);
+               case TILDA_WINDOW_STICK:
+                       self->stick = g_value_get_boolean (value);
+
+                       /* This is moderately ugly, but GTK+ does it this way... */
+                       self->stick ? gtk_window_stick (GTK_WINDOW(self->window))
+                                               : gtk_window_unstick (GTK_WINDOW(self->window));
+                       debug_printf ("window stick: %d\n", self->stick);
                        break;
 
                case TILDA_WINDOW_HIDDEN_AT_START:
                        self->hidden_at_start = g_value_get_boolean (value);
-                       g_print ("window hidden at start: %d\n", self->hidden_at_start);
+                       debug_printf ("window hidden at start: %d\n", self->hidden_at_start);
                        break;
 
                case TILDA_WINDOW_CENTERED_HORIZONTALLY:
                        self->centered_horizontally = g_value_get_boolean (value);
-                       g_print ("window centered horizontally: %d\n", self->centered_horizontally);
+                       if (self->centered_horizontally)
+                               tilda_window_center_horizontally (self);
+                       debug_printf ("window centered horizontally: %d\n", self->centered_horizontally);
                        break;
 
                case TILDA_WINDOW_CENTERED_VERTICALLY:
                        self->centered_vertically = g_value_get_boolean (value);
-                       g_print ("window centered vertically: %d\n", self->centered_vertically);
+                       if (self->centered_vertically)
+                               tilda_window_center_vertically (self);
+                       debug_printf ("window centered vertically: %d\n", self->centered_vertically);
                        break;
 
                case TILDA_WINDOW_HAVE_REAL_TRANSPARENCY:
                        self->have_real_transparency = g_value_get_boolean (value);
-                       g_print ("window have real transp: %d\n", self->have_real_transparency);
+                       debug_printf ("window have real transp: %d\n", self->have_real_transparency);
                        break;
 
                default:
@@ -454,8 +534,8 @@ tilda_window_get_property (GObject    *object,
                        g_value_set_boolean (value, self->skip_taskbar_hint);
                        break;
 
-               case TILDA_WINDOW_PINNED:
-                       g_value_set_boolean (value, self->pinned);
+               case TILDA_WINDOW_STICK:
+                       g_value_set_boolean (value, self->stick);
                        break;
 
                case TILDA_WINDOW_HIDDEN_AT_START:
@@ -486,6 +566,8 @@ tilda_window_constructor (GType                  type,
                                                  guint                  n_construct_properties,
                                                  GObjectConstructParam *construct_properties)
 {
+       debug_enter ();
+
        GObject *obj;
        TildaWindow *self;
 
@@ -515,13 +597,24 @@ tilda_window_constructor (GType                  type,
        g_object_set (G_OBJECT(self), "key", "F2", NULL);
        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);
+       g_object_set (G_OBJECT(self), "hidden-at-start", FALSE, NULL);
 
        gtk_window_set_decorated (GTK_WINDOW(self->window), FALSE);
 
+       // FIXME: It should be configurable how many terms we add at startup
        tilda_window_add_term (self);
        tilda_window_add_term (self);
-       gtk_widget_show_all (self->window);
-       self->state = WINDOW_DOWN;
+
+       /* Show us if we're ready. If not, just remain hidden. All sub-widgets must
+        * be gtk_widget_show()n by this point. */
+       if (!self->hidden_at_start)
+       {
+               gtk_widget_show (self->window);
+               self->state = WINDOW_DOWN;
+       }
+       else
+               self->state = WINDOW_UP;
 
        return obj;
 }
@@ -529,12 +622,17 @@ tilda_window_constructor (GType                  type,
 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)
 {
+       debug_enter ();
+
        TildaWindow *self = (TildaWindow *) obj;
 
        /* We don't want to run dispose twice, so just return immediately */
@@ -560,6 +658,8 @@ tilda_window_dispose (GObject *obj)
 static void
 tilda_window_finalize (GObject *obj)
 {
+       debug_enter ();
+
        TildaWindow *self = (TildaWindow *) obj;
 
        /*
@@ -578,6 +678,8 @@ static void
 tilda_window_class_init (gpointer g_class,
                                                 gpointer g_class_data)
 {
+       debug_enter ();
+
        GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
        TildaWindowClass *klass = TILDA_WINDOW_CLASS (g_class);
        GParamSpec *pspec;
@@ -718,14 +820,14 @@ tilda_window_class_init (gpointer g_class,
                                                                         TILDA_WINDOW_SKIP_TASKBAR_HINT,
                                                                         pspec);
 
-       pspec = g_param_spec_boolean ("pinned",
+       pspec = g_param_spec_boolean ("stick",
                                                                  "Display this window on all workspaces",
                                                                  NULL,
                                                                  FALSE,
                                                                  G_PARAM_READWRITE);
 
        g_object_class_install_property (gobject_class,
-                                                                        TILDA_WINDOW_PINNED,
+                                                                        TILDA_WINDOW_STICK,
                                                                         pspec);
 
        pspec = g_param_spec_boolean ("hidden-at-start",
@@ -765,8 +867,6 @@ tilda_window_class_init (gpointer g_class,
                                                                         TILDA_WINDOW_HAVE_REAL_TRANSPARENCY,
                                                                         pspec);
 
-       /* TODO: more properties */
-
        /* Hook the TildaWindow type into DBus */
        dbus_g_object_type_install_info (tilda_window_get_type(), &dbus_glib_tilda_window_object_info);
 }
@@ -799,34 +899,4 @@ tilda_window_get_type (void)
        return type;
 }
 
-#if 0
-
-int main (int argc, char *argv[])
-{
-       GObject *tw;
-       gint test_number = INT_MIN;
-
-       /* Initialize the GObject type system */
-       g_type_init ();
-       gtk_init (&argc, &argv);
-
-       tw = g_object_new (TILDA_TYPE_WINDOW, "number", 10, NULL);
-       g_object_get (G_OBJECT (tw), "number", &test_number, NULL);
-       g_assert (test_number == 10);
-
-       g_object_unref (G_OBJECT (tw));
-
-       tw = g_object_new (TILDA_TYPE_WINDOW, "number", 22, NULL);
-       g_object_get (G_OBJECT (tw), "number", &test_number, NULL);
-       g_assert (test_number == 22);
-
-       gtk_main ();
-
-       g_object_unref (G_OBJECT (tw));
-
-       return 0;
-}
-
-#endif
-
 /* vim: set ts=4 sts=4 sw=4 noet tw=112: */