Changeset 1522 for trunk/src/user32

Timestamp:

Oct 30, 1999, 5:16:58 PM (26 years ago)

Author:

dengert

Message:

fix repaints for transparent windows

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (7 diffs)
• pmwindow.h (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.38 1999-10-29 16:06:55 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.39 1999-10-30 15:16:58 dengert Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -69 +69 @@
   ULONG dwClientStyle;
 
+#if 0
 //  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
         dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS);
@@ -89 +90 @@
         dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
         return 0;
+#else
+  BOOL TopLevel = hwndParent == HWND_DESKTOP;
+  FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0};
+
+  dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS);
+
+  dwFrameStyle |= FCF_NOBYTEALIGN;
+  if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR) {
+    dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+  }
+
+  dwWinStyle &= ~(WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+  FCData.flCreateFlags = dwFrameStyle;
+
+  *hwndFrame = WinCreateWindow (hwndParent,
+                                TopLevel ? WC_FRAME : WIN32_INNERFRAME,
+                                pszName, dwWinStyle, 0, 0, 50, 30,
+                                hwndParent, HWND_TOP, id, &FCData, NULL);
+  if (*hwndFrame) {
+    hwndClient = WinCreateWindow (*hwndFrame, WIN32_STDCLASS,
+                                  NULL, dwClientStyle, 0, 0, 0, 0,
+                                  *hwndFrame, HWND_TOP, FID_CLIENT, NULL, NULL);
+    if (hwndClient != NULLHANDLE)
+      WinSendMsg (*hwndFrame, WM_UPDATEFRAME, 0, 0);
+    return hwndClient;
+  }
+  dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
+  return 0;
+#endif
+
 #if 0
   }

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.47 1999-10-28 22:41:01 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.48 1999-10-30 15:16:57 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -117 +117 @@
 BOOL InitPM()
 {
+  CLASSINFO FrameClassInfo;
+
   hab = WinInitialize(0);
   dprintf(("Winitialize returned %x", hab));
@@ -152 +154 @@
      (PFNWP)Win32WindowProc,            /* Address of window procedure  */
 //     CS_SIZEREDRAW | CS_HITTEST | CS_MOVENOTIFY,
-     CS_SIZEREDRAW | CS_HITTEST,
+     CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT,
      NROF_WIN32WNDBYTES)) {
         dprintf(("WinRegisterClass Win32BaseWindow failed"));
         return(FALSE);
+   }
+   if (!WinQueryClassInfo (hab, WC_FRAME, &FrameClassInfo)) {
+     dprintf (("WinQueryClassInfo WC_FRAME failed"));
+     return (FALSE);
+   }
+   FrameClassInfo.flClassStyle &= ~(CS_PUBLIC | CS_CLIPSIBLINGS);
+   if (!WinRegisterClass (hab,
+                          WIN32_INNERFRAME,
+                          FrameClassInfo.pfnWindowProc,
+                          FrameClassInfo.flClassStyle,
+                          FrameClassInfo.cbWindowData)) {
+     dprintf (("WinRegisterClass Win32InnerFrame failed"));
+     return (FALSE);
    }
 
@@ -664 +679 @@
         keyWasPressed = ((SHORT1FROMMP (mp1) & KC_PREVDOWN) == KC_PREVDOWN);
 
-        dprintf(("PM: WM_CHAR: %x %x %d %x", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), repeatCount, scanCode));
+        dprintf(("PM: WM_CHAR: %x %x %d %x", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), repeatCount, scanCode));
         // both WM_KEYUP & WM_KEYDOWN want a virtual key, find the right Win32 virtual key
         // given the OS/2 virtual key and OS/2 character
@@ -738 +753 @@
             ULONG keyflags = 0, vkey = 0;
             ULONG fl = SHORT1FROMMP(mp1);
-            ULONG chCode = SHORT1FROMMP(mp2);
+            ULONG chCode = SHORT1FROMMP(mp2);
 
             if(!(fl & KC_CHAR)) {
 //SvL: Test
-                break;
+                break;
 //                goto RunDefWndProc;
             }
             if(fl & KC_VIRTUALKEY) {
-                if(virtualKey)
-                        vkey = virtualKey;
-                else    vkey = SHORT2FROMMP(mp2);
-                chCode = vkey;
+                if(virtualKey)
+                        vkey = virtualKey;
+                else    vkey = SHORT2FROMMP(mp2);
+                chCode = vkey;
             }
             if(fl & KC_KEYUP) {
@@ -786 +801 @@
           ULONG id;
 
-          dprintf(("OS2: WM_TIMER %x %d", hwnd, mp1));
+          dprintf(("OS2: WM_TIMER %x %d", hwnd, mp1));
           if (TIMER_GetTimerInfo(hwnd,(ULONG)mp1,&sys,&id))
           {
@@ -856 +871 @@
                 goto RunDefWndProc;
         }
-        //Apparently there are apps that return 0, but don't do anything during WM_PAINT
+        //Apparently there are apps that return 0, but don't do anything during WM_PAINT
         goto RunDefWndProc;
 

trunk/src/user32/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.2 1999-10-17 12:17:44 cbratschi Exp $ */
+/* $Id: pmwindow.h,v 1.3 1999-10-30 15:16:57 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -9 +9 @@
 #define __PMWINDOW_H__
 
-#define WIN32_STDCLASS  "Win32WindowClass"
+#define WIN32_STDCLASS   "Win32WindowClass"
+#define WIN32_INNERFRAME "Win32InnerFrameClass"
 
 BOOL InitPM();