Merge branch 'main' into lenemter/use-glib-once

lenemter · web-flow · commit 96d0e969ce29 · 2025-09-24T12:38:42.000+03:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc
+        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc
     - name: Build
       env:
         DESTDIR: out
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
-          dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel libcanberra-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
+          dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
       - name: Build
         env:
           DESTDIR: out
@@ -69,7 +69,7 @@ jobs:
         run: |
           zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
           zypper --gpg-auto-import-keys refresh
-          zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 libcanberra-devel clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
+          zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
       - uses: actions/checkout@v5
       - name: Build
         env:
diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ A window & compositing manager based on libmutter and designed by elementary for
 You'll need the following dependencies:
 * gettext (>= 0.19.6)
 * gsettings-desktop-schemas-dev
-* libcanberra-dev
 * libclutter-1.0-dev (>= 1.12.0)
 * libgee-0.8-dev
 * libglib2.0-dev (>= 2.74)
diff --git a/docs/meson.build b/docs/meson.build
@@ -20,7 +20,6 @@ basic_command = [
     '--pkg', 'gio-unix-2.0',
     '--pkg', 'gmodule-2.0',
     '--pkg', 'posix',
-    '--pkg', 'libcanberra',
     '--pkg', 'sqlite3',
     '--pkg', 'libsystemd',
     '--pkg', 'granite',
diff --git a/lib/CloseButton.vala b/lib/CloseButton.vala
@@ -51,7 +51,7 @@ public class Gala.CloseButton : Clutter.Actor {
         if (close_pixbufs[height] == null) {
             try {
                 close_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale (
-                    Config.RESOURCEPATH + "/buttons/close.svg",
+                    "/org/pantheon/desktop/gala/buttons/close.svg",
                     -1,
                     height,
                     true
diff --git a/lib/Utils.vala b/lib/Utils.vala
@@ -357,7 +357,7 @@ namespace Gala {
             if (resize_pixbufs[height] == null) {
                 try {
                     resize_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale (
-                        Config.RESOURCEPATH + "/buttons/resize.svg",
+                        "/org/pantheon/desktop/gala/buttons/resize.svg",
                         -1,
                         height,
                         true
diff --git a/lib/meson.build b/lib/meson.build
@@ -71,9 +71,5 @@ pkg.generate(
     name: 'Gala',
     description: 'Library to develop plugins for Gala',
     subdirs: 'gala',
-    requires: [glib_dep, gobject_dep, gio_dep, gio_unix_dep, libmutter_dep],
-    variables: [
-        'datarootdir=${prefix}/@0@'.format(get_option('datadir')),
-        'pkgdatadir=${datarootdir}/gala'
-    ]
+    requires: [glib_dep, gobject_dep, gio_dep, gio_unix_dep, libmutter_dep]
 )
diff --git a/meson.build b/meson.build
@@ -5,8 +5,6 @@ project('gala',
     license: 'GPL3',
 )
 
-is_release = false
-
 gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
@@ -18,16 +16,11 @@ vapi_dir = meson.current_source_dir() / 'vapi'
 locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
 data_dir = join_paths(get_option('prefix'), get_option('datadir'))
 plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
-pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
-pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
 
 conf = configuration_data()
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('LOCALEDIR', locale_dir)
-conf.set_quoted('DATADIR', data_dir)
-conf.set_quoted('PKGDATADIR', pkgdata_dir)
 conf.set_quoted('PLUGINDIR', plugins_dir)
-conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
 conf.set_quoted('VERSION', meson.project_version())
 config_h = configure_file(
     output: 'config.h',
@@ -41,9 +34,6 @@ config_dep = declare_dependency(
 
 config_inc_dir = include_directories('.')
 
-customconf = configuration_data()
-customconf.set('GETTEXT_PACKAGE', meson.project_name())
-
 add_project_arguments([
         '--target-glib=2.44',
         '--hide-internal',
@@ -73,7 +63,6 @@ glib_version_required = '2.74.0'
 gtk_version_required = '3.10.0'
 
 atk_bridge_dep = dependency('atk-bridge-2.0')
-canberra_dep = dependency('libcanberra')
 glib_dep = dependency('glib-2.0', version: '>= @0@'.format(glib_version_required))
 gobject_dep = dependency('gobject-2.0', version: '>= @0@'.format(glib_version_required))
 gio_dep = dependency('gio-2.0', version: '>= @0@'.format(glib_version_required))
@@ -169,7 +158,7 @@ endif
 add_project_arguments(vala_flags, language: 'vala')
 add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
 
-gala_base_dep = [atk_bridge_dep, canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep]
+gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep]
 
 if get_option('systemd')
     gala_base_dep += systemd_dep
diff --git a/plugins/pip/SelectionArea.vala b/plugins/pip/SelectionArea.vala
@@ -23,8 +23,8 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
     public Gala.WindowManager wm { get; construct; }
 
     private Gala.ModalProxy? modal_proxy;
-    private Gdk.Point start_point;
-    private Gdk.Point end_point;
+    private Graphene.Point start_point;
+    private Graphene.Point end_point;
     private bool dragging = false;
     private bool clicked = false;
 
@@ -130,10 +130,10 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
     }
 
     private void get_selection_rectangle (out int x, out int y, out int width, out int height) {
-        x = int.min (start_point.x, end_point.x);
-        y = int.min (start_point.y, end_point.y);
-        width = (start_point.x - end_point.x).abs ();
-        height = (start_point.y - end_point.y).abs ();
+        x = (int) float.min (start_point.x, end_point.x);
+        y = (int) float.min (start_point.y, end_point.y);
+        width = (int) (start_point.x - end_point.x).abs ();
+        height = (int) (start_point.y - end_point.y).abs ();
     }
 
     protected override void draw (Cairo.Context ctx, int width, int height) {
diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
@@ -552,17 +552,7 @@ public class Gala.ScreenshotManager : Object {
     }
 
     private void play_shutter_sound () {
-        Canberra.Context context;
-        Canberra.Proplist props;
-
-        Canberra.Context.create (out context);
-        Canberra.Proplist.create (out props);
-
-        props.sets (Canberra.PROP_EVENT_ID, "screen-capture");
-        props.sets (Canberra.PROP_EVENT_DESCRIPTION, _("Screenshot taken"));
-        props.sets (Canberra.PROP_CANBERRA_CACHE_CONTROL, "permanent");
-
-        context.play_full (0, props, null);
+        wm.get_display ().get_sound_player ().play_from_theme ("screen-capture", _("Screenshot taken"));
     }
 
     private Cairo.ImageSurface take_screenshot (int x, int y, int width, int height, bool include_cursor) {
diff --git a/src/Widgets/MultitaskingView/WindowCloneContainer.vala b/src/Widgets/MultitaskingView/WindowCloneContainer.vala
@@ -383,7 +383,7 @@ public class Gala.WindowCloneContainer : ActorTarget {
     // https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
 
     // some math utilities
-    private static int squared_distance (Gdk.Point a, Gdk.Point b) {
+    private static float squared_distance (Graphene.Point a, Graphene.Point b) {
         var k1 = b.x - a.x;
         var k2 = b.y - a.y;
 
@@ -394,7 +394,7 @@ public class Gala.WindowCloneContainer : ActorTarget {
         return {rect.x + dx1, rect.y + dy1, rect.width + (-dx1 + dx2), rect.height + (-dy1 + dy2)};
     }
 
-    private static Gdk.Point rect_center (Mtk.Rectangle rect) {
+    private static Graphene.Point rect_center (Mtk.Rectangle rect) {
         return {rect.x + rect.width / 2, rect.y + rect.height / 2};
     }
 
@@ -419,7 +419,7 @@ public class Gala.WindowCloneContainer : ActorTarget {
         taken_slots.resize (rows * columns);
 
         // precalculate all slot centers
-        Gdk.Point[] slot_centers = {};
+        Graphene.Point[] slot_centers = {};
         slot_centers.resize (rows * columns);
         for (int x = 0; x < columns; x++) {
             for (int y = 0; y < rows; y++) {
@@ -437,7 +437,7 @@ public class Gala.WindowCloneContainer : ActorTarget {
             var rect = window.rect;
 
             var slot_candidate = -1;
-            var slot_candidate_distance = int.MAX;
+            var slot_candidate_distance = float.MAX;
             var pos = rect_center (rect);
 
             // all slots
@@ -510,8 +510,8 @@ public class Gala.WindowCloneContainer : ActorTarget {
             if (scale > 1.0) {
                 scale = 1.0f;
                 target = {
-                    rect_center (target).x - (int) Math.floorf (rect.width * scale) / 2,
-                    rect_center (target).y - (int) Math.floorf (rect.height * scale) / 2,
+                    (int) (rect_center (target).x - Math.floorf (rect.width * scale) / 2),
+                    (int) (rect_center (target).y - Math.floorf (rect.height * scale) / 2),
                     (int) Math.floorf (scale * rect.width),
                     (int) Math.floorf (scale * rect.height)
                 };
diff --git a/vapi/config.vapi b/vapi/config.vapi
@@ -1,28 +1,14 @@
-//
-//  Copyright (C) 2011 Robert Dyer, Rico Tzschichholz
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  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 General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ *                         2011 Robert Dyer
+ *                         2011 Rico Tzschichholz
+ */
 
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
-namespace Config
-{
+namespace Config {
 	public const string GETTEXT_PACKAGE;
 	public const string LOCALEDIR;
-	public const string DATADIR;
-	public const string PKGDATADIR;
 	public const string VERSION;
 	public const string PLUGINDIR;
-	public const string RESOURCEPATH;
 }
