From fc6d36405718e19946ba0b4c96dcbbb39b456eee Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:04:13 +0100 Subject: Change parameters of Fl_Wayland_Window_Driver::delete_cursor() --- src/drivers/Wayland/Fl_Wayland_Window_Driver.H | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/drivers/Wayland/Fl_Wayland_Window_Driver.H') diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H index e0eca821e..192d82f5a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H @@ -59,7 +59,6 @@ private: cairo_rectangle_int_t *subRect_; // makes sure subwindow remains inside its parent window static bool in_flush_; // useful for progressive window drawing Fl_Cursor standard_cursor_; // window's standard custom kind - void delete_cursor_(bool delete_rgb = true); struct gl_start_support *gl_start_support_; // for support of gl_start/gl_finish bool is_popup_window_; public: @@ -74,6 +73,12 @@ public: struct Fl_Wayland_Screen_Driver::output *output; struct wl_list link; }; + struct custom_cursor { + struct wl_cursor *wl_cursor; + const Fl_RGB_Image *rgb; + int hotx, hoty; + }; + static void delete_cursor(struct custom_cursor *custom, bool delete_rgb = true); static type_for_resize_window_between_screens data_for_resize_window_between_screens_; void decorated_win_size(int &w, int &h); void shape_bitmap_(Fl_Image* b); @@ -155,11 +160,8 @@ struct wld_window { struct xdg_popup *xdg_popup; struct xdg_toplevel *xdg_toplevel; }; - struct custom_cursor_ { - struct wl_cursor *wl_cursor; - const Fl_RGB_Image *rgb; - int hotx, hoty; - } *custom_cursor; // non-null when using custom cursor + // non-null when using custom cursor + struct Fl_Wayland_Window_Driver::custom_cursor *custom_cursor; int configured_width; int configured_height; int floating_width; -- cgit v1.2.3