Port to Gtk4

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y desktop-file-utils gettext libgranite-dev libgtk-3-dev libhandy-1-dev libvte-2.91-dev libxml2-utils meson valac xvfb
+        apt install -y desktop-file-utils gettext libgranite-7-dev libgtk-4-dev libadwaita-1-dev libvte-2.91-gtk4-dev libxml2-utils meson valac xvfb
     - name: Build
       run: |
         meson setup build

data/Application.css

@@ -1,20 +1,7 @@
 /*
-* Copyright 2017-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License version 3, as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the
-* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-* Boston, MA 02110-1301 USA
-*/
+ * Copyright 2017-2024 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
 
 /* Make sure terminal background can use colors with alpha */
 .terminal-window.background {
@@ -43,13 +30,3 @@ vte-terminal {
     -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
 }
 
-/* Workaround Hdy.Tabbar transparent area. Remove during GTK 4 port */
-tabbar .box {
-    margin: 0;
-    padding-top: 2px;
-}
-
-/* Workaround for context menu styles. Remove during GTK4 port */
-menu {
-    font: initial;
-}

meson.build

@@ -1,7 +1,7 @@
 project(
     'io.elementary.terminal',
     'vala', 'c',
-    version: '6.2.0',
+    version: '7.0.0',
     meson_version: '>=0.60'
 )
 
@@ -15,18 +15,10 @@ endif
 gnome = import('gnome')
 i18n = import('i18n')
 
-glib_version = '>=2.40'
-
-glib_dep = dependency('glib-2.0', version: glib_version)
-gobject_dep = dependency('gobject-2.0', version: glib_version)
-gio_dep = dependency('gio-2.0', version: glib_version)
-gee_dep = dependency('gee-0.8')
-gtk_dep = dependency('gtk+-3.0', version: '>=3.24')
-granite_dep = dependency('granite', version: '>=6.1')
-handy_dep = dependency('libhandy-1', version: '>=0.83')
-vte_dep = dependency('vte-2.91', version: '>=0.59')
-pcre2_dep = dependency('libpcre2-8')
-
+granite_dep = dependency('granite-7', version: '>=7.5')
+adwaita_dep = dependency('libadwaita-1', version: '>=1.5')
+vte_dep = dependency('vte-2.91-gtk4', version: '>=0.76')
+pcre2_dep = dependency('libpcre2-8', version: '>=10.4') # Perl Regular Expression library
 posix_dep = valac.find_library('posix')
 linux_dep = valac.find_library('linux', required: false)
 m_dep = cc.find_library('m', required : false)
@@ -43,9 +35,9 @@ add_project_arguments(
     language: 'vala'
 )
 
-if glib_dep.version().version_compare('>=2.73.2')
+# if glib_dep.version().version_compare('>=2.73.2')
     add_project_arguments('--define', 'HAS_GLIB_2_74', language: 'vala')
-endif
+# endif
 
 if linux_dep.found()
     add_project_arguments('--define', 'HAS_LINUX', language: 'vala')
@@ -54,7 +46,7 @@ endif
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
     '-DPCRE2_CODE_UNIT_WIDTH=0',
-    '-DHANDY_USE_UNSTABLE_API',
+    # '-DHANDY_USE_UNSTABLE_API',
     language:'c'
 )
 

src/Application.vala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 elementary, Inc. (https://elementary.io)
+ * Copyright 2011-2024 elementary, Inc. (https://elementary.io)
  * SPDX-License-Identifier: LGPL-3.0-only
  */
 
@@ -46,17 +46,8 @@ public class Terminal.Application : Gtk.Application {
                 }
             }
 
-            // This is a hack to avoid using Gdk-Xii dependency.  Using present_with_time ()
-            // with the current event time does not work either on X11 or Wayland perhaps
-            // because the triggering event did not occur on the Terminal window?
-            // Using set_keep_above () at least works on X11 but not on Wayland
-            //TODO It may well be possible to use present () on Gtk4 so this needs revisiting
-            window_to_present.set_keep_above (true);
-            window_to_present.present ();
-            window_to_present.grab_focus ();
             Idle.add (() => {
-                window_to_present.set_keep_above (false);
-                return Source.REMOVE;
+                window_to_present.present ();
             });
         });
 
@@ -196,7 +187,7 @@ public class Terminal.Application : Gtk.Application {
                 terminal.tab.icon = process_icon;
             }
 
