Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ Window Action Commands:

set_desktop_for_window [WINDOW] NUMBER
Move a window to a different desktop.
Specify the desktop number or "current_desktop" or "all".

Global Commands:
get_desktop
Expand Down
2 changes: 2 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,8 @@ fn generate_step(
}
} else if id.to_lowercase() == "current_desktop" {
-1
} else if id.to_lowercase() == "all" {
-2
} else {
return Err(anyhow!("invalid desktop id '{id}'"));
}
Expand Down
14 changes: 11 additions & 3 deletions src/templates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ workspace_setCurrentDesktop = (desktop) => { workspace.currentDesktop
workspace_numDesktops = () => workspace.desktops;
workspace_setNumDesktops = (n) => { workspace.desktops = n };
window_x11DesktopIds = (window) => window.x11DesktopIds;
window_setX11DesktopId = (window, id) => { window.desktop = id; };
window_setX11DesktopId = (window, id) => {
if (id == -2) {
output_error("`all` unsupported in KDE 5");
} else {
window.desktop = id;
}
};
window_screen = (window) => window.screen;
{{else}}
workspace_windowList = () => workspace.windowList();
Expand All @@ -55,8 +61,10 @@ workspace_numDesktops = () => workspace.desktops.length;
workspace_setNumDesktops = (n) => { output_error("`set_num_desktops` unsupported in KDE 6"); };
window_x11DesktopIds = (window) => window.desktops.map((d) => d.x11DesktopNumber);
window_setX11DesktopId = (window, id) => {
if (id < 0) {
if (id == -1) {
window.desktops = [workspace.currentDesktop];
} else if (id == -2) {
window.onAllDesktops = true;
} else {
let d = workspace.desktops.find((d) => d.x11DesktopNumber == id);
if (d) {
Expand Down Expand Up @@ -213,7 +221,7 @@ pub const WINDOW_ACTIONS: phf::Map<&'static str, &'static str> = phf::phf_map! {
"#,
"windowstate" => "{{{windowstate}}}",
"get_desktop_for_window"=> "output_result(window_x11DesktopIds(w)[0]);",
"set_desktop_for_window"=> "window_setX11DesktopId(w, {{{desktop_id}}})",
"set_desktop_for_window"=> "window_setX11DesktopId(w, {{{desktop_id}}});",
};

pub const WINDOWSTATE_PROPERTIES: phf::Map<&'static str, &'static str> = phf::phf_map! {
Expand Down