Skip to content

Close with keyboard #7

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

Draft
natapov wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Close with keyboard #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c45f3b
extracted window closing code into a function
natapov Jan 18, 2023
3140068
made pressing Q close selected window
natapov Jan 18, 2023
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
168 changes: 94 additions & 74 deletions SimpleWindowSwitcher/sws_WindowSwitcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,89 @@ static DWORD _sws_WindowSwitcher_EndTaskThreadProc(sws_WindowSwitcher_EndTaskThr
free(params);
}

BOOL _sws_WindowSwitcher_CloseWindowById(sws_WindowSwitcher* _this, INT closeIndex)
{
sws_WindowSwitcherLayoutWindow* pWindowList = _this->layout.pWindowList.pList;
if (_this->layout.bIncludeWallpaper && pWindowList[closeIndex].hWnd == _this->layout.hWndWallpaper)
{
return FALSE; // window failed to close
}
DWORD closePID;
GetWindowThreadProcessId(pWindowList[closeIndex].hWnd, &closePID);
if (_this->hLastClosedWnds)
{
DPA_Destroy(_this->hLastClosedWnds);
_this->hLastClosedWnds = NULL;
}
_this->hLastClosedWnds = DPA_Create(SWS_VECTOR_CAPACITY);

if (_this->bSwitcherIsPerApplication && _this->mode == SWS_WINDOWSWITCHER_LAYOUTMODE_FULL)
{
sws_WindowSwitcherLayout layout;
sws_WindowSwitcherLayout_Initialize(
&layout,
_this->hMonitor,
_this->hWnd,
&(_this->dwRowHeight),
&(_this->pHWNDList),
pWindowList[closeIndex].hWnd,
_this->hWndWallpaper
);
sws_WindowSwitcherLayoutWindow* pTestList = layout.pWindowList.pList;
for (unsigned int j = 0; j < layout.pWindowList.cbSize; ++j)
{
DWORD jPID;
GetWindowThreadProcessId(pTestList[j].hWnd, &jPID);
BOOL bShouldInclude = FALSE;
if (!_this->bSwitcherIsPerApplication)
{
bShouldInclude = (j == closeIndex);
}
else
{
bShouldInclude = (closePID == jPID || !_wcsicmp(pWindowList[closeIndex].wszPath, pTestList[j].wszPath));
}
if (bShouldInclude)
{
DPA_AppendPtr(_this->hLastClosedWnds, pTestList[j].hWnd);
}
}
sws_WindowSwitcherLayout_Clear(&layout);
}
else
{
DPA_AppendPtr(_this->hLastClosedWnds, pWindowList[closeIndex].hWnd);
}
for (unsigned j = 0; j < DPA_GetPtrCount(_this->hLastClosedWnds); ++j)
{
HWND hWnd = DPA_FastGetPtr(_this->hLastClosedWnds, j);
if (IsHungAppWindow(hWnd))
{
ShowWindow(_this->hWnd, SW_HIDE);
sws_WindowSwitcher_EndTaskThreadParams* pEndTaskParams = malloc(sizeof(sws_WindowSwitcher_EndTaskThreadParams));
if (pEndTaskParams)
{
pEndTaskParams->hWnd = hWnd;
pEndTaskParams->sws = _this;
pEndTaskParams->hDesktop = GetThreadDesktop(GetCurrentThreadId());
if (!SHCreateThread(_sws_WindowSwitcher_EndTaskThreadProc, pEndTaskParams, CTF_NOADDREFLIB, NULL))
{
free(pEndTaskParams);
EndTask(hWnd, FALSE, FALSE);
}
}
}
else
{
PostMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
}
}
SetTimer(_this->hWnd, SWS_WINDOWSWITCHER_TIMER_CLOSEHWND, SWS_WINDOWSWITCHER_TIMER_CLOSEHWND_DELAY, NULL);
//EndTask(pWindowList[i].hWnd, FALSE, FALSE);
//PostMessageW(pWindowList[i].hWnd, WM_CLOSE, 0, 0);
return TRUE;
}

