mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-19 01:10:22 +00:00
backout back buffer cleanup for now.
This commit is contained in:
ramiro%netscape.com
parent
64ab1c9f4e
commit
b77416df71
@ -61,7 +61,8 @@ nsRenderingContextXlib::nsRenderingContextXlib()
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::nsRenderingContextXlib()\n"));
|
||||
NS_INIT_REFCNT();
|
||||
mSurface = nsnull;
|
||||
mOffscreenSurface = nsnull;
|
||||
mRenderingSurface = nsnull;
|
||||
mContext = nsnull;
|
||||
mFontMetrics = nsnull;
|
||||
mTMatrix = nsnull;
|
||||
@ -98,6 +99,7 @@ nsRenderingContextXlib::~nsRenderingContextXlib()
|
||||
if (mTMatrix)
|
||||
delete mTMatrix;
|
||||
NS_IF_RELEASE(mClipRegion);
|
||||
NS_IF_RELEASE(mOffscreenSurface);
|
||||
NS_IF_RELEASE(mFontMetrics);
|
||||
NS_IF_RELEASE(mContext);
|
||||
}
|
||||
@ -159,20 +161,21 @@ nsRenderingContextXlib::Init(nsIDeviceContext* aContext, nsIWidget *aWindow)
|
||||
mVisual = ((nsDeviceContextXlib *) mContext)->GetVisual();
|
||||
mDepth = ((nsDeviceContextXlib *) mContext)->GetDepth();
|
||||
|
||||
mSurface = (nsDrawingSurfaceXlib *)new nsDrawingSurfaceXlib();
|
||||
mRenderingSurface = (nsDrawingSurfaceXlib *)new nsDrawingSurfaceXlib();
|
||||
|
||||
if (mSurface) {
|
||||
if (mRenderingSurface) {
|
||||
Drawable win = (Drawable)aWindow->GetNativeData(NS_NATIVE_WINDOW);
|
||||
GC gc = (GC)aWindow->GetNativeData(NS_NATIVE_GRAPHIC);
|
||||
|
||||
mSurface->Init(mDisplay,
|
||||
mRenderingSurface->Init(mDisplay,
|
||||
mScreen,
|
||||
mVisual,
|
||||
mDepth,
|
||||
win,
|
||||
gc);
|
||||
|
||||
NS_ADDREF(mSurface);
|
||||
mOffscreenSurface = mRenderingSurface;
|
||||
NS_ADDREF(mRenderingSurface);
|
||||
}
|
||||
return (CommonInit());
|
||||
}
|
||||
@ -192,10 +195,10 @@ nsRenderingContextXlib::Init(nsIDeviceContext* aContext, nsDrawingSurface aSurfa
|
||||
mVisual = ((nsDeviceContextXlib *) mContext)->GetVisual();
|
||||
mDepth = ((nsDeviceContextXlib *) mContext)->GetDepth();
|
||||
|
||||
mSurface = (nsDrawingSurfaceXlib *)aSurface;
|
||||
mRenderingSurface = (nsDrawingSurfaceXlib *)aSurface;
|
||||
|
||||
if (nsnull != mSurface) {
|
||||
NS_ADDREF(mSurface);
|
||||
if (nsnull != mRenderingSurface) {
|
||||
NS_ADDREF(mRenderingSurface);
|
||||
}
|
||||
|
||||
return CommonInit();
|
||||
@ -208,7 +211,7 @@ nsresult nsRenderingContextXlib::CommonInit(void)
|
||||
unsigned int width, height, border, depth;
|
||||
Window root_win;
|
||||
|
||||
Drawable drawable = mSurface->GetDrawable();
|
||||
Drawable drawable = mRenderingSurface->GetDrawable();
|
||||
|
||||
#ifdef XLIB_GFX_NOISY
|
||||
printf("XGetGeometry(display=%p,drawable=%p)\n",
|
||||
@ -263,7 +266,7 @@ nsRenderingContextXlib::LockDrawingSurface(PRInt32 aX, PRInt32 aY,
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::LockDrawingSurface()\n"));
|
||||
PushState();
|
||||
return mSurface->Lock(aX, aY, aWidth, aHeight,
|
||||
return mRenderingSurface->Lock(aX, aY, aWidth, aHeight,
|
||||
aBits, aStride, aWidthBytes, aFlags);
|
||||
}
|
||||
|
||||
@ -273,7 +276,7 @@ nsRenderingContextXlib::UnlockDrawingSurface(void)
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::UnlockDrawingSurface()\n"));
|
||||
PRBool clipstate;
|
||||
PopState(clipstate);
|
||||
mSurface->Unlock();
|
||||
mRenderingSurface->Unlock();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -281,38 +284,18 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::SelectOffScreenDrawingSurface(nsDrawingSurface aSurface)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::SelectOffScreenDrawingSurface()\n"));
|
||||
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
|
||||
if (aSurface != mSurface)
|
||||
{
|
||||
NS_ASSERTION(nsnull != aSurface, "Setting up a nsnull drawing surface for the rendering context");
|
||||
|
||||
if (nsnull != aSurface)
|
||||
{
|
||||
NS_IF_RELEASE(mSurface);
|
||||
|
||||
mSurface = (nsDrawingSurfaceXlib *)aSurface;
|
||||
|
||||
rv = NS_OK;
|
||||
}
|
||||
|
||||
NS_ADDREF(mSurface);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Setting surface to the existing surface so do nothing.
|
||||
rv = NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
if (nsnull == aSurface)
|
||||
mRenderingSurface = mOffscreenSurface;
|
||||
else
|
||||
mRenderingSurface = (nsDrawingSurfaceXlib *)aSurface;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRenderingContextXlib::GetDrawingSurface(nsDrawingSurface *aSurface)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::GetDrawingSurface()\n"));
|
||||
*aSurface = mSurface;
|
||||
*aSurface = mRenderingSurface;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -385,10 +368,10 @@ nsRenderingContextXlib::PopState(PRBool &aClipState)
|
||||
mClipRegion = state->mClipRegion;
|
||||
mFontMetrics = state->mFontMetrics;
|
||||
|
||||
if (mSurface && mClipRegion) {
|
||||
if (mRenderingSurface && mClipRegion) {
|
||||
Region region;
|
||||
mClipRegion->GetNativeRegion((void *&)region);
|
||||
XSetRegion(mDisplay, mSurface->GetGC(), region);
|
||||
XSetRegion(mDisplay, mRenderingSurface->GetGC(), region);
|
||||
}
|
||||
|
||||
if (state->mColor != mCurrentColor)
|
||||
@ -440,7 +423,7 @@ nsRenderingContextXlib::SetClipRect(const nsRect& aRect, nsClipCombine aCombine,
|
||||
aClipState = mClipRegion->IsEmpty();
|
||||
|
||||
mClipRegion->GetNativeRegion((void*&)rgn);
|
||||
XSetRegion(mDisplay, mSurface->GetGC(), rgn);
|
||||
XSetRegion(mDisplay, mRenderingSurface->GetGC(), rgn);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -484,7 +467,7 @@ nsRenderingContextXlib::SetClipRegion(const nsIRegion& aRegion, nsClipCombine aC
|
||||
|
||||
aClipState = mClipRegion->IsEmpty();
|
||||
mClipRegion->GetNativeRegion((void*&)rgn);
|
||||
XSetRegion(mDisplay, mSurface->GetGC(),rgn);
|
||||
XSetRegion(mDisplay, mRenderingSurface->GetGC(),rgn);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -528,7 +511,7 @@ nsRenderingContextXlib::SetLineStyle(nsLineStyle aLineStyle)
|
||||
switch(aLineStyle)
|
||||
{
|
||||
case nsLineStyle_kSolid:
|
||||
XSetLineAttributes(mDisplay, mSurface->GetGC(),
|
||||
XSetLineAttributes(mDisplay, mRenderingSurface->GetGC(),
|
||||
1, // width
|
||||
LineSolid, // line style
|
||||
CapNotLast,// cap style
|
||||
@ -537,7 +520,7 @@ nsRenderingContextXlib::SetLineStyle(nsLineStyle aLineStyle)
|
||||
case nsLineStyle_kDashed:
|
||||
{
|
||||
static char dashed[2] = {4,4};
|
||||
XSetDashes(mDisplay, mSurface->GetGC(),
|
||||
XSetDashes(mDisplay, mRenderingSurface->GetGC(),
|
||||
0, dashed, 2);
|
||||
}
|
||||
break;
|
||||
@ -545,7 +528,7 @@ nsRenderingContextXlib::SetLineStyle(nsLineStyle aLineStyle)
|
||||
case nsLineStyle_kDotted:
|
||||
{
|
||||
static char dotted[2] = {3,1};
|
||||
XSetDashes(mDisplay, mSurface->GetGC(),
|
||||
XSetDashes(mDisplay, mRenderingSurface->GetGC(),
|
||||
0, dotted, 2);
|
||||
}
|
||||
break;
|
||||
@ -576,7 +559,7 @@ nsRenderingContextXlib::SetColor(nscolor aColor)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
mCurrentColor = aColor;
|
||||
xlib_rgb_gc_set_foreground(mSurface->GetGC(), NS_RGB(NS_GET_B(aColor),
|
||||
xlib_rgb_gc_set_foreground(mRenderingSurface->GetGC(), NS_RGB(NS_GET_B(aColor),
|
||||
NS_GET_G(aColor),
|
||||
NS_GET_R(aColor)));
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("Setting color to %d %d %d\n", NS_GET_R(aColor), NS_GET_G(aColor), NS_GET_B(aColor)));
|
||||
@ -638,7 +621,7 @@ nsRenderingContextXlib::SetFont(nsIFontMetrics *aFontMetrics)
|
||||
nsFontHandle fontHandle;
|
||||
mFontMetrics->GetFontHandle(fontHandle);
|
||||
mCurrentFont = (XFontStruct *)fontHandle;
|
||||
XSetFont(mDisplay, mSurface->GetGC(), mCurrentFont->fid);
|
||||
XSetFont(mDisplay, mRenderingSurface->GetGC(), mCurrentFont->fid);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -680,36 +663,26 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::CreateDrawingSurface(nsRect *aBounds, PRUint32 aSurfFlags, nsDrawingSurface &aSurface)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::CreateDrawingSurface()\n"));
|
||||
if (nsnull == mSurface) {
|
||||
if (nsnull == mRenderingSurface) {
|
||||
aSurface = nsnull;
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
nsDrawingSurfaceXlib *surf = new nsDrawingSurfaceXlib();
|
||||
|
||||
if (surf)
|
||||
{
|
||||
if (surf) {
|
||||
NS_ADDREF(surf);
|
||||
|
||||
PRUint32 width = 0;
|
||||
PRUint32 height = 0;
|
||||
|
||||
if (nsnull != aBounds)
|
||||
{
|
||||
width = aBounds->width;
|
||||
height = aBounds->height;
|
||||
}
|
||||
|
||||
surf->Init(mDisplay,
|
||||
mScreen,
|
||||
mVisual,
|
||||
mDepth,
|
||||
mSurface->GetGC(),
|
||||
width,
|
||||
height,
|
||||
mRenderingSurface->GetGC(),
|
||||
aBounds->width,
|
||||
aBounds->height,
|
||||
aSurfFlags);
|
||||
}
|
||||
|
||||
|
||||
aSurface = (nsDrawingSurface)surf;
|
||||
|
||||
return NS_OK;
|
||||
@ -719,28 +692,9 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DestroyDrawingSurface(nsDrawingSurface aDS)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DestroyDrawingSurface()\n"));
|
||||
|
||||
nsDrawingSurfaceXlib *surf = (nsDrawingSurfaceXlib *) aDS;
|
||||
|
||||
NS_ASSERTION(nsnull != surf, "Trying to destroy a null surface");
|
||||
|
||||
if (nsnull == surf)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
// Are we using the surface that we want to kill?
|
||||
if (surf == mSurface)
|
||||
{
|
||||
// Remove our local ref to the surface
|
||||
NS_IF_RELEASE(mSurface);
|
||||
|
||||
// Stop using the drawing surface.
|
||||
mSurface = nsnull;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Release a drawing surface we are currently not using.
|
||||
NS_IF_RELEASE(surf);
|
||||
}
|
||||
NS_IF_RELEASE(surf);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -749,14 +703,14 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawLine()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface)
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
mTMatrix->TransformCoord(&aX0,&aY0);
|
||||
mTMatrix->TransformCoord(&aX1,&aY1);
|
||||
|
||||
::XDrawLine(mDisplay, mSurface->GetDrawable(),
|
||||
mSurface->GetGC(), aX0, aY0, aX1, aY1);
|
||||
::XDrawLine(mDisplay, mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(), aX0, aY0, aX1, aY1);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -775,7 +729,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawPolyLine()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
PRInt32 i ;
|
||||
@ -792,8 +746,8 @@ nsRenderingContextXlib::DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints
|
||||
}
|
||||
|
||||
::XDrawLines(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
xpoints, aNumPoints, CoordModeOrigin);
|
||||
|
||||
PR_Free((void *)xpoints);
|
||||
@ -812,7 +766,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawRect()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
@ -830,8 +784,8 @@ nsRenderingContextXlib::DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
if (w && h)
|
||||
{
|
||||
::XDrawRectangle(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,
|
||||
y,
|
||||
w - 1,
|
||||
@ -852,7 +806,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::FillRect()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nscoord x,y,w,h;
|
||||
@ -863,10 +817,10 @@ nsRenderingContextXlib::FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
|
||||
mTMatrix->TransformCoord(&x,&y,&w,&h);
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("About to fill window 0x%lxd with rect %d %d %d %d\n",
|
||||
mSurface->GetDrawable(), x, y, w, h));
|
||||
mRenderingSurface->GetDrawable(), x, y, w, h));
|
||||
::XFillRectangle(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,y,w,h);
|
||||
|
||||
return NS_OK;
|
||||
@ -881,7 +835,7 @@ nsRenderingContextXlib :: InvertRect(const nsRect& aRect)
|
||||
NS_IMETHODIMP
|
||||
nsRenderingContextXlib :: InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
if (nsnull == mTMatrix || nsnull == mSurface)
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nscoord x,y,w,h;
|
||||
@ -895,12 +849,12 @@ nsRenderingContextXlib :: InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nsc
|
||||
|
||||
// Set XOR drawing mode
|
||||
::XSetFunction(mDisplay,
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetGC(),
|
||||
GXxor);
|
||||
|
||||
::XFillRectangle(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,
|
||||
y,
|
||||
w,
|
||||
@ -908,7 +862,7 @@ nsRenderingContextXlib :: InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nsc
|
||||
|
||||
// Back to normal copy drawing mode
|
||||
::XSetFunction(mDisplay,
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetGC(),
|
||||
GXcopy);
|
||||
|
||||
return NS_OK;
|
||||
@ -918,7 +872,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawPolygon()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
PRInt32 i ;
|
||||
@ -935,8 +889,8 @@ nsRenderingContextXlib::DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints)
|
||||
}
|
||||
|
||||
::XDrawLines(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
xpoints, aNumPoints, CoordModeOrigin);
|
||||
|
||||
PR_Free((void *)xpoints);
|
||||
@ -948,7 +902,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::FillPolygon()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
PRInt32 i ;
|
||||
@ -968,8 +922,8 @@ nsRenderingContextXlib::FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints)
|
||||
}
|
||||
|
||||
::XFillPolygon(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
xpoints, aNumPoints, Convex, CoordModeOrigin);
|
||||
|
||||
PR_Free((void *)xpoints);
|
||||
@ -988,7 +942,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawEllipse()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nscoord x,y,w,h;
|
||||
@ -1001,8 +955,8 @@ nsRenderingContextXlib::DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nsco
|
||||
mTMatrix->TransformCoord(&x,&y,&w,&h);
|
||||
|
||||
::XDrawArc(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,y,w,h, 0, 360 * 64);
|
||||
|
||||
return NS_OK;
|
||||
@ -1019,7 +973,7 @@ NS_IMETHODIMP
|
||||
nsRenderingContextXlib::FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::FillEllipse()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nscoord x,y,w,h;
|
||||
@ -1032,8 +986,8 @@ nsRenderingContextXlib::FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nsco
|
||||
mTMatrix->TransformCoord(&x,&y,&w,&h);
|
||||
|
||||
::XFillArc(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,y,w,h, 0, 360 * 64);
|
||||
|
||||
return NS_OK;
|
||||
@ -1052,7 +1006,7 @@ nsRenderingContextXlib::DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
float aStartAngle, float aEndAngle)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::DrawArc()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nscoord x,y,w,h;
|
||||
@ -1065,8 +1019,8 @@ nsRenderingContextXlib::DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
mTMatrix->TransformCoord(&x,&y,&w,&h);
|
||||
|
||||
::XDrawArc(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,y,w,h, NSToIntRound(aStartAngle * 64.0f),
|
||||
NSToIntRound(aEndAngle * 64.0f));
|
||||
|
||||
@ -1086,7 +1040,7 @@ nsRenderingContextXlib::FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
float aStartAngle, float aEndAngle)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::FillArc()\n"));
|
||||
if (nsnull == mTMatrix || nsnull == mSurface) {
|
||||
if (nsnull == mTMatrix || nsnull == mRenderingSurface) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nscoord x,y,w,h;
|
||||
@ -1099,8 +1053,8 @@ nsRenderingContextXlib::FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord
|
||||
mTMatrix->TransformCoord(&x,&y,&w,&h);
|
||||
|
||||
::XFillArc(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x,y,w,h, NSToIntRound(aStartAngle * 64.0f),
|
||||
NSToIntRound(aEndAngle * 64.0f));
|
||||
|
||||
@ -1223,7 +1177,7 @@ nsRenderingContextXlib::DrawString(const char *aString, PRUint32 aLength,
|
||||
if (0 != aLength) {
|
||||
if (mTMatrix == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (mSurface == nsnull)
|
||||
if (mRenderingSurface == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (aString == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
@ -1246,8 +1200,8 @@ nsRenderingContextXlib::DrawString(const char *aString, PRUint32 aLength,
|
||||
nscoord yy = y;
|
||||
mTMatrix->TransformCoord(&xx, &yy);
|
||||
XDrawString(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
xx, yy, &ch, 1);
|
||||
x += *aSpacing++;
|
||||
}
|
||||
@ -1255,8 +1209,8 @@ nsRenderingContextXlib::DrawString(const char *aString, PRUint32 aLength,
|
||||
else {
|
||||
mTMatrix->TransformCoord(&x, &y);
|
||||
XDrawString(mDisplay,
|
||||
mSurface->GetDrawable(),
|
||||
mSurface->GetGC(),
|
||||
mRenderingSurface->GetDrawable(),
|
||||
mRenderingSurface->GetGC(),
|
||||
x, y, aString, aLength);
|
||||
}
|
||||
}
|
||||
@ -1309,7 +1263,7 @@ nsRenderingContextXlib::DrawString(const PRUnichar *aString, PRUint32 aLength,
|
||||
if (aLength && mFontMetrics) {
|
||||
if (mTMatrix == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (mSurface == nsnull)
|
||||
if (mRenderingSurface == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (aString == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
@ -1352,13 +1306,13 @@ FoundFont:
|
||||
x = aX;
|
||||
y = aY;
|
||||
mTMatrix->TransformCoord(&x, &y);
|
||||
nsFontMetricsXlib::DrawString(mSurface, prevFont, x, y, str, 1);
|
||||
nsFontMetricsXlib::DrawString(mRenderingSurface, prevFont, x, y, str, 1);
|
||||
aX += *aSpacing++;
|
||||
str++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
nsFontMetricsXlib::DrawString(mSurface, prevFont, x, y,
|
||||
nsFontMetricsXlib::DrawString(mRenderingSurface, prevFont, x, y,
|
||||
&aString[start], i - start);
|
||||
x += nsFontMetricsXlib::GetWidth(prevFont, &aString[start],
|
||||
i - start);
|
||||
@ -1381,13 +1335,13 @@ FoundFont:
|
||||
x = aX;
|
||||
y = aY;
|
||||
mTMatrix->TransformCoord(&x, &y);
|
||||
nsFontMetricsXlib::DrawString(mSurface, prevFont, x, y, str, 1);
|
||||
nsFontMetricsXlib::DrawString(mRenderingSurface, prevFont, x, y, str, 1);
|
||||
aX += *aSpacing++;
|
||||
str++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
nsFontMetricsXlib::DrawString(mSurface, prevFont, x, y, &aString[start],
|
||||
nsFontMetricsXlib::DrawString(mRenderingSurface, prevFont, x, y, &aString[start],
|
||||
i - start);
|
||||
}
|
||||
}
|
||||
@ -1441,7 +1395,7 @@ nsRenderingContextXlib::DrawImage(nsIImage *aImage, const nsRect& aRect)
|
||||
nsRect tr;
|
||||
tr = aRect;
|
||||
mTMatrix->TransformCoord(&tr.x, &tr.y, &tr.width, &tr.height);
|
||||
return aImage->Draw(*this, mSurface, tr.x, tr.y, tr.width, tr.height);
|
||||
return aImage->Draw(*this, mRenderingSurface, tr.x, tr.y, tr.width, tr.height);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@ -1458,7 +1412,7 @@ nsRenderingContextXlib::DrawImage(nsIImage *aImage, const nsRect& aSRect, const
|
||||
mTMatrix->TransformCoord(&dr.x, &dr.y,
|
||||
&dr.width, &dr.height);
|
||||
|
||||
return aImage->Draw(*this, mSurface,
|
||||
return aImage->Draw(*this, mRenderingSurface,
|
||||
sr.x, sr.y,
|
||||
sr.width, sr.height,
|
||||
dr.x, dr.y,
|
||||
@ -1467,11 +1421,8 @@ nsRenderingContextXlib::DrawImage(nsIImage *aImage, const nsRect& aSRect, const
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRenderingContextXlib::CopyOffScreenBits(nsDrawingSurface aSrcSurf,
|
||||
PRInt32 aSrcX,
|
||||
PRInt32 aSrcY,
|
||||
const nsRect &aDestBounds,
|
||||
PRUint32 aCopyFlags)
|
||||
nsRenderingContextXlib::CopyOffScreenBits(nsDrawingSurface aSrcSurf, PRInt32 aSrcX, PRInt32 aSrcY,
|
||||
const nsRect &aDestBounds, PRUint32 aCopyFlags)
|
||||
{
|
||||
PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::CopyOffScreenBits()\n"));
|
||||
PRInt32 srcX = aSrcX;
|
||||
@ -1479,20 +1430,19 @@ nsRenderingContextXlib::CopyOffScreenBits(nsDrawingSurface aSrcSurf,
|
||||
nsRect drect = aDestBounds;
|
||||
nsDrawingSurfaceXlib *destsurf;
|
||||
|
||||
NS_ASSERTION(nsnull != aSrcSurf, "Trying to blit from a null surface");
|
||||
NS_ASSERTION(nsnull != mSurface, "Trying to blit to a null surface");
|
||||
NS_ASSERTION(nsnull != mTMatrix, "null transformation matrix");
|
||||
if (aSrcSurf == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (mTMatrix == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (mRenderingSurface == nsnull)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (nsnull == aSrcSurf)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
if (nsnull == mSurface)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
if (nsnull == mTMatrix)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
destsurf = mSurface;
|
||||
if (aCopyFlags & NS_COPYBITS_TO_BACK_BUFFER) {
|
||||
NS_ASSERTION(!(nsnull == mRenderingSurface), "no back buffer");
|
||||
destsurf = mRenderingSurface;
|
||||
}
|
||||
else
|
||||
destsurf = mOffscreenSurface;
|
||||
|
||||
if (aCopyFlags & NS_COPYBITS_XFORM_SOURCE_VALUES)
|
||||
mTMatrix->TransformCoord(&srcX, &srcY);
|
||||
@ -1507,12 +1457,9 @@ nsRenderingContextXlib::CopyOffScreenBits(nsDrawingSurface aSrcSurf,
|
||||
((nsDrawingSurfaceXlib *)aSrcSurf)->GetDrawable(),
|
||||
destsurf->GetDrawable(),
|
||||
((nsDrawingSurfaceXlib *)aSrcSurf)->GetGC(),
|
||||
srcX,
|
||||
srcY,
|
||||
drect.width,
|
||||
drect.height,
|
||||
drect.x,
|
||||
drect.y);
|
||||
srcX, srcY,
|
||||
drect.width, drect.height,
|
||||
drect.x, drect.y);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -168,7 +168,8 @@ class nsRenderingContextXlib : public nsIRenderingContext,
|
||||
nsresult CommonInit(void);
|
||||
|
||||
private:
|
||||
nsDrawingSurfaceXlib *mSurface;
|
||||
nsDrawingSurfaceXlib *mOffscreenSurface;
|
||||
nsDrawingSurfaceXlib *mRenderingSurface;
|
||||
nsIDeviceContext *mContext;
|
||||
nsIFontMetrics *mFontMetrics;
|
||||
nsRegionXlib *mClipRegion;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user