Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-30 04:55:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Wayland: clearer procedure to complete initialisation of screen data

Browse Source
This commit is contained in:
ManoloFLTK
2023-05-03 08:50:19 +02:00
parent 9ffeef7697
commit a94fed77e4
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/src/wayland.dox
+1
View File
@@ -922,6 +922,7 @@ struct Fl_Wayland_Screen_Driver::output { // one record for each display
struct wl_output *wl_output; // the Wayland object for this display struct wl_output *wl_output; // the Wayland object for this display
int wld_scale; // Wayland scale factor int wld_scale; // Wayland scale factor
float gui_scale; // FLTK scale factor float gui_scale; // FLTK scale factor
bool done; // true means record members have been initialized
struct wl_list link; // links these records together struct wl_list link; // links these records together
}; };
</pre> </pre>
src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
+1
View File
@@ -73,6 +73,7 @@ public:
struct wl_output *wl_output; struct wl_output *wl_output;
int wld_scale; // Wayland scale factor int wld_scale; // Wayland scale factor
float gui_scale; // FLTK scale factor float gui_scale; // FLTK scale factor
bool done;
struct wl_list link; struct wl_list link;
}; };
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+9 -1
View File
@@ -977,6 +977,7 @@ static void output_done(void *data, struct wl_output *wl_output)
} }
xp = xp->next; xp = xp->next;
} }
output->done = true;
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->seat) try_update_cursor(scr_driver->seat); if (scr_driver->seat) try_update_cursor(scr_driver->seat);
@@ -1082,7 +1083,6 @@ static void registry_handle_global(void *user_data, struct wl_registry *wl_regis
wl_output_add_listener(output->wl_output, &output_listener, output); wl_output_add_listener(output->wl_output, &output_listener, output);
wl_list_insert(&(scr_driver->outputs), &output->link); wl_list_insert(&(scr_driver->outputs), &output->link);
scr_driver->screen_count_set( wl_list_length(&(scr_driver->outputs)) ); scr_driver->screen_count_set( wl_list_length(&(scr_driver->outputs)) );
wl_display_roundtrip(scr_driver->wl_display); // important
//fprintf(stderr, "wl_output: id=%d wl_output=%p screen_count()=%d\n", id, output->wl_output, Fl::screen_count()); //fprintf(stderr, "wl_output: id=%d wl_output=%p screen_count()=%d\n", id, output->wl_output, Fl::screen_count());
} else if (strcmp(interface, xdg_wm_base_interface.name) == 0) { } else if (strcmp(interface, xdg_wm_base_interface.name) == 0) {
@@ -1107,6 +1107,7 @@ static void registry_handle_global(void *user_data, struct wl_registry *wl_regis
output->wld_scale = 1; output->wld_scale = 1;
output->gui_scale = 1.f; output->gui_scale = 1.f;
output->width = 1440; output->height = 900; output->width = 1440; output->height = 900;
output->done = true;
wl_list_insert(&(scr_driver->outputs), &output->link); wl_list_insert(&(scr_driver->outputs), &output->link);
scr_driver->screen_count_set(1); scr_driver->screen_count_set(1);
} }
@@ -1172,8 +1173,15 @@ 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) { static void sync_done(void *data, struct wl_callback *cb, uint32_t time) {
// runs after all calls to registry_handle_global()
*(struct wl_callback **)data = NULL; *(struct wl_callback **)data = NULL;
wl_callback_destroy(cb); wl_callback_destroy(cb);
// keep processing until output_done() has run for each screen
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
Fl_Wayland_Screen_Driver::output *output;
wl_list_for_each(output, &scr_driver->outputs, link) { // each screen of the system
while (!output->done) wl_display_dispatch(scr_driver->wl_display);
}
} }