sway/commands: Handle incorrect resize unit #8640
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emersion
reviewed
Apr 1, 2025
emersion
reviewed
Apr 1, 2025
emersion
reviewed
Apr 1, 2025
sahinf
force-pushed
the
fix-resize-crashing
branch
from
d302b54 to
d646a4e
Compare
sahinf
force-pushed
the
fix-resize-crashing
branch
from
d646a4e to
86c68c8
Compare
emersion
reviewed
Apr 13, 2025
emersion
reviewed
Apr 13, 2025
| @@ -295,6 +295,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat, | |||
| struct cmd_results *res = handler->handle(argc-1, argv+1); | |||
| list_add(res_list, res); | |||
| if (res->status == CMD_INVALID) { | |||
| sway_log(SWAY_ERROR, "%s", res->error); | |||
There was a problem hiding this comment.
We don't log command error results, these are displayed to the user by swaymsg.
There was a problem hiding this comment.
But these errors are from for_window directives within the config, not from the user running swaymsg. They currently don't get displayed to the user at all. Should they not get printed if from for_window directives?
for_window [app_id="Alacritty"] {
floating enable
move position 600 pt 200 pt
resize set width 300 pt
resize set height 300 pt
}
exec alacritty
There was a problem hiding this comment.
Ah, right. Yeah, would make sense to me to print from the function that executes for_window criteria.
emersion
reviewed
Apr 13, 2025
emersion
reviewed
Apr 13, 2025
emersion
reviewed
Apr 13, 2025
sahinf
force-pushed
the
fix-resize-crashing
branch
from
b291208 to
2dad368
Compare
problem: an invalid usage of the command resize set will cause sway to crash because it doesn't check for an invalid height. solution: validate height along with width. fixes swaywm#8619 collect errors of all cmd_resize variations and bubble them up Log invalid command usage without this, the invalid command usages from the config criteria do not get logged or printed to the user anywhere.
sahinf
force-pushed
the
fix-resize-crashing
branch
from
2dad368 to
02b3c6f
Compare
emersion
reviewed
Apr 17, 2025
| "<width|height|up|down|left|right> [<amount>] [px|ppt]'"; | ||
|
|
||
| return cmd_results_new(CMD_INVALID, "%s", usage); | ||
| return error; |
There was a problem hiding this comment.
Seems like with this change we no longer report an error when executing resize foo.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
problem: an invalid usage of the command
resize setwill cause sway to crash because it doesn't check for an invalid height.solution:
fixes #8619