-            if (!(Gdk.WindowState.FOCUSED in terminal.main_window.get_window ().get_state ())) {
+            if (!get_active_window ().is_active) {
                 var notification = new Notification (process_string);
                 notification.set_body (process);
                 notification.set_icon (process_icon);
@@ -210,7 +201,8 @@ public class Terminal.Application : Gtk.Application {
 
     protected override void startup () {
         base.startup ();
-        Hdy.init ();
+        Granite.init ();
+        Adw.init ();
 
         saved_state = new GLib.Settings ("io.elementary.terminal.saved-state");
         settings = new GLib.Settings ("io.elementary.terminal.settings");
@@ -224,8 +216,8 @@ public class Terminal.Application : Gtk.Application {
          * https://gitlab.gnome.org/GNOME/vte/blob/0.68.0/src/vtegtk.cc#L844-847
          * To be able to overwrite their styles, we need to use +1.
          */
-        Gtk.StyleContext.add_provider_for_screen (
-            Gdk.Screen.get_default (),
+        Gtk.StyleContext.add_provider_for_display (
+            Gdk.Display.get_default (),
             provider,
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1
         );
@@ -243,16 +235,6 @@ public class Terminal.Application : Gtk.Application {
 
         set_accels_for_action ("app.new-window", { "<Control><Shift>N" });
         set_accels_for_action ("app.quit", { "<Control><Shift>Q" });
-
-        set_accels_for_action (TerminalWidget.ACTION_COPY, TerminalWidget.ACCELS_COPY);
-        set_accels_for_action (TerminalWidget.ACTION_COPY_OUTPUT, TerminalWidget.ACCELS_COPY_OUTPUT);
-        set_accels_for_action (TerminalWidget.ACTION_PASTE, TerminalWidget.ACCELS_PASTE);
-        set_accels_for_action (TerminalWidget.ACTION_RELOAD, TerminalWidget.ACCELS_RELOAD);
-        set_accels_for_action (TerminalWidget.ACTION_SCROLL_TO_COMMAND, TerminalWidget.ACCELS_SCROLL_TO_COMMAND);
-        set_accels_for_action (TerminalWidget.ACTION_SELECT_ALL, TerminalWidget.ACCELS_SELECT_ALL);
-        set_accels_for_action (TerminalWidget.ACTION_ZOOM_DEFAULT, TerminalWidget.ACCELS_ZOOM_DEFAULT);
-        set_accels_for_action (TerminalWidget.ACTION_ZOOM_IN, TerminalWidget.ACCELS_ZOOM_IN);
-        set_accels_for_action (TerminalWidget.ACTION_ZOOM_OUT, TerminalWidget.ACCELS_ZOOM_OUT);
     }
 
     protected override int command_line (ApplicationCommandLine command_line) {
@@ -288,38 +270,28 @@ public class Terminal.Application : Gtk.Application {
             window.add_tab_with_working_directory (working_directory, null, new_tab);
         }
 
-        //TODO In Gtk4 we can just bind the settings to first window properties
-        // instead of this function
-        restore_saved_state (window, is_first_window);
-
         if (options.lookup ("minimized", "b", out minimized) && minimized) {
-            window.iconify ();
+            window.minimize ();
         } else {
             window.present ();
         }
-        return 0;
-    }
-
-    private void restore_saved_state (Gtk.Window window, bool is_first_window) {
-        window.resize (
-            Application.saved_state.get_int ("window-width"),
-            Application.saved_state.get_int ("window-height")
-        );
-
-        if (Application.saved_state.get_boolean ("is-maximized")) {
-            window.maximize ();
-        }
 
         if (is_first_window) {
-            window.size_allocate.connect ((alloc) => {
-                if (!window.is_maximized) {
-                    Application.saved_state.set_int ("window-width", alloc.width);
-                    Application.saved_state.set_int ("window-height", alloc.height);
-                }
+            /*
+            * This is very finicky. Bind size after present else set_titlebar gives us bad sizes
+            * Set maximize after height/width else window is min size on unmaximize
+            * Bind maximize as SET else get get bad sizes
+            */
+            saved_state.bind ("window-height", window, "default-height", SettingsBindFlags.DEFAULT);
+            saved_state.bind ("window-width", window, "default-width", SettingsBindFlags.DEFAULT);
+
+            if (saved_state.get_boolean ("is-maximized")) {
+                window.maximize ();
+            }
 
-                Application.saved_state.set_boolean ("is-maximized", window.is_maximized);
-            });
+            saved_state.bind ("is-maximized", window, "maximized", SettingsBindFlags.SET);
         }
+        return 0;
     }
 
     protected override void dbus_unregister (DBusConnection connection, string path) {