Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compute TWIPS during Init() of DeviceContext rather than waiting

Browse Source 
until the RenderingContext is created.


git-svn-id: svn://10.0.0.236/trunk@3639 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
spider
1998-06-11 00:32:29 +00:00
parent 0d87d412e5
commit 698e0cb1a0
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/gfx/src/motif/nsDeviceContextUnix.cpp
View File

@@ -70,6 +70,24 @@ nsresult nsDeviceContextUnix :: Init()
for (PRInt32 cnt = 0; cnt < 256; cnt++)
mGammaTable[cnt] = cnt;
// XXX We really need to have Display passed to us since it could be specified
// not from the environment, which is the one we use here.
Display * display = ::XOpenDisplay(nsnull);
if (display) {
mTwipsToPixels = (((float)::XDisplayWidth(display, DefaultScreen(display))) /
((float)::XDisplayWidthMM(display,DefaultScreen(display) )) * 25.4) /
NS_POINTS_TO_TWIPS_FLOAT(72.0f);
mPixelsToTwips = 1.0f / mTwipsToPixels;
::XCloseDisplay(display);
}
return NS_OK;
}
@@ -143,14 +161,6 @@ nsIRenderingContext * nsDeviceContextUnix :: CreateRenderingContext(nsIView *aVi
void nsDeviceContextUnix :: InitRenderingContext(nsIRenderingContext *aContext, nsIWidget *aWin)
{
aContext->Init(this, aWin);
mTwipsToPixels = (((float)::XDisplayWidth(mSurface->display, DefaultScreen(mSurface->display))) /
((float)::XDisplayWidthMM(mSurface->display,DefaultScreen(mSurface->display) )) * 25.4) /
NS_POINTS_TO_TWIPS_FLOAT(72.0f);
mPixelsToTwips = 1.0f / mTwipsToPixels;
//InstallColormap();
}
PRUint32 nsDeviceContextUnix :: ConvertPixel(nscolor aColor)