Commit Graph
100 Commits
Author SHA1 Message Date
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
Isaac Freund 83fe764fcd View: only send configures through transactions
This reduces the number of separate configure events sent to clients
through better batching and is also more correct.
2023-03-01 20:44:13 +01:00
Isaac Freund ed0aa73670 Output: fix background of transformed outputs 2023-03-01 19:40:37 +01:00
Isaac Freund b1540e2d94 Root: fix use of view.current before update
In commitTransaction() we currently the current view state to determine
whether or not to enable the view's scene tree. However we don't update
the view's current state until after that check.
2023-03-01 19:03:16 +01:00
Isaac Freund bf759c7c57 View: clamp to output on exiting float/fullscreen 2023-03-01 17:13:14 +01:00
Isaac Freund 50513390ce View: move borders state to State struct
This state affects rendering, so it should pass through the transaction
system like the rest.
2023-03-01 16:12:27 +01:00
Isaac Freund c1c72e23a3 Root: fix more fullscreen bugs
Moving fullscreen views between outputs now works properly.
A case in which we did not inform the client that it is no longer
fullscreen has been fixed as well.
2023-03-01 12:16:53 +01:00
Isaac Freund 5f0af38992 session-lock: fix race with multiple outputs
The race is as follows:
1. Output A commits and sets render state to pending_lock_surface
2. Output B commits and sets render state to pending_lock_surface
3. Output A presents and sets render state to lock_surface
4. maybeLock() does not lock because waiting on output B
5. Output A commits and sets render state to pending_lock_surface
6. Output B presents and sets render state to lock_surface
4. maybeLock() does not lock because waiting on output A
2023-03-01 11:33:26 +01:00
Isaac Freund 472f882f42 Output: inline renderOutput function
Having this in a separate file no longer makes sense since the switch to
the scene graph.
2023-03-01 11:32:04 +01:00
Isaac Freund 6411c71151 Root: centralize focus(null) calls in applyPending() 2023-03-01 10:49:44 +01:00
Isaac Freund 07154720fa csd-filter-add/remove: add missing applyPending()
A transaction is now necessary to update border state.
2023-02-28 23:00:02 +01:00
Isaac Freund 8cb5ca9041 river: fix various fullscreen related bugs 2023-02-28 22:56:12 +01:00
Isaac Freund e11d4dc0de LayerSurface: fix use-after-free on destroy
The scene_layer_surface may be destroyed before handleDestroy is called,
which means we can't rely on it to access the wlr_layer_surface in
destroyPopups().
2023-02-28 18:28:17 +01:00
Isaac Freund 005bde367c OutputStatus: rework implementation
This was motivated by the view tags not being proplerly updated by
Root.commitTransaction() when there were no views on an output.
2023-02-28 18:28:17 +01:00
Isaac Freund be4330288d river: rework core data structures & transactions 2023-02-28 18:28:17 +01:00
Isaac Freund f5dc67cfc1 View: use saved surface trees for transactions 2023-02-28 14:55:59 +01:00
Isaac Freund ce7fda4ed9 Xwayland: render using the scene graph 2023-02-28 14:55:59 +01:00
Isaac Freund 0b2272ec57 DragIcon: render using the scene graph 2023-02-28 14:55:58 +01:00
Isaac Freund 0e0b585c44 xdg-shell: implement version 5 2023-02-28 14:55:58 +01:00
Isaac Freund 879b880a6a XdgPopup: reimplement using the scene graph
xdg-shell version 3 is now implemented, supporting popup repositioning.
2023-02-28 14:55:58 +01:00
Isaac Freund dbcb75dddb LayerSurface: render using the scene graph
This also brings a lot of code cleanup and proper support for
version 4 of the protocol.
2023-02-28 14:55:58 +01:00
Isaac Freund 85843dd5c7 View: remove dead code
wl_output.enter/leave is handled by wlr_scene now.
2023-02-28 14:55:58 +01:00
Isaac Freund 1b57fe0aa7 Xwayland: create scene tree 2023-02-28 14:55:58 +01:00
Isaac Freund a545a06c5b View: implement borders with scene graph 2023-02-28 14:55:58 +01:00
Isaac Freund f4a8d6dcc9 Output: use separate scene trees for layers 2023-02-28 14:55:58 +01:00
Isaac Freund b38676f078 session-lock: use the scene graph 2023-02-28 14:55:58 +01:00
Isaac Freund 683ed0f04e Cursor: remove surfaceAt()
We now use the wlr_scene API to find out what is at the cursor location.
2023-02-28 14:55:58 +01:00
Isaac Freund 4f0ce8fceb render: use wlr_scene to render views 2023-02-28 14:55:58 +01:00
Isaac Freund 07294057cb wlr-foreign-toplevel-management: remove protocol
This can be re implemented after the migration to the scene graph is
complete.
2023-02-28 14:55:58 +01:00
Isaac Freund 168756cbe8 render: remove damage tracking
This will be handled by wlr_scene shortly.
2023-02-28 14:55:58 +01:00
Isaac Freund b7ac5becfb pointer-constraints: remove protocol
This implementation as it stands is incomplete/buggy and will make
updating to wlr_scene more complex.

