Cursor enhancements

Cargo.toml

@@ -66,6 +66,9 @@ features = [
 
 [workspace.lints.clippy]
 too_many_arguments = "allow"
+new_without_default = "allow"
+type_complexity = "allow"
+let_and_return = "allow"
 
 ########################################################################yo😎###########
 

api/lua/pinnacle/grpc/defs.lua

@@ -350,6 +350,10 @@ local pinnacle_input_v0alpha1_SetLibinputSettingRequest_TapButtonMap = {
 ---@field tap_drag_lock boolean?
 ---@field tap boolean?
 
+---@class SetXcursorRequest
+---@field theme string?
+---@field size integer?
+
 -- Process
 
 ---@class pinnacle.process.v0alpha1.SpawnRequest
@@ -770,6 +774,13 @@ defs.pinnacle = {
                     request = "pinnacle.input.v0alpha1.SetLibinputSettingRequest",
                     response = "google.protobuf.Empty",
                 },
+                ---@type GrpcRequestArgs
+                SetXcursor = {
+                    service = "pinnacle.input.v0alpha1.InputService",
+                    method = "SetXcursor",
+                    request = "pinnacle.input.v0alpha1.SetXcursorRequest",
+                    response = "google.protobuf.Empty",
+                },
             },
         },
     },

api/lua/pinnacle/input.lua

@@ -352,4 +352,28 @@ function input.set_libinput_settings(settings)
     end
 end
 
+---Sets the current xcursor theme.
+---
+---Pinnacle reads `$XCURSOR_THEME` on startup to set the theme.
+---This allows you to set it at runtime.
+---
+---@param theme string
+function input.set_xcursor_theme(theme)
+    client.unary_request(input_service.SetXcursor, {
+        theme = theme,
+    })
+end
+
+---Sets the current xcursor size.
+---
+---Pinnacle reads `$XCURSOR_SIZE` on startup to set the cursor size.
+---This allows you to set it at runtime.
+---
+---@param size integer
+function input.set_xcursor_size(size)
+    client.unary_request(input_service.SetXcursor, {
+        size = size,
+    })
+end
+
 return input

api/protocol/pinnacle/input/v0alpha1/input.proto

@@ -143,6 +143,11 @@ message SetLibinputSettingRequest {
   }
 }
 
+message SetXcursorRequest {
+  optional string theme = 1;
+  optional uint32 size = 2;
+}
+
 service InputService {
   rpc SetKeybind(SetKeybindRequest) returns (stream SetKeybindResponse);
   rpc SetMousebind(SetMousebindRequest) returns (stream SetMousebindResponse);
@@ -153,4 +158,6 @@ service InputService {
   rpc SetRepeatRate(SetRepeatRateRequest) returns (google.protobuf.Empty);
 
   rpc SetLibinputSetting(SetLibinputSettingRequest) returns (google.protobuf.Empty);
+
+  rpc SetXcursor(SetXcursorRequest) returns (google.protobuf.Empty);
 }

api/rust/src/input.rs

@@ -16,7 +16,7 @@ use pinnacle_api_defs::pinnacle::input::{
         input_service_client::InputServiceClient,
         set_libinput_setting_request::{CalibrationMatrix, Setting},
         KeybindDescriptionsRequest, SetKeybindRequest, SetLibinputSettingRequest,
-        SetMousebindRequest, SetRepeatRateRequest, SetXkbConfigRequest,
+        SetMousebindRequest, SetRepeatRateRequest, SetXcursorRequest, SetXkbConfigRequest,
     },
 };
 use tokio::sync::mpsc::UnboundedSender;
@@ -402,6 +402,46 @@ impl Input {
         }))
         .unwrap();
     }
+
+    /// Set the xcursor theme.
+    ///
+    /// Pinnacle reads `$XCURSOR_THEME` on startup to determine the theme.
+    /// This allows you to set it at runtime.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// input.set_xcursor_theme("Adwaita");
+    /// ```
+    pub fn set_xcursor_theme(&self, theme: impl ToString) {
+        let mut client = self.create_input_client();
+
+        block_on_tokio(client.set_xcursor(SetXcursorRequest {
+            theme: Some(theme.to_string()),
+            size: None,
+        }))
+        .unwrap();
+    }
+
+    /// Set the xcursor size.
+    ///
+    /// Pinnacle reads `$XCURSOR_SIZE` on startup to determine the cursor size.
+    /// This allows you to set it at runtime.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// input.set_xcursor_size(64);
+    /// ```
+    pub fn set_xcursor_size(&self, size: u32) {
+        let mut client = self.create_input_client();
+
+        block_on_tokio(client.set_xcursor(SetXcursorRequest {
+            theme: None,
+            size: Some(size),
+        }))
+        .unwrap();
+    }
 }
 
 /// A trait that designates anything that can be converted into a [`Keysym`].

src/api.rs

@@ -11,7 +11,7 @@ use pinnacle_api_defs::pinnacle::{
         set_mousebind_request::MouseEdge,
         KeybindDescription, KeybindDescriptionsRequest, KeybindDescriptionsResponse, Modifier,
         SetKeybindRequest, SetKeybindResponse, SetLibinputSettingRequest, SetMousebindRequest,
-        SetMousebindResponse, SetRepeatRateRequest, SetXkbConfigRequest,
+        SetMousebindResponse, SetRepeatRateRequest, SetXcursorRequest, SetXkbConfigRequest,
     },
     output::{
         self,
@@ -586,6 +586,31 @@ impl input_service_server::InputService for InputService {
         })
         .await
     }
+
+    async fn set_xcursor(
+        &self,
+        request: Request<SetXcursorRequest>,
+    ) -> Result<Response<()>, Status> {
+        let request = request.into_inner();
+
+        let theme = request.theme;
+        let size = request.size;
+
+        run_unary_no_response(&self.sender, move |state| {
+            if let Some(theme) = theme {
+                state.pinnacle.cursor_state.set_theme(&theme);
+            }
+
+            if let Some(size) = size {
+                state.pinnacle.cursor_state.set_size(size);
+            }
+
+            if let Some(output) = state.pinnacle.focused_output().cloned() {
+                state.schedule_render(&output)
+            }
+        })
+        .await
+    }
 }
 
 pub struct ProcessService {

src/api/window.rs

@@ -489,7 +489,6 @@ impl window_service_server::WindowService for WindowService {
                 return;
             };
             let Some(window) = pointer_focus.window_for(state) else {
-                tracing::info!("Move grabs are currently not implemented for non-windows");
                 return;
             };
             let Some(wl_surf) = window.wl_surface() else {
@@ -498,6 +497,10 @@ impl window_service_server::WindowService for WindowService {
             let seat = state.pinnacle.seat.clone();
 
             state.move_request_server(&wl_surf, &seat, SERIAL_COUNTER.next_serial(), button);
+
+            if let Some(output) = state.pinnacle.focused_output().cloned() {
+                state.schedule_render(&output);
+            }
         })
         .await
     }
@@ -579,6 +582,10 @@ impl window_service_server::WindowService for WindowService {
                 edges.into(),
                 button,
             );
+
+            if let Some(output) = state.pinnacle.focused_output().cloned() {
+                state.schedule_render(&output);
+            }
         })
         .await
     }