Changeset 2257 for trunk/src/user32/oslibgdi.h

Timestamp:

Dec 29, 1999, 11:54:04 PM (26 years ago)

Author:

cbratschi

Message:

new mapping functions, fixed 1 pixel and window handle bugs

File:

• trunk/src/user32/oslibgdi.h (modified) (2 diffs)

trunk/src/user32/oslibgdi.h

@@ -1 @@
-/* $Id: oslibgdi.h,v 1.2 1999-11-26 17:06:07 cbratschi Exp $ */
+/* $Id: oslibgdi.h,v 1.3 1999-12-29 22:54:00 cbratschi Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -41 +41 @@
 BOOL  OSLibWinQueryUpdateRect(HWND hwnd, PRECT pRect);
 
-//******************************************************************************
-//Map win32 y coordinate (in window coordinates) to OS/2 y coord. (in window coordinates)
-//******************************************************************************
-inline ULONG MapOS2ToWin32Y(Win32BaseWindow *window, ULONG y)
-{
-    return window->getWindowHeight() - y - 1;
-}
+//Mapping functions
 
-ULONG MapOS2ToWin32Y(HWND hwndParent, ULONG cy, ULONG y);
-BOOL  MapOS2ToWin32Point(HWND hwndParent, HWND hwndChild, OSLIBPOINT *point);
-
-//map os/2 rectangle to screen coordinates and convert to win32 rect
-BOOL  MapOS2ToWin32Rectl(HWND hwndParent, HWND hwndChild, PRECTLOS2 rectOS2, PRECT rectWin32);
-
-BOOL  MapOS2ToWin32Rectl(HWND hwnd,PRECTLOS2 rectOS2, PRECT rectWin32);
-BOOL  MapWin32ToOS2Rectl(HWND hwnd,PRECT rectWin32, PRECTLOS2 rectOS2);
-
-BOOL  MapOS2ToWin32WindowRect(PRECTLOS2 rectOS2,PRECT rectWin32);
-BOOL  MapWin32ToOS2WindowRect(PRECT rectWin32,PRECTLOS2 rectOS2);
+INT  mapScreenY(INT screenPosY);
+INT  mapScreenY(INT screenH,INT screenPosY);
+INT  mapY(HWND os2Client,INT clientPosY);
+INT  mapY(Win32BaseWindow *win32wnd,INT clientPosY);
+INT  mapOS2ToWin32Y(HWND os2From,HWND os2To,INT fromPosY);
+INT  mapOS2ToWin32Y(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,INT fromPosY);
+INT  mapWin32Y(HWND os2From,HWND os2To,INT fromPosY);
+INT  mapWin32Y(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,INT fromPosY);
+BOOL mapScreenPoint(OSLIBPOINT *screenPt);
+BOOL mapScreenPoint(INT screenH,OSLIBPOINT *screenPt);
+BOOL mapPoint(HWND os2Client,OSLIBPOINT *clientPt);
+BOOL mapPoint(Win32BaseWindow *win32wnd,OSLIBPOINT *clientPt);
+BOOL mapOS2ToWin32Point(HWND os2From,HWND os2To,OSLIBPOINT *fromPt);
+BOOL mapOS2ToWin32Point(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,OSLIBPOINT *fromPt);
+BOOL mapWin32Point(HWND os2From,HWND os2To,OSLIBPOINT *fromPt);
+BOOL mapWin32Point(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,OSLIBPOINT *fromPt);
+BOOL mapOS2ToWin32ScreenRect(PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL mapWin32ToOS2ScreenRect(PRECT rectWin32,PRECTLOS2 rectOS2);
+BOOL mapOS2ToWin32Rect(HWND os2Client,PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL mapOS2ToWin32Rect(Win32BaseWindow *win32wnd,PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL mapOS2ToWin32Rect(HWND os2From,HWND os2To,PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL mapOS2ToWin32Rect(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL mapWin32ToOS2Rect(HWND os2Client,PRECT rectWin32,PRECTLOS2 rectOS2);
+BOOL mapWin32ToOS2Rect(Win32BaseWindow *win32wnd,PRECT rectWin32,PRECTLOS2 rectOS2);
+BOOL mapWin32ToOS2Rect(HWND os2From,HWND os2To,PRECT rectWin32,PRECTLOS2 rectOS2);
+BOOL mapWin32ToOS2Rect(Win32BaseWindow *wndFrom,Win32BaseWindow *wndTo,PRECT rectWin32,PRECTLOS2 rectOS2);
+BOOL copyOS2ToWin32Rect(PRECTLOS2 rectOS2,PRECT rectWin32);
+BOOL copyWin32ToOS2WindowRect(PRECT rectWin32,PRECTLOS2 rectOS2);
+INT  mapOS2ToWin32ChildOrigin(INT parentH,INT parentPosY,INT childH);
 
 #endif //__OSLIBGDI_H__