diff options
| -rw-r--r-- | src/terminal-window.c | 5627 |
1 files changed, 2814 insertions, 2813 deletions
diff --git a/src/terminal-window.c b/src/terminal-window.c index a2ac4be..cd10b59 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -45,50 +45,50 @@ struct _TerminalWindowPrivate { - GtkActionGroup *action_group; - GtkUIManager *ui_manager; - guint ui_id; + GtkActionGroup *action_group; + GtkUIManager *ui_manager; + guint ui_id; - GtkActionGroup *profiles_action_group; - guint profiles_ui_id; + GtkActionGroup *profiles_action_group; + guint profiles_ui_id; - GtkActionGroup *encodings_action_group; - guint encodings_ui_id; + GtkActionGroup *encodings_action_group; + guint encodings_ui_id; - TerminalTabsMenu *tabs_menu; + TerminalTabsMenu *tabs_menu; - TerminalScreenPopupInfo *popup_info; - guint remove_popup_info_idle; + TerminalScreenPopupInfo *popup_info; + guint remove_popup_info_idle; - GtkActionGroup *new_terminal_action_group; - guint new_terminal_ui_id; + GtkActionGroup *new_terminal_action_group; + guint new_terminal_ui_id; - GtkWidget *menubar; - GtkWidget *notebook; - TerminalScreen *active_screen; - int old_char_width; - int old_char_height; - void *old_geometry_widget; /* only used for pointer value as it may be freed */ + GtkWidget *menubar; + GtkWidget *notebook; + TerminalScreen *active_screen; + int old_char_width; + int old_char_height; + void *old_geometry_widget; /* only used for pointer value as it may be freed */ - GtkWidget *confirm_close_dialog; - GtkWidget *search_find_dialog; + GtkWidget *confirm_close_dialog; + GtkWidget *search_find_dialog; - guint menubar_visible : 1; - guint use_default_menubar_visibility : 1; + guint menubar_visible : 1; + guint use_default_menubar_visibility : 1; - /* Compositing manager integration */ - guint have_argb_visual : 1; + /* Compositing manager integration */ + guint have_argb_visual : 1; - /* Used to clear stray "demands attention" flashing on our window when we - * unmap and map it to switch to an ARGB visual. - */ - guint clear_demands_attention : 1; + /* Used to clear stray "demands attention" flashing on our window when we + * unmap and map it to switch to an ARGB visual. + */ + guint clear_demands_attention : 1; - guint disposed : 1; - guint present_on_insert : 1; + guint disposed : 1; + guint present_on_insert : 1; - /* Workaround until gtk+ bug #535557 is fixed */ - guint icon_title_set : 1; + /* Workaround until gtk+ bug #535557 is fixed */ + guint icon_title_set : 1; }; #define PROFILE_DATA_KEY "GT::Profile" @@ -246,53 +246,53 @@ app_setting_notify_cb (TerminalApp *app, GParamSpec *pspec, GdkScreen *screen) { - GtkSettings *settings; - const char *prop_name; - - if (pspec) - prop_name = pspec->name; - else - prop_name = NULL; - - settings = gtk_settings_get_for_screen (screen); - - if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MNEMONICS)) - { - gboolean enable_mnemonics; - - g_object_get (app, TERMINAL_APP_ENABLE_MNEMONICS, &enable_mnemonics, NULL); - g_object_set (settings, "gtk-enable-mnemonics", enable_mnemonics, NULL); - } - - if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MENU_BAR_ACCEL)) - { - /* const */ char *saved_menubar_accel; - gboolean enable_menubar_accel; - - /* FIXME: Once gtk+ bug 507398 is fixed, use that to reset the property instead */ - /* Now this is a bad hack on so many levels. */ - saved_menubar_accel = g_object_get_data (G_OBJECT (settings), "GT::gtk-menu-bar-accel"); - if (!saved_menubar_accel) - { - g_object_get (settings, "gtk-menu-bar-accel", &saved_menubar_accel, NULL); - g_object_set_data_full (G_OBJECT (settings), "GT::gtk-menu-bar-accel", - saved_menubar_accel, (GDestroyNotify) g_free); - } - - g_object_get (app, TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, &enable_menubar_accel, NULL); - if (enable_menubar_accel) - g_object_set (settings, "gtk-menu-bar-accel", saved_menubar_accel, NULL); - else - g_object_set (settings, "gtk-menu-bar-accel", NULL, NULL); - } + GtkSettings *settings; + const char *prop_name; + + if (pspec) + prop_name = pspec->name; + else + prop_name = NULL; + + settings = gtk_settings_get_for_screen (screen); + + if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MNEMONICS)) + { + gboolean enable_mnemonics; + + g_object_get (app, TERMINAL_APP_ENABLE_MNEMONICS, &enable_mnemonics, NULL); + g_object_set (settings, "gtk-enable-mnemonics", enable_mnemonics, NULL); + } + + if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MENU_BAR_ACCEL)) + { + /* const */ char *saved_menubar_accel; + gboolean enable_menubar_accel; + + /* FIXME: Once gtk+ bug 507398 is fixed, use that to reset the property instead */ + /* Now this is a bad hack on so many levels. */ + saved_menubar_accel = g_object_get_data (G_OBJECT (settings), "GT::gtk-menu-bar-accel"); + if (!saved_menubar_accel) + { + g_object_get (settings, "gtk-menu-bar-accel", &saved_menubar_accel, NULL); + g_object_set_data_full (G_OBJECT (settings), "GT::gtk-menu-bar-accel", + saved_menubar_accel, (GDestroyNotify) g_free); + } + + g_object_get (app, TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, &enable_menubar_accel, NULL); + if (enable_menubar_accel) + g_object_set (settings, "gtk-menu-bar-accel", saved_menubar_accel, NULL); + else + g_object_set (settings, "gtk-menu-bar-accel", NULL, NULL); + } } static void app_setting_notify_destroy_cb (GdkScreen *screen) { - g_signal_handlers_disconnect_by_func (terminal_app_get (), - G_CALLBACK (app_setting_notify_cb), - screen); + g_signal_handlers_disconnect_by_func (terminal_app_get (), + G_CALLBACK (app_setting_notify_cb), + screen); } /* utility functions */ @@ -300,23 +300,23 @@ app_setting_notify_destroy_cb (GdkScreen *screen) static char * escape_underscores (const char *name) { - GString *escaped_name; + GString *escaped_name; - g_assert (name != NULL); + g_assert (name != NULL); - /* Who'd use more that 4 underscores in a profile name... */ - escaped_name = g_string_sized_new (strlen (name) + 4 + 1); + /* Who'd use more that 4 underscores in a profile name... */ + escaped_name = g_string_sized_new (strlen (name) + 4 + 1); - while (*name) - { - if (*name == '_') - g_string_append (escaped_name, "__"); - else - g_string_append_c (escaped_name, *name); - name++; - } + while (*name) + { + if (*name == '_') + g_string_append (escaped_name, "__"); + else + g_string_append_c (escaped_name, *name); + name++; + } - return g_string_free (escaped_name, FALSE); + return g_string_free (escaped_name, FALSE); } static int @@ -324,44 +324,44 @@ find_tab_num_at_pos (GtkNotebook *notebook, int screen_x, int screen_y) { - GtkPositionType tab_pos; - int page_num = 0; - GtkNotebook *nb = GTK_NOTEBOOK (notebook); - GtkWidget *page; - GtkAllocation tab_allocation; + GtkPositionType tab_pos; + int page_num = 0; + GtkNotebook *nb = GTK_NOTEBOOK (notebook); + GtkWidget *page; + GtkAllocation tab_allocation; - tab_pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (notebook)); + tab_pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (notebook)); - while ((page = gtk_notebook_get_nth_page (nb, page_num))) - { - GtkWidget *tab; - int max_x, max_y, x_root, y_root; + while ((page = gtk_notebook_get_nth_page (nb, page_num))) + { + GtkWidget *tab; + int max_x, max_y, x_root, y_root; - tab = gtk_notebook_get_tab_label (nb, page); - g_return_val_if_fail (tab != NULL, -1); + tab = gtk_notebook_get_tab_label (nb, page); + g_return_val_if_fail (tab != NULL, -1); - if (!gtk_widget_get_mapped (GTK_WIDGET (tab))) - { - page_num++; - continue; - } + if (!gtk_widget_get_mapped (GTK_WIDGET (tab))) + { + page_num++; + continue; + } - gdk_window_get_origin (gtk_widget_get_window (tab), &x_root, &y_root); + gdk_window_get_origin (gtk_widget_get_window (tab), &x_root, &y_root); - gtk_widget_get_allocation (tab, &tab_allocation); - max_x = x_root + tab_allocation.x + tab_allocation.width; - max_y = y_root + tab_allocation.y + tab_allocation.height; + gtk_widget_get_allocation (tab, &tab_allocation); + max_x = x_root + tab_allocation.x + tab_allocation.width; + max_y = y_root + tab_allocation.y + tab_allocation.height; - if ((tab_pos == GTK_POS_TOP || tab_pos == GTK_POS_BOTTOM) && screen_x <= max_x) - return page_num; + if ((tab_pos == GTK_POS_TOP || tab_pos == GTK_POS_BOTTOM) && screen_x <= max_x) + return page_num; - if ((tab_pos == GTK_POS_LEFT || tab_pos == GTK_POS_RIGHT) && screen_y <= max_y) - return page_num; + if ((tab_pos == GTK_POS_LEFT || tab_pos == GTK_POS_RIGHT) && screen_y <= max_y) + return page_num; - page_num++; - } + page_num++; + } - return -1; + return -1; } static void @@ -371,75 +371,75 @@ position_menu_under_widget (GtkMenu *menu, gboolean *push_in, gpointer user_data) { - /* Adapted from gtktoolbar.c */ - GtkWidget *widget = GTK_WIDGET (user_data); - GdkWindow *widget_window; - GtkWidget *container; - GtkRequisition req; - GtkRequisition menu_req; - GdkRectangle monitor; - int monitor_num; - GdkScreen *screen; - GtkAllocation widget_allocation; - - widget_window = gtk_widget_get_window (widget); - gtk_widget_get_allocation (widget, &widget_allocation); - container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER); - - gtk_widget_size_request (widget, &req); - gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); - - screen = gtk_widget_get_screen (GTK_WIDGET (menu)); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); - if (monitor_num < 0) - monitor_num = 0; - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - gdk_window_get_origin (widget_window, x, y); - if (!gtk_widget_get_has_window (widget)) - { - *x += widget_allocation.x; - *y += widget_allocation.y; - } - if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR) - *x += widget_allocation.width - req.width; - else - *x += req.width - menu_req.width; - - if ((*y + widget_allocation.height + menu_req.height) <= monitor.y + monitor.height) - *y += widget_allocation.height; - else if ((*y - menu_req.height) >= monitor.y) - *y -= menu_req.height; - else if (monitor.y + monitor.height - (*y + widget_allocation.height) > *y) - *y += widget_allocation.height; - else - *y -= menu_req.height; - - *push_in = FALSE; + /* Adapted from gtktoolbar.c */ + GtkWidget *widget = GTK_WIDGET (user_data); + GdkWindow *widget_window; + GtkWidget *container; + GtkRequisition req; + GtkRequisition menu_req; + GdkRectangle monitor; + int monitor_num; + GdkScreen *screen; + GtkAllocation widget_allocation; + + widget_window = gtk_widget_get_window (widget); + gtk_widget_get_allocation (widget, &widget_allocation); + container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER); + + gtk_widget_size_request (widget, &req); + gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); + + screen = gtk_widget_get_screen (GTK_WIDGET (menu)); + monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); + if (monitor_num < 0) + monitor_num = 0; + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + + gdk_window_get_origin (widget_window, x, y); + if (!gtk_widget_get_has_window (widget)) + { + *x += widget_allocation.x; + *y += widget_allocation.y; + } + if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR) + *x += widget_allocation.width - req.width; + else + *x += req.width - menu_req.width; + + if ((*y + widget_allocation.height + menu_req.height) <= monitor.y + monitor.height) + *y += widget_allocation.height; + else if ((*y - menu_req.height) >= monitor.y) + *y -= menu_req.height; + else if (monitor.y + monitor.height - (*y + widget_allocation.height) > *y) + *y += widget_allocation.height; + else + *y -= menu_req.height; + + *push_in = FALSE; } static void terminal_set_profile_toggled_callback (GtkToggleAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalProfile *profile; + TerminalWindowPrivate *priv = window->priv; + TerminalProfile *profile; - if (!gtk_toggle_action_get_active (action)) - return; + if (!gtk_toggle_action_get_active (action)) + return; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); - g_assert (profile); + profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); + g_assert (profile); - if (_terminal_profile_get_forgotten (profile)) - return; + if (_terminal_profile_get_forgotten (profile)) + return; - g_signal_handlers_block_by_func (priv->active_screen, G_CALLBACK (profile_set_callback), window); - terminal_screen_set_profile (priv->active_screen, profile); - g_signal_handlers_unblock_by_func (priv->active_screen, G_CALLBACK (profile_set_callback), window); + g_signal_handlers_block_by_func (priv->active_screen, G_CALLBACK (profile_set_callback), window); + terminal_screen_set_profile (priv->active_screen, profile); + g_signal_handlers_unblock_by_func (priv->active_screen, G_CALLBACK (profile_set_callback), window); } static void @@ -447,189 +447,189 @@ profile_visible_name_notify_cb (TerminalProfile *profile, GParamSpec *pspec, GtkAction *action) { - const char *visible_name; - char *dot, *display_name; - guint num; - - visible_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_VISIBLE_NAME); - display_name = escape_underscores (visible_name); - - dot = strchr (gtk_action_get_name (action), '.'); - if (dot != NULL) - { - char *free_me; - - num = g_ascii_strtoll (dot + 1, NULL, 10); - - free_me = display_name; - if (num < 10) - /* Translators: This is the label of a menu item to choose a profile. - * _%d is used as the accelerator (with d between 1 and 9), and - * the %s is the name of the terminal profile. - */ - display_name = g_strdup_printf (_("_%d. %s"), num, display_name); - else if (num < 36) - /* Translators: This is the label of a menu item to choose a profile. - * _%c is used as the accelerator (it will be a character between A and Z), - * and the %s is the name of the terminal profile. - */ - display_name = g_strdup_printf (_("_%c. %s"), ('A' + num - 10), display_name); - else - free_me = NULL; - - g_free (free_me); - } - - g_object_set (action, "label", display_name, NULL); - g_free (display_name); + const char *visible_name; + char *dot, *display_name; + guint num; + + visible_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_VISIBLE_NAME); + display_name = escape_underscores (visible_name); + + dot = strchr (gtk_action_get_name (action), '.'); + if (dot != NULL) + { + char *free_me; + + num = g_ascii_strtoll (dot + 1, NULL, 10); + + free_me = display_name; + if (num < 10) + /* Translators: This is the label of a menu item to choose a profile. + * _%d is used as the accelerator (with d between 1 and 9), and + * the %s is the name of the terminal profile. + */ + display_name = g_strdup_printf (_("_%d. %s"), num, display_name); + else if (num < 36) + /* Translators: This is the label of a menu item to choose a profile. + * _%c is used as the accelerator (it will be a character between A and Z), + * and the %s is the name of the terminal profile. + */ + display_name = g_strdup_printf (_("_%c. %s"), ('A' + num - 10), display_name); + else + free_me = NULL; + + g_free (free_me); + } + + g_object_set (action, "label", display_name, NULL); + g_free (display_name); } static void disconnect_profiles_from_actions_in_group (GtkActionGroup *action_group) { - GList *actions, *l; + GList *actions, *l; - actions = gtk_action_group_list_actions (action_group); - for (l = actions; l != NULL; l = l->next) - { - GObject *action = G_OBJECT (l->data); - TerminalProfile *profile; + actions = gtk_action_group_list_actions (action_group); + for (l = actions; l != NULL; l = l->next) + { + GObject *action = G_OBJECT (l->data); + TerminalProfile *profile; - profile = g_object_get_data (action, PROFILE_DATA_KEY); - if (!profile) - continue; + profile = g_object_get_data (action, PROFILE_DATA_KEY); + if (!profile) + continue; - g_signal_handlers_disconnect_by_func (profile, G_CALLBACK (profile_visible_name_notify_cb), action); - } - g_list_free (actions); + g_signal_handlers_disconnect_by_func (profile, G_CALLBACK (profile_visible_name_notify_cb), action); + } + g_list_free (actions); } static void terminal_window_update_set_profile_menu_active_profile (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalProfile *new_active_profile; - GList *actions, *l; + TerminalWindowPrivate *priv = window->priv; + TerminalProfile *new_active_profile; + GList *actions, *l; - if (!priv->profiles_action_group) - return; + if (!priv->profiles_action_group) + return; - if (!priv->active_screen) - return; + if (!priv->active_screen) + return; - new_active_profile = terminal_screen_get_profile (priv->active_screen); + new_active_profile = terminal_screen_get_profile (priv->active_screen); - actions = gtk_action_group_list_actions (priv->profiles_action_group); - for (l = actions; l != NULL; l = l->next) - { - GObject *action = G_OBJECT (l->data); - TerminalProfile *profile; + actions = gtk_action_group_list_actions (priv->profiles_action_group); + for (l = actions; l != NULL; l = l->next) + { + GObject *action = G_OBJECT (l->data); + TerminalProfile *profile; - profile = g_object_get_data (action, PROFILE_DATA_KEY); - if (profile != new_active_profile) - continue; + profile = g_object_get_data (action, PROFILE_DATA_KEY); + if (profile != new_active_profile) + continue; - g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); - g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); + g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); - break; - } - g_list_free (actions); + break; + } + g_list_free (actions); } static void terminal_window_update_set_profile_menu (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalProfile *active_profile; - GtkActionGroup *action_group; - GtkAction *action; - GList *profiles, *p; - GSList *group; - guint n; - gboolean single_profile; - - /* Remove the old UI */ - if (priv->profiles_ui_id != 0) - { - gtk_ui_manager_remove_ui (priv->ui_manager, priv->profiles_ui_id); - priv->profiles_ui_id = 0; - } - - if (priv->profiles_action_group != NULL) - { - disconnect_profiles_from_actions_in_group (priv->profiles_action_group); - gtk_ui_manager_remove_action_group (priv->ui_manager, - priv->profiles_action_group); - priv->profiles_action_group = NULL; - } - - profiles = terminal_app_get_profile_list (terminal_app_get ()); - - action = gtk_action_group_get_action (priv->action_group, "TerminalProfiles"); - single_profile = !profiles || profiles->next == NULL; /* list length <= 1 */ - gtk_action_set_sensitive (action, !single_profile); - if (profiles == NULL) - return; - - if (priv->active_screen) - active_profile = terminal_screen_get_profile (priv->active_screen); - else - active_profile = NULL; - - action_group = priv->profiles_action_group = gtk_action_group_new ("Profiles"); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); - g_object_unref (action_group); - - priv->profiles_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); - - group = NULL; - n = 0; - for (p = profiles; p != NULL; p = p->next) - { - TerminalProfile *profile = (TerminalProfile *) p->data; - GtkRadioAction *profile_action; - char name[32]; - - g_snprintf (name, sizeof (name), "TerminalSetProfile%u", n++); - - profile_action = gtk_radio_action_new (name, - NULL, - NULL, - NULL, - n); - - gtk_radio_action_set_group (profile_action, group); - group = gtk_radio_action_get_group (profile_action); - - if (profile == active_profile) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (profile_action), TRUE); - - g_object_set_data_full (G_OBJECT (profile_action), - PROFILE_DATA_KEY, - g_object_ref (profile), - (GDestroyNotify) g_object_unref); - profile_visible_name_notify_cb (profile, NULL, GTK_ACTION (profile_action)); - g_signal_connect (profile, "notify::" TERMINAL_PROFILE_VISIBLE_NAME, - G_CALLBACK (profile_visible_name_notify_cb), profile_action); - g_signal_connect (profile_action, "toggled", - G_CALLBACK (terminal_set_profile_toggled_callback), window); - - gtk_action_group_add_action (action_group, GTK_ACTION (profile_action)); - g_object_unref (profile_action); - - gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id, - PROFILES_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id, - PROFILES_POPUP_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - } - - g_list_free (profiles); + TerminalWindowPrivate *priv = window->priv; + TerminalProfile *active_profile; + GtkActionGroup *action_group; + GtkAction *action; + GList *profiles, *p; + GSList *group; + guint n; + gboolean single_profile; + + /* Remove the old UI */ + if (priv->profiles_ui_id != 0) + { + gtk_ui_manager_remove_ui (priv->ui_manager, priv->profiles_ui_id); + priv->profiles_ui_id = 0; + } + + if (priv->profiles_action_group != NULL) + { + disconnect_profiles_from_actions_in_group (priv->profiles_action_group); + gtk_ui_manager_remove_action_group (priv->ui_manager, + priv->profiles_action_group); + priv->profiles_action_group = NULL; + } + + profiles = terminal_app_get_profile_list (terminal_app_get ()); + + action = gtk_action_group_get_action (priv->action_group, "TerminalProfiles"); + single_profile = !profiles || profiles->next == NULL; /* list length <= 1 */ + gtk_action_set_sensitive (action, !single_profile); + if (profiles == NULL) + return; + + if (priv->active_screen) + active_profile = terminal_screen_get_profile (priv->active_screen); + else + active_profile = NULL; + + action_group = priv->profiles_action_group = gtk_action_group_new ("Profiles"); + gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); + g_object_unref (action_group); + + priv->profiles_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); + + group = NULL; + n = 0; + for (p = profiles; p != NULL; p = p->next) + { + TerminalProfile *profile = (TerminalProfile *) p->data; + GtkRadioAction *profile_action; + char name[32]; + + g_snprintf (name, sizeof (name), "TerminalSetProfile%u", n++); + + profile_action = gtk_radio_action_new (name, + NULL, + NULL, + NULL, + n); + + gtk_radio_action_set_group (profile_action, group); + group = gtk_radio_action_get_group (profile_action); + + if (profile == active_profile) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (profile_action), TRUE); + + g_object_set_data_full (G_OBJECT (profile_action), + PROFILE_DATA_KEY, + g_object_ref (profile), + (GDestroyNotify) g_object_unref); + profile_visible_name_notify_cb (profile, NULL, GTK_ACTION (profile_action)); + g_signal_connect (profile, "notify::" TERMINAL_PROFILE_VISIBLE_NAME, + G_CALLBACK (profile_visible_name_notify_cb), profile_action); + g_signal_connect (profile_action, "toggled", + G_CALLBACK (terminal_set_profile_toggled_callback), window); + + gtk_action_group_add_action (action_group, GTK_ACTION (profile_action)); + g_object_unref (profile_action); + + gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id, + PROFILES_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id, + PROFILES_POPUP_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + } + + g_list_free (profiles); } static void @@ -639,314 +639,314 @@ terminal_window_create_new_terminal_action (TerminalWindow *window, guint num, GCallback callback) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - - action = gtk_action_new (name, NULL, NULL, NULL); - - g_object_set_data_full (G_OBJECT (action), - PROFILE_DATA_KEY, - g_object_ref (profile), - (GDestroyNotify) g_object_unref); - profile_visible_name_notify_cb (profile, NULL, action); - g_signal_connect (profile, "notify::" TERMINAL_PROFILE_VISIBLE_NAME, - G_CALLBACK (profile_visible_name_notify_cb), action); - g_signal_connect (action, "activate", callback, window); - - gtk_action_group_add_action (priv->new_terminal_action_group, action); - g_object_unref (action); + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + + action = gtk_action_new (name, NULL, NULL, NULL); + + g_object_set_data_full (G_OBJECT (action), + PROFILE_DATA_KEY, + g_object_ref (profile), + (GDestroyNotify) g_object_unref); + profile_visible_name_notify_cb (profile, NULL, action); + g_signal_connect (profile, "notify::" TERMINAL_PROFILE_VISIBLE_NAME, + G_CALLBACK (profile_visible_name_notify_cb), action); + g_signal_connect (action, "activate", callback, window); + + gtk_action_group_add_action (priv->new_terminal_action_group, action); + g_object_unref (action); } static void terminal_window_update_new_terminal_menus (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkActionGroup *action_group; - GtkAction *action; - GList *profiles, *p; - guint n; - gboolean have_single_profile; - - /* Remove the old UI */ - if (priv->new_terminal_ui_id != 0) - { - gtk_ui_manager_remove_ui (priv->ui_manager, priv->new_terminal_ui_id); - priv->new_terminal_ui_id = 0; - } - - if (priv->new_terminal_action_group != NULL) - { - disconnect_profiles_from_actions_in_group (priv->new_terminal_action_group); - gtk_ui_manager_remove_action_group (priv->ui_manager, - priv->new_terminal_action_group); - priv->new_terminal_action_group = NULL; - } - - profiles = terminal_app_get_profile_list (terminal_app_get ()); - have_single_profile = !profiles || !profiles->next; - - action = gtk_action_group_get_action (priv->action_group, "FileNewTab"); - gtk_action_set_visible (action, have_single_profile); - action = gtk_action_group_get_action (priv->action_group, "FileNewWindow"); - gtk_action_set_visible (action, have_single_profile); - - if (have_single_profile) - { - g_list_free (profiles); - return; - } - - /* Now build the submenus */ - - action_group = priv->new_terminal_action_group = gtk_action_group_new ("NewTerminal"); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); - g_object_unref (action_group); - - priv->new_terminal_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); - - n = 0; - for (p = profiles; p != NULL; p = p->next) - { - TerminalProfile *profile = (TerminalProfile *) p->data; - char name[32]; - - g_snprintf (name, sizeof (name), "FileNewTab.%u", n); - terminal_window_create_new_terminal_action (window, - profile, - name, - n, - G_CALLBACK (file_new_tab_callback)); - - gtk_ui_manager_add_ui (priv->ui_manager, priv->new_terminal_ui_id, - FILE_NEW_TERMINAL_TAB_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - - g_snprintf (name, sizeof (name), "FileNewWindow.%u", n); - terminal_window_create_new_terminal_action (window, - profile, - name, - n, - G_CALLBACK (file_new_window_callback)); - - gtk_ui_manager_add_ui (priv->ui_manager, priv->new_terminal_ui_id, - FILE_NEW_TERMINAL_WINDOW_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - - ++n; - } - - g_list_free (profiles); + TerminalWindowPrivate *priv = window->priv; + GtkActionGroup *action_group; + GtkAction *action; + GList *profiles, *p; + guint n; + gboolean have_single_profile; + + /* Remove the old UI */ + if (priv->new_terminal_ui_id != 0) + { + gtk_ui_manager_remove_ui (priv->ui_manager, priv->new_terminal_ui_id); + priv->new_terminal_ui_id = 0; + } + + if (priv->new_terminal_action_group != NULL) + { + disconnect_profiles_from_actions_in_group (priv->new_terminal_action_group); + gtk_ui_manager_remove_action_group (priv->ui_manager, + priv->new_terminal_action_group); + priv->new_terminal_action_group = NULL; + } + + profiles = terminal_app_get_profile_list (terminal_app_get ()); + have_single_profile = !profiles || !profiles->next; + + action = gtk_action_group_get_action (priv->action_group, "FileNewTab"); + gtk_action_set_visible (action, have_single_profile); + action = gtk_action_group_get_action (priv->action_group, "FileNewWindow"); + gtk_action_set_visible (action, have_single_profile); + + if (have_single_profile) + { + g_list_free (profiles); + return; + } + + /* Now build the submenus */ + + action_group = priv->new_terminal_action_group = gtk_action_group_new ("NewTerminal"); + gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); + g_object_unref (action_group); + + priv->new_terminal_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); + + n = 0; + for (p = profiles; p != NULL; p = p->next) + { + TerminalProfile *profile = (TerminalProfile *) p->data; + char name[32]; + + g_snprintf (name, sizeof (name), "FileNewTab.%u", n); + terminal_window_create_new_terminal_action (window, + profile, + name, + n, + G_CALLBACK (file_new_tab_callback)); + + gtk_ui_manager_add_ui (priv->ui_manager, priv->new_terminal_ui_id, + FILE_NEW_TERMINAL_TAB_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + + g_snprintf (name, sizeof (name), "FileNewWindow.%u", n); + terminal_window_create_new_terminal_action (window, + profile, + name, + n, + G_CALLBACK (file_new_window_callback)); + + gtk_ui_manager_add_ui (priv->ui_manager, priv->new_terminal_ui_id, + FILE_NEW_TERMINAL_WINDOW_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + + ++n; + } + + g_list_free (profiles); } static void terminal_set_encoding_callback (GtkToggleAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalEncoding *encoding; + TerminalWindowPrivate *priv = window->priv; + TerminalEncoding *encoding; - if (!gtk_toggle_action_get_active (action)) - return; + if (!gtk_toggle_action_get_active (action)) + return; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - encoding = g_object_get_data (G_OBJECT (action), ENCODING_DATA_KEY); - g_assert (encoding); + encoding = g_object_get_data (G_OBJECT (action), ENCODING_DATA_KEY); + g_assert (encoding); - vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen), - terminal_encoding_get_charset (encoding)); + vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen), + terminal_encoding_get_charset (encoding)); } static void terminal_window_update_encoding_menu (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalApp *app; - GtkActionGroup *action_group; - GSList *group; - guint n; - GSList *encodings, *l; - const char *charset; - TerminalEncoding *active_encoding; - - /* Remove the old UI */ - if (priv->encodings_ui_id != 0) - { - gtk_ui_manager_remove_ui (priv->ui_manager, priv->encodings_ui_id); - priv->encodings_ui_id = 0; - } - - if (priv->encodings_action_group != NULL) - { - gtk_ui_manager_remove_action_group (priv->ui_manager, - priv->encodings_action_group); - priv->encodings_action_group = NULL; - } - - action_group = priv->encodings_action_group = gtk_action_group_new ("Encodings"); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); - g_object_unref (action_group); - - priv->encodings_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); - - if (priv->active_screen) - charset = vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen)); - else - charset = "current"; - - app = terminal_app_get (); - active_encoding = terminal_app_ensure_encoding (app, charset); - - encodings = terminal_app_get_active_encodings (app); - - if (g_slist_find (encodings, active_encoding) == NULL) - encodings = g_slist_append (encodings, terminal_encoding_ref (active_encoding)); - - group = NULL; - n = 0; - for (l = encodings; l != NULL; l = l->next) - { - TerminalEncoding *e = (TerminalEncoding *) l->data; - GtkRadioAction *encoding_action; - char name[128]; - char *display_name; - - g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_id (e)); - display_name = g_strdup_printf ("%s (%s)", e->name, terminal_encoding_get_charset (e)); - - encoding_action = gtk_radio_action_new (name, - display_name, - NULL, - NULL, - n); - g_free (display_name); - - gtk_radio_action_set_group (encoding_action, group); - group = gtk_radio_action_get_group (encoding_action); - - if (charset && strcmp (terminal_encoding_get_id (e), charset) == 0) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (encoding_action), TRUE); - - g_signal_connect (encoding_action, "toggled", - G_CALLBACK (terminal_set_encoding_callback), window); - - g_object_set_data_full (G_OBJECT (encoding_action), ENCODING_DATA_KEY, - terminal_encoding_ref (e), - (GDestroyNotify) terminal_encoding_unref); - - gtk_action_group_add_action (action_group, GTK_ACTION (encoding_action)); - g_object_unref (encoding_action); - - gtk_ui_manager_add_ui (priv->ui_manager, priv->encodings_ui_id, - SET_ENCODING_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - } - - g_slist_foreach (encodings, (GFunc) terminal_encoding_unref, NULL); - g_slist_free (encodings); + TerminalWindowPrivate *priv = window->priv; + TerminalApp *app; + GtkActionGroup *action_group; + GSList *group; + guint n; + GSList *encodings, *l; + const char *charset; + TerminalEncoding *active_encoding; + + /* Remove the old UI */ + if (priv->encodings_ui_id != 0) + { + gtk_ui_manager_remove_ui (priv->ui_manager, priv->encodings_ui_id); + priv->encodings_ui_id = 0; + } + + if (priv->encodings_action_group != NULL) + { + gtk_ui_manager_remove_action_group (priv->ui_manager, + priv->encodings_action_group); + priv->encodings_action_group = NULL; + } + + action_group = priv->encodings_action_group = gtk_action_group_new ("Encodings"); + gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); + g_object_unref (action_group); + + priv->encodings_ui_id = gtk_ui_manager_new_merge_id (priv->ui_manager); + + if (priv->active_screen) + charset = vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen)); + else + charset = "current"; + + app = terminal_app_get (); + active_encoding = terminal_app_ensure_encoding (app, charset); + + encodings = terminal_app_get_active_encodings (app); + + if (g_slist_find (encodings, active_encoding) == NULL) + encodings = g_slist_append (encodings, terminal_encoding_ref (active_encoding)); + + group = NULL; + n = 0; + for (l = encodings; l != NULL; l = l->next) + { + TerminalEncoding *e = (TerminalEncoding *) l->data; + GtkRadioAction *encoding_action; + char name[128]; + char *display_name; + + g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_id (e)); + display_name = g_strdup_printf ("%s (%s)", e->name, terminal_encoding_get_charset (e)); + + encoding_action = gtk_radio_action_new (name, + display_name, + NULL, + NULL, + n); + g_free (display_name); + + gtk_radio_action_set_group (encoding_action, group); + group = gtk_radio_action_get_group (encoding_action); + + if (charset && strcmp (terminal_encoding_get_id (e), charset) == 0) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (encoding_action), TRUE); + + g_signal_connect (encoding_action, "toggled", + G_CALLBACK (terminal_set_encoding_callback), window); + + g_object_set_data_full (G_OBJECT (encoding_action), ENCODING_DATA_KEY, + terminal_encoding_ref (e), + (GDestroyNotify) terminal_encoding_unref); + + gtk_action_group_add_action (action_group, GTK_ACTION (encoding_action)); + g_object_unref (encoding_action); + + gtk_ui_manager_add_ui (priv->ui_manager, priv->encodings_ui_id, + SET_ENCODING_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + } + + g_slist_foreach (encodings, (GFunc) terminal_encoding_unref, NULL); + g_slist_free (encodings); } static void terminal_window_update_encoding_menu_active_encoding (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - char name[128]; - - if (!priv->active_screen) - return; - if (!priv->encodings_action_group) - return; - - g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", - vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen))); - action = gtk_action_group_get_action (priv->encodings_action_group, name); - if (!action) - return; - - g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); - g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + char name[128]; + + if (!priv->active_screen) + return; + if (!priv->encodings_action_group) + return; + + g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", + vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen))); + action = gtk_action_group_get_action (priv->encodings_action_group, name); + if (!action) + return; + + g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); } static void terminal_size_to_cb (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - const char *name; - char *end = NULL; - guint width, height; + TerminalWindowPrivate *priv = window->priv; + const char *name; + char *end = NULL; + guint width, height; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - name = gtk_action_get_name (action) + strlen (SIZE_TO_ACTION_NAME_PREFIX); - width = g_ascii_strtoull (name, &end, 10); - g_assert (end && *end == 'x'); - height = g_ascii_strtoull (end + 1, &end, 10); - g_assert (end && *end == '\0'); + name = gtk_action_get_name (action) + strlen (SIZE_TO_ACTION_NAME_PREFIX); + width = g_ascii_strtoull (name, &end, 10); + g_assert (end && *end == 'x'); + height = g_ascii_strtoull (end + 1, &end, 10); + g_assert (end && *end == '\0'); - vte_terminal_set_size (VTE_TERMINAL (priv->active_screen), width, height); + vte_terminal_set_size (VTE_TERMINAL (priv->active_screen), width, height); - terminal_window_set_size_force_grid (window, priv->active_screen, TRUE, -1, -1); + terminal_window_set_size_force_grid (window, priv->active_screen, TRUE, -1, -1); } static void terminal_window_update_size_to_menu (TerminalWindow *window) { - static const struct - { - guint grid_width; - guint grid_height; - } predefined_sizes[] = - { - { 80, 24 }, - { 80, 43 }, - { 132, 24 }, - { 132, 43 } - }; - TerminalWindowPrivate *priv = window->priv; - guint i; - - /* We only install this once, so there's no need for a separate action group - * and any cleanup + build-new-one action here. - */ - - for (i = 0; i < G_N_ELEMENTS (predefined_sizes); ++i) - { - guint grid_width = predefined_sizes[i].grid_width; - guint grid_height = predefined_sizes[i].grid_height; - GtkAction *action; - char name[40]; - char *display_name; - - g_snprintf (name, sizeof (name), SIZE_TO_ACTION_NAME_PREFIX "%ux%u", - grid_width, grid_height); - - /* If there are ever more than 9 of these, extend this to use A..Z as mnemonics, - * like we do for the profiles menu. - */ - display_name = g_strdup_printf ("_%u. %ux%u", i + 1, grid_width, grid_height); - - action = gtk_action_new (name, display_name, NULL, NULL); - g_free (display_name); - - g_signal_connect (action, "activate", - G_CALLBACK (terminal_size_to_cb), window); - - gtk_action_group_add_action (priv->action_group, action); - g_object_unref (action); - - gtk_ui_manager_add_ui (priv->ui_manager, priv->ui_id, - SIZE_TO_UI_PATH, - name, name, - GTK_UI_MANAGER_MENUITEM, FALSE); - } + static const struct + { + guint grid_width; + guint grid_height; + } predefined_sizes[] = + { + { 80, 24 }, + { 80, 43 }, + { 132, 24 }, + { 132, 43 } + }; + TerminalWindowPrivate *priv = window->priv; + guint i; + + /* We only install this once, so there's no need for a separate action group + * and any cleanup + build-new-one action here. + */ + + for (i = 0; i < G_N_ELEMENTS (predefined_sizes); ++i) + { + guint grid_width = predefined_sizes[i].grid_width; + guint grid_height = predefined_sizes[i].grid_height; + GtkAction *action; + char name[40]; + char *display_name; + + g_snprintf (name, sizeof (name), SIZE_TO_ACTION_NAME_PREFIX "%ux%u", + grid_width, grid_height); + + /* If there are ever more than 9 of these, extend this to use A..Z as mnemonics, + * like we do for the profiles menu. + */ + display_name = g_strdup_printf ("_%u. %ux%u", i + 1, grid_width, grid_height); + + action = gtk_action_new (name, display_name, NULL, NULL); + g_free (display_name); + + g_signal_connect (action, "activate", + G_CALLBACK (terminal_size_to_cb), window); + + gtk_action_group_add_action (priv->action_group, action); + g_object_unref (action); + + gtk_ui_manager_add_ui (priv->ui_manager, priv->ui_id, + SIZE_TO_UI_PATH, + name, name, + GTK_UI_MANAGER_MENUITEM, FALSE); + } } /* Actions stuff */ @@ -955,58 +955,58 @@ static void terminal_window_update_copy_sensitivity (TerminalScreen *screen, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - gboolean can_copy; + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + gboolean can_copy; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - can_copy = vte_terminal_get_has_selection (VTE_TERMINAL (screen)); + can_copy = vte_terminal_get_has_selection (VTE_TERMINAL (screen)); - action = gtk_action_group_get_action (priv->action_group, "EditCopy"); - gtk_action_set_sensitive (action, can_copy); + action = gtk_action_group_get_action (priv->action_group, "EditCopy"); + gtk_action_set_sensitive (action, can_copy); } static void terminal_window_update_zoom_sensitivity (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreen *screen; - GtkAction *action; - double current, zoom; + TerminalWindowPrivate *priv = window->priv; + TerminalScreen *screen; + GtkAction *action; + double current, zoom; - screen = priv->active_screen; - if (screen == NULL) - return; + screen = priv->active_screen; + if (screen == NULL) + return; - current = terminal_screen_get_font_scale (screen); + current = terminal_screen_get_font_scale (screen); - action = gtk_action_group_get_action (priv->action_group, "ViewZoomOut"); - gtk_action_set_sensitive (action, find_smaller_zoom_factor (current, &zoom)); - action = gtk_action_group_get_action (priv->action_group, "ViewZoomIn"); - gtk_action_set_sensitive (action, find_larger_zoom_factor (current, &zoom)); + action = gtk_action_group_get_action (priv->action_group, "ViewZoomOut"); + gtk_action_set_sensitive (action, find_smaller_zoom_factor (current, &zoom)); + action = gtk_action_group_get_action (priv->action_group, "ViewZoomIn"); + gtk_action_set_sensitive (action, find_larger_zoom_factor (current, &zoom)); } static void terminal_window_update_search_sensitivity (TerminalScreen *screen, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - gboolean can_search; + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + gboolean can_search; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; + can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; - action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); - gtk_action_set_sensitive (action, can_search); - action = gtk_action_group_get_action (priv->action_group, "SearchFindPrevious"); - gtk_action_set_sensitive (action, can_search); - action = gtk_action_group_get_action (priv->action_group, "SearchClearHighlight"); - gtk_action_set_sensitive (action, can_search); + action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); + gtk_action_set_sensitive (action, can_search); + action = gtk_action_group_get_action (priv->action_group, "SearchFindPrevious"); + gtk_action_set_sensitive (action, can_search); + action = gtk_action_group_get_action (priv->action_group, "SearchClearHighlight"); + gtk_action_set_sensitive (action, can_search); } static void @@ -1015,34 +1015,34 @@ update_edit_menu_cb (GtkClipboard *clipboard, int n_targets, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - gboolean can_paste, can_paste_uris; + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + gboolean can_paste, can_paste_uris; - can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets); - can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets); + can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets); + can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets); - action = gtk_action_group_get_action (priv->action_group, "EditPaste"); - gtk_action_set_sensitive (action, can_paste); - action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths"); - gtk_action_set_visible (action, can_paste_uris); - gtk_action_set_sensitive (action, can_paste_uris); + action = gtk_action_group_get_action (priv->action_group, "EditPaste"); + gtk_action_set_sensitive (action, can_paste); + action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths"); + gtk_action_set_visible (action, can_paste_uris); + gtk_action_set_sensitive (action, can_paste_uris); - /* Ref was added in gtk_clipboard_request_targets below */ - g_object_unref (window); + /* Ref was added in gtk_clipboard_request_targets below */ + g_object_unref (window); } static void edit_menu_activate_callback (GtkMenuItem *menuitem, gpointer user_data) { - TerminalWindow *window = (TerminalWindow *) user_data; - GtkClipboard *clipboard; + TerminalWindow *window = (TerminalWindow *) user_data; + GtkClipboard *clipboard; - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); - gtk_clipboard_request_targets (clipboard, - (GtkClipboardTargetsReceivedFunc) update_edit_menu_cb, - g_object_ref (window)); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); + gtk_clipboard_request_targets (clipboard, + (GtkClipboardTargetsReceivedFunc) update_edit_menu_cb, + g_object_ref (window)); } static void @@ -1051,116 +1051,116 @@ screen_resize_window_cb (TerminalScreen *screen, guint height, TerminalWindow* window) { - TerminalWindowPrivate *priv = window->priv; - VteTerminal *terminal = VTE_TERMINAL (screen); - GtkWidget *widget = GTK_WIDGET (screen); - guint grid_width, grid_height; - int char_width, char_height; - GtkBorder *inner_border = NULL; - GtkAllocation widget_allocation; + TerminalWindowPrivate *priv = window->priv; + VteTerminal *terminal = VTE_TERMINAL (screen); + GtkWidget *widget = GTK_WIDGET (screen); + guint grid_width, grid_height; + int char_width, char_height; + GtkBorder *inner_border = NULL; + GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); - /* Don't do anything if we're maximised or fullscreened */ - // FIXME: realized && ... instead? - if (!gtk_widget_get_realized (widget) || - (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0) - return; + gtk_widget_get_allocation (widget, &widget_allocation); + /* Don't do anything if we're maximised or fullscreened */ + // FIXME: realized && ... instead? + if (!gtk_widget_get_realized (widget) || + (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0) + return; - /* NOTE: width and height already include the VteTerminal's padding! */ + /* NOTE: width and height already include the VteTerminal's padding! */ - /* Short-circuit */ - if (((int) width) == widget_allocation.width && - ((int) height) == widget_allocation.height) - return; + /* Short-circuit */ + if (((int) width) == widget_allocation.width && + ((int) height) == widget_allocation.height) + return; - /* The resize-window signal sucks. Re-compute grid widths */ + /* The resize-window signal sucks. Re-compute grid widths */ - char_width = vte_terminal_get_char_width (terminal); - char_height = vte_terminal_get_char_height (terminal); + char_width = vte_terminal_get_char_width (terminal); + char_height = vte_terminal_get_char_height (terminal); - gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &inner_border, NULL); - grid_width = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width; - grid_height = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height; - gtk_border_free (inner_border); + gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &inner_border, NULL); + grid_width = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width; + grid_height = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height; + gtk_border_free (inner_border); - vte_terminal_set_size (terminal, grid_width, grid_height); + vte_terminal_set_size (terminal, grid_width, grid_height); - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); //grid_width, grid_height); + terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); //grid_width, grid_height); } static void terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); - GtkActionGroup *action_group = priv->action_group; - GtkAction *action; - int num_pages, page_num; - gboolean not_first, not_last; + TerminalWindowPrivate *priv = window->priv; + GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); + GtkActionGroup *action_group = priv->action_group; + GtkAction *action; + int num_pages, page_num; + gboolean not_first, not_last; - if (priv->disposed) - return; + if (priv->disposed) + return; - num_pages = gtk_notebook_get_n_pages (notebook); - page_num = gtk_notebook_get_current_page (notebook); - not_first = page_num > 0; - not_last = page_num + 1 < num_pages; + num_pages = gtk_notebook_get_n_pages (notebook); + page_num = gtk_notebook_get_current_page (notebook); + not_first = page_num > 0; + not_last = page_num + 1 < num_pages; - /* Hide the tabs menu in single-tab windows */ - action = gtk_action_group_get_action (action_group, "Tabs"); - gtk_action_set_visible (action, num_pages > 1); + /* Hide the tabs menu in single-tab windows */ + action = gtk_action_group_get_action (action_group, "Tabs"); + gtk_action_set_visible (action, num_pages > 1); #if 1 - /* NOTE: We always make next/prev actions sensitive except in - * single-tab windows, so the corresponding shortcut key escape code - * isn't sent to the terminal. See bug #453193 and bug #138609. - * This also makes tab cycling work, bug #92139. - * FIXME: Find a better way to do this. - */ - action = gtk_action_group_get_action (action_group, "TabsPrevious"); - gtk_action_set_sensitive (action, num_pages > 1); - action = gtk_action_group_get_action (action_group, "TabsNext"); - gtk_action_set_sensitive (action, num_pages > 1); + /* NOTE: We always make next/prev actions sensitive except in + * single-tab windows, so the corresponding shortcut key escape code + * isn't sent to the terminal. See bug #453193 and bug #138609. + * This also makes tab cycling work, bug #92139. + * FIXME: Find a better way to do this. + */ + action = gtk_action_group_get_action (action_group, "TabsPrevious"); + gtk_action_set_sensitive (action, num_pages > 1); + action = gtk_action_group_get_action (action_group, "TabsNext"); + gtk_action_set_sensitive (action, num_pages > 1); #else - /* This would be correct, but see the comment above. */ - action = gtk_action_group_get_action (action_group, "TabsPrevious"); - gtk_action_set_sensitive (action, not_first); - action = gtk_action_group_get_action (action_group, "TabsNext"); - gtk_action_set_sensitive (action, not_last); + /* This would be correct, but see the comment above. */ + action = gtk_action_group_get_action (action_group, "TabsPrevious"); + gtk_action_set_sensitive (action, not_first); + action = gtk_action_group_get_action (action_group, "TabsNext"); + gtk_action_set_sensitive (action, not_last); #endif - action = gtk_action_group_get_action (action_group, "TabsMoveLeft"); - gtk_action_set_sensitive (action, not_first); - action = gtk_action_group_get_action (action_group, "TabsMoveRight"); - gtk_action_set_sensitive (action, not_last); - action = gtk_action_group_get_action (action_group, "TabsDetach"); - gtk_action_set_sensitive (action, num_pages > 1); - action = gtk_action_group_get_action (action_group, "FileCloseTab"); - gtk_action_set_sensitive (action, num_pages > 1); + action = gtk_action_group_get_action (action_group, "TabsMoveLeft"); + gtk_action_set_sensitive (action, not_first); + action = gtk_action_group_get_action (action_group, "TabsMoveRight"); + gtk_action_set_sensitive (action, not_last); + action = gtk_action_group_get_action (action_group, "TabsDetach"); + gtk_action_set_sensitive (action, num_pages > 1); + action = gtk_action_group_get_action (action_group, "FileCloseTab"); + gtk_action_set_sensitive (action, num_pages > 1); } gboolean terminal_window_uses_argb_visual (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - return priv->have_argb_visual; + TerminalWindowPrivate *priv = window->priv; + return priv->have_argb_visual; } static void update_tab_visibility (TerminalWindow *window, int change) { - TerminalWindowPrivate *priv = window->priv; - gboolean show_tabs; - guint num; + TerminalWindowPrivate *priv = window->priv; + gboolean show_tabs; + guint num; - num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); - show_tabs = (num + change) > 1; - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), show_tabs); + show_tabs = (num + change) > 1; + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), show_tabs); } static GtkNotebook * @@ -1170,24 +1170,24 @@ handle_tab_droped_on_desktop (GtkNotebook *source_notebook, gint y, gpointer data) { - TerminalScreen *screen; - TerminalWindow *source_window; - TerminalWindow *new_window; - TerminalWindowPrivate *new_priv; + TerminalScreen *screen; + TerminalWindow *source_window; + TerminalWindow *new_window; + TerminalWindowPrivate *new_priv; - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); - source_window = TERMINAL_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (source_notebook))); - g_return_val_if_fail (TERMINAL_IS_WINDOW (source_window), NULL); + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); + source_window = TERMINAL_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (source_notebook))); + g_return_val_if_fail (TERMINAL_IS_WINDOW (source_window), NULL); - new_window = terminal_app_new_window (terminal_app_get (), - gtk_widget_get_screen (GTK_WIDGET (source_window))); - new_priv = new_window->priv; - new_priv->present_on_insert = TRUE; + new_window = terminal_app_new_window (terminal_app_get (), + gtk_widget_get_screen (GTK_WIDGET (source_window))); + new_priv = new_window->priv; + new_priv->present_on_insert = TRUE; - update_tab_visibility (source_window, -1); - update_tab_visibility (new_window, +1); + update_tab_visibility (source_window, -1); + update_tab_visibility (new_window, +1); - return GTK_NOTEBOOK (new_priv->notebook); + return GTK_NOTEBOOK (new_priv->notebook); } /* Terminal screen popup menu handling */ @@ -1196,100 +1196,100 @@ static void popup_open_url_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreenPopupInfo *info = priv->popup_info; + TerminalWindowPrivate *priv = window->priv; + TerminalScreenPopupInfo *info = priv->popup_info; - if (info == NULL) - return; + if (info == NULL) + return; - terminal_util_open_url (GTK_WIDGET (window), info->string, info->flavour, - gtk_get_current_event_time ()); + terminal_util_open_url (GTK_WIDGET (window), info->string, info->flavour, + gtk_get_current_event_time ()); } static void popup_copy_url_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreenPopupInfo *info = priv->popup_info; - GtkClipboard *clipboard; + TerminalWindowPrivate *priv = window->priv; + TerminalScreenPopupInfo *info = priv->popup_info; + GtkClipboard *clipboard; - if (info == NULL) - return; + if (info == NULL) + return; - if (info->string == NULL) - return; + if (info->string == NULL) + return; - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, info->string, -1); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text (clipboard, info->string, -1); } static void popup_leave_fullscreen_callback (GtkAction *action, TerminalWindow *window) { - gtk_window_unfullscreen (GTK_WINDOW (window)); + gtk_window_unfullscreen (GTK_WINDOW (window)); } static void remove_popup_info (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - - if (priv->remove_popup_info_idle != 0) - { - g_source_remove (priv->remove_popup_info_idle); - priv->remove_popup_info_idle = 0; - } - - if (priv->popup_info != NULL) - { - terminal_screen_popup_info_unref (priv->popup_info); - priv->popup_info = NULL; - } + TerminalWindowPrivate *priv = window->priv; + + if (priv->remove_popup_info_idle != 0) + { + g_source_remove (priv->remove_popup_info_idle); + priv->remove_popup_info_idle = 0; + } + + if (priv->popup_info != NULL) + { + terminal_screen_popup_info_unref (priv->popup_info); + priv->popup_info = NULL; + } } static gboolean idle_remove_popup_info (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - priv->remove_popup_info_idle = 0; - remove_popup_info (window); - return FALSE; + priv->remove_popup_info_idle = 0; + remove_popup_info (window); + return FALSE; } static void unset_popup_info (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - - /* Unref the event from idle since we still need it - * from the action callbacks which will run before idle. - */ - if (priv->remove_popup_info_idle == 0 && - priv->popup_info != NULL) - { - priv->remove_popup_info_idle = - g_idle_add ((GSourceFunc) idle_remove_popup_info, window); - } + TerminalWindowPrivate *priv = window->priv; + + /* Unref the event from idle since we still need it + * from the action callbacks which will run before idle. + */ + if (priv->remove_popup_info_idle == 0 && + priv->popup_info != NULL) + { + priv->remove_popup_info_idle = + g_idle_add ((GSourceFunc) idle_remove_popup_info, window); + } } static void popup_menu_deactivate_callback (GtkWidget *popup, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *im_menu_item; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *im_menu_item; - g_signal_handlers_disconnect_by_func - (popup, G_CALLBACK (popup_menu_deactivate_callback), window); + g_signal_handlers_disconnect_by_func + (popup, G_CALLBACK (popup_menu_deactivate_callback), window); - im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager, - "/Popup/PopupInputMethods"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL); + im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager, + "/Popup/PopupInputMethods"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL); - unset_popup_info (window); + unset_popup_info (window); } static void @@ -1298,97 +1298,97 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard, int n_targets, TerminalScreenPopupInfo *info) { - TerminalWindow *window = info->window; - TerminalWindowPrivate *priv = window->priv; - TerminalScreen *screen = info->screen; - GtkWidget *popup_menu, *im_menu, *im_menu_item; - GtkAction *action; - gboolean can_paste, can_paste_uris, show_link, show_email_link, show_call_link, show_input_method_menu; - int n_pages; - - if (!gtk_widget_get_realized (GTK_WIDGET (screen))) - { - terminal_screen_popup_info_unref (info); - return; - } - - /* Now we know that the screen is realized, we know that the window is still alive */ - remove_popup_info (window); - - priv->popup_info = info; /* adopt the ref added when requesting the clipboard */ - - n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); - - can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets); - can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets); - show_link = info->string != NULL && (info->flavour == FLAVOR_AS_IS || info->flavour == FLAVOR_DEFAULT_TO_HTTP); - show_email_link = info->string != NULL && info->flavour == FLAVOR_EMAIL; - show_call_link = info->string != NULL && info->flavour == FLAVOR_VOIP_CALL; - - action = gtk_action_group_get_action (priv->action_group, "PopupSendEmail"); - gtk_action_set_visible (action, show_email_link); - action = gtk_action_group_get_action (priv->action_group, "PopupCopyEmailAddress"); - gtk_action_set_visible (action, show_email_link); - action = gtk_action_group_get_action (priv->action_group, "PopupCall"); - gtk_action_set_visible (action, show_call_link); - action = gtk_action_group_get_action (priv->action_group, "PopupCopyCallAddress"); - gtk_action_set_visible (action, show_call_link); - action = gtk_action_group_get_action (priv->action_group, "PopupOpenLink"); - gtk_action_set_visible (action, show_link); - action = gtk_action_group_get_action (priv->action_group, "PopupCopyLinkAddress"); - gtk_action_set_visible (action, show_link); - - action = gtk_action_group_get_action (priv->action_group, "PopupCloseWindow"); - gtk_action_set_visible (action, n_pages <= 1); - action = gtk_action_group_get_action (priv->action_group, "PopupCloseTab"); - gtk_action_set_visible (action, n_pages > 1); - - action = gtk_action_group_get_action (priv->action_group, "PopupCopy"); - gtk_action_set_sensitive (action, vte_terminal_get_has_selection (VTE_TERMINAL (screen))); - action = gtk_action_group_get_action (priv->action_group, "PopupPaste"); - gtk_action_set_sensitive (action, can_paste); - action = gtk_action_group_get_action (priv->action_group, "PopupPasteURIPaths"); - gtk_action_set_visible (action, can_paste_uris); - - g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)), - "gtk-show-input-method-menu", &show_input_method_menu, - NULL); - - action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods"); - gtk_action_set_visible (action, show_input_method_menu); - - im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager, - "/Popup/PopupInputMethods"); - /* FIXME: fix this when gtk+ bug #500065 is done, use vte_terminal_im_merge_ui */ - if (show_input_method_menu) - { - im_menu = gtk_menu_new (); - vte_terminal_im_append_menuitems (VTE_TERMINAL (screen), - GTK_MENU_SHELL (im_menu)); - gtk_widget_show (im_menu); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), im_menu); - } - else - { - gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL); - } - - popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup"); - g_signal_connect (popup_menu, "deactivate", - G_CALLBACK (popup_menu_deactivate_callback), window); - - /* Pseudo activation of the popup menu's action */ - action = gtk_action_group_get_action (priv->action_group, "Popup"); - gtk_action_activate (action); - - if (info->button == 0) - gtk_menu_shell_select_first (GTK_MENU_SHELL (popup_menu), FALSE); - - gtk_menu_popup (GTK_MENU (popup_menu), - NULL, NULL, - NULL, NULL, - info->button, - info->timestamp); + TerminalWindow *window = info->window; + TerminalWindowPrivate *priv = window->priv; + TerminalScreen *screen = info->screen; + GtkWidget *popup_menu, *im_menu, *im_menu_item; + GtkAction *action; + gboolean can_paste, can_paste_uris, show_link, show_email_link, show_call_link, show_input_method_menu; + int n_pages; + + if (!gtk_widget_get_realized (GTK_WIDGET (screen))) + { + terminal_screen_popup_info_unref (info); + return; + } + + /* Now we know that the screen is realized, we know that the window is still alive */ + remove_popup_info (window); + + priv->popup_info = info; /* adopt the ref added when requesting the clipboard */ + + n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + + can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets); + can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets); + show_link = info->string != NULL && (info->flavour == FLAVOR_AS_IS || info->flavour == FLAVOR_DEFAULT_TO_HTTP); + show_email_link = info->string != NULL && info->flavour == FLAVOR_EMAIL; + show_call_link = info->string != NULL && info->flavour == FLAVOR_VOIP_CALL; + + action = gtk_action_group_get_action (priv->action_group, "PopupSendEmail"); + gtk_action_set_visible (action, show_email_link); + action = gtk_action_group_get_action (priv->action_group, "PopupCopyEmailAddress"); + gtk_action_set_visible (action, show_email_link); + action = gtk_action_group_get_action (priv->action_group, "PopupCall"); + gtk_action_set_visible (action, show_call_link); + action = gtk_action_group_get_action (priv->action_group, "PopupCopyCallAddress"); + gtk_action_set_visible (action, show_call_link); + action = gtk_action_group_get_action (priv->action_group, "PopupOpenLink"); + gtk_action_set_visible (action, show_link); + action = gtk_action_group_get_action (priv->action_group, "PopupCopyLinkAddress"); + gtk_action_set_visible (action, show_link); + + action = gtk_action_group_get_action (priv->action_group, "PopupCloseWindow"); + gtk_action_set_visible (action, n_pages <= 1); + action = gtk_action_group_get_action (priv->action_group, "PopupCloseTab"); + gtk_action_set_visible (action, n_pages > 1); + + action = gtk_action_group_get_action (priv->action_group, "PopupCopy"); + gtk_action_set_sensitive (action, vte_terminal_get_has_selection (VTE_TERMINAL (screen))); + action = gtk_action_group_get_action (priv->action_group, "PopupPaste"); + gtk_action_set_sensitive (action, can_paste); + action = gtk_action_group_get_action (priv->action_group, "PopupPasteURIPaths"); + gtk_action_set_visible (action, can_paste_uris); + + g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)), + "gtk-show-input-method-menu", &show_input_method_menu, + NULL); + + action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods"); + gtk_action_set_visible (action, show_input_method_menu); + + im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager, + "/Popup/PopupInputMethods"); + /* FIXME: fix this when gtk+ bug #500065 is done, use vte_terminal_im_merge_ui */ + if (show_input_method_menu) + { + im_menu = gtk_menu_new (); + vte_terminal_im_append_menuitems (VTE_TERMINAL (screen), + GTK_MENU_SHELL (im_menu)); + gtk_widget_show (im_menu); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), im_menu); + } + else + { + gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL); + } + + popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup"); + g_signal_connect (popup_menu, "deactivate", + G_CALLBACK (popup_menu_deactivate_callback), window); + + /* Pseudo activation of the popup menu's action */ + action = gtk_action_group_get_action (priv->action_group, "Popup"); + gtk_action_activate (action); + + if (info->button == 0) + gtk_menu_shell_select_first (GTK_MENU_SHELL (popup_menu), FALSE); + + gtk_menu_popup (GTK_MENU (popup_menu), + NULL, NULL, + NULL, NULL, + info->button, + info->timestamp); } static void @@ -1396,14 +1396,14 @@ screen_show_popup_menu_callback (TerminalScreen *screen, TerminalScreenPopupInfo *info, TerminalWindow *window) { - GtkClipboard *clipboard; + GtkClipboard *clipboard; - g_return_if_fail (info->window == window); + g_return_if_fail (info->window == window); - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); - gtk_clipboard_request_targets (clipboard, - (GtkClipboardTargetsReceivedFunc) popup_clipboard_targets_received_cb, - terminal_screen_popup_info_ref (info)); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); + gtk_clipboard_request_targets (clipboard, + (GtkClipboardTargetsReceivedFunc) popup_clipboard_targets_received_cb, + terminal_screen_popup_info_ref (info)); } static gboolean @@ -1413,33 +1413,33 @@ screen_match_clicked_cb (TerminalScreen *screen, guint state, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (screen != priv->active_screen) - return FALSE; + if (screen != priv->active_screen) + return FALSE; - switch (flavour) - { + switch (flavour) + { #ifdef ENABLE_SKEY - case FLAVOR_SKEY: - terminal_skey_do_popup (GTK_WINDOW (window), screen, match); - break; + case FLAVOR_SKEY: + terminal_skey_do_popup (GTK_WINDOW (window), screen, match); + break; #endif - default: - gtk_widget_grab_focus (GTK_WIDGET (screen)); - terminal_util_open_url (GTK_WIDGET (window), match, flavour, - gtk_get_current_event_time ()); - break; - } - - return TRUE; + default: + gtk_widget_grab_focus (GTK_WIDGET (screen)); + terminal_util_open_url (GTK_WIDGET (window), match, flavour, + gtk_get_current_event_time ()); + break; + } + + return TRUE; } static void screen_close_cb (TerminalScreen *screen, TerminalWindow *window) { - terminal_window_remove_screen (window, screen); + terminal_window_remove_screen (window, screen); } static gboolean @@ -1449,44 +1449,44 @@ terminal_window_accel_activate_cb (GtkAccelGroup *accel_group, GdkModifierType modifier, TerminalWindow *window) { - GtkAccelGroupEntry *entries; - guint n_entries; - gboolean retval = FALSE; + GtkAccelGroupEntry *entries; + guint n_entries; + gboolean retval = FALSE; - entries = gtk_accel_group_query (accel_group, keyval, modifier, &n_entries); - if (n_entries > 0) - { - const char *accel_path; + entries = gtk_accel_group_query (accel_group, keyval, modifier, &n_entries); + if (n_entries > 0) + { + const char *accel_path; - accel_path = g_quark_to_string (entries[0].accel_path_quark); + accel_path = g_quark_to_string (entries[0].accel_path_quark); - if (g_str_has_prefix (accel_path, "<Actions>/Main/")) - { - const char *action_name; + if (g_str_has_prefix (accel_path, "<Actions>/Main/")) + { + const char *action_name; - /* We want to always consume these accelerators, even if the corresponding - * action is insensitive, so the corresponding shortcut key escape code - * isn't sent to the terminal. See bug #453193, bug #138609 and bug #559728. - * This also makes tab cycling work, bug #92139. (NOT!) - */ + /* We want to always consume these accelerators, even if the corresponding + * action is insensitive, so the corresponding shortcut key escape code + * isn't sent to the terminal. See bug #453193, bug #138609 and bug #559728. + * This also makes tab cycling work, bug #92139. (NOT!) + */ - action_name = I_(accel_path + strlen ("<Actions>/Main/")); + action_name = I_(accel_path + strlen ("<Actions>/Main/")); #if 0 - if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) > 1 && - (action_name == I_("TabsPrevious") || action_name == I_("TabsNext"))) - retval = TRUE; - else + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) > 1 && + (action_name == I_("TabsPrevious") || action_name == I_("TabsNext"))) + retval = TRUE; + else #endif - if (action_name == I_("EditCopy") || - action_name == I_("PopupCopy") || - action_name == I_("EditPaste") || - action_name == I_("PopupPaste")) - retval = TRUE; - } - } - - return retval; + if (action_name == I_("EditCopy") || + action_name == I_("PopupCopy") || + action_name == I_("EditPaste") || + action_name == I_("PopupPaste")) + retval = TRUE; + } + } + + return retval; } /*****************************************/ @@ -1496,92 +1496,92 @@ static void terminal_window_size_request_cb (GtkWidget *widget, GtkRequisition *req) { - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] size-request result %d : %d\n", - widget, req->width, req->height); + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] size-request result %d : %d\n", + widget, req->width, req->height); } static void terminal_window_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation) { - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] size-alloc result %d : %d at (%d, %d)\n", - widget, - allocation->width, allocation->height, - allocation->x, allocation->y); + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] size-alloc result %d : %d at (%d, %d)\n", + widget, + allocation->width, allocation->height, + allocation->x, allocation->y); } #endif /* MATE_ENABLE_DEBUG */ static void terminal_window_realize (GtkWidget *widget) { - TerminalWindow *window = TERMINAL_WINDOW (widget); - TerminalWindowPrivate *priv = window->priv; + TerminalWindow *window = TERMINAL_WINDOW (widget); + TerminalWindowPrivate *priv = window->priv; #ifdef GDK_WINDOWING_X11 - GdkScreen *screen; - GdkColormap *colormap; - GtkAllocation widget_allocation; - - gtk_widget_get_allocation (widget, &widget_allocation); - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - if (gdk_screen_is_composited (screen) && - (colormap = gdk_screen_get_rgba_colormap (screen)) != NULL) - { - /* Set RGBA colormap if possible so VTE can use real transparency */ - gtk_widget_set_colormap (widget, colormap); - priv->have_argb_visual = TRUE; - } - else - { - gtk_widget_set_colormap (widget, gdk_screen_get_default_colormap (screen)); - priv->have_argb_visual = FALSE; - } + GdkScreen *screen; + GdkColormap *colormap; + GtkAllocation widget_allocation; + + gtk_widget_get_allocation (widget, &widget_allocation); + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + if (gdk_screen_is_composited (screen) && + (colormap = gdk_screen_get_rgba_colormap (screen)) != NULL) + { + /* Set RGBA colormap if possible so VTE can use real transparency */ + gtk_widget_set_colormap (widget, colormap); + priv->have_argb_visual = TRUE; + } + else + { + gtk_widget_set_colormap (widget, gdk_screen_get_default_colormap (screen)); + priv->have_argb_visual = FALSE; + } #endif - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] realize, size %d : %d at (%d, %d)\n", - widget, - widget_allocation.width, widget_allocation.height, - widget_allocation.x, widget_allocation.y); + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] realize, size %d : %d at (%d, %d)\n", + widget, + widget_allocation.width, widget_allocation.height, + widget_allocation.x, widget_allocation.y); - GTK_WIDGET_CLASS (terminal_window_parent_class)->realize (widget); + GTK_WIDGET_CLASS (terminal_window_parent_class)->realize (widget); - /* Need to do this now since this requires the window to be realized */ - if (priv->active_screen != NULL) - sync_screen_icon_title (priv->active_screen, NULL, window); + /* Need to do this now since this requires the window to be realized */ + if (priv->active_screen != NULL) + sync_screen_icon_title (priv->active_screen, NULL, window); } static gboolean terminal_window_map_event (GtkWidget *widget, GdkEventAny *event) { - TerminalWindow *window = TERMINAL_WINDOW (widget); - TerminalWindowPrivate *priv = window->priv; - gboolean (* map_event) (GtkWidget *, GdkEventAny *) = - GTK_WIDGET_CLASS (terminal_window_parent_class)->map_event; - GtkAllocation widget_allocation; - - gtk_widget_get_allocation (widget, &widget_allocation); - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] map-event, size %d : %d at (%d, %d)\n", - widget, - widget_allocation.width, widget_allocation.height, - widget_allocation.x, widget_allocation.y); - - if (priv->clear_demands_attention) - { + TerminalWindow *window = TERMINAL_WINDOW (widget); + TerminalWindowPrivate *priv = window->priv; + gboolean (* map_event) (GtkWidget *, GdkEventAny *) = + GTK_WIDGET_CLASS (terminal_window_parent_class)->map_event; + GtkAllocation widget_allocation; + + gtk_widget_get_allocation (widget, &widget_allocation); + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] map-event, size %d : %d at (%d, %d)\n", + widget, + widget_allocation.width, widget_allocation.height, + widget_allocation.x, widget_allocation.y); + + if (priv->clear_demands_attention) + { #ifdef GDK_WINDOWING_X11 - terminal_util_x11_clear_demands_attention (gtk_widget_get_window (widget)); + terminal_util_x11_clear_demands_attention (gtk_widget_get_window (widget)); #endif - priv->clear_demands_attention = FALSE; - } + priv->clear_demands_attention = FALSE; + } - if (map_event) - return map_event (widget, event); + if (map_event) + return map_event (widget, event); - return FALSE; + return FALSE; } @@ -1589,43 +1589,43 @@ static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) { - gboolean (* window_state_event) (GtkWidget *, GdkEventWindowState *event) = - GTK_WIDGET_CLASS (terminal_window_parent_class)->window_state_event; + gboolean (* window_state_event) (GtkWidget *, GdkEventWindowState *event) = + GTK_WIDGET_CLASS (terminal_window_parent_class)->window_state_event; - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) - { - TerminalWindow *window = TERMINAL_WINDOW (widget); - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - gboolean is_fullscreen; + if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) + { + TerminalWindow *window = TERMINAL_WINDOW (widget); + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + gboolean is_fullscreen; - is_fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0; + is_fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0; - action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen); + action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen); - action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); - gtk_action_set_visible (action, is_fullscreen); - } + action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); + gtk_action_set_visible (action, is_fullscreen); + } - if (window_state_event) - return window_state_event (widget, event); + if (window_state_event) + return window_state_event (widget, event); - return FALSE; + return FALSE; } static void terminal_window_window_manager_changed_cb (GdkScreen *screen, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; - gboolean supports_fs; + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; + gboolean supports_fs; - supports_fs = gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern ("_NET_WM_STATE_FULLSCREEN", FALSE)); + supports_fs = gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern ("_NET_WM_STATE_FULLSCREEN", FALSE)); - action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); - gtk_action_set_sensitive (action, supports_fs); + action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); + gtk_action_set_sensitive (action, supports_fs); } #ifdef GDK_WINDOWING_X11 @@ -1634,74 +1634,74 @@ static void terminal_window_composited_changed_cb (GdkScreen *screen, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - gboolean composited; - - composited = gdk_screen_is_composited (screen); - if ((composited != priv->have_argb_visual) && - gtk_widget_get_realized (GTK_WIDGET (window))) - { - GtkWidget *widget = GTK_WIDGET (window); - GdkWindow *widget_window; - guint32 user_time; - gboolean have_desktop; - guint32 desktop = 0; /* Quiet GCC */ - gboolean was_minimized; - int x, y; - - widget_window = gtk_widget_get_window (widget); - - user_time = gdk_x11_display_get_user_time (gtk_widget_get_display (widget)); - - /* If compositing changed, re-realize the window. Bug #563561 */ - - /* Save the position; this isn't perfect, because the position - * that gtk_window_get_position() returns is the position of the - * frame window, and we are racing with the new window manager - * framing our window, so we might see a funky intermediate state. - * But at worst, we'll be off by a few pixels (the frame size). */ - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - - /* GtkWindow tries to save whether the window was iconified - * and restore it, but that doesn't work because of problems - * GDK_WINDOW_STATE_ICONIFIED. For details, see comment for - * terminal_util_x11_window_is_minimized() - */ - was_minimized = terminal_util_x11_window_is_minimized (widget_window); - - /* And the desktop */ - have_desktop = terminal_util_x11_get_net_wm_desktop (widget_window, &desktop); - - gtk_widget_hide (widget); - gtk_widget_unrealize (widget); - - /* put the window back where it was before */ - gtk_window_move (GTK_WINDOW (window), x, y); - gtk_widget_realize (widget); - - /* Get new GdkWindow */ - widget_window = gtk_widget_get_window (widget); - - gdk_x11_window_set_user_time (widget_window, user_time); - - if (was_minimized) - gtk_window_iconify (GTK_WINDOW (window)); - else - gtk_window_deiconify (GTK_WINDOW (window)); - - gtk_widget_show (widget); - if (have_desktop) - terminal_util_x11_set_net_wm_desktop (widget_window, desktop); - - /* Mapping the window is likely to have set the "demands-attention" state. - * In particular, Marco will always set the state if a window is mapped, - * is not given the focus (because of an old user time), and is covered - * by some other window. We have no way of preventing this, so we just - * wait for our window to be mapped, and then tell the window manager - * to turn off the bit. If it wasn't set, no harm. - */ - priv->clear_demands_attention = TRUE; - } + TerminalWindowPrivate *priv = window->priv; + gboolean composited; + + composited = gdk_screen_is_composited (screen); + if ((composited != priv->have_argb_visual) && + gtk_widget_get_realized (GTK_WIDGET (window))) + { + GtkWidget *widget = GTK_WIDGET (window); + GdkWindow *widget_window; + guint32 user_time; + gboolean have_desktop; + guint32 desktop = 0; /* Quiet GCC */ + gboolean was_minimized; + int x, y; + + widget_window = gtk_widget_get_window (widget); + + user_time = gdk_x11_display_get_user_time (gtk_widget_get_display (widget)); + + /* If compositing changed, re-realize the window. Bug #563561 */ + + /* Save the position; this isn't perfect, because the position + * that gtk_window_get_position() returns is the position of the + * frame window, and we are racing with the new window manager + * framing our window, so we might see a funky intermediate state. + * But at worst, we'll be off by a few pixels (the frame size). */ + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + + /* GtkWindow tries to save whether the window was iconified + * and restore it, but that doesn't work because of problems + * GDK_WINDOW_STATE_ICONIFIED. For details, see comment for + * terminal_util_x11_window_is_minimized() + */ + was_minimized = terminal_util_x11_window_is_minimized (widget_window); + + /* And the desktop */ + have_desktop = terminal_util_x11_get_net_wm_desktop (widget_window, &desktop); + + gtk_widget_hide (widget); + gtk_widget_unrealize (widget); + + /* put the window back where it was before */ + gtk_window_move (GTK_WINDOW (window), x, y); + gtk_widget_realize (widget); + + /* Get new GdkWindow */ + widget_window = gtk_widget_get_window (widget); + + gdk_x11_window_set_user_time (widget_window, user_time); + + if (was_minimized) + gtk_window_iconify (GTK_WINDOW (window)); + else + gtk_window_deiconify (GTK_WINDOW (window)); + + gtk_widget_show (widget); + if (have_desktop) + terminal_util_x11_set_net_wm_desktop (widget_window, desktop); + + /* Mapping the window is likely to have set the "demands-attention" state. + * In particular, Marco will always set the state if a window is mapped, + * is not given the focus (because of an old user time), and is covered + * by some other window. We have no way of preventing this, so we just + * wait for our window to be mapped, and then tell the window manager + * to turn off the bit. If it wasn't set, no harm. + */ + priv->clear_demands_attention = TRUE; + } } #endif /* GDK_WINDOWING_X11 */ @@ -1710,613 +1710,613 @@ static void terminal_window_screen_update (TerminalWindow *window, GdkScreen *screen) { - TerminalApp *app; + TerminalApp *app; - terminal_window_window_manager_changed_cb (screen, window); - g_signal_connect (screen, "window-manager-changed", - G_CALLBACK (terminal_window_window_manager_changed_cb), window); + terminal_window_window_manager_changed_cb (screen, window); + g_signal_connect (screen, "window-manager-changed", + G_CALLBACK (terminal_window_window_manager_changed_cb), window); #ifdef GDK_WINDOWING_X11 - g_signal_connect (screen, "composited-changed", - G_CALLBACK (terminal_window_composited_changed_cb), window); + g_signal_connect (screen, "composited-changed", + G_CALLBACK (terminal_window_composited_changed_cb), window); #endif - if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (screen), "GT::HasSettingsConnection"))) - return; + if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (screen), "GT::HasSettingsConnection"))) + return; - g_object_set_data_full (G_OBJECT (screen), "GT::HasSettingsConnection", - GINT_TO_POINTER (TRUE), - (GDestroyNotify) app_setting_notify_destroy_cb); + g_object_set_data_full (G_OBJECT (screen), "GT::HasSettingsConnection", + GINT_TO_POINTER (TRUE), + (GDestroyNotify) app_setting_notify_destroy_cb); - app = terminal_app_get (); - app_setting_notify_cb (app, NULL, screen); - g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MNEMONICS, - G_CALLBACK (app_setting_notify_cb), screen); - g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, - G_CALLBACK (app_setting_notify_cb), screen); + app = terminal_app_get (); + app_setting_notify_cb (app, NULL, screen); + g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MNEMONICS, + G_CALLBACK (app_setting_notify_cb), screen); + g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, + G_CALLBACK (app_setting_notify_cb), screen); } static void terminal_window_screen_changed (GtkWidget *widget, GdkScreen *previous_screen) { - TerminalWindow *window = TERMINAL_WINDOW (widget); - void (* screen_changed) (GtkWidget *, GdkScreen *) = - GTK_WIDGET_CLASS (terminal_window_parent_class)->screen_changed; - GdkScreen *screen; - - if (screen_changed) - screen_changed (widget, previous_screen); - - screen = gtk_widget_get_screen (widget); - if (previous_screen == screen) - return; - - if (previous_screen) - { - g_signal_handlers_disconnect_by_func (previous_screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), - window); + TerminalWindow *window = TERMINAL_WINDOW (widget); + void (* screen_changed) (GtkWidget *, GdkScreen *) = + GTK_WIDGET_CLASS (terminal_window_parent_class)->screen_changed; + GdkScreen *screen; + + if (screen_changed) + screen_changed (widget, previous_screen); + + screen = gtk_widget_get_screen (widget); + if (previous_screen == screen) + return; + + if (previous_screen) + { + g_signal_handlers_disconnect_by_func (previous_screen, + G_CALLBACK (terminal_window_window_manager_changed_cb), + window); #ifdef GDK_WINDOWING_X11 - g_signal_handlers_disconnect_by_func (previous_screen, - G_CALLBACK (terminal_window_composited_changed_cb), - window); + g_signal_handlers_disconnect_by_func (previous_screen, + G_CALLBACK (terminal_window_composited_changed_cb), + window); #endif - } + } - if (!screen) - return; + if (!screen) + return; - terminal_window_screen_update (window, screen); + terminal_window_screen_update (window, screen); } static void terminal_window_profile_list_changed_cb (TerminalApp *app, TerminalWindow *window) { - terminal_window_update_set_profile_menu (window); - terminal_window_update_new_terminal_menus (window); + terminal_window_update_set_profile_menu (window); + terminal_window_update_new_terminal_menus (window); } static void terminal_window_encoding_list_changed_cb (TerminalApp *app, TerminalWindow *window) { - terminal_window_update_encoding_menu (window); + terminal_window_update_encoding_menu (window); } static void terminal_window_init (TerminalWindow *window) { - const GtkActionEntry menu_entries[] = - { - /* Toplevel */ - { "File", NULL, N_("_File") }, - { "FileNewWindowProfiles", STOCK_NEW_WINDOW, N_("Open _Terminal")}, - { "FileNewTabProfiles", STOCK_NEW_TAB, N_("Open Ta_b") }, - { "Edit", NULL, N_("_Edit") }, - { "View", NULL, N_("_View") }, - { "Search", NULL, N_("_Search") }, - { "Terminal", NULL, N_("_Terminal") }, - { "Tabs", NULL, N_("Ta_bs") }, - { "Help", NULL, N_("_Help") }, - { "Popup", NULL, NULL }, - { "NotebookPopup", NULL, "" }, - - /* File menu */ - { - "FileNewWindow", STOCK_NEW_WINDOW, N_("Open _Terminal"), "<shift><control>N", - NULL, - G_CALLBACK (file_new_window_callback) - }, - { - "FileNewTab", STOCK_NEW_TAB, N_("Open Ta_b"), "<shift><control>T", - NULL, - G_CALLBACK (file_new_tab_callback) - }, - { - "FileNewProfile", GTK_STOCK_OPEN, N_("New _Profile…"), "", - NULL, - G_CALLBACK (file_new_profile_callback) - }, - { - "FileSaveContents", GTK_STOCK_SAVE, N_("_Save Contents"), "", - NULL, - G_CALLBACK (file_save_contents_callback) - }, - { - "FileCloseTab", GTK_STOCK_CLOSE, N_("C_lose Tab"), "<shift><control>W", - NULL, - G_CALLBACK (file_close_tab_callback) - }, - { - "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close Window"), "<shift><control>Q", - NULL, - G_CALLBACK (file_close_window_callback) - }, - - /* Edit menu */ - { - "EditCopy", GTK_STOCK_COPY, NULL, "<shift><control>C", - NULL, - G_CALLBACK (edit_copy_callback) - }, - { - "EditPaste", GTK_STOCK_PASTE, NULL, "<shift><control>V", - NULL, - G_CALLBACK (edit_paste_callback) - }, - { - "EditPasteURIPaths", GTK_STOCK_PASTE, N_("Paste _Filenames"), "", - NULL, - G_CALLBACK (edit_paste_callback) - }, - { - "EditSelectAll", GTK_STOCK_SELECT_ALL, NULL, NULL, - NULL, - G_CALLBACK (edit_select_all_callback) - }, - { - "EditProfiles", NULL, N_("P_rofiles…"), NULL, - NULL, - G_CALLBACK (edit_profiles_callback) - }, - { - "EditKeybindings", NULL, N_("_Keyboard Shortcuts…"), NULL, - NULL, - G_CALLBACK (edit_keybindings_callback) - }, - { - "EditCurrentProfile", NULL, N_("Pr_ofile Preferences"), NULL, - NULL, - G_CALLBACK (edit_current_profile_callback) - }, - - /* View menu */ - { - "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus", - NULL, - G_CALLBACK (view_zoom_in_callback) - }, - { - "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus", - NULL, - G_CALLBACK (view_zoom_out_callback) - }, - { - "ViewZoom100", GTK_STOCK_ZOOM_100, NULL, "<control>0", - NULL, - G_CALLBACK (view_zoom_normal_callback) - }, - - /* Search menu */ - { - "SearchFind", GTK_STOCK_FIND, N_("_Find..."), "<shift><control>F", - NULL, - G_CALLBACK (search_find_callback) - }, - { - "SearchFindNext", NULL, N_("Find Ne_xt"), "<shift><control>H", - NULL, - G_CALLBACK (search_find_next_callback) - }, - { - "SearchFindPrevious", NULL, N_("Find Pre_vious"), "<shift><control>G", - NULL, - G_CALLBACK (search_find_prev_callback) - }, - { - "SearchClearHighlight", NULL, N_("_Clear Highlight"), "<shift><control>J", - NULL, - G_CALLBACK (search_clear_highlight_callback) - }, + const GtkActionEntry menu_entries[] = + { + /* Toplevel */ + { "File", NULL, N_("_File") }, + { "FileNewWindowProfiles", STOCK_NEW_WINDOW, N_("Open _Terminal")}, + { "FileNewTabProfiles", STOCK_NEW_TAB, N_("Open Ta_b") }, + { "Edit", NULL, N_("_Edit") }, + { "View", NULL, N_("_View") }, + { "Search", NULL, N_("_Search") }, + { "Terminal", NULL, N_("_Terminal") }, + { "Tabs", NULL, N_("Ta_bs") }, + { "Help", NULL, N_("_Help") }, + { "Popup", NULL, NULL }, + { "NotebookPopup", NULL, "" }, + + /* File menu */ + { + "FileNewWindow", STOCK_NEW_WINDOW, N_("Open _Terminal"), "<shift><control>N", + NULL, + G_CALLBACK (file_new_window_callback) + }, + { + "FileNewTab", STOCK_NEW_TAB, N_("Open Ta_b"), "<shift><control>T", + NULL, + G_CALLBACK (file_new_tab_callback) + }, + { + "FileNewProfile", GTK_STOCK_OPEN, N_("New _Profile…"), "", + NULL, + G_CALLBACK (file_new_profile_callback) + }, + { + "FileSaveContents", GTK_STOCK_SAVE, N_("_Save Contents"), "", + NULL, + G_CALLBACK (file_save_contents_callback) + }, + { + "FileCloseTab", GTK_STOCK_CLOSE, N_("C_lose Tab"), "<shift><control>W", + NULL, + G_CALLBACK (file_close_tab_callback) + }, + { + "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close Window"), "<shift><control>Q", + NULL, + G_CALLBACK (file_close_window_callback) + }, + + /* Edit menu */ + { + "EditCopy", GTK_STOCK_COPY, NULL, "<shift><control>C", + NULL, + G_CALLBACK (edit_copy_callback) + }, + { + "EditPaste", GTK_STOCK_PASTE, NULL, "<shift><control>V", + NULL, + G_CALLBACK (edit_paste_callback) + }, + { + "EditPasteURIPaths", GTK_STOCK_PASTE, N_("Paste _Filenames"), "", + NULL, + G_CALLBACK (edit_paste_callback) + }, + { + "EditSelectAll", GTK_STOCK_SELECT_ALL, NULL, NULL, + NULL, + G_CALLBACK (edit_select_all_callback) + }, + { + "EditProfiles", NULL, N_("P_rofiles…"), NULL, + NULL, + G_CALLBACK (edit_profiles_callback) + }, + { + "EditKeybindings", NULL, N_("_Keyboard Shortcuts…"), NULL, + NULL, + G_CALLBACK (edit_keybindings_callback) + }, + { + "EditCurrentProfile", NULL, N_("Pr_ofile Preferences"), NULL, + NULL, + G_CALLBACK (edit_current_profile_callback) + }, + + /* View menu */ + { + "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus", + NULL, + G_CALLBACK (view_zoom_in_callback) + }, + { + "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus", + NULL, + G_CALLBACK (view_zoom_out_callback) + }, + { + "ViewZoom100", GTK_STOCK_ZOOM_100, NULL, "<control>0", + NULL, + G_CALLBACK (view_zoom_normal_callback) + }, + + /* Search menu */ + { + "SearchFind", GTK_STOCK_FIND, N_("_Find..."), "<shift><control>F", + NULL, + G_CALLBACK (search_find_callback) + }, + { + "SearchFindNext", NULL, N_("Find Ne_xt"), "<shift><control>H", + NULL, + G_CALLBACK (search_find_next_callback) + }, + { + "SearchFindPrevious", NULL, N_("Find Pre_vious"), "<shift><control>G", + NULL, + G_CALLBACK (search_find_prev_callback) + }, + { + "SearchClearHighlight", NULL, N_("_Clear Highlight"), "<shift><control>J", + NULL, + G_CALLBACK (search_clear_highlight_callback) + }, #if 0 - { - "SearchGoToLine", GTK_STOCK_JUMP_TO, N_("Go to _Line..."), "<shift><control>I", - NULL, - G_CALLBACK (search_goto_line_callback) - }, - { - "SearchIncrementalSearch", GTK_STOCK_FIND, N_("_Incremental Search..."), "<shift><control>K", - NULL, - G_CALLBACK (search_incremental_search_callback) - }, + { + "SearchGoToLine", GTK_STOCK_JUMP_TO, N_("Go to _Line..."), "<shift><control>I", + NULL, + G_CALLBACK (search_goto_line_callback) + }, + { + "SearchIncrementalSearch", GTK_STOCK_FIND, N_("_Incremental Search..."), "<shift><control>K", + NULL, + G_CALLBACK (search_incremental_search_callback) + }, #endif - /* Terminal menu */ - { "TerminalProfiles", NULL, N_("Change _Profile") }, - { - "TerminalSetTitle", NULL, N_("_Set Title…"), NULL, - NULL, - G_CALLBACK (terminal_set_title_callback) - }, - { "TerminalSetEncoding", NULL, N_("Set _Character Encoding") }, - { - "TerminalReset", NULL, N_("_Reset"), NULL, - NULL, - G_CALLBACK (terminal_reset_callback) - }, - { - "TerminalResetClear", NULL, N_("Reset and C_lear"), NULL, - NULL, - G_CALLBACK (terminal_reset_clear_callback) - }, - - /* Terminal/Encodings menu */ - { - "TerminalAddEncoding", NULL, N_("_Add or Remove…"), NULL, - NULL, - G_CALLBACK (terminal_add_encoding_callback) - }, - - /* Tabs menu */ - { - "TabsPrevious", NULL, N_("_Previous Tab"), "<control>Page_Up", - NULL, - G_CALLBACK (tabs_next_or_previous_tab_cb) - }, - { - "TabsNext", NULL, N_("_Next Tab"), "<control>Page_Down", - NULL, - G_CALLBACK (tabs_next_or_previous_tab_cb) - }, - { - "TabsMoveLeft", NULL, N_("Move Tab _Left"), "<shift><control>Page_Up", - NULL, - G_CALLBACK (tabs_move_left_callback) - }, - { - "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down", - NULL, - G_CALLBACK (tabs_move_right_callback) - }, - { - "TabsDetach", NULL, N_("_Detach tab"), NULL, - NULL, - G_CALLBACK (tabs_detach_tab_callback) - }, - - /* Help menu */ - { - "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - NULL, - G_CALLBACK (help_contents_callback) - }, - { - "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, - NULL, - G_CALLBACK (help_about_callback) - }, - - /* Popup menu */ - { - "PopupSendEmail", NULL, N_("_Send Mail To…"), NULL, - NULL, - G_CALLBACK (popup_open_url_callback) - }, - { - "PopupCopyEmailAddress", NULL, N_("_Copy E-mail Address"), NULL, - NULL, - G_CALLBACK (popup_copy_url_callback) - }, - { - "PopupCall", NULL, N_("C_all To…"), NULL, - NULL, - G_CALLBACK (popup_open_url_callback) - }, - { - "PopupCopyCallAddress", NULL, N_("_Copy Call Address"), NULL, - NULL, - G_CALLBACK (popup_copy_url_callback) - }, - { - "PopupOpenLink", NULL, N_("_Open Link"), NULL, - NULL, - G_CALLBACK (popup_open_url_callback) - }, - { - "PopupCopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, - NULL, - G_CALLBACK (popup_copy_url_callback) - }, - { "PopupTerminalProfiles", NULL, N_("P_rofiles") }, - { - "PopupCopy", GTK_STOCK_COPY, NULL, "", - NULL, - G_CALLBACK (edit_copy_callback) - }, - { - "PopupPaste", GTK_STOCK_PASTE, NULL, "", - NULL, - G_CALLBACK (edit_paste_callback) - }, - { - "PopupPasteURIPaths", GTK_STOCK_PASTE, N_("Paste _Filenames"), "", - NULL, - G_CALLBACK (edit_paste_callback) - }, - { - "PopupNewTerminal", NULL, N_("Open _Terminal"), NULL, - NULL, - G_CALLBACK (file_new_window_callback) - }, - { - "PopupNewTab", NULL, N_("Open Ta_b"), NULL, - NULL, - G_CALLBACK (file_new_tab_callback) - }, - { - "PopupCloseWindow", NULL, N_("C_lose Window"), NULL, - NULL, - G_CALLBACK (file_close_window_callback) - }, - { - "PopupCloseTab", NULL, N_("C_lose Tab"), NULL, - NULL, - G_CALLBACK (file_close_tab_callback) - }, - { - "PopupLeaveFullscreen", NULL, N_("L_eave Full Screen"), NULL, - NULL, - G_CALLBACK (popup_leave_fullscreen_callback) - }, - { "PopupInputMethods", NULL, N_("_Input Methods") } - }; - - const GtkToggleActionEntry toggle_menu_entries[] = - { - /* View Menu */ - { - "ViewMenubar", NULL, N_("Show _Menubar"), NULL, - NULL, - G_CALLBACK (view_menubar_toggled_callback), - FALSE - }, - { - "ViewFullscreen", NULL, N_("_Full Screen"), NULL, - NULL, - G_CALLBACK (view_fullscreen_toggled_callback), - FALSE - } - }; - TerminalWindowPrivate *priv; - TerminalApp *app; - GtkActionGroup *action_group; - GtkAction *action; - GtkUIManager *manager; - GtkWidget *main_vbox; - GError *error; - GtkWindowGroup *window_group; - GtkAccelGroup *accel_group; - - priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate); - - g_signal_connect (G_OBJECT (window), "delete_event", - G_CALLBACK(terminal_window_delete_event), - NULL); + /* Terminal menu */ + { "TerminalProfiles", NULL, N_("Change _Profile") }, + { + "TerminalSetTitle", NULL, N_("_Set Title…"), NULL, + NULL, + G_CALLBACK (terminal_set_title_callback) + }, + { "TerminalSetEncoding", NULL, N_("Set _Character Encoding") }, + { + "TerminalReset", NULL, N_("_Reset"), NULL, + NULL, + G_CALLBACK (terminal_reset_callback) + }, + { + "TerminalResetClear", NULL, N_("Reset and C_lear"), NULL, + NULL, + G_CALLBACK (terminal_reset_clear_callback) + }, + + /* Terminal/Encodings menu */ + { + "TerminalAddEncoding", NULL, N_("_Add or Remove…"), NULL, + NULL, + G_CALLBACK (terminal_add_encoding_callback) + }, + + /* Tabs menu */ + { + "TabsPrevious", NULL, N_("_Previous Tab"), "<control>Page_Up", + NULL, + G_CALLBACK (tabs_next_or_previous_tab_cb) + }, + { + "TabsNext", NULL, N_("_Next Tab"), "<control>Page_Down", + NULL, + G_CALLBACK (tabs_next_or_previous_tab_cb) + }, + { + "TabsMoveLeft", NULL, N_("Move Tab _Left"), "<shift><control>Page_Up", + NULL, + G_CALLBACK (tabs_move_left_callback) + }, + { + "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down", + NULL, + G_CALLBACK (tabs_move_right_callback) + }, + { + "TabsDetach", NULL, N_("_Detach tab"), NULL, + NULL, + G_CALLBACK (tabs_detach_tab_callback) + }, + + /* Help menu */ + { + "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", + NULL, + G_CALLBACK (help_contents_callback) + }, + { + "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, + NULL, + G_CALLBACK (help_about_callback) + }, + + /* Popup menu */ + { + "PopupSendEmail", NULL, N_("_Send Mail To…"), NULL, + NULL, + G_CALLBACK (popup_open_url_callback) + }, + { + "PopupCopyEmailAddress", NULL, N_("_Copy E-mail Address"), NULL, + NULL, + G_CALLBACK (popup_copy_url_callback) + }, + { + "PopupCall", NULL, N_("C_all To…"), NULL, + NULL, + G_CALLBACK (popup_open_url_callback) + }, + { + "PopupCopyCallAddress", NULL, N_("_Copy Call Address"), NULL, + NULL, + G_CALLBACK (popup_copy_url_callback) + }, + { + "PopupOpenLink", NULL, N_("_Open Link"), NULL, + NULL, + G_CALLBACK (popup_open_url_callback) + }, + { + "PopupCopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, + NULL, + G_CALLBACK (popup_copy_url_callback) + }, + { "PopupTerminalProfiles", NULL, N_("P_rofiles") }, + { + "PopupCopy", GTK_STOCK_COPY, NULL, "", + NULL, + G_CALLBACK (edit_copy_callback) + }, + { + "PopupPaste", GTK_STOCK_PASTE, NULL, "", + NULL, + G_CALLBACK (edit_paste_callback) + }, + { + "PopupPasteURIPaths", GTK_STOCK_PASTE, N_("Paste _Filenames"), "", + NULL, + G_CALLBACK (edit_paste_callback) + }, + { + "PopupNewTerminal", NULL, N_("Open _Terminal"), NULL, + NULL, + G_CALLBACK (file_new_window_callback) + }, + { + "PopupNewTab", NULL, N_("Open Ta_b"), NULL, + NULL, + G_CALLBACK (file_new_tab_callback) + }, + { + "PopupCloseWindow", NULL, N_("C_lose Window"), NULL, + NULL, + G_CALLBACK (file_close_window_callback) + }, + { + "PopupCloseTab", NULL, N_("C_lose Tab"), NULL, + NULL, + G_CALLBACK (file_close_tab_callback) + }, + { + "PopupLeaveFullscreen", NULL, N_("L_eave Full Screen"), NULL, + NULL, + G_CALLBACK (popup_leave_fullscreen_callback) + }, + { "PopupInputMethods", NULL, N_("_Input Methods") } + }; + + const GtkToggleActionEntry toggle_menu_entries[] = + { + /* View Menu */ + { + "ViewMenubar", NULL, N_("Show _Menubar"), NULL, + NULL, + G_CALLBACK (view_menubar_toggled_callback), + FALSE + }, + { + "ViewFullscreen", NULL, N_("_Full Screen"), NULL, + NULL, + G_CALLBACK (view_fullscreen_toggled_callback), + FALSE + } + }; + TerminalWindowPrivate *priv; + TerminalApp *app; + GtkActionGroup *action_group; + GtkAction *action; + GtkUIManager *manager; + GtkWidget *main_vbox; + GError *error; + GtkWindowGroup *window_group; + GtkAccelGroup *accel_group; + + priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate); + + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK(terminal_window_delete_event), + NULL); #ifdef MATE_ENABLE_DEBUG - _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY) - { - g_signal_connect_after (window, "size-request", G_CALLBACK (terminal_window_size_request_cb), NULL); - g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), NULL); - } + _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY) + { + g_signal_connect_after (window, "size-request", G_CALLBACK (terminal_window_size_request_cb), NULL); + g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), NULL); + } #endif - gtk_window_set_title (GTK_WINDOW (window), _("Terminal")); - - priv->active_screen = NULL; - priv->menubar_visible = FALSE; - - main_vbox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (window), main_vbox); - gtk_widget_show (main_vbox); - - priv->notebook = gtk_notebook_new (); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); - gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), GUINT_TO_POINTER (1)); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), - TRUE); - g_signal_connect (priv->notebook, "button-press-event", - G_CALLBACK (notebook_button_press_cb), window); - g_signal_connect (priv->notebook, "popup-menu", - G_CALLBACK (notebook_popup_menu_cb), window); - g_signal_connect_after (priv->notebook, "switch-page", - G_CALLBACK (notebook_page_selected_callback), window); - g_signal_connect_after (priv->notebook, "page-added", - G_CALLBACK (notebook_page_added_callback), window); - g_signal_connect_after (priv->notebook, "page-removed", - G_CALLBACK (notebook_page_removed_callback), window); - g_signal_connect_data (priv->notebook, "page-reordered", - G_CALLBACK (terminal_window_update_tabs_menu_sensitivity), - window, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER); - - gtk_box_pack_end (GTK_BOX (main_vbox), priv->notebook, TRUE, TRUE, 0); - gtk_widget_show (priv->notebook); - - priv->old_char_width = -1; - priv->old_char_height = -1; - priv->old_geometry_widget = NULL; - - /* Create the UI manager */ - manager = priv->ui_manager = gtk_ui_manager_new (); - - accel_group = gtk_ui_manager_get_accel_group (manager); - gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); - /* Workaround for bug #453193, bug #138609 and bug #559728 */ - g_signal_connect_after (accel_group, "accel-activate", - G_CALLBACK (terminal_window_accel_activate_cb), window); - - /* Create the actions */ - /* Note that this action group name is used in terminal-accels.c; do not change it */ - priv->action_group = action_group = gtk_action_group_new ("Main"); - gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, menu_entries, - G_N_ELEMENTS (menu_entries), window); - gtk_action_group_add_toggle_actions (action_group, - toggle_menu_entries, - G_N_ELEMENTS (toggle_menu_entries), - window); - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - - action = gtk_action_group_get_action (action_group, "Edit"); - g_signal_connect (action, "activate", - G_CALLBACK (edit_menu_activate_callback), window); - - /* Set this action invisible so the Edit menu doesn't flash the first - * time it's shown and there's no text/uri-list on the clipboard. - */ - action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths"); - gtk_action_set_visible (action, FALSE); - - /* Idem for this action, since the window is not fullscreen. */ - action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); - gtk_action_set_visible (action, FALSE); + gtk_window_set_title (GTK_WINDOW (window), _("Terminal")); + + priv->active_screen = NULL; + priv->menubar_visible = FALSE; + + main_vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (window), main_vbox); + gtk_widget_show (main_vbox); + + priv->notebook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), GUINT_TO_POINTER (1)); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), + TRUE); + g_signal_connect (priv->notebook, "button-press-event", + G_CALLBACK (notebook_button_press_cb), window); + g_signal_connect (priv->notebook, "popup-menu", + G_CALLBACK (notebook_popup_menu_cb), window); + g_signal_connect_after (priv->notebook, "switch-page", + G_CALLBACK (notebook_page_selected_callback), window); + g_signal_connect_after (priv->notebook, "page-added", + G_CALLBACK (notebook_page_added_callback), window); + g_signal_connect_after (priv->notebook, "page-removed", + G_CALLBACK (notebook_page_removed_callback), window); + g_signal_connect_data (priv->notebook, "page-reordered", + G_CALLBACK (terminal_window_update_tabs_menu_sensitivity), + window, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER); + + gtk_box_pack_end (GTK_BOX (main_vbox), priv->notebook, TRUE, TRUE, 0); + gtk_widget_show (priv->notebook); + + priv->old_char_width = -1; + priv->old_char_height = -1; + priv->old_geometry_widget = NULL; + + /* Create the UI manager */ + manager = priv->ui_manager = gtk_ui_manager_new (); + + accel_group = gtk_ui_manager_get_accel_group (manager); + gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); + /* Workaround for bug #453193, bug #138609 and bug #559728 */ + g_signal_connect_after (accel_group, "accel-activate", + G_CALLBACK (terminal_window_accel_activate_cb), window); + + /* Create the actions */ + /* Note that this action group name is used in terminal-accels.c; do not change it */ + priv->action_group = action_group = gtk_action_group_new ("Main"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, menu_entries, + G_N_ELEMENTS (menu_entries), window); + gtk_action_group_add_toggle_actions (action_group, + toggle_menu_entries, + G_N_ELEMENTS (toggle_menu_entries), + window); + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + + action = gtk_action_group_get_action (action_group, "Edit"); + g_signal_connect (action, "activate", + G_CALLBACK (edit_menu_activate_callback), window); + + /* Set this action invisible so the Edit menu doesn't flash the first + * time it's shown and there's no text/uri-list on the clipboard. + */ + action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths"); + gtk_action_set_visible (action, FALSE); + + /* Idem for this action, since the window is not fullscreen. */ + action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); + gtk_action_set_visible (action, FALSE); #ifndef ENABLE_SAVE - action = gtk_action_group_get_action (priv->action_group, "FileSaveContents"); - gtk_action_set_visible (action, FALSE); + action = gtk_action_group_get_action (priv->action_group, "FileSaveContents"); + gtk_action_set_visible (action, FALSE); #endif - /* Load the UI */ - error = NULL; - priv->ui_id = gtk_ui_manager_add_ui_from_file (manager, - TERM_PKGDATADIR G_DIR_SEPARATOR_S "terminal.xml", - &error); - if (error) - { - g_printerr ("Failed to load UI: %s\n", error->message); - g_error_free (error); - } - - priv->menubar = gtk_ui_manager_get_widget (manager, "/menubar"); - gtk_box_pack_start (GTK_BOX (main_vbox), - priv->menubar, - FALSE, FALSE, 0); - - /* Add tabs menu */ - priv->tabs_menu = terminal_tabs_menu_new (window); - - app = terminal_app_get (); - terminal_window_profile_list_changed_cb (app, window); - g_signal_connect (app, "profile-list-changed", - G_CALLBACK (terminal_window_profile_list_changed_cb), window); - - terminal_window_encoding_list_changed_cb (app, window); - g_signal_connect (app, "encoding-list-changed", - G_CALLBACK (terminal_window_encoding_list_changed_cb), window); - - terminal_window_set_menubar_visible (window, TRUE); - priv->use_default_menubar_visibility = TRUE; - - terminal_window_update_size_to_menu (window); - - /* We have to explicitly call this, since screen-changed is NOT - * emitted for the toplevel the first time! - */ - terminal_window_screen_update (window, gtk_widget_get_screen (GTK_WIDGET (window))); - - window_group = gtk_window_group_new (); - gtk_window_group_add_window (window_group, GTK_WINDOW (window)); - g_object_unref (window_group); - - terminal_util_set_unique_role (GTK_WINDOW (window), "mate-terminal-window"); + /* Load the UI */ + error = NULL; + priv->ui_id = gtk_ui_manager_add_ui_from_file (manager, + TERM_PKGDATADIR G_DIR_SEPARATOR_S "terminal.xml", + &error); + if (error) + { + g_printerr ("Failed to load UI: %s\n", error->message); + g_error_free (error); + } + + priv->menubar = gtk_ui_manager_get_widget (manager, "/menubar"); + gtk_box_pack_start (GTK_BOX (main_vbox), + priv->menubar, + FALSE, FALSE, 0); + + /* Add tabs menu */ + priv->tabs_menu = terminal_tabs_menu_new (window); + + app = terminal_app_get (); + terminal_window_profile_list_changed_cb (app, window); + g_signal_connect (app, "profile-list-changed", + G_CALLBACK (terminal_window_profile_list_changed_cb), window); + + terminal_window_encoding_list_changed_cb (app, window); + g_signal_connect (app, "encoding-list-changed", + G_CALLBACK (terminal_window_encoding_list_changed_cb), window); + + terminal_window_set_menubar_visible (window, TRUE); + priv->use_default_menubar_visibility = TRUE; + + terminal_window_update_size_to_menu (window); + + /* We have to explicitly call this, since screen-changed is NOT + * emitted for the toplevel the first time! + */ + terminal_window_screen_update (window, gtk_widget_get_screen (GTK_WIDGET (window))); + + window_group = gtk_window_group_new (); + gtk_window_group_add_window (window_group, GTK_WINDOW (window)); + g_object_unref (window_group); + + terminal_util_set_unique_role (GTK_WINDOW (window), "mate-terminal-window"); } static void terminal_window_class_init (TerminalWindowClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->dispose = terminal_window_dispose; - object_class->finalize = terminal_window_finalize; - - widget_class->show = terminal_window_show; - widget_class->realize = terminal_window_realize; - widget_class->map_event = terminal_window_map_event; - widget_class->window_state_event = terminal_window_state_event; - widget_class->screen_changed = terminal_window_screen_changed; - - g_type_class_add_private (object_class, sizeof (TerminalWindowPrivate)); - - gtk_rc_parse_string ("style \"mate-terminal-tab-close-button-style\"\n" - "{\n" - "GtkWidget::focus-padding = 0\n" - "GtkWidget::focus-line-width = 0\n" - "xthickness = 0\n" - "ythickness = 0\n" - "}\n" - "widget \"*.mate-terminal-tab-close-button\" style \"mate-terminal-tab-close-button-style\""); - - gtk_notebook_set_window_creation_hook (handle_tab_droped_on_desktop, NULL, NULL); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = terminal_window_dispose; + object_class->finalize = terminal_window_finalize; + + widget_class->show = terminal_window_show; + widget_class->realize = terminal_window_realize; + widget_class->map_event = terminal_window_map_event; + widget_class->window_state_event = terminal_window_state_event; + widget_class->screen_changed = terminal_window_screen_changed; + + g_type_class_add_private (object_class, sizeof (TerminalWindowPrivate)); + + gtk_rc_parse_string ("style \"mate-terminal-tab-close-button-style\"\n" + "{\n" + "GtkWidget::focus-padding = 0\n" + "GtkWidget::focus-line-width = 0\n" + "xthickness = 0\n" + "ythickness = 0\n" + "}\n" + "widget \"*.mate-terminal-tab-close-button\" style \"mate-terminal-tab-close-button-style\""); + + gtk_notebook_set_window_creation_hook (handle_tab_droped_on_desktop, NULL, NULL); } static void terminal_window_dispose (GObject *object) { - TerminalWindow *window = TERMINAL_WINDOW (object); - TerminalWindowPrivate *priv = window->priv; - TerminalApp *app; - GdkScreen *screen; - - remove_popup_info (window); - - priv->disposed = TRUE; - - if (priv->tabs_menu) - { - g_object_unref (priv->tabs_menu); - priv->tabs_menu = NULL; - } - - if (priv->profiles_action_group != NULL) - disconnect_profiles_from_actions_in_group (priv->profiles_action_group); - if (priv->new_terminal_action_group != NULL) - disconnect_profiles_from_actions_in_group (priv->new_terminal_action_group); - - app = terminal_app_get (); - g_signal_handlers_disconnect_by_func (app, - G_CALLBACK (terminal_window_profile_list_changed_cb), - window); - g_signal_handlers_disconnect_by_func (app, - G_CALLBACK (terminal_window_encoding_list_changed_cb), - window); - - screen = gtk_widget_get_screen (GTK_WIDGET (object)); - if (screen) - { - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), - window); + TerminalWindow *window = TERMINAL_WINDOW (object); + TerminalWindowPrivate *priv = window->priv; + TerminalApp *app; + GdkScreen *screen; + + remove_popup_info (window); + + priv->disposed = TRUE; + + if (priv->tabs_menu) + { + g_object_unref (priv->tabs_menu); + priv->tabs_menu = NULL; + } + + if (priv->profiles_action_group != NULL) + disconnect_profiles_from_actions_in_group (priv->profiles_action_group); + if (priv->new_terminal_action_group != NULL) + disconnect_profiles_from_actions_in_group (priv->new_terminal_action_group); + + app = terminal_app_get (); + g_signal_handlers_disconnect_by_func (app, + G_CALLBACK (terminal_window_profile_list_changed_cb), + window); + g_signal_handlers_disconnect_by_func (app, + G_CALLBACK (terminal_window_encoding_list_changed_cb), + window); + + screen = gtk_widget_get_screen (GTK_WIDGET (object)); + if (screen) + { + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (terminal_window_window_manager_changed_cb), + window); #ifdef GDK_WINDOWING_X11 - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (terminal_window_composited_changed_cb), - window); + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (terminal_window_composited_changed_cb), + window); #endif - } + } - G_OBJECT_CLASS (terminal_window_parent_class)->dispose (object); + G_OBJECT_CLASS (terminal_window_parent_class)->dispose (object); } static void terminal_window_finalize (GObject *object) { - TerminalWindow *window = TERMINAL_WINDOW (object); - TerminalWindowPrivate *priv = window->priv; + TerminalWindow *window = TERMINAL_WINDOW (object); + TerminalWindowPrivate *priv = window->priv; - g_object_unref (priv->ui_manager); + g_object_unref (priv->ui_manager); - if (priv->confirm_close_dialog) - gtk_dialog_response (GTK_DIALOG (priv->confirm_close_dialog), - GTK_RESPONSE_DELETE_EVENT); + if (priv->confirm_close_dialog) + gtk_dialog_response (GTK_DIALOG (priv->confirm_close_dialog), + GTK_RESPONSE_DELETE_EVENT); - if (priv->search_find_dialog) - gtk_dialog_response (GTK_DIALOG (priv->search_find_dialog), - GTK_RESPONSE_DELETE_EVENT); + if (priv->search_find_dialog) + gtk_dialog_response (GTK_DIALOG (priv->search_find_dialog), + GTK_RESPONSE_DELETE_EVENT); - G_OBJECT_CLASS (terminal_window_parent_class)->finalize (object); + G_OBJECT_CLASS (terminal_window_parent_class)->finalize (object); } static gboolean @@ -2324,43 +2324,43 @@ terminal_window_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data) { - return confirm_close_window_or_tab (TERMINAL_WINDOW (widget), NULL); + return confirm_close_window_or_tab (TERMINAL_WINDOW (widget), NULL); } static void terminal_window_show (GtkWidget *widget) { - TerminalWindow *window = TERMINAL_WINDOW (widget); - GtkAllocation widget_allocation; + TerminalWindow *window = TERMINAL_WINDOW (widget); + GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); + gtk_widget_get_allocation (widget, &widget_allocation); #if 0 - TerminalWindowPrivate *priv = window->priv; - - if (priv->active_screen != NULL) - { - /* At this point, we have our GdkScreen, and hence the right - * font size, so we can go ahead and size the window. */ - terminal_window_set_size (window, priv->active_screen, FALSE); - } + TerminalWindowPrivate *priv = window->priv; + + if (priv->active_screen != NULL) + { + /* At this point, we have our GdkScreen, and hence the right + * font size, so we can go ahead and size the window. */ + terminal_window_set_size (window, priv->active_screen, FALSE); + } #endif - terminal_window_update_geometry (window); + terminal_window_update_geometry (window); - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] show, size %d : %d at (%d, %d)\n", - widget, - widget_allocation.width, widget_allocation.height, - widget_allocation.x, widget_allocation.y); + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] show, size %d : %d at (%d, %d)\n", + widget, + widget_allocation.width, widget_allocation.height, + widget_allocation.x, widget_allocation.y); - GTK_WIDGET_CLASS (terminal_window_parent_class)->show (widget); + GTK_WIDGET_CLASS (terminal_window_parent_class)->show (widget); } TerminalWindow* terminal_window_new (void) { - return g_object_new (TERMINAL_TYPE_WINDOW, NULL); + return g_object_new (TERMINAL_TYPE_WINDOW, NULL); } /** @@ -2372,10 +2372,10 @@ terminal_window_new (void) void terminal_window_set_is_restored (TerminalWindow *window) { - g_return_if_fail (TERMINAL_IS_WINDOW (window)); - g_return_if_fail (!gtk_widget_get_mapped (GTK_WIDGET (window))); + g_return_if_fail (TERMINAL_IS_WINDOW (window)); + g_return_if_fail (!gtk_widget_get_mapped (GTK_WIDGET (window))); - window->priv->clear_demands_attention = TRUE; + window->priv->clear_demands_attention = TRUE; } static void @@ -2383,15 +2383,15 @@ profile_set_callback (TerminalScreen *screen, TerminalProfile *old_profile, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!gtk_widget_get_realized (GTK_WIDGET (window))) - return; + if (!gtk_widget_get_realized (GTK_WIDGET (window))) + return; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - terminal_window_update_set_profile_menu_active_profile (window); + terminal_window_update_set_profile_menu_active_profile (window); } static void @@ -2399,12 +2399,12 @@ sync_screen_title (TerminalScreen *screen, GParamSpec *psepc, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - gtk_window_set_title (GTK_WINDOW (window), terminal_screen_get_title (screen)); + gtk_window_set_title (GTK_WINDOW (window), terminal_screen_get_title (screen)); } static void @@ -2412,20 +2412,20 @@ sync_screen_icon_title (TerminalScreen *screen, GParamSpec *psepc, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!gtk_widget_get_realized (GTK_WIDGET (window))) - return; + if (!gtk_widget_get_realized (GTK_WIDGET (window))) + return; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - if (!terminal_screen_get_icon_title_set (screen)) - return; + if (!terminal_screen_get_icon_title_set (screen)) + return; - gdk_window_set_icon_name (gtk_widget_get_window (GTK_WIDGET (window)), terminal_screen_get_icon_title (screen)); + gdk_window_set_icon_name (gtk_widget_get_window (GTK_WIDGET (window)), terminal_screen_get_icon_title (screen)); - priv->icon_title_set = TRUE; + priv->icon_title_set = TRUE; } static void @@ -2433,30 +2433,30 @@ sync_screen_icon_title_set (TerminalScreen *screen, GParamSpec *psepc, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!gtk_widget_get_realized (GTK_WIDGET (window))) - return; + if (!gtk_widget_get_realized (GTK_WIDGET (window))) + return; - /* No need to restore the title if we never set an icon title */ - if (!priv->icon_title_set) - return; + /* No need to restore the title if we never set an icon title */ + if (!priv->icon_title_set) + return; - if (screen != priv->active_screen) - return; + if (screen != priv->active_screen) + return; - if (terminal_screen_get_icon_title_set (screen)) - return; + if (terminal_screen_get_icon_title_set (screen)) + return; - /* Need to reset the icon name */ - /* FIXME: Once gtk+ bug 535557 is fixed, use that to unset the icon title. */ + /* Need to reset the icon name */ + /* FIXME: Once gtk+ bug 535557 is fixed, use that to unset the icon title. */ - g_object_set_qdata (G_OBJECT (gtk_widget_get_window (GTK_WIDGET (window))), - g_quark_from_static_string ("gdk-icon-name-set"), - GUINT_TO_POINTER (FALSE)); - priv->icon_title_set = FALSE; + g_object_set_qdata (G_OBJECT (gtk_widget_get_window (GTK_WIDGET (window))), + g_quark_from_static_string ("gdk-icon-name-set"), + GUINT_TO_POINTER (FALSE)); + priv->icon_title_set = FALSE; - /* Re-setting the right title will be done by the notify::title handler which comes after this one */ + /* Re-setting the right title will be done by the notify::title handler which comes after this one */ } /* Notebook callbacks */ @@ -2465,26 +2465,26 @@ static void close_button_clicked_cb (GtkWidget *tab_label, GtkWidget *screen_container) { - GtkWidget *toplevel; - TerminalWindow *window; - TerminalWindowPrivate *priv; - TerminalScreen *screen; + GtkWidget *toplevel; + TerminalWindow *window; + TerminalWindowPrivate *priv; + TerminalScreen *screen; - toplevel = gtk_widget_get_toplevel (screen_container); - if (!gtk_widget_is_toplevel (toplevel)) - return; + toplevel = gtk_widget_get_toplevel (screen_container); + if (!gtk_widget_is_toplevel (toplevel)) + return; - if (!TERMINAL_IS_WINDOW (toplevel)) - return; + if (!TERMINAL_IS_WINDOW (toplevel)) + return; - window = TERMINAL_WINDOW (toplevel); - priv = window->priv; + window = TERMINAL_WINDOW (toplevel); + priv = window->priv; - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (screen_container)); - if (confirm_close_window_or_tab (window, screen)) - return; + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (screen_container)); + if (confirm_close_window_or_tab (window, screen)) + return; - terminal_window_remove_screen (window, screen); + terminal_window_remove_screen (window, screen); } void @@ -2492,59 +2492,59 @@ terminal_window_add_screen (TerminalWindow *window, TerminalScreen *screen, int position) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *old_window; - GtkWidget *screen_container, *tab_label; - - old_window = gtk_widget_get_toplevel (GTK_WIDGET (screen)); - if (gtk_widget_is_toplevel (old_window) && - TERMINAL_IS_WINDOW (old_window) && - TERMINAL_WINDOW (old_window)== window) - return; - - if (TERMINAL_IS_WINDOW (old_window)) - terminal_window_remove_screen (TERMINAL_WINDOW (old_window), screen); - - screen_container = terminal_screen_container_new (screen); - gtk_widget_show (screen_container); - - update_tab_visibility (window, +1); - - tab_label = terminal_tab_label_new (screen); - g_signal_connect (tab_label, "close-button-clicked", - G_CALLBACK (close_button_clicked_cb), screen_container); - - gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), - screen_container, - tab_label, - position); - gtk_container_child_set (GTK_CONTAINER (priv->notebook), - screen_container, - "tab-expand", TRUE, - "tab-fill", TRUE, - NULL); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), - screen_container, - TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), - screen_container, - TRUE); + TerminalWindowPrivate *priv = window->priv; + GtkWidget *old_window; + GtkWidget *screen_container, *tab_label; + + old_window = gtk_widget_get_toplevel (GTK_WIDGET (screen)); + if (gtk_widget_is_toplevel (old_window) && + TERMINAL_IS_WINDOW (old_window) && + TERMINAL_WINDOW (old_window)== window) + return; + + if (TERMINAL_IS_WINDOW (old_window)) + terminal_window_remove_screen (TERMINAL_WINDOW (old_window), screen); + + screen_container = terminal_screen_container_new (screen); + gtk_widget_show (screen_container); + + update_tab_visibility (window, +1); + + tab_label = terminal_tab_label_new (screen); + g_signal_connect (tab_label, "close-button-clicked", + G_CALLBACK (close_button_clicked_cb), screen_container); + + gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), + screen_container, + tab_label, + position); + gtk_container_child_set (GTK_CONTAINER (priv->notebook), + screen_container, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), + screen_container, + TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), + screen_container, + TRUE); } void terminal_window_remove_screen (TerminalWindow *window, TerminalScreen *screen) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreenContainer *screen_container; + TerminalWindowPrivate *priv = window->priv; + TerminalScreenContainer *screen_container; - g_return_if_fail (gtk_widget_get_toplevel (GTK_WIDGET (screen)) == GTK_WIDGET (window)); + g_return_if_fail (gtk_widget_get_toplevel (GTK_WIDGET (screen)) == GTK_WIDGET (window)); - update_tab_visibility (window, -1); + update_tab_visibility (window, -1); - screen_container = terminal_screen_container_get_from_screen (screen); - gtk_container_remove (GTK_CONTAINER (priv->notebook), - GTK_WIDGET (screen_container)); + screen_container = terminal_screen_container_get_from_screen (screen); + gtk_container_remove (GTK_CONTAINER (priv->notebook), + GTK_WIDGET (screen_container)); } void @@ -2553,92 +2553,92 @@ terminal_window_move_screen (TerminalWindow *source_window, TerminalScreen *screen, int dest_position) { - TerminalScreenContainer *screen_container; - - g_return_if_fail (TERMINAL_IS_WINDOW (source_window)); - g_return_if_fail (TERMINAL_IS_WINDOW (dest_window)); - g_return_if_fail (TERMINAL_IS_SCREEN (screen)); - g_return_if_fail (gtk_widget_get_toplevel (GTK_WIDGET (screen)) == GTK_WIDGET (source_window)); - g_return_if_fail (dest_position >= -1); - - screen_container = terminal_screen_container_get_from_screen (screen); - g_assert (TERMINAL_IS_SCREEN_CONTAINER (screen_container)); - - /* We have to ref the screen container as well as the screen, - * because otherwise removing the screen container from the source - * window's notebook will cause the container and its containing - * screen to be gtk_widget_destroy()ed! - */ - g_object_ref_sink (screen_container); - g_object_ref_sink (screen); - terminal_window_remove_screen (source_window, screen); - - /* Now we can safely remove the screen from the container and let the container die */ - gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (screen))), GTK_WIDGET (screen)); - g_object_unref (screen_container); - - terminal_window_add_screen (dest_window, screen, dest_position); - g_object_unref (screen); + TerminalScreenContainer *screen_container; + + g_return_if_fail (TERMINAL_IS_WINDOW (source_window)); + g_return_if_fail (TERMINAL_IS_WINDOW (dest_window)); + g_return_if_fail (TERMINAL_IS_SCREEN (screen)); + g_return_if_fail (gtk_widget_get_toplevel (GTK_WIDGET (screen)) == GTK_WIDGET (source_window)); + g_return_if_fail (dest_position >= -1); + + screen_container = terminal_screen_container_get_from_screen (screen); + g_assert (TERMINAL_IS_SCREEN_CONTAINER (screen_container)); + + /* We have to ref the screen container as well as the screen, + * because otherwise removing the screen container from the source + * window's notebook will cause the container and its containing + * screen to be gtk_widget_destroy()ed! + */ + g_object_ref_sink (screen_container); + g_object_ref_sink (screen); + terminal_window_remove_screen (source_window, screen); + + /* Now we can safely remove the screen from the container and let the container die */ + gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (screen))), GTK_WIDGET (screen)); + g_object_unref (screen_container); + + terminal_window_add_screen (dest_window, screen, dest_position); + g_object_unref (screen); } GList* terminal_window_list_screen_containers (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - /* We are trusting that GtkNotebook will return pages in order */ - return gtk_container_get_children (GTK_CONTAINER (priv->notebook)); + /* We are trusting that GtkNotebook will return pages in order */ + return gtk_container_get_children (GTK_CONTAINER (priv->notebook)); } void terminal_window_set_menubar_visible (TerminalWindow *window, gboolean setting) { - TerminalWindowPrivate *priv = window->priv; - GtkAction *action; + TerminalWindowPrivate *priv = window->priv; + GtkAction *action; - /* it's been set now, so don't override when adding a screen. - * this side effect must happen before we short-circuit below. - */ - priv->use_default_menubar_visibility = FALSE; + /* it's been set now, so don't override when adding a screen. + * this side effect must happen before we short-circuit below. + */ + priv->use_default_menubar_visibility = FALSE; - if (setting == priv->menubar_visible) - return; + if (setting == priv->menubar_visible) + return; - priv->menubar_visible = setting; + priv->menubar_visible = setting; - action = gtk_action_group_get_action (priv->action_group, "ViewMenubar"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), setting); + action = gtk_action_group_get_action (priv->action_group, "ViewMenubar"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), setting); - g_object_set (priv->menubar, "visible", setting, NULL); + g_object_set (priv->menubar, "visible", setting, NULL); - /* FIXMEchpe: use gtk_widget_get_realized instead? */ - if (priv->active_screen) - { - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] setting size after toggling menubar visibility\n", - window); + /* FIXMEchpe: use gtk_widget_get_realized instead? */ + if (priv->active_screen) + { + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] setting size after toggling menubar visibility\n", + window); - terminal_window_set_size (window, priv->active_screen, TRUE); - } + terminal_window_set_size (window, priv->active_screen, TRUE); + } } gboolean terminal_window_get_menubar_visible (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - return priv->menubar_visible; + return priv->menubar_visible; } GtkWidget * terminal_window_get_notebook (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - g_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL); + g_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL); - return GTK_WIDGET (priv->notebook); + return GTK_WIDGET (priv->notebook); } void @@ -2646,7 +2646,7 @@ terminal_window_set_size (TerminalWindow *window, TerminalScreen *screen, gboolean even_if_mapped) { - terminal_window_set_size_force_grid (window, screen, even_if_mapped, -1, -1); + terminal_window_set_size_force_grid (window, screen, even_if_mapped, -1, -1); } void @@ -2656,88 +2656,88 @@ terminal_window_set_size_force_grid (TerminalWindow *window, int force_grid_width, int force_grid_height) { - /* Owen's hack from mate-terminal */ - GtkWidget *widget; - GtkWidget *app; - GtkRequisition toplevel_request; - GtkRequisition widget_request; - int w, h; - int char_width; - int char_height; - int grid_width; - int grid_height; - GtkBorder *inner_border = NULL; - - /* be sure our geometry is up-to-date */ - terminal_window_update_geometry (window); - - widget = GTK_WIDGET (screen); - - app = gtk_widget_get_toplevel (widget); - g_assert (app != NULL); - - gtk_widget_size_request (app, &toplevel_request); - gtk_widget_size_request (widget, &widget_request); - - terminal_screen_get_cell_size (screen, &char_width, &char_height); - terminal_screen_get_size (screen, &grid_width, &grid_height); - - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] set size: toplevel %dx%d widget %dx%d grid %dx%d char-cell %dx%d\n", - window, - toplevel_request.width, toplevel_request.height, - widget_request.width, widget_request.height, - grid_width, grid_height, char_width, char_height); - - w = toplevel_request.width - widget_request.width; - h = toplevel_request.height - widget_request.height; - - if (force_grid_width >= 0) - grid_width = force_grid_width; - if (force_grid_height >= 0) - grid_height = force_grid_height; - - gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); - w += (inner_border ? (inner_border->left + inner_border->right) : 0) + char_width * grid_width; - h += (inner_border ? (inner_border->top + inner_border->bottom) : 0) + char_height * grid_height; - gtk_border_free (inner_border); - - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] set size: grid %dx%d force %dx%d setting %dx%d pixels\n", - window, - grid_width, grid_height, force_grid_width, force_grid_height, w, h); - - if (even_if_mapped && gtk_widget_get_mapped (app)) - { - gtk_window_resize (GTK_WINDOW (app), w, h); - } - else - { - gtk_window_set_default_size (GTK_WINDOW (app), w, h); - } + /* Owen's hack from mate-terminal */ + GtkWidget *widget; + GtkWidget *app; + GtkRequisition toplevel_request; + GtkRequisition widget_request; + int w, h; + int char_width; + int char_height; + int grid_width; + int grid_height; + GtkBorder *inner_border = NULL; + + /* be sure our geometry is up-to-date */ + terminal_window_update_geometry (window); + + widget = GTK_WIDGET (screen); + + app = gtk_widget_get_toplevel (widget); + g_assert (app != NULL); + + gtk_widget_size_request (app, &toplevel_request); + gtk_widget_size_request (widget, &widget_request); + + terminal_screen_get_cell_size (screen, &char_width, &char_height); + terminal_screen_get_size (screen, &grid_width, &grid_height); + + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] set size: toplevel %dx%d widget %dx%d grid %dx%d char-cell %dx%d\n", + window, + toplevel_request.width, toplevel_request.height, + widget_request.width, widget_request.height, + grid_width, grid_height, char_width, char_height); + + w = toplevel_request.width - widget_request.width; + h = toplevel_request.height - widget_request.height; + + if (force_grid_width >= 0) + grid_width = force_grid_width; + if (force_grid_height >= 0) + grid_height = force_grid_height; + + gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); + w += (inner_border ? (inner_border->left + inner_border->right) : 0) + char_width * grid_width; + h += (inner_border ? (inner_border->top + inner_border->bottom) : 0) + char_height * grid_height; + gtk_border_free (inner_border); + + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] set size: grid %dx%d force %dx%d setting %dx%d pixels\n", + window, + grid_width, grid_height, force_grid_width, force_grid_height, w, h); + + if (even_if_mapped && gtk_widget_get_mapped (app)) + { + gtk_window_resize (GTK_WINDOW (app), w, h); + } + else + { + gtk_window_set_default_size (GTK_WINDOW (app), w, h); + } } void terminal_window_switch_screen (TerminalWindow *window, TerminalScreen *screen) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreenContainer *screen_container; - int page_num; - - screen_container = terminal_screen_container_get_from_screen (screen); - g_assert (TERMINAL_IS_SCREEN_CONTAINER (screen_container)); - page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), - GTK_WIDGET (screen_container)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page_num); + TerminalWindowPrivate *priv = window->priv; + TerminalScreenContainer *screen_container; + int page_num; + + screen_container = terminal_screen_container_get_from_screen (screen); + g_assert (TERMINAL_IS_SCREEN_CONTAINER (screen_container)); + page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), + GTK_WIDGET (screen_container)); + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page_num); } TerminalScreen* terminal_window_get_active (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - return priv->active_screen; + return priv->active_screen; } static gboolean @@ -2745,64 +2745,64 @@ notebook_button_press_cb (GtkWidget *widget, GdkEventButton *event, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebook *notebook = GTK_NOTEBOOK (widget); - GtkWidget *menu; - GtkAction *action; - int tab_clicked; + TerminalWindowPrivate *priv = window->priv; + GtkNotebook *notebook = GTK_NOTEBOOK (widget); + GtkWidget *menu; + GtkAction *action; + int tab_clicked; - if (event->type != GDK_BUTTON_PRESS || - event->button != 3 || - (event->state & gtk_accelerator_get_default_mod_mask ()) != 0) - return FALSE; + if (event->type != GDK_BUTTON_PRESS || + event->button != 3 || + (event->state & gtk_accelerator_get_default_mod_mask ()) != 0) + return FALSE; - tab_clicked = find_tab_num_at_pos (notebook, event->x_root, event->y_root); - if (tab_clicked < 0) - return FALSE; + tab_clicked = find_tab_num_at_pos (notebook, event->x_root, event->y_root); + if (tab_clicked < 0) + return FALSE; - /* switch to the page the mouse is over */ - gtk_notebook_set_current_page (notebook, tab_clicked); + /* switch to the page the mouse is over */ + gtk_notebook_set_current_page (notebook, tab_clicked); - action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); - gtk_action_activate (action); + action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); + gtk_action_activate (action); - menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - NULL, NULL, - event->button, event->time); + menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, + NULL, NULL, + event->button, event->time); - return TRUE; + return TRUE; } static gboolean notebook_popup_menu_cb (GtkWidget *widget, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); - GtkWidget *focus_widget, *tab, *tab_label, *menu; - GtkAction *action; - int page_num; - - focus_widget = gtk_window_get_focus (GTK_WINDOW (window)); - /* Only respond if the notebook is the actual focus */ - if (focus_widget != priv->notebook) - return FALSE; - - page_num = gtk_notebook_get_current_page (notebook); - tab = gtk_notebook_get_nth_page (notebook, page_num); - tab_label = gtk_notebook_get_tab_label (notebook, tab); - - action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); - gtk_action_activate (action); - - menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - position_menu_under_widget, tab_label, - 0, gtk_get_current_event_time ()); - gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); - - return TRUE; + TerminalWindowPrivate *priv = window->priv; + GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); + GtkWidget *focus_widget, *tab, *tab_label, *menu; + GtkAction *action; + int page_num; + + focus_widget = gtk_window_get_focus (GTK_WINDOW (window)); + /* Only respond if the notebook is the actual focus */ + if (focus_widget != priv->notebook) + return FALSE; + + page_num = gtk_notebook_get_current_page (notebook); + tab = gtk_notebook_get_nth_page (notebook, page_num); + tab_label = gtk_notebook_get_tab_label (notebook, tab); + + action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); + gtk_action_activate (action); + + menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, + position_menu_under_widget, tab_label, + 0, gtk_get_current_event_time ()); + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); + + return TRUE; } static void @@ -2815,84 +2815,84 @@ notebook_page_selected_callback (GtkWidget *notebook, guint page_num, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *widget; - TerminalScreen *screen; - TerminalProfile *profile; - int old_grid_width, old_grid_height; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *widget; + TerminalScreen *screen; + TerminalProfile *profile; + int old_grid_width, old_grid_height; #if !GTK_CHECK_VERSION (2, 90, 6) - GtkWidget *page_widget; + GtkWidget *page_widget; #endif - _terminal_debug_print (TERMINAL_DEBUG_MDI, - "[window %p] MDI: page-selected %d\n", - window, page_num); + _terminal_debug_print (TERMINAL_DEBUG_MDI, + "[window %p] MDI: page-selected %d\n", + window, page_num); - if (priv->disposed) - return; + if (priv->disposed) + return; #if !GTK_CHECK_VERSION (2, 90, 6) - page_widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num); + page_widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num); #endif - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (page_widget)); - widget = GTK_WIDGET (screen); - g_assert (screen != NULL); + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (page_widget)); + widget = GTK_WIDGET (screen); + g_assert (screen != NULL); - _terminal_debug_print (TERMINAL_DEBUG_MDI, - "[window %p] MDI: setting active tab to screen %p (old active screen %p)\n", - window, screen, priv->active_screen); + _terminal_debug_print (TERMINAL_DEBUG_MDI, + "[window %p] MDI: setting active tab to screen %p (old active screen %p)\n", + window, screen, priv->active_screen); - if (priv->active_screen == screen) - return; + if (priv->active_screen == screen) + return; - if (priv->active_screen != NULL) - { - terminal_screen_get_size (priv->active_screen, &old_grid_width, &old_grid_height); + if (priv->active_screen != NULL) + { + terminal_screen_get_size (priv->active_screen, &old_grid_width, &old_grid_height); - /* This is so that we maintain the same grid */ - vte_terminal_set_size (VTE_TERMINAL (screen), old_grid_width, old_grid_height); - } + /* This is so that we maintain the same grid */ + vte_terminal_set_size (VTE_TERMINAL (screen), old_grid_width, old_grid_height); + } - /* Workaround to remove gtknotebook's feature of computing its size based on - * all pages. When the widget is hidden, its size will not be taken into - * account. - */ - if (priv->active_screen) - gtk_widget_hide (GTK_WIDGET (priv->active_screen)); /* FIXME */ + /* Workaround to remove gtknotebook's feature of computing its size based on + * all pages. When the widget is hidden, its size will not be taken into + * account. + */ + if (priv->active_screen) + gtk_widget_hide (GTK_WIDGET (priv->active_screen)); /* FIXME */ - /* Make sure that the widget is no longer hidden due to the workaround */ - gtk_widget_show (widget); + /* Make sure that the widget is no longer hidden due to the workaround */ + gtk_widget_show (widget); - profile = terminal_screen_get_profile (screen); + profile = terminal_screen_get_profile (screen); - priv->active_screen = screen; + priv->active_screen = screen; - /* Override menubar setting if it wasn't restored from session */ - if (priv->use_default_menubar_visibility) - { - gboolean setting = - terminal_profile_get_property_boolean (terminal_screen_get_profile (screen), TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR); + /* Override menubar setting if it wasn't restored from session */ + if (priv->use_default_menubar_visibility) + { + gboolean setting = + terminal_profile_get_property_boolean (terminal_screen_get_profile (screen), TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR); - terminal_window_set_menubar_visible (window, setting); - } + terminal_window_set_menubar_visible (window, setting); + } - sync_screen_icon_title_set (screen, NULL, window); - sync_screen_icon_title (screen, NULL, window); - sync_screen_title (screen, NULL, window); + sync_screen_icon_title_set (screen, NULL, window); + sync_screen_icon_title (screen, NULL, window); + sync_screen_title (screen, NULL, window); - /* set size of window to current grid size */ - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] setting size after flipping notebook pages\n", - window); - terminal_window_set_size (window, screen, TRUE); + /* set size of window to current grid size */ + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] setting size after flipping notebook pages\n", + window); + terminal_window_set_size (window, screen, TRUE); - terminal_window_update_tabs_menu_sensitivity (window); - terminal_window_update_encoding_menu_active_encoding (window); - terminal_window_update_set_profile_menu_active_profile (window); - terminal_window_update_copy_sensitivity (screen, window); - terminal_window_update_zoom_sensitivity (window); - terminal_window_update_search_sensitivity (screen, window); + terminal_window_update_tabs_menu_sensitivity (window); + terminal_window_update_encoding_menu_active_encoding (window); + terminal_window_update_set_profile_menu_active_profile (window); + terminal_window_update_copy_sensitivity (screen, window); + terminal_window_update_zoom_sensitivity (window); + terminal_window_update_search_sensitivity (screen, window); } static void @@ -2901,66 +2901,66 @@ notebook_page_added_callback (GtkWidget *notebook, guint page_num, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreen *screen; - - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); - - _terminal_debug_print (TERMINAL_DEBUG_MDI, - "[window %p] MDI: screen %p inserted\n", - window, screen); - - g_signal_connect (G_OBJECT (screen), - "profile-set", - G_CALLBACK (profile_set_callback), - window); - - /* FIXME: only connect on the active screen, not all screens! */ - g_signal_connect (screen, "notify::title", - G_CALLBACK (sync_screen_title), window); - g_signal_connect (screen, "notify::icon-title", - G_CALLBACK (sync_screen_icon_title), window); - g_signal_connect (screen, "notify::icon-title-set", - G_CALLBACK (sync_screen_icon_title_set), window); - g_signal_connect (screen, "selection-changed", - G_CALLBACK (terminal_window_update_copy_sensitivity), window); - - g_signal_connect (screen, "show-popup-menu", - G_CALLBACK (screen_show_popup_menu_callback), window); - g_signal_connect (screen, "match-clicked", - G_CALLBACK (screen_match_clicked_cb), window); - g_signal_connect (screen, "resize-window", - G_CALLBACK (screen_resize_window_cb), window); - - g_signal_connect (screen, "close-screen", - G_CALLBACK (screen_close_cb), window); - - update_tab_visibility (window, 0); - terminal_window_update_tabs_menu_sensitivity (window); - terminal_window_update_search_sensitivity (screen, window); + TerminalWindowPrivate *priv = window->priv; + TerminalScreen *screen; + + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); + + _terminal_debug_print (TERMINAL_DEBUG_MDI, + "[window %p] MDI: screen %p inserted\n", + window, screen); + + g_signal_connect (G_OBJECT (screen), + "profile-set", + G_CALLBACK (profile_set_callback), + window); + + /* FIXME: only connect on the active screen, not all screens! */ + g_signal_connect (screen, "notify::title", + G_CALLBACK (sync_screen_title), window); + g_signal_connect (screen, "notify::icon-title", + G_CALLBACK (sync_screen_icon_title), window); + g_signal_connect (screen, "notify::icon-title-set", + G_CALLBACK (sync_screen_icon_title_set), window); + g_signal_connect (screen, "selection-changed", + G_CALLBACK (terminal_window_update_copy_sensitivity), window); + + g_signal_connect (screen, "show-popup-menu", + G_CALLBACK (screen_show_popup_menu_callback), window); + g_signal_connect (screen, "match-clicked", + G_CALLBACK (screen_match_clicked_cb), window); + g_signal_connect (screen, "resize-window", + G_CALLBACK (screen_resize_window_cb), window); + + g_signal_connect (screen, "close-screen", + G_CALLBACK (screen_close_cb), window); + + update_tab_visibility (window, 0); + terminal_window_update_tabs_menu_sensitivity (window); + terminal_window_update_search_sensitivity (screen, window); #if 0 - /* FIXMEchpe: wtf is this doing? */ + /* FIXMEchpe: wtf is this doing? */ - /* If we have an active screen, match its size and zoom */ - if (priv->active_screen) - { - int current_width, current_height; - double scale; + /* If we have an active screen, match its size and zoom */ + if (priv->active_screen) + { + int current_width, current_height; + double scale; - terminal_screen_get_size (priv->active_screen, ¤t_width, ¤t_height); - vte_terminal_set_size (VTE_TERMINAL (screen), current_width, current_height); + terminal_screen_get_size (priv->active_screen, ¤t_width, ¤t_height); + vte_terminal_set_size (VTE_TERMINAL (screen), current_width, current_height); - scale = terminal_screen_get_font_scale (priv->active_screen); - terminal_screen_set_font_scale (screen, scale); - } + scale = terminal_screen_get_font_scale (priv->active_screen); + terminal_screen_set_font_scale (screen, scale); + } #endif - if (priv->present_on_insert) - { - gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time ()); - priv->present_on_insert = FALSE; - } + if (priv->present_on_insert) + { + gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time ()); + priv->present_on_insert = FALSE; + } } static void @@ -2969,210 +2969,210 @@ notebook_page_removed_callback (GtkWidget *notebook, guint page_num, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreen *screen; - int pages; - - if (priv->disposed) - return; - - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); - - _terminal_debug_print (TERMINAL_DEBUG_MDI, - "[window %p] MDI: screen %p removed\n", - window, screen); - - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), - G_CALLBACK (profile_set_callback), - window); - - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), - G_CALLBACK (sync_screen_title), - window); - - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), - G_CALLBACK (sync_screen_icon_title), - window); - - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), - G_CALLBACK (sync_screen_icon_title_set), - window); - - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), - G_CALLBACK (terminal_window_update_copy_sensitivity), - window); - - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (screen_show_popup_menu_callback), - window); - - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (screen_match_clicked_cb), - window); - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (screen_resize_window_cb), - window); - - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (screen_close_cb), - window); - - terminal_window_update_tabs_menu_sensitivity (window); - update_tab_visibility (window, 0); - terminal_window_update_search_sensitivity (screen, window); - - pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); - if (pages == 1) - { - terminal_window_set_size (window, priv->active_screen, TRUE); - } - else if (pages == 0) - { - gtk_widget_destroy (GTK_WIDGET (window)); - } + TerminalWindowPrivate *priv = window->priv; + TerminalScreen *screen; + int pages; + + if (priv->disposed) + return; + + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container)); + + _terminal_debug_print (TERMINAL_DEBUG_MDI, + "[window %p] MDI: screen %p removed\n", + window, screen); + + g_signal_handlers_disconnect_by_func (G_OBJECT (screen), + G_CALLBACK (profile_set_callback), + window); + + g_signal_handlers_disconnect_by_func (G_OBJECT (screen), + G_CALLBACK (sync_screen_title), + window); + + g_signal_handlers_disconnect_by_func (G_OBJECT (screen), + G_CALLBACK (sync_screen_icon_title), + window); + + g_signal_handlers_disconnect_by_func (G_OBJECT (screen), + G_CALLBACK (sync_screen_icon_title_set), + window); + + g_signal_handlers_disconnect_by_func (G_OBJECT (screen), + G_CALLBACK (terminal_window_update_copy_sensitivity), + window); + + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (screen_show_popup_menu_callback), + window); + + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (screen_match_clicked_cb), + window); + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (screen_resize_window_cb), + window); + + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (screen_close_cb), + window); + + terminal_window_update_tabs_menu_sensitivity (window); + update_tab_visibility (window, 0); + terminal_window_update_search_sensitivity (screen, window); + + pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); + if (pages == 1) + { + terminal_window_set_size (window, priv->active_screen, TRUE); + } + else if (pages == 0) + { + gtk_widget_destroy (GTK_WIDGET (window)); + } } void terminal_window_update_geometry (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *widget; - GdkGeometry hints; - int char_width; - int char_height; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *widget; + GdkGeometry hints; + int char_width; + int char_height; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - widget = GTK_WIDGET (priv->active_screen); + widget = GTK_WIDGET (priv->active_screen); - /* We set geometry hints from the active term; best thing - * I can think of to do. Other option would be to try to - * get some kind of union of all hints from all terms in the - * window, but that doesn't make too much sense. - */ - terminal_screen_get_cell_size (priv->active_screen, &char_width, &char_height); + /* We set geometry hints from the active term; best thing + * I can think of to do. Other option would be to try to + * get some kind of union of all hints from all terms in the + * window, but that doesn't make too much sense. + */ + terminal_screen_get_cell_size (priv->active_screen, &char_width, &char_height); - if (char_width != priv->old_char_width || - char_height != priv->old_char_height || - widget != (GtkWidget*) priv->old_geometry_widget) - { - GtkBorder *inner_border = NULL; + if (char_width != priv->old_char_width || + char_height != priv->old_char_height || + widget != (GtkWidget*) priv->old_geometry_widget) + { + GtkBorder *inner_border = NULL; - /* FIXME Since we're using xthickness/ythickness to compute - * padding we need to change the hints when the theme changes. - */ + /* FIXME Since we're using xthickness/ythickness to compute + * padding we need to change the hints when the theme changes. + */ - gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); + gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); - hints.base_width = (inner_border ? (inner_border->left + inner_border->right) : 0); - hints.base_height = (inner_border ? (inner_border->top + inner_border->bottom) : 0); + hints.base_width = (inner_border ? (inner_border->left + inner_border->right) : 0); + hints.base_height = (inner_border ? (inner_border->top + inner_border->bottom) : 0); - gtk_border_free (inner_border); + gtk_border_free (inner_border); #define MIN_WIDTH_CHARS 4 #define MIN_HEIGHT_CHARS 1 - hints.width_inc = char_width; - hints.height_inc = char_height; - - /* min size is min size of just the geometry widget, remember. */ - hints.min_width = hints.base_width + hints.width_inc * MIN_WIDTH_CHARS; - hints.min_height = hints.base_height + hints.height_inc * MIN_HEIGHT_CHARS; - - gtk_window_set_geometry_hints (GTK_WINDOW (window), - widget, - &hints, - GDK_HINT_RESIZE_INC | - GDK_HINT_MIN_SIZE | - GDK_HINT_BASE_SIZE); - - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] hints: base %dx%d min %dx%d inc %d %d\n", - window, - hints.base_width, - hints.base_height, - hints.min_width, - hints.min_height, - hints.width_inc, - hints.height_inc); - - priv->old_char_width = hints.width_inc; - priv->old_char_height = hints.height_inc; - priv->old_geometry_widget = widget; - } - else - { - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, - "[window %p] hints: increment unchanged, not setting\n", - window); - } + hints.width_inc = char_width; + hints.height_inc = char_height; + + /* min size is min size of just the geometry widget, remember. */ + hints.min_width = hints.base_width + hints.width_inc * MIN_WIDTH_CHARS; + hints.min_height = hints.base_height + hints.height_inc * MIN_HEIGHT_CHARS; + + gtk_window_set_geometry_hints (GTK_WINDOW (window), + widget, + &hints, + GDK_HINT_RESIZE_INC | + GDK_HINT_MIN_SIZE | + GDK_HINT_BASE_SIZE); + + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] hints: base %dx%d min %dx%d inc %d %d\n", + window, + hints.base_width, + hints.base_height, + hints.min_width, + hints.min_height, + hints.width_inc, + hints.height_inc); + + priv->old_char_width = hints.width_inc; + priv->old_char_height = hints.height_inc; + priv->old_geometry_widget = widget; + } + else + { + _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, + "[window %p] hints: increment unchanged, not setting\n", + window); + } } static void file_new_window_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalApp *app; - TerminalWindow *new_window; - TerminalProfile *profile; - char *new_working_directory; - - app = terminal_app_get (); - - profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); - if (!profile) - profile = terminal_screen_get_profile (priv->active_screen); - if (!profile) - profile = terminal_app_get_profile_for_new_term (app); - if (!profile) - return; - - if (_terminal_profile_get_forgotten (profile)) - return; - - new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window))); - - new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen); - terminal_app_new_terminal (app, new_window, profile, - NULL, NULL, - new_working_directory, - terminal_screen_get_initial_environment (priv->active_screen), - 1.0); - g_free (new_working_directory); - - gtk_window_present (GTK_WINDOW (new_window)); + TerminalWindowPrivate *priv = window->priv; + TerminalApp *app; + TerminalWindow *new_window; + TerminalProfile *profile; + char *new_working_directory; + + app = terminal_app_get (); + + profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); + if (!profile) + profile = terminal_screen_get_profile (priv->active_screen); + if (!profile) + profile = terminal_app_get_profile_for_new_term (app); + if (!profile) + return; + + if (_terminal_profile_get_forgotten (profile)) + return; + + new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window))); + + new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen); + terminal_app_new_terminal (app, new_window, profile, + NULL, NULL, + new_working_directory, + terminal_screen_get_initial_environment (priv->active_screen), + 1.0); + g_free (new_working_directory); + + gtk_window_present (GTK_WINDOW (new_window)); } static void file_new_tab_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalApp *app; - TerminalProfile *profile; - char *new_working_directory; - - app = terminal_app_get (); - profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); - if (!profile) - profile = terminal_screen_get_profile (priv->active_screen); - if (!profile) - profile = terminal_app_get_profile_for_new_term (app); - if (!profile) - return; - - if (_terminal_profile_get_forgotten (profile)) - return; - - new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen); - terminal_app_new_terminal (app, window, profile, - NULL, NULL, - new_working_directory, - terminal_screen_get_initial_environment (priv->active_screen), - 1.0); - g_free (new_working_directory); + TerminalWindowPrivate *priv = window->priv; + TerminalApp *app; + TerminalProfile *profile; + char *new_working_directory; + + app = terminal_app_get (); + profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY); + if (!profile) + profile = terminal_screen_get_profile (priv->active_screen); + if (!profile) + profile = terminal_app_get_profile_for_new_term (app); + if (!profile) + return; + + if (_terminal_profile_get_forgotten (profile)) + return; + + new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen); + terminal_app_new_terminal (app, window, profile, + NULL, NULL, + new_working_directory, + terminal_screen_get_initial_environment (priv->active_screen), + 1.0); + g_free (new_working_directory); } static void @@ -3180,19 +3180,19 @@ confirm_close_response_cb (GtkWidget *dialog, int response, TerminalWindow *window) { - TerminalScreen *screen; + TerminalScreen *screen; - screen = g_object_get_data (G_OBJECT (dialog), "close-screen"); + screen = g_object_get_data (G_OBJECT (dialog), "close-screen"); - gtk_widget_destroy (dialog); + gtk_widget_destroy (dialog); - if (response != GTK_RESPONSE_ACCEPT) - return; + if (response != GTK_RESPONSE_ACCEPT) + return; - if (screen) - terminal_window_remove_screen (window, screen); - else - gtk_widget_destroy (GTK_WIDGET (window)); + if (screen) + terminal_window_remove_screen (window, screen); + else + gtk_widget_destroy (GTK_WIDGET (window)); } /* Returns: TRUE if closing needs to wait until user confirmation; @@ -3202,153 +3202,153 @@ static gboolean confirm_close_window_or_tab (TerminalWindow *window, TerminalScreen *screen) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *dialog; - MateConfClient *client; - gboolean do_confirm; - int n_tabs; - - if (priv->confirm_close_dialog) - { - /* WTF, already have one? It's modal, so how did that happen? */ - gtk_dialog_response (GTK_DIALOG (priv->confirm_close_dialog), - GTK_RESPONSE_DELETE_EVENT); - } - - client = mateconf_client_get_default (); - do_confirm = mateconf_client_get_bool (client, CONF_GLOBAL_PREFIX "/confirm_window_close", NULL); - g_object_unref (client); - if (!do_confirm) - return FALSE; - - if (screen) - { - do_confirm = terminal_screen_has_foreground_process (screen); - n_tabs = 1; - } - else - { - GList *tabs, *t; - - do_confirm = FALSE; - - tabs = terminal_window_list_screen_containers (window); - n_tabs = g_list_length (tabs); - - for (t = tabs; t != NULL; t = t->next) - { - TerminalScreen *terminal_screen; - - terminal_screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (t->data)); - if (terminal_screen_has_foreground_process (terminal_screen)) - { - do_confirm = TRUE; - break; - } - } - g_list_free (tabs); - } - - if (!do_confirm) - return FALSE; - - dialog = priv->confirm_close_dialog = - gtk_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CANCEL, - "%s", n_tabs > 1 ? _("Close this window?") : _("Close this terminal?")); - - if (n_tabs > 1) - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", _("There are still processes running in some terminals in this window. " - "Closing the window will kill all of them.")); - else - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", _("There is still a process running in this terminal. " - "Closing the terminal will kill it.")); - - gtk_window_set_title (GTK_WINDOW (dialog), ""); - - gtk_dialog_add_button (GTK_DIALOG (dialog), n_tabs > 1 ? _("C_lose Window") : _("C_lose Terminal"), GTK_RESPONSE_ACCEPT); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, - -1); - - g_object_set_data (G_OBJECT (dialog), "close-screen", screen); - - g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &priv->confirm_close_dialog); - g_signal_connect (dialog, "response", - G_CALLBACK (confirm_close_response_cb), window); - - gtk_window_present (GTK_WINDOW (dialog)); - - return TRUE; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *dialog; + MateConfClient *client; + gboolean do_confirm; + int n_tabs; + + if (priv->confirm_close_dialog) + { + /* WTF, already have one? It's modal, so how did that happen? */ + gtk_dialog_response (GTK_DIALOG (priv->confirm_close_dialog), + GTK_RESPONSE_DELETE_EVENT); + } + + client = mateconf_client_get_default (); + do_confirm = mateconf_client_get_bool (client, CONF_GLOBAL_PREFIX "/confirm_window_close", NULL); + g_object_unref (client); + if (!do_confirm) + return FALSE; + + if (screen) + { + do_confirm = terminal_screen_has_foreground_process (screen); + n_tabs = 1; + } + else + { + GList *tabs, *t; + + do_confirm = FALSE; + + tabs = terminal_window_list_screen_containers (window); + n_tabs = g_list_length (tabs); + + for (t = tabs; t != NULL; t = t->next) + { + TerminalScreen *terminal_screen; + + terminal_screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (t->data)); + if (terminal_screen_has_foreground_process (terminal_screen)) + { + do_confirm = TRUE; + break; + } + } + g_list_free (tabs); + } + + if (!do_confirm) + return FALSE; + + dialog = priv->confirm_close_dialog = + gtk_message_dialog_new (GTK_WINDOW (window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_CANCEL, + "%s", n_tabs > 1 ? _("Close this window?") : _("Close this terminal?")); + + if (n_tabs > 1) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", _("There are still processes running in some terminals in this window. " + "Closing the window will kill all of them.")); + else + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", _("There is still a process running in this terminal. " + "Closing the terminal will kill it.")); + + gtk_window_set_title (GTK_WINDOW (dialog), ""); + + gtk_dialog_add_button (GTK_DIALOG (dialog), n_tabs > 1 ? _("C_lose Window") : _("C_lose Terminal"), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, + -1); + + g_object_set_data (G_OBJECT (dialog), "close-screen", screen); + + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &priv->confirm_close_dialog); + g_signal_connect (dialog, "response", + G_CALLBACK (confirm_close_response_cb), window); + + gtk_window_present (GTK_WINDOW (dialog)); + + return TRUE; } static void file_close_window_callback (GtkAction *action, TerminalWindow *window) { - if (confirm_close_window_or_tab (window, NULL)) - return; + if (confirm_close_window_or_tab (window, NULL)) + return; - gtk_widget_destroy (GTK_WIDGET (window)); + gtk_widget_destroy (GTK_WIDGET (window)); } #ifdef ENABLE_SAVE static void save_contents_dialog_on_response (GtkDialog *dialog, gint response_id, gpointer terminal) { - GtkWindow *parent; - gchar *filename_uri = NULL; - GFile *file; - GOutputStream *stream; - GError *error = NULL; - - if (response_id != GTK_RESPONSE_ACCEPT) - { - gtk_widget_destroy (GTK_WIDGET (dialog)); - return; - } - - parent = (GtkWindow*) gtk_widget_get_ancestor (GTK_WIDGET (terminal), GTK_TYPE_WINDOW); - filename_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - - gtk_widget_destroy (GTK_WIDGET (dialog)); - - if (filename_uri == NULL) - return; - - file = g_file_new_for_uri (filename_uri); - stream = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &error)); - - if (stream) - { - /* XXX - * FIXME - * This is a sync operation. - * Should be replaced with the async version when vte implements that. - */ - vte_terminal_write_contents (terminal, stream, - VTE_TERMINAL_WRITE_DEFAULT, - NULL, &error); - g_object_unref (stream); - } - - if (error) - { - terminal_util_show_error_dialog (parent, NULL, error, - "%s", _("Could not save contents")); - g_error_free (error); - } - - g_object_unref(file); - g_free(filename_uri); + GtkWindow *parent; + gchar *filename_uri = NULL; + GFile *file; + GOutputStream *stream; + GError *error = NULL; + + if (response_id != GTK_RESPONSE_ACCEPT) + { + gtk_widget_destroy (GTK_WIDGET (dialog)); + return; + } + + parent = (GtkWindow*) gtk_widget_get_ancestor (GTK_WIDGET (terminal), GTK_TYPE_WINDOW); + filename_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + + if (filename_uri == NULL) + return; + + file = g_file_new_for_uri (filename_uri); + stream = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &error)); + + if (stream) + { + /* XXX + * FIXME + * This is a sync operation. + * Should be replaced with the async version when vte implements that. + */ + vte_terminal_write_contents (terminal, stream, + VTE_TERMINAL_WRITE_DEFAULT, + NULL, &error); + g_object_unref (stream); + } + + if (error) + { + terminal_util_show_error_dialog (parent, NULL, error, + "%s", _("Could not save contents")); + g_error_free (error); + } + + g_object_unref(file); + g_free(filename_uri); } #endif /* ENABLE_SAVE */ @@ -3357,35 +3357,35 @@ file_save_contents_callback (GtkAction *action, TerminalWindow *window) { #ifdef ENABLE_SAVE - GtkWidget *dialog = NULL; - TerminalWindowPrivate *priv = window->priv; - VteTerminal *terminal; + GtkWidget *dialog = NULL; + TerminalWindowPrivate *priv = window->priv; + VteTerminal *terminal; - if (!priv->active_screen) - return; + if (!priv->active_screen) + return; - terminal = VTE_TERMINAL (priv->active_screen); - g_return_if_fail (VTE_IS_TERMINAL (terminal)); + terminal = VTE_TERMINAL (priv->active_screen); + g_return_if_fail (VTE_IS_TERMINAL (terminal)); - dialog = gtk_file_chooser_dialog_new (_("Save as..."), - GTK_WINDOW(window), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); + dialog = gtk_file_chooser_dialog_new (_("Save as..."), + GTK_WINDOW(window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - /* XXX where should we save to? */ - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + /* XXX where should we save to? */ + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(window)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(window)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - g_signal_connect (dialog, "response", G_CALLBACK (save_contents_dialog_on_response), terminal); - g_signal_connect (dialog, "delete_event", G_CALLBACK (terminal_util_dialog_response_on_delete), NULL); + g_signal_connect (dialog, "response", G_CALLBACK (save_contents_dialog_on_response), terminal); + g_signal_connect (dialog, "delete_event", G_CALLBACK (terminal_util_dialog_response_on_delete), NULL); - gtk_window_present (GTK_WINDOW (dialog)); + gtk_window_present (GTK_WINDOW (dialog)); #endif /* ENABLE_SAVE */ } @@ -3393,34 +3393,34 @@ static void file_close_tab_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalScreen *active_screen = priv->active_screen; + TerminalWindowPrivate *priv = window->priv; + TerminalScreen *active_screen = priv->active_screen; - if (!active_screen) - return; + if (!active_screen) + return; - if (confirm_close_window_or_tab (window, active_screen)) - return; + if (confirm_close_window_or_tab (window, active_screen)) + return; - terminal_window_remove_screen (window, active_screen); + terminal_window_remove_screen (window, active_screen); } static void edit_copy_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!priv->active_screen) - return; + if (!priv->active_screen) + return; - vte_terminal_copy_clipboard (VTE_TERMINAL (priv->active_screen)); + vte_terminal_copy_clipboard (VTE_TERMINAL (priv->active_screen)); } typedef struct { - TerminalScreen *screen; - gboolean uris_as_paths; + TerminalScreen *screen; + gboolean uris_as_paths; } PasteData; static void @@ -3428,26 +3428,26 @@ clipboard_uris_received_cb (GtkClipboard *clipboard, /* const */ char **uris, PasteData *data) { - char *text; - gsize len; - - if (!uris) - { - g_object_unref (data->screen); - g_slice_free (PasteData, data); - return; - } - - /* This potentially modifies the strings in |uris| but that's ok */ - if (data->uris_as_paths) - terminal_util_transform_uris_to_quoted_fuse_paths (uris); - - text = terminal_util_concat_uris (uris, &len); - vte_terminal_feed_child (VTE_TERMINAL (data->screen), text, len); - g_free (text); - - g_object_unref (data->screen); - g_slice_free (PasteData, data); + char *text; + gsize len; + + if (!uris) + { + g_object_unref (data->screen); + g_slice_free (PasteData, data); + return; + } + + /* This potentially modifies the strings in |uris| but that's ok */ + if (data->uris_as_paths) + terminal_util_transform_uris_to_quoted_fuse_paths (uris); + + text = terminal_util_concat_uris (uris, &len); + vte_terminal_feed_child (VTE_TERMINAL (data->screen), text, len); + g_free (text); + + g_object_unref (data->screen); + g_slice_free (PasteData, data); } static void @@ -3456,230 +3456,230 @@ clipboard_targets_received_cb (GtkClipboard *clipboard, int n_targets, PasteData *data) { - if (!targets) - { - g_object_unref (data->screen); - g_slice_free (PasteData, data); - return; - } - - if (gtk_targets_include_uri (targets, n_targets)) - { - gtk_clipboard_request_uris (clipboard, - (GtkClipboardURIReceivedFunc) clipboard_uris_received_cb, - data); - return; - } - else /* if (gtk_targets_include_text (targets, n_targets)) */ - { - vte_terminal_paste_clipboard (VTE_TERMINAL (data->screen)); - } - - g_object_unref (data->screen); - g_slice_free (PasteData, data); + if (!targets) + { + g_object_unref (data->screen); + g_slice_free (PasteData, data); + return; + } + + if (gtk_targets_include_uri (targets, n_targets)) + { + gtk_clipboard_request_uris (clipboard, + (GtkClipboardURIReceivedFunc) clipboard_uris_received_cb, + data); + return; + } + else /* if (gtk_targets_include_text (targets, n_targets)) */ + { + vte_terminal_paste_clipboard (VTE_TERMINAL (data->screen)); + } + + g_object_unref (data->screen); + g_slice_free (PasteData, data); } static void edit_paste_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkClipboard *clipboard; - PasteData *data; - const char *name; + TerminalWindowPrivate *priv = window->priv; + GtkClipboard *clipboard; + PasteData *data; + const char *name; - if (!priv->active_screen) - return; + if (!priv->active_screen) + return; - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); - name = gtk_action_get_name (action); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); + name = gtk_action_get_name (action); - data = g_slice_new (PasteData); - data->screen = g_object_ref (priv->active_screen); - data->uris_as_paths = (name == I_("EditPasteURIPaths") || name == I_("PopupPasteURIPaths")); + data = g_slice_new (PasteData); + data->screen = g_object_ref (priv->active_screen); + data->uris_as_paths = (name == I_("EditPasteURIPaths") || name == I_("PopupPasteURIPaths")); - gtk_clipboard_request_targets (clipboard, - (GtkClipboardTargetsReceivedFunc) clipboard_targets_received_cb, - data); + gtk_clipboard_request_targets (clipboard, + (GtkClipboardTargetsReceivedFunc) clipboard_targets_received_cb, + data); } static void edit_select_all_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!priv->active_screen) - return; + if (!priv->active_screen) + return; - vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); + vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); } static void edit_keybindings_callback (GtkAction *action, TerminalWindow *window) { - terminal_app_edit_keybindings (terminal_app_get (), - GTK_WINDOW (window)); + terminal_app_edit_keybindings (terminal_app_get (), + GTK_WINDOW (window)); } static void edit_current_profile_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - terminal_app_edit_profile (terminal_app_get (), - terminal_screen_get_profile (priv->active_screen), - GTK_WINDOW (window), - NULL); + terminal_app_edit_profile (terminal_app_get (), + terminal_screen_get_profile (priv->active_screen), + GTK_WINDOW (window), + NULL); } static void file_new_profile_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - terminal_app_new_profile (terminal_app_get (), - terminal_screen_get_profile (priv->active_screen), - GTK_WINDOW (window)); + terminal_app_new_profile (terminal_app_get (), + terminal_screen_get_profile (priv->active_screen), + GTK_WINDOW (window)); } static void edit_profiles_callback (GtkAction *action, TerminalWindow *window) { - terminal_app_manage_profiles (terminal_app_get (), - GTK_WINDOW (window)); + terminal_app_manage_profiles (terminal_app_get (), + GTK_WINDOW (window)); } static void view_menubar_toggled_callback (GtkToggleAction *action, TerminalWindow *window) { - terminal_window_set_menubar_visible (window, gtk_toggle_action_get_active (action)); + terminal_window_set_menubar_visible (window, gtk_toggle_action_get_active (action)); } static void view_fullscreen_toggled_callback (GtkToggleAction *action, TerminalWindow *window) { - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); + g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); - if (gtk_toggle_action_get_active (action)) - gtk_window_fullscreen (GTK_WINDOW (window)); - else - gtk_window_unfullscreen (GTK_WINDOW (window)); + if (gtk_toggle_action_get_active (action)) + gtk_window_fullscreen (GTK_WINDOW (window)); + else + gtk_window_unfullscreen (GTK_WINDOW (window)); } static const double zoom_factors[] = { - TERMINAL_SCALE_MINIMUM, - TERMINAL_SCALE_XXXXX_SMALL, - TERMINAL_SCALE_XXXX_SMALL, - TERMINAL_SCALE_XXX_SMALL, - PANGO_SCALE_XX_SMALL, - PANGO_SCALE_X_SMALL, - PANGO_SCALE_SMALL, - PANGO_SCALE_MEDIUM, - PANGO_SCALE_LARGE, - PANGO_SCALE_X_LARGE, - PANGO_SCALE_XX_LARGE, - TERMINAL_SCALE_XXX_LARGE, - TERMINAL_SCALE_XXXX_LARGE, - TERMINAL_SCALE_XXXXX_LARGE, - TERMINAL_SCALE_MAXIMUM + TERMINAL_SCALE_MINIMUM, + TERMINAL_SCALE_XXXXX_SMALL, + TERMINAL_SCALE_XXXX_SMALL, + TERMINAL_SCALE_XXX_SMALL, + PANGO_SCALE_XX_SMALL, + PANGO_SCALE_X_SMALL, + PANGO_SCALE_SMALL, + PANGO_SCALE_MEDIUM, + PANGO_SCALE_LARGE, + PANGO_SCALE_X_LARGE, + PANGO_SCALE_XX_LARGE, + TERMINAL_SCALE_XXX_LARGE, + TERMINAL_SCALE_XXXX_LARGE, + TERMINAL_SCALE_XXXXX_LARGE, + TERMINAL_SCALE_MAXIMUM }; static gboolean find_larger_zoom_factor (double current, double *found) { - guint i; - - for (i = 0; i < G_N_ELEMENTS (zoom_factors); ++i) - { - /* Find a font that's larger than this one */ - if ((zoom_factors[i] - current) > 1e-6) - { - *found = zoom_factors[i]; - return TRUE; - } - } - - return FALSE; + guint i; + + for (i = 0; i < G_N_ELEMENTS (zoom_factors); ++i) + { + /* Find a font that's larger than this one */ + if ((zoom_factors[i] - current) > 1e-6) + { + *found = zoom_factors[i]; + return TRUE; + } + } + + return FALSE; } static gboolean find_smaller_zoom_factor (double current, double *found) { - int i; - - i = (int) G_N_ELEMENTS (zoom_factors) - 1; - while (i >= 0) - { - /* Find a font that's smaller than this one */ - if ((current - zoom_factors[i]) > 1e-6) - { - *found = zoom_factors[i]; - return TRUE; - } - - --i; - } - - return FALSE; + int i; + + i = (int) G_N_ELEMENTS (zoom_factors) - 1; + while (i >= 0) + { + /* Find a font that's smaller than this one */ + if ((current - zoom_factors[i]) > 1e-6) + { + *found = zoom_factors[i]; + return TRUE; + } + + --i; + } + + return FALSE; } static void view_zoom_in_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - double current; + TerminalWindowPrivate *priv = window->priv; + double current; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - current = terminal_screen_get_font_scale (priv->active_screen); - if (!find_larger_zoom_factor (current, ¤t)) - return; + current = terminal_screen_get_font_scale (priv->active_screen); + if (!find_larger_zoom_factor (current, ¤t)) + return; - terminal_screen_set_font_scale (priv->active_screen, current); - terminal_window_update_zoom_sensitivity (window); + terminal_screen_set_font_scale (priv->active_screen, current); + terminal_window_update_zoom_sensitivity (window); } static void view_zoom_out_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - double current; + TerminalWindowPrivate *priv = window->priv; + double current; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - current = terminal_screen_get_font_scale (priv->active_screen); - if (!find_smaller_zoom_factor (current, ¤t)) - return; + current = terminal_screen_get_font_scale (priv->active_screen); + if (!find_smaller_zoom_factor (current, ¤t)) + return; - terminal_screen_set_font_scale (priv->active_screen, current); - terminal_window_update_zoom_sensitivity (window); + terminal_screen_set_font_scale (priv->active_screen, current); + terminal_window_update_zoom_sensitivity (window); } static void view_zoom_normal_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - terminal_screen_set_font_scale (priv->active_screen, PANGO_SCALE_MEDIUM); - terminal_window_update_zoom_sensitivity (window); + terminal_screen_set_font_scale (priv->active_screen, PANGO_SCALE_MEDIUM); + terminal_window_update_zoom_sensitivity (window); } @@ -3688,32 +3688,32 @@ search_find_response_callback (GtkWidget *dialog, int response, gpointer user_data) { - TerminalWindow *window = TERMINAL_WINDOW (user_data); - TerminalWindowPrivate *priv = window->priv; - TerminalSearchFlags flags; - GRegex *regex; + TerminalWindow *window = TERMINAL_WINDOW (user_data); + TerminalWindowPrivate *priv = window->priv; + TerminalSearchFlags flags; + GRegex *regex; - if (response != GTK_RESPONSE_ACCEPT) - return; + if (response != GTK_RESPONSE_ACCEPT) + return; - if (G_UNLIKELY (!priv->active_screen)) - return; + if (G_UNLIKELY (!priv->active_screen)) + return; - regex = terminal_search_dialog_get_regex (dialog); - g_return_if_fail (regex != NULL); + regex = terminal_search_dialog_get_regex (dialog); + g_return_if_fail (regex != NULL); - flags = terminal_search_dialog_get_search_flags (dialog); + flags = terminal_search_dialog_get_search_flags (dialog); - vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex); - vte_terminal_search_set_wrap_around (VTE_TERMINAL (priv->active_screen), - (flags & TERMINAL_SEARCH_FLAG_WRAP_AROUND)); + vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex); + vte_terminal_search_set_wrap_around (VTE_TERMINAL (priv->active_screen), + (flags & TERMINAL_SEARCH_FLAG_WRAP_AROUND)); - if (flags & TERMINAL_SEARCH_FLAG_BACKWARDS) - vte_terminal_search_find_previous (VTE_TERMINAL (priv->active_screen)); - else - vte_terminal_search_find_next (VTE_TERMINAL (priv->active_screen)); + if (flags & TERMINAL_SEARCH_FLAG_BACKWARDS) + vte_terminal_search_find_previous (VTE_TERMINAL (priv->active_screen)); + else + vte_terminal_search_find_next (VTE_TERMINAL (priv->active_screen)); - terminal_window_update_search_sensitivity (priv->active_screen, window); + terminal_window_update_search_sensitivity (priv->active_screen, window); } static gboolean @@ -3721,61 +3721,61 @@ search_dialog_delete_event_cb (GtkWidget *widget, GdkEventAny *event, gpointer user_data) { - /* prevent destruction */ - return TRUE; + /* prevent destruction */ + return TRUE; } static void search_find_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (!priv->search_find_dialog) - { - GtkWidget *dialog; + if (!priv->search_find_dialog) + { + GtkWidget *dialog; - dialog = priv->search_find_dialog = terminal_search_dialog_new (GTK_WINDOW (window)); + dialog = priv->search_find_dialog = terminal_search_dialog_new (GTK_WINDOW (window)); - g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &priv->search_find_dialog); - g_signal_connect (dialog, "response", - G_CALLBACK (search_find_response_callback), window); - g_signal_connect (dialog, "delete-event", - G_CALLBACK (search_dialog_delete_event_cb), NULL); - } + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &priv->search_find_dialog); + g_signal_connect (dialog, "response", + G_CALLBACK (search_find_response_callback), window); + g_signal_connect (dialog, "delete-event", + G_CALLBACK (search_dialog_delete_event_cb), NULL); + } - terminal_search_dialog_present (priv->search_find_dialog); + terminal_search_dialog_present (priv->search_find_dialog); } static void search_find_next_callback (GtkAction *action, TerminalWindow *window) { - if (G_UNLIKELY (!window->priv->active_screen)) - return; + if (G_UNLIKELY (!window->priv->active_screen)) + return; - vte_terminal_search_find_next (VTE_TERMINAL (window->priv->active_screen)); + vte_terminal_search_find_next (VTE_TERMINAL (window->priv->active_screen)); } static void search_find_prev_callback (GtkAction *action, TerminalWindow *window) { - if (G_UNLIKELY (!window->priv->active_screen)) - return; + if (G_UNLIKELY (!window->priv->active_screen)) + return; - vte_terminal_search_find_previous (VTE_TERMINAL (window->priv->active_screen)); + vte_terminal_search_find_previous (VTE_TERMINAL (window->priv->active_screen)); } static void search_clear_highlight_callback (GtkAction *action, TerminalWindow *window) { - if (G_UNLIKELY (!window->priv->active_screen)) - return; + if (G_UNLIKELY (!window->priv->active_screen)) + return; - vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL); + vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL); } static void @@ -3783,205 +3783,205 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, int response, TerminalScreen *screen) { - if (response == GTK_RESPONSE_OK) - { - GtkEntry *entry; - const char *text; + if (response == GTK_RESPONSE_OK) + { + GtkEntry *entry; + const char *text; - entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "title-entry")); - text = gtk_entry_get_text (entry); - terminal_screen_set_user_title (screen, text); - } + entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "title-entry")); + text = gtk_entry_get_text (entry); + terminal_screen_set_user_title (screen, text); + } - gtk_widget_destroy (dialog); + gtk_widget_destroy (dialog); } static void terminal_set_title_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *dialog, *message_area, *hbox, *label, *entry; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *dialog, *message_area, *hbox, *label, *entry; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - /* FIXME: hook the screen up so this dialogue closes if the terminal screen closes */ + /* FIXME: hook the screen up so this dialogue closes if the terminal screen closes */ - dialog = gtk_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_OTHER, - GTK_BUTTONS_OK_CANCEL, - "%s", ""); + dialog = gtk_message_dialog_new (GTK_WINDOW (window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_OTHER, + GTK_BUTTONS_OK_CANCEL, + "%s", ""); - gtk_window_set_title (GTK_WINDOW (dialog), _("Set Title")); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_window_set_role (GTK_WINDOW (dialog), "mate-terminal-change-title"); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - /* Alternative button order was set automatically by GtkMessageDialog */ + gtk_window_set_title (GTK_WINDOW (dialog), _("Set Title")); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_window_set_role (GTK_WINDOW (dialog), "mate-terminal-change-title"); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + /* Alternative button order was set automatically by GtkMessageDialog */ - g_signal_connect (dialog, "response", - G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen); - g_signal_connect (dialog, "delete-event", - G_CALLBACK (terminal_util_dialog_response_on_delete), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen); + g_signal_connect (dialog, "delete-event", + G_CALLBACK (terminal_util_dialog_response_on_delete), NULL); #if GTK_CHECK_VERSION (2, 90, 6) - message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); - gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL); + message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); + gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL); #else - label = GTK_MESSAGE_DIALOG (dialog)->label; - gtk_widget_hide (label); - message_area = gtk_widget_get_parent (label); + label = GTK_MESSAGE_DIALOG (dialog)->label; + gtk_widget_hide (label); + message_area = gtk_widget_get_parent (label); #endif - hbox = gtk_hbox_new (FALSE, 12); - gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 12); + gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); - label = gtk_label_new_with_mnemonic (_("_Title:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + label = gtk_label_new_with_mnemonic (_("_Title:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry = gtk_entry_new (); - gtk_entry_set_width_chars (GTK_ENTRY (entry), 32); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_widget_show_all (hbox); + entry = gtk_entry_new (); + gtk_entry_set_width_chars (GTK_ENTRY (entry), 32); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_widget_show_all (hbox); - gtk_widget_grab_focus (entry); - gtk_entry_set_text (GTK_ENTRY (entry), terminal_screen_get_raw_title (priv->active_screen)); - gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); - g_object_set_data (G_OBJECT (dialog), "title-entry", entry); + gtk_widget_grab_focus (entry); + gtk_entry_set_text (GTK_ENTRY (entry), terminal_screen_get_raw_title (priv->active_screen)); + gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); + g_object_set_data (G_OBJECT (dialog), "title-entry", entry); - gtk_window_present (GTK_WINDOW (dialog)); + gtk_window_present (GTK_WINDOW (dialog)); } static void terminal_add_encoding_callback (GtkAction *action, TerminalWindow *window) { - terminal_app_edit_encodings (terminal_app_get (), - GTK_WINDOW (window)); + terminal_app_edit_encodings (terminal_app_get (), + GTK_WINDOW (window)); } static void terminal_reset_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - vte_terminal_reset (VTE_TERMINAL (priv->active_screen), TRUE, FALSE); + vte_terminal_reset (VTE_TERMINAL (priv->active_screen), TRUE, FALSE); } static void terminal_reset_clear_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - if (priv->active_screen == NULL) - return; + if (priv->active_screen == NULL) + return; - vte_terminal_reset (VTE_TERMINAL (priv->active_screen), TRUE, TRUE); + vte_terminal_reset (VTE_TERMINAL (priv->active_screen), TRUE, TRUE); } static void tabs_next_or_previous_tab_cb (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebookClass *klass; - GtkBindingSet *binding_set; - const char *name; - guint keyval = 0; - - name = gtk_action_get_name (action); - if (strcmp (name, "TabsNext") == 0) - { - keyval = GDK_Page_Down; - } - else if (strcmp (name, "TabsPrevious") == 0) - { - keyval = GDK_Page_Up; - } - - klass = GTK_NOTEBOOK_GET_CLASS (GTK_NOTEBOOK (priv->notebook)); - binding_set = gtk_binding_set_by_class (klass); - gtk_binding_set_activate (gtk_binding_set_by_class (klass), - keyval, - GDK_CONTROL_MASK, - GTK_OBJECT (priv->notebook)); + TerminalWindowPrivate *priv = window->priv; + GtkNotebookClass *klass; + GtkBindingSet *binding_set; + const char *name; + guint keyval = 0; + + name = gtk_action_get_name (action); + if (strcmp (name, "TabsNext") == 0) + { + keyval = GDK_Page_Down; + } + else if (strcmp (name, "TabsPrevious") == 0) + { + keyval = GDK_Page_Up; + } + + klass = GTK_NOTEBOOK_GET_CLASS (GTK_NOTEBOOK (priv->notebook)); + binding_set = gtk_binding_set_by_class (klass); + gtk_binding_set_activate (gtk_binding_set_by_class (klass), + keyval, + GDK_CONTROL_MASK, + GTK_OBJECT (priv->notebook)); } static void tabs_move_left_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); - gint page_num,last_page; - GtkWidget *page; + TerminalWindowPrivate *priv = window->priv; + GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); + gint page_num,last_page; + GtkWidget *page; - page_num = gtk_notebook_get_current_page (notebook); - last_page = gtk_notebook_get_n_pages (notebook) - 1; - page = gtk_notebook_get_nth_page (notebook, page_num); + page_num = gtk_notebook_get_current_page (notebook); + last_page = gtk_notebook_get_n_pages (notebook) - 1; + page = gtk_notebook_get_nth_page (notebook, page_num); - gtk_notebook_reorder_child (notebook, page, page_num == 0 ? last_page : page_num - 1); + gtk_notebook_reorder_child (notebook, page, page_num == 0 ? last_page : page_num - 1); } static void tabs_move_right_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); - gint page_num,last_page; - GtkWidget *page; + TerminalWindowPrivate *priv = window->priv; + GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook); + gint page_num,last_page; + GtkWidget *page; - page_num = gtk_notebook_get_current_page (notebook); - last_page = gtk_notebook_get_n_pages (notebook) - 1; - page = gtk_notebook_get_nth_page (notebook, page_num); + page_num = gtk_notebook_get_current_page (notebook); + last_page = gtk_notebook_get_n_pages (notebook) - 1; + page = gtk_notebook_get_nth_page (notebook, page_num); - gtk_notebook_reorder_child (notebook, page, page_num == last_page ? 0 : page_num + 1); + gtk_notebook_reorder_child (notebook, page, page_num == last_page ? 0 : page_num + 1); } static void tabs_detach_tab_callback (GtkAction *action, TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; - TerminalApp *app; - TerminalWindow *new_window; - TerminalScreen *screen; - char *geometry; - int width, height; + TerminalWindowPrivate *priv = window->priv; + TerminalApp *app; + TerminalWindow *new_window; + TerminalScreen *screen; + char *geometry; + int width, height; - app = terminal_app_get (); + app = terminal_app_get (); - screen = priv->active_screen; + screen = priv->active_screen; - /* FIXME: this seems wrong if tabs are shown in the window */ - terminal_screen_get_size (screen, &width, &height); - geometry = g_strdup_printf ("%dx%d", width, height); + /* FIXME: this seems wrong if tabs are shown in the window */ + terminal_screen_get_size (screen, &width, &height); + geometry = g_strdup_printf ("%dx%d", width, height); - new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window))); + new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window))); - terminal_window_move_screen (window, new_window, screen, -1); + terminal_window_move_screen (window, new_window, screen, -1); - gtk_window_parse_geometry (GTK_WINDOW (new_window), geometry); - g_free (geometry); + gtk_window_parse_geometry (GTK_WINDOW (new_window), geometry); + g_free (geometry); - gtk_window_present_with_time (GTK_WINDOW (new_window), gtk_get_current_event_time ()); + gtk_window_present_with_time (GTK_WINDOW (new_window), gtk_get_current_event_time ()); } static void help_contents_callback (GtkAction *action, TerminalWindow *window) { - terminal_util_show_help (NULL, GTK_WINDOW (window)); + terminal_util_show_help (NULL, GTK_WINDOW (window)); } #define ABOUT_GROUP "About" @@ -3991,85 +3991,86 @@ static void help_about_callback (GtkAction *action, TerminalWindow *window) { - static const char copyright[] = - "Copyright © 2002–2004 Havoc Pennington\n" - "Copyright © 2003–2004, 2007 Mariano Suárez-Alvarez\n" - "Copyright © 2006 Guilherme de S. Pastore\n" - "Copyright © 2007–2010 Christian Persch\n" - "Copyright © 2011 Perberos"; - char *licence_text; - GKeyFile *key_file; - GError *error = NULL; - char **authors, **contributors, **artists, **documenters, **array_strv; - gsize n_authors = 0, n_contributors = 0, n_artists = 0, n_documenters = 0 , i; - GPtrArray *array; - - key_file = g_key_file_new (); - if (!g_key_file_load_from_file (key_file, TERM_PKGDATADIR G_DIR_SEPARATOR_S "terminal.about", 0, &error)) - { - g_warning ("Couldn't load about data: %s\n", error->message); - g_error_free (error); - g_key_file_free (key_file); - return; - } - - authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, NULL); - contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", &n_contributors, NULL); - artists = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL); - documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL); - g_key_file_free (key_file); - - array = g_ptr_array_new (); - - for (i = 0; i < n_authors; ++i) - g_ptr_array_add (array, EMAILIFY (authors[i])); - g_free (authors); /* strings are now owned by the array */ - - if (n_contributors > 0) - { - g_ptr_array_add (array, g_strdup ("")); - g_ptr_array_add (array, g_strdup (_("Contributors:"))); - for (i = 0; i < n_contributors; ++i) - g_ptr_array_add (array, EMAILIFY (contributors[i])); - } - g_free (contributors); /* strings are now owned by the array */ - - g_ptr_array_add (array, NULL); - array_strv = (char **) g_ptr_array_free (array, FALSE); - - for (i = 0; i < n_artists; ++i) - artists[i] = EMAILIFY (artists[i]); - for (i = 0; i < n_documenters; ++i) - documenters[i] = EMAILIFY (documenters[i]); - - licence_text = terminal_util_get_licence_text (); - - gtk_show_about_dialog (GTK_WINDOW (window), - "program-name", _("MATE Terminal"), - "copyright", copyright, - "comments", _("A terminal emulator for the MATE desktop"), - "version", VERSION, - "authors", array_strv, - "artists", artists, - "documenters", documenters, - "license", licence_text, - "wrap-license", TRUE, - "translator-credits", _("translator-credits"), - "logo-icon-name", MATE_TERMINAL_ICON_NAME, - NULL); - - g_strfreev (array_strv); - g_strfreev (artists); - g_strfreev (documenters); - g_free (licence_text); + static const char copyright[] = + "Copyright © 2002–2004 Havoc Pennington\n" + "Copyright © 2003–2004, 2007 Mariano Suárez-Alvarez\n" + "Copyright © 2006 Guilherme de S. Pastore\n" + "Copyright © 2007–2010 Christian Persch\n" + "Copyright © 2011 Perberos"; + char *licence_text; + GKeyFile *key_file; + GError *error = NULL; + char **authors, **contributors, **artists, **documenters, **array_strv; + gsize n_authors = 0, n_contributors = 0, n_artists = 0, n_documenters = 0 , i; + GPtrArray *array; + + key_file = g_key_file_new (); + if (!g_key_file_load_from_file (key_file, TERM_PKGDATADIR G_DIR_SEPARATOR_S "terminal.about", 0, &error)) + { + g_warning ("Couldn't load about data: %s\n", error->message); + g_error_free (error); + g_key_file_free (key_file); + return; + } + + authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, NULL); + contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", &n_contributors, NULL); + artists = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL); + documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL); + g_key_file_free (key_file); + + array = g_ptr_array_new (); + + for (i = 0; i < n_authors; ++i) + g_ptr_array_add (array, EMAILIFY (authors[i])); + g_free (authors); /* strings are now owned by the array */ + + if (n_contributors > 0) + { + g_ptr_array_add (array, g_strdup ("")); + g_ptr_array_add (array, g_strdup (_("Contributors:"))); + for (i = 0; i < n_contributors; ++i) + g_ptr_array_add (array, EMAILIFY (contributors[i])); + } + g_free (contributors); /* strings are now owned by the array */ + + g_ptr_array_add (array, NULL); + array_strv = (char **) g_ptr_array_free (array, FALSE); + + for (i = 0; i < n_artists; ++i) + artists[i] = EMAILIFY (artists[i]); + for (i = 0; i < n_documenters; ++i) + documenters[i] = EMAILIFY (documenters[i]); + + licence_text = terminal_util_get_licence_text (); + + gtk_show_about_dialog (GTK_WINDOW (window), + "program-name", _("MATE Terminal"), + "copyright", copyright, + "comments", _("A terminal emulator for the MATE desktop"), + "version", VERSION, + "authors", array_strv, + "artists", artists, + "documenters", documenters, + "license", licence_text, + "wrap-license", TRUE, + "translator-credits", _("translator-credits"), + "logo-icon-name", MATE_TERMINAL_ICON_NAME, + "website", "http://www.mate-desktop.org", + NULL); + + g_strfreev (array_strv); + g_strfreev (artists); + g_strfreev (documenters); + g_free (licence_text); } GtkUIManager * terminal_window_get_ui_manager (TerminalWindow *window) { - TerminalWindowPrivate *priv = window->priv; + TerminalWindowPrivate *priv = window->priv; - return priv->ui_manager; + return priv->ui_manager; } void @@ -4077,65 +4078,65 @@ terminal_window_save_state (TerminalWindow *window, GKeyFile *key_file, const char *group) { - TerminalWindowPrivate *priv = window->priv; - GList *tabs, *lt; - TerminalScreen *active_screen; - GdkWindowState state; - GPtrArray *tab_names_array; - char **tab_names; - gsize len; - - //XXXif (priv->menub)//XXX - g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, - priv->menubar_visible); - - g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_ROLE, - gtk_window_get_role (GTK_WINDOW (window))); - - state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); - if (state & GDK_WINDOW_STATE_MAXIMIZED) - g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_MAXIMIZED, TRUE); - if (state & GDK_WINDOW_STATE_FULLSCREEN) - g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_FULLSCREEN, TRUE); - - active_screen = terminal_window_get_active (window); - tabs = terminal_window_list_screen_containers (window); - - tab_names_array = g_ptr_array_sized_new (g_list_length (tabs) + 1); - - for (lt = tabs; lt != NULL; lt = lt->next) - { - TerminalScreen *screen; - char *tab_group; - - screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (lt->data)); - - tab_group = g_strdup_printf ("Terminal%p", screen); - g_ptr_array_add (tab_names_array, tab_group); - - terminal_screen_save_config (screen, key_file, tab_group); - - if (screen == active_screen) - { - int w, h, x, y; - char *geometry; - - g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_ACTIVE_TAB, tab_group); - - /* FIXME saving the geometry is not great :-/ */ - terminal_screen_get_size (screen, &w, &h); - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - geometry = g_strdup_printf ("%dx%d+%d+%d", w, h, x, y); - g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_GEOMETRY, geometry); - g_free (geometry); - } - } - - g_list_free (tabs); - - len = tab_names_array->len; - g_ptr_array_add (tab_names_array, NULL); - tab_names = (char **) g_ptr_array_free (tab_names_array, FALSE); - g_key_file_set_string_list (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_TABS, (const char * const *) tab_names, len); - g_strfreev (tab_names); + TerminalWindowPrivate *priv = window->priv; + GList *tabs, *lt; + TerminalScreen *active_screen; + GdkWindowState state; + GPtrArray *tab_names_array; + char **tab_names; + gsize len; + + //XXXif (priv->menub)//XXX + g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, + priv->menubar_visible); + + g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_ROLE, + gtk_window_get_role (GTK_WINDOW (window))); + + state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); + if (state & GDK_WINDOW_STATE_MAXIMIZED) + g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_MAXIMIZED, TRUE); + if (state & GDK_WINDOW_STATE_FULLSCREEN) + g_key_file_set_boolean (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_FULLSCREEN, TRUE); + + active_screen = terminal_window_get_active (window); + tabs = terminal_window_list_screen_containers (window); + + tab_names_array = g_ptr_array_sized_new (g_list_length (tabs) + 1); + + for (lt = tabs; lt != NULL; lt = lt->next) + { + TerminalScreen *screen; + char *tab_group; + + screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (lt->data)); + + tab_group = g_strdup_printf ("Terminal%p", screen); + g_ptr_array_add (tab_names_array, tab_group); + + terminal_screen_save_config (screen, key_file, tab_group); + + if (screen == active_screen) + { + int w, h, x, y; + char *geometry; + + g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_ACTIVE_TAB, tab_group); + + /* FIXME saving the geometry is not great :-/ */ + terminal_screen_get_size (screen, &w, &h); + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + geometry = g_strdup_printf ("%dx%d+%d+%d", w, h, x, y); + g_key_file_set_string (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_GEOMETRY, geometry); + g_free (geometry); + } + } + + g_list_free (tabs); + + len = tab_names_array->len; + g_ptr_array_add (tab_names_array, NULL); + tab_names = (char **) g_ptr_array_free (tab_names_array, FALSE); + g_key_file_set_string_list (key_file, group, TERMINAL_CONFIG_WINDOW_PROP_TABS, (const char * const *) tab_names, len); + g_strfreev (tab_names); } |