Merge lp:~stevenvandenbrandenstift/pantheon-terminal/fix-1375346 into lp:~elementary-apps/pantheon-terminal/trunk

[Steven Vanden Branden]

Update for Vte 2.91

updates the (to be) deprecated Gdk.Color to Gdk.RGBA
Update for Vte 2.91

[Cody Garver (codygarver)]

Remove commented out code and fix code style violations, function() should be function ()

[lp:~stevenvandenbrandenstift/pantheon-terminal/fix-1375346]

642. By Steven Vanden Branden on 2014-09-30

fix coding style

643. By Steven Vanden Branden on 2014-09-30

remove new for structs

[Steven Vanden Branden (stevenvandenbrandenstift)]

> Remove commented out code and fix code style violations, function() should be
> function ()

should all be fixed now, thanks

[Rico Tzschichholz (ricotz)]

I can't speak for the maintainer of pantheon-terminal, but this should not be done like that.

Imo the support for vte2.91 *must* be conditional and vte2.90 support needs to be preserved. Also keeping in mind that Freya won't receive vte2.91.

[Steven Vanden Branden (stevenvandenbrandenstift)]

owk i forget to adjust that. i will adjust it so it uses vte version 2.90 or higher

[lp:~stevenvandenbrandenstift/pantheon-terminal/fix-1375346]

644. By Steven Vanden Branden on 2014-10-01

fix backwards compability

Unmerged revisions

644. By Steven Vanden Branden on 2014-10-01

fix backwards compability

643. By Steven Vanden Branden on 2014-09-30

remove new for structs

642. By Steven Vanden Branden on 2014-09-30

fix coding style

641. By Steven Vanden Branden on 2014-09-30

fix for vte 2.91

640. By Steven Vanden Branden on 2014-09-30

fix background and foreground colors

639. By Steven Vanden Branden on 2014-09-30

change deprecated fork_all with spawn_async

638. By Steven Vanden Branden on 2014-09-30

change Color to RGBA + remove obsolete background setting

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-31 21:13:28 +0000
+++ CMakeLists.txt	2014-09-30 18:33:49 +0000
@@ -42,7 +42,7 @@
   gthread-2.0
   gtk+-3.0>=3.9.10
   granite>=0.3.0
-  vte-2.90
+  vte-2.91
   libnotify
   gdk-3.0)
 
@@ -70,7 +70,7 @@
     src/ForegroundProcessDialog.vala
     src/Constants.vala
 PACKAGES
-    vte-2.90
+    vte-2.91
     granite
     gtk+-3.0
     libnotify
@@ -96,4 +96,4 @@
 install (TARGETS pantheon-terminal RUNTIME DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-terminal.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/open-pantheon-terminal-here.desktop DESTINATION share/applications)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/enable-zsh-completion-notifications DESTINATION share/pantheon-terminal)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/enable-zsh-completion-notifications DESTINATION share/pantheon-terminal)
\ No newline at end of file

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-08-05 23:31:01 +0000
+++ src/Settings.vala	2014-09-30 18:33:49 +0000
@@ -63,7 +63,7 @@
         public string foreground { get; set; }
         public string background { get; set; }
         public string cursor_color { get; set; }
-        public Vte.TerminalCursorShape cursor_shape { get; set; }
+        public Vte.CursorShape cursor_shape { get; set; }
         public string palette { get; set; }
 
         public string shell { get; set; }

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2014-08-08 07:11:29 +0000
+++ src/TerminalWidget.vala	2014-09-30 18:33:49 +0000
@@ -100,9 +100,6 @@
 
             terminal_id = "%i".printf (terminal_id_counter++);
 
-            /* Sets characters that define word for double click selection */
-            set_word_chars ("-A-Za-z0-9/.,_~#%?:=+@");
-
             restore_settings ();
             settings.changed.connect (restore_settings);
 
@@ -175,14 +172,13 @@
         public void restore_settings () {
             /* Load configuration */
             int opacity = settings.opacity * 65535;
-            set_background_image (null);
             set_opacity ((uint16) (opacity / 100));
 
-            Gdk.Color background_color;
-            Gdk.Color.parse (settings.background, out background_color);
+            Gdk.RGBA background_color = Gdk.RGBA ();
+            Gdk.RGBA foreground_color = Gdk.RGBA ();
 
-            Gdk.Color foreground_color;
-            Gdk.Color.parse (settings.foreground, out foreground_color);
+            background_color.parse (settings.background);
+            foreground_color.parse (settings.foreground);
 
             string[] hex_palette = {"#000000", "#FF6C60", "#A8FF60", "#FFFFCC", "#96CBFE",
                                     "#FF73FE", "#C6C5FE", "#EEEEEE", "#000000", "#FF6C60",
@@ -201,19 +197,18 @@
                 }
             }
 
-            Gdk.Color[] palette = new Gdk.Color[16];
+            Gdk.RGBA[] palette = new Gdk.RGBA[16];
 
             for (int i = 0; i < hex_palette.length; i++) {
-                Gdk.Color new_color;
-                Gdk.Color.parse (hex_palette[i], out new_color);
-
+                Gdk.RGBA new_color= Gdk.RGBA();
+                new_color.parse (hex_palette[i]);
                 palette[i] = new_color;
             }
 
             set_colors (foreground_color, background_color, palette);
 
-            Gdk.Color cursor_color;
-            Gdk.Color.parse (settings.cursor_color, out cursor_color);
+            Gdk.RGBA cursor_color = Gdk.RGBA ();
+            cursor_color.parse (settings.cursor_color);
             set_color_cursor (cursor_color);
 
             /* Bold font */
@@ -271,8 +266,8 @@
             };
 
             try {
-                this.fork_command_full (Vte.PtyFlags.DEFAULT, dir, { shell },
-                                        envv, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                this.spawn_sync (Vte.PtyFlags.DEFAULT, dir, { shell },
+                                        envv, SpawnFlags.SEARCH_PATH, null, out this.child_pid, null);
             } catch (Error e) {
                 warning (e.message);
             }
@@ -283,8 +278,8 @@
                 string[]? program_with_args = null;
                 Shell.parse_argv (program_string, out program_with_args);
 
-                this.fork_command_full (Vte.PtyFlags.DEFAULT, null, program_with_args,
-                                        null, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                this.spawn_sync (Vte.PtyFlags.DEFAULT, null, program_with_args,
+                                        null, SpawnFlags.SEARCH_PATH, null, out this.child_pid, null);
             } catch (Error e) {
                 warning (e.message);
             }
@@ -296,7 +291,7 @@
                 return false;
             }
 
-            int pty = this.pty_object.fd;
+            int pty = get_pty().fd;
             int fgpid = Posix.tcgetpgrp (pty);
 
             if (fgpid != this.child_pid && fgpid != -1) {