Changeset 6941 for trunk/src

Timestamp:

Oct 3, 2001, 8:37:53 PM (24 years ago)

Author:

sandervl

Message:

window tracking rewrite + getdcex change (clipping)

Location:

trunk/src/user32

Files:

• Makefile (modified) (3 diffs)
• dc.cpp (modified) (5 diffs)
• oslibmsg.cpp (modified) (5 diffs)
• oslibmsg.h (modified) (2 diffs)
• pmwindow.cpp (modified) (4 diffs)
• pmwindow.h (modified) (2 diffs)
• win32wbasenonclient.cpp (modified) (3 diffs)
• wintrack.cpp (added)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.95 2001-10-01 01:41:38 bird Exp $
+# $Id: Makefile,v 1.96 2001-10-03 18:37:51 sandervl Exp $
 
 #
@@ -19 +19 @@
 #
 !ifndef WMAKE
-CDEFINES  = $(CDEFINES) -DINVERT -DCLIENTFRAME
+CDEFINES  = $(CDEFINES) -DINVERT -DCLIENTFRAME -DCUSTOM_TRACKFRAME
 !else
-CDEFINES += -DINVERT -DCLIENTFRAME
+CDEFINES += -DINVERT -DCLIENTFRAME -DCUSTOM_TRACKFRAME
 !endif
 
@@ -64 +64 @@
 $(OBJDIR)\winproc.obj \
 $(OBJDIR)\oslibmsg.obj \
+$(OBJDIR)\wintrack.obj \
 $(OBJDIR)\hook.obj \
 $(OBJDIR)\win32wmdiclient.obj \

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.111 2001-07-30 12:02:15 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.112 2001-10-03 18:37:51 sandervl Exp $ */
 
 /*
@@ -969 +969 @@
             int clipstyle = 0;
             int clipwnd   = HWND_TOP;
-            if(flags & (DCX_USESTYLE_W)) {
+            if(flags & (DCX_USESTYLE_W)) 
+            {
                 int style = wnd->getStyle();
                 if(style & WS_CLIPCHILDREN_W) {
@@ -990 +991 @@
                 clipstyle |= PSF_PARENTCLIP;
             }
-            if(clipstyle) {
+            //Always call WinGetClipPS; WinGetPS takes window & class style
+            //into account
+//            if(clipstyle || !(flags & DCX_DEFAULTCLIP_W)) {
                  dprintf2(("WinGetClipPS style %x", clipstyle));
                  hps = WinGetClipPS(hWindow, clipwnd, clipstyle);
-            }
-            else hps = WinGetPS (hWindow);
+//            }
+//            else hps = WinGetPS (hWindow);
 
             // default cp is OS/2 one: set to windows default (ODIN.INI)
@@ -1111 +1114 @@
         return GetDCEx( GetDesktopWindow(), 0, DCX_CACHE_W | DCX_WINDOW_W );
 
-    return GetDCEx (hwnd, NULL, 0);
+    return GetDCEx (hwnd, NULL, DCX_USESTYLE_W);
 }
 //******************************************************************************
@@ -1118 +1121 @@
 {
     if (!hwnd) hwnd = GetDesktopWindow();
-    return GetDCEx (hwnd, NULL, DCX_WINDOW_W);
+    return GetDCEx (hwnd, NULL, DCX_WINDOW_W | DCX_USESTYLE_W);
 }
 //******************************************************************************

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.43 2001-09-01 12:41:42 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.44 2001-10-03 18:37:51 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -82 +82 @@
 
    //TODO: Needs better translation!
-   WM_CHAR,          WINWM_KEYDOWN,
+   WM_CHAR,          WINWM_KEYDOWN,   //WM_KEYFIRST
    WM_CHAR,          WINWM_KEYUP,
    WM_CHAR,          WINWM_CHAR,
@@ -97 +97 @@
    //
    //todo: not always right if mouse msg turns out to be for the nonclient window
-   WM_MOUSEMOVE,     WINWM_MOUSEMOVE,
+   WM_MOUSEMOVE,     WINWM_MOUSEMOVE,    //WM_MOUSEFIRST
    WM_BUTTON1DOWN,   WINWM_LBUTTONDOWN,
    WM_BUTTON1UP,     WINWM_LBUTTONUP,
@@ -107 +107 @@
    WM_BUTTON3UP,     WINWM_MBUTTONUP,
    WM_BUTTON3DBLCLK, WINWM_MBUTTONDBLCLK,
-
+   WM_BUTTON3DBLCLK, WINWM_MOUSEWHEEL,    //WM_MOUSELAST
    999999999,        999999999,
 };
@@ -270 +270 @@
         do {
                 eaten = FALSE;
-                rc = WinGetMsg(teb->o.odin.hab, &os2msg, filtermin, filtermax, 0);
+                rc = WinGetMsg(teb->o.odin.hab, &os2msg, 0, filtermin, filtermax);
                 if (os2msg.msg == WM_TIMER)
                     eaten = TIMER_HandleTimer(&os2msg);

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.14 2001-02-15 00:33:01 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.15 2001-10-03 18:37:52 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -165 +165 @@
 #define WINWM_MBUTTONUP             0x0208
 #define WINWM_MBUTTONDBLCLK         0x0209
-#define WINWM_MOUSELAST             0x0209
+#define WINWM_MOUSEWHEEL            0x020A
+#define WINWM_MOUSELAST             0x020A
 #define WINWM_PARENTNOTIFY          0x0210
 #define WINWM_ENTERMENULOOP         0x0211

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.151 2001-10-03 13:50:36 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.152 2001-10-03 18:37:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1405 +1405 @@
         dprintf(("PMFRAME: WM_TRACKFRAME %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
         if(fOS2Look) {//sent by titlebar control
+#ifdef CUSTOM_TRACKFRAME
+            Frame_SysCommandSizeMove(win32wnd, SC_MOVE_W);
+#else
             FrameTrackFrame(win32wnd, TF_MOVE);
+#endif
         }
         rc = 0;
@@ -1456 +1460 @@
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );
 }
+#ifndef CUSTOM_TRACKFRAME 
 //******************************************************************************
 //TODO: Quickly moving a window two times doesn't force a repaint (1st time)
@@ -1556 +1561 @@
    return;
 }
+#endif
 //******************************************************************************
 //******************************************************************************

trunk/src/user32/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.11 2001-06-10 12:05:39 sandervl Exp $ */
+/* $Id: pmwindow.h,v 1.12 2001-10-03 18:37:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -32 +32 @@
 
 VOID FrameTrackFrame(Win32BaseWindow *win32wnd,DWORD flags);
+void Frame_SysCommandSizeMove(Win32BaseWindow *win32wnd, WPARAM wParam);
 
 #endif

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.35 2001-06-22 07:32:48 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.36 2001-10-03 18:37:53 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1270 +1270 @@
     switch (uCommand)
     {
-
     case SC_SIZE:
     {
+#ifdef CUSTOM_TRACKFRAME
+      Frame_SysCommandSizeMove(this, wParam);
+#else
       DWORD flags;
 
@@ -1316 +1318 @@
       }
       if (flags) FrameTrackFrame(this,flags);
+#endif
       break;
     }
 
     case SC_MOVE:
+#ifdef CUSTOM_TRACKFRAME
+        Frame_SysCommandSizeMove(this, wParam);
+#else
         if (dwStyle & WS_MAXIMIZE) break;
         FrameTrackFrame(this,TFOS_MOVE);
+#endif
         break;