X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-win32.c;h=ba3a7e9c9bb04f70701bb286d8554e8958a062ac;hb=8bcaf951a632cdadb149b7b6e53c94f666146afb;hp=4a5e8318becc5e349b1e6c580186390e22f03b2c;hpb=02b81f6d41f4d878d3849929a3f1859b41bca15e;p=wmpus diff --git a/sys-win32.c b/sys-win32.c index 4a5e831..ba3a7e9 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 @@ -16,6 +33,7 @@ /* Internal structures */ struct win_sys { HWND hwnd; + state_t state; }; typedef struct { @@ -24,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[] = { @@ -97,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) { @@ -140,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); } @@ -177,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) @@ -214,14 +246,15 @@ LRESULT CALLBACK ShlProc(int msg, WPARAM wParam, LPARAM lParam) return 1; case HSHELL_WINDOWDESTROYED: printf("ShlProc: %p - window destroyed\n", hwnd); - if ((win = win_find(hwnd,0))) { + if ((win = win_find(hwnd,0)) && + win->sys->state == st_show) { wm_remove(win); win_remove(win); } 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; @@ -243,13 +276,31 @@ 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); - win->x = MAX(x,0); win->y = MAX(y,0); + win->x = x; win->y = y; win->w = MAX(w,1); win->h = MAX(h,1); MoveWindow(win->sys->hwnd, win->x, win->y, win->w, win->h, TRUE); } @@ -270,25 +321,53 @@ 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); } +void sys_show(win_t *win, state_t state) +{ + static struct { + char *str; + int cmd; + } map[] = { + [st_show ] {"show" , SW_SHOW }, + [st_full ] {"full" , SW_MAXIMIZE}, + [st_shade] {"shade", SW_SHOW }, + [st_icon ] {"icon" , SW_MINIMIZE}, + [st_hide ] {"hide" , SW_HIDE }, + }; + win->sys->state = state; + printf("sys_show: %s\n", map[state].str); + ShowWindow(win->sys->hwnd, map[state].cmd); +} + 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); + //printf("sys_unwatch: %p\n", win); +} + +list_t *sys_info(win_t *win) +{ + list_t *screens = NULL; + EnumDisplayMonitors(NULL, NULL, MonProc, (LPARAM)&screens); + return screens; } win_t *sys_init(void) @@ -296,12 +375,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()); @@ -311,7 +390,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()); @@ -327,7 +406,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 */ @@ -336,7 +415,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)