diff options
| author | Colin Harrison <colin.harrison-at-virgin.net> | 2007-05-11 10:08:42 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-05-11 10:08:42 +0100 |
| commit | 178d426311bb3c7160f72b5d95b0a137eda09ba9 (patch) | |
| tree | 653e60fc4a4f442ca64188cf65b2a48c77f111e7 | |
| parent | ebaa6c920c82401952a0ccc991b94574306449bd (diff) | |
Missing piece from bug 9808
| -rw-r--r-- | hw/xwin/winmultiwindowwndproc.c | 5 | ||||
| -rwxr-xr-x | hw/xwin/winwin32rootlesswndproc.c | 5 | ||||
| -rw-r--r-- | hw/xwin/winwndproc.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 47875b4df..0a7579b61 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -38,6 +38,7 @@ #include "winmultiwindowclass.h" #include "winprefs.h" #include "winmsg.h" +#include "inputstr.h" /* * External global variables @@ -494,8 +495,8 @@ winTopLevelWindowProc (HWND hwnd, UINT message, break; /* Has the mouse pointer crossed screens? */ - if (s_pScreen != miPointerCurrentScreen ()) - miPointerSetNewScreen (s_pScreenInfo->dwScreen, + if (s_pScreen != miPointerGetScreen(inputInfo.pointer)) + miPointerSetScreen (inputInfo.pointer, s_pScreenInfo->dwScreen, ptMouse.x - s_pScreenInfo->dwXOffset, ptMouse.y - s_pScreenInfo->dwYOffset); diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c index ffa84938f..859aafd29 100755 --- a/hw/xwin/winwin32rootlesswndproc.c +++ b/hw/xwin/winwin32rootlesswndproc.c @@ -41,6 +41,7 @@ #include <X11/Xatom.h> #include "winmultiwindowclass.h" #include "winmsg.h" +#include "inputstr.h" /* @@ -534,8 +535,8 @@ winMWExtWMWindowProc (HWND hwnd, UINT message, break; /* Has the mouse pointer crossed screens? */ - if (pScreen != miPointerCurrentScreen ()) - miPointerSetNewScreen (pScreenInfo->dwScreen, + if (pScreen != miPointerGetScreen(inputInfo.pointer)) + miPointerSetScreen (inputInfo.pointer, pScreenInfo->dwScreen, ptMouse.x - pScreenInfo->dwXOffset, ptMouse.y - pScreenInfo->dwYOffset); diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 2974c41ed..29ea81fc1 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -40,6 +40,7 @@ #include "winprefs.h" #include "winconfig.h" #include "winmsg.h" +#include "inputstr.h" #ifdef XKB extern BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam); @@ -723,8 +724,8 @@ winWindowProc (HWND hwnd, UINT message, break; /* Has the mouse pointer crossed screens? */ - if (s_pScreen != miPointerCurrentScreen ()) - miPointerSetNewScreen (s_pScreenInfo->dwScreen, + if (s_pScreen != miPointerGetScreen(inputInfo.pointer)) + miPointerSetScreen (inputInfo.pointer, s_pScreenInfo->dwScreen, GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset, GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset); |