Skip to content

Correctly unset x11 pass through #2391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

Correctly unset x11 pass through #2391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78a33ef
Correctly unset x11 pass through
lenemter May 15, 2025
8224b50
Merge branch 'main' into lenemter/correctly-unset-pass-through
danirabbit May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions lib/Utils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,6 @@ namespace Gala {
return texture;
}

private static HashTable<Meta.Window, X.XserverRegion?> regions = new HashTable<Meta.Window, X.XserverRegion?> (null, null);

public static void x11_set_window_pass_through (Meta.Window window) {
unowned var x11_display = window.display.get_x11_display ();

Expand All @@ -416,10 +414,7 @@ namespace Gala {
#endif
unowned var xdisplay = x11_display.get_xdisplay ();

regions[window] = X.Fixes.create_region_from_window (xdisplay, x_window, 0);

X.Xrectangle rect = {};

var region = X.Fixes.create_region (xdisplay, {rect});

X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
Expand All @@ -437,16 +432,7 @@ namespace Gala {
#endif
unowned var xdisplay = x11_display.get_xdisplay ();

var region = regions[window];

if (region == null) {
return;
}

X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);

regions.remove (window);
X.Fixes.destroy_region (xdisplay, region);
X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, (X.XserverRegion) 0);
}

/**
Expand Down
Loading