It will be reimplemented after updating to wlr_scene is complete.
2023-02-28 14:55:58 +01:00
Isaac Freund 06cb76f937 Keyboard: fix keyboard-layout mapping crash 2023-02-28 14:40:10 +01:00
Isaac Freund c0c08ab919 deps: update to latest zig-wayland/zig-wlroots 2023-02-27 17:51:31 +01:00
Isaac Freund 0ccf0e65d5 deps: update to latest zig-wayland/zig-wlroots 2023-02-27 13:35:55 +01:00
Isaac Freund e1ab51f260 Seat: guard setFocusRaw() usage while locked
Focusing a layer shell or Xwayland override redirect surface while
locked is a bug.
2023-02-10 13:15:16 +01:00
Isaac Freund 919d5d7c62 docs: remove repology badge from readme
It's getting too big and has too much redundant information.
2023-02-03 18:27:38 +01:00
Isaac Freund 345d6b737a docs: fix typos in riverctl man page 2023-02-03 18:18:21 +01:00
Isaac Freund 5274383c72 wlr-output-management: fix bug due to zig miscompilation
It looks like having the empty error capture |_| on the else branch of
the if statement causes the else branch to be ignored by the compiler.

This should be a compile error, as the condition of the if statement is
a bool, not an error union.
2023-01-30 23:48:24 +01:00
Isaac Freund 76952183c0 session-lock: fix assertion failure on hot-plug while locked 2023-01-25 12:39:00 +01:00
Isaac Freund 946173005d wlr-output-management: leverage new wlroots APIs
These new functions allow testing commits without messing up the
pending state of the output and needing to rollback. The new apply()
function also makes the code considerably more concise.
2023-01-24 13:55:40 +01:00
Isaac Freund a9bfb7c924 idle-inhibit: fix use-after-free
A user reported a crash that only reproduces when preloading a hardened
malloc implementation. From the stack trace, this use-after-free seems
to be the most likely cause. Yay hardened malloc!
2023-01-21 14:54:14 +01:00
Isaac Freund 6c7586e8d7 session-lock: properly handle disabled outputs
Outputs that are part of the layout but currently disabled (e.g. due
to use of wlr-output-power-management) are not correctly handled as
river currently waits for them to present a new locked frame before
sending the locked event.

This new frame never comes however since the output is disabled. Fix
this by maintaining the correct Output.lock_render_state as outputs
are enabled/disabled.

Additionally add missing maybeLock() calls to handle the case that all
outputs in the layout are disabled.
2023-01-18 12:31:07 +01:00
Isaac Freund 84abdfaced command/layout: fix a memory leak 2023-01-12 15:35:31 +01:00
Isaac Freund 615beab2e6 Seat: rework Xwayland Override Redirect focus
Instead of stashing the active view and setting Seat.focused to the
Xwayland OR surface when a child OR surface of a currently focused
Xwayland view is given keyboard focus, keep Seat.focused set to the
Xwayland view.

Such Override Redirect surfaces are commonly used for drop down menus
and the like, and river should behave as if the parent Xwayland view
still has focus.

This ensures that the riverctl focus-view next/prev commands continue to
work as expected while a popup is open, the correct focused view title
will be sent over river status, etc.

It's also cleaner to centralize this logic in XwaylandOverrideRedirect
and keep it out of Seat.zig.
2023-01-12 14:44:55 +01:00
Isaac Freund f20692e329 deps: update zig-wayland to fix build on aarch64 2023-01-09 14:55:18 +01:00
Isaac Freund 2c0c606596 flags: further cleanup after Zig 0.10
Long live the self hosted compiler!
2023-01-08 17:01:14 +01:00
Isaac Freund 09f3f141ae deps: update to Zig 0.10 2023-01-08 16:21:42 +01:00
Isaac Freund f370202b68 render: fix rounding for fractional scaling
We currently scale the width/height of rectangles based on the scaled
x/y instead of the unscaled x/y. This however leads to inconsistent
width/height due to rounding. Fix this bug by basing width/height
scaling off of the original x/y.

Furthermore, fix a typo where we scaled the height off of the x
coordinate instead of the y coordinate.
2023-01-08 15:25:16 +01:00
Isaac Freund 4dd02358d9 session-lock: fix assertion failure on abnormal client behavior
If the client commits a protocol error or otherwise crashes before the
session has been fully locked, we currently try to send the locked event
without checking if the client has been destroyed.

