Commit Graph
100 Commits
Author SHA1 Message Date
Isaac Freund 6e9bd83e1d Root: use Output.PendingState for fallback
Using the same type for these has the potential to simplify some future
code.
2024-01-12 16:49:04 -06:00
Isaac Freund 62dbe34bda river: fix -log-level filtering
This has been broken since the Zig 0.11.0 upgrade it seems.
2024-01-11 17:10:26 -06:00
Isaac Freund c9838c31b6 Keyboard: don't send enter before keymap event
It's unclear if this is technically a violation of the protocol or not,
but it makes little sense to do this and many clients in the wild crash
if wl_keyboard.enter is sent before wl_keyboard.keymap.
2024-01-11 16:55:02 -06:00
Isaac Freund ec8f57e704 Keyboard: check translated keysyms for mappings
If our current approch without xkbcommon translation does not match any
mapping on a key event attempt to match the translated keysym as well.

This makes e.g. the keypad number keys (e.g. KP_1) work intuitively as
they may require translation with numlock active.

The reason we stopped doing this in I7c02ebcbc was due to layout where
e.g. Super+Shift+Space is translated as Space with the Shift modifier
consumed, thereby conflicting with a separate mapping for Super+Space.
This should not be a issue anymore though as we now only run a maximum
of one mapping per key event and we attemt to match mappings without
xkbcommon translation before attempting with translation.
2024-01-11 15:06:33 -06:00
Isaac Freund f6c434c7a7 river: log version during startup 2024-01-10 17:32:35 -06:00
Isaac Freund cc1f988e56 Root: fix stack order on restore from 0 outputs 2024-01-09 13:11:16 -06:00
Isaac Freund c38e7e2d87 Root: remove unneeded fallback.inflight lists 2024-01-09 13:03:55 -06:00
Isaac Freund 5947f04408 Seat: fix potential crash in handleMapping()
I haven't actually managed to reproduce a crash here yet but I feel much
more comfortable about this code with this change.
2024-01-07 16:55:10 -06:00
Isaac Freund 540ca043df Keyboard: fix mapping XF86ScreenSaver 2024-01-06 20:36:53 -06:00
Isaac Freund afbc84c994 river: re-add wl_drm support for now
It seems to be a bit too early to drop support for this legacy protocol.

Xwayland apparently still relies on it for hardware acceleration as do
fairly recent mesa versions still in widespread use.
2024-01-06 19:23:55 -06:00
Isaac Freund 9aa0f1a9a6 Output: fix possible crash on destroy 2024-01-05 12:50:36 -06:00
Isaac Freund 393bfb42b9 Keyboard: delete some uneeded code 2024-01-05 12:31:55 -06:00
Isaac Freund 913770975b Cursor: clean up cursor theme loading
wlroots will now load xcursor themes at the correct scale automatically
based on the scale of the outputs where ther cursors are displayed.

Also make the error handling a bit more robust.
2024-01-04 14:44:51 -06:00
Isaac Freund ebb6d1bdd1 xdg-activation: fix race with transaction system
This code could allows the view to be focused and urgent at the
same time if the request to activate the view is received just after
the pending focus has been set but before the transaction completes.
2024-01-04 10:10:31 -06:00
Isaac Freund 28dcd8320a linux-dmabuf: send better per-surface feedback
This commit leverages the new wlr_scene helper to send custom feedback
per surface rather than using the same default feedback for every
surface. This should allow direct scanout to work more reliably with
multiple outputs for example.
2024-01-03 17:23:53 -06:00
Isaac Freund 80ced04f68 river: drop support for wl_drm
wl_drm is a legacy interface superseded by the linux-dmabuf
protocol. All clients should migrate.

This commit drops support for the protocol which should help find
whatever problematic clients are left in the wild.

