From 147bda5471c2463a141e23e45bdc17e3830755ea Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 19 Feb 2023 08:53:00 +0100 Subject: Rename fd_callback() to wayland_socket_callback() --- src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index 8279736ca..efe584229 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -1101,7 +1101,7 @@ static const struct wl_registry_listener registry_listener = { }; -static void fd_callback(int fd, struct wl_display *display) { +static void wayland_socket_callback(int fd, struct wl_display *display) { struct pollfd fds = (struct pollfd) { fd, POLLIN, 0 }; do { if (wl_display_dispatch(display) == -1) { @@ -1144,10 +1144,8 @@ void Fl_Wayland_Screen_Driver::open_display_platform() { if (!has_xrgb) { Fl::fatal("Error: no WL_SHM_FORMAT_ARGB8888 shm format\n"); } - /*if (compositor == Fl_Wayland_Screen_Driver::unspecified) { - Fl::warning("FLTK could not identify the type of the running Wayland compositor"); - }*/ - Fl::add_fd(wl_display_get_fd(wl_display), FL_READ, (Fl_FD_Handler)fd_callback, wl_display); + Fl::add_fd(wl_display_get_fd(wl_display), FL_READ, (Fl_FD_Handler)wayland_socket_callback, + wl_display); fl_create_print_window(); } -- cgit v1.2.3