/* Internal structures */
struct win_sys {
HWND hwnd;
- state_t state;
};
typedef struct {
case HSHELL_WINDOWDESTROYED:
printf("ShlProc: %p - window destroyed\n", hwnd);
if ((win = win_find(hwnd,0)) &&
- win->sys->state == st_show) {
+ win->state == st_show) {
wm_remove(win);
win_remove(win);
}
return TRUE;
}
+BOOL WINAPI CtrlProc(DWORD type)
+{
+ sys_exit();
+ return TRUE;
+}
+
/********************
* System functions *
********************/
void sys_raise(win_t *win)
{
printf("sys_raise: %p\n", win);
- SetForegroundWindow(win->sys->hwnd);
- //HWND hwnd = win->sys->hwnd;
- //HWND top = GetAncestor(hwnd,GA_ROOT);
- //SetWindowPos(top, HWND_TOPMOST, 0, 0, 0, 0,
- // SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
+ /* See note in sys_focus */
+ DWORD oldId = GetWindowThreadProcessId(GetForegroundWindow(), NULL);
+ DWORD newId = GetCurrentThreadId();
+ AttachThreadInput(oldId, newId, TRUE);
+
+ SetWindowPos(win->sys->hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+
+ AttachThreadInput(oldId, newId, FALSE);
}
void sys_focus(win_t *win)
/* Windows prevents a thread from using SetForegroundInput under
* certain circumstances and instead flashes the windows toolbar icon.
* Attaching the thread input queues avoids this behavior */
- DWORD oldId = GetWindowThreadProcessId(GetForegroundWindow(), NULL);
+ HWND fgWin = GetForegroundWindow();
+ if (fgWin == win->sys->hwnd)
+ return; // already focused
+ DWORD oldId = GetWindowThreadProcessId(fgWin, NULL);
DWORD newId = GetCurrentThreadId();
- AttachThreadInput(oldId, newId, TRUE);
+ if (oldId != newId)
+ AttachThreadInput(oldId, newId, TRUE);
- BringWindowToTop(win->sys->hwnd);
- SetForegroundWindow(win->sys->hwnd);
- SetFocus(win->sys->hwnd);
+ HWND next = GetWindow(win->sys->hwnd, GW_HWNDNEXT);
+ SetWindowPos(win->sys->hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+ if (next)
+ SetWindowPos(win->sys->hwnd, next, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
- AttachThreadInput(oldId, newId, FALSE);
+ if (oldId != newId)
+ AttachThreadInput(oldId, newId, FALSE);
}
void sys_show(win_t *win, state_t state)
[st_icon ] {"icon" , SW_MINIMIZE},
[st_hide ] {"hide" , SW_HIDE },
};
- win->sys->state = state;
+ if (win->state != state && win->state == st_shade)
+ SetWindowRgn(win->sys->hwnd, NULL, TRUE);
+ win->state = state;
printf("sys_show: %s\n", map[state].str);
ShowWindow(win->sys->hwnd, map[state].cmd);
+ if (state == st_shade)
+ SetWindowRgn(win->sys->hwnd, CreateRectRgn(0,0,win->w,25), TRUE);
}
void sys_watch(win_t *win, Key_t key, mod_t mod)
//if (!RegisterHotKey(NULL, 123, MOD_CONTROL, VK_LBUTTON))
// printf("sys_init: Error Registering Hotkey - %lu\n", GetLastError());
+ /* Capture ctrl-c and console widnow close */
+ SetConsoleCtrlHandler(CtrlProc, TRUE);
+
return root = win_new(hwnd,0);
}
void sys_exit(void)
{
- PostQuitMessage(0);
+ PostMessage(root->sys->hwnd, WM_QUIT, 0, 0);
}
void sys_free(win_t *root)