Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(wm): adds Komorebic taskbar visibility controls #735

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feat(wm): adds Komorebic taskbar visibility controls #735

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
611e65f
feat(wm): adds Komorebic taskbar visibility controls
LegitCamper Apr 6, 2024
daa601d
Merge pull request #1 from LegitCamper/master
LegitCamper Apr 6, 2024
19ffed2
fix(wm): renames taskbar enums to be shorter
LegitCamper Apr 7, 2024
638e280
fix(wm): unhide taskbar during exit
LegitCamper Apr 7, 2024
0996580
fix(wm): remove duplicate lines
LegitCamper Apr 8, 2024
f54bcb2
fix(wm): fix taskbar handle function
LegitCamper Apr 8, 2024
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
2 changes: 2 additions & 0 deletions komorebi-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ pub enum SocketMessage {
EnsureWorkspaces(usize, usize),
EnsureNamedWorkspaces(usize, Vec<String>),
NewWorkspace,
ToggleTaskbar,
Taskbar(bool),
ToggleTiling,
Stop,
TogglePause,
Expand Down
25 changes: 25 additions & 0 deletions komorebi/src/process_command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,30 @@ impl WindowManager {
SocketMessage::MoveWorkspaceToMonitorNumber(monitor_idx) => {
self.move_workspace_to_monitor(monitor_idx)?;
}
SocketMessage::ToggleTaskbar => {
let (taskbar, startmenu) = WindowsApi::get_taskbar_handles()?;
let is_hidden = WindowsApi::is_taskbar_hidden(taskbar);
if is_hidden {
WindowsApi::hide_taskbar((taskbar, startmenu), true);
} else {
WindowsApi::hide_taskbar((taskbar, startmenu), false);
}
}
SocketMessage::Taskbar(show) => {
let (taskbar, startmenu) = WindowsApi::get_taskbar_handles()?;
if show {
WindowsApi::hide_taskbar((taskbar, startmenu), true);
} else {
WindowsApi::hide_taskbar((taskbar, startmenu), false);
}
}
SocketMessage::MoveWorkspaceToMonitorNumber(monitor_idx) => {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this have been mistakenly duplicated from above

self.move_workspace_to_monitor(monitor_idx)?;
}
SocketMessage::MoveWorkspaceToMonitorNumber(monitor_idx) => {
self.move_workspace_to_monitor(monitor_idx)?;
}

SocketMessage::TogglePause => {
if self.is_paused {
tracing::info!("resuming");
Expand Down Expand Up @@ -717,6 +741,7 @@ impl WindowManager {
"received stop command, restoring all hidden windows and terminating process"
);
self.restore_all_windows()?;
WindowsApi::hide_taskbar(WindowsApi::get_taskbar_handles()?, false);

if WindowsApi::focus_follows_mouse()? {
WindowsApi::disable_focus_follows_mouse()?;
Expand Down
28 changes: 28 additions & 0 deletions komorebi/src/windows_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use color_eyre::eyre::anyhow;
use color_eyre::eyre::Error;
use color_eyre::Result;
use widestring::U16CStr;
use windows::core::s;
use windows::core::Result as WindowsCrateResult;
use windows::core::PCSTR;
use windows::core::PCWSTR;
use windows::core::PWSTR;
use windows::Win32::Foundation::CloseHandle;
Expand Down Expand Up @@ -74,6 +76,8 @@ use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
use windows::Win32::UI::WindowsAndMessaging::BringWindowToTop;
use windows::Win32::UI::WindowsAndMessaging::CreateWindowExW;
use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
use windows::Win32::UI::WindowsAndMessaging::FindWindowA;
use windows::Win32::UI::WindowsAndMessaging::FindWindowExA;
use windows::Win32::UI::WindowsAndMessaging::GetCursorPos;
use windows::Win32::UI::WindowsAndMessaging::GetDesktopWindow;
use windows::Win32::UI::WindowsAndMessaging::GetForegroundWindow;
Expand Down Expand Up @@ -119,6 +123,7 @@ use windows::Win32::UI::WindowsAndMessaging::SW_HIDE;
use windows::Win32::UI::WindowsAndMessaging::SW_MAXIMIZE;
use windows::Win32::UI::WindowsAndMessaging::SW_MINIMIZE;
use windows::Win32::UI::WindowsAndMessaging::SW_NORMAL;
use windows::Win32::UI::WindowsAndMessaging::SW_SHOW;
use windows::Win32::UI::WindowsAndMessaging::SW_SHOWNOACTIVATE;
use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_ACTION;
use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS;
Expand Down Expand Up @@ -571,6 +576,29 @@ impl WindowsApi {
Self::set_cursor_pos(rect.left + (rect.right / 2), rect.top + (rect.bottom / 2))
}

pub fn get_taskbar_handles() -> Result<(HWND, HWND)> {
let taskbar = unsafe { FindWindowA(s!("Shell_TrayWnd"), PCSTR::null()) };
let startmenu = unsafe { FindWindowExA(taskbar, HWND { 0: 0 }, s!("Button"), s!("Start")) };
Ok((HWND(taskbar.process()?), HWND(startmenu.process()?)))
}

pub fn is_taskbar_hidden(taskbar_hwnd: HWND) -> bool {
unsafe { IsWindowVisible(taskbar_hwnd) }.as_bool()
}

pub fn hide_taskbar(taskbar_hwnds: (HWND, HWND), hide: bool) {
unsafe {
if hide {
// 0 hides the taskbar and 5 enables visibility
ShowWindow(taskbar_hwnds.0, SW_HIDE);
ShowWindow(taskbar_hwnds.1, SW_HIDE);
} else {
ShowWindow(taskbar_hwnds.0, SW_SHOW);
ShowWindow(taskbar_hwnds.1, SW_SHOW);
}
}
}

pub fn window_thread_process_id(hwnd: HWND) -> (u32, u32) {
let mut process_id: u32 = 0;

Expand Down
12 changes: 12 additions & 0 deletions komorebic/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ gen_enum_subcommand_args! {
CycleLayout: CycleDirection,
WatchConfiguration: BooleanState,
MouseFollowsFocus: BooleanState,
Taskbar: BooleanState,
Query: StateQuery,
WindowHidingBehaviour: HidingBehaviour,
CrossMonitorMoveBehaviour: MoveBehaviour,
Expand Down Expand Up @@ -1052,6 +1053,11 @@ enum SubCommand {
/// Set the workspace name for the specified workspace
#[clap(arg_required_else_help = true)]
WorkspaceName(WorkspaceName),
/// Toggles tasbar visibility
ToggleTaskbar,
/// shows tasbar
#[clap(arg_required_else_help = true)]
Taskbar(Taskbar),
/// Toggle the behaviour for new windows (stacking or dynamic tiling)
ToggleWindowContainerBehaviour,
/// Toggle window tiling on the focused workspace
Expand Down Expand Up @@ -1993,6 +1999,12 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
.as_bytes()?,
)?;
}
SubCommand::ToggleTaskbar => {
send_message(&SocketMessage::ToggleTaskbar.as_bytes()?)?;
}
SubCommand::Taskbar(arg) => {
send_message(&SocketMessage::Taskbar(arg.boolean_state.into()).as_bytes()?)?;
}
SubCommand::MonitorIndexPreference(arg) => {
send_message(
&SocketMessage::MonitorIndexPreference(
Expand Down
Loading