Add sdr-native support

Author: eaglesemanation

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ on:
         type: string
 
 env:
-  UBUNTU_24_10_NAME: oracular
+  UBUNTU_25_04_NAME: plucky
 
 jobs:
   validate-and-patch:
@@ -58,7 +58,7 @@ jobs:
         run: |
            debchange \
             -v ${{ steps.release_version.outputs.release_version }}-1 \
-            -D $UBUNTU_24_10_NAME -u low --package displayconfig-mutter \
+            -D $UBUNTU_25_04_NAME -u low --package displayconfig-mutter \
             "https://github.com/eaglesemanation/displayconfig-mutter/releases/tag/v${{ steps.release_version.outputs.release_version }}"
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:

src/cli.rs

@@ -1,4 +1,4 @@
-use clap::{Args, Parser, Subcommand};
+use clap::{Args, Parser, Subcommand, ValueEnum};
 
 #[derive(Debug, Parser)]
 #[command(version, about, long_about = None)]
@@ -56,8 +56,22 @@ pub struct SetArgs {
     #[arg(long)]
     pub scaling: Option<u32>,
     /// Controls high dynamic range color mode
-    #[arg(long)]
+    #[arg(long, conflicts_with = "color_mode")]
     pub hdr: Option<bool>,
+    /// Controls display color mode
+    #[arg(value_enum, long, conflicts_with = "hdr")]
+    pub color_mode: Option<ColorMode>,
+}
+
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
+pub enum ColorMode {
+    /// sRGB SDR
+    #[default]
+    SDR,
+    /// HDR
+    HDR,
+    /// SDR with wide gammut
+    SDRNative,
 }
 
 fn resolution_parser(s: &str) -> Result<(u32, u32), String> {

src/display_config.rs

@@ -117,6 +117,7 @@ pub mod get_current_state {
         pub supported_color_modes: Option<Vec<MonitorColorMode>>,
     }
 
+    // https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/backends/meta-output.h#L45
     #[derive(
         Debug, Type, PartialEq, Eq, Default, Clone, Copy, Serialize_repr, Deserialize_repr,
     )]
@@ -126,6 +127,8 @@ pub mod get_current_state {
         Default = 0,
         /// HDR
         BT2100 = 1,
+        /// SDR with wide gammut
+        SDRNative = 2,
     }
 
     #[derive(Debug, Clone, Type, Serialize, Deserialize)]
@@ -318,6 +321,7 @@ pub mod apply_monitors_config {
     }
 }
 
+// https://gitlab.gnome.org/GNOME/mutter/-/blob/main/data/dbus-interfaces/org.gnome.Mutter.DisplayConfig.xml
 #[zbus::proxy(
     default_service = "org.gnome.Mutter.DisplayConfig",
     default_path = "/org/gnome/Mutter/DisplayConfig",

src/main.rs

@@ -3,7 +3,7 @@ use std::{cmp::Ordering, collections::HashSet};
 use anyhow::anyhow;
 use clap::Parser;
 use displayconfig_mutter::{
-    cli::{self, Cli},
+    cli::{self, Cli, ColorMode},
     display_config::{
         apply_monitors_config,
         get_current_state::{self, LogicalMonitorTransform, MonitorColorMode, RefreshRateMode},
@@ -193,35 +193,41 @@ async fn main() -> anyhow::Result<()> {
             }
             updated_logical_monitor.scale = *scale;
 
-            let hdr_supported = current_monitor
+            let fallback_supported_color_modes = vec![MonitorColorMode::Default];
+            let supported_color_modes = current_monitor
                 .properties
                 .supported_color_modes
                 .as_ref()
-                .is_some_and(|modes| modes.contains(&MonitorColorMode::BT2100));
-            let color_mode = args
-                .hdr
-                .map(|hdr| {
+                .unwrap_or(&fallback_supported_color_modes);
+            let color_mode = match (args.hdr, args.color_mode) {
+                (None, None) => current_monitor
+                    .properties
+                    .color_mode
+                    .unwrap_or(MonitorColorMode::Default),
+                (Some(hdr), None) => {
                     if hdr {
                         MonitorColorMode::BT2100
                     } else {
                         MonitorColorMode::Default
                     }
-                })
-                .unwrap_or(
-                    current_monitor
-                        .properties
-                        .color_mode
-                        .unwrap_or(MonitorColorMode::Default),
-                );
-            updated_monitor.properties.color_mode = match (color_mode, hdr_supported) {
-                (MonitorColorMode::BT2100, false) => {
-                    return Err(anyhow!(
-                        "display \"{}\" does not support HDR",
-                        args.connector
-                    ))
                 }
-                (MonitorColorMode::Default, false) => None,
-                (mode, true) => Some(mode),
+                (None, Some(color_mode)) => match color_mode {
+                    ColorMode::SDR => MonitorColorMode::Default,
+                    ColorMode::HDR => MonitorColorMode::BT2100,
+                    ColorMode::SDRNative => MonitorColorMode::SDRNative,
+                },
+                (Some(_), Some(_)) => panic!("Clap allowed mutually exclusive flags"),
+            };
+
+            if !supported_color_modes.contains(&color_mode) {
+                return Err(anyhow!(
+                    "display \"{}\" does not support selected color mode",
+                    args.connector
+                ));
+            }
+            updated_monitor.properties.color_mode = match color_mode {
+                MonitorColorMode::Default => None,
+                mode => Some(mode),
             };
             let (updated_x, updated_y) = (updated_logical_monitor.x, updated_logical_monitor.y);