From c74486102f09d89599ddcee732c17d0fafb9bfcc Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Mon, 3 Aug 2026 03:53:25 +0200 Subject: [PATCH] gh-13108: Use mozilla API for gdkGetPointer (gh-14823) --- src/zen/compact-mode/ZenMouseTrackerGtk.cpp | 4 +--- src/zen/drag-and-drop/nsZenDragAndDrop.cpp | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/zen/compact-mode/ZenMouseTrackerGtk.cpp b/src/zen/compact-mode/ZenMouseTrackerGtk.cpp index 595af453b..427081603 100644 --- a/src/zen/compact-mode/ZenMouseTrackerGtk.cpp +++ b/src/zen/compact-mode/ZenMouseTrackerGtk.cpp @@ -20,9 +20,7 @@ namespace zen { static guint sTimerId = 0; static gboolean OnTimer(gpointer) { - GdkDisplay* display = gdk_display_get_default(); - GdkSeat* seat = display ? gdk_display_get_default_seat(display) : nullptr; - GdkDevice* pointer = seat ? gdk_seat_get_pointer(seat) : nullptr; + GdkDevice* pointer = mozilla::widget::GdkGetPointer(); if (pointer) { gint x = 0, y = 0; gdk_device_get_position(pointer, nullptr, &x, &y); diff --git a/src/zen/drag-and-drop/nsZenDragAndDrop.cpp b/src/zen/drag-and-drop/nsZenDragAndDrop.cpp index 1a50d62c9..bc30f348b 100644 --- a/src/zen/drag-and-drop/nsZenDragAndDrop.cpp +++ b/src/zen/drag-and-drop/nsZenDragAndDrop.cpp @@ -13,6 +13,7 @@ # include #elif defined(MOZ_WIDGET_GTK) # include +# include "mozilla/WidgetUtilsGtk.h" #endif namespace zen { @@ -41,9 +42,7 @@ static nsresult StartNativeWindowMove(nsIWidget* aWidget) { static_cast(aWidget->GetNativeData(NS_NATIVE_WINDOW)); NS_ENSURE_TRUE(gdkWindow, NS_ERROR_FAILURE); GdkWindow* toplevel = gdk_window_get_toplevel(gdkWindow); - GdkSeat* seat = - gdk_display_get_default_seat(gdk_window_get_display(toplevel)); - GdkDevice* pointer = seat ? gdk_seat_get_pointer(seat) : nullptr; + GdkDevice* pointer = mozilla::widget::GdkGetPointer(); NS_ENSURE_TRUE(pointer, NS_ERROR_FAILURE); // A native move works on both X11 and Wayland, unlike moving the // window programmatically.