Changeset 2956 for trunk/src/user32/win32wbase.cpp

Timestamp:

Mar 1, 2000, 2:30:07 PM (25 years ago)

Author:

sandervl

Message:

focus fixes + changes for dinput

File:

• trunk/src/user32/win32wbase.cpp (modified) (12 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.170 2000-02-29 19:16:12 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.171 2000-03-01 13:30:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -45 +45 @@
 #include "controls.h"
 #include <wprocess.h>
-#include "winmouse.h"
 #include <win\hook.h>
 #include <menu.h>
@@ -864 +863 @@
 {
     switch(virtualkey) {
+    case VK_LEFT:
+    case VK_RIGHT:
     case VK_DOWN:
     case VK_UP:
@@ -939 +940 @@
     }
 
-    if(ISMOUSE_CAPTURED())
-    {
-        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_BUTTON, msg->pt.x, msg->pt.y))
-            return 0;
-    }
-
     if(fClick)
     {
@@ -965 +960 @@
                    && (hwndTop != GetForegroundWindow()) )
                 {
-                      ::SetActiveWindow(hwndTop);
+                    //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
+                    OSLibWinSetFocus(getOS2FrameWindowHandle());
                 }
         }
@@ -1007 +1003 @@
 ULONG Win32BaseWindow::MsgMouseMove(MSG *msg)
 {
-    if(ISMOUSE_CAPTURED()) {
-        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, msg->pt.x, msg->pt.y))
-            return 0;
-    }
-
     //TODO: hiword should be 0 if window enters menu mode (SDK docs)
     SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, msg->message));
@@ -1022 +1013 @@
 ULONG Win32BaseWindow::MsgChar(MSG *msg)
 {
-    if(ISKDB_CAPTURED())
-    {
-        DInputKeyBoardHandler(msg);
-    }
     return DispatchMsgA(msg);
 }
@@ -2417 +2404 @@
 //the current process owns them.
 //******************************************************************************
-HWND Win32BaseWindow::FindWindowEx(HWND hwndParent, HWND hwndChildAfter, LPSTR lpszClass, LPSTR lpszWindow,
-                                   BOOL fUnicode)
+HWND Win32BaseWindow::FindWindowEx(HWND hwndParent, HWND hwndChildAfter, ATOM atom, LPSTR lpszWindow)
 {
  Win32BaseWindow *parent = GetWindowFromHandle(hwndParent);
  Win32BaseWindow *child  = GetWindowFromHandle(hwndChildAfter);
 
-    if((hwndParent != OSLIB_HWND_DESKTOP && !parent) ||
+    dprintf(("FindWindowEx %x %x %x %s", hwndParent, hwndChildAfter, atom, lpszWindow));
+    if((hwndParent != 0 && !parent) ||
        (hwndChildAfter != 0 && !child) ||
-       (hwndParent == OSLIB_HWND_DESKTOP && hwndChildAfter != 0))
+       (hwndParent == 0 && hwndChildAfter != 0))
     {
         dprintf(("Win32BaseWindow::FindWindowEx: parent or child not found %x %x", hwndParent, hwndChildAfter));
@@ -2431 +2418 @@
         return 0;
     }
-    if(hwndParent != OSLIB_HWND_DESKTOP)
+    SetLastError(0);
+    if(hwndParent != 0)
     {//if the current process owns the window, just do a quick search
         child = (Win32BaseWindow *)parent->getFirstChild();
@@ -2448 +2436 @@
         while(child)
         {
-            if(child->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
-               (!lpszWindow || child->hasWindowName(lpszWindow, fUnicode)))
+            //According to Wine, the class doesn't need to be specified
+            if((!atom || child->getWindowClass()->getAtom() == atom) &&
+               (!lpszWindow || child->hasWindowName(lpszWindow)))
             {
                 dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
@@ -2474 +2463 @@
 
             if(wnd) {
-                if(wnd->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
-                   (!lpszWindow || wnd->hasWindowName(lpszWindow, fUnicode)))
+                //According to Wine, the class doesn't need to be specified
+                if((!atom || wnd->getWindowClass()->getAtom() == atom) &&
+                   (!lpszWindow || wnd->hasWindowName(lpszWindow)))
                 {
                     OSLibWinEndEnumWindows(henum);
@@ -2572 +2562 @@
     dprintf(("SetActiveWindow %x", getWindowHandle()));
     if(OSLibWinSetActiveWindow(OS2HwndFrame) == FALSE) {
-        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2HwndFrame));
+        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2HwndFrame));
     }
     hwndActive = GetActiveWindow();