river-options: remove protocol

This protocol involves far too much accidental complexity. The original
motivating use-case was to provide a convenient way to send arbitrary
data to layout clients at runtime in order to avoid layout clients
needing to implement their own IPC and do this over a side-channel.
Instead of implementing a quite complex but still rigid options protocol
and storing this state in the compositor, instead we will simply add
events to the layout protocol to support this use case.

Consider the status quo event sequence:

1. send get_option_handle request (riverctl)
2. roundtrip waiting for first event (riverctl)
3. send set_foo_value request (riverctl)
4. receive set_foo_value request (river)
5. send foo_value event to all current handles (river)
6. receive foo_value event (rivertile)
7. send parameters_changed request (rivertile)
8. receive parameters_changed request (river)
9. send layout_demand (river)

And compare with the event sequence after the proposed change:

1. send set_foo_value request (riverctl)
2. receive set_foo_value request (river)
3. send set_foo_value event (river)
4. send layout_demand (river)

This requires *much* less back and forth between the server and clients
and is clearly much simpler.

completions/bash/riverctl

@@ -17,6 +17,8 @@ function __riverctl_completion ()
 			toggle-float \
 			toggle-fullscreen \
 			zoom \
+			default-layout \
+			output-layout \
 			set-focused-tags \
 			set-view-tags \
 			toggle-focused-tags \
@@ -36,12 +38,7 @@ function __riverctl_completion ()
 			focus-follow-cursor \
 			opacity \
 			set-repeat \
-			xcursor-theme \
-			declare-option \
-			get-option \
-			set-option \
-			unset-option \
-			mod-option"
+			xcursor-theme
 		COMPREPLY=($(compgen -W "${OPTS}" -- "${COMP_WORDS[1]}"))
 	elif [ "${COMP_CWORD}" -eq 2 ]
 	then
@@ -52,7 +49,6 @@ function __riverctl_completion ()
 			"map"|"unmap") OPTS="-release" ;;
 			"attach-mode") OPTS="top bottom" ;;
 			"focus-follows-cursor") OPTS="disabled normal strict" ;;
-			"get-option"|"set-option"|"unset-option"|"mod-option") OPTS="-output -focused-output" ;;
 			*) return ;;
 		esac
 		COMPREPLY=($(compgen -W "${OPTS}" -- "${COMP_WORDS[2]}"))

completions/fish/riverctl.fish

@@ -1,6 +1,6 @@
 function __fish_riverctl_complete_no_subcommand
     for i in (commandline -opc)
-        if contains -- $i close csd-filter-add exit float-filter-add focus-output focus-view move resize snap send-to-output spawn swap toggle-float toggle-fullscreen zoom set-focused-tags set-view-tags toggle-focused-tags toggle-view-tags spawn-tagmask declare-mode enter-mode map map-pointer unmap unmap-pointer attach-mode background-color border-color-focused border-color-unfocused border-width focus-follows-cursor opacity set-repeat xcursor-theme declare-option get-option set-option unset-option mod-option output_title
+        if contains -- $i close csd-filter-add exit float-filter-add focus-output focus-view move resize snap send-to-output spawn swap toggle-float toggle-fullscreen zoom default-layout output-layout set-focused-tags set-view-tags toggle-focused-tags toggle-view-tags spawn-tagmask declare-mode enter-mode map map-pointer unmap unmap-pointer attach-mode background-color border-color-focused border-color-unfocused border-width focus-follows-cursor opacity set-repeat xcursor-theme
             return 1
         end
     end
@@ -23,6 +23,8 @@ complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a swap
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a toggle-float           -d 'Toggle the floating state of the focused view'
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a toggle-fullscreen      -d 'Toggle the fullscreen state of the focused view'
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a zoom                   -d 'Bump the focused view to the top of the layout stack'
+complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a default-layout         -d 'Set the layout namespace to be used by all outputs by default.'
+complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a output-layout          -d 'Set the layout namespace of currently focused output.'
 # Tag managements
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a set-focused-tags       -d 'Show views with tags corresponding to the set bits of tags'
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a set-view-tags          -d 'Assign the currently focused view the tags corresponding to the set bits of tags'
@@ -46,13 +48,6 @@ complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a focus-fol
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a opacity                -d 'Configure server-side opacity of views'
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a set-repeat             -d 'Set the keyboard repeat rate and repeat delay'
 complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a xcursor-theme          -d 'Set the xcursor theme'
-# Options
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a declare-option         -d 'Declare a new option with the given type and initial value'
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a get-option             -d 'Print the current value of the given option to stdout'
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a set-option             -d 'Set the value of the specified option'
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a unset-option           -d 'Unset the value of the specified option for the given output'
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a mod-option             -d 'Add value to the value of the specified option'
-complete -c riverctl -x -n '__fish_riverctl_complete_no_subcommand' -a output_title           -d 'Changing this option changes the title of the Wayland and X11 backend outputs'
 
 # Subcommands
 complete -c riverctl -x -n '__fish_seen_subcommand_from focus-output'         -a 'next previous'

completions/zsh/_riverctl

@@ -29,6 +29,8 @@ _riverctl() {
     'toggle-float:Toggle the floating state of the focused view'
     'toggle-fullscreen:Toggle the fullscreen state of the focused view'
     'zoom:Bump the focused view to the top of the layout stack'
+    'default-layout:Set the layout namespace to be used by all outputs by default.'
+    'output-layout:Set the layout namespace of currently focused output.'
     # Tag management
     'set-focused-tags:Show views with tags corresponding to the set bits of tags'
     'set-view-tags:Assign the currently focused view the tags corresponding to the set bits of tags'
@@ -52,13 +54,6 @@ _riverctl() {
     'opacity:Configure server-side opacity of views'
     'set-repeat:Set the keyboard repeat rate and repeat delay'
     'xcursor-theme:Set the xcursor theme'
-    # Options
-    'declare-option:Declare a new option with the given type and initial value'
-    'get-option:Print the current value of the given option to stdout'
-    'set-option:Set the value of the specified option'
-    'unset-option:Unset the value of the specified option for the given output'
-    'mod-option:Add value to the value of the specified option'
-    'output_title:Changing this option changes the title of the Wayland and X11 backend outputs'
   )
 
   local -A opt_args