This commit adds the necessary if statement.
2023-01-07 17:35:22 +01:00
Isaac Freund f511a34ded session-lock: fix assertion failure due to race
There's currently a potential race in the implementation that can be hit
during unlocking. This is not a security vulnerability, but it does
cause the compositor to crash due to a failed assertion.

This commit simplifies the code and fixes the race as well as tightening
up the assertions around this state/control flow even further.
2023-01-07 14:58:28 +01:00
Isaac Freund df2fc30238 session-lock: wait for present before locking
Currently we send the locked event after rendering and commit of blank
or lock surfaces buffers on all outputs. However, this is technically
not enough to ensure that the buffers have been presented.

Instead, listen to the wlr_output present event to ensure that no
normal, "unlocked" content is possibly visible.
2023-01-06 18:51:40 +01:00
Isaac Freund c479525ab8 rivertile: fix code to disallow 0 main count
Also document this limit
2023-01-06 17:47:54 +01:00
Isaac Freund e49db7682c build: bump version to 0.3.0-dev 2023-01-02 01:55:16 +01:00
Isaac Freund 4d8f816305 build: bump to version 0.2.0 2023-01-02 01:12:11 +01:00
Isaac Freund 39104ae9e3 command/spawn-tagmask: apply globally
Currently the spawn-tagmask applies to the currently focused output.
This however means that it is lost if the monitor is unplugged and makes
it hard to set for all outputs.

Change this to make the command apply to all outputs.

This is a breaking change.
2023-01-02 00:58:25 +01:00
Isaac Freund 2c86c2b6e5 river-control: update zig-wayland to fix leak
It was forgotten to destroy the callback server side object when sending
the destructor event. With the new zig-wayland version, this cannot be
forgotten.
2022-12-31 23:22:47 +01:00
Isaac Freund 609055e835 layout: fix size of CSD views
Currently we subtract the border width from the size of CSD view as well
as SSD ones, which is not correct.
2022-12-31 19:27:18 +01:00
Isaac Freund a7f00a77ca touch: support drag and drop 2022-12-30 23:20:18 +01:00
Isaac Freund 6a028639b8 Config: use a single xkb keymap for all keyboards
This is nice simplification and allows us to abort startup if the
default xkb configuration (perhaps influenced by XKB_DEFAULT_*
environment variables) is invalid.
2022-12-30 23:20:02 +01:00
Isaac Freund 8f8d94aa45 session-lock: fix potential race
Currently the session lock client has no 100% safe way to know when it
is safe to suspend after requesting that the session be locked.

For a suspend to be safe the compositor must have either blanked or
rendered a lock surface on all outputs before suspending. This is
because the current framebuffer on suspend appears to be saved and
displayed again after suspend, at least on my Linux system.

If a new "locked" frame for all outputs is not rendered before suspend,
an "unlocked" frame or frames will likely be briefly displayed on resume
before the lock surfaces are rendered or the screen is blanked.

To fix this, wait until a lock surface has been rendered on all outputs,
or if that times out until all outputs have been blanked, before sending
the locked event to the client.

Resolving this race on the compositor side without protocol changes
is the most effective way to avoid this potential information leak,
regardless of which session lock client is used.
2022-12-29 18:25:12 +01:00
Isaac Freund e18d0d5e1c flags: automatically prepend '-'
This makes the usage a bit cleaner as the results of the parsing may be
accessed with e.g. ret.flags.version instead of ret.flags.@"-version".
2022-12-28 22:11:14 +01:00
Isaac Freund 2be9ac05d6 command/map: use flags.zig, cleanup 2022-12-28 21:56:42 +01:00
Isaac Freund eed7d94557 docs: improve keyboard layout documentation
- Remove recommendation of XKB_* environment variables in river(1) as we
  now have a dedicated riverctl keyboard-layout command.

- Give an example of how to use and switch between multiple layouts in
  the riverctl(1) man page.
2022-12-28 20:43:54 +01:00
Isaac Freund 0cb6b3f81d command/keyboard-layout: use flags.zig, cleanup 2022-12-28 20:21:23 +01:00
Isaac Freund 16cbe5f469 flags: rewrite to allow [:0]const u8 arguments
This also cleans up the code by using @Type(), eliminating the need
for the argFlag() and boolFlag() functions.

Allowing [:0]const u8 arguments makes this parser useful for
river-control commands as well.
2022-12-28 20:21:23 +01:00
Isaac Freund 6ac3928556 idle: support ext-idle-notify-v1, drop KDE protocol
This commit is a breaking change as it drops support for the now
obsolete org_kde_kwin_idle protocol.
2022-12-24 18:18:09 +01:00
Isaac Freund 05c9194eba build: handle wlroots built without xwayland support 2022-12-24 17:38:02 +01:00
Isaac Freund 096e175cec View: honor fullscreen requests before map 2022-12-24 03:06:53 +01:00