Misc debugging

[wmpus] / sys-win32.c

diff --git a/sys-win32.c b/sys-win32.c
index bf6c9aa466b7db3227e3b252e80760ea8b7a3d77..afacdd2ba99ec8d3b3ab83b923d1462a5e5d44fc 100644 (file)
--- a/sys-win32.c
+++ b/sys-win32.c
@@ -25,9 +25,13 @@
 #include <winuser.h>
 
 #include "util.h"
+#include "conf.h"
 #include "sys.h"
 #include "wm.h"
 
+/* Configuration */
+static int NO_CAPTURE = 0;
+
 /* Internal structures */
 struct win_sys {
        HWND hwnd;
@@ -40,9 +44,10 @@ typedef struct {
 } keymap_t;
 
 /* Global data */
-static int    shellhookid;
-static void  *cache;
-static win_t *root;
+static int     shellhookid;
+static void   *cache;
+static win_t  *root;
+static list_t *screens;
 
 /* Conversion functions */
 static keymap_t key2vk[] = {
@@ -292,6 +297,14 @@ BOOL CALLBACK MonProc(HMONITOR mon, HDC dc, LPRECT rect, LPARAM _screens)
        return TRUE;
 }
 
+BOOL CALLBACK LoopProc(HWND hwnd, LPARAM user)
+{
+       win_t *win;
+       if ((win = win_find(hwnd,1)))
+               wm_insert(win);
+       return TRUE;
+}
+
 /********************
  * System functions *
  ********************/
@@ -363,8 +376,8 @@ void sys_unwatch(win_t *win, Key_t key, mod_t mod)
 
 list_t *sys_info(win_t *win)
 {
-       list_t *screens = NULL;
-       EnumDisplayMonitors(NULL, NULL, MonProc, (LPARAM)&screens);
+       if (screens == NULL)
+               EnumDisplayMonitors(NULL, NULL, MonProc, (LPARAM)&screens);
        return screens;
 }
 
@@ -373,6 +386,9 @@ win_t *sys_init(void)
        HINSTANCE hInst = GetModuleHandle(NULL);
        HWND      hwnd  = NULL;
 
+       /* Load configuration */
+       NO_CAPTURE = conf_get_int("main.no-capture", NO_CAPTURE);
+
        /* Setup window class */
        WNDCLASSEX wc    = {
                .cbSize        = sizeof(WNDCLASSEX),
@@ -418,9 +434,24 @@ win_t *sys_init(void)
 
 void sys_run(win_t *root)
 {
-       MSG msg;
-       while (GetMessage(&msg, NULL, 0, 0) > 0) {
+       MSG msg = {};
+       if (!NO_CAPTURE)
+               EnumWindows(LoopProc, 0);
+       while (GetMessage(&msg, NULL, 0, 0) > 0 &&
+              msg.message != WM_QUIT) {
                TranslateMessage(&msg);
                DispatchMessage(&msg);
        }
 }
+
+void sys_exit(void)
+{
+       PostQuitMessage(0);
+}
+
+void sys_free(win_t *root)
+{
+       /* I don't really care about this
+        * since I don't know how to use
+        * valgrind on win32 anyway.. */
+}