diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-02-17 16:24:30 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-02-17 16:24:41 +0100 |
| commit | 2af43ef4c809bdef49789db28b1fee9ccb272a5a (patch) | |
| tree | ea3934d04be9af2d71cba83e9b759115cfa0e2f1 /src/drivers/Wayland | |
| parent | 4a3781eb0eadc65e93ecb490c7b5f817253f0a0f (diff) | |
Remove special FL_CURSOR_NONE implementation in Wayland
Diffstat (limited to 'src/drivers/Wayland')
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Screen_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 10 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H index f0bf11431..94640afce 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H @@ -91,7 +91,6 @@ public: struct wl_cursor *xc_se; struct wl_cursor *xc_ne; struct wl_cursor *xc_nw; - struct wl_cursor *xc_none; static const struct wl_data_device_listener *p_data_device_listener; public: diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index 281724e9a..8279736ca 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -1452,7 +1452,7 @@ struct wl_cursor *Fl_Wayland_Screen_Driver::cache_cursor(const char *cursor_name void Fl_Wayland_Screen_Driver::reset_cursor() { xc_arrow = xc_ns = xc_wait = xc_insert = xc_hand = xc_help = xc_cross = xc_move = xc_north = xc_south = xc_west = xc_east = xc_we = xc_nesw = xc_nwse = xc_sw = xc_se = - xc_ne = xc_nw = xc_none = NULL; + xc_ne = xc_nw = NULL; } uint32_t Fl_Wayland_Screen_Driver::get_serial() { diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index a23ae5653..641b397e5 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1402,16 +1402,6 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { if (!scr_driver->xc_nw) return 0; scr_driver->default_cursor(scr_driver->xc_nw); break; - case FL_CURSOR_NONE: - if (!scr_driver->xc_none) { - static const uchar pixel[] = {0, 0, 0, 0}; - Fl_RGB_Image image(pixel, 1, 1, 4); - this->set_cursor(&image, 0, 0); - scr_driver->xc_none = xid->custom_cursor; - xid->custom_cursor = NULL; - } - scr_driver->default_cursor(scr_driver->xc_none); - break; default: return 0; |