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

Wayland: new struct wl_cursor *custom_cursor member variable

Browse Source
This commit is contained in:
ManoloFLTK 2023-02-15 22:52:20 +01:00
parent 6fbfaba19d
commit f6b87790cc
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
documentation/src/wayland.dox
View File

@ -665,6 +665,7 @@ for each shown()'n Fl_Window by \c Fl_Wayland_Window_Driver::makeWindow().
Function \c fl_wl_xid(Fl_Window*) returns a pointer to the <tt>struct wld_window</tt> of its argument. Function \c fl_wl_xid(Fl_Window*) returns a pointer to the <tt>struct wld_window</tt> of its argument.
<pre> <pre>
struct wld_window { struct wld_window {
Fl_Window *fl_win;
struct wl_list outputs; // linked list of outputs where this surface is mapped struct wl_list outputs; // linked list of outputs where this surface is mapped
struct wl_surface *wl_surface; // the window's surface struct wl_surface *wl_surface; // the window's surface
struct fl_wld_buffer *buffer; // see \ref fl_wld_buffer struct fl_wld_buffer *buffer; // see \ref fl_wld_buffer
@ -675,7 +676,7 @@ struct wld_window {
struct xdg_popup *xdg_popup; // for POPUP windows struct xdg_popup *xdg_popup; // for POPUP windows
struct xdg_toplevel *xdg_toplevel; // for UNFRAMED windows struct xdg_toplevel *xdg_toplevel; // for UNFRAMED windows
}; };
Fl_Window *fl_win; struct wl_cursor *custom_cursor; // non-null when using custom cursor
enum Fl_Wayland_Window_Driver::kind kind; // DECORATED or POPUP or SUBWINDOW or UNFRAMED enum Fl_Wayland_Window_Driver::kind kind; // DECORATED or POPUP or SUBWINDOW or UNFRAMED
int configured_width; // used when negotiating window size with the compositor int configured_width; // used when negotiating window size with the compositor
int configured_height; int configured_height;

5
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View File

@ -268,8 +268,7 @@ static void pointer_enter(void *data,
{ {
Fl_Window *win = event_coords_from_surface(surface, surface_x, surface_y); Fl_Window *win = event_coords_from_surface(surface, surface_x, surface_y);
if (!win) return; if (!win) return;
Fl_Wayland_Window_Driver *driver = Fl_Wayland_Window_Driver::driver(win); struct wl_cursor *cursor = fl_wl_xid(win)->custom_cursor;// use custom cursor if present
struct wl_cursor *cursor = driver->cursor(); // use custom cursor if present
struct seat *seat = (struct seat*)data; struct seat *seat = (struct seat*)data;
do_set_cursor(seat, cursor); do_set_cursor(seat, cursor);
seat->serial = serial; seat->serial = serial;
@ -439,7 +438,7 @@ static void cursor_surface_enter(void *data,
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()); //fprintf(stderr, "cursor_surface_enter: cursor_default=%d standard_cursor=%d\n", driver->cursor_default(), driver->standard_cursor());
struct wl_cursor *cursor = driver->cursor(); struct wl_cursor *cursor = fl_wl_xid(win)->custom_cursor;
if (cursor) do_set_cursor(seat, cursor); if (cursor) do_set_cursor(seat, cursor);
else if (driver->cursor_default()) driver->set_cursor(driver->cursor_default()); else if (driver->cursor_default()) driver->set_cursor(driver->cursor_default());
else win->cursor(driver->standard_cursor()); else win->cursor(driver->standard_cursor());

7
src/drivers/Wayland/Fl_Wayland_Window_Driver.H
View File

@ -59,13 +59,11 @@ private:
cairo_rectangle_int_t *subRect_; // makes sure subwindow remains inside its parent window cairo_rectangle_int_t *subRect_; // makes sure subwindow remains inside its parent window
static bool in_flush; // useful for progressive window drawing static bool in_flush; // useful for progressive window drawing
static Fl_Wayland_Plugin *gl_plugin(); static Fl_Wayland_Plugin *gl_plugin();
struct wl_cursor *cursor_; // non-null when using custom cursor
Fl_Cursor standard_cursor_; // window's standard custom kind Fl_Cursor standard_cursor_; // window's standard custom kind
void delete_cursor_(); void delete_cursor_(struct wld_window *);
struct gl_start_support *gl_start_support_; // for support of gl_start/gl_finish struct gl_start_support *gl_start_support_; // for support of gl_start/gl_finish
public: public:
inline Fl_Cursor standard_cursor() { return standard_cursor_; }; inline Fl_Cursor standard_cursor() { return standard_cursor_; };
struct wl_cursor *cursor() { return cursor_; };
bool in_handle_configure; // distinguish OS and user window resize bool in_handle_configure; // distinguish OS and user window resize
struct window_output { struct window_output {
Fl_Wayland_Screen_Driver::output* output; Fl_Wayland_Screen_Driver::output* output;
@ -137,6 +135,7 @@ public:
struct wld_window { struct wld_window {
Fl_Window *fl_win;
struct wl_list outputs; struct wl_list outputs;
struct wl_surface *wl_surface; struct wl_surface *wl_surface;
struct fl_wld_buffer *buffer; struct fl_wld_buffer *buffer;
@ -147,7 +146,7 @@ struct wld_window {
struct xdg_popup *xdg_popup; struct xdg_popup *xdg_popup;
struct xdg_toplevel *xdg_toplevel; struct xdg_toplevel *xdg_toplevel;
}; };
Fl_Window *fl_win; struct wl_cursor *custom_cursor; // non-null when using custom cursor
enum Fl_Wayland_Window_Driver::kind kind; enum Fl_Wayland_Window_Driver::kind kind;
int configured_width; int configured_width;
int configured_height; int configured_height;

40
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@ -73,7 +73,6 @@ void Fl_Wayland_Window_Driver::destroy_double_buffer() {
Fl_Wayland_Window_Driver::Fl_Wayland_Window_Driver(Fl_Window *win) : Fl_Window_Driver(win) Fl_Wayland_Window_Driver::Fl_Wayland_Window_Driver(Fl_Window *win) : Fl_Window_Driver(win)
{ {
shape_data_ = NULL; shape_data_ = NULL;
cursor_ = NULL;
standard_cursor_ = FL_CURSOR_DEFAULT; standard_cursor_ = FL_CURSOR_DEFAULT;
in_handle_configure = false; in_handle_configure = false;
screen_num_ = -1; screen_num_ = -1;
@ -81,20 +80,21 @@ Fl_Wayland_Window_Driver::Fl_Wayland_Window_Driver(Fl_Window *win) : Fl_Window_D
subRect_ = NULL; subRect_ = NULL;
} }
void Fl_Wayland_Window_Driver::delete_cursor_() { void Fl_Wayland_Window_Driver::delete_cursor_(struct wld_window *xid) {
if (cursor_) { struct wl_cursor *wl_cursor = xid->custom_cursor;
struct cursor_image *new_image = (struct cursor_image*)cursor_->images[0]; if (wl_cursor) {
struct cursor_image *new_image = (struct cursor_image*)wl_cursor->images[0];
struct fl_wld_buffer *offscreen = (struct fl_wld_buffer *)wl_buffer_get_user_data(new_image->buffer); struct fl_wld_buffer *offscreen = (struct fl_wld_buffer *)wl_buffer_get_user_data(new_image->buffer);
struct wld_window fake_xid; struct wld_window fake_xid;
fake_xid.buffer = offscreen; fake_xid.buffer = offscreen;
Fl_Wayland_Graphics_Driver::buffer_release(&fake_xid); Fl_Wayland_Graphics_Driver::buffer_release(&fake_xid);
free(new_image); free(new_image);
free(cursor_->images); free(wl_cursor->images);
free(cursor_->name); free(wl_cursor->name);
free(cursor_); free(wl_cursor);
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
if (scr_driver->default_cursor() == cursor_) scr_driver->default_cursor(scr_driver->xc_arrow); if (scr_driver->default_cursor() == wl_cursor) scr_driver->default_cursor(scr_driver->xc_arrow);
cursor_ = NULL; xid->custom_cursor = NULL;
} }
} }
@ -109,7 +109,6 @@ Fl_Wayland_Window_Driver::~Fl_Wayland_Window_Driver()
delete[] data; delete[] data;
delete shape_data_; delete shape_data_;
} }
delete_cursor_();
if (subRect_) delete subRect_; if (subRect_) delete subRect_;
if (gl_start_support_) { // occurs only if gl_start/gl_finish was used if (gl_start_support_) { // occurs only if gl_start/gl_finish was used
gl_plugin()->destroy(gl_start_support_); gl_plugin()->destroy(gl_start_support_);
@ -475,6 +474,7 @@ void Fl_Wayland_Window_Driver::hide() {
wl_surface_destroy(wld_win->wl_surface); wl_surface_destroy(wld_win->wl_surface);
wld_win->wl_surface = NULL; wld_win->wl_surface = NULL;
} }
if (wld_win->custom_cursor) delete_cursor_(wld_win);
Fl_Wayland_Window_Driver::window_output *window_output, *tmp; Fl_Wayland_Window_Driver::window_output *window_output, *tmp;
wl_list_for_each_safe(window_output, tmp, &wld_win->outputs, link) { wl_list_for_each_safe(window_output, tmp, &wld_win->outputs, link) {
wl_list_remove(&window_output->link); wl_list_remove(&window_output->link);
@ -1303,6 +1303,7 @@ void Fl_Wayland_Window_Driver::resize_after_screen_change(void *data) {
int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) {
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
struct wld_window *xid = (struct wld_window *)Fl_Window_Driver::xid(pWindow);
// Cursor names are the files of directory /usr/share/icons/XXXX/cursors/ // Cursor names are the files of directory /usr/share/icons/XXXX/cursors/
// where XXXX is the name of the current 'cursor theme'. // where XXXX is the name of the current 'cursor theme'.
@ -1345,8 +1346,8 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) {
Fl_Pixmap pxm(xpm); Fl_Pixmap pxm(xpm);
Fl_RGB_Image image(&pxm); Fl_RGB_Image image(&pxm);
this->set_cursor(&image, 1, 3); this->set_cursor(&image, 1, 3);
scr_driver->xc_help = this->cursor_; scr_driver->xc_help = xid->custom_cursor;
this->cursor_ = NULL; xid->custom_cursor = NULL;
} }
scr_driver->default_cursor(scr_driver->xc_help); scr_driver->default_cursor(scr_driver->xc_help);
break; break;
@ -1416,8 +1417,8 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) {
Fl_Pixmap pxm(xpm); Fl_Pixmap pxm(xpm);
Fl_RGB_Image image(&pxm); Fl_RGB_Image image(&pxm);
this->set_cursor(&image, 0, 0); this->set_cursor(&image, 0, 0);
scr_driver->xc_none = this->cursor_; scr_driver->xc_none = xid->custom_cursor;
this->cursor_ = NULL; xid->custom_cursor = NULL;
} }
scr_driver->default_cursor(scr_driver->xc_none); scr_driver->default_cursor(scr_driver->xc_none);
break; break;
@ -1425,7 +1426,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) {
default: default:
return 0; return 0;
} }
if (cursor_) delete_cursor_(); if (xid->custom_cursor) delete_cursor_(xid);
standard_cursor_ = c; standard_cursor_ = c;
scr_driver->set_cursor(); scr_driver->set_cursor();
return 1; return 1;
@ -1515,9 +1516,10 @@ void Fl_Wayland_Window_Driver::label(const char *name, const char *iname) {
int Fl_Wayland_Window_Driver::set_cursor(const Fl_RGB_Image *rgb, int hotx, int hoty) { int Fl_Wayland_Window_Driver::set_cursor(const Fl_RGB_Image *rgb, int hotx, int hoty) {
// build a new wl_cursor and its image // build a new wl_cursor and its image
struct wld_window *xid = (struct wld_window *)Fl_Window_Driver::xid(pWindow);
struct wl_cursor *new_cursor = (struct wl_cursor*)malloc(sizeof(struct wl_cursor)); struct wl_cursor *new_cursor = (struct wl_cursor*)malloc(sizeof(struct wl_cursor));
struct cursor_image *new_image = (struct cursor_image*)calloc(1, sizeof(struct cursor_image)); struct cursor_image *new_image = (struct cursor_image*)calloc(1, sizeof(struct cursor_image));
int scale = fl_wl_xid(pWindow)->scale; int scale = xid->scale;
new_image->image.width = rgb->w() * scale; new_image->image.width = rgb->w() * scale;
new_image->image.height = rgb->h() * scale; new_image->image.height = rgb->h() * scale;
new_image->image.hotspot_x = hotx * scale; new_image->image.hotspot_x = hotx * scale;
@ -1543,11 +1545,11 @@ int Fl_Wayland_Window_Driver::set_cursor(const Fl_RGB_Image *rgb, int hotx, int
delete img_surf; delete img_surf;
memcpy(offscreen->data, offscreen->draw_buffer, offscreen->data_size); memcpy(offscreen->data, offscreen->draw_buffer, offscreen->data_size);
// delete the previous custom cursor, if there was one // delete the previous custom cursor, if there was one
delete_cursor_(); delete_cursor_(xid);
//have this new cursor used //have this new cursor used
cursor_ = new_cursor; xid->custom_cursor = new_cursor;
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
scr_driver->default_cursor(cursor_); scr_driver->default_cursor(xid->custom_cursor);
return 1; return 1;
} }