From: Ira W. Snyder Date: Sun, 20 Jan 2008 01:24:08 +0000 (-0800) Subject: [Window] Export the AddTerminal method over DBus X-Git-Url: https://www.irasnyder.com/gitweb/?p=tilda-gobject.git;a=commitdiff_plain;h=3390da90c845629c6c0c0b1c333555404bac5c53 [Window] Export the AddTerminal method over DBus This exports a method to add a terminal to the window that the AddTerminal message is sent to. --- diff --git a/tilda-terminal.c b/tilda-terminal.c index ed34929..91921d2 100644 --- a/tilda-terminal.c +++ b/tilda-terminal.c @@ -119,7 +119,7 @@ tilda_terminal_child_exited_cb (GtkWidget *widget, gpointer data) switch (self->exit_action) { case EXIT_TERMINAL: - tilda_window_remove_term (TILDA_WINDOW(self->parent_window), self->number); + tilda_window_remove_terminal (TILDA_WINDOW(self->parent_window), self->number); break; case RESTART_COMMAND: vte_terminal_feed (VTE_TERMINAL(self->vte_term), "\r\n\r\n", 4); diff --git a/tilda-window.c b/tilda-window.c index 579ee1f..f9b1ba5 100644 --- a/tilda-window.c +++ b/tilda-window.c @@ -34,10 +34,10 @@ tilda_window_find_current_terminal (TildaWindow *self) } static gint -tilda_window_find_next_free_terminal_number (TildaWindow *tw) +tilda_window_find_next_free_terminal_number (TildaWindow *self) { debug_enter (); - debug_assert (TILDA_IS_WINDOW(tw)); + debug_assert (TILDA_IS_WINDOW(self)); gint i, j; gboolean found; @@ -46,9 +46,9 @@ tilda_window_find_next_free_terminal_number (TildaWindow *tw) { found = FALSE; - for (j=0; jterms->len; ++j) + for (j=0; jterms->len; ++j) { - TildaTerminal *tt = g_ptr_array_index (tw->terms, j); + TildaTerminal *tt = g_ptr_array_index (self->terms, j); if (tt->number == i) { @@ -64,29 +64,29 @@ tilda_window_find_next_free_terminal_number (TildaWindow *tw) return 0; } -static gboolean -tilda_window_add_term (TildaWindow *tw) +gboolean +tilda_window_add_terminal (TildaWindow *self) { debug_enter (); - debug_assert (TILDA_IS_WINDOW(tw)); + debug_assert (TILDA_IS_WINDOW(self)); gint number; TildaTerminal *tt; - number = tilda_window_find_next_free_terminal_number (tw); + number = tilda_window_find_next_free_terminal_number (self); tt = g_object_new (TILDA_TYPE_TERMINAL, "number", number, - "parent-window", tw, + "parent-window", self, NULL); - g_ptr_array_add (tw->terms, tt); + g_ptr_array_add (self->terms, tt); GtkWidget *label = gtk_label_new ("Tilda"); - gint index = gtk_notebook_prepend_page (GTK_NOTEBOOK(tw->notebook), tt->hbox, label); - gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK(tw->notebook), tt->hbox, TRUE, TRUE, GTK_PACK_END); - gtk_notebook_set_current_page (GTK_NOTEBOOK(tw->notebook), index); + gint index = gtk_notebook_prepend_page (GTK_NOTEBOOK(self->notebook), tt->hbox, label); + gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK(self->notebook), tt->hbox, TRUE, TRUE, GTK_PACK_END); + gtk_notebook_set_current_page (GTK_NOTEBOOK(self->notebook), index); - if (gtk_notebook_get_n_pages (GTK_NOTEBOOK(tw->notebook)) > 1) - gtk_notebook_set_show_tabs (GTK_NOTEBOOK(tw->notebook), TRUE); + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK(self->notebook)) > 1) + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(self->notebook), TRUE); return TRUE; } @@ -98,21 +98,21 @@ tilda_window_add_term (TildaWindow *tw) * Return: TRUE on success, FALSE otherwise. */ gboolean -tilda_window_remove_term (TildaWindow *tw, gint terminal_number) +tilda_window_remove_terminal (TildaWindow *self, gint terminal_number) { debug_enter (); - debug_assert (TILDA_IS_WINDOW(tw)); + debug_assert (TILDA_IS_WINDOW(self)); debug_assert (terminal_number >= 0); gint i; - for (i=0; iterms->len; ++i) + for (i=0; iterms->len; ++i) { - TildaTerminal *tt = g_ptr_array_index (tw->terms, i); + TildaTerminal *tt = g_ptr_array_index (self->terms, i); if (tt->number == terminal_number) { - gint notebook_index = gtk_notebook_page_num (GTK_NOTEBOOK(tw->notebook), tt->hbox); + gint notebook_index = gtk_notebook_page_num (GTK_NOTEBOOK(self->notebook), tt->hbox); /* Make sure the index was valid */ if (notebook_index == -1) @@ -122,21 +122,21 @@ tilda_window_remove_term (TildaWindow *tw, gint terminal_number) } /* Actually remove the terminal */ - gtk_notebook_remove_page (GTK_NOTEBOOK (tw->notebook), notebook_index); + gtk_notebook_remove_page (GTK_NOTEBOOK (self->notebook), notebook_index); /* We should hide the tabs if there is only one tab left */ - if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)) == 1) - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (tw->notebook), FALSE); + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (self->notebook)) == 1) + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (self->notebook), FALSE); /* Remove the term from our lists, then free it */ - g_ptr_array_remove_fast (tw->terms, tt); + g_ptr_array_remove_fast (self->terms, tt); g_object_unref (G_OBJECT(tt)); /* With no pages left, it's time to remove this window */ - if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)) < 1) + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (self->notebook)) < 1) { - debug_printf ("no terminals left, closing window %d\n", tw->number); - tilda_del_window (tw->number); + debug_printf ("no terminals left, closing window %d\n", self->number); + tilda_del_window (self->number); } /* Leave the loop, we're done */ @@ -305,16 +305,16 @@ tilda_window_try_to_bind_key (TildaWindow *self, const gchar *new_key) } static void -tilda_window_dbus_register_object (TildaWindow *tw) +tilda_window_dbus_register_object (TildaWindow *self) { debug_enter (); - debug_assert (TILDA_IS_WINDOW(tw)); + debug_assert (TILDA_IS_WINDOW(self)); gchar *object_path; // Register this object with DBus - object_path = g_strdup_printf ("/net/sourceforge/Tilda/Window%d", tw->number); - dbus_g_connection_register_g_object (dbus_connection, object_path, G_OBJECT(tw)); + object_path = g_strdup_printf ("/net/sourceforge/Tilda/Window%d", self->number); + dbus_g_connection_register_g_object (dbus_connection, object_path, G_OBJECT(self)); g_free (object_path); } @@ -604,8 +604,8 @@ tilda_window_constructor (GType type, 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); + tilda_window_add_terminal (self); + tilda_window_add_terminal (self); /* Show us if we're ready. If not, just remain hidden. All sub-widgets must * be gtk_widget_show()n by this point. */ diff --git a/tilda-window.h b/tilda-window.h index 8d1dffc..bc6cd89 100644 --- a/tilda-window.h +++ b/tilda-window.h @@ -75,7 +75,8 @@ struct _TildaWindowClass { GType tilda_window_get_type (void); /* API */ -gboolean tilda_window_remove_term (TildaWindow *tw, gint terminal_number); +gboolean tilda_window_add_terminal (TildaWindow *self); +gboolean tilda_window_remove_terminal (TildaWindow *self, gint terminal_number); #endif /* TILDA_WINDOW_H */ diff --git a/tilda-window.xml b/tilda-window.xml index 2615808..a2b372a 100644 --- a/tilda-window.xml +++ b/tilda-window.xml @@ -5,6 +5,10 @@ + + + +