Skip to content

ScreenshotManager: simplify composite_stage_cursor #2740

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
lenemter merged 1 commit into from
Jan 24, 2026
Merged

ScreenshotManager: simplify composite_stage_cursor #2740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions src/ScreenshotManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public class Gala.ScreenshotManager : Object {
image.set_device_scale (resource_scale, resource_scale);
}

image = composite_stage_cursor (image, { rect.x, rect.y, rect.width, rect.height });
composite_stage_cursor (image, { rect.x, rect.y, rect.width, rect.height });
}

unconceal_text ();
Expand Down Expand Up @@ -592,7 +592,7 @@ public class Gala.ScreenshotManager : Object {
return image;
}

private Cairo.ImageSurface composite_stage_cursor (Cairo.ImageSurface image, Cairo.RectangleInt image_rect) {
private void composite_stage_cursor (Cairo.ImageSurface image, Cairo.RectangleInt image_rect) {
#if HAS_MUTTER48
unowned var cursor_tracker = wm.get_display ().get_compositor ().get_backend ().get_cursor_tracker ();
#else
Expand All @@ -603,12 +603,12 @@ public class Gala.ScreenshotManager : Object {

var region = new Cairo.Region.rectangle (image_rect);
if (!region.contains_point ((int) coords.x, (int) coords.y)) {
return image;
return;
}

unowned Cogl.Texture texture = cursor_tracker.get_sprite ();
unowned Cogl.Texture? texture = cursor_tracker.get_sprite ();
if (texture == null) {
return image;
return;
}

int width = (int)texture.get_width ();
Expand All @@ -618,18 +618,10 @@ public class Gala.ScreenshotManager : Object {
texture.get_data (Cogl.PixelFormat.RGBA_8888, 0, data);

var cursor_image = new Cairo.ImageSurface.for_data (data, Cairo.Format.ARGB32, width, height, width * 4);
var target = new Cairo.ImageSurface (Cairo.Format.ARGB32, image_rect.width, image_rect.height);

var cr = new Cairo.Context (target);
cr.set_operator (Cairo.Operator.OVER);
cr.set_source_surface (image, 0, 0);
cr.paint ();

var cr = new Cairo.Context (image);
cr.set_operator (Cairo.Operator.OVER);
cr.set_source_surface (cursor_image, coords.x - image_rect.x, coords.y - image_rect.y);
cr.paint ();

return (Cairo.ImageSurface)cr.get_target ();
}

private async void wait_stage_repaint () {
Expand Down