Changeset 2353 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 7, 2000, 6:38:48 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/new/win32wbase.cpp (modified) (17 diffs)

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.23 2000-01-06 17:05:52 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.24 2000-01-07 17:38:47 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -713 +713 @@
   if (SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
   {
-        RECT rect;
-
         //update rect
         rectWindow.left = cs->x;
@@ -720 +718 @@
         rectWindow.top = cs->y;
         rectWindow.bottom = cs->y+cs->cy;
-        rectClient = rectWindow;
         if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+        rectClient = rectWindow;
+        if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rectClient,2);
         //set the window size and update the client
-        rect = rectWindow;
-        if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
-        SetWindowPos(hwndLinkAfter,rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
+        SetWindowPos(hwndLinkAfter,rectClient.left,rectClient.top,rectClient.right-rectClient.left,rectClient.bottom-rectClient.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
         fNoSizeMsg = FALSE;
         if( (SendInternalMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
@@ -1103 +1100 @@
 ULONG Win32BaseWindow::MsgNCPaint()
 {
-  HRGN hrgn;
-
-  hrgn = 0; //CB: todo: set to frame update region
-  return SendInternalMessageA(WM_NCPAINT,hrgn,0);
+  RECT rect;
+
+  if (GetOS2UpdateRect(OS2HwndFrame,&rect))
+  {
+    HRGN hrgn;
+    ULONG rc;
+    RECT client = rectClient;
+
+//CB: bug in dc.cpp!!!
+    if ((rect.left == rect.right) || (rect.bottom == rect.top)) return 0;
+    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
+    if ((rect.left >= client.left) && (rect.left < client.right) &&
+        (rect.right >= client.left) && (rect.right < client.right) &&
+        (rect.top  >= client.top) && (rect.top < client.bottom) &&
+        (rect.bottom >= client.top) && (rect.bottom < client.bottom))
+      return 0;
+    hrgn = CreateRectRgnIndirect(&rect);
+    if (!hrgn) return 0;
+//CB: bug in GetDCEx with region!!!
+    rc = SendInternalMessageA(WM_NCPAINT,/*hrgn*/0,0);
+dprintf(("CB: %d %d %d %d",rect.left,rect.top,rect.bottom,rect.right));
+    DeleteObject(hrgn);
+    //CB: todo: check if intersection with client
+
+    return rc;
+  } else return 0;
 }
 //******************************************************************************
@@ -1343 +1362 @@
         DrawMaxButton(hdc,pressed,FALSE);
     }
-  } while (msg.message != WM_LBUTTONUP);
+  } while ((msg.message != WM_LBUTTONUP) && (msg.message != WM_NCLBUTTONUP));
   if (wParam == HTMINBUTTON)
     DrawMinButton(hdc,FALSE,FALSE);
@@ -1372 +1391 @@
     return;
   state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
+#else
+state = 0;
 #endif
   /* If the item close of the sysmenu is disabled or not there do nothing */
@@ -1387 +1408 @@
     if (pressed != oldstate)
       DrawCloseButton(hdc, pressed, FALSE);
-  } while (msg.message != WM_LBUTTONUP);
-  DrawCloseButton(hdc, FALSE, FALSE);
+  } while ((msg.message != WM_LBUTTONUP) && (msg.message != WM_NCLBUTTONUP));
+  DrawCloseButton(hdc,FALSE,FALSE);
   ReleaseCapture();
-  ReleaseDC(Win32Hwnd, hdc );
+  ReleaseDC(Win32Hwnd,hdc);
   if (!pressed) return;
   SendInternalMessageA(WM_SYSCOMMAND,SC_CLOSE,*(LPARAM*)&msg.pt);
@@ -1459 +1480 @@
 //******************************************************************************
 //******************************************************************************
