frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not grab ALT-TAB when window is in multiwindow mode

This commit is contained in:
Alexander Gottwald 2005-01-11 12:03:34 +00:00
parent d365664c58
commit 27fc6874b3
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/ChangeLog
View File

@ -1,4 +1,9 @@
2005-01-10 Alexander Gottwald <ago at freedesktop dot org> 2005-01-11 Alexander Gottwald <ago at freedesktop dot org>
* winkeyhook.c:
Do not grab ALT-TAB when window is in multiwindow mode
2005-01-11 Alexander Gottwald <ago at freedesktop dot org>
* winprefs.h: * winprefs.h:
Fix crash with not matching definitions of PATH_MAX Fix crash with not matching definitions of PATH_MAX

24
hw/xwin/winkeyhook.c
View File

@ -64,8 +64,29 @@ static LRESULT CALLBACK
winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam) winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam)
{ {
BOOL fPassKeystroke = FALSE; BOOL fPassKeystroke = FALSE;
BOOL fPassAltTab = TRUE;
PKBDLLHOOKSTRUCT p = (PKBDLLHOOKSTRUCT) lParam; PKBDLLHOOKSTRUCT p = (PKBDLLHOOKSTRUCT) lParam;
HWND hwnd = GetActiveWindow(); HWND hwnd = GetActiveWindow();
#ifdef XWIN_MULTIWINDOW
WindowPtr pWin = NULL;
winPrivWinPtr pWinPriv = NULL;
winPrivScreenPtr pScreenPriv = NULL;
winScreenInfo *pScreenInfo = NULL;
/* Check if the Windows window property for our X window pointer is valid */
if ((pWin = GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
{
/* Get a pointer to our window privates */
pWinPriv = winGetWindowPriv(pWin);
/* Get pointers to our screen privates and screen info */
pScreenPriv = pWinPriv->pScreenPriv;
pScreenInfo = pScreenPriv->pScreenInfo;
if (pScreenInfo->fMultiWindow)
fPassAltTab = FALSE;
}
#endif
/* Pass keystrokes on to our main message loop */ /* Pass keystrokes on to our main message loop */
if (iCode == HC_ACTION) if (iCode == HC_ACTION)
@ -79,7 +100,8 @@ winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam)
case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_KEYDOWN: case WM_SYSKEYDOWN:
case WM_KEYUP: case WM_SYSKEYUP: case WM_KEYUP: case WM_SYSKEYUP:
fPassKeystroke = fPassKeystroke =
((p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0)) (fPassAltTab &&
(p->vkCode == VK_TAB) && ((p->flags & LLKHF_ALTDOWN) != 0))
|| (p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN) || (p->vkCode == VK_LWIN) || (p->vkCode == VK_RWIN)
; ;
break; break;