Skip to content

Commit 95a829a

Browse files
lenemterlenemter
authored
Merge branch 'main' into lenemter/add-hide-delay
2 parents 6dcb94c + 2a98017 commit 95a829a

21 files changed

+97
-114
lines changed

‎plugins/pip/Main.vala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
9292
var rect = Graphene.Rect.alloc ();
9393
rect.init (point_x, point_y, width, height);
9494

95-
var popup_window = new PopupWindow (wm, active);
95+
var popup_window = new PopupWindow (wm.get_display (), active);
9696
popup_window.set_container_clip (rect);
9797
popup_window.show.connect (on_popup_window_show);
9898
popup_window.hide.connect (on_popup_window_hide);
@@ -114,7 +114,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
114114
private void select_window_at (int x, int y) {
115115
var selected = get_window_actor_at (x, y);
116116
if (selected != null) {
117-
var popup_window = new PopupWindow (wm, selected);
117+
var popup_window = new PopupWindow (wm.get_display (), selected);
118118
popup_window.show.connect (on_popup_window_show);
119119
popup_window.hide.connect (on_popup_window_hide);
120120
add_window (popup_window);

‎plugins/pip/PopupWindow.vala‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
1616

1717
public signal void closed ();
1818

19-
public Gala.WindowManager wm { get; construct; }
19+
public Meta.Display display { get; construct; }
2020
public Meta.WindowActor window_actor { get; construct; }
2121

2222
private Clutter.Clone clone; // clone itself
@@ -52,12 +52,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
5252
|| window_type == Meta.WindowType.MODAL_DIALOG;
5353
}
5454

55-
public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor) {
56-
Object (wm: wm, window_actor: window_actor);
55+
public PopupWindow (Meta.Display display, Meta.WindowActor window_actor) {
56+
Object (display: display, window_actor: window_actor);
5757
}
5858

5959
construct {
60-
unowned var display = wm.get_display ();
6160
var scale = display.get_monitor_scale (display.get_current_monitor ());
6261

6362
button_size = Gala.Utils.scale_to_int (36, scale);
@@ -133,7 +132,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
133132
window.unmanaged.connect (on_close_click_clicked);
134133
window.notify["appears-focused"].connect (update_window_focus);
135134

136-
unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
135+
unowned var workspace_manager = display.get_workspace_manager ();
137136
workspace_manager.active_workspace_changed.connect (update_window_focus);
138137
}
139138

@@ -215,15 +214,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
215214
}
216215

217216
private Clutter.Actor on_move_begin () {
218-
wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
217+
display.set_cursor (Meta.Cursor.DND_IN_DRAG);
219218

220219
return this;
221220
}
222221

223222
private void on_move_end () {
224223
reactive = true;
225224
update_screen_position ();
226-
wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
225+
display.set_cursor (Meta.Cursor.DEFAULT);
227226
}
228227

229228
#if HAS_MUTTER45
@@ -245,7 +244,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
245244
grab = resize_button.get_stage ().grab (resize_button);
246245
resize_button.event.connect (on_resize_event);
247246

248-
wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
247+
display.set_cursor (Meta.Cursor.SE_RESIZE);
249248

250249
return Clutter.EVENT_PROPAGATE;
251250
}
@@ -306,7 +305,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
306305

307306
update_screen_position ();
308307

309-
wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
308+
display.set_cursor (Meta.Cursor.DEFAULT);
310309
}
311310

312311
private void on_allocation_changed () {
@@ -329,14 +328,14 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
329328
}
330329

331330
private void update_window_focus () {
332-
unowned Meta.Window focus_window = wm.get_display ().get_focus_window ();
331+
unowned Meta.Window focus_window = display.get_focus_window ();
333332
if ((focus_window != null && !get_window_is_normal (focus_window))
334333
|| (previous_focus != null && !get_window_is_normal (previous_focus))) {
335334
previous_focus = focus_window;
336335
return;
337336
}
338337

339-
unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
338+
unowned var workspace_manager = display.get_workspace_manager ();
340339
unowned var active_workspace = workspace_manager.get_active_workspace ();
341340
unowned var window = window_actor.get_meta_window ();
342341

@@ -520,7 +519,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
520519
}
521520

