Build as Flatpak

.github/workflows/ci.yml

@@ -8,28 +8,38 @@ on:
       - synchronize
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  flatpak:
+    name: Flatpak (${{ matrix.configuration.arch }})
+    runs-on: ${{ matrix.configuration.runs-on }}
 
     strategy:
-      fail-fast: false
       matrix:
-        version: [stable, unstable, development-target]
+        configuration:
+          - arch: x86_64
+            runs-on: ubuntu-latest
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
     container:
-      image: ghcr.io/elementary/docker:${{ matrix.version }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }}
+      options: --privileged
 
     steps:
-    - uses: actions/checkout@v5
-    - 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
-    - name: Build
-      run: |
-        meson setup build
-        meson compile -C build
-        meson test -C build --print-errorlogs
-        meson install -C build
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Build
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.5
+        with:
+          bundle: terminal.flatpak
+          manifest-path: io.elementary.terminal.yml
+          run-tests: true
+          repository-name: appcenter
+          repository-url: https://flatpak.elementary.io/repo.flatpakrepo
+          cache-key: "flatpak-builder-${{ github.sha }}"
+          arch: ${{ matrix.configuration.arch }}
 
   lint:
     runs-on: ubuntu-latest

.gitignore

@@ -1,2 +1,4 @@
 *~
 build/
+.flatpak/
+.flatpak-builder

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 {
@@ -31,7 +18,6 @@ vte-terminal {
 }
 
 .color-button radio {
-    padding: 10px;
     -gtk-icon-shadow: none;
 }
 
@@ -43,13 +29,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;
-}

data/io.elementary.terminal.gschema.xml

@@ -17,15 +17,20 @@
   </enum>
 
   <schema path="/io/elementary/terminal/saved-state/" id="io.elementary.terminal.saved-state">
-    <key name="window-size" type="(ii)">
-      <default>(600, 400)</default>
-      <summary>Most recent window size</summary>
-      <description>Most recent window size (width, height)</description>
-    </key>
-    <key name="window-state" enum="pantheon-terminal-window-states">
-      <default>"Normal"</default>
-      <summary>The saved state of the window.</summary>
-      <description>The saved state of the window.</description>
+    <key name="window-height" type="i">
+      <default>700</default>
+      <summary>Most recent window height</summary>
+      <description>Most recent window height</description>
+    </key>
+    <key name="window-width" type="i">
+      <default>1024</default>
+      <summary>Most recent window width</summary>
+      <description>Most recent window width</description>
+    </key>
+    <key name="is-maximized" type="b">
+      <default>false</default>
+      <summary>Whether window is maximized</summary>
+      <description>Whether the main application window is maximized or not</description>
     </key>
     <key name="tabs" type="as">
       <default>[]</default>

data/meson.build

@@ -21,7 +21,7 @@ i18n.merge_file(
 
 i18n.merge_file(
     input: 'terminal.metainfo.xml.in',
-    output: meson.project_name() + '.metainfo.xml',
+    output: '@BASENAME', # Must use @BASENAME@ else flatpak build fails
     po_dir: podir / 'extra',
     install: true,
     install_dir: datadir / 'metainfo'

io.elementary.terminal.yml

@@ -0,0 +1,50 @@
+app-id: io.elementary.terminal
+runtime: io.elementary.Platform
+runtime-version: '8.1'
+sdk: io.elementary.Sdk
+command: io.elementary.terminal
+
+finish-args:
+  - '--metadata=X-DConf=migrate-path=/io/elementary/terminal/'
+  - '--allow=devel'
+  - '--filesystem=host'
+  - '--filesystem=xdg-run/gvfsd'
+  - '--share=ipc'
+  - '--share=network'
+  - '--socket=fallback-x11'
+  - '--socket=wayland'
+  - '--socket=session-bus'
+  - '--device=all'
+  - '--talk-name=org.freedesktop.Flatpak'
+
+cleanup:
+  - '/include'
+  - '/lib/pkgconfig'
+  - '/lib/cmake'
+  - '/lib/girepository-1.0'
+  - '/share/gir-1.0'
+  - '/share/vala'
+  - '*.a'
+  - '*.la'
+
+build-options:
+  libdir: /app/lib
+
+modules:
+  - name: vte
+    buildsystem: meson
+    config-opts:
+      - '-Dgtk4=true'
+      - '-Dgtk3=false'
+    sources:
+      - type: archive
+        url: https://download.gnome.org/sources/vte/0.76/vte-0.76.6.tar.xz
+        sha256: 9ac739ad73b63e109269088a6d27029b6d45700b0993977c1e00ed1bcb1a3d39
+
+  - name: terminal
+    buildsystem: meson
+    sources:
+      - type: dir
+        path: .
+    run-tests: true
+

meson.build

@@ -15,18 +15,16 @@ endif
 gnome = import('gnome')
 i18n = import('i18n')
 
-glib_version = '>=2.40'
-
+glib_version = '>=2.50'
 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')
-
+gtk_dep = dependency('gtk4', version: '>=4.1')
+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)
@@ -54,7 +52,6 @@ endif
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
     '-DPCRE2_CODE_UNIT_WIDTH=0',
-    '-DHANDY_USE_UNSTABLE_API',
     language:'c'
 )
 

src/Application.vala

@@ -16,8 +16,13 @@ public class Terminal.Application : Gtk.Application {
 
     public bool is_testing { get; set construct; }
 
+    public static bool is_running_in_flatpak;
     private static Themes themes;
 
+    static construct {
+        is_running_in_flatpak = FileUtils.test ("/.flatpak-info", FileTest.IS_REGULAR);
+    }
+
     public Application () {
         Object (
             application_id: "io.elementary.terminal", /* Ensures only one instance runs */
@@ -224,7 +229,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");
@@ -238,8 +244,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
         );
@@ -269,16 +275,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) {
@@ -315,10 +311,27 @@ public class Terminal.Application : Gtk.Application {
         }
 
         if (options.lookup ("minimized", "b", out minimized) && minimized) {
-            window.iconify ();
+            window.minimize ();
         } else {
             window.present ();
         }
+
+        if (is_first_window) {
+            /*
+            * 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 ();
+            }
+
+            saved_state.bind ("is-maximized", window, "maximized", SettingsBindFlags.SET);
+        }
+
         return 0;
     }