Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes ASSERT when running fuzzel. #168

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Fixes ASSERT when running fuzzel. #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5e0d9
Fixes layer positioning: Apply only upon surface commit, remove ASSERT.
phkaeser Jan 25, 2025
eb7b210
Merge branch 'main' into fuzzel-repro
phkaeser Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 26 additions & 38 deletions src/layer_panel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ static bool _wlmaker_layer_panel_apply_keyboard(
static bool _wlmaker_layer_panel_apply_layer(
wlmaker_layer_panel_t *layer_panel_ptr,
enum zwlr_layer_shell_v1_layer zwlr_layer);
static void _wlmaker_layer_panel_set_positioning(
wlmtk_panel_positioning_t *positioning_ptr,
const struct wlr_layer_surface_v1_state *state_ptr);

static uint32_t _wlmaker_layer_panel_request_size(
wlmtk_panel_t *panel_ptr,
Expand Down Expand Up @@ -138,9 +135,7 @@ wlmaker_layer_panel_t *_wlmaker_layer_panel_create_injected(
layer_panel_ptr->wlr_layer_surface_v1_ptr = wlr_layer_surface_v1_ptr;
layer_panel_ptr->server_ptr = server_ptr;

wlmtk_panel_positioning_t pos;
_wlmaker_layer_panel_set_positioning(
&pos, &layer_panel_ptr->wlr_layer_surface_v1_ptr->pending);
wlmtk_panel_positioning_t pos = {};
if (!wlmtk_panel_init(
&layer_panel_ptr->super_panel, &pos, server_ptr->env_ptr)) {
_wlmaker_layer_panel_destroy(layer_panel_ptr);
Expand Down Expand Up @@ -187,16 +182,6 @@ wlmaker_layer_panel_t *_wlmaker_layer_panel_create_injected(
&layer_panel_ptr->new_popup_listener,
_wlmaker_layer_panel_handle_new_popup);

if (!_wlmaker_layer_panel_apply_keyboard(
layer_panel_ptr,
wlr_layer_surface_v1_ptr->pending.keyboard_interactive) ||
!_wlmaker_layer_panel_apply_layer(
layer_panel_ptr,
layer_panel_ptr->wlr_layer_surface_v1_ptr->pending.layer)) {
_wlmaker_layer_panel_destroy(layer_panel_ptr);
return NULL;
}

bs_log(BS_INFO, "Created layer panel %p with wlmtk surface %p",
layer_panel_ptr, layer_panel_ptr->wlmtk_surface_ptr);
return layer_panel_ptr;
Expand Down Expand Up @@ -305,7 +290,7 @@ bool _wlmaker_layer_panel_apply_layer(
default:
wl_resource_post_error(
layer_panel_ptr->wlr_layer_surface_v1_ptr->resource,
WL_DISPLAY_ERROR_INVALID_METHOD,
ZWLR_LAYER_SHELL_V1_ERROR_INVALID_LAYER,
"Invalid value for for zwlr_layer value: %d",
layer_panel_ptr->wlr_layer_surface_v1_ptr->pending.layer);
return false;
Expand All @@ -332,25 +317,6 @@ bool _wlmaker_layer_panel_apply_layer(
return true;
}

/* ------------------------------------------------------------------------- */
/** Updates `positioning_ptr` from the given surface state. */
void _wlmaker_layer_panel_set_positioning(
wlmtk_panel_positioning_t *positioning_ptr,
const struct wlr_layer_surface_v1_state *state_ptr)
{
positioning_ptr->anchor = state_ptr->anchor;

positioning_ptr->desired_width = state_ptr->desired_width;
positioning_ptr->desired_height = state_ptr->desired_height;

positioning_ptr->margin_left = state_ptr->margin.left;
positioning_ptr->margin_top = state_ptr->margin.top;
positioning_ptr->margin_right = state_ptr->margin.right;
positioning_ptr->margin_bottom = state_ptr->margin.bottom;

positioning_ptr->exclusive_zone = state_ptr->exclusive_zone;
}

/* ------------------------------------------------------------------------- */
/** Implements wlmtk_panel_vmt_t::request_size. */
uint32_t _wlmaker_layer_panel_request_size(
Expand Down Expand Up @@ -384,8 +350,30 @@ void _wlmaker_layer_panel_handle_surface_commit(
struct wlr_layer_surface_v1_state *state_ptr =
&layer_panel_ptr->wlr_layer_surface_v1_ptr->pending;

wlmtk_panel_positioning_t pos;
_wlmaker_layer_panel_set_positioning(&pos, state_ptr);
wlmtk_panel_positioning_t pos = {
.anchor = state_ptr->anchor,
.desired_width = state_ptr->desired_width,
.desired_height = state_ptr->desired_height,

.margin_left = state_ptr->margin.left,
.margin_top = state_ptr->margin.top,
.margin_right = state_ptr->margin.right,
.margin_bottom = state_ptr->margin.bottom,

.exclusive_zone = state_ptr->exclusive_zone
};
// Sanity check position and anchor values.
if ((0 == pos.desired_width &&
0 == (pos.anchor & (WLR_EDGE_LEFT | WLR_EDGE_RIGHT))) ||
(0 == pos.desired_height &&
0 == (pos.anchor & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)))) {
wl_resource_post_error(
layer_panel_ptr->wlr_layer_surface_v1_ptr->resource,
ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
"Invalid size %d x %d for anchor 0x%"PRIx32,
pos.desired_width, pos.desired_height, pos.anchor);
}

wlmtk_panel_commit(
&layer_panel_ptr->super_panel,
state_ptr->configure_serial,
Expand Down
2 changes: 0 additions & 2 deletions src/toolkit/panel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ struct wlr_box wlmtk_panel_compute_dimensions(
if (0 == dims.width) {
// Width not given. Protocol requires the anchor to be set on left &
// right edges, and translates to full width (minus margins).
BS_ASSERT(anchor & WLR_EDGE_LEFT && anchor & WLR_EDGE_RIGHT);
dims.x = max_dims.x + margin_left;
dims.width = max_dims.width - margin_left - margin_right;
} else if (anchor & WLR_EDGE_LEFT && !(anchor & WLR_EDGE_RIGHT)) {
Expand All @@ -183,7 +182,6 @@ struct wlr_box wlmtk_panel_compute_dimensions(
if (0 == dims.height) {
// Height not given. Protocol requires the anchor to be set on top &
// bottom edges, and translates to full height (minus margins).
BS_ASSERT(anchor & WLR_EDGE_TOP && anchor & WLR_EDGE_BOTTOM);
dims.y = max_dims.y + margin_top;
dims.height = max_dims.height - margin_top - margin_bottom;
} else if (anchor & WLR_EDGE_TOP && !(anchor & WLR_EDGE_BOTTOM)) {
Expand Down