зеркало из https://github.com/mozilla/gecko-dev.git
Photon Build only
Changes to support new gfx2 and image libs. Bug fixes for drawing speed and code cleanup
This commit is contained in:
briane%qnx.com
Родитель
7d7a76ec0e
Коммит
931cd027ba
|
|
@ -25,24 +25,16 @@
|
|||
|
||||
#include "nsPhGfxLog.h"
|
||||
|
||||
nsScreenManagerPh :: nsScreenManagerPh ( )
|
||||
{
|
||||
nsScreenManagerPh :: nsScreenManagerPh( ) {
|
||||
NS_INIT_REFCNT();
|
||||
|
||||
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsScreenManagerPh::nsScreenManagerPh Constructor called this=<%p>\n", this));
|
||||
|
||||
// nothing else to do. I guess we could cache a bunch of information
|
||||
// here, but we want to ask the device at runtime in case anything
|
||||
// has changed.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
nsScreenManagerPh :: ~nsScreenManagerPh()
|
||||
{
|
||||
// nothing to see here.
|
||||
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsScreenManagerPh::~nsScreenManagerPh Destructor called this=<%p>\n", this));
|
||||
|
||||
}
|
||||
nsScreenManagerPh :: ~nsScreenManagerPh( ) {
|
||||
}
|
||||
|
||||
|
||||
// addref, release, QI
|
||||
|
|
@ -57,17 +49,12 @@ NS_IMPL_ISUPPORTS(nsScreenManagerPh, NS_GET_IID(nsIScreenManager))
|
|||
// NOTE: For this "single-monitor" impl, we just always return the cached primary
|
||||
// screen. This should change when a multi-monitor impl is done.
|
||||
//
|
||||
nsIScreen*
|
||||
nsScreenManagerPh :: CreateNewScreenObject ( )
|
||||
{
|
||||
nsIScreen* nsScreenManagerPh :: CreateNewScreenObject( ) {
|
||||
nsIScreen* retval = nsnull;
|
||||
if ( !mCachedMainScreen )
|
||||
mCachedMainScreen = new nsScreenPh ( );
|
||||
if( !mCachedMainScreen ) mCachedMainScreen = new nsScreenPh( );
|
||||
NS_IF_ADDREF(retval = mCachedMainScreen.get());
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// ScreenForRect
|
||||
|
|
@ -77,15 +64,10 @@ nsScreenManagerPh :: CreateNewScreenObject ( )
|
|||
//
|
||||
// The coordinates are in pixels (not twips) and in screen coordinates.
|
||||
//
|
||||
NS_IMETHODIMP
|
||||
nsScreenManagerPh :: ScreenForRect ( PRInt32 /*inLeft*/, PRInt32 /*inTop*/, PRInt32 /*inWidth*/,
|
||||
PRInt32 /*inHeight*/, nsIScreen **outScreen )
|
||||
{
|
||||
GetPrimaryScreen ( outScreen );
|
||||
NS_IMETHODIMP nsScreenManagerPh :: ScreenForRect ( PRInt32 /*inLeft*/, PRInt32 /*inTop*/, PRInt32 /*inWidth*/, PRInt32 /*inHeight*/, nsIScreen **outScreen ) {
|
||||
GetPrimaryScreen( outScreen );
|
||||
return NS_OK;
|
||||
|
||||
} // ScreenForRect
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// GetPrimaryScreen
|
||||
|
|
@ -93,25 +75,18 @@ nsScreenManagerPh :: ScreenForRect ( PRInt32 /*inLeft*/, PRInt32 /*inTop*/, PRIn
|
|||
// The screen with the menubar/taskbar. This shouldn't be needed very
|
||||
// often.
|
||||
//
|
||||
NS_IMETHODIMP
|
||||
nsScreenManagerPh :: GetPrimaryScreen(nsIScreen * *aPrimaryScreen)
|
||||
{
|
||||
NS_IMETHODIMP nsScreenManagerPh :: GetPrimaryScreen( nsIScreen * *aPrimaryScreen ) {
|
||||
*aPrimaryScreen = CreateNewScreenObject(); // addrefs
|
||||
return NS_OK;
|
||||
|
||||
} // GetPrimaryScreen
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// GetNumberOfScreens
|
||||
//
|
||||
// Returns how many physical screens are available.
|
||||
//
|
||||
NS_IMETHODIMP
|
||||
nsScreenManagerPh :: GetNumberOfScreens(PRUint32 *aNumberOfScreens)
|
||||
{
|
||||
NS_IMETHODIMP nsScreenManagerPh :: GetNumberOfScreens( PRUint32 *aNumberOfScreens ) {
|
||||
*aNumberOfScreens = 1;
|
||||
return NS_OK;
|
||||
|
||||
} // GetNumberOfScreens
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,168 +25,64 @@
|
|||
#include <Pt.h>
|
||||
#include "nsPhGfxLog.h"
|
||||
|
||||
nsScreenPh :: nsScreenPh ( )
|
||||
{
|
||||
nsScreenPh :: nsScreenPh ( ) {
|
||||
nsresult res = NS_ERROR_FAILURE;
|
||||
PhSysInfo_t SysInfo;
|
||||
PhRect_t rect;
|
||||
char *p = NULL;
|
||||
int inp_grp = 0;
|
||||
int inp_grp;
|
||||
PhRid_t rid;
|
||||
PhRegion_t region;
|
||||
|
||||
NS_INIT_REFCNT();
|
||||
|
||||
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsScreenPh::nsScreenPh Constructor called this=<%p>\n", this));
|
||||
/* Initialize the data members */
|
||||
/* Get the Screen Size and Depth*/
|
||||
p = getenv("PHIG");
|
||||
if( p ) inp_grp = atoi(p);
|
||||
else inp_grp = 1;
|
||||
|
||||
PhQueryRids( 0, 0, inp_grp, Ph_INPUTGROUP_REGION, 0, 0, 0, &rid, 1 );
|
||||
PhRegionQuery( rid, ®ion, &rect, NULL, 0 );
|
||||
inp_grp = region.input_group;
|
||||
PhWindowQueryVisible( Ph_QUERY_INPUT_GROUP | Ph_QUERY_EXACT, 0, inp_grp, &rect );
|
||||
mWidth = rect.lr.x - rect.ul.x + 1;
|
||||
mHeight = rect.lr.y - rect.ul.y + 1;
|
||||
|
||||
// nothing else to do. I guess we could cache a bunch of information
|
||||
// here, but we want to ask the device at runtime in case anything
|
||||
// has changed.
|
||||
|
||||
/* Initialize the data members */
|
||||
/* Get the Screen Size and Depth*/
|
||||
p = getenv("PHIG");
|
||||
if (p)
|
||||
{
|
||||
inp_grp = atoi(p);
|
||||
|
||||
PhQueryRids( 0, 0, inp_grp, Ph_INPUTGROUP_REGION, 0, 0, 0, &rid, 1 );
|
||||
PhRegionQuery( rid, ®ion, &rect, NULL, 0 );
|
||||
inp_grp = region.input_group;
|
||||
PhWindowQueryVisible( Ph_QUERY_INPUT_GROUP | Ph_QUERY_EXACT, 0, inp_grp, &rect );
|
||||
mWidth = rect.lr.x - rect.ul.x + 1;
|
||||
mHeight = rect.lr.y - rect.ul.y + 1;
|
||||
|
||||
/* Get the System Info for the RID */
|
||||
if (!PhQuerySystemInfo(rid, NULL, &SysInfo))
|
||||
{
|
||||
PR_LOG(PhGfxLog, PR_LOG_ERROR,("nsScreenPh::nsScreenPh with aWidget: Error getting SystemInfo\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Make sure the "color_bits" field is valid */
|
||||
if (SysInfo.gfx.valid_fields & Ph_GFX_COLOR_BITS)
|
||||
{
|
||||
mPixelDepth = SysInfo.gfx.color_bits;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("nsScreenPh::nsScreenPh The PHIG environment variable must be set, try setting it to 1\n");
|
||||
}
|
||||
}
|
||||
|
||||
nsScreenPh :: ~nsScreenPh()
|
||||
{
|
||||
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsScreenPh::~nsScreenPh Destructor called this=<%p>\n", this));
|
||||
|
||||
// nothing to see here.
|
||||
}
|
||||
/* Get the System Info for the RID */
|
||||
if( PhQuerySystemInfo(rid, NULL, &SysInfo ) ) {
|
||||
/* Make sure the "color_bits" field is valid */
|
||||
if( SysInfo.gfx.valid_fields & Ph_GFX_COLOR_BITS ) mPixelDepth = SysInfo.gfx.color_bits;
|
||||
}
|
||||
}
|
||||
|
||||
nsScreenPh :: ~nsScreenPh( ) { }
|
||||
|
||||
// addref, release, QI
|
||||
NS_IMPL_ISUPPORTS(nsScreenPh, NS_GET_IID(nsIScreen))
|
||||
|
||||
#if 0
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetWidth(PRInt32 *aWidth)
|
||||
{
|
||||
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsScreenPh::GetWidth Constructor called this=<%p>\n", this));
|
||||
|
||||
*aWidth = mWidth;
|
||||
return NS_OK;
|
||||
|
||||
} // GetWidth
|
||||
NS_IMETHODIMP nsScreenPh :: GetPixelDepth( PRInt32 *aPixelDepth ) {
|
||||
*aPixelDepth = mPixelDepth;
|
||||
return NS_OK;
|
||||
} // GetPixelDepth
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetHeight(PRInt32 *aHeight)
|
||||
{
|
||||
*aHeight = mHeight;
|
||||
return NS_OK;
|
||||
|
||||
} // GetHeight
|
||||
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetPixelDepth(PRInt32 *aPixelDepth)
|
||||
{
|
||||
*aPixelDepth = mPixelDepth;
|
||||
return NS_OK;
|
||||
|
||||
} // GetPixelDepth
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetColorDepth(PRInt32 *aColorDepth)
|
||||
{
|
||||
NS_IMETHODIMP nsScreenPh :: GetColorDepth( PRInt32 *aColorDepth ) {
|
||||
return GetPixelDepth ( aColorDepth );
|
||||
}
|
||||
|
||||
} // GetColorDepth
|
||||
|
||||
|
||||
#if 0
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetAvailWidth(PRInt32 *aAvailWidth)
|
||||
{
|
||||
return GetWidth(aAvailWidth);
|
||||
|
||||
} // GetAvailWidth
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetAvailHeight(PRInt32 *aAvailHeight)
|
||||
{
|
||||
return GetHeight(aAvailHeight);
|
||||
|
||||
} // GetAvailHeight
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetAvailLeft(PRInt32 *aAvailLeft)
|
||||
{
|
||||
*aAvailLeft = 0;
|
||||
return NS_OK;
|
||||
|
||||
} // GetAvailLeft
|
||||
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetAvailTop(PRInt32 *aAvailTop)
|
||||
{
|
||||
*aAvailTop = 0;
|
||||
return NS_OK;
|
||||
|
||||
} // GetAvailTop
|
||||
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetRect(PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight)
|
||||
{
|
||||
NS_IMETHODIMP nsScreenPh :: GetRect( PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight ) {
|
||||
*outTop = 0;
|
||||
*outLeft = 0;
|
||||
*outWidth = mWidth;
|
||||
*outHeight = mHeight;
|
||||
|
||||
return NS_OK;
|
||||
|
||||
} // GetRect
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsScreenPh :: GetAvailRect(PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight)
|
||||
{
|
||||
NS_IMETHODIMP nsScreenPh :: GetAvailRect( PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight ) {
|
||||
*outTop = 0;
|
||||
*outLeft = 0;
|
||||
*outWidth = mWidth;
|
||||
*outHeight = mHeight;
|
||||
|
||||
return NS_OK;
|
||||
|
||||
} // GetAvailRect
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче