Removed DummyMotionNotify EVENT driver routine.

include/message.h

@@ -30,7 +30,6 @@ typedef struct tagEVENT_DRIVER {
   void   (*pSynchronize)(BOOL);
   BOOL   (*pCheckFocus)(void);
   BOOL   (*pQueryPointer)(DWORD *, DWORD *, DWORD *);
-  void   (*pDummyMotionNotify)(void);
   void   (*pUserRepaintDisable)(BOOL);
 } EVENT_DRIVER;
 
@@ -40,7 +39,6 @@ extern BOOL EVENT_Init( void );
 extern void EVENT_Synchronize( BOOL bProcessEvents );
 extern BOOL EVENT_CheckFocus( void );
 extern BOOL EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
-extern void EVENT_DummyMotionNotify(void);
 
 /* input.c */
 

include/ttydrv.h

@@ -94,7 +94,6 @@ extern BOOL TTYDRV_EVENT_Init(void);
 extern void TTYDRV_EVENT_Synchronize(BOOL bProcessEvents);
 extern BOOL TTYDRV_EVENT_CheckFocus(void);
 extern BOOL TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
-extern void TTYDRV_EVENT_DummyMotionNotify(void);
 extern void TTYDRV_EVENT_UserRepaintDisable(BOOL bDisable);
 
 /* TTY keyboard driver */

include/x11drv.h

@@ -345,7 +345,6 @@ extern BOOL X11DRV_EVENT_Init(void);
 extern void X11DRV_EVENT_Synchronize( BOOL bProcessEvents );
 extern BOOL X11DRV_EVENT_CheckFocus( void );
 extern BOOL X11DRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state);
-extern void X11DRV_EVENT_DummyMotionNotify(void);
 extern void X11DRV_EVENT_UserRepaintDisable( BOOL bDisable );
 
 /* X11 keyboard driver */

windows/event.c

@@ -50,13 +50,4 @@ BOOL EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
   return EVENT_Driver->pQueryPointer(posX, posY, state);
 }
 
-/***********************************************************************
- *		EVENT_DummyMotionNotify
- *
- * Generate a dummy MotionNotify event. Used to force a WM_SETCURSOR message.
- */
-void EVENT_DummyMotionNotify(void)
-{
-  EVENT_Driver->pDummyMotionNotify();
-}
 

windows/ttydrv/event.c

@@ -47,13 +47,6 @@ BOOL TTYDRV_EVENT_QueryPointer(DWORD *posX, DWORD *posY, DWORD *state)
 }
 
 /***********************************************************************
- *		TTYDRV_EVENT_DummyMotionNotify
- */
-void TTYDRV_EVENT_DummyMotionNotify(void)
-{
-}
-
-/***********************************************************************
  *		TTYDRV_EVENT_UserRepaintDisable
  */
 void TTYDRV_EVENT_UserRepaintDisable( BOOL bDisable )

windows/ttydrv/init.c

@@ -42,7 +42,6 @@ EVENT_DRIVER TTYDRV_EVENT_Driver =
   TTYDRV_EVENT_Synchronize,
   TTYDRV_EVENT_CheckFocus,
   TTYDRV_EVENT_QueryPointer,
-  TTYDRV_EVENT_DummyMotionNotify,
   TTYDRV_EVENT_UserRepaintDisable
 };
 

windows/winpos.c

@@ -2764,7 +2764,20 @@ Pos:  /* -----------------------------------------------------------------------
         EVENT_Synchronize( TRUE );  /* Synchronize with the host window system */
 
     if (!GetCapture() && ((wndPtr->dwStyle & WS_VISIBLE) || (flags & SWP_HIDEWINDOW)))
-        EVENT_DummyMotionNotify(); /* Simulate a mouse event to set the cursor */
+    { 
+        /* Simulate a mouse event to set the cursor */
+        DWORD posX, posY, keyState;
+
+        if ( EVENT_QueryPointer( &posX, &posY, &keyState ) )
+        {
+            int iWndsLocks = WIN_SuspendWndsLock();
+
+            hardware_event( WM_MOUSEMOVE, keyState, 0,
+                            posX, posY, GetTickCount(), 0 );
+
+            WIN_RestoreWndsLock(iWndsLocks);
+        }
+    }
 
     wndTemp = WIN_GetDesktop();
 

windows/x11drv/event.c

@@ -565,23 +565,6 @@ static void EVENT_MotionNotify( HWND hWnd, XMotionEvent *event )
 
 
 /***********************************************************************
- *           X11DRV_EVENT_DummyMotionNotify
- *
- * Generate a dummy MotionNotify event. Used to force a WM_SETCURSOR message.
- */
-void X11DRV_EVENT_DummyMotionNotify(void)
-{
-  DWORD winX, winY, state;
-  
-  if ( EVENT_QueryPointer( &winX, &winY, &state ) )
-    {
-      MOUSE_SendEvent( MOUSEEVENTF_MOVE, winX, winY, state,
-		       GetTickCount(), 0 );
-    }
-}
-
-
-/***********************************************************************
  *           EVENT_ButtonPress
  */
 static void EVENT_ButtonPress( HWND hWnd, XButtonEvent *event )

windows/x11drv/init.c

@@ -46,7 +46,6 @@ EVENT_DRIVER X11DRV_EVENT_Driver =
   X11DRV_EVENT_Synchronize,
   X11DRV_EVENT_CheckFocus,
   X11DRV_EVENT_QueryPointer,
-  X11DRV_EVENT_DummyMotionNotify,
   X11DRV_EVENT_UserRepaintDisable
 };