Missing piece from bug 9808

This commit is contained in:
Colin Harrison 2007-05-11 10:08:42 +01:00 committed by Alan Hourihane
parent ebaa6c920c
commit 178d426311
3 changed files with 9 additions and 6 deletions

View File

@ -38,6 +38,7 @@
#include "winmultiwindowclass.h" #include "winmultiwindowclass.h"
#include "winprefs.h" #include "winprefs.h"
#include "winmsg.h" #include "winmsg.h"
#include "inputstr.h"
/* /*
* External global variables * External global variables
@ -494,8 +495,8 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
break; break;
/* Has the mouse pointer crossed screens? */ /* Has the mouse pointer crossed screens? */
if (s_pScreen != miPointerCurrentScreen ()) if (s_pScreen != miPointerGetScreen(inputInfo.pointer))
miPointerSetNewScreen (s_pScreenInfo->dwScreen, miPointerSetScreen (inputInfo.pointer, s_pScreenInfo->dwScreen,
ptMouse.x - s_pScreenInfo->dwXOffset, ptMouse.x - s_pScreenInfo->dwXOffset,
ptMouse.y - s_pScreenInfo->dwYOffset); ptMouse.y - s_pScreenInfo->dwYOffset);

View File

@ -41,6 +41,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "winmultiwindowclass.h" #include "winmultiwindowclass.h"
#include "winmsg.h" #include "winmsg.h"
#include "inputstr.h"
/* /*
@ -534,8 +535,8 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
break; break;
/* Has the mouse pointer crossed screens? */ /* Has the mouse pointer crossed screens? */
if (pScreen != miPointerCurrentScreen ()) if (pScreen != miPointerGetScreen(inputInfo.pointer))
miPointerSetNewScreen (pScreenInfo->dwScreen, miPointerSetScreen (inputInfo.pointer, pScreenInfo->dwScreen,
ptMouse.x - pScreenInfo->dwXOffset, ptMouse.x - pScreenInfo->dwXOffset,
ptMouse.y - pScreenInfo->dwYOffset); ptMouse.y - pScreenInfo->dwYOffset);

View File

@ -40,6 +40,7 @@
#include "winprefs.h" #include "winprefs.h"
#include "winconfig.h" #include "winconfig.h"
#include "winmsg.h" #include "winmsg.h"
#include "inputstr.h"
#ifdef XKB #ifdef XKB
extern BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam); extern BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam);
@ -723,8 +724,8 @@ winWindowProc (HWND hwnd, UINT message,
break; break;
/* Has the mouse pointer crossed screens? */ /* Has the mouse pointer crossed screens? */
if (s_pScreen != miPointerCurrentScreen ()) if (s_pScreen != miPointerGetScreen(inputInfo.pointer))
miPointerSetNewScreen (s_pScreenInfo->dwScreen, miPointerSetScreen (inputInfo.pointer, s_pScreenInfo->dwScreen,
GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset, GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,
GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset); GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);