mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash when resizing tiled scratchpad windows

Browse source 
Splitting and then hiding a scratchpad container results in
a segfault.

fixes #6693
This commit is contained in:
bretello 2023-07-17 19:31:53 +02:00 • committed by Ronan Pigott
parent c3e6390073
commit dc634c4a13
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sway/commands/resize.c
View file

@ -75,6 +75,10 @@ void container_resize_tiled(struct sway_container *con,
return; return;
} }
if (container_is_scratchpad_hidden_or_child(con)) {
return;
}
// For HORIZONTAL or VERTICAL, we are growing in two directions so select // For HORIZONTAL or VERTICAL, we are growing in two directions so select
// both adjacent siblings. For RIGHT or DOWN, just select the next sibling. // both adjacent siblings. For RIGHT or DOWN, just select the next sibling.
// For LEFT or UP, convert it to a RIGHT or DOWN resize and reassign con to // For LEFT or UP, convert it to a RIGHT or DOWN resize and reassign con to
@ -249,6 +253,10 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
struct movement_amount *amount) { struct movement_amount *amount) {
struct sway_container *current = config->handler_context.container; struct sway_container *current = config->handler_context.container;
if (container_is_scratchpad_hidden_or_child(current)) {
return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
}
if (amount->unit == MOVEMENT_UNIT_DEFAULT) { if (amount->unit == MOVEMENT_UNIT_DEFAULT) {
amount->unit = MOVEMENT_UNIT_PPT; amount->unit = MOVEMENT_UNIT_PPT;
} }
@ -292,6 +300,11 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
*/ */
static struct cmd_results *resize_set_tiled(struct sway_container *con, static struct cmd_results *resize_set_tiled(struct sway_container *con,
struct movement_amount *width, struct movement_amount *height) { struct movement_amount *width, struct movement_amount *height) {
if (container_is_scratchpad_hidden_or_child(con)) {
return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
}
if (width->amount) { if (width->amount) {
if (width->unit == MOVEMENT_UNIT_PPT || if (width->unit == MOVEMENT_UNIT_PPT ||
width->unit == MOVEMENT_UNIT_DEFAULT) { width->unit == MOVEMENT_UNIT_DEFAULT) {