mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-21 05:33:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg: Detect pending configure request timeouts

Browse source
This commit is contained in:
John Lindgren 2023-02-28 11:30:42 -05:00 • committed by Johan Malm
parent 31ec8f050c
commit ea09fc3850
2 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/view.h
View file

@ -95,6 +95,7 @@ struct view {
/* used by xdg-shell views */ /* used by xdg-shell views */
uint32_t pending_configure_serial; uint32_t pending_configure_serial;
struct wl_event_source *pending_configure_timeout;
struct ssd *ssd; struct ssd *ssd;

53
src/xdg.c
View file

@ -7,6 +7,8 @@
#include "view-impl-common.h" #include "view-impl-common.h"
#include "workspaces.h" #include "workspaces.h"
#define CONFIGURE_TIMEOUT_MS 100
static struct xdg_toplevel_view * static struct xdg_toplevel_view *
xdg_toplevel_view_from_view(struct view *view) xdg_toplevel_view_from_view(struct view *view)
{ {
@ -78,17 +80,53 @@ handle_commit(struct wl_listener *listener, void *data)
|| current->height != size.height; || current->height != size.height;
uint32_t serial = view->pending_configure_serial; uint32_t serial = view->pending_configure_serial;
if (serial > 0 && serial >= xdg_surface->current.configure_serial) { if (serial > 0 && serial == xdg_surface->current.configure_serial) {
assert(view->pending_configure_timeout);
wl_event_source_remove(view->pending_configure_timeout);
view->pending_configure_serial = 0;
view->pending_configure_timeout = NULL;
update_required = true; update_required = true;
if (serial == xdg_surface->current.configure_serial) {
view->pending_configure_serial = 0;
}
} }
if (update_required) { if (update_required) {
view_impl_apply_geometry(view, size.width, size.height); view_impl_apply_geometry(view, size.width, size.height);
} }
} }
static int
handle_configure_timeout(void *data)
{
struct view *view = data;
assert(view->pending_configure_serial > 0);
assert(view->pending_configure_timeout);
const char *app_id = view_get_string_prop(view, "app_id");
wlr_log(WLR_ERROR, "client (%s) did not respond to configure request "
"in %d ms", app_id, CONFIGURE_TIMEOUT_MS);
wl_event_source_remove(view->pending_configure_timeout);
view->pending_configure_serial = 0;
view->pending_configure_timeout = NULL;
view_impl_apply_geometry(view, view->current.width,
view->current.height);
return 0; /* ignored per wl_event_loop docs */
}
static void
set_pending_configure_serial(struct view *view, uint32_t serial)
{
view->pending_configure_serial = serial;
if (!view->pending_configure_timeout) {
view->pending_configure_timeout =
wl_event_loop_add_timer(view->server->wl_event_loop,
handle_configure_timeout, view);
}
wl_event_source_timer_update(view->pending_configure_timeout,
CONFIGURE_TIMEOUT_MS);
}
static void static void
handle_map(struct wl_listener *listener, void *data) handle_map(struct wl_listener *listener, void *data)
{ {
@ -118,6 +156,11 @@ handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&xdg_toplevel_view->set_app_id.link); wl_list_remove(&xdg_toplevel_view->set_app_id.link);
wl_list_remove(&xdg_toplevel_view->new_popup.link); wl_list_remove(&xdg_toplevel_view->new_popup.link);
if (view->pending_configure_timeout) {
wl_event_source_remove(view->pending_configure_timeout);
view->pending_configure_timeout = NULL;
}
view_destroy(view); view_destroy(view);
} }
@ -231,7 +274,7 @@ xdg_toplevel_view_configure(struct view *view, struct wlr_box geo)
view->pending = geo; view->pending = geo;
if (serial > 0) { if (serial > 0) {
view->pending_configure_serial = serial; set_pending_configure_serial(view, serial);
} else if (view->pending_configure_serial == 0) { } else if (view->pending_configure_serial == 0) {
/* /*
* We can't assume here that view->current is equal to * We can't assume here that view->current is equal to