If it turns out that this is too soon we can easily keep supporting
wl_drm for a little while longer as wlroots has not yet dropped support
for it.
2024-01-03 17:22:00 -06:00
Isaac Freund db70868c04 XdgToplevel: fix frame perfection on unmap
It looks like the old workaround for this wlroots API wart is no longer
sufficient for wlroots 0.17.
2024-01-03 12:39:43 -06:00
Isaac Freund be4dbe3fe7 Keyboard: clarify keypress routing logic 2024-01-01 23:02:55 -06:00
Isaac Freund 40920c7818 TextInput: fix consecutive enable requests
The wording of the text-input-v3 protocol is quite confusing here
but I'm pretty sure this is now correct.
2024-01-01 23:02:55 -06:00
Isaac Freund 6f311af3b3 TextInput/InputRelay: style nits
There should be no functional changes in this commit
2024-01-01 23:02:55 -06:00
Isaac Freund 134a6bcfb5 TextInput: handle multiple text inputs correctly
The protocol states that we must send enter and leave to all text input
objects if the client has created multiple.

Only one text input is allowed to be activated by the client per seat
however.
2024-01-01 23:02:55 -06:00
Isaac Freund 49defcfb7a TextInput: remove pending_focused_surface
This state doesn't need to exist, just get the focus from the Seat.
2024-01-01 23:02:55 -06:00
Isaac Freund 3aba3abbcd build: require at least wlroots 0.17.1
There are enough bugs fixed in 0.17.1 which are relevant to river that I
think it's worthwhile to refuse to compile against 0.17.1.
2024-01-01 22:55:15 -06:00
Isaac Freund a128a574a4 output-management: work around wlroots crash 2024-01-01 22:52:25 -06:00
Isaac Freund 5f0c9e2ccf output-management: fix output config application
Currently wlr-output-management config application is broken since the
pre 0.17 code relied on the (now removed) output enable/disable event to
be emitted as part of the state application.

The old code was pretty smelly and hard to understand, I'm glad the
upstream improvements pushed river's code in this directions.
2024-01-01 22:52:25 -06:00
Isaac Freund b440767b54 gamma-control: track wlroots 0.17 changes 2023-12-29 16:22:15 -06:00
Isaac Freund 677766956e deps: update to lastest zig-wlroots
This fixes a few issues with the XwaylandSurface bindings
2023-12-06 11:00:45 +01:00
Isaac Freund 093b85d234 build: fix comment on scanner.generate() versions 2023-12-05 11:37:15 +01:00
Isaac Freund cf06498f22 ci: fix arch and alpine 2023-12-05 11:25:17 +01:00
Isaac Freund deb671bec8 Output: fix initial commit for wayland backend
Also add some more logging
2023-12-05 11:06:27 +01:00
Isaac Freund d207e08dab Root: fix faulty assertion, cleanup
Thanks to tiosgz for prompting me to look at this more closely.

There doesn't seem to be any compelling reason to use the
wlr_scene_output_layout helper, it's simpler to just make the two
necessary SceneOutput.setPosition() calls manually. This will hopefully
be refactored down to a single call eventually as well.
2023-12-05 10:32:30 +01:00
Isaac Freund 1dc1ac02bc Output: fix regression of initial mode logic
This logic that looked pointless to me while doing the wlroots 0.17
upgrade is in fact important as tiosgz helpfully pointed out.

It was added back in bc610c8b to address an issue. Hopefully the new
comments stop me from trying to break it again :)
2023-12-05 00:27:36 +01:00
Isaac Freund 6bfaf62cef SceneNodeData: fix fromNode()
This currently fails to check the node passed and skips directly to the
parent.
2023-12-05 00:27:22 +01:00
Isaac Freund 7ee6c79b6b build: update to wlroots 0.17 2023-12-01 17:29:05 +01:00
Isaac Freund 50ccd4c5b3 session-lock: fix pointer focus handling on map 2023-11-17 19:51:57 +01:00
Isaac Freund 68366c7331 Cursor: fix high polling rate resize regression
The previous commit ended up clamping the accumulated f64 offset to an
integer every frame, losing any sub-pixel cursor motions. This has been
known to cause problems with high polling rate mice in the past.

