Merge lp:~voldyman/pantheon-terminal/parameter-at-launch into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

pantheon-terminal -x "command"

a new terminal will open and execute the "command"

multiple -x "cmd" can be used to execute multiple commands in multiple tabs

[David Gomes (davidgomes)]

""}, -> "" },
cmd [i] -> cmd[i]

New line after .diff's line 39.

[David Gomes (davidgomes)]

review: Needs Fixing

[David Gomes (davidgomes)]

Newline after diff's 22nd line.

review: Needs Fixing

[lp:~voldyman/pantheon-terminal/parameter-at-launch]

409. By Akshay Shekher on 2012-12-19

Added parameter to start command at launch.

[David Gomes (davidgomes)]

Code is all good. I already tested this and it works, but we need to talk some more about this before it gets merged.

[David Gomes (davidgomes)]

Nice job.

review: Approve

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2012-11-23 19:38:28 +0000
+++ src/PantheonTerminal.vala	2012-12-19 08:49:20 +0000
@@ -33,11 +33,13 @@
 
         static string app_cmd_name;
         static string app_shell_name;
+        [CCode (array_length = false, array_null_terminated = true)]
+        static string[]? command = null;
         static bool print_version;
 
         public int minimum_width;
         public int minimum_height;
-        
+
         construct {
             print_version = false;
             build_data_dir = Constants.DATADIR;
@@ -85,6 +87,11 @@
                     warning (e.message);
                 }
             }
+
+            if (command != null) {
+                new_window_with_command (command);
+                return;
+            }
             new_window ();
         }
 
@@ -102,9 +109,22 @@
             add_window (window);
         }
 
+        public void new_window_with_command (string[] cmd) {
+            var window = new PantheonTerminalWindow (this);
+            window.show ();
+            windows.append (window);
+            add_window (window);
+            window.exec_cmd (cmd[0]);
+
+            for (int i = 1; i < cmd.length; i++) {
+                window.new_tab_with_cmd (cmd[i]);
+            }
+        }
+
         static const OptionEntry[] entries = {
             { "shell", 's', 0, OptionArg.STRING, ref app_shell_name, N_("Set shell at launch"), "" },
             { "version", 'v', 0, OptionArg.NONE, out print_version, "Print version info and exit", null },
+            { "execute" , 'x', 0, OptionArg.STRING_ARRAY, ref command, N_("Command to execute at launch"), "" },
             { null }
         };
 

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-11-23 22:54:32 +0000
+++ src/PantheonTerminalWindow.vala	2012-12-19 08:49:20 +0000
@@ -444,6 +444,16 @@
             t.grab_focus ();
         }
 
+        public void new_tab_with_cmd (string cmd) {
+            new_tab ();
+            exec_cmd (cmd);
+        }
+
+        public void exec_cmd (string cmd) {
+            var _cmd = cmd + "\n";
+            current_terminal.feed_child (_cmd, _cmd.length);
+        }
+
         static string get_term_font () {
             string font_name;