Skip to content

Commit d843441

Browse files
lenemterlenemter
authored
Merge branch 'main' into lenemter/drop-windows-directly
2 parents c0520b4 + d11be69 commit d843441

32 files changed

+192
-848
lines changed

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install Dependencies
3232
run: |
3333
apt update
34-
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
34+
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
3535
- name: Build
3636
env:
3737
DESTDIR: out
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v5
5151
- name: Install Dependencies
5252
run: |
53-
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
53+
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
5454
- name: Build
5555
env:
5656
DESTDIR: out
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
7171
zypper --gpg-auto-import-keys refresh
72-
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
72+
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
7373
- uses: actions/checkout@v5
7474
- name: Build
7575
env:

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ aclocal.m4
33
autom4te.cache
44
/build-aux/*
55
ChangeLog
6-
config.h
7-
config.h.in
8-
config.h.in~
96
config.log
107
config.status
118
configure

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ A window & compositing manager based on libmutter and designed by elementary for
88
You'll need the following dependencies:
99
* gettext (>= 0.19.6)
1010
* gsettings-desktop-schemas-dev
11-
* libcanberra-dev
1211
* libclutter-1.0-dev (>= 1.12.0)
1312
* libgee-0.8-dev
1413
* libglib2.0-dev (>= 2.74)

‎config.vala.in‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* SPDX-License-Identifier: GPL-3.0-or-later
3+
* SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
4+
* 2011 Robert Dyer
5+
* 2011 Rico Tzschichholz
6+
*/
7+
8+
namespace Config {
9+
public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
10+
public const string LOCALEDIR = "@LOCALEDIR@";
11+
public const string VERSION = "@VERSION@";
12+
public const string PLUGINDIR = "@PLUGINDIR@";
13+
}

‎daemon-gtk3/meson.build‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ gala_daemon_sources = files(
77
'BackgroundMenu.vala',
88
)
99

10-
granite_dep_old = dependency('granite')
10+
granite6_dep = dependency('granite')
1111
hdy_dep = dependency('libhandy-1')
1212

