Skip to content

Ignore stale client commits on floating resize - #9215

Open
jbms wants to merge 1 commit into
swaywm:masterfrom
jbms:sway-stale-client-commit-fix
Open

Ignore stale client commits on floating resize#9215
jbms wants to merge 1 commit into
swaywm:masterfrom
jbms:sway-stale-client-commit-fix

Conversation

@jbms

@jbms jbms commented Jul 9, 2026

Copy link
Copy Markdown

When a new view is mapped, criteria rules may configure its geometry (e.g. resize set). This configuration sends a new configure event to the client.

However, during the map event handling, we are still processing the initial commit from the client. After the map event is handled and the rule-configured geometry is applied via a transaction, the compositor's commit handler (handle_commit) continues.

For floating containers, handle_commit resizes the container to match the client's committed buffer size. If it processes the initial commit (which has the initial client size, not the configured one), it overrides the configured geometry back to the initial size.

To fix this, we introduce is_commit_stale helper which checks if there is a pending or scheduled configure event with a newer serial than the serial acknowledged by the current commit. If the commit is stale, we ignore its size for resizing floating containers, waiting instead for the client to acknowledge and commit the newly configured size.

How to reproduce:

  1. Register the for_window rule: swaymsg 'for_window [title="Scratchpad Test"] move scratchpad, resize set 500 500'

  2. Start the client: foot -T "Scratchpad Test"

  3. Query the scratchpad window geometry: swaymsg -t get_tree | jq '.. | select(.name? == "__i3_scratch") | .floating_nodes[] | select(.name == "Scratchpad Test") | .rect'

    On buggy versions, this will output the client's default size instead of the configured 500x500.

When a new view is mapped, criteria rules may configure its
geometry (e.g. `resize set`). This configuration sends a new
configure event to the client.

However, during the map event handling, we are still processing
the initial commit from the client. After the map event is
handled and the rule-configured geometry is applied via a
transaction, the compositor's commit handler (`handle_commit`)
continues.

For floating containers, `handle_commit` resizes the container to
match the client's committed buffer size. If it processes the
initial commit (which has the initial client size, not the
configured one), it overrides the configured geometry back to the
initial size.

To fix this, we introduce `is_commit_stale` helper which checks
if there is a pending or scheduled configure event with a newer
serial than the serial acknowledged by the current commit. If the
commit is stale, we ignore its size for resizing floating
containers, waiting instead for the client to acknowledge and
commit the newly configured size.

How to reproduce:
1. Register the for_window rule:
   swaymsg 'for_window [title="Scratchpad Test"] move scratchpad, resize set 500 500'
2. Start the client:
   foot -T "Scratchpad Test"
3. Query the scratchpad window geometry:
   swaymsg -t get_tree | jq '.. | select(.name? == "__i3_scratch") | .floating_nodes[] | select(.name == "Scratchpad Test") | .rect'

   On buggy versions, this will output the client's default size
   instead of the configured 500x500.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant