X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-win32.c;h=8e34940c22da440489f9af14c88ae5d1be7be864;hb=e70f83bc769b1de560882f4db5c6f33dce09350b;hp=81175fdd2cf3ca03f79ce0b0841270380ac3a85c;hpb=519fdd6d5a7c1e0c75638ff18a081e53aee30dbd;p=wmpus diff --git a/sys-win32.c b/sys-win32.c index 81175fd..8e34940 100644 --- a/sys-win32.c +++ b/sys-win32.c @@ -1,22 +1,41 @@ +/* + * Copyright (c) 2011, Andy Spencer + * + * 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 #include #include #include #define WIN32_LEAN_AND_MEAN -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0501 #include #include #include #include "util.h" +#include "conf.h" #include "sys.h" #include "wm.h" +/* Configuration */ +static int NO_CAPTURE = 0; +static int STACK = 25; + /* Internal structures */ struct win_sys { HWND hwnd; - state_t state; }; typedef struct { @@ -25,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[] = { @@ -99,7 +119,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) { @@ -219,24 +239,30 @@ LRESULT CALLBACK ShlProc(int msg, WPARAM wParam, LPARAM lParam) HWND hwnd = (HWND)wParam; win_t *win = NULL; switch (msg) { - case HSHELL_WINDOWCREATED: case HSHELL_REDRAW: + case HSHELL_WINDOWCREATED: printf("ShlProc: %p - %s\n", hwnd, msg == HSHELL_REDRAW ? "redraw" : "window created"); if (!(win = win_find(hwnd,0))) if ((win = win_find(hwnd,1))) wm_insert(win); return 1; + case HSHELL_WINDOWREPLACED: case HSHELL_WINDOWDESTROYED: - printf("ShlProc: %p - window destroyed\n", hwnd); + printf("ShlProc: %p - %s\n", hwnd, msg == HSHELL_WINDOWREPLACED ? + "window replaced" : "window destroyed"); if ((win = win_find(hwnd,0)) && - win->sys->state == st_show) { + (win->state == st_show || + win->state == st_shade)) { wm_remove(win); win_remove(win); } return 1; case HSHELL_WINDOWACTIVATED: printf("ShlProc: %p - window activated\n", hwnd); + // Fake button-click + if ((win = win_find(hwnd,0))) + wm_handle_key(win, key_mouse1, MOD(), getptr()); return 0; default: printf("ShlProc: %p - unknown msg, %d\n", hwnd, msg); @@ -259,9 +285,42 @@ 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->z = !!(info.dwFlags & MONITORINFOF_PRIMARY); + 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; +} + +BOOL CALLBACK LoopProc(HWND hwnd, LPARAM user) +{ + win_t *win; + if ((win = win_find(hwnd,1))) + wm_insert(win); + return TRUE; +} + +BOOL WINAPI CtrlProc(DWORD type) +{ + sys_exit(); + 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); @@ -273,12 +332,15 @@ void sys_move(win_t *win, int x, int y, int w, int h) 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) @@ -286,13 +348,23 @@ 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 */ - DWORD oldId = GetWindowThreadProcessId(GetForegroundWindow(), NULL); - DWORD newId = GetWindowThreadProcessId(win->sys->hwnd, NULL); - AttachThreadInput(oldId, newId, TRUE); - SetForegroundWindow(win->sys->hwnd); - AttachThreadInput(oldId, newId, FALSE); + * certain circumstances and instead flashes the windows toolbar icon. + * Attaching the thread input queues avoids this behavior */ + HWND fgWin = GetForegroundWindow(); + if (fgWin == win->sys->hwnd) + return; // already focused + DWORD oldId = GetWindowThreadProcessId(fgWin, NULL); + DWORD newId = GetCurrentThreadId(); + if (oldId != newId) + AttachThreadInput(oldId, newId, TRUE); + + 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); + + if (oldId != newId) + AttachThreadInput(oldId, newId, FALSE); } void sys_show(win_t *win, state_t state) @@ -307,9 +379,13 @@ 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,STACK), TRUE); } void sys_watch(win_t *win, Key_t key, mod_t mod) @@ -324,28 +400,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); + if (screens == NULL) + EnumDisplayMonitors(NULL, NULL, MonProc, (LPARAM)&screens); return screens; } @@ -354,12 +412,16 @@ win_t *sys_init(void) HINSTANCE hInst = GetModuleHandle(NULL); HWND hwnd = NULL; - /* Setup AWM window class */ + /* Load configuration */ + NO_CAPTURE = conf_get_int("main.no-capture", NO_CAPTURE); + STACK = conf_get_int("main.stack", STACK); + + /* Setup window class */ WNDCLASSEX wc = { .cbSize = sizeof(WNDCLASSEX), .lpfnWndProc = WndProc, .hInstance = hInst, - .lpszClassName = "awm_class", + .lpszClassName = "wmpus_class", }; if (!RegisterClassEx(&wc)) printf("sys_init: Error Registering Class - %lu\n", GetLastError()); @@ -369,7 +431,7 @@ win_t *sys_init(void) SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0); /* Create shell hook window */ - if (!(hwnd = CreateWindowEx(0, "awm_class", "awm", 0, + if (!(hwnd = CreateWindowEx(0, "wmpus_class", "wmpus", 0, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, HWND_MESSAGE, NULL, hInst, NULL))) printf("sys_init: Error Creating Shell Hook Window - %lu\n", GetLastError()); @@ -394,14 +456,32 @@ win_t *sys_init(void) //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_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) +{ + PostMessage(root->sys->hwnd, WM_QUIT, 0, 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.. */ +}