Changeset 5509 for trunk/src

Timestamp:

Apr 15, 2001, 4:29:49 PM (24 years ago)

Author:

sandervl

Message:

Rewrote (Get)ClipCursor

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (4 diffs)
• oslibres.cpp (modified) (2 diffs)
• oslibres.h (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.52 2001-04-12 14:04:32 sandervl Exp $
+; $Id: USER32.DEF,v 1.53 2001-04-15 14:29:47 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -20 +20 @@
     _GpiEnableYInversion        = PMGPI.723
     _GpiQueryYInversion         = PMGPI.726
+    _WinQueryPointerClipRect    = PMMERGE.5433
+    _WinSetPointerClipRect      = PMMERGE.5434
+
 ;;;; Present in WGSS50
 ;;;;    _GpiQueryDCData             = PMGPI.665
@@ -636 +639 @@
 
 
+;----------------------------------
+; obsolete WINNLS APIs (Far East)
+;----------------------------------
+    SendIMEMessageExA          = _SendIMEMessageExA@8           @1010
+    SendIMEMessageExW          = _SendIMEMessageExW@8           @1011
+
+    WINNLSEnableIME            = _WINNLSEnableIME@8             @1012
+    WINNLSGetEnableStatus      = _WINNLSGetEnableStatus@4       @1013
+    WINNLSGetIMEHotkey         = _WINNLSGetIMEHotkey@4          @1014
+
 ;------------------------------------------------------------------------------
 ; Wine/Odin helper function
@@ -675 +688 @@
     _CreateFakeWindowEx@4                                        @2028 NONAME
 
-;----------------------------------
-; obsolete WINNLS APIs (Far East)
-;----------------------------------
-    SendIMEMessageExA          = _SendIMEMessageExA@8
-    SendIMEMessageExW          = _SendIMEMessageExW@8
-
-    WINNLSEnableIME            = _WINNLSEnableIME@8
-    WINNLSGetEnableStatus      = _WINNLSGetEnableStatus@4
-    WINNLSGetIMEHotkey         = _WINNLSGetIMEHotkey@4

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.12 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.13 2001-04-15 14:29:48 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -473 +473 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinClipCursor(const RECT * pRect)
+{
+   RECTL  rectl;
+   PRECTL ptr = NULL;
+
+   if (pRect != NULL)
+   {
+      rectl.xLeft = max(pRect->left, 0);
+      rectl.xRight = min(pRect->right, ScreenWidth-1);
+      rectl.yBottom = max(ScreenHeight - pRect->bottom, 0);
+      rectl.yTop = min(ScreenHeight - pRect->top, ScreenHeight-1);
+      ptr = &rectl;
+   }
+   return WinSetPointerClipRect (HWND_DESKTOP, ptr);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinGetClipCursor(LPRECT pRect)
+{
+   RECTL  rectl;
+
+   if (WinQueryPointerClipRect(HWND_DESKTOP, &rectl))
+   {
+      pRect->left   = rectl.xLeft;
+      pRect->right  = rectl.xRight;
+      pRect->bottom = ScreenHeight - rectl.yBottom;
+      pRect->top    = ScreenHeight - rectl.yTop;
+      return TRUE;
+   }
+   return FALSE;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibres.h

@@ -1 @@
-/* $Id: oslibres.h,v 1.6 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: oslibres.h,v 1.7 2001-04-15 14:29:48 sandervl Exp $ */
 /*
  * Window GUI resource wrapper functions for OS/2
@@ -52 +52 @@
 VOID    OSLibWinDestroyPointer(HANDLE hPointer);
 BOOL    OSLibWinSetPointer(HANDLE hPointer);
+BOOL    OSLibWinClipCursor(const RECT * pRect);
+BOOL    OSLibWinGetClipCursor(LPRECT pRect);
+
+
+
+BOOL APIENTRY _WinSetPointerClipRect(HWND hwnd, PRECTL pRect);
+BOOL APIENTRY _WinQueryPointerClipRect(HWND hwnd, PRECTL pRect);
+
+inline BOOL APIENTRY WinSetPointerClipRect(HWND hwnd, PRECTL pRect)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _WinSetPointerClipRect(hwnd, pRect);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+inline BOOL APIENTRY WinQueryPointerClipRect(HWND hwnd, PRECTL pRect)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _WinQueryPointerClipRect(hwnd, pRect);
+    SetFS(sel);
+
+    return yyrc;
+}
 
 #endif //__OSLIBGDI_H__

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.95 2001-03-30 22:08:19 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.96 2001-04-15 14:29:48 sandervl Exp $ */
 
 /*
@@ -325 +325 @@
 }
 
-/* Cursor Functions */
-
-BOOL WIN32API ClipCursor(const RECT * lpRect)
-{
-    dprintf(("USER32:  ClipCursor\n"));
-    return O32_ClipCursor(lpRect);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetClipCursor( LPRECT lpRect)
-{
-    dprintf(("USER32:  GetClipCursor\n"));
-    return O32_GetClipCursor(lpRect);
-}
-
 /* Mouse Input Functions */
 

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.21 2001-04-05 09:31:28 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.22 2001-04-15 14:29:49 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -380 +380 @@
     dprintf(("USER32: SetCursorPos %d %d", X,Y));
     return OSLibWinSetPointerPos(X, mapScreenY(Y));
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ClipCursor(const RECT * lpRect)
+{
+    if(lpRect) {
+         dprintf(("USER32: ClipCursor (%d,%d)(%d,%d)", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
+    }
+    else dprintf(("USER32: ClipCursor NULL"));
+    return OSLibWinClipCursor(lpRect);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetClipCursor( LPRECT lpRect)
+{
+    dprintf(("USER32: GetClipCursor %x", lpRect));
+    return OSLibWinGetClipCursor(lpRect);
 }
 //******************************************************************************