-LONG Win32BaseWindow::HandleNCLButtonUp(WPARAM wParam,LPARAM lParam)
-{
-  switch(wParam)  /* Hit test */
-  {
-    case HTMINBUTTON:
-      SendInternalMessageA(WM_SYSCOMMAND,SC_MINIMIZE,lParam);
-      break;
-
-    case HTMAXBUTTON:
-      SendInternalMessageA(WM_SYSCOMMAND,SC_MAXIMIZE,lParam);
-      break;
-
-    case HTCLOSE:
-      SendInternalMessageA(WM_SYSCOMMAND,SC_CLOSE,lParam);
-      break;
-  }
-
-  return 0;
-}
-//******************************************************************************
-//******************************************************************************
 BOOL Win32BaseWindow::WindowNeedsWMBorder()
 {
@@ -1770 +1770 @@
 {
   INT width, height;
+  HBRUSH oldBrush;
 
   if (dlgFrame)
@@ -1781 +1782 @@
   }
 
-  SelectObject( hdc, GetSysColorBrush(active ? COLOR_ACTIVEBORDER :
-                COLOR_INACTIVEBORDER) );
+  oldBrush = SelectObject(hdc,GetSysColorBrush(active ? COLOR_ACTIVEBORDER:COLOR_INACTIVEBORDER));
 
   /* Draw frame */
-  PatBlt( hdc, rect->left, rect->top,
-            rect->right - rect->left, height, PATCOPY );
-  PatBlt( hdc, rect->left, rect->top,
-            width, rect->bottom - rect->top, PATCOPY );
-  PatBlt( hdc, rect->left, rect->bottom - 1,
-            rect->right - rect->left, -height, PATCOPY );
-  PatBlt( hdc, rect->right - 1, rect->top,
-            -width, rect->bottom - rect->top, PATCOPY );
-
-  InflateRect( rect, -width, -height );
+
+  PatBlt(hdc,rect->left,rect->top,rect->right-rect->left,height,PATCOPY);
+  PatBlt(hdc,rect->left,rect->top,width,rect->bottom-rect->top,PATCOPY);
+  PatBlt(hdc,rect->left,rect->bottom-1,rect->right-rect->left,-height,PATCOPY);
+  PatBlt(hdc,rect->right-1,rect->top,-width,rect->bottom-rect->top,PATCOPY);
+  SelectObject(hdc,oldBrush);
+
+  InflateRect(rect,-width,-height);
 }
 //******************************************************************************
@@ -2002 +2000 @@
     /* Go get the sysmenu */
     state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
+#else
+state = 0;
 #endif
     /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */
@@ -2137 +2137 @@
     r.top  = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1;
     FillRect( hdc, &r,  GetSysColorBrush(COLOR_SCROLLBAR) );
+    //CB: todo: use scroll code for size grip
   }
 
@@ -2294 +2295 @@
     case SC_SCREENSAVE:
         if (wParam == SC_ABOUTWINE)
-            ShellAboutA(hwnd, "Odin", WINE_RELEASE_INFO, 0);
+            ShellAboutA(hwnd, "Odin", ODIN_RELEASE_INFO, 0);
         else
         if (wParam == SC_PUTMARK)
             dprintf(("Mark requested by user\n"));
         break;
-
+#endif
     case SC_HOTKEY:
     case SC_ARRANGE:
@@ -2305 +2306 @@
     case SC_PREVWINDOW:
         break;
-#endif
     }
     return 0;
@@ -2468 +2468 @@
     case WM_NCACTIVATE:
         return HandleNCActivate(wParam);
-        return TRUE;
 
     case WM_NCCREATE:
@@ -2512 +2511 @@
 
     case WM_ACTIVATE:
-      //CB: todo
       return 0;
 
@@ -2642 +2640 @@
         return HandleNCLButtonDown(wParam,lParam);
 
-    case WM_NCLBUTTONUP:
-        return HandleNCLButtonUp(wParam,lParam);
-
+    case WM_LBUTTONDBLCLK:
     case WM_NCLBUTTONDBLCLK:
         return HandleNCLButtonDblClk(wParam,lParam);