Support graceful shutdown

[wmpus] / sys-win32.c

diff --git a/sys-win32.c b/sys-win32.c
index 04e4ef4e52d75978520751034339291d9f431d0a..bf6c9aa466b7db3227e3b252e80760ea8b7a3d77 100644 (file)
--- a/sys-win32.c
+++ b/sys-win32.c
@@ -1,18 +1,16 @@
 /*
- * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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>
@@ -324,9 +322,13 @@ void sys_focus(win_t *win)
         * 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);
 }