Changeset 1576 for trunk/src

Timestamp:

Nov 3, 1999, 8:51:44 PM (26 years ago)

Author:

sandervl

Message:

mouse activate + CreateIconIndirect fix

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (5 diffs)
• pmframe.cpp (modified) (4 diffs)
• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)
• win32wbase.h (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.41 1999-11-01 19:11:40 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.42 1999-11-03 19:51:42 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -50 +50 @@
 //******************************************************************************
 HWND OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
-                          char *pszName, HWND Owner, ULONG fBottom, HWND *hwndFrame,
+                          char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame,
                           ULONG id)
 {
@@ -66 +66 @@
         Owner = HWND_DESKTOP;
   }
-
   ULONG dwClientStyle;
+#if 1
 
   BOOL TopLevel = hwndParent == HWND_DESKTOP;
+//  if(dwFrameStyle & FCF_TITLEBAR)
+//      TopLevel = TRUE;
+
   FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0};
 
@@ -98 +101 @@
   dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
   return 0;
+#else
+        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
+
+        dwFrameStyle |= FCF_NOBYTEALIGN;
+        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR)
+                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+
+        dwWinStyle   &= ~WS_CLIPCHILDREN;
+
+        *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
+                                       &dwFrameStyle, WIN32_STDCLASS,
+                                       "", dwClientStyle, 0, id, &hwndClient);
+        if(*hwndFrame) {
+                if(pszName) {
+                        WinSetWindowText(*hwndFrame, pszName);
+                }
+                return hwndClient;
+        }
+        dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
+        return 0;
+#endif
 }
 //******************************************************************************
@@ -1051 +1075 @@
   OSLibWinConvertStyle(dwStyle, &dwExStyle, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
 
-  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+//  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
 
   WinSetWindowULong(hwnd, QWL_STYLE,

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.18 1999-11-03 18:00:25 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.19 1999-11-03 19:51:43 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -257 +257 @@
 
         if(!win32wnd->CanReceiveSizeMsgs()) {
-            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
+//SvL: Doing this breaks button.exe, header4(a).exe & style.exe
+//            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
             break;
         }
@@ -293 +294 @@
             pswp->hwnd = hwnd;
 
-            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
-            //RestoreOS2TIB();
-            //return (MRESULT)0xf;
+//            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
+            RestoreOS2TIB();
+            return (MRESULT)0xf;
         }
         goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
@@ -422 +423 @@
         if (win32wnd->IsModalDialog())
         {
-          Win32BaseWindow *topOwner = win32wnd->getOwner()->getTopParent();
+          Win32BaseWindow *topOwner = win32wnd->getOwner()->GetTopParent();
 
           if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.28 1999-11-03 18:00:26 cbratschi Exp $ */
+/* $Id: win32dlg.cpp,v 1.29 1999-11-03 19:51:43 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -261 +261 @@
      topOwner = windowDesktop;
     }
-    else topOwner = getOwner()->getTopParent();
+    else topOwner = getOwner()->GetTopParent();
 
     if(topOwner == NULL) {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.73 1999-11-03 18:00:27 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.74 1999-11-03 19:51:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1026 +1026 @@
     return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
 }
-//******************************************************************************
 //******************************************************************************
 //******************************************************************************
@@ -1102 +1101 @@
     }
 
-    if(fClick) {
+    if(fClick) 
+    {
+     HWND hwndTop;
+
         /* Activate the window if needed */
-        HWND hwndTop = (getTopParent()) ? getTopParent()->getWindowHandle() : 0;
-
-        if (getWindowHandle() != GetActiveWindow())
+        if(isSubclassedOS2Wnd()) {
+                Win32BaseWindow *parentwnd = GetWindowFromOS2FrameHandle(OSLibWinQueryWindow(OS2Hwnd, QWOS_PARENT));
+                if(parentwnd) {
+                        hwndTop = (parentwnd->GetTopParent()) ? parentwnd->GetTopParent()->getWindowHandle() : 0;
+                }
+                else    hwndTop = 0;
+        }
+        else    hwndTop = (GetTopParent()) ? GetTopParent()->getWindowHandle() : 0;
+
+        if (hwndTop && getWindowHandle() != GetActiveWindow())
         {
                 LONG ret = SendMessageA(WM_MOUSEACTIVATE, hwndTop,
@@ -1864 +1873 @@
         window = parentwindow;
    }
-}
-//******************************************************************************
-//******************************************************************************
-Win32BaseWindow *Win32BaseWindow::getTopParent()
-{
- Win32BaseWindow *tmpWnd = this;
-
-    while( tmpWnd && (tmpWnd->getStyle() & WS_CHILD))
-    {
-        tmpWnd = tmpWnd->getParent();
-    }
-    return tmpWnd;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.39 1999-11-03 18:00:29 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.40 1999-11-03 19:51:44 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -186 +186 @@
 Win32BaseWindow *getOwner()                   { return owner; };
 
-Win32BaseWindow *getTopParent();
  SCROLLBAR_INFO *getScrollInfo(int nBar);
        HWND      getVertScrollHandle()        { return hwndVertScroll; };

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.1 1999-09-15 23:19:03 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.2 1999-11-03 19:51:44 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -55 +55 @@
 //******************************************************************************
 //******************************************************************************
-HICON WIN32API CreateIconIndirect(LPICONINFO arg1)
+HICON WIN32API CreateIconIndirect(LPICONINFO pIcon)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  CreateIconIndirect\n");
-#endif
-    return O32_CreateIconIndirect(arg1);
+ HICON   hIcon;
+ HDC     hdcSrc, hdcDst;
+
+    dprintf(("USER32:  CreateIconIndirect\n"));
+    if(pIcon->hbmMask && pIcon->hbmColor) 
+    {
+        ICONINFO iconinfo;
+        SIZE bmpsize;
+
+        iconinfo = *pIcon;
+        if(GetBitmapDimensionEx(pIcon->hbmColor, &bmpsize) == FALSE) {
+                return 0;
+        }
+        //if there's a color bitmap, the mask bitmap contains only the AND bits
+        //Open32 calls WinCreatePointerIndirect which expects AND & XOR bits
+        //To solve this we create a bitmap that's 2x height of the mask, copy
+        //the AND bits and set the XOR bits to 0
+        hdcSrc = CreateCompatibleDC(0);
+        hdcDst = CreateCompatibleDC(0);
+
+        iconinfo.hbmMask  = CreateCompatibleBitmap (hdcDst, bmpsize.cx, bmpsize.cy*2);
+        SelectObject (hdcDst, iconinfo.hbmMask);
+        SelectObject (hdcSrc, pIcon->hbmMask);
+        BitBlt (hdcDst, 0, 0, bmpsize.cx, bmpsize.cy,
+                hdcSrc, bmpsize.cx, 0, SRCCOPY);
+        PatBlt (hdcDst, bmpsize.cx, bmpsize.cy, bmpsize.cx, bmpsize.cy, BLACKNESS);
+        
+        hIcon = O32_CreateIconIndirect(&iconinfo);
+
+        DeleteObject(iconinfo.hbmMask);
+        DeleteDC(hdcSrc);
+        DeleteDC(hdcDst);
+
+        return hIcon;
+    }
+    hIcon = O32_CreateIconIndirect(pIcon);
+    if(hIcon == 0) {
+        dprintf(("CreateIconIndirect %d (%d,%d) %x %x failed with %x", pIcon->fIcon, pIcon->xHotspot, pIcon->yHotspot, pIcon->hbmMask, pIcon->hbmColor, GetLastError()));
+    }
+    return hIcon;
 }
 //******************************************************************************