Return to the same approve the move cursor mode uses to solve this and
accumulate a separate sub-pixel delta.
2023-11-14 15:36:25 +01:00
Isaac Freund c50ed9c7e7 Cursor: clamp cursor movement to resize bounds
Currently resizing a window allows moving the invisible "internal"
cursor infinitely far off screen despite the fact that the window is
bounded by the size constraints of the client and by the output
dimensions. This means that attempting to resize past these bounds in
one dimension will result in the "internal" cursor being far out of
bounds and will require an equal movement in the opposite direction in
order to continue resizing.

Exposing this implementation detail of an invisible "internal" cursor
separate from the rendered cursor is of course bad, so clamp it to the
bounds of the resize.
2023-11-13 22:54:36 +01:00
Isaac Freund 69b61602cf View: handle map while no outputs are available
Currently views which are mapped while no outputs are available can
never actually get rendered because they have 0 tags and are stuck in
the hidden stack.

This commit fixes this and they should now be restored when a new output
becomes available.
2023-11-09 16:36:39 +01:00
Isaac Freund 04dea1edee river: remove dead code
This file has been dead since the refactor to use the wlroots
scene graph deleted view_stack.zig
2023-11-09 00:08:56 +01:00
Isaac Freund 6c81990163 xdg-toplevel: ignore redundant move/resize requests
Such requests currently lead to an assertion failure.

I don't know what changed in nautilus 45.0 that caused it to start doing
this and I probably don't want to know.
2023-11-08 13:16:50 +01:00
Isaac Freund c4fe1e1a3f rules: rename "tag" action to "tags"
This rule action accepts and assigns a set of 32 tags represented as a
32 bit integer just like all of river's other commands handling tags.

Using the singular here is potentially misleading and is also
inconsistent with set-view-tags, etc. which all use the plural.

Sorry about the breaking change for those who use master branch, ideally
I would have caught this before merging but at least I noticed before a
release.

This commit also does a bit of internal refactoring/cleanup of the rules
system.
2023-11-08 11:33:27 +01:00
Isaac Freund 18a440b606 pointer-constraints: fix assertion failure
It is possible for the assertion in PointerConstraint.confine() to fail
if a view with an active pointer constraint is, for example, resized
using a keybinding such that the pointer is outside the constraint
region.

Handle this edge case by deactivating the constraint. The other option
would be to warp the pointer to the nearest point still inside the
constraint region. Deactivating the constraint is far simpler however
and I don't expect this to be a UX pain point.
2023-11-06 13:14:16 +01:00
Isaac Freund 642f9b7ae0 XdgToplevel: tweak fullscreen state policy
Currently river only sends the fullscreen state to a maximum of one
toplevel per output at a time and switching tags such that the
fullscreen toplevel is not visible causes the fullscreen state to be
removed.

This may be technically correct, but it causes issues when programs like
firefox trigger animations on fullscreen state change.

This commit returns river's policy here to what we did back in 0.2 and
leaves the xdg_toplevel fullscreen state set regardless of whether or
not the toplevel is currently rendered as fullscreen or if there are
other fullscreen toplevels.
2023-11-03 17:16:04 +01:00
Isaac Freund 59c9842c8f Cursor: use inflight_mode as needed in updateState()
This fixes possible assertion failures when quickly cancelling and
starting a new move/resize. The following steps, take from the bug
report, can currently reproduce the race:

