Changeset 9943 for trunk/src

Timestamp:

Mar 27, 2003, 12:02:27 PM (22 years ago)

Author:

sandervl

Message:

Changes for window tracking (move/size) with full window dragging enabled

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (3 diffs)
• wintrack.cpp (modified) (12 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.140 2003-02-27 14:22:42 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.141 2003-03-27 11:02:26 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1329 +1329 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibWinLockVisibleRegions(BOOL fLock)
+{
+    WinLockVisRegions(HWND_DESKTOP, fLock);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.73 2003-02-27 14:22:43 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.74 2003-03-27 11:02:26 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -344 +344 @@
 ULONG  OSLibWinQuerySysColor(int index);
 
+void   OSLibWinLockVisibleRegions(BOOL fLock);
+
 #endif
 
@@ -395 +397 @@
                                 (((colorRef) & 0x000000FF)<<16)   )
 
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/wintrack.cpp

@@ -47 +47 @@
 static void draw_moving_frame( HDC hdc, RECT *rect, BOOL thickframe, DWORD hittest, BOOL fRedraw)
 {
+    if(hdc == 0) {
+        DebugInt3(); 
+        return;
+    }
     if (thickframe)
     {
@@ -465 +469 @@
     capturePoint = pt;
 
-//    if (IsZoomed(hwnd) || !IsWindowVisible(hwnd) || (exstyle & WS_EX_MANAGED)) return;
     if (IsZoomed(hwnd) || !IsWindowVisible(hwnd)) return;
 
@@ -497 +500 @@
     }
 
-      /* Get min/max info */
-
-//    WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack );
+    /* Get min/max info */
     win32wnd->AdjustTrackInfo(&minTrack, &maxTrack);
     GetWindowRect( hwnd, &sizingRect );
@@ -539 +540 @@
 
     /* Retrieve a default cache DC (without using the window style) */
-    hdc = GetDCEx( parent, 0, DCX_CACHE);
+    hdc = 0;
+    if(!DragFullWindows) 
+        hdc = GetDCEx( parent, 0, DCX_CACHE);
 
     if( iconic ) /* create a cursor for dragging */
@@ -546 +549 @@
         if(!hIcon) hIcon = (HICON)SendMessageA( hwnd, WM_QUERYDRAGICON, 0, 0L);
         if( hIcon ) hDragCursor = hIcon;
-// CURSORICON_IconToCursor( hIcon, TRUE );
         if( !hDragCursor ) iconic = FALSE;
     }
@@ -556 +558 @@
     SetCapture( hwnd );
 
+    BOOL fMove = (wParam & 0xfff0) == SC_MOVE;
+
     //prevent the app from drawing to this window (or its children)    
-    if(!DragFullWindows) 
+    if(!DragFullWindows || fMove) 
         LockWindowUpdate(hwnd);
 
@@ -630 +634 @@
                 if (ON_BOTTOM_BORDER(hittest)) newRect.bottom += dy;
 
-////                if(!iconic && !DragFullWindows) draw_moving_frame( hdc, &sizingRect, thickframe, hittest, TRUE);
-
                 /* determine the hit location */
                 if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT)
@@ -660 +662 @@
                         draw_moving_frame( hdc, &newRect, thickframe, hittest, TRUE );
                     else {
-                        /* To avoid any deadlocks, all the locks on the windows
-                           structures must be suspended before the SetWindowPos */
-//                        iWndsLocks = WIN_SuspendWndsLock();
+                        if (!fMove) {
+                            LockWindowUpdate(hwnd);
+                        }
                         SetWindowPos( hwnd, 0, newRect.left, newRect.top,
                                       newRect.right - newRect.left,
-                                      newRect.bottom - newRect.top,
+                                      newRect.bottom - newRect.top, 
                                       ((hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ) | 
                                       ((fControl) ? (SWP_NOACTIVATE|SWP_NOZORDER) : 0));
-//                        WIN_RestoreWndsLock(iWndsLocks);
+                        if (!fMove) {
+                            LockWindowUpdate(NULL);
+                        }
                     }
                 }
@@ -676 +680 @@
 
     //Enable window update
-    if(!DragFullWindows) 
+    if(!DragFullWindows || fMove) 
         LockWindowUpdate(NULL);
 
@@ -692 +696 @@
         draw_moving_frame( hdc, &lastsizingRect, thickframe, hittest, FALSE);
 
-    ReleaseDC( parent, hdc );
-
-//    wine_tsx11_lock();
-//    XUngrabPointer( display, CurrentTime );
-//    if (grab)
-//    {
-//        XSync( display, False );
-//        XUngrabServer( display );
-//        XSync( display, False );
-//        gdi_display = old_gdi_display;
-//    }
-//    wine_tsx11_unlock();
+    if(hdc) ReleaseDC( parent, hdc );
 
     if (HOOK_CallHooksA( WH_CBT, HCBT_MOVESIZE, (WPARAM)hwnd, (LPARAM)&lastsizingRect )) moved = FALSE;
@@ -713 +706 @@
     if (moved)
     {
-        /* To avoid any deadlocks, all the locks on the windows
-           structures must be suspended before the SetWindowPos */
-//        iWndsLocks = WIN_SuspendWndsLock();
-
         /* if the moving/resizing isn't canceled call SetWindowPos
          * with the new position or the new size of the window
@@ -739 +728 @@
                               ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
         }
-
-//        WIN_RestoreWndsLock(iWndsLocks);
     }
     else