mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

#76670 

r=mkaply,achimha@innotek.de sr=roc+moz
Implement XP regions - currently only used on OS/2
This commit is contained in:
mkaply%us.ibm.com 2001-05-15 22:14:48 +00:00
Родитель 5faa137abc
Коммит fde4277837
4 изменённых файлов: 99 добавлений и 377 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
gfx/src/Makefile.in
Просмотреть файл

@ -90,6 +90,13 @@ CPPSRCS = \
nsPrintOptionsImpl.cpp \ nsPrintOptionsImpl.cpp \
$(NULL) $(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += \
nsRegion.cpp \
nsRegionImpl.cpp \
$(NULL)
endif
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libimg_s.$(LIB_SUFFIX) \ $(DIST)/lib/libimg_s.$(LIB_SUFFIX) \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \ $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \

363
gfx/src/os2/nsRegionOS2.cpp
Просмотреть файл

@ -1,348 +1,101 @@
/* /*
* The contents of this file are subject to the Mozilla Public License * The contents of this file are subject to the Mozilla Public
* Version 1.1 (the "License"); you may not use this file except in * License Version 1.1 (the "License"); you may not use this file
* compliance with the License. You may obtain a copy of the License at * except in compliance with the License. You may obtain a copy of
* http://www.mozilla.org/MPL/ * the License at http://www.mozilla.org/MPL/
* *
* Software distributed under the License is distributed on an "AS IS" * Software distributed under the License is distributed on an "AS
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* License for the specific language governing rights and limitations * implied. See the License for the specific language governing
* under the License. * rights and limitations under the License.
* *
* The Original Code is the Mozilla OS/2 libraries. * The Original Code is mozilla.org code.
* *
* The Initial Developer of the Original Code is John Fairhurst, * The Initial Developer of the Original Code is Dainis Jonitis,
* <john_fairhurst@iname.com>. Portions created by John Fairhurst are * <Dainis_Jonitis@swh-t.lv>. Portions created by Dainis Jonitis are
* Copyright (C) 1999 John Fairhurst. All Rights Reserved. * Copyright (C) 2001 Dainis Jonitis. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/ */
// ToDo: nothing
#include "nsGfxDefs.h" #include "nsGfxDefs.h"
#include <stdlib.h>
#include <stdio.h>
#include "nsRegionOS2.h" #include "nsRegionOS2.h"
// Crazy Region Space
//
// In OS/2, windows & presentation spaces have coord. systems with the
// origin in the bottom left & positive going up.
//
// The rest of mozilla assumes a coord. system with the origin in the
// top left & positive going down.
//
// Thus we have a host of methods to convert between the two when
// drawing into a window, and so on.
//
// Regions are different: when they're defined and operations done on
// them, there's no clue to the intended target. So we need another
// way of defining regions. Do this using something which is very close
// to XP space (actually much closer now we use nsRects instead of XP_Rects)
// which can be envisaged as a reflection in the (XP space) line y = 0
//
// Hmm, perhaps it would cause less confusion not to mention this at all!
#define nsRgnPS (gModuleData.hpsScreen) NS_IMPL_ISUPPORTS(nsRegionOS2, NS_GET_IID(nsIRegion))
nsRegionOS2::nsRegionOS2() nsRegionOS2::nsRegionOS2()
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
mRegion = 0;
mRegionType = RGN_NULL;
} }
nsRegionOS2::~nsRegionOS2() // Do not use GetNativeRegion on OS/2. Regions are device specific. Use GetHRGN () instead.
{
if( mRegion)
{
GFX (::GpiDestroyRegion (nsRgnPS, mRegion), FALSE);
}
}
NS_IMPL_ISUPPORTS(nsRegionOS2, NS_GET_IID(nsIRegion))
// Create empty region
nsresult nsRegionOS2::Init()
{
mRegion = GFX (::GpiCreateRegion (nsRgnPS, 0, 0), RGN_ERROR);
mRegionType = RGN_NULL;
return NS_OK;
}
// assignment
void nsRegionOS2::SetTo( const nsIRegion &aRegion)
{
nsRegionOS2 *pRegion = (nsRegionOS2 *) &aRegion;
mRegionType = GFX (::GpiCombineRegion (nsRgnPS, mRegion, pRegion->mRegion,
0, CRGN_COPY), RGN_ERROR);
}
void nsRegionOS2::SetTo( PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
{
if( 0 == mRegion)
Init();
RECTL rcl = { aX, aY, aX + aWidth, aY + aHeight }; // in-ex
GFX (::GpiSetRegion (nsRgnPS, mRegion, 1, &rcl), FALSE);
mRegionType = (aWidth && aHeight) ? RGN_RECT : RGN_NULL;
}
// Combine region with something; generic helpers
void nsRegionOS2::combine( long lOp, PRInt32 aX, PRInt32 aY, PRInt32 aW, PRInt32 aH)
{
RECTL rcl = { aX, aY, aX + aW, aY + aH }; // in-ex
HRGN rgn = GFX (::GpiCreateRegion (nsRgnPS, 1, &rcl), RGN_ERROR);
if (rgn == RGN_ERROR)
{
printf( "X Y W H is %d %d %d %d\n", aX, aY, aW, aH);
}
mRegionType = GFX (::GpiCombineRegion (nsRgnPS, mRegion, mRegion, rgn, lOp), RGN_ERROR);
GFX (::GpiDestroyRegion (nsRgnPS, rgn), FALSE);
}
void nsRegionOS2::combine( long lOp, const nsIRegion &aRegion)
{
nsRegionOS2 *pRegion = (nsRegionOS2 *)&aRegion;
mRegionType = GFX (::GpiCombineRegion (nsRgnPS, mRegion, mRegion,
pRegion->mRegion, lOp), RGN_ERROR);
}
#define DECL_COMBINE(name,token) \
void nsRegionOS2::name(const nsIRegion &aRegion) \
{ combine( token, aRegion); } \
\
void nsRegionOS2::name( PRInt32 aX, PRInt32 aY, \
PRInt32 aWidth, PRInt32 aHeight) \
{ combine( token, aX, aY, aWidth, aHeight); }
DECL_COMBINE(Intersect,CRGN_AND)
DECL_COMBINE(Union,CRGN_OR)
DECL_COMBINE(Subtract,CRGN_DIFF)
// misc
PRBool nsRegionOS2::IsEmpty()
{
return (mRegionType == RGN_NULL) ? PR_TRUE : PR_FALSE;
}
PRBool nsRegionOS2::IsEqual( const nsIRegion &aRegion)
{
nsRegionOS2 *pRegion = (nsRegionOS2 *)&aRegion;
long lrc = GFX (::GpiEqualRegion (nsRgnPS, mRegion, pRegion->mRegion), EQRGN_ERROR);
return lrc == EQRGN_EQUAL ? PR_TRUE : PR_FALSE;
}
void nsRegionOS2::GetBoundingBox( PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
{
if( mRegionType != RGN_NULL)
{
RECTL rcl;
GFX (::GpiQueryRegionBox (nsRgnPS, mRegion, &rcl), RGN_ERROR);
*aX = rcl.xLeft;
*aY = rcl.yBottom;
*aWidth = rcl.xRight - rcl.xLeft; // in-ex, okay.
*aHeight = rcl.yTop - rcl.yBottom;
}
else
*aX = *aY = *aWidth = *aHeight = 0;
}
// translate
void nsRegionOS2::Offset( PRInt32 aXOffset, PRInt32 aYOffset)
{
POINTL ptl = { aXOffset, aYOffset };
GFX (::GpiOffsetRegion (nsRgnPS, mRegion, &ptl), FALSE);
}
// hittest - precise spec, rect must be completely contained.
PRBool nsRegionOS2::ContainsRect( PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
{
RECTL rcl = { aX, aY, aX + aWidth, aY + aHeight }; // in-ex
long lRC = GFX (::GpiRectInRegion (nsRgnPS, mRegion, &rcl), RRGN_ERROR);
return lRC == RRGN_INSIDE ? PR_TRUE : PR_FALSE;
}
// Accessor for the CRS region
nsresult nsRegionOS2::GetNativeRegion (void *&aRegion) const nsresult nsRegionOS2::GetNativeRegion (void *&aRegion) const
{ {
aRegion = (void*) mRegion; aRegion = (void*)RGN_ERROR;
return NS_OK; return NS_OK;
} }
// Get the complexity of the region PRUint32 nsRegionOS2::NumOfRects (HPS aPS, HRGN aRegion) const
nsresult nsRegionOS2::GetRegionComplexity( nsRegionComplexity &aComplexity) const
{ {
NS_ASSERTION( mRegionType != RGN_ERROR, "Bad region complexity"); RGNRECT rgnRect;
rgnRect.crcReturned = 0;
switch( mRegionType) GFX (::GpiQueryRegionRects (aPS, aRegion, NULL, &rgnRect, NULL), FALSE);
{
case RGN_NULL: aComplexity = eRegionComplexity_empty; break; return rgnRect.crcReturned;
case RGN_RECT: aComplexity = eRegionComplexity_rect; break;
default:
case RGN_COMPLEX: aComplexity = eRegionComplexity_complex; break;
} }
return NS_OK; HRGN nsRegionOS2::GetHRGN (PRUint32 DestHeight, HPS DestPS)
{
PRUint32 NumRects = mRegion.GetNumRects ();
if (NumRects > 0)
{
PRECTL pRects = new RECTL [NumRects];
nsRegionRectIterator ri (mRegion);
const nsRect* pSrc;
PRECTL pDest = pRects;
while (pSrc = ri.Next ())
{
pDest->xLeft = pSrc->x;
pDest->xRight = pSrc->XMost ();
pDest->yTop = DestHeight - pSrc->y;
pDest->yBottom = pDest->yTop - pSrc->height;
pDest++;
} }
// Code recycled from os2fe/drawable.cpp (the good old days...) HRGN rgn = GFX (::GpiCreateRegion (DestPS, NumRects, pRects), RGN_ERROR);
// The beautiful thing about this is that it works both ways: os/2 delete [] pRects;
// space in, Crazy Region Space out, and vice-versa.
struct CGetRects
{
PRECTL pRects;
ULONG ulUsed;
ULONG ulGot;
ULONG ulHeight;
CGetRects( ULONG h) : ulUsed( 0), ulGot( 10), ulHeight( h) return rgn;
} else
{ {
pRects = (PRECTL) malloc( 10 * sizeof( RECTL)); return GFX (::GpiCreateRegion (DestPS, 0, NULL), RGN_ERROR);
} }
~CGetRects() { free( pRects); }
inline void add( RECTL &rectl) // sneaky; might work...
{
if( ulUsed == ulGot)
{
ulGot += 10;
pRects = (PRECTL) realloc( pRects, ulGot * sizeof( RECTL));
}
pRects[ ulUsed].xLeft = rectl.xLeft;
pRects[ ulUsed].yBottom = ulHeight - rectl.yTop; // This is right.
pRects[ ulUsed].xRight = rectl.xRight; // Trust me.
pRects[ ulUsed].yTop = ulHeight - rectl.yBottom;
ulUsed++;
}
};
// Big ugly function to accumulate lists of rectangles.
// All logic is in parameters (as opposed to making a callback per rect) for
// speed reasons (maybe spurious, but...)
static void RealQueryRects( HRGN hrgn,
HPS hps,
nsRegionRectSet **aRects,
CGetRects *aGetRects)
{
BOOL isRECTL = aRects ? FALSE : TRUE;
// right, this is far too complicated. What we want is a function to
// query how many rectangles we need before we start...
RECTL rects[ 10];
RGNRECT rgnRect = { 1, 10, 0, RECTDIR_LFRT_TOPBOT };
for( ;;)
{
// get a batch of rectangles
GFX (::GpiQueryRegionRects (hps, hrgn, 0, &rgnRect, rects), FALSE);
// call them out
for( PRUint32 i = 0; i < rgnRect.crcReturned; i++)
{
if( isRECTL)
{
aGetRects->add( rects[i]);
}
else
{
// accumulate nsRects in the nsRegionRectSet structure
// first check for space
if( (*aRects)->mNumRects == (*aRects)->mRectsLen)
{
*aRects = (nsRegionRectSet *)
realloc( *aRects, sizeof( nsRegionRectSet) +
((*aRects)->mNumRects + 9) * sizeof(nsRegionRect));
(*aRects)->mRectsLen += 10;
#ifdef DEBUG
// !! If this happens lots, bump up initial allocation
printf( "Allocating more regionrect space...\n");
#endif
}
nsRegionRect *theRect = (*aRects)->mRects + (*aRects)->mNumRects;
theRect->x = rects[i].xLeft;
theRect->y = rects[i].yBottom;
theRect->width = rects[i].xRight - rects[i].xLeft; // in-ex
theRect->height = rects[i].yTop - rects[i].yBottom;
(*aRects)->mNumRects++;
}
}
// are we done ?
if( rgnRect.crcReturned < rgnRect.crc) break;
// set up for the next batch
rgnRect.ircStart += 10;
}
}
#define GetRects_Native(r,p,a) RealQueryRects( r, p, nsnull, a)
#define GetRects_NS(r,p,a) RealQueryRects( r, p, a, nsnull)
HRGN nsRegionOS2::GetHRGN( PRUint32 ulHeight, HPS hps)
{
CGetRects getRects( ulHeight);
GetRects_Native( mRegion, nsRgnPS, &getRects);
return GFX (::GpiCreateRegion (hps, getRects.ulUsed, getRects.pRects), RGN_ERROR);
} }
// For copying from an existing region who has height & possibly diff. hdc // For copying from an existing region who has height & possibly diff. hdc
nsresult nsRegionOS2::Init( HRGN copy, PRUint32 ulHeight, HPS hps) nsresult nsRegionOS2::InitWithHRGN (HRGN SrcRegion, PRUint32 SrcHeight, HPS SrcPS)
{ {
CGetRects getRects( ulHeight); PRUint32 NumRects = NumOfRects (SrcPS, SrcRegion);
mRegion.Empty ();
GetRects_Native( copy, hps, &getRects); if (NumRects > 0)
{
RGNRECT RgnControl = { 1, NumRects, 0, RECTDIR_LFRT_TOPBOT };
PRECTL pRects = new RECTL [NumRects];
Init(); GFX (::GpiQueryRegionRects (SrcPS, SrcRegion, NULL, &RgnControl, pRects), FALSE);
mRegionType = GFX (::GpiSetRegion (nsRgnPS, mRegion, getRects.ulUsed, for (PRUint32 cnt = 0 ; cnt < NumRects ; cnt++)
getRects.pRects), FALSE); mRegion.Or (mRegion, nsRect ( pRects [cnt].xLeft, SrcHeight - pRects [cnt].yTop,
return NS_OK; pRects [cnt].xRight - pRects [cnt].xLeft, pRects [cnt].yTop - pRects [cnt].yBottom));
delete [] pRects;
} }
// Get the region as an array of rects for the new compositor
nsresult nsRegionOS2::GetRects( nsRegionRectSet **aRects)
{
if( !aRects)
return NS_ERROR_NULL_POINTER;
if( *aRects == nsnull)
{
*aRects = (nsRegionRectSet *) malloc( sizeof( nsRegionRectSet) +
9 * sizeof( nsRegionRect));
(*aRects)->mNumRects = 0;
(*aRects)->mRectsLen = 10;
}
else
{
// Can reuse the structures (says the header).
// That's quite sensible, actually.
(*aRects)->mNumRects = 0;
}
GetRects_NS( mRegion, nsRgnPS, aRects);
return NS_OK;
}
nsresult nsRegionOS2::FreeRects( nsRegionRectSet *aRects)
{
if( !aRects)
return NS_ERROR_NULL_POINTER;
free( aRects);
return NS_OK; return NS_OK;
} }

74
gfx/src/os2/nsRegionOS2.h
Просмотреть файл

@ -1,85 +1,47 @@
/* /*
* The contents of this file are subject to the Mozilla Public License * The contents of this file are subject to the Mozilla Public
* Version 1.1 (the "License"); you may not use this file except in * License Version 1.1 (the "License"); you may not use this file
* compliance with the License. You may obtain a copy of the License at * except in compliance with the License. You may obtain a copy of
* http://www.mozilla.org/MPL/ * the License at http://www.mozilla.org/MPL/
* *
* Software distributed under the License is distributed on an "AS IS" * Software distributed under the License is distributed on an "AS
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* License for the specific language governing rights and limitations * implied. See the License for the specific language governing
* under the License. * rights and limitations under the License.
* *
* The Original Code is the Mozilla OS/2 libraries. * The Original Code is mozilla.org code.
* *
* The Initial Developer of the Original Code is John Fairhurst, * The Initial Developer of the Original Code is Dainis Jonitis,
* <john_fairhurst@iname.com>. Portions created by John Fairhurst are * <Dainis_Jonitis@swh-t.lv>. Portions created by Dainis Jonitis are
* Copyright (C) 1999 John Fairhurst. All Rights Reserved. * Copyright (C) 2001 Dainis Jonitis. All Rights Reserved.
* *
* Contributor(s): * Contributor(s):
*
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 05/110/2000 IBM Corp. Make more like Windows
*/ */
// Region object. From os2fe\regions.cpp.
// Regions are defined in Crazy Region Space - see nsRegionOS2.cpp.
#ifndef _nsRegionOS2_h #ifndef _nsRegionOS2_h
#define _nsRegionOS2_h #define _nsRegionOS2_h
#include "nsIRegion.h" #include "nsRegionImpl.h"
typedef void (*nsRECTLInRegionFunc)(void *closure, RECTL &rectl);
class nsRegionOS2 : public nsIRegion class nsRegionOS2 : public nsRegionImpl
{ {
PRUint32 NumOfRects (HPS aPS, HRGN aRegion) const;
public: public:
nsRegionOS2 (); nsRegionOS2 ();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
virtual nsresult Init(); NS_IMETHOD GetNativeRegion(void *&aRegion) const; // Don't use this on OS/2 - Use GetHRGN () instead
virtual void SetTo(const nsIRegion &aRegion);
virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
virtual void Intersect(const nsIRegion &aRegion);
virtual void Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
virtual void Union(const nsIRegion &aRegion);
virtual void Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
virtual void Subtract(const nsIRegion &aRegion);
virtual void Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
virtual PRBool IsEmpty(void);
virtual PRBool IsEqual(const nsIRegion &aRegion);
virtual void GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight);
virtual void Offset(PRInt32 aXOffset, PRInt32 aYOffset);
virtual PRBool ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
NS_IMETHOD GetRects(nsRegionRectSet **aRects);
NS_IMETHOD FreeRects(nsRegionRectSet *aRects);
NS_IMETHOD GetNativeRegion(void *&aRegion) const; // Don't use this -- it returns a region defined in CRS.
NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const;
NS_IMETHOD GetNumRects(PRUint32 *aRects) const { *aRects = 0; return NS_OK; }
// OS/2 specific // OS/2 specific
// get region in widget's coord space for given device // get region in widget's coord space for given device
HRGN GetHRGN (PRUint32 ulHeight, HPS hps); HRGN GetHRGN (PRUint32 ulHeight, HPS hps);
// copy from another region defined in aWidget's space for a given device // copy from another region defined in aWidget's space for a given device
nsresult Init( HRGN copy, PRUint32 ulHeight, HPS hps); nsresult InitWithHRGN (HRGN copy, PRUint32 ulHeight, HPS hps);
private:
~nsRegionOS2();
HRGN mRegion;
long mRegionType;
void combine( long lOp, PRInt32 aX, PRInt32 aY, PRInt32 aW, PRInt32 aH);
void combine( long lOp, const nsIRegion &aRegion);
}; };
#endif #endif

2
gfx/src/os2/nsRenderingContextOS2.cpp
Просмотреть файл

@ -735,7 +735,7 @@ NS_IMETHODIMP nsRenderingContextOS2::GetClipRegion( nsIRegion **aRegion)
HRGN hrgnDummy = 0; HRGN hrgnDummy = 0;
PRUint32 ulHeight = mSurface->GetHeight (); PRUint32 ulHeight = mSurface->GetHeight ();
pRegion->Init( hrgnClip, ulHeight, mPS); pRegion->InitWithHRGN (hrgnClip, ulHeight, mPS);
GFX (::GpiSetClipRegion (mPS, hrgnClip, &hrgnDummy), RGN_ERROR); GFX (::GpiSetClipRegion (mPS, hrgnClip, &hrgnDummy), RGN_ERROR);
} }
else else