diff options
| -rw-r--r-- | niri-config/src/lib.rs | 4 | ||||
| -rw-r--r-- | resources/default-config.kdl | 5 | ||||
| -rw-r--r-- | src/handlers/xdg_shell.rs | 10 | ||||
| -rw-r--r-- | src/window.rs | 3 |
4 files changed, 20 insertions, 2 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index e8d41764..2b40e7a9 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -585,6 +585,8 @@ pub struct WindowRule { pub open_on_output: Option<String>, #[knuffel(child, unwrap(argument))] pub open_maximized: Option<bool>, + #[knuffel(child, unwrap(argument))] + pub open_fullscreen: Option<bool>, } #[derive(knuffel::Decode, Debug, Default, Clone)] @@ -1065,6 +1067,7 @@ mod tests { open-on-output "eDP-1" open-maximized true + open-fullscreen false } binds { @@ -1225,6 +1228,7 @@ mod tests { }], open_on_output: Some("eDP-1".to_owned()), open_maximized: Some(true), + open_fullscreen: Some(false), ..Default::default() }], binds: Binds(vec![ diff --git a/resources/default-config.kdl b/resources/default-config.kdl index bd26d393..0ebefcd2 100644 --- a/resources/default-config.kdl +++ b/resources/default-config.kdl @@ -308,6 +308,11 @@ animations { // Make this window open as a maximized column. open-maximized true + + // Make this window open fullscreen. + open-fullscreen true + // You can also set this to false to prevent a window from opening fullscreen. + // open-fullscreen false } // Here's a useful example. Work around WezTerm's initial configure bug diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs index 02468518..590dc7a1 100644 --- a/src/handlers/xdg_shell.rs +++ b/src/handlers/xdg_shell.rs @@ -93,6 +93,10 @@ pub fn resolve_window_rules( if let Some(x) = rule.open_maximized { resolved.open_maximized = Some(x); } + + if let Some(x) = rule.open_fullscreen { + resolved.open_fullscreen = Some(x); + } } resolved.open_on_output = open_on_output.map(|x| x.to_owned()); @@ -604,8 +608,10 @@ impl State { .or_else(|| self.niri.layout.active_workspace()); if let Some(ws) = ws { - // Set a fullscreen state if requested. - if wants_fullscreen.is_some() { + // Set a fullscreen state based on window request and window rule. + if (wants_fullscreen.is_some() && rules.open_fullscreen.is_none()) + || rules.open_fullscreen == Some(true) + { toplevel.with_pending_state(|state| { state.states.set(xdg_toplevel::State::Fullscreen); }); diff --git a/src/window.rs b/src/window.rs index ce62d07b..a5023afa 100644 --- a/src/window.rs +++ b/src/window.rs @@ -58,6 +58,9 @@ pub struct ResolvedWindowRules { /// Whether the window should open full-width. pub open_maximized: Option<bool>, + + /// Whether the window should open fullscreen. + pub open_fullscreen: Option<bool>, } impl Unmapped { |