summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gardiner <obz@gentoo.org>2004-08-18 06:57:04 +0000
committerMike Gardiner <obz@gentoo.org>2004-08-18 06:57:04 +0000
commit475e869ff9be85f59bf68a108cd512384caafeb9 (patch)
tree936dce4a689838c9b7b73dab297de1022221d7fb /x11-terms/gnome-terminal/files
parentVersion bump to 0.12. (Manifest recommit) (diff)
downloadgentoo-2-475e869ff9be85f59bf68a108cd512384caafeb9.tar.gz
gentoo-2-475e869ff9be85f59bf68a108cd512384caafeb9.tar.bz2
gentoo-2-475e869ff9be85f59bf68a108cd512384caafeb9.zip
New revision, including the text-selection algorithm patch, supplied in bug #52952
Diffstat (limited to 'x11-terms/gnome-terminal/files')
-rw-r--r--x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r11
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch52
2 files changed, 53 insertions, 0 deletions
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
new file mode 100644
index 000000000000..c2538ac851c3
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
@@ -0,0 +1 @@
+MD5 43e04260410e66e767a4b247d0af8b46 gnome-terminal-2.6.1.tar.bz2 1999378
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch
new file mode 100644
index 000000000000..2b10eb1f55ef
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch
@@ -0,0 +1,52 @@
+diff -urN gnome-terminal-2.6.1/src/terminal-screen.c gnome-terminal-2.6.1/src/terminal-screen.c
+--- gnome-terminal-2.6.1/src/terminal-screen.c 2004-05-17 19:59:47.850620000 -0700
++++ gnome-terminal-2.6.1/src/terminal-screen.c 2004-05-17 20:05:56.833560000 -0700
+@@ -1599,10 +1599,6 @@
+ terminal_widget_get_cell_size (term, &char_width, &char_height);
+
+ g_free (screen->priv->matched_string);
+- screen->priv->matched_string =
+- terminal_widget_check_match (term,
+- event->x / char_width,
+- event->y / char_height);
+ dingus_button = ((event->button == 1) || (event->button == 2));
+
+ if (dingus_button &&
+@@ -1624,20 +1620,30 @@
+ }
+
+ if (dingus_button &&
+- (event->state & GDK_CONTROL_MASK) &&
+- (screen->priv->matched_string != NULL))
++ (event->state & GDK_CONTROL_MASK))
+ {
+ gtk_widget_grab_focus (widget);
+
+- open_url (screen, screen->priv->matched_string);
+- g_free (screen->priv->matched_string);
+- screen->priv->matched_string = NULL;
+- return TRUE; /* don't do anything else such as select with the click */
++ screen->priv->matched_string =
++ terminal_widget_check_match (term,
++ event->x / char_width,
++ event->y / char_height);
++ if (screen->priv->matched_string != NULL)
++ {
++ open_url (screen, screen->priv->matched_string);
++ g_free (screen->priv->matched_string);
++ screen->priv->matched_string = NULL;
++ return TRUE; /* don't do anything else such as select with the click */
++ }
+ }
+
+ if ((event->button == 3) &&
+ !(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)))
+ {
++ screen->priv->matched_string =
++ terminal_widget_check_match (term,
++ event->x / char_width,
++ event->y / char_height);
+ terminal_screen_do_popup (screen, event);
+ return TRUE;
+ }
+