static LRESULT _sws_WindowsSwitcher_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
sws_WindowSwitcher* _this = NULL;
Expand Down Expand Up @@ -2311,84 +2394,14 @@ static LRESULT _sws_WindowsSwitcher_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam,
{
if (_this->cwIndex != -1 &&
_this->cwIndex < _this->layout.pWindowList.cbSize &&
(uMsg == WM_MBUTTONUP ? 1 : (_this->cwMask & SWS_WINDOWFLAG_IS_ON_CLOSE)) &&
!(_this->layout.bIncludeWallpaper && pWindowList[i].hWnd == _this->layout.hWndWallpaper)
(uMsg == WM_MBUTTONUP ? 1 : (_this->cwMask & SWS_WINDOWFLAG_IS_ON_CLOSE))
)
{
DWORD iPID;
GetWindowThreadProcessId(pWindowList[i].hWnd, &iPID);
if (_this->hLastClosedWnds)
{
DPA_Destroy(_this->hLastClosedWnds);
_this->hLastClosedWnds = NULL;
}
_this->hLastClosedWnds = DPA_Create(SWS_VECTOR_CAPACITY);

if (_this->bSwitcherIsPerApplication && _this->mode == SWS_WINDOWSWITCHER_LAYOUTMODE_FULL)
{
sws_WindowSwitcherLayout layout;
sws_WindowSwitcherLayout_Initialize(
&layout,
_this->hMonitor,
_this->hWnd,
&(_this->dwRowHeight),
&(_this->pHWNDList),
pWindowList[i].hWnd,
_this->hWndWallpaper
);
sws_WindowSwitcherLayoutWindow* pTestList = layout.pWindowList.pList;
for (unsigned int j = 0; j < layout.pWindowList.cbSize; ++j)
{
DWORD jPID;
GetWindowThreadProcessId(pTestList[j].hWnd, &jPID);
BOOL bShouldInclude = FALSE;
if (!_this->bSwitcherIsPerApplication)
{
bShouldInclude = (j == i);
}
else
{
bShouldInclude = (iPID == jPID || !_wcsicmp(pWindowList[i].wszPath, pTestList[j].wszPath));
}
if (bShouldInclude)
{
DPA_AppendPtr(_this->hLastClosedWnds, pTestList[j].hWnd);
}
}
sws_WindowSwitcherLayout_Clear(&layout);
}
else
//(_this->cwIndex == i) here unless i'm misunderstanding -shai
if (_sws_WindowSwitcher_CloseWindowById(_this, i))
{
DPA_AppendPtr(_this->hLastClosedWnds, pWindowList[i].hWnd);
}
for (unsigned j = 0; j < DPA_GetPtrCount(_this->hLastClosedWnds); ++j)
{
HWND hWnd = DPA_FastGetPtr(_this->hLastClosedWnds, j);
if (IsHungAppWindow(hWnd))
{
ShowWindow(_this->hWnd, SW_HIDE);
sws_WindowSwitcher_EndTaskThreadParams* pEndTaskParams = malloc(sizeof(sws_WindowSwitcher_EndTaskThreadParams));
if (pEndTaskParams)
{
pEndTaskParams->hWnd = hWnd;
pEndTaskParams->sws = _this;
pEndTaskParams->hDesktop = GetThreadDesktop(GetCurrentThreadId());
if (!SHCreateThread(_sws_WindowSwitcher_EndTaskThreadProc, pEndTaskParams, CTF_NOADDREFLIB, NULL))
{
free(pEndTaskParams);
EndTask(hWnd, FALSE, FALSE);
}
}
}
else
{
PostMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
}
break;
}
SetTimer(_this->hWnd, SWS_WINDOWSWITCHER_TIMER_CLOSEHWND, SWS_WINDOWSWITCHER_TIMER_CLOSEHWND_DELAY, NULL);
//EndTask(pWindowList[i].hWnd, FALSE, FALSE);
//PostMessageW(pWindowList[i].hWnd, WM_CLOSE, 0, 0);
break;
}
if (uMsg == WM_MBUTTONUP)
{
Expand Down Expand Up @@ -2426,6 +2439,13 @@ static LRESULT _sws_WindowsSwitcher_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam,
ShowWindow(_this->hWnd, SW_HIDE);
return 0;
}*/

//No particular reason this has to be Q but it seemed like a nice choice - Shai
if ((uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN) && wParam == 0x51)
{
_sws_WindowSwitcher_CloseWindowById(_this, _this->layout.iIndex);
return 0;
}
if (uMsg == WM_HOTKEY && (LOWORD(lParam) & MOD_CONTROL))
{
_this->bWasControl = TRUE;
Expand Down