head-management: add brightness-setter-v1 extension

src/ifs/head_management.rs

@@ -134,6 +134,7 @@ enum HeadOp {
     SetFormat(&'static Format),
     SetTransferFunction(BackendTransferFunction),
     SetColorSpace(BackendColorSpace),
+    SetBrightness(Option<f64>),
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]

src/ifs/head_management/head_management_macros.rs

@@ -411,4 +411,5 @@ declare_extensions! {
     format_setter_v1: FormatSetterV1,
     drm_color_space_setter_v1: DrmColorSpaceSetterV1,
     brightness_info_v1: BrightnessInfoV1,
+    brightness_setter_v1: BrightnessSetterV1,
 }

src/ifs/head_management/jay_head_ext.rs

@@ -1,4 +1,5 @@
 pub(super) mod jay_head_ext_brightness_info_v1;
+pub(super) mod jay_head_ext_brightness_setter_v1;
 pub(super) mod jay_head_ext_compositor_space_enabler_v1;
 pub(super) mod jay_head_ext_compositor_space_info_v1;
 pub(super) mod jay_head_ext_compositor_space_positioner_v1;

src/ifs/head_management/jay_head_ext/jay_head_ext_brightness_setter_v1.rs

@@ -0,0 +1,41 @@
+use {
+    crate::{
+        ifs::head_management::HeadOp,
+        wire::{
+            jay_head_ext_brightness_setter_v1::{
+                JayHeadExtBrightnessSetterV1RequestHandler, SetBrightness, UnsetBrightness,
+            },
+            jay_head_manager_ext_brightness_setter_v1::JayHeadManagerExtBrightnessSetterV1RequestHandler,
+        },
+    },
+    std::rc::Rc,
+};
+
+impl_brightness_setter_v1! {
+    version = 1,
+}
+
+impl JayHeadManagerExtBrightnessSetterV1RequestHandler for MgrName {
+    type Error = ErrorName;
+
+    mgr_common_req!();
+}
+
+impl JayHeadExtBrightnessSetterV1RequestHandler for HeadName {
+    type Error = ErrorName;
+
+    head_common_req!();
+
+    fn unset_brightness(&self, _req: UnsetBrightness, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        self.common.push_op(HeadOp::SetBrightness(None))?;
+        Ok(())
+    }
+
+    fn set_brightness(&self, req: SetBrightness, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        self.common
+            .push_op(HeadOp::SetBrightness(Some(f32::from_bits(req.lux) as f64)))?;
+        Ok(())
+    }
+}
+
+error!();

src/ifs/head_management/jay_head_manager_session_v1.rs

@@ -459,6 +459,10 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
                         state.color_space = c;
                         to_send |= DRM_COLOR_SPACE_INFO;
                     }
+                    HeadOp::SetBrightness(b) => {
+                        state.brightness = b;
+                        to_send |= BRIGHTNESS_INFO;
+                    }
                 }
             }
             if to_send.contains(CORE_INFO)
@@ -517,6 +521,11 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
             {
                 i.send_state(state);
             }
+            if to_send.contains(BRIGHTNESS_INFO)
+                && let Some(i) = &head.ext.brightness_info_v1
+            {
+                i.send_brightness(state);
+            }
         }
         slf.schedule_transaction_result(req.result, None)?;
         Ok(())
@@ -554,6 +563,7 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
                 node.update_transform(desired.transform);
                 node.set_vrr_mode(VrrMode::from_config(desired.vrr_mode).unwrap());
                 node.set_tearing_mode(TearingMode::from_config(desired.tearing_mode).unwrap());
+                node.set_brightness(desired.brightness);
             } else if let Some(mi) = &desired.monitor_info {
                 let pos = &self.client.state.persistent_output_states;
                 let pos = match pos.get(&mi.output_id) {
@@ -579,6 +589,7 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
                     .set(VrrMode::from_config(desired.vrr_mode).unwrap());
                 pos.tearing_mode
                     .set(TearingMode::from_config(desired.tearing_mode).unwrap());
+                pos.brightness.set(desired.brightness);
             }
         }
         slf.schedule_transaction_result(req.result, None)?;

wire/jay_head_ext_brightness_setter_v1.txt

@@ -0,0 +1,11 @@
+request destroy (destructor) {
+
+}
+
+request unset_brightness {
+
+}
+
+request set_brightness {
+    lux: u32,
+}

wire/jay_head_manager_ext_brightness_setter_v1.txt

@@ -0,0 +1,7 @@
+request destroy (destructor) {
+
+}
+
+event head {
+    head: id(jay_head_ext_brightness_setter_v1) (new),
+}