13-
gala_daemon_bin = executable(
13+
executable(
1414
'gala-daemon-gtk3',
1515
gala_daemon_sources,
16-
dependencies: [gala_dep, gala_base_dep, granite_dep_old, hdy_dep],
17-
include_directories: config_inc_dir,
16+
gala_common_enums,
17+
config_header,
18+
dependencies: [granite6_dep, hdy_dep],
1819
install: true,
1920
)

‎daemon/DBus.vala‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,6 @@
33
* SPDX-License-Identifier: GPL-3.0-or-later
44
*/
55

6-
public enum Gala.ActionType {
7-
NONE = 0,
8-
SHOW_MULTITASKING_VIEW,
9-
MAXIMIZE_CURRENT,
10-
HIDE_CURRENT,
11-
OPEN_LAUNCHER,
12-
CUSTOM_COMMAND,
13-
WINDOW_OVERVIEW,
14-
WINDOW_OVERVIEW_ALL,
15-
SWITCH_TO_WORKSPACE_PREVIOUS,
16-
SWITCH_TO_WORKSPACE_NEXT,
17-
SWITCH_TO_WORKSPACE_LAST,
18-
START_MOVE_CURRENT,
19-
START_RESIZE_CURRENT,
20-
TOGGLE_ALWAYS_ON_TOP_CURRENT,
21-
TOGGLE_ALWAYS_ON_VISIBLE_WORKSPACE_CURRENT,
22-
MOVE_CURRENT_WORKSPACE_LEFT,
23-
MOVE_CURRENT_WORKSPACE_RIGHT,
24-
CLOSE_CURRENT,
25-
SCREENSHOT_CURRENT
26-
}
27-
28-
[Flags]
29-
public enum Gala.WindowFlags {
30-
NONE = 0,
31-
CAN_HIDE,
32-
CAN_MAXIMIZE,
33-
IS_MAXIMIZED,
34-
ALLOWS_MOVE,
35-
ALLOWS_RESIZE,
36-
ALWAYS_ON_TOP,
37-
ON_ALL_WORKSPACES,
38-
CAN_CLOSE,
39-
IS_TILED,
40-
ALLOWS_MOVE_LEFT,
41-
ALLOWS_MOVE_RIGHT
42-
}
43-
446
[DBus (name = "org.pantheon.gala")]
457
public interface Gala.WMDBus : GLib.Object {
468
public abstract void perform_action (Gala.ActionType type) throws DBusError, IOError;

‎daemon/meson.build‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ gala_daemon_sources = files(
77
'WindowMenu.vala',
88
)
99

10-
gala_daemon_bin = executable(
10+
gtk4_dep = dependency('gtk4')
11+
granite7_dep = dependency('granite-7')
12+
13+
executable(
1114
'gala-daemon',
1215
gala_daemon_sources,
16+
gala_common_enums,
17+
config_header,
1318
gala_resources,
14-
dependencies: [config_dep, granite_dep, gtk4_dep],
15-
include_directories: config_inc_dir,
16-
install: true,
19+
dependencies: [gtk4_dep, granite7_dep],
20+
install: true
1721
)

‎docs/meson.build‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
1-
valadoc = find_program('valadoc')
2-
31
mutter_packages_command = []
42
foreach dep : mutter_dep
53
mutter_packages_command += [ '--pkg', dep.name() ]
64
endforeach
75

86
basic_command = [
9-
valadoc,
7+
find_program('valadoc'),
108
'--force',
119
'--verbose',
1210
'--package-name','gala',
13-
'--package-version', '0.0.0',
14-
'--driver', vala.version(),
11+
'--package-version', meson.project_version(),
1512
mutter_packages_command,
16-
'--pkg', 'atk-bridge-2.0',
17-
'--pkg', 'gnome-desktop-3.0',
1813
'--pkg', 'gtk+-3.0',
1914
'--pkg', 'gee-0.8',
2015
'--pkg', 'gio-unix-2.0',
2116
'--pkg', 'gmodule-2.0',
2217
'--pkg', 'posix',
23-
'--pkg', 'libcanberra',
24-
'--pkg', 'sqlite3',
25-
'--pkg', 'libsystemd',
26-
'--pkg', 'granite',
27-
'--pkg', 'config',
2818
vala_flags,
29-
'--vapidir=' + join_paths(meson.build_root(), 'lib'),
19+
'--vapidir=' + join_paths(meson.project_build_root(), 'lib'),
3020
'--vapidir=' + join_paths(meson.global_source_root(), 'vapi'),
3121
'--doclet=html',
3222
'--use-svg-images'
@@ -49,7 +39,10 @@ all_doc_target = custom_target(
4939
command: [
5040
basic_command,
5141
'--internal',
52-
'--pkg', 'granite',
42+
'--pkg', 'sqlite3',
43+
'--pkg', 'atk-bridge-2.0',
44+
'--pkg', 'gnome-desktop-3.0',
45+
'--pkg', 'libsystemd',
5346
'--pkg', 'gnome-desktop-3.0',
5447
'--pkg', 'gmodule-2.0',
5548
'--pkg', 'wayland-server',
@@ -59,6 +52,6 @@ all_doc_target = custom_target(
5952
'@INPUT@'
6053
],
6154
build_by_default: true,
62-
input: gala_lib_sources + gala_bin_sources,
55+
input: gala_lib_sources + gala_bin_sources + [config_header],
6356
output: 'full'
6457
)

‎lib/CloseButton.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class Gala.CloseButton : Clutter.Actor {
5151
if (close_pixbufs[height] == null) {
5252
try {
5353
close_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale (
54-
Config.RESOURCEPATH + "/buttons/close.svg",
54+
"/org/pantheon/desktop/gala/buttons/close.svg",
5555
-1,
5656
height,
5757
true

‎lib/CommonEnums.vala‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* SPDX-License-Identifier: GPL-3.0-or-later
3+
* SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
4+
* 2014 Tom Beckmann
5+
*
6+
* Note: These enums are shared with the daemon
7+
*/
8+
9+
namespace Gala {
10+
public enum ActionType {
11+
NONE = 0,
12+
SHOW_MULTITASKING_VIEW,
13+
MAXIMIZE_CURRENT,
14+
HIDE_CURRENT,
15+
OPEN_LAUNCHER,
16+
CUSTOM_COMMAND,
17+
WINDOW_OVERVIEW,
18+
WINDOW_OVERVIEW_ALL,
19+
SWITCH_TO_WORKSPACE_PREVIOUS,
20+
SWITCH_TO_WORKSPACE_NEXT,
21+
SWITCH_TO_WORKSPACE_LAST,
22+
START_MOVE_CURRENT,
23+
START_RESIZE_CURRENT,
24+
TOGGLE_ALWAYS_ON_TOP_CURRENT,
25+
TOGGLE_ALWAYS_ON_VISIBLE_WORKSPACE_CURRENT,
26+
MOVE_CURRENT_WORKSPACE_LEFT,
27+
MOVE_CURRENT_WORKSPACE_RIGHT,
28+
CLOSE_CURRENT,
29+
SCREENSHOT_CURRENT
30+
}
31+
32+
[Flags]
33+
public enum WindowFlags {
34+
NONE = 0,
35+
CAN_HIDE,
36+
CAN_MAXIMIZE,
37+
IS_MAXIMIZED,
38+
ALLOWS_MOVE,
39+
ALLOWS_RESIZE,
40+
ALWAYS_ON_TOP,
41+
ON_ALL_WORKSPACES,
42+
CAN_CLOSE,
43+
IS_TILED,
44+
ALLOWS_MOVE_LEFT,
45+
ALLOWS_MOVE_RIGHT
46+
}
47+
}

0 commit comments

Comments
 (0)