commit 8d8703cb489c477260ebc360e683d40ac8070b4c
author Patrik Stridvall <ps@leissner.se> Thu Feb 04 14:05:38 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 04 14:05:38 1999 +0000
tree 23ff394f3ce3d01e41dd662ee9b6cf4025b698fc
parent c6e6a9aff99daed073e35b1be48b4107e23a88f7

Moved some more code to the X11 driver.

windows/mouse.c

diff --git a/windows/mouse.c b/windows/mouse.c
index 7f9047d..9da2277 100644
--- a/windows/mouse.c
+++ b/windows/mouse.c
@@ -11,7 +11,11 @@
 #include "mouse.h"
 #include "debug.h"
 #include "debugtools.h"
-#include "x11drv.h"
+#include "desktop.h"
+
+/**********************************************************************/
+
+extern BOOL32 X11DRV_MOUSE_DisableWarpPointer;
 
 static LPMOUSE_EVENT_PROC DefMouseEventProc = NULL;
 
@@ -55,7 +59,6 @@
 void MOUSE_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY, 
                       DWORD keyState, DWORD time, HWND32 hWnd )
 {
-    extern BOOL32 DISPLAY_DisableWarpPointer;
     WINE_MOUSEEVENT wme;
 
     if ( !DefMouseEventProc ) return;
@@ -63,16 +66,16 @@
     TRACE( event, "(%04lX,%ld,%ld)\n", mouseStatus, posX, posY );
 
     mouseStatus |= MOUSEEVENTF_ABSOLUTE;
-    posX = (((long)posX << 16) + screenWidth-1)  / screenWidth;
-    posY = (((long)posY << 16) + screenHeight-1) / screenHeight;
+    posX = (((long)posX << 16) + DESKTOP_GetScreenWidth()-1)  / DESKTOP_GetScreenWidth();
+    posY = (((long)posY << 16) + DESKTOP_GetScreenHeight()-1) / DESKTOP_GetScreenHeight();
 
     wme.magic    = WINE_MOUSEEVENT_MAGIC;
     wme.keyState = keyState;
     wme.time     = time;
     wme.hWnd     = hWnd;
 
-    DISPLAY_DisableWarpPointer = TRUE;
+    X11DRV_MOUSE_DisableWarpPointer = TRUE;
     DefMouseEventProc( mouseStatus, posX, posY, 0, (DWORD)&wme );
-    DISPLAY_DisableWarpPointer = FALSE;
+    X11DRV_MOUSE_DisableWarpPointer = FALSE;
 }