Changeset 6902 for trunk/src/user32

Timestamp:

Oct 1, 2001, 12:24:42 AM (24 years ago)

Author:

sandervl

Message:

added visible region callback function

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• dcrgn.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)
• win32wbase.h (modified) (4 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.66 2001-08-09 08:45:40 sandervl Exp $
+; $Id: USER32.DEF,v 1.67 2001-09-30 22:24:40 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -705 +705 @@
     _OSLibWinCreateObject@32                                     @2031 NONAME
     _ConvertIconGroup@12                                         @2032 NONAME
+
+    _WinSetVisibleRgnNotifyProc@12                               @2033 NONAME
+    _Win32ToOS2FrameHandle@4                                     @2034 NONAME

trunk/src/user32/dcrgn.cpp

@@ -1 @@
-/* $Id: dcrgn.cpp,v 1.6 2001-06-09 14:50:17 sandervl Exp $ */
+/* $Id: dcrgn.cpp,v 1.7 2001-09-30 22:24:41 sandervl Exp $ */
 
 /*
@@ -245 +245 @@
 }
 //******************************************************************************
-//******************************************************************************
+// WinSetVisibleRgnNotifyProc
+//   To set a notification procedure for visible region changes of a specific window.
+//   The procedure will be called when a WM_VRNENABLED message is posted
+//   with ffVisRgnChanged set to TRUE
+//
+// Parameters:
+//   HWND hwnd                          window handle
+//   VISRGN_NOTIFY_PROC lpNotifyProc    notification proc or NULL to clear proc
+//   DWORD dwUserData                   value used as 3rd parameter during
+//                                      visible region callback
+//
+// NOTE: Internal API
+//******************************************************************************
+BOOL WIN32API WinSetVisibleRgnNotifyProc(HWND hwnd, VISRGN_NOTIFY_PROC lpNotifyProc, 
+                                         DWORD dwUserData)
+{
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("WinSetVisibleRgnNotifyProc, window %x not found", hwnd));
+        return FALSE;
+    }
+    BOOL ret = window->setVisibleRgnNotifyProc(lpNotifyProc, dwUserData);
+    RELEASE_WNDOBJ(window);
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.148 2001-09-22 18:20:59 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.149 2001-09-30 22:24:41 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -374 +374 @@
             break;
         }
+        if(mp1) {//visible region has been altered
+            win32wnd->callVisibleRgnNotifyProc(TRUE);
+        }
         goto RunDefWndProc;
 
     case WM_VRNDISABLED:
         dprintf(("OS2: WM_VRNDISABLED %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        //visible region is about to change or WinLockWindowUpdate called
+        //suspend window drawing
+        win32wnd->callVisibleRgnNotifyProc(FALSE);
         goto RunDefWndProc;
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.285 2001-09-23 08:14:56 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.286 2001-09-30 22:24:41 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -192 +192 @@
   windowpos.ptMaxPosition.x = -1;
   windowpos.ptMaxPosition.y = -1;
+
+  lpVisRgnNotifyProc  = NULL;
+  dwVisRgnNotifyParam = NULL;
 }
 //******************************************************************************
@@ -3288 +3291 @@
 
     dprintf(("SetActiveWindow %x", getWindowHandle()));
-    if(getStyle() & (WS_DISABLED | WS_CHILD)) {
+    if(getStyle() & WS_CHILD) {
+//    if(getStyle() & (WS_DISABLED | WS_CHILD)) {
         dprintf(("WARNING: Window is a child or disabled"));
         return 0;
@@ -3898 +3902 @@
     if(window) {
             hwndOS2 = window->getOS2WindowHandle();
+            RELEASE_WNDOBJ(window);
+            return hwndOS2;
+    }
+//    dprintf2(("Win32BaseWindow::Win32ToOS2Handle: not a win32 window %x", hwnd));
+    return hwnd;
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API Win32ToOS2FrameHandle(HWND hwnd)
+{
+    HWND hwndOS2;
+
+    Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+    if(window) {
+            hwndOS2 = window->getOS2FrameWindowHandle();
             RELEASE_WNDOBJ(window);
             return hwndOS2;

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.126 2001-09-22 18:21:00 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.127 2001-09-30 22:24:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -20 +20 @@
 #include <gen_object.h>
 #include <win32wndchild.h>
+#include <winuser32.h>
 #include <winres.h>
 #include <scroll.h>
@@ -280 +281 @@
          void   SetVisibleRegionChanged(BOOL changed) { fVisibleRegionChanged = changed; };
          BOOL   IsVisibleRegionChanged()              { return fVisibleRegionChanged; };
-
+         BOOL   setVisibleRgnNotifyProc(VISRGN_NOTIFY_PROC lpNotifyProc, DWORD dwUserData)
+         {
+             lpVisRgnNotifyProc  = lpNotifyProc;
+             dwVisRgnNotifyParam = dwUserData;
+             return TRUE;
+         }
+         void   callVisibleRgnNotifyProc(BOOL fDrawingAllowed) 
+         {
+             if(lpVisRgnNotifyProc) {
+                 lpVisRgnNotifyProc(getWindowHandle(), fDrawingAllowed, dwVisRgnNotifyParam);
+             }
+         }
          int    GetWindowTextLength(BOOL fUnicode);
          int    GetWindowTextLengthA() { return GetWindowTextLength(FALSE); };
@@ -430 +442 @@
 
     PROPERTY   *propertyList;
+
+VISRGN_NOTIFY_PROC lpVisRgnNotifyProc;
+        DWORD   dwVisRgnNotifyParam;
        
         HANDLE  hTaskList; //PM specific (switchentry handle)