`0293b03`

migrate picom config to v13 rules format, drop deprecated exclude lists and wintypes

Authored by

espadonne 2 months ago

SHA: 0293b03c87ae88fe61981f6ab0a8aa834fa43428
Parents: f08b002
Tree: 18c29cc

1 changed file

Status	File	+	-
M	`gar/src/config/mod.rs`	99	99

gar/src/config/mod.rsmodified

  blur-strength = {};
  blur-background = true;
  blur-background-frame = false;
--blur-kern = "3x3box";
++blur-kern = "3x3box";"#,
--
--blur-background-exclude = [
--    "window_type = 'dock'",
--    "window_type = 'desktop'",
--    "window_type = 'menu'",
--    "window_type = 'dropdown_menu'",
--    "window_type = 'popup_menu'",
--    "_NET_WM_BYPASS_COMPOSITOR = 1"
--];"#,
                  blur_method, blur_strength
+             )
          } else {
  shadow-radius = {};
  shadow-opacity = {:.2};
  shadow-offset-x = {};
--shadow-offset-y = {};
++shadow-offset-y = {};"#,
--
--shadow-exclude = [
--    "window_type = 'dock'",
--    "window_type = 'desktop'",
--    "window_type = 'menu'",
--    "window_type = 'dropdown_menu'",
--    "window_type = 'popup_menu'",
--    "window_type = 'tooltip'",
--    "_NET_WM_STATE *= '_NET_WM_STATE_FULLSCREEN'",
--    "_NET_WM_BYPASS_COMPOSITOR = 1"
--];"#,
                  self.shadow_radius,
                  self.shadow_opacity,
                  self.shadow_offset_x,
  fade-out-step = 0.03;
  fade-delta = {};
--no-fading-destroyed-argb = true;
++no-fading-destroyed-argb = true;"#,
--
--fade-exclude = [
--    "window_type = 'menu'",
--    "window_type = 'dropdown_menu'",
--    "window_type = 'popup_menu'"
--];"#,
                  self.fade_delta
+             )
          } else {
              "# No custom shader".to_string()
          };
--        // Per-window rules section
++        // Unified rules section (picom v13 format)
--        let rules_section = if !self.picom_rules.is_empty() {
++        // Replaces deprecated: shadow-exclude, fade-exclude, blur-background-exclude,
--            let mut rules = String::from("# Per-window Rules\nrules = (\n");
++        // rounded-corners-exclude, and wintypes blocks
--            for rule in &self.picom_rules {
++        let mut rules = String::from("# Rules (picom v13 format)\nrules = (\n");
--                rules.push_str(&format!("    {{\n        match = \"{}\";\n", rule.match_expr));
++
--                if let Some(cr) = rule.corner_radius {
++        // Built-in window type rules
--                    rules.push_str(&format!("        corner-radius = {};\n", cr));
++        rules.push_str(r#"    {
--                }
++        match = "window_type = 'dock'";
--                if let Some(opacity) = rule.opacity {
++        shadow = false;
--                    rules.push_str(&format!("        opacity = {:.2};\n", opacity));
++        corner-radius = 0;
--                }
++        blur-background = false;
--                if let Some(shadow) = rule.shadow {
++        clip-shadow-above = true;
--                    rules.push_str(&format!("        shadow = {};\n", shadow));
++    },
--                }
++    {
--                if let Some(blur) = rule.blur_background {
++        match = "window_type = 'desktop'";
--                    rules.push_str(&format!("        blur-background = {};\n", blur));
++        shadow = false;
--                }
++        corner-radius = 0;
--                if let Some(ref shader) = rule.shader {
++        blur-background = false;
--                    let expanded = if shader.starts_with("~/") {
++    },
--                        if let Some(home) = dirs::home_dir() {
++    {
--                            home.join(&shader[2..]).to_string_lossy().to_string()
++        match = "window_type = 'tooltip'";
--                        } else {
++        shadow = false;
--                            shader.clone()
++        corner-radius = 0;
--                        }
++        blur-background = false;
++        fade = true;
++        opacity = 0.95;
++        focus = true;
++    },
++    {
++        match = "window_type = 'menu'";
++        shadow = false;
++        corner-radius = 0;
++        blur-background = false;
++        fade = false;
++    },
++    {
++        match = "window_type = 'dropdown_menu'";
++        shadow = false;
++        corner-radius = 0;
++        blur-background = false;
++        fade = false;
++        opacity = 0.95;
++    },
++    {
++        match = "window_type = 'popup_menu'";
++        shadow = false;
++        corner-radius = 0;
++        blur-background = false;
++        fade = false;
++        opacity = 0.95;
++    },
++    {
++        match = "window_type = 'dnd'";
++        shadow = false;
++    },
++    {
++        match = "_NET_WM_STATE *= '_NET_WM_STATE_FULLSCREEN'";
++        corner-radius = 0;
++        shadow = false;
++    },
++    {
++        match = "_NET_WM_BYPASS_COMPOSITOR = 1";
++        shadow = false;
++        blur-background = false;
++    },
++"#);
++
++        // User custom picom rules
++        for rule in &self.picom_rules {
++            rules.push_str(&format!("    {{\n        match = \"{}\";\n", rule.match_expr));
++            if let Some(cr) = rule.corner_radius {
++                rules.push_str(&format!("        corner-radius = {};\n", cr));
++            }
++            if let Some(opacity) = rule.opacity {
++                rules.push_str(&format!("        opacity = {:.2};\n", opacity));
++            }
++            if let Some(shadow) = rule.shadow {
++                rules.push_str(&format!("        shadow = {};\n", shadow));
++            }
++            if let Some(blur) = rule.blur_background {
++                rules.push_str(&format!("        blur-background = {};\n", blur));
++            }
++            if let Some(ref shader) = rule.shader {
++                let expanded = if shader.starts_with("~/") {
++                    if let Some(home) = dirs::home_dir() {
++                        home.join(&shader[2..]).to_string_lossy().to_string()
                      } else {
                          shader.clone()
--                    };
++                    }
--                    rules.push_str(&format!("        shader = \"{}\";\n", expanded));
++                } else {
--                }
++                    shader.clone()
--                rules.push_str("    },\n");
++                };
++                rules.push_str(&format!("        shader = \"{}\";\n", expanded));
+             }
--            rules.push_str(");");
++            rules.push_str("    },\n");
--            rules
++        }
--        } else {
++
--            "# No per-window rules".to_string()
++        rules.push_str(");");
--        };
++        let rules_section = rules;
          format!(
              r#"# picom.conf - Auto-generated by gar window manager
  # Rounded Corners
  corner-radius = {};
--rounded-corners-exclude = [
--    "window_type = 'dock'",
--    "window_type = 'desktop'",
--    "window_type = 'tooltip'",
--    "window_type = 'menu'",
--    "window_type = 'dropdown_menu'",
--    "window_type = 'popup_menu'",
--    "_NET_WM_STATE *= '_NET_WM_STATE_FULLSCREEN'"
--];
--
  {}
  {}
  {}
  {}
--
--# Window Type Settings
--wintypes:
--{{
--    tooltip = {{
--        fade = true;
--        shadow = false;
--        opacity = 0.95;
--        focus = true;
--        blur-background = false;
--    }};
--    dock = {{
--        shadow = false;
--        clip-shadow-above = true;
--    }};
--    dnd = {{
--        shadow = false;
--    }};
--    popup_menu = {{
--        opacity = 0.95;
--        shadow = false;
--    }};
--    dropdown_menu = {{
--        opacity = 0.95;
--        shadow = false;
--    }};
--}};
  "#,
              self.picom_backend,
              self.corner_radius,