522521
private bool coord_is_in_other_monitor (float coord, Clutter.Orientation axis) {
523-
var display = wm.get_display ();
524522
int n_monitors = display.get_n_monitors ();
525523

526524
if (n_monitors == 1) {
@@ -553,7 +551,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
553551
#else
554552
private void get_current_monitor_rect (out Meta.Rectangle rect) {
555553
#endif
556-
var display = wm.get_display ();
557554
rect = display.get_monitor_geometry (display.get_current_monitor ());
558555
}
559556

‎src/Background/BackgroundContainer.vala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ namespace Gala {
2020
public signal void changed ();
2121
public signal void show_background_menu (int x, int y);
2222

23-
public WindowManager wm { get; construct; }
23+
public Meta.Display display { get; construct; }
2424

25-
public BackgroundContainer (WindowManager wm) {
26-
Object (wm: wm);
25+
public BackgroundContainer (Meta.Display display) {
26+
Object (display: display);
2727
}
2828

2929
construct {
30-
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
30+
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
3131
monitor_manager.monitors_changed.connect (update);
3232

3333
reactive = true;
@@ -44,7 +44,7 @@ namespace Gala {
4444
}
4545

4646
~BackgroundContainer () {
47-
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
47+
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
4848
monitor_manager.monitors_changed.disconnect (update);
4949
}
5050

@@ -59,8 +59,8 @@ namespace Gala {
5959

6060
destroy_all_children ();
6161

62-
for (var i = 0; i < wm.get_display ().get_n_monitors (); i++) {
63-
var background = new BackgroundManager (wm, i);
62+
for (var i = 0; i < display.get_n_monitors (); i++) {
63+
var background = new BackgroundManager (display, i);
6464

6565
add_child (background);
6666

‎src/Background/BackgroundManager.vala‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
1010

1111
public signal void changed ();
1212

13-
public WindowManager wm { get; construct; }
13+
public Meta.Display display { get; construct; }
1414
public int monitor_index { get; construct; }
1515
public bool control_position { get; construct; }
1616
public bool rounded_corners { get; construct; }
@@ -24,12 +24,12 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
2424
private Meta.BackgroundActor? background_actor;
2525
private Meta.BackgroundActor? new_background_actor = null;
2626

27-
public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true, bool rounded_corners = true) {
28-
Object (wm: wm, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
27+
public BackgroundManager (Meta.Display display, int monitor_index, bool control_position = true, bool rounded_corners = true) {
28+
Object (display: display, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
2929
}
3030

3131
construct {
32-
background_source = BackgroundCache.get_default ().get_background_source (wm.get_display ());
32+
background_source = BackgroundCache.get_default ().get_background_source (display);
3333
update_background_actor (false);
3434

3535
destroy.connect (on_destroy);
@@ -93,7 +93,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
9393

9494
if (background.is_loaded) {
9595
if (rounded_corners) {
96-
new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
96+
new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
9797
}
9898

9999
swap_background_actor (animate);
@@ -106,7 +106,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
106106
background.set_data<ulong> ("background-loaded-handler", 0);
107107

108108
if (rounded_corners) {
109-
new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
109+
new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
110110
}
111111

112112
swap_background_actor (animate);
@@ -121,8 +121,6 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
121121
}
122122

123123
private Meta.BackgroundActor create_background_actor () {
124-
unowned var display = wm.get_display ();
125-
126124
var background = background_source.get_background (monitor_index);
127125
var background_actor = new Meta.BackgroundActor (display, monitor_index);
128126

‎src/DBus.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class Gala.DBus {
3333
Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
3434
(connection) => {
3535
try {
36-
connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm));
36+
connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm.get_display ()));
3737
connection.register_object ("/org/gnome/Shell/Screenshot", ScreenshotManager.init (wm));
3838
} catch (Error e) { warning (e.message); }
3939
},

‎src/DBusAccelerator.vala‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,23 @@ namespace Gala {
7575
private static DBusAccelerator? instance;
7676

7777
[DBus (visible = false)]
78-
public static unowned DBusAccelerator init (WindowManager wm) {
79-
if (instance == null)
80-
instance = new DBusAccelerator (wm);
78+
public static unowned DBusAccelerator init (Meta.Display display) {
79+
if (instance == null) {
80+
instance = new DBusAccelerator (display);
81+
}
8182

8283
return instance;
8384
}
8485

8586
public signal void accelerator_activated (uint action, GLib.HashTable<string, Variant> parameters);
8687

87-
private WindowManager wm;
88+
private Meta.Display display;
8889
private GLib.HashTable<unowned string, GrabbedAccelerator> grabbed_accelerators;
8990

90-
private DBusAccelerator (WindowManager _wm) {
91-
wm = _wm;
91+
private DBusAccelerator (Meta.Display _display) {
92+
display = _display;
9293
grabbed_accelerators = new HashTable<unowned string, GrabbedAccelerator> (str_hash, str_equal);
93-
wm.get_display ().accelerator_activated.connect (on_accelerator_activated);
94+
display.accelerator_activated.connect (on_accelerator_activated);
9495
}
9596

9697
private void on_accelerator_activated (uint action, Clutter.InputDevice device, uint timestamp) {
@@ -115,7 +116,7 @@ namespace Gala {
115116
return found_accel.action;
116117
}
117118

118-
uint action = wm.get_display ().grab_accelerator (accelerator, grab_flags);
119+
uint action = display.grab_accelerator (accelerator, grab_flags);
119120
if (action != Meta.KeyBindingFlags.NONE) {
120121
var accel = new GrabbedAccelerator ();
121122
accel.action = action;
@@ -141,7 +142,7 @@ namespace Gala {
141142
public bool ungrab_accelerator (uint action) throws GLib.DBusError, GLib.IOError {
142143
foreach (unowned GrabbedAccelerator accel in grabbed_accelerators.get_values ()) {
143144
if (accel.action == action) {
144-
bool ret = wm.get_display ().ungrab_accelerator (action);
145+
bool ret = display.ungrab_accelerator (action);
145146
grabbed_accelerators.remove (accel.name);
146147
return ret;
147148
}

‎src/ShellClients/ShellClientsManager.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public class Gala.ShellClientsManager : Object {
184184
}
185185

186186
public void make_centered (Meta.Window window) requires (!is_itself_positioned (window)) {
187-
positioned_windows[window] = new WindowPositioner (wm, window, CENTER);
187+
positioned_windows[window] = new WindowPositioner (wm.get_display (), window, CENTER);
188188

189189
// connect_after so we make sure that any queued move is unqueued
190190
window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));

‎src/ShellClients/WindowPositioner.vala‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public class Gala.WindowPositioner : Object {
1010
CENTER
1111
}
1212

13+
public Meta.Display display { get; construct; }
1314
public Meta.Window window { get; construct; }
14-
public WindowManager wm { get; construct; }
1515
public Position position { get; private set; }
1616
public Variant? position_data { get; private set; }
1717

18-
public WindowPositioner (WindowManager wm, Meta.Window window, Position position, Variant? position_data = null) {
19-
Object (wm: wm, window: window, position: position, position_data: position_data);
18+
public WindowPositioner (Meta.Display display, Meta.Window window, Position position, Variant? position_data = null) {
19+
Object (display: display, window: window, position: position, position_data: position_data);
2020
}
2121

2222
construct {
@@ -26,7 +26,7 @@ public class Gala.WindowPositioner : Object {
2626
window.position_changed.connect (position_window);
2727
window.shown.connect (position_window);
2828

29-
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
29+
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
3030
monitor_manager.monitors_changed.connect (position_window);
3131
monitor_manager.monitors_changed_internal.connect (position_window);
3232
}
@@ -46,7 +46,6 @@ public class Gala.WindowPositioner : Object {
4646

4747
switch (position) {
4848
case CENTER:
49-
unowned var display = wm.get_display ();
5049
var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
5150
var window_rect = window.get_frame_rect ();
5251

‎src/Widgets/DwellClickTimer.vala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ namespace Gala {
3939
private GLib.Settings interface_settings;
4040
private Cairo.ImageSurface surface;
4141

42-
public weak WindowManager wm { get; construct; }
42+
public Meta.Display display { get; construct; }
4343

4444
public double angle { get; set; }
4545

46-
public DwellClickTimer (WindowManager wm) {
47-
Object (wm: wm);
46+
public DwellClickTimer (Meta.Display display) {
47+
Object (display: display);
4848
}
4949

5050
construct {
@@ -69,7 +69,6 @@ namespace Gala {
6969
seat.set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType.PRIMARY);
7070

7171
seat.ptr_a11y_timeout_started.connect ((device, type, timeout) => {
72-
unowned var display = wm.get_display ();
7372
var scale = display.get_monitor_scale (display.get_current_monitor ());
7473
update_cursor_size (scale);
7574

‎src/Widgets/IconGroup.vala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace Gala {
3939

4040
private DragDropAction drag_action;
4141

42-
public WindowManager wm { get; construct; }
42+
public Meta.Display display { get; construct; }
4343
public Meta.Workspace workspace { get; construct; }
4444
private float _scale_factor = 1.0f;
4545
public float scale_factor {
@@ -55,8 +55,8 @@ namespace Gala {
5555
private Clutter.Actor? prev_parent = null;
5656
private Clutter.Actor icon_container;
5757

58-
public IconGroup (WindowManager wm, Meta.Workspace workspace, float scale) {
59-
Object (wm: wm, workspace: workspace, scale_factor: scale);
58+
public IconGroup (Meta.Display display, Meta.Workspace workspace, float scale) {
59+
Object (display: display, workspace: workspace, scale_factor: scale);
6060
}
6161

6262
construct {
@@ -143,7 +143,7 @@ namespace Gala {
143143
* the group.
144144
*/
145145
public void add_window (Meta.Window window, bool no_redraw = false, bool temporary = false) {
146-
var new_window = new WindowIconActor (wm, window);
146+
var new_window = new WindowIconActor (window);
147147
new_window.set_position (32, 32);
148148
new_window.temporary = temporary;
149149

@@ -415,7 +415,7 @@ namespace Gala {
415415
// disable reactivity so that workspace thumbs can get events
416416
reactive = false;
417417

418-
wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
418+
display.set_cursor (Meta.Cursor.DND_IN_DRAG);
419419

420420
return this;
421421
}
@@ -433,14 +433,14 @@ namespace Gala {
433433
drag_canceled ();
434434
}
435435

436-
wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
436+
display.set_cursor (Meta.Cursor.DEFAULT);
437437
}
438438

439439
private void drag_canceled () {
440440
get_parent ().remove_child (this);
441441
restore_group ();
442442

443-
wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
443+
display.set_cursor (Meta.Cursor.DEFAULT);
444444
}
445445

446446
private void restore_group () {

0 commit comments

Comments
 (0)