1. Start with a window in tiled mode.
2. Begin resizing the window with your cursor.
3. Send the window back to tiled mode (with a keybind) and quickly begin
resizing it again with your cursor.
2023-11-03 17:06:05 +01:00
Isaac Freund 5da4769c23 rivertile: eliminate an @intCast()
It's pretty cool that the new @min() and @max() builtin semantics allow
this.
2023-10-26 00:04:11 +02:00
Isaac Freund 4cb65f9e2e DragIcon: set position on creation
Currently if a drag icon is created but the cursor/touch point is not
moved river will render the drag icon at 0,0 instead of the cursor/touch
point location. This fixes that.
2023-10-25 22:01:05 +02:00
Isaac Freund 0729b9122b docs: update PACKAGING.md for Zig 0.11 2023-10-25 12:16:50 +02:00
Isaac Freund 3fa44d8509 docs: explain unknown info in output identifiers 2023-10-21 12:01:42 +02:00
Isaac Freund f364e1b81b Cursor: use total delta for resize calculation
This means that interactive resize speed is no longer throttled by the
speed at which the client commits new buffers. Interactive resize speed
is now determined entirely by how fast the pointer input device is moved
by the user.

This may result in more subjectively "choppy" resizes for clients that
commit very slowly, but it should be less sluggish at least.
2023-10-17 19:10:41 +02:00
Isaac Freund 5690c833e9 View: clean up after Zig update 2023-10-16 16:42:33 +02:00
Isaac Freund 2e586c7061 build: update to Zig 0.11.0 2023-10-16 16:27:03 +02:00
Isaac Freund 470eb22280 river-layout: Remove incorrect assertion
This assertion is not correct since removing transaction preemption.
2023-06-20 15:26:29 +02:00
Isaac Freund 6e2169a149 XdgToplevel: store scene node in wlr_surface data
This was accidentally removed in 05eac54b077, which broke
SceneNodeData.fromSurface() for xdg_toplevels.

This means that thing such as xdg-activation and idle inhibit didn't
work since that commit and should work again starting from this commit.
2023-06-05 19:49:39 +02:00
Isaac Freund 3865a7be7c session-lock: fix assertion failures and clean up
The removed assertions aren't possible to guarantee due to the fact that
the lock render state is updated asynchronously as the output is
rendered.
2023-03-24 15:27:25 +01:00
Isaac Freund eaa2f6d37e LayerSurface: fix surfaces on multiple outputs at once
The previous commit broke handling of keyboard interactive
layer surfaces being created on multiple outputs at once.

This new approach reverts part of the logic change in the previous
commit while keeping the fix for the crash and the new assertion.
2023-03-16 15:10:52 +01:00
Isaac Freund 133b88c266 LayerSurface: handle focus when switching outputs
Currently if a layer surface is focused and the user focuses a different
output the layer surface remains focused. However, updating focus on
layer surface unmap only considers seats that have the layer surface's
output focused.

To fix this there are 3 approaches I see:

1. Unfocus all layer surfaces on the old output when switching output
focus, focus any layer surfaces on the new output.

2. Disallow switching output focus while a layer surface is focused.

3. Stop caring about output focus when determining which layer surface
should gain/lose focus.

I've taken the 3rd option here as it is significantly simpler to
implement and maintain but still feels reasonably intuitive.
2023-03-16 11:03:33 +01:00
Isaac Freund 50c6ae245f build: work around zig 0.10.0 bug to fix CI 2023-03-15 17:34:10 +01:00
Isaac Freund c2ce893dd0 Cursor: apply x/y change during resize on commit
This fixes issues with resizing clients that stick to a fixed aspect
ratio during resize such as mpv.
2023-03-15 17:33:16 +01:00
Isaac Freund a679743fa0 Cursor: lock to current geometry during move/resize
This eliminates cursor jitter entirely during interactive resize.

