Changeset 10316 for trunk/src/user32/pmwindow.cpp

Timestamp:

Nov 12, 2003, 3:13:26 PM (22 years ago)

Author:

sandervl

Message:

Visible & Clip region changes

File:

• trunk/src/user32/pmwindow.cpp (modified) (11 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.223 2003-10-22 12:43:51 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.224 2003-11-12 14:10:19 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -59 +59 @@
 #include "menu.h"
 #include "user32api.h"
+#include <kbdhook.h>
 
 #define DBG_LOCALLOG    DBG_pmwindow
 #include "dbglocal.h"
 
+
 #define ODIN_SetExceptionHandler(a)
 #define ODIN_UnsetExceptionHandler(a)
-
 
 // Notification that focus change has completed (UNDOCUMENTED)
@@ -84 +85 @@
 BOOL    fDragDropDisabled = FALSE;
 
-const char WIN32_CDCLASS[]       = "Win32CDWindowClass";
-      char WIN32_STDCLASS[255]   = "Win32WindowClass";
+const char WIN32_CDCLASS[]       = ODIN_WIN32_CDCLASS;
+      char WIN32_STDCLASS[255]   = ODIN_WIN32_STDCLASS;
 
 #define PMMENU_MINBUTTON           0
@@ -190 +191 @@
     SetThreadMessageQueue(hmq);
 
+    //initialize keyboard hook for first thread  
+    hookInit(hab);
+
     BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
     dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
@@ -255 +259 @@
     // query the font height to find out whether we have small or large fonts
     DevQueryCaps(hdc, CAPS_GRAPHICS_CHAR_HEIGHT, 1, (PLONG)&CapsCharHeight);
+    dprintf(("CAPS_GRAPHICS_CHAR_HEIGHT = %d", CapsCharHeight));
+    if(CapsCharHeight > 16) {
+       CapsCharHeight = 16; 
+    }
+
+#ifdef DEBUG
+    ULONG temp;
+    DevQueryCaps(hdc, CAPS_GRAPHICS_CHAR_WIDTH, 1, (PLONG)&temp);
+    dprintf(("CAPS_GRAPHICS_CHAR_WIDTH = %d", temp));
+    DevQueryCaps(hdc, CAPS_CHAR_HEIGHT, 1, (PLONG)&temp);
+    dprintf(("CAPS_CHAR_HEIGTH = %d", temp));
+    DevQueryCaps(hdc, CAPS_CHAR_WIDTH, 1, (PLONG)&temp);
+    dprintf(("CAPS_CHAR_WIDTH = %d", temp));
+    DevQueryCaps(hdc, CAPS_SMALL_CHAR_HEIGHT, 1, (PLONG)&temp);
+    dprintf(("CAPS_SMALL_CHAR_HEIGTH = %d", temp));
+    DevQueryCaps(hdc, CAPS_SMALL_CHAR_WIDTH, 1, (PLONG)&temp);
+    dprintf(("CAPS_SMALL_CHAR_WIDTH = %d", temp));
+    DevQueryCaps(hdc, CAPS_VERTICAL_FONT_RES, 1,(PLONG)&temp);
+    dprintf(("CAPS_VERTICAL_FONT_RES = %d", temp));
+    DevQueryCaps(hdc, CAPS_HORIZONTAL_FONT_RES, 1,(PLONG)&temp);
+    dprintf(("CAPS_HORIZONTAL_FONT_RES = %d", temp));
+#endif
 
     DevCloseDC(hdc);
 
-    dprintf(("InitPM: Desktop (%d,%d) bpp %d", ScreenWidth, ScreenHeight, ScreenBitsPerPel));
+    dprintf(("InitPM: Desktop (%d,%d) bpp %d font size %d", ScreenWidth, ScreenHeight, ScreenBitsPerPel, CapsCharHeight));
     return TRUE;
 } /* End of main */
@@ -638 +664 @@
 
     case WM_SHOW:
+    {
         dprintf(("OS2: WM_SHOW %x %d", hwnd, mp1));
         win32wnd->MsgShow((ULONG)mp1);
-        break;
+ 
+        //if a child window is hidden, then the update region of the 
+        //parent changes and a WM_ERASEBKGND is required during the next
+        //BeginPaint call.
+        if((ULONG)mp1 == FALSE) 
+        {
+            Win32BaseWindow *parent = win32wnd->getParent();
+            if(parent) {
+                dprintf(("PM Update region changed for parent %x", win32wnd->getWindowHandle()));
+                parent->SetPMUpdateRegionChanged(TRUE);
+            }
+        }
+        break;
+    }
 
     case WM_ACTIVATE:
@@ -658 +698 @@
     {
         dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp1)));
-        win32wnd->SetVisibleRegionChanged(TRUE);
+        win32wnd->SetPMUpdateRegionChanged(TRUE);
         goto RunDefWndProc;
     }
@@ -1267 +1307 @@
     case WM_PAINT:
     {
-      RECTL rectl;
+        RECTL rectl;
+        HRGN  hrgn;
+
+        hrgn = CreateRectRgn(0, 0, 0, 0);
+        GetUpdateRgnFrame(win32wnd->getWindowHandle(), hrgn);
 
         HPS hps = WinBeginPaint(hwnd, NULL, &rectl);
@@ -1285 +1329 @@
 
                 mapOS2ToWin32Rect(win32wnd->getWindowHeight(), (PRECTLOS2)&rectl, &rectUpdate);
-                win32wnd->MsgNCPaint(&rectUpdate);
+                win32wnd->MsgNCPaint(&rectUpdate, hrgn);
             }
         }
         WinEndPaint(hps);
+
+        DeleteObject(hrgn);
         break;
     }
@@ -1599 +1645 @@
         if ((pswp->fl & SWP_MAXIMIZE) && (win32wnd->getExStyle() & WS_EX_MDICHILD_W))
         {
-         SendMessageA(win32wnd->getWindowHandle(), WM_SYSCOMMAND_W, SC_MAXIMIZE_W, 0);
-         goto PosChangedEnd;
+            SendMessageA(win32wnd->getWindowHandle(), WM_SYSCOMMAND_W, SC_MAXIMIZE_W, 0);
+            goto PosChangedEnd;
         }
 
@@ -2478 +2524 @@
 //******************************************************************************
 //******************************************************************************
+char *WIN32API QueryCustomStdClassName()
+{
+   return WIN32_STDCLASS;
+}
+//******************************************************************************
+//******************************************************************************
 
 #ifdef DEBUG