Support graceful shutdown

[wmpus] / sys-win32.c

diff --git a/sys-win32.c b/sys-win32.c
index 1edc5d281d05c1a66dd320139ecd1686ccbeca28..bf6c9aa466b7db3227e3b252e80760ea8b7a3d77 100644 (file)
--- a/sys-win32.c
+++ b/sys-win32.c
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -99,7 +114,7 @@ static ptr_t getptr(void)
        return (ptr_t){-1, -1, wptr.x, wptr.y};
 }
 
-/* Helpers */
+/* Window functions */
 static win_t *win_new(HWND hwnd, int checkwin)
 {
        if (checkwin) {
@@ -259,9 +274,27 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
        return DefWindowProc(hwnd, msg, wParam, lParam);
 }
 
-/*****************
- * Sys functions *
- *****************/
+BOOL CALLBACK MonProc(HMONITOR mon, HDC dc, LPRECT rect, LPARAM _screens)
+{
+       MONITORINFO info = {.cbSize=sizeof(MONITORINFO)};
+       GetMonitorInfo(mon, &info);
+       RECT *work = &info.rcWork;
+
+       list_t **screens = (list_t**)_screens;
+       win_t *screen = new0(win_t);
+       screen->x = work->left;
+       screen->y = work->top;
+       screen->w = work->right  - work->left;
+       screen->h = work->bottom - work->top;
+       *screens = list_append(*screens, screen);
+       printf("mon_proc: %d,%d %dx%d\n",
+               screen->x, screen->y, screen->w, screen->h);
+       return TRUE;
+}
+
+/********************
+ * System functions *
+ ********************/
 void sys_move(win_t *win, int x, int y, int w, int h)
 {
        printf("sys_move: %p - %d,%d  %dx%d\n", win, x, y, w, h);
@@ -286,12 +319,16 @@ void sys_focus(win_t *win)
        printf("sys_focus: %p\n", win);
 
        /* Windows prevents a thread from using SetForegroundInput under
-        * certain circumstnaces and instead flashes the windows toolbar icon.
-        * Attaching the htread input queues avoids this behavior */
+        * certain circumstances and instead flashes the windows toolbar icon.
+        * Attaching the thread input queues avoids this behavior */
        DWORD oldId = GetWindowThreadProcessId(GetForegroundWindow(), NULL);
-       DWORD newId = GetWindowThreadProcessId(win->sys->hwnd,        NULL);
+       DWORD newId = GetCurrentThreadId();
        AttachThreadInput(oldId, newId, TRUE);
+
+       BringWindowToTop(win->sys->hwnd);
        SetForegroundWindow(win->sys->hwnd);
+       SetFocus(win->sys->hwnd);
+
        AttachThreadInput(oldId, newId, FALSE);
 }
 
@@ -324,28 +361,10 @@ void sys_unwatch(win_t *win, Key_t key, mod_t mod)
        //printf("sys_unwatch: %p\n", win);
 }
 
-BOOL CALLBACK Mon(HMONITOR mon, HDC dc, LPRECT rect, LPARAM _screens)
-{
-       MONITORINFO info = {.cbSize=sizeof(MONITORINFO)};
-       GetMonitorInfo(mon, &info);
-       RECT *work = &info.rcWork;
-
-       list_t **screens = (list_t**)_screens;
-       win_t *screen = new0(win_t);
-       screen->x = work->left;
-       screen->y = work->top;
-       screen->w = work->right  - work->left;
-       screen->h = work->bottom - work->top;
-       *screens = list_append(*screens, screen);
-       printf("mon_proc: %d,%d %dx%d\n",
-               screen->x, screen->y, screen->w, screen->h);
-       return TRUE;
-}
-
 list_t *sys_info(win_t *win)
 {
        list_t *screens = NULL;
-       EnumDisplayMonitors(NULL, NULL, Mon, (LPARAM)&screens);
+       EnumDisplayMonitors(NULL, NULL, MonProc, (LPARAM)&screens);
        return screens;
 }