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

[Steven Vanden Branden]

keeps compability with vte3-2.90 trough vala preprocessing
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 ()

[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

[David Gomes (davidgomes)]

If Freya's not getting vte 2.91 then I really don't see the need to merge this before it. Yes, I know that Pantheon Terminal isn't just used on elementary, but honestly I'd rather just have a vte 2.91 branch and merge it in trunk after Freya when we move to the new GNOME.

However, if you guys really think we should support both vte 2.91 and the old version then all of this does look ok except for some trailing whitespace and that I'd prefer that things inside #if would be indented.

[Avi Romanoff (aroman)]

Yeah, I don't like the idea of carrying a whole bunch of idefs either. i agree with david -- trunk should be based on whatever freya ships with. no need to bend over backwards for compatibility.

review: Disapprove

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-10-01 10:36:02 +0000
@@ -38,13 +38,26 @@
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
 find_package (PkgConfig)
+pkg_check_modules (VTE vte-2.91)
+if (NOT VTE_FOUND)
 pkg_check_modules (DEPS REQUIRED
   gthread-2.0
   gtk+-3.0>=3.9.10
   granite>=0.3.0
+  libnotify
+  gdk-3.0
   vte-2.90
+)
+else (NOT VTE_FOUND)
+pkg_check_modules (DEPS REQUIRED
+  gthread-2.0
+  gtk+-3.0>=3.9.10
+  granite>=0.3.0
   libnotify
-  gdk-3.0)
+  gdk-3.0
+  vte-2.91
+)
+endif (NOT VTE_FOUND)
 
 add_definitions (${DEPS_CFLAGS})
 
@@ -61,6 +74,7 @@
 ensure_vala_version ("0.22.0" MINIMUM)
 
 include (ValaPrecompile)
+if (VTE_VERSION VERSION_LESS 0.38.0)
 vala_precompile (VALA_C
     src/DBus.vala
     src/Settings.vala
@@ -82,6 +96,30 @@
     --thread
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
 )
+else (VTE_VERSION VERSION_LESS 0.38.0)
+vala_precompile (VALA_C
+    src/DBus.vala
+    src/Settings.vala
+    src/PantheonTerminal.vala
+    src/PantheonTerminalWindow.vala
+    src/TerminalWidget.vala
+    src/ForegroundProcessDialog.vala
+    src/Constants.vala
+PACKAGES
+    vte-2.91
+    granite
+    gtk+-3.0
+    libnotify
+    gdk-3.0
+    posix
+CUSTOM_VAPIS
+    vapi/config.vapi
+OPTIONS
+    --thread
+    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
+    --define=VTE291
+)
+endif (VTE_VERSION VERSION_LESS 0.38.0)
 
 include (GSettings)
 add_schema ("org.pantheon.terminal.gschema.xml")
@@ -96,4 +134,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-10-01 10:36:02 +0000
@@ -63,7 +63,11 @@
         public string foreground { get; set; }
         public string background { get; set; }
         public string cursor_color { get; set; }
-        public Vte.TerminalCursorShape cursor_shape { get; set; }
+        #if VTE291 
+        public Vte.CursorShape cursor_shape { get; set; }
+        #else 
+        public Vte.TerminalCursorShape cursor_shape { get; set; }      
+        #endif
         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-10-01 10:36:02 +0000
@@ -99,9 +99,11 @@
         public TerminalWidget (PantheonTerminalWindow parent_window) {
 
             terminal_id = "%i".printf (terminal_id_counter++);
-
+               
+            #if !VTE291
             /* Sets characters that define word for double click selection */
             set_word_chars ("-A-Za-z0-9/.,_~#%?:=+@");
+            #endif            
 
             restore_settings ();
             settings.changed.connect (restore_settings);
@@ -175,15 +177,24 @@
         public void restore_settings () {
             /* Load configuration */
             int opacity = settings.opacity * 65535;
-            set_background_image (null);
             set_opacity ((uint16) (opacity / 100));
-
+            
+            #if VTE291
+            Gdk.RGBA background_color = Gdk.RGBA ();
+            Gdk.RGBA foreground_color = Gdk.RGBA ();
+            
+            background_color.parse (settings.background);
+            foreground_color.parse (settings.foreground);
+            #else
             Gdk.Color background_color;
             Gdk.Color.parse (settings.background, out background_color);
 
             Gdk.Color foreground_color;
             Gdk.Color.parse (settings.foreground, out foreground_color);
 
+            set_background_image (null);
+            #endif
+
             string[] hex_palette = {"#000000", "#FF6C60", "#A8FF60", "#FFFFCC", "#96CBFE",
                                     "#FF73FE", "#C6C5FE", "#EEEEEE", "#000000", "#FF6C60",
                                     "#A8FF60", "#FFFFB6", "#96CBFE", "#FF73FE", "#C6C5FE",
@@ -200,20 +211,34 @@
                     current_string += settings.palette[i].to_string ();
                 }
             }
-
+            
+            #if VTE291
+            Gdk.RGBA[] palette = new Gdk.RGBA[16];
+            #else
             Gdk.Color[] palette = new Gdk.Color[16];
+            #endif
 
             for (int i = 0; i < hex_palette.length; i++) {
+                #if VTE291
+                Gdk.RGBA new_color= Gdk.RGBA();
+                new_color.parse (hex_palette[i]);
+                #else
                 Gdk.Color new_color;
                 Gdk.Color.parse (hex_palette[i], out new_color);
-
+                #endif
                 palette[i] = new_color;
             }
-
+            
             set_colors (foreground_color, background_color, palette);
 
+            #if VTE291
+            Gdk.RGBA cursor_color = Gdk.RGBA ();
+            cursor_color.parse (settings.cursor_color);
+            #else
             Gdk.Color cursor_color;
             Gdk.Color.parse (settings.cursor_color, out cursor_color);
+            #endif            
+            
             set_color_cursor (cursor_color);
 
             /* Bold font */
@@ -271,8 +296,11 @@
             };
 
             try {
-                this.fork_command_full (Vte.PtyFlags.DEFAULT, dir, { shell },
-                                        envv, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                #if VTE291 
+                this.spawn_sync (Vte.PtyFlags.DEFAULT, dir, { shell }, envv, SpawnFlags.SEARCH_PATH, null, out this.child_pid, null);
+                #else 
+                this.fork_command_full (Vte.PtyFlags.DEFAULT, dir, { shell }, envv, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                #endif
             } catch (Error e) {
                 warning (e.message);
             }
@@ -282,9 +310,11 @@
             try {
                 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);
+                #if VTE291
+                this.spawn_sync (Vte.PtyFlags.DEFAULT, null, program_with_args, null, SpawnFlags.SEARCH_PATH, null, out this.child_pid, null);
+                #else
+                this.fork_command_full (Vte.PtyFlags.DEFAULT, null, program_with_args, null, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                #endif
             } catch (Error e) {
                 warning (e.message);
             }
@@ -295,8 +325,12 @@
                 pid = -1;
                 return false;
             }
-
+            
+            #if VTE291
+            int pty = get_pty().fd;
+            #else
             int pty = this.pty_object.fd;
+            #endif
             int fgpid = Posix.tcgetpgrp (pty);
 
             if (fgpid != this.child_pid && fgpid != -1) {