gnome-terminal r2950 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Mon Jul  7 20:54:09 2008
New Revision: 2950
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2950&view=rev

Log:
Add context menu on tab labels. Bug #153521, base on a patch by Maxim Ermilov with code adapted from Epiphany.


Modified:
   trunk/src/terminal-window.c
   trunk/src/terminal.xml

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Mon Jul  7 20:54:09 2008
@@ -87,7 +87,7 @@
 
 #define STOCK_NEW_WINDOW  "tab-new"
 #define STOCK_NEW_TAB     "window-new"
- 
+
 static void terminal_window_init        (TerminalWindow      *window);
 static void terminal_window_class_init  (TerminalWindowClass *klass);
 static void terminal_window_dispose     (GObject             *object);
@@ -99,8 +99,13 @@
                                               GdkEvent *event,
                                               gpointer data);
 
+static gboolean notebook_button_press_cb     (GtkWidget *notebook,
+                                              GdkEventButton *event,
+                                              TerminalWindow *window);
+static gboolean notebook_popup_menu_cb       (GtkWidget *notebook,
+                                              TerminalWindow *window);
 static void notebook_page_selected_callback  (GtkWidget       *notebook,
-                                              GtkNotebookPage *useless_crap,
+                                              GtkNotebookPage *page,
                                               guint            page_num,
                                               TerminalWindow  *window);
 static void notebook_page_added_callback     (GtkWidget       *notebook,
@@ -261,6 +266,102 @@
   return g_string_free (escaped_name, FALSE);
 }
 
+static int
+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;
+
+  tab_pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (notebook));
+
+  if (GTK_NOTEBOOK (notebook)->first_tab == NULL)
+    return -1;
+
+  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);
+
+      if (!GTK_WIDGET_MAPPED (GTK_WIDGET (tab)))
+        {
+          page_num++;
+          continue;
+        }
+
+      gdk_window_get_origin (tab->window, &x_root, &y_root);
+
+      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_LEFT || tab_pos == GTK_POS_RIGHT) && screen_y <= max_y)
+        return page_num;
+
+      page_num++;
+    }
+
+  return -1;
+}
+
+static void
+position_menu_under_widget (GtkMenu *menu,
+                            int *x,
+                            int *y,
+                            gboolean *push_in,
+                            gpointer user_data)
+{
+  /* Adapted from gtktoolbar.c */
+  GtkWidget *widget = GTK_WIDGET (user_data);
+  GtkWidget *container;
+  GtkRequisition req;
+  GtkRequisition menu_req;
+  GdkRectangle monitor;
+  int monitor_num;
+  GdkScreen *screen;
+
+  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_NO_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)
@@ -1235,6 +1336,7 @@
       { "Tabs", NULL, N_("_Tabs") },
       { "Help", NULL, N_("_Help") },
       { "Popup", NULL, NULL },
+      { "NotebookPopup", NULL, "" },
 
       /* File menu */
       { "FileNewWindow", STOCK_NEW_WINDOW, N_("Open _Terminal"), "<shift><control>N",
@@ -1419,7 +1521,11 @@
   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);                                      
+                               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",
@@ -2132,6 +2238,75 @@
   return priv->active_screen;
 }
 
+static gboolean
+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;
+
+  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 == -1)
+    /* consume event, so that we don't pop up the context menu when
+     * the mouse if not over a tab label
+     */
+    return TRUE;
+
+  /* switch to the page the mouse is over, but don't consume the event */
+  gtk_notebook_set_current_page (notebook, tab_clicked);
+
+  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);
+
+  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;
+}
+
 static void
 notebook_page_selected_callback (GtkWidget       *notebook,
                                  GtkNotebookPage *useless_crap,

Modified: trunk/src/terminal.xml
==============================================================================
--- trunk/src/terminal.xml	(original)
+++ trunk/src/terminal.xml	Mon Jul  7 20:54:09 2008
@@ -82,4 +82,12 @@
     <separator />
     <menuitem action="PopupInputMethods" />
   </popup>
+  <popup name="NotebookPopup" action="NotebookPopup">
+    <menuitem action="TabsMoveLeft"/>
+    <menuitem action="TabsMoveRight"/>
+    <separator />
+    <menuitem action="TerminalSetTitle" />
+    <separator />
+    <menuitem action="FileCloseTab"/>
+  </popup>  
 </ui>