Skip to content

Commit

Permalink
Slightly simpler Fl_Wayland_Screen_Driver::open_display_platform()
Browse files Browse the repository at this point in the history
  • Loading branch information
@ManoloFLTK
ManoloFLTK committed Apr 27, 2023
1 parent 982d104 commit 9ea0cc8
Showing 1 changed file with 14 additions and 19 deletions.
33 changes: 14 additions & 19 deletions src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,6 @@ extern const char *fl_bg2;
// end of extern additions workaround


static bool has_xrgb = false;


static void shm_format(void *data, struct wl_shm *wl_shm, uint32_t format)
{
if (format == Fl_Wayland_Graphics_Driver::wld_format)
has_xrgb = true;
}

static struct wl_shm_listener shm_listener = {
shm_format
};

static void do_set_cursor(struct Fl_Wayland_Screen_Driver::seat *seat, struct wl_cursor *wl_cursor = NULL)
{
struct wl_cursor_image *image;
Expand Down Expand Up @@ -1044,7 +1031,6 @@ static void registry_handle_global(void *user_data, struct wl_registry *wl_regis
} else if (strcmp(interface, "wl_shm") == 0) {
scr_driver->wl_shm = (struct wl_shm*)wl_registry_bind(wl_registry,
id, &wl_shm_interface, 1);
wl_shm_add_listener(scr_driver->wl_shm, &shm_listener, NULL);

} else if (strcmp(interface, "wl_seat") == 0) {
if (version < 2) {
Expand Down Expand Up @@ -1181,6 +1167,17 @@ Fl_Wayland_Screen_Driver::Fl_Wayland_Screen_Driver() : Fl_Unix_Screen_Driver() {
}


static void sync_done(void *data, struct wl_callback *cb, uint32_t time) {
*(struct wl_callback **)data = NULL;
wl_callback_destroy(cb);
}


static const struct wl_callback_listener sync_listener = {
sync_done
};


void Fl_Wayland_Screen_Driver::open_display_platform() {
static bool beenHereDoneThat = false;
if (beenHereDoneThat)
Expand All @@ -1199,11 +1196,9 @@ void Fl_Wayland_Screen_Driver::open_display_platform() {

wl_registry = wl_display_get_registry(wl_display);
wl_registry_add_listener(wl_registry, &registry_listener, NULL);
wl_display_dispatch(wl_display);
wl_display_roundtrip(wl_display);
if (!has_xrgb) {
Fl::fatal("Error: no WL_SHM_FORMAT_ARGB8888 shm format\n");
}
struct wl_callback *registry_cb = wl_display_sync(wl_display);
wl_callback_add_listener(registry_cb, &sync_listener, &registry_cb);
while (registry_cb) wl_display_dispatch(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();
Expand Down

2 comments on commit 9ea0cc8

@wcout
Copy link
Contributor

@wcout wcout commented on 9ea0cc8 May 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ManoloFLTK This commit causes a regression on my system (Ubuntu 20.04) under Wayland: Fl::screen_xywh() does not return values for W/H.
Reproduce with fullscreen test program. It shows the screen size as -1x-1.-
Can you see that too?

@ManoloFLTK
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. This is now repaired with commit 02c7ee5 .

Please sign in to comment.