mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-23 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config/output: Use INT_MAX as x/y unset value

Browse source 
We oftne use -1 to indicate unset values. In case of output (x, y), we
would consider the fields set if they are not both -1. This means that
(0, -1) and (-1, 0) are valid coordinates, but (-1, -1) is not.

We support negative output positioning, so we cannot use -1 to mean
unset. Zero is also not an option as that would disallow reverting a set
position back to (0, 0).

INT_MAX is an unreasonable output position, so use it to indicate unset
values, and only use the value when both are set.

(cherry picked from commit 8ac1f72c9e)
This commit is contained in:
Kenny Levinsen 2025-04-30 13:34:31 +02:00 • committed by Simon Ser
parent caeee85d8d
commit 983af1a9b6
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/config/output.c
View file

@ -67,7 +67,7 @@ struct output_config *new_output_config(const char *name) {
oc->refresh_rate = -1;
oc->custom_mode = -1;
oc->drm_mode.type = -1;
oc->x = oc->y = -1;
oc->x = oc->y = INT_MAX;
oc->scale = -1;
oc->scale_filter = SCALE_FILTER_DEFAULT;
oc->transform = -1;
@ -93,11 +93,11 @@ static void supersede_output_config(struct output_config *dst, struct output_con
if (src->height != -1) {
dst->height = -1;
}
if (src->x != -1) {
dst->x = -1;
if (src->x != INT_MAX) {
dst->x = INT_MAX;
}
if (src->y != -1) {
dst->y = -1;
if (src->y != INT_MAX) {
dst->y = INT_MAX;
}
if (src->scale != -1) {
dst->scale = -1;
@ -157,10 +157,10 @@ static void merge_output_config(struct output_config *dst, struct output_config
if (src->height != -1) {
dst->height = src->height;
}
if (src->x != -1) {
if (src->x != INT_MAX) {
dst->x = src->x;
}
if (src->y != -1) {
if (src->y != INT_MAX) {
dst->y = src->y;
}
if (src->scale != -1) {
@ -527,7 +527,7 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
}
// Find position for it
if (oc && (oc->x != -1 || oc->y != -1)) {
if (oc && oc->x != INT_MAX && oc->y != INT_MAX) {
sway_log(SWAY_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
wlr_output_layout_add(root->output_layout, wlr_output, oc->x, oc->y);
} else {