mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: improve cursor_surface_enter()

Browse Source
This commit is contained in:
ManoloFLTK 2023-03-14 08:09:39 +01:00
parent 8aafe6cf69
commit 16448d5ba8
1 changed files with 9 additions and 8 deletions

17
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx

@ -408,6 +408,9 @@ static void try_update_cursor(struct seat *seat)
} }
static void output_scale(void *data, struct wl_output *wl_output, int32_t factor);
static void cursor_surface_enter(void *data, static void cursor_surface_enter(void *data,
struct wl_surface *wl_surface, struct wl_surface *wl_surface,
struct wl_output *wl_output) struct wl_output *wl_output)
@ -424,22 +427,20 @@ static void cursor_surface_enter(void *data,
//fprintf(stderr, "cursor_surface_enter: wl_output_get_user_data(%p)=%p\n", wl_output, pointer_output->output); //fprintf(stderr, "cursor_surface_enter: wl_output_get_user_data(%p)=%p\n", wl_output, pointer_output->output);
wl_list_insert(&seat->pointer_outputs, &pointer_output->link); wl_list_insert(&seat->pointer_outputs, &pointer_output->link);
try_update_cursor(seat); try_update_cursor(seat);
Fl_Wayland_Screen_Driver::output *output = (Fl_Wayland_Screen_Driver::output*)wl_output_get_user_data(wl_output);
output_scale(output, wl_output, output->wld_scale); // rescale custom cursors
// maintain custom or standard window cursor // maintain custom or standard window cursor
Fl_Window *win = Fl::first_window(); Fl_Window *win = Fl::first_window();
if (win) { if (win) {
Fl_Wayland_Window_Driver *driver = Fl_Wayland_Window_Driver::driver(win); Fl_Wayland_Window_Driver *driver = Fl_Wayland_Window_Driver::driver(win);
//fprintf(stderr, "cursor_surface_enter: cursor_default=%d standard_cursor=%d\n", driver->cursor_default(), driver->standard_cursor());
struct wld_window *xid = fl_wl_xid(win); struct wld_window *xid = fl_wl_xid(win);
struct wld_window::custom_cursor *custom = xid->custom_cursor; if (xid->custom_cursor) do_set_cursor(seat, xid->custom_cursor->wl_cursor);
if (custom) { else if (driver->cursor_default()) driver->set_cursor(driver->cursor_default());
// Change custom cursor's width & height according to display's wld_scale
driver->set_cursor_4args(custom->rgb, custom->hotx, custom->hoty, false);
do_set_cursor(seat, xid->custom_cursor->wl_cursor);
} else if (driver->cursor_default()) driver->set_cursor(driver->cursor_default());
else win->cursor(driver->standard_cursor()); else win->cursor(driver->standard_cursor());
} }
} }
static void cursor_surface_leave(void *data, static void cursor_surface_leave(void *data,
struct wl_surface *wl_surface, struct wl_surface *wl_surface,
struct wl_output *wl_output) struct wl_output *wl_output)
@ -979,7 +980,7 @@ static void output_scale(void *data, struct wl_output *wl_output, int32_t factor
Fl_Window *win = Fl::first_window(); Fl_Window *win = Fl::first_window();
while (win) { while (win) {
struct wld_window *xid = fl_wl_xid(win); struct wld_window *xid = fl_wl_xid(win);
if (xid->custom_cursor && wl_output_get_user_data(wl_output) == xid->output) { if (xid->custom_cursor && output == xid->output) {
Fl_Wayland_Window_Driver *driver = Fl_Wayland_Window_Driver::driver(win); Fl_Wayland_Window_Driver *driver = Fl_Wayland_Window_Driver::driver(win);
driver->set_cursor_4args(xid->custom_cursor->rgb, driver->set_cursor_4args(xid->custom_cursor->rgb,
xid->custom_cursor->hotx, xid->custom_cursor->hoty, false); xid->custom_cursor->hotx, xid->custom_cursor->hoty, false);