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

[Akshay Shekher]

kill child process (bash) and its children when the tab is closed.

[Rico Tzschichholz (ricotz)]

try to use something like "bool try_get_foreground_process (out int pid)" instead of getting the pid twice

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

242. By Akshay Shekher on 2012-07-13

foreground pid is fetched only once.

243. By Akshay Shekher on 2012-07-13

kill bash and foreground process

244. By Akshay Shekher on 2012-07-13

Neatness check

245. By Akshay Shekher on 2012-07-13

Even more neatness

[David Gomes (davidgomes)]

Approved, nice job.

review: Approve

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-07-13 10:43:10 +0000
+++ src/PantheonTerminalWindow.vala	2012-07-13 11:49:25 +0000
@@ -247,12 +247,14 @@
                     var d = new ForegroundProcessDialog ();
                     if (d.run () == 1) {
                         notebook.remove (g);
+                        t.kill_ps_and_fg ();
                         terminals.remove (t);
                     }
                     d.destroy ();
                 }
                 else {
                     notebook.remove (g);
+                    t.kill_ps ();
                     terminals.remove (t);
                 }
             });

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2012-05-17 18:29:15 +0000
+++ src/TerminalWidget.vala	2012-07-13 11:49:25 +0000
@@ -25,7 +25,6 @@
     public class TerminalWidget : Vte.Terminal {
 
         GLib.Pid child_pid;
-
         private PantheonTerminalWindow window;
         public TerminalTab tab;
 
@@ -53,10 +52,20 @@
 
             /* Connect to necessary signals */
             child_exited.connect (on_child_exited);
-
         }
 
         void on_child_exited () { }
+        
+        public void kill_ps () {
+            Posix.kill (this.child_pid, 9);
+        }
+        
+        public void kill_ps_and_fg () {
+            int fg_pid;
+            if (this.try_get_foreground_pid (out fg_pid))
+                Posix.kill (fg_pid, 9);
+            kill_ps ();
+        }
 
         public void active_shell (string dir = GLib.Environment.get_current_dir ()) {
             try {
@@ -66,12 +75,24 @@
             }
         }
 
+        public bool try_get_foreground_pid (out int pid) {
+            int pty = this.pty_object.fd;
+            int fgpid = Posix.tcgetpgrp (pty);
+            if (fgpid != this.child_pid && fgpid != -1) {
+                pid = (int) fgpid;
+                return true;
+            }
+            else {
+                pid = -1;
+                return false;
+            }
+        } 
+
         public bool has_foreground_process () {
-            int pty = this.pty_object.fd;
-            int fgpid = Posix.tcgetpgrp(pty);
-            return fgpid != this.child_pid && fgpid != -1;
+            return try_get_foreground_pid (null);
         }
 
+
         public int calculate_width (int column_count) {
             return (int) (this.get_char_width()) * column_count;
         }
@@ -86,4 +107,4 @@
 
     }
 
-}
+}
\ No newline at end of file