Changeset 16888

Timestamp:

Jul 14, 2001, 11:21:46 AM (24 years ago)

Author:

sandervl

Message:

Support full window drag for Odin windows

Location:

tags/trunk/src/user32

Files:

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

tags/trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.59 2001-07-03 18:33:27 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.60 2001-07-14 09:21:42 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -133 +133 @@
 #define SVOS_CYBYTEALIGN             50
 #define SVOS_CYALIGN                 50
+#define SVOS_DESKTOPWORKAREAYTOP     51
+#define SVOS_DESKTOPWORKAREAYBOTTOM  52
+#define SVOS_DESKTOPWORKAREAXRIGHT   53
+#define SVOS_DESKTOPWORKAREAXLEFT    54
 
 /* The following value enables any greater value to be set by WinSetSysValue. */
@@ -180 +184 @@
 #define SVOS_PRINTSCREEN             97
 #define SVOS_LOCKSTARTINPUT          98
+#define SVOS_DYNAMICDRAG             99
+#define SVOS_ALTTABWINDOW            100
+#define SVOS_VIOMOUSEACTIONS         101
+#define SVOS_ASYNCFOCUSCHANGE        102
+#define SVOS_AFCSENSITIVITY          103
+#define SVOS_CLOSEVIOWITHOUTCONFIRM  104
+#define SVOS_CXCURSOR                106
+#define SVOS_CYCURSOR                107
 #define SVOS_CSYSVALUES              108
 

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.139 2001-07-08 15:51:42 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.140 2001-07-14 09:21:43 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1354 +1354 @@
 
     case WM_TRACKFRAME:
+        dprintf(("PMFRAME: WM_TRACKFRAME %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
         if(fOS2Look) {//sent by titlebar control
             FrameTrackFrame(win32wnd, TF_MOVE);
@@ -1386 +1387 @@
 //******************************************************************************
 //TODO: Quickly moving a window two times doesn't force a repaint (1st time)
+//
+//
+BOOL (APIENTRY *WinTrackWindow)(HWND hwndTrack, PTRACKINFO pti) = NULL;
+//
 //******************************************************************************
 VOID FrameTrackFrame(Win32BaseWindow *win32wnd,DWORD flags)
@@ -1394 +1399 @@
   HWND      hwndTracking;
   LONG      parentHeight, parentWidth;
-
+  static    BOOL fInit = FALSE;
+  APIRET    rc;
+  BOOL      ret;
+
+    if(!fInit) {
+        HMODULE hModule;
+        char    buf[CCHMAXPATH];
+        rc = DosLoadModule(buf, sizeof(buf), "PMMERGE", &hModule);
+        rc = DosQueryProcAddr(hModule, 5466, NULL, (PFN *)&WinTrackWindow);
+        if(rc) WinTrackWindow = NULL;
+        fInit = TRUE;
+    }
     dprintf(("FrameTrackFrame: %x %x", win32wnd->getWindowHandle(), flags));
     track.cxBorder = 4;
@@ -1428 +1444 @@
     track.fs = flags;
 
-    if(WinTrackRect(hwndTracking, NULL, &track) )
-    {
+    BOOL fDynamicDrag = WinQuerySysValue(HWND_DESKTOP, SVOS_DYNAMICDRAG);
+
+    SEL sel = RestoreOS2FS();
+    if(fDynamicDrag && WinTrackWindow) {
+         ret = WinTrackWindow(win32wnd->getOS2FrameWindowHandle(), &track);
+    }
+    else ret = WinTrackRect(hwndTracking, NULL, &track);
+    SetFS(sel);
+
+    if(ret) {
         /* if successful copy final position back */
         if(!WinEqualRect(0, &rcl, &track.rclTrack)) {

tags/trunk/src/user32/user32.cpp ¶

@@ -1 @@
-/* $Id: user32.cpp,v 1.107 2001-07-14 08:36:19 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.108 2001-07-14 09:21:46 sandervl Exp $ */
 
 /*
@@ -707 +707 @@
 
     case SPI_GETDRAGFULLWINDOWS:
-        *(BOOL *)pvParam = FALSE; //CB: where is the Warp 4 setting stored?
+        *(BOOL *)pvParam = OSLibWinQuerySysValue(SVOS_DYNAMICDRAG);
         break;