Merge lp:~voldyman/pantheon-terminal/fixed-1028594 into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

Added support for link clicking

[Victor Martinez (victored)]

Your fix works perfectly here Akshay.

It'd be better if you used "else if" in line 31, and Gtk.BUTTON_PRIMARY instead of "1", but these are negligible issues.

review: Approve

[Victor Martinez (victored)]

Correction: Gdk.BUTTON_PRIMARY

[lp:~voldyman/pantheon-terminal/fixed-1028594]

274. By Akshay Shekher on 2012-07-28

Using SwitchCase Instead of multiple if's

275. By Akshay Shekher on 2012-07-28

Using Gdk.BUTTON_PRIMARY/SECONDARY

[David Gomes (davidgomes)]

Empty newlines 48 and 76 should be removed, also:

private extern string? vte_terminal_match_check (Vte.Terminal terminal,

 long col, long row,

 out int tag);

Lines 10, 11, 12 should look like that, an alignment to the passed
arguments is necessary.

Other than that, looks fine. Fix that and it's ready for trunk.

--
David Gomes

[Akshay Shekher (voldyman)]

Match_check does not work for valac<0.17.2

On 28-Jul-2012, at 7:19 PM, David Gomes <email address hidden> wrote:

> Empty newlines 48 and 76 should be removed, also:
>
> private extern string? vte_terminal_match_check (Vte.Terminal terminal,
>
> long col, long row,
>
> out int tag);
>
> Lines 10, 11, 12 should look like that, an alignment to the passed
> arguments is necessary.
>
> Other than that, looks fine. Fix that and it's ready for trunk.
>
> --
> David Gomes
>
> --
> https://code.launchpad.net/~voldyman/pantheon-terminal/fixed-1028594/+merge/117115
> You are the owner of lp:~voldyman/pantheon-terminal/fixed-1028594.

[Rico Tzschichholz (ricotz)]

Use "#if !VALA_0_18" to guard your custom bindings to only use them when they are needed

[lp:~voldyman/pantheon-terminal/fixed-1028594]

276. By Akshay Shekher on 2012-07-29

vte_terminal_match_check and using this.match_check

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-07-26 13:37:17 +0000
+++ src/PantheonTerminalWindow.vala	2012-07-29 05:49:21 +0000
@@ -160,7 +160,7 @@
             add (notebook);
             this.key_press_event.connect ((e) => {
                 switch (e.keyval){
-                    case 49: //ctrl+[1-8]
+                    case 49: //alt+[1-8]
                     case 50:
                     case 51:
                     case 52:

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2012-07-26 13:37:17 +0000
+++ src/TerminalWidget.vala	2012-07-29 05:49:21 +0000
@@ -37,9 +37,22 @@
             menu.show_all ();
 
             button_press_event.connect ((event) => {
-                if (event.button == 3) {
-                    menu.select_first (false);
-                    menu.popup (null, null, null, event.button, event.time);
+                switch (event.button) {
+                    case Gdk.BUTTON_PRIMARY:
+                        string? uri = get_link ((long)event.x, (long)event.y);
+                        if (uri != null) {
+                            try {
+                                Gtk.show_uri (null, (!)uri, Gtk.get_current_event_time());
+                                return true;
+                            } catch (GLib.Error error) {
+                                warning ("Could Not Open link");
+                            }
+                        }
+                        return false;
+                    case Gdk.BUTTON_SECONDARY :
+                        menu.select_first (false);
+                        menu.popup (null, null, null, event.button, event.time);
+                        return true;
                 }
                 return false;
             });
@@ -56,6 +69,9 @@
             Gtk.TargetEntry target = {"text/uri-list",0,0};
             Gtk.drag_dest_set (this, Gtk.DestDefaults.ALL,{target},Gdk.DragAction.COPY);
 
+            /*Make Links Clickable */
+            this.clickable("""(https?|ftps?)://\S+""");
+
         }
 
         void on_child_exited () { }
@@ -105,6 +121,27 @@
             return (int) (this.get_char_height()) * row_count;
         }
 
+        private void clickable (string str) {
+            try {
+                var regex = new GLib.Regex (str);
+                int id = this.match_add_gregex (regex, 0);
+
+                this.match_set_cursor_type (id, Gdk.CursorType.HAND2);
+            } catch (GLib.RegexError error) {
+                warning (error.message);
+            }
+        }
+
+        private string? get_link (long x, long y) {
+            long col = x / this.get_char_width ();
+            long row = y / this.get_char_height ();
+            int tag;
+
+            // Vte.Terminal.match_check need a non-null tag instead of what is
+            // written in the doc
+            // (see: https://bugzilla.gnome.org/show_bug.cgi?id=676886)
+            return this.match_check(col, row, out tag);
+
+        }
     }
-
 }