This also fixes a bug where the xdg-toplevel resizing state was not
cleared if a resize operation was aborted due to a change in view tags
or similar.
2023-03-14 13:34:55 +01:00
Isaac Freund 9db41115a8 XdgToplevel: ensure view dimensions match geometry
Some clients (e.g. mpv) do not respond to configures by committing
buffers of the exact size requested. Instead they may commit a buffer of
a smaller size in order to maintain an aspect ratio or not commit a
buffer at all.
2023-03-14 12:30:53 +01:00
Isaac Freund 90f240355e Cursor: fix warp on output change with no views 2023-03-14 12:07:14 +01:00
Isaac Freund 0ba65848a1 Root: separate fallback list to handle 0 outputs
Mixing views that are currently being mapped/unmapped with views that
are stashed during hotplug down to 0 outputs is error-prone and almost
certainly has a bug or two hiding currently.
2023-03-14 11:53:04 +01:00
Isaac Freund 95825b0153 Root: remove incorrect assertions in addOutput() 2023-03-14 11:41:02 +01:00
Isaac Freund dd542b5284 Output: reinitialize output_status, cleanup
If a output is removed and added back without being destroyed this must
be reinitialized.

This commit also cleans up the Root.applyPending() calls related to
output hotplug and adds some more logging.
2023-03-14 11:39:10 +01:00
Isaac Freund 0355b654af doc: fix typo in riverctl man page 2023-03-13 10:04:46 +01:00
Isaac Freund e4e8eae0df example/init: update for rules system 2023-03-12 17:26:44 +01:00
Isaac Freund fe3c3b5246 docs: fix typo in riverctl man page 2023-03-12 17:14:57 +01:00
Isaac Freund b2b2c9ed13 river: add rules system
This is a breaking change and replaces the previous
csd-filter-add/remove and float-filter-add/remove commands.

See the riverctl(1) man page for documentation on the new system.
2023-03-12 16:44:19 +01:00
Isaac Freund 05eac54b07 xdg-decoration: clean up implementation
We now send some protocol errors that wlroots 0.16 is missing [1].
This also allows us to access the xdg decoration from a view, which will
be necessary for some future changes.

