New command switch-to-app-or-urgent-or-lru-window

timeout_old
Tassilo Horn 3 years ago
parent 30e3d3b080
commit 2702a69925
  1. 8
      NEWS.md
  2. 26
      src/cmds.rs

@ -1,3 +1,11 @@
swayr v0.15.0
=============
- There's a new command `switch-to-app-or-urgent-or-lru-window` which given an
application ID or window class switches to a matching window unless that's
already the current window. In that case, it acts just like
`switch-to-urgent-or-lru-window`.
swayr v0.14.0 swayr v0.14.0
============= =============

@ -67,6 +67,10 @@ pub enum ConsiderWindows {
pub enum SwayrCommand { pub enum SwayrCommand {
/// Switch to next urgent window (if any) or to last recently used window. /// Switch to next urgent window (if any) or to last recently used window.
SwitchToUrgentOrLRUWindow, SwitchToUrgentOrLRUWindow,
/// Switch to the given app (given by app_id or window class) if that's not
/// currently focused. If it is, switch to the next urgent window (if any)
/// or to last recently used window.
SwitchToAppOrUrgentOrLRUWindow { name: String },
/// Focus the selected window. /// Focus the selected window.
SwitchWindow, SwitchWindow,
/// Switch to the selected workspace. /// Switch to the selected workspace.
@ -249,6 +253,12 @@ pub fn exec_swayr_cmd(args: ExecSwayrCmdArgs) {
SwayrCommand::SwitchToUrgentOrLRUWindow => { SwayrCommand::SwitchToUrgentOrLRUWindow => {
switch_to_urgent_or_lru_window(&*props.read().unwrap()) switch_to_urgent_or_lru_window(&*props.read().unwrap())
} }
SwayrCommand::SwitchToAppOrUrgentOrLRUWindow { name } => {
switch_to_app_or_urgent_or_lru_window(
Some(name),
&*props.read().unwrap(),
)
}
SwayrCommand::SwitchWindow => switch_window(&*props.read().unwrap()), SwayrCommand::SwitchWindow => switch_window(&*props.read().unwrap()),
SwayrCommand::SwitchWorkspace => { SwayrCommand::SwitchWorkspace => {
switch_workspace(&*props.read().unwrap()) switch_workspace(&*props.read().unwrap())
@ -476,14 +486,28 @@ pub fn get_outputs() -> Vec<s::Output> {
pub fn switch_to_urgent_or_lru_window( pub fn switch_to_urgent_or_lru_window(
extra_props: &HashMap<i64, t::ExtraProps>, extra_props: &HashMap<i64, t::ExtraProps>,
) {
switch_to_app_or_urgent_or_lru_window(None, extra_props)
}
pub fn switch_to_app_or_urgent_or_lru_window(
name: Option<&str>,
extra_props: &HashMap<i64, t::ExtraProps>,
) { ) {
let root = get_tree(false); let root = get_tree(false);
let tree = t::get_tree(&root, extra_props); let tree = t::get_tree(&root, extra_props);
if let Some(win) = tree.get_windows().get(0) { let wins = tree.get_windows();
let app_win =
name.and_then(|n| wins.iter().find(|w| w.node.get_app_name() == n));
if app_win.is_none() || app_win.unwrap().node.is_current() {
if let Some(win) = wins.get(0) {
focus_window_by_id(win.node.id) focus_window_by_id(win.node.id)
} else { } else {
log::debug!("No window to switch to.") log::debug!("No window to switch to.")
} }
} else {
focus_window_by_id(app_win.unwrap().node.id)
}
} }
lazy_static! { lazy_static! {

Loading…
Cancel
Save