Changeset 6395 for trunk/src/user32

Timestamp:

Jul 28, 2001, 3:43:54 PM (24 years ago)

Author:

sandervl

Message:

rewrote some functions

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• window.cpp (modified) (3 diffs)
• winmouse.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.61 2001-07-20 15:34:15 sandervl Exp $
+; $Id: USER32.DEF,v 1.62 2001-07-28 13:43:53 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -17 +17 @@
     __ShowCaret                 = PMMERGE.10007
     __ShowCursor                = PMMERGE.10018
+    __SwapMouseButton           = PMMERGE.10019
     WinReplyMsg                 = PMMERGE.5325
     _GpiEnableYInversion        = PMGPI.723

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.106 2001-07-15 15:39:03 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.107 2001-07-28 13:43:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -302 +302 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinSetSysValue(LONG iSysValue, ULONG val)
+{
+    return WinQuerySysValue(iSysValue, val);
+}
+//******************************************************************************
+//******************************************************************************
 ULONG OSLibWinQueryDlgItemText(HWND hwndDlg,ULONG idItem,LONG cchBufferMax,char* pchBuffer)
 {

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.60 2001-07-14 09:21:42 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.61 2001-07-28 13:43:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -195 +195 @@
 
 LONG OSLibWinQuerySysValue(LONG iSysValue);
+BOOL OSLibWinSetSysValue(LONG iSysValue, ULONG val);
 ULONG OSLibWinQueryDlgItemText(HWND hwndDlg,ULONG idItem,LONG cchBufferMax,char* pchBuffer);
 BOOL OSLibWinSetDlgItemText(HWND hwndDlg,ULONG idItem,char* pszText);

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.101 2001-07-23 19:16:41 sandervl Exp $ */
+/* $Id: window.cpp,v 1.102 2001-07-28 13:43:54 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -18 +18 @@
  * TODO: ShowOwnedPopups needs to be tested
  *       GetLastActivePopup needs to be rewritten
- *       ArrangeIconicWindows probably too
  *
  */
@@ -1745 +1744 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API ArrangeIconicWindows( HWND hwnd)
-{
-    dprintf(("USER32:  ArrangeIconicWindows %x", hwnd));
-    return O32_ArrangeIconicWindows(Win32ToOS2Handle(hwnd));
+UINT WIN32API ArrangeIconicWindows( HWND parent)
+{
+    RECT rectParent;
+    HWND hwndChild;
+    INT x, y, xspacing, yspacing;
+
+    dprintf(("USER32: ArrangeIconicWindows %x", parent));
+    dprintf(("USER32: TODO: icon title!!"));
+
+    GetClientRect(parent, &rectParent);
+    x = rectParent.left;
+    y = rectParent.bottom;
+    xspacing = GetSystemMetrics(SM_CXICONSPACING);
+    yspacing = GetSystemMetrics(SM_CYICONSPACING);
+
+    hwndChild = GetWindow( parent, GW_CHILD );
+    while (hwndChild)
+    {
+        if( IsIconic( hwndChild ) )
+        {
+//            WND *wndPtr = WIN_FindWndPtr(hwndChild);
+            
+//            WINPOS_ShowIconTitle( wndPtr, FALSE );
+               
+            SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
+                            y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
+                            SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
+//          if( IsWindow(hwndChild) )
+//                WINPOS_ShowIconTitle(wndPtr , TRUE );
+//            WIN_ReleaseWndPtr(wndPtr);
+
+            if (x <= rectParent.right - xspacing) x += xspacing;
+            else
+            {
+                x = rectParent.left;
+                y -= yspacing;
+            }
+        }
+        hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );
+    }
+    return yspacing;
 }
 //******************************************************************************

trunk/src/user32/winmouse.cpp

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.15 2001-05-19 11:16:02 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.16 2001-07-28 13:43:54 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
  *
- * Copyright 1999 Sander van Leeuwen
- *
+ * Copyright 1999-2001 Sander van Leeuwen
+ *
+ * TODO: SwapMouseButton: 
+ *       We shouldn't let win32 apps change this for the whole system
+ *       better to change mouse button message translation instead
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -160 +163 @@
 {
     dprintf(("USER32: GetDoubleClickTime"));
-    return O32_GetDoubleClickTime();
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetDoubleClickTime( UINT uInterval)
-{
+    UINT result = OSLibWinQuerySysValue(SVOS_DBLCLKTIME);
+    if(result == 0)
+        SetLastError(ERROR_INVALID_PARAMETER); //TODO: ????
+
+    return result;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetDoubleClickTime(UINT uInterval)
+{
+    BOOL ret = TRUE;
+
     dprintf(("USER32: SetDoubleClickTime %d", uInterval));
-    return O32_SetDoubleClickTime(uInterval);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SwapMouseButton( BOOL fSwap)
+
+    ret = OSLibWinSetSysValue(SVOS_DBLCLKTIME, uInterval);
+    if(ret == FALSE )
+    {
+        SetLastError(ERROR_INVALID_PARAMETER); //TODO: ????
+    }
+    return (ret);
+}
+//******************************************************************************
+//TODO: we shouldn't let win32 apps change this for the whole system
+//      better to change mouse button message translation instead
+BOOL OPEN32API __SwapMouseButton(BOOL swapFlag);
+
+inline BOOL _SwapMouseButton(BOOL swapFlag)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = __SwapMouseButton(swapFlag);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+//******************************************************************************
+BOOL WIN32API SwapMouseButton(BOOL fSwap)
 {
     dprintf(("USER32: SwapMouseButton %d", fSwap));
-    return O32_SwapMouseButton(fSwap);
+    return _SwapMouseButton(fSwap);
 }
 /*****************************************************************************