X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-win32.c;h=04e4ef4e52d75978520751034339291d9f431d0a;hb=f8a6f7154a8d2abd925fc5cc60c6544b838b602c;hp=1bc8a6cd48ab8182016b432d6fcc99ae8f67f35f;hpb=bcf8984f9b78949a7f33b2771800e67a538caddc;p=wmpus diff --git a/sys-win32.c b/sys-win32.c index 1bc8a6c..04e4ef4 100644 --- a/sys-win32.c +++ b/sys-win32.c @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2011 Andy Spencer + * + * 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 . + */ + #include #include #include @@ -25,8 +42,9 @@ typedef struct { } keymap_t; /* Global data */ -static int shellhookid; -static void *win_cache; +static int shellhookid; +static void *cache; +static win_t *root; /* Conversion functions */ static keymap_t key2vk[] = { @@ -98,7 +116,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) { @@ -141,16 +159,16 @@ static win_t *win_find(HWND hwnd, int create) win_sys_t sys = {.hwnd=hwnd}; win_t tmp = {.sys=&sys}; win_t **old = NULL, *new = NULL; - if ((old = tfind(&tmp, &win_cache, win_cmp))) + if ((old = tfind(&tmp, &cache, win_cmp))) return *old; if (create && (new = win_new(hwnd,1))) - tsearch(new, &win_cache, win_cmp); + tsearch(new, &cache, win_cmp); return new; } static void win_remove(win_t *win) { - tdelete(win, &win_cache, win_cmp); + tdelete(win, &cache, win_cmp); free(win->sys); free(win); } @@ -178,20 +196,33 @@ LRESULT CALLBACK KbdProc(int msg, WPARAM wParam, LPARAM lParam) msg, wParam, lParam, st->vkCode, st->scanCode, st->flags, key, mod2int(mod)); - return wm_handle_key(win_focused(), key, mod, getptr()) + return wm_handle_key(win_focused() ?: root, key, mod, getptr()) || CallNextHookEx(0, msg, wParam, lParam); } LRESULT CALLBACK MllProc(int msg, WPARAM wParam, LPARAM lParam) { - Key_t key = key_none; - mod_t mod = getmod(); + Key_t key = key_none; + mod_t mod = getmod(); + win_t *win = win_cursor(); + + /* Update modifiers */ switch (wParam) { case WM_LBUTTONDOWN: mod.up = 0; key = key_mouse1; break; case WM_LBUTTONUP: mod.up = 1; key = key_mouse1; break; case WM_RBUTTONDOWN: mod.up = 0; key = key_mouse3; break; case WM_RBUTTONUP: mod.up = 1; key = key_mouse3; break; } + + /* Check for focus-in/focus-out */ + static win_t *old = NULL; + if (win && win != old) { + wm_handle_key(old, key_leave, mod, getptr()); + wm_handle_key(win, key_enter, mod, getptr()); + } + old = win; + + /* Send mouse movement event */ if (wParam == WM_MOUSEMOVE) return wm_handle_ptr(win_cursor(), getptr()); else if (key != key_none) @@ -223,7 +254,7 @@ LRESULT CALLBACK ShlProc(int msg, WPARAM wParam, LPARAM lParam) return 1; case HSHELL_WINDOWACTIVATED: printf("ShlProc: %p - window activated\n", hwnd); - return 1; + return 0; default: printf("ShlProc: %p - unknown msg, %d\n", hwnd, msg); return 0; @@ -245,9 +276,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); @@ -272,8 +321,8 @@ 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); AttachThreadInput(oldId, newId, TRUE); @@ -301,37 +350,19 @@ void sys_show(win_t *win, state_t state) void sys_watch(win_t *win, Key_t key, mod_t mod) { (void)key2w; // TODO - printf("sys_watch: %p\n", win); + //printf("sys_watch: %p\n", win); } void sys_unwatch(win_t *win, Key_t key, mod_t mod) { (void)key2w; // TODO - 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; + //printf("sys_unwatch: %p\n", win); } 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; } @@ -340,12 +371,12 @@ win_t *sys_init(void) HINSTANCE hInst = GetModuleHandle(NULL); HWND hwnd = NULL; - /* Setup AWM window class */ + /* 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()); @@ -355,7 +386,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()); @@ -371,7 +402,7 @@ win_t *sys_init(void) /* Input hooks */ SetWindowsHookEx(WH_KEYBOARD_LL, KbdProc, hInst, 0); - //SetWindowsHookEx(WH_MOUSE_LL, MllProc, hInst, 0); + SetWindowsHookEx(WH_MOUSE_LL, MllProc, hInst, 0); //SetWindowsHookEx(WH_SHELL, ShlProc, hInst, 0); /* Alternate ways to get input */ @@ -380,7 +411,7 @@ win_t *sys_init(void) //if (!RegisterHotKey(NULL, 123, MOD_CONTROL, VK_LBUTTON)) // printf("sys_init: Error Registering Hotkey - %lu\n", GetLastError()); - return win_new(hwnd,0); + return root = win_new(hwnd,0); } void sys_run(win_t *root)