Changeset 3502 for trunk/src/dinput/dinput.cpp

Timestamp:

May 9, 2000, 8:58:40 PM (25 years ago)

Author:

sandervl

Message:

cooperative keyboard capture fix

File:

• trunk/src/dinput/dinput.cpp (modified) (7 diffs)

trunk/src/dinput/dinput.cpp

@@ -1 @@
-/* $Id: dinput.cpp,v 1.5 2000-03-19 09:16:58 mike Exp $ */
+/* $Id: dinput.cpp,v 1.6 2000-05-09 18:58:40 sandervl Exp $ */
 /*              DirectInput
  *
@@ -995 +995 @@
 
 /* Our private mouse event handler */
-static void WINAPI dinput_mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
-                                      DWORD cButtons, DWORD dwExtraInfo )
+static BOOL WINAPI dinput_mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
+                                       DWORD cButtons, DWORD dwExtraInfo )
 {
   DWORD posX, posY, keyState, xtime, extra;
@@ -1013 +1013 @@
     extra = (DWORD)wme->hWnd;
 
+    if(This->win && This->win != wme->hWnd) {
+        return FALSE;
+    }
+
     assert( dwFlags & MOUSEEVENTF_ABSOLUTE );
     posX = (dx * GetSystemMetrics(SM_CXSCREEN)) >> 16;
@@ -1019 +1023 @@
     ERR("Mouse event not supported...\n");
     LeaveCriticalSection(&(This->crit));
-    return ;
-  }
-
-  TRACE("DINPUT-SMAI: event %ld, %ld", posX, posY);
+    return FALSE;
+  }
+
+  TRACE("DINPUT-SMAI: event %x %ld, %ld", dwFlags, posX, posY);
 
   if ( dwFlags & MOUSEEVENTF_MOVE ) {
@@ -1094 +1098 @@
   This->prevY = posY;
   LeaveCriticalSection(&(This->crit));
+
+  return TRUE;
 }
 
@@ -1105 +1111 @@
   RECT  rect;
 
-  TRACE("(this=%p)\n",This);
+  TRACE("SysMouseAImpl_Acquire: (this=%p)\n",This);
 
   if (This->acquired == 0) {
@@ -1151 +1157 @@
   ICOM_THIS(SysMouseAImpl,iface);
 
-  TRACE("(this=%p)\n",This);
+  TRACE("SysMouseAImpl_Unacquire: (this=%p)\n",This);
 
   /* Reinstall previous mouse event handler */