sync: merge upstream master into forked master
#8
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
This makes the behavior of floating containers more consistent with i3. The coordinates of the container are scaled when the size of the workspace it is on changes or when the container is moved between workspaces on different outputs. For scratchpad containers, add a new state that preserves the dimensions of the last output the window appeared on. This is necessary because after a container is hidden in the scratchpad, we expect it to be in the same relative position on the output when it reappears. We can't just use the container's attached workspace because that workspace's dimensions might have been changed or the workspace as a whole could have been destroyed.
Fixes an issue where an already visible scratchpad window being moved due to 'scratchpad show' leaves the entire workspace at the top of the focus stack in the old workspace. Moving by 'focus output' back to the old workspace would focus the entire workspace instead of just the last active container.
Otherwise the initial bounds would be `INT_MAX` until `handle_mode` or `handle_commit` is called :)
The Wayland protocol better serves this purpose, and is supported by more compositors.
This was introduced in the last libinput release.
Fixes the following error:
../sway/ipc-json.c:928:17: error: enumeration value 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror=switch]
928 | switch (libinput_device_config_accel_get_profile(device)) {
| ^~~~~~
The opaque region is set incorrectly if updated on-the-fly if switching from an opaque to a non opaque background.
This avoids us from using a bogus background_color value that mutates as swaybar renders things and deciding opacity depending on that. Also remove a redundant full surface clear. Just directly write our desired background color.
…onitor swaywm#7524 was a partial fix. Seems like this is still an issue when unplugging and plugging the monitor back in. Closes: swaywm#7528
We already do this in handle_commit().
When there is no damage, no need to perform an output commit, even when direct scan-out is used.
During direct scan-out, pass the damaged region to the wlroots backend.
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reduces code duplication.
No need to iterate over the outputs manually.
Simple helpers to allocate and format a string.
This allows the compiler to catch mismatches between the format string and the arguments passed in. Need to add -Wno-format-zero-length because we pass an empty string on purpose in swaybar/render.c.
cmd_results_new() does not take the command name as argument.
And fix the resulting build failures.
We already had a similar function in there.
This lets us easily add rendering state that we need in the future
With recent wlroots changes, backends which don't support output modes can now support being disabled. We were always marking mode-less outputs as disabled. Stop doing that, check whether the output takes up some space in the layout instead.
This is now unused.
Fix swaylock showing transient cursor after locked.
User-contributed scripts are being moved over to this repository: https://github.com/OctopusET/sway-contrib
|
@kgilmer pinging you here to see what the current status is; not sure whether we can merge this as-is (in the sense that it doesn't break Regolith functionality), but it'd be nice to be up-to-date with upstream I guess |
Regular clients are not allowed to use this interface. wlroots already sends a protocol error if a non-Xwayland client tries to use this interface, but let's remove all temptation by hiding it completely.
|
Hi @georglauterbach , thanks for the bump. We're on the home stretch of the 3.0 release and so we'll take this up once that's out the door. Thanks! |
|
Sounds awesome - can't wait to go v3 :D |
If a floating client resizes itself, sway updates several of its internal dimensions to match but not wlr_toplevel. This means that the next time wlroots sends a toplevel configure event, it can have wrong coordinates that resize the client back to its old size. To fix this, let's just use wlr_xdg_toplevel_set_size so the wlr_toplevel has the same dimensions as sway. Fixes swaywm#5266.
This isn't the right fix for this issue because the xwayland code also uses this function and updating the wlr_toplevel there doesn't make sense and also causes problems. Fixes swaywm#7722. This reverts commit bf44690.
If a floating client resizes itself, sway updates several of its internal dimensions to match but not wlr_toplevel. This means that the next time wlroots sends a toplevel configure event, it can have wrong coordinates that resize the client back to its old size. To fix this, let's just use wlr_xdg_toplevel_set_size so the wlr_toplevel has the same dimensions as sway. Exactly the same as 0183b9d but the logic is onlly applied to xdg_shell and not xwayland.
|
I rebased onto official upstream again to catch the latest changes. All in all, I had two or thre merge conflicts that I resolved; we may want to have a look at the last commits that I had to touch. |
|
Thanks for the PR. This will be useful when sway 1.9 is released and packaged :) |
|
any reason why we shouldn't build this change into the |
|
The master branch is in sync with |
ztec
pushed a commit
to ztec/sway-regolith
that referenced
this pull request
Feb 6, 2025
../sway/config/output.c:33:21: runtime error: member access within null pointer of type 'struct sway_output'
AddressSanitizer:DEADLYSIGNAL
=================================================================
==7856==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000080 (pc 0x63da8558205c bp 0x7ffdc35881a0 sp 0x7ffdc3588160 T0)
==7856==The signal is caused by a READ memory access.
==7856==Hint: address points to the zero page.
#0 0x63da8558205c in output_get_identifier ../sway/config/output.c:33
regolith-linux#1 0x63da855865c3 in store_output_config ../sway/config/output.c:220
regolith-linux#2 0x63da855d4066 in cmd_output ../sway/commands/output.c:106
regolith-linux#3 0x63da8547f2e3 in config_command ../sway/commands.c:425
regolith-linux#4 0x63da8548f3fc in read_config ../sway/config.c:822
regolith-linux#5 0x63da8548a224 in load_config ../sway/config.c:435
regolith-linux#6 0x63da8548b065 in load_main_config ../sway/config.c:507
regolith-linux#7 0x63da854bee8d in main ../sway/main.c:351
regolith-linux#8 0x77e2ea643ccf (/usr/lib/libc.so.6+0x25ccf) (BuildId: c0caa0b7709d3369ee575fcd7d7d0b0fc48733af)
regolith-linux#9 0x77e2ea643d89 in __libc_start_main (/usr/lib/libc.so.6+0x25d89) (BuildId: c0caa0b7709d3369ee575fcd7d7d0b0fc48733af)
regolith-linux#10 0x63da8547ad64 in _start (/home/simon/src/sway/build/sway/sway+0x372d64) (BuildId: 3fa2e8838c1c32713b40aec6b1e84bbe4db5bde8)
Fixes: 1267e47 ("config/output: Refactor handling of tiered configs")
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.
This PR synchronizes our
masterbranch with Sway's official upstreammasterbranch.What Did I Do?
masterinto mymasterCC @SoumyaRanjanPatnaik