make sure that globals are defined here for display properties. also, make sure that the gfx module for xlib is linked explicitly with the xlib libraries so that the tests link
git-svn-id: svn://10.0.0.236/trunk@33129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
d528aba0b3
commit
33764d7917
@ -33,6 +33,7 @@ REQUIRES=util img xpcom raptor netlib ps
|
||||
DEFINES += -D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS)
|
||||
|
||||
CPPSRCS = nsFontMetricsXlib.cpp \
|
||||
nsDeviceContextXlib.cpp \
|
||||
|
||||
@ -43,6 +43,31 @@ static NS_DEFINE_IID(kCDrawingSurface, NS_DRAWING_SURFACE_CID);
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
||||
|
||||
Display *gDisplay;
|
||||
Screen *gScreen;
|
||||
int gScreenNum;
|
||||
int gDepth;
|
||||
Visual *gVisual;
|
||||
XVisualInfo *gVisualInfo;
|
||||
|
||||
PRUint32 gRedZeroMask; //red color mask in zero position
|
||||
PRUint32 gGreenZeroMask; //green color mask in zero position
|
||||
PRUint32 gBlueZeroMask; //blue color mask in zero position
|
||||
PRUint32 gAlphaZeroMask; //alpha data mask in zero position
|
||||
PRUint32 gRedMask; //red color mask
|
||||
PRUint32 gGreenMask; //green color mask
|
||||
PRUint32 gBlueMask; //blue color mask
|
||||
PRUint32 gAlphaMask; //alpha data mask
|
||||
PRUint8 gRedCount; //number of red color bits
|
||||
PRUint8 gGreenCount; //number of green color bits
|
||||
PRUint8 gBlueCount; //number of blue color bits
|
||||
PRUint8 gAlphaCount; //number of alpha data bits
|
||||
PRUint8 gRedShift; //number to shift value into red position
|
||||
PRUint8 gGreenShift; //number to shift value into green position
|
||||
PRUint8 gBlueShift; //number to shift value into blue position
|
||||
PRUint8 gAlphaShift; //number to shift value into alpha position
|
||||
|
||||
|
||||
class nsGfxFactoryXlib : public nsIFactory
|
||||
{
|
||||
public:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user