[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4051
2023-03-10 18:49:30 +01:00
Isaac Freund fcb184f0bd View: add none impl tag for better safety checks 2023-03-10 14:15:15 +01:00
Isaac Freund fc6d1cca15 xdg-shell: determine tiled state by float state
How river currently sets this isn't really in accordance with the spirit
of the protocol. It was originally done this way to get gtk3 windows to
look a little bit better with borders drawn around them. However, I've
come to believe that river shouldn't just ignore standards like this.

The right way to do things would be to either implement the
xdg-decoration protocol for gtk properly or to be pragmatic and accept
some programs are intended to be used with CSD and that's OK.
2023-03-10 10:48:54 +01:00
Isaac Freund 0752b6b9ba example/init: Fix confusing comments
River does not currently recognize Ctrl as a modifier, only Control.
2023-03-09 23:35:06 +01:00
Isaac Freund 0de3f67898 river-status: only send layout name if changed 2023-03-09 23:14:26 +01:00
Isaac Freund ebfa892d95 XdgToplevel: clean up wlr_surface data on destroy 2023-03-08 12:20:27 +01:00
Isaac Freund f072d19e51 Xwayland: eliminate unneeded user data usage
This is some dead code that is left over from before the scene graph
changes.
2023-03-08 11:37:28 +01:00
Isaac Freund 9a2e0d97d7 layer-shell: apply exclusive zones in separate pass
This brings the behavior closer to what we had before the scene
graph refactor.

The main difference now is that the order has changed from background to
overlay instead of from overlay to background. This ordering seems to
make more sense in the cases I've tested and the old ordering was just
cargo-cult anyways.
2023-03-07 23:43:23 +01:00
Isaac Freund 29976e5741 Seat: fix potential assertion failure 2023-03-06 20:17:59 +01:00
Isaac Freund 684f26acac river: improve comments on pending/inflight/current 2023-03-06 16:30:42 +01:00
Isaac Freund 05e8fbc8b9 wlr-foreign-toplevel-management: implement protocol
Well, at least as much of it as was implemented before the scene graph
refactor.
2023-03-06 12:58:54 +01:00
Isaac Freund f21eb4d05b Xwayland: only raise views if activated 2023-03-06 10:08:10 +01:00
Isaac Freund b7b371cb4f pointer-constraints: implement protocol
Now with 50% less pointer warping!

The new implementation requires the user to move the cursor into the
constraint region before the constraint is activated in order to keep
behavior more predictable.
2023-03-05 23:11:54 +01:00
Isaac Freund 1602b34f4f Seat: use the grab aware API to clear focus
This looks to be a typo made way back in the early days of river.
2023-03-05 13:37:57 +01:00
Isaac Freund db726718ef Cursor: use pending position to warp during move 2023-03-05 09:44:14 +01:00
Isaac Freund cc2b38af92 presentation-time: support protocol 2023-03-04 23:06:41 +01:00
Isaac Freund b6ac1021ae Server: remove headless backend
This was previously used to create a noop output, but we no longer rely
on that hack.
2023-03-04 23:02:52 +01:00
Isaac Freund 44004e2d28 SceneNodeData: allow access from wlr_surfaces
This replaces the old View.fromWlrSurface function and is more general.

This commit also moves the xdg activation request_activate listener to
Server as it has no reason to be in View.
2023-03-04 22:41:35 +01:00
Isaac Freund ea4e589fdc river: clean up some uneeded TODOs 2023-03-04 20:58:02 +01:00
Isaac Freund f5f9b526a0 river: fix a few leaks 2023-03-04 20:12:37 +01:00
Isaac Freund 4d2f5bb32d Cursor: store offset and warp cursor during move
This is more reliable since it uses absolute coordinates instead of a
relative movement which could cause the cursor position to get out of
sync with the view.

This is the same approach used for resize.
2023-03-04 19:17:18 +01:00
Isaac Freund b4ae62cd40 View: rework configure abstraction
- Move the decision whether a configure should be tracked or not into
the xdg toplevel/xwayland code.

- Only track configures for xdg toplevels with the transaction system
if the dimensions of the view are affected.
2023-03-04 16:03:16 +01:00
Isaac Freund 915fb7ae7b xdg-shell: honor client move/resize requests 2023-03-03 20:13:06 +01:00
Isaac FreundandLeon Henrik Plickat c29153255c Cursor: allow resizing from all edges
Co-authored-by: Leon Henrik Plickat <leonhenrik.plickat@stud.uni-goettingen.de>
2023-03-03 20:13:06 +01:00
Isaac Freund 8d9b6ab99e deps: update zig-wlroots to fix Xwayland crash 2023-03-03 15:50:24 +01:00
Isaac Freund 4a9d84bdb8 Xwayland: hide override redirect windows if locked 2023-03-03 15:21:54 +01:00
Isaac Freund 0be43ad45f Root: keep all fullscreen views the correct size
Currently we may resize fullscreen views when they become visible/not
visible when switching tags even if their fullscreen state remains
constant. This is suboptimal, and as it turns out also much more complex
to implement.
2023-03-03 13:40:44 +01:00
Isaac Freund 9ce1847d32 XdgToplevel: fix size_changed check on commit
We need to initialize the geometry on map to ensure the first commit is
handled correctly.

Also we don't care about the x/y of the geometry, only the width/height.
2023-03-02 19:24:54 +01:00
Isaac Freund 56e4efe68d Xwayland: fix has_fixed_size heuristic for floating 2023-03-02 17:11:32 +01:00
Isaac Freund 9bfa0ece23 View: handle destroy during inflight layout demand 2023-03-02 16:42:16 +01:00
Isaac Freund 686ef11fc8 river: render floating views above the layout 2023-03-02 15:10:10 +01:00
Isaac Freund ecb959f068 View: fix frame perfection on unmap 2023-03-01 23:04:42 +01:00