move ATSUI entangled-code into its specific sub-directory

This is prep work to make room for a CoreText-based implementation

8 files changed, 455 insertions, 423 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index cf09be5a7c7e..f98ca9835c51 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -324,9 +324,26 @@ $(eval $(call gb_Library_use_packages,vcl,\
 # GUIBASE specific stuff
 
 ifeq ($(GUIBASE),aqua)
+
 $(eval $(call gb_Library_add_cxxflags,vcl,\
     $(gb_OBJCXXFLAGS) \
 ))
+
+ifeq ($(ENABLE_CORETEXT),YES)
+
+$(eval $(call gb_Library_add_defs,vcl,\
+    -DENABLE_CORETEXT \
+))
+
+else # ATSUI
+
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/aqua/source/gdi/atsui/salatslayout \
+    vcl/aqua/source/gdi/atsui/salatsuifontutils \
+    vcl/aqua/source/gdi/atsui/salgdi \
+))
+endif
+
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/aqua/source/a11y/aqua11yactionwrapper \
     vcl/aqua/source/a11y/aqua11ycomponentwrapper \
@@ -380,11 +397,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/aqua/source/dtrans/PictToBmpFlt \
     vcl/aqua/source/dtrans/aqua_clipboard \
     vcl/aqua/source/dtrans/service_entry \
-    vcl/aqua/source/gdi/salatslayout \
-    vcl/aqua/source/gdi/salatsuifontutils \
     vcl/aqua/source/gdi/salbmp \
     vcl/aqua/source/gdi/salcolorutils \
-    vcl/aqua/source/gdi/salgdi \
     vcl/aqua/source/gdi/salgdiutils \
     vcl/aqua/source/gdi/salmathutils \
     vcl/aqua/source/gdi/salnativewidgets \
@@ -403,6 +417,10 @@ $(eval $(call gb_Library_use_externals,vcl,\
     carbon \
     corefoundation \
 ))
+
+$(eval $(call gb_Library_use_libraries,vcl,\
+    AppleRemote \
+))
 endif
 
 vcl_generic_code=\
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 73182ede97fc..093b29634cfd 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -29,8 +29,8 @@
 #include "tools/debug.hxx"
 
 #include "aqua/saldata.hxx"
-#include "aqua/salgdi.h"
-#include "aqua/salatsuifontutils.hxx"
+#include "aqua/atsui/salgdi.h"
+#include "aqua/atsui/salatsuifontutils.hxx"
 
 #include "sallayout.hxx"
 #include "salgdi.hxx"
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 1a52f1071939..c56ac0d901ee 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -33,9 +33,9 @@
 
 #include "vcl/svapp.hxx"
 
-#include "aqua/salgdi.h"
+#include "aqua/atsui/salgdi.h"
 #include "aqua/saldata.hxx"
-#include "aqua/salatsuifontutils.hxx"
+#include "aqua/atsui/salatsuifontutils.hxx"
 
 // ATSUI is deprecated in 10.6 (or already 10.5?)
 #if defined LIBO_WERROR && defined __GNUC__
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 05c970d7d06d..7fdd19fd362b 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -45,11 +45,11 @@
 #include "vcl/svapp.hxx"
 
 #include "aqua/salconst.h"
-#include "aqua/salgdi.h"
+#include "aqua/atsui/salgdi.h"
 #include "aqua/salbmp.h"
 #include "aqua/salframe.h"
 #include "aqua/salcolorutils.hxx"
-#include "aqua/salatsuifontutils.hxx"
+#include "aqua/atsui/salatsuifontutils.hxx"
 
 #include "fontsubset.hxx"
 #include "impfont.hxx"
diff --git a/vcl/inc/aqua/salatsuifontutils.hxx b/vcl/inc/aqua/atsui/salatsuifontutils.hxx
index 51079b8ec5d2..51079b8ec5d2 100644
--- a/vcl/inc/aqua/salatsuifontutils.hxx
+++ b/vcl/inc/aqua/atsui/salatsuifontutils.hxx
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
new file mode 100644
index 000000000000..0788095f798c
--- /dev/null
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -0,0 +1,416 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SV_SALGDI_H
+#define _SV_SALGDI_H
+
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+
+#include "premac.h"
+#include <ApplicationServices/ApplicationServices.h>
+#include "postmac.h"
+
+#include "aqua/aquavcltypes.h"
+#include <vcl/fontcapabilities.hxx>
+
+#include "outfont.hxx"
+#include "salgdi.hxx"
+
+#include <vector>
+
+class AquaSalFrame;
+class AquaSalBitmap;
+class ImplDevFontAttributes;
+
+struct CGRect;
+
+// mac specific physically available font face
+class ImplMacFontData : public PhysicalFontFace
+{
+public:
+    ImplMacFontData( const ImplDevFontAttributes&, ATSUFontID );
+
+    virtual ~ImplMacFontData();
+
+    virtual PhysicalFontFace*   Clone() const;
+    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const;
+    virtual sal_IntPtr      GetFontId() const;
+
+    const ImplFontCharMap*  GetImplFontCharMap() const;
+    bool                    GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
+    bool                    HasChar( sal_uInt32 cChar ) const;
+
+    void                    ReadOs2Table() const;
+    void                    ReadMacCmapEncoding() const;
+    bool                    HasCJKSupport() const;
+
+private:
+    const ATSUFontID            mnFontId;
+    mutable const ImplFontCharMap*  mpCharMap;
+    mutable vcl::FontCapabilities maFontCapabilities;
+    mutable bool                mbOs2Read;       // true if OS2-table related info is valid
+    mutable bool                mbHasOs2Table;
+    mutable bool                mbCmapEncodingRead; // true if cmap encoding of Mac font is read
+    mutable bool                mbHasCJKSupport; // #i78970# CJK fonts need extra leading
+    mutable bool                mbFontCapabilitiesRead;
+};
+
+// abstracting quartz color instead of having to use an CGFloat[] array
+class RGBAColor
+{
+public:
+    RGBAColor( SalColor );
+    RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha ); //NOTUSEDYET
+    const float* AsArray() const    { return &mfRed; }
+    bool IsVisible() const          { return (mfAlpha > 0); }
+    void SetAlpha( float fAlpha )   { mfAlpha = fAlpha; }
+private:
+    float mfRed, mfGreen, mfBlue, mfAlpha;
+};
+
+// -------------------
+// - AquaSalGraphics -
+// -------------------
+class AquaSalGraphics : public SalGraphics
+{
+    friend class ATSLayout;
+protected:
+    AquaSalFrame*                           mpFrame;
+    CGLayerRef                              mxLayer;    // Quartz graphics layer
+    CGContextRef                            mrContext;  // Quartz drawing context
+    class XorEmulation*                     mpXorEmulation;
+    int                                     mnXorMode; // 0: off 1: on 2: invert only
+    int                                     mnWidth;
+    int                                     mnHeight;
+    int                                     mnBitmapDepth;  // zero unless bitmap
+    /// device resolution of this graphics
+    long                                    mnRealDPIX;
+    long                                    mnRealDPIY;
+    /// some graphics implementations (e.g. AquaSalInfoPrinter) scale
+    /// everything down by a factor (see SetupPrinterGraphics for details)
+    /// so we have to compensate for it with the inverse factor
+    double                                  mfFakeDPIScale;
+
+    /// path representing current clip region
+    CGMutablePathRef                        mxClipPath;
+
+    /// Drawing colors
+    /// pen color RGBA
+    RGBAColor                               maLineColor;
+    /// brush color RGBA
+    RGBAColor                               maFillColor;
+
+    // Device Font settings
+     const ImplMacFontData*                  mpMacFontData;
+    /// ATSU style object which carries all font attributes
+    ATSUStyle                               maATSUStyle;
+    /// text rotation as ATSU angle
+    Fixed                                   mnATSUIRotation;
+    /// workaround to prevent ATSU overflows for huge font sizes
+    float                                   mfFontScale;
+    /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
+    float                                   mfFontStretch;
+    /// allows text to be rendered without antialiasing
+    bool                                    mbNonAntialiasedText;
+
+    // Graphics types
+
+    /// is this a printer graphics
+    bool                                    mbPrinter;
+    /// is this a virtual device graphics
+    bool                                    mbVirDev;
+    /// is this a window graphics
+    bool                                    mbWindow;
+
+public:
+    AquaSalGraphics();
+    virtual ~AquaSalGraphics();
+
+    bool                IsPenVisible() const    { return maLineColor.IsVisible(); }
+    bool                IsBrushVisible() const  { return maFillColor.IsVisible(); }
+
+    void                SetWindowGraphics( AquaSalFrame* pFrame );
+    void                SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY, double fFakeScale );
+    void                SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
+
+    void                initResolution( NSWindow* );
+    void                copyResolution( AquaSalGraphics& );
+    void                updateResolution();
+
+    bool                IsWindowGraphics()      const   { return mbWindow; }
+    bool                IsPrinterGraphics()     const   { return mbPrinter; }
+    bool                IsVirDevGraphics()      const   { return mbVirDev; }
+    AquaSalFrame*       getGraphicsFrame() const { return mpFrame; }
+    void                setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
+
+    void                ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
+
+    bool                CheckContext();
+    void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
+    void                RefreshRect( const CGRect& );
+    void                RefreshRect( const NSRect& );
+    void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
+
+    void                SetState();
+    void                UnsetState();
+    // InvalidateContext does an UnsetState and sets mrContext to 0
+    void                InvalidateContext();
+
+    virtual bool        setClipRegion( const Region& );
+
+    // draw --> LineColor and FillColor and RasterOp and ClipRegion
+    virtual void        drawPixel( long nX, long nY );
+    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
+    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
+    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
+    virtual void        drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
+    virtual void        drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+    virtual void        drawPolyPolygon( sal_uLong nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry );
+    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
+    virtual sal_Bool    drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool    drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool    drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
+    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
+
+    // CopyArea --> No RasterOp, but ClipRegion
+    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+                                  long nSrcHeight, sal_uInt16 nFlags );
+
+    // CopyBits and DrawBitmap --> RasterOp and ClipRegion
+    // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
+    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
+    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
+    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+                                    const SalBitmap& rSalBitmap,
+                                    SalColor nTransparentColor );
+    virtual void        drawBitmap( const SalTwoRect* pPosAry,
+                                    const SalBitmap& rSalBitmap,
+                                    const SalBitmap& rTransparentBitmap );
+    virtual void        drawMask( const SalTwoRect* pPosAry,
+                                  const SalBitmap& rSalBitmap,
+                                  SalColor nMaskColor );
+
+    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
+    virtual SalColor    getPixel( long nX, long nY );
+
+    // invert --> ClipRegion (only Windows or VirDevs)
+    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
+    virtual void        invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+
+    virtual sal_Bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
+
+    virtual bool            drawAlphaBitmap( const SalTwoRect&,
+                                             const SalBitmap& rSourceBitmap,
+                                             const SalBitmap& rAlphaBitmap );
+
+    virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
+                                           long nHeight, sal_uInt8 nTransparency );
+
+    CGPoint*                makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtAry);
+    // native widget rendering methods that require mirroring
+    virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+                                              const Point& aPos, sal_Bool& rIsInside );
+    virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+                                           ControlState nState, const ImplControlValue& aValue,
+                                           const rtl::OUString& aCaption );
+    virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+                                                const ImplControlValue& aValue, const rtl::OUString& aCaption,
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
+
+    // get device resolution
+    virtual void            GetResolution( long& rDPIX, long& rDPIY );
+    // get the depth of the device
+    virtual sal_uInt16          GetBitCount() const;
+    // get the width of the device
+    virtual long            GetGraphicsWidth() const;
+
+    // set the clip region to empty
+    virtual void            ResetClipRegion();
+
+    // set the line color to transparent (= don't draw lines)
+    virtual void            SetLineColor();
+    // set the line color to a specific color
+    virtual void            SetLineColor( SalColor nSalColor );
+    // set the fill color to transparent (= don't fill)
+    virtual void            SetFillColor();
+    // set the fill color to a specific color, shapes will be
+    // filled accordingly
+    virtual void            SetFillColor( SalColor nSalColor );
+    // enable/disable XOR drawing
+    virtual void            SetXORMode( bool bSet, bool bInvertOnly );
+    // set line color for raster operations
+    virtual void            SetROPLineColor( SalROPColor nROPColor );
+    // set fill color for raster operations
+    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    // set the text color to a specific color
+    virtual void            SetTextColor( SalColor nSalColor );
+    // set the font
+    virtual sal_uInt16         SetFont( FontSelectPattern*, int nFallbackLevel );
+    // get the current font's etrics
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
+    // get kernign pairs of the current font
+    // return only PairCount if (pKernPairs == NULL)
+    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
+    // get the repertoire of the current font
+    virtual const ImplFontCharMap* GetImplFontCharMap() const;
+    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
+    // graphics must fill supplied font list
+    virtual void            GetDevFontList( ImplDevFontList* );
+    // graphics should call ImplAddDevFontSubstitute on supplied
+    // OutputDevice for all its device specific preferred font substitutions
+    virtual void            GetDevFontSubstList( OutputDevice* );
+    virtual bool            AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
+    // CreateFontSubset: a method to get a subset of glyhps of a font
+    // inside a new valid font file
+    // returns TRUE if creation of subset was successfull
+    // parameters: rToFile: contains a osl file URL to write the subset to
+    //             pFont: describes from which font to create a subset
+    //             pGlyphIDs: the glyph ids to be extracted
+    //             pEncoding: the character code corresponding to each glyph
+    //             pWidths: the advance widths of the correspoding glyphs (in PS font units)
+    //             nGlyphs: the number of glyphs
+    //             rInfo: additional outgoing information
+    // implementation note: encoding 0 with glyph id 0 should be added implicitly
+    // as "undefined character"
+    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
+                                              const PhysicalFontFace* pFont,
+                                              long* pGlyphIDs,
+                                              sal_uInt8* pEncoding,
+                                              sal_Int32* pWidths,
+                                              int nGlyphs,
+                                              FontSubsetInfo& rInfo // out parameter
+                                              );
+
+    // GetFontEncodingVector: a method to get the encoding map Unicode
+    // to font encoded character; this is only used for type1 fonts and
+    // may return NULL in case of unknown encoding vector
+    // if ppNonEncoded is set and non encoded characters (that is type1
+    // glyphs with only a name) exist it is set to the corresponding
+    // map for non encoded glyphs; the encoding vector contains -1
+    // as encoding for these cases
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
+
+    // GetEmbedFontData: gets the font data for a font marked
+    // embeddable by GetDevFontList or NULL in case of error
+    // parameters: pFont: describes the font in question
+    //             pWidths: the widths of all glyphs from char code 0 to 255
+    //                      pWidths MUST support at least 256 members;
+    //             rInfo: additional outgoing information
+    //             pDataLen: out parameter, contains the byte length of the returned buffer
+    virtual const void* GetEmbedFontData( const PhysicalFontFace*,
+                                          const sal_Ucs* pUnicodes,
+                                          sal_Int32* pWidths,
+                                          FontSubsetInfo& rInfo,
+                                          long* pDataLen );
+    // frees the font data again
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+
+    virtual void            GetGlyphWidths( const PhysicalFontFace*,
+                                            bool bVertical,
+                                            Int32Vector& rWidths,
+                                            Ucs2UIntMap& rUnicodeEnc );
+
+    virtual sal_Bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& );
+    virtual sal_Bool                    GetGlyphOutline( sal_GlyphId nIndex, basegfx::B2DPolyPolygon& );
+
+    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
+    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
+    virtual bool                    supportsOperation( OutDevSupportType ) const;
+
+    // Query the platform layer for control support
+    virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
+
+    virtual SystemGraphicsData    GetGraphicsData() const;
+    virtual SystemFontData        GetSysFontData( int /* nFallbacklevel */ ) const;
+
+private:
+    // differences between VCL, Quartz and kHiThemeOrientation coordinate systems
+    // make some graphics seem to be vertically-mirrored from a VCL perspective
+    bool IsFlipped() const { return mbWindow; }
+
+    void ApplyXorContext();
+    void Pattern50Fill();
+    UInt32 getState( ControlState nState );
+    UInt32 getTrackState( ControlState nState );
+};
+
+class XorEmulation
+{
+public:
+                    XorEmulation();
+    /*final*/       ~XorEmulation();
+
+    void            SetTarget( int nWidth, int nHeight, int nBitmapDepth, CGContextRef, CGLayerRef );
+    bool            UpdateTarget();
+    void            Enable()            { mbIsEnabled = true; }
+    void            Disable()           { mbIsEnabled = false; }
+    bool            IsEnabled() const   { return mbIsEnabled; }
+    CGContextRef    GetTargetContext() const { return mxTargetContext; }
+    CGContextRef    GetMaskContext() const { return (mbIsEnabled ? mxMaskContext : NULL); }
+
+private:
+    CGLayerRef      mxTargetLayer;
+    CGContextRef    mxTargetContext;
+    CGContextRef    mxMaskContext;
+    CGContextRef    mxTempContext;
+    sal_uLong*          mpMaskBuffer;
+    sal_uLong*          mpTempBuffer;
+    int             mnBufferLongs;
+    bool            mbIsEnabled;
+};
+
+
+// --- some trivial inlines
+
+inline void AquaSalGraphics::RefreshRect( const CGRect& rRect )
+{
+    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
+}
+
+inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
+{
+    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
+}
+
+inline RGBAColor::RGBAColor( SalColor nSalColor )
+:   mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
+,   mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
+,   mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
+,   mfAlpha( 1.0 )  // opaque
+{}
+
+inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha )
+:   mfRed( fRed )
+,   mfGreen( fGreen )
+,   mfBlue( fBlue )
+,   mfAlpha( fAlpha )
+{}
+
+#endif // _SV_SALGDI_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 0788095f798c..06802fcfaf58 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -1,416 +1,7 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
 
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
 
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "aqua/aquavcltypes.h"
-#include <vcl/fontcapabilities.hxx>
-
-#include "outfont.hxx"
-#include "salgdi.hxx"
-
-#include <vector>
-
-class AquaSalFrame;
-class AquaSalBitmap;
-class ImplDevFontAttributes;
-
-struct CGRect;
-
-// mac specific physically available font face
-class ImplMacFontData : public PhysicalFontFace
-{
-public:
-    ImplMacFontData( const ImplDevFontAttributes&, ATSUFontID );
-
-    virtual ~ImplMacFontData();
-
-    virtual PhysicalFontFace*   Clone() const;
-    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const;
-    virtual sal_IntPtr      GetFontId() const;
-
-    const ImplFontCharMap*  GetImplFontCharMap() const;
-    bool                    GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-    bool                    HasChar( sal_uInt32 cChar ) const;
-
-    void                    ReadOs2Table() const;
-    void                    ReadMacCmapEncoding() const;
-    bool                    HasCJKSupport() const;
-
-private:
-    const ATSUFontID            mnFontId;
-    mutable const ImplFontCharMap*  mpCharMap;
-    mutable vcl::FontCapabilities maFontCapabilities;
-    mutable bool                mbOs2Read;       // true if OS2-table related info is valid
-    mutable bool                mbHasOs2Table;
-    mutable bool                mbCmapEncodingRead; // true if cmap encoding of Mac font is read
-    mutable bool                mbHasCJKSupport; // #i78970# CJK fonts need extra leading
-    mutable bool                mbFontCapabilitiesRead;
-};
-
-// abstracting quartz color instead of having to use an CGFloat[] array
-class RGBAColor
-{
-public:
-    RGBAColor( SalColor );
-    RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha ); //NOTUSEDYET
-    const float* AsArray() const    { return &mfRed; }
-    bool IsVisible() const          { return (mfAlpha > 0); }
-    void SetAlpha( float fAlpha )   { mfAlpha = fAlpha; }
-private:
-    float mfRed, mfGreen, mfBlue, mfAlpha;
-};
-
-// -------------------
-// - AquaSalGraphics -
-// -------------------
-class AquaSalGraphics : public SalGraphics
-{
-    friend class ATSLayout;
-protected:
-    AquaSalFrame*                           mpFrame;
-    CGLayerRef                              mxLayer;    // Quartz graphics layer
-    CGContextRef                            mrContext;  // Quartz drawing context
-    class XorEmulation*                     mpXorEmulation;
-    int                                     mnXorMode; // 0: off 1: on 2: invert only
-    int                                     mnWidth;
-    int                                     mnHeight;
-    int                                     mnBitmapDepth;  // zero unless bitmap
-    /// device resolution of this graphics
-    long                                    mnRealDPIX;
-    long                                    mnRealDPIY;
-    /// some graphics implementations (e.g. AquaSalInfoPrinter) scale
-    /// everything down by a factor (see SetupPrinterGraphics for details)
-    /// so we have to compensate for it with the inverse factor
-    double                                  mfFakeDPIScale;
-
-    /// path representing current clip region
-    CGMutablePathRef                        mxClipPath;
-
-    /// Drawing colors
-    /// pen color RGBA
-    RGBAColor                               maLineColor;
-    /// brush color RGBA
-    RGBAColor                               maFillColor;
-
-    // Device Font settings
-     const ImplMacFontData*                  mpMacFontData;
-    /// ATSU style object which carries all font attributes
-    ATSUStyle                               maATSUStyle;
-    /// text rotation as ATSU angle
-    Fixed                                   mnATSUIRotation;
-    /// workaround to prevent ATSU overflows for huge font sizes
-    float                                   mfFontScale;
-    /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
-    float                                   mfFontStretch;
-    /// allows text to be rendered without antialiasing
-    bool                                    mbNonAntialiasedText;
-
-    // Graphics types
-
-    /// is this a printer graphics
-    bool                                    mbPrinter;
-    /// is this a virtual device graphics
-    bool                                    mbVirDev;
-    /// is this a window graphics
-    bool                                    mbWindow;
-
-public:
-    AquaSalGraphics();
-    virtual ~AquaSalGraphics();
-
-    bool                IsPenVisible() const    { return maLineColor.IsVisible(); }
-    bool                IsBrushVisible() const  { return maFillColor.IsVisible(); }
-
-    void                SetWindowGraphics( AquaSalFrame* pFrame );
-    void                SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY, double fFakeScale );
-    void                SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
-
-    void                initResolution( NSWindow* );
-    void                copyResolution( AquaSalGraphics& );
-    void                updateResolution();
-
-    bool                IsWindowGraphics()      const   { return mbWindow; }
-    bool                IsPrinterGraphics()     const   { return mbPrinter; }
-    bool                IsVirDevGraphics()      const   { return mbVirDev; }
-    AquaSalFrame*       getGraphicsFrame() const { return mpFrame; }
-    void                setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
-
-    void                ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
-
-    bool                CheckContext();
-    void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
-    void                RefreshRect( const CGRect& );
-    void                RefreshRect( const NSRect& );
-    void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
-
-    void                SetState();
-    void                UnsetState();
-    // InvalidateContext does an UnsetState and sets mrContext to 0
-    void                InvalidateContext();
-
-    virtual bool        setClipRegion( const Region& );
-
-    // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( sal_uLong nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry );
-    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual sal_Bool    drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool    drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool    drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-
-    // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                                  long nSrcHeight, sal_uInt16 nFlags );
-
-    // CopyBits and DrawBitmap --> RasterOp and ClipRegion
-    // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
-                                    const SalBitmap& rSalBitmap,
-                                    SalColor nTransparentColor );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
-                                    const SalBitmap& rSalBitmap,
-                                    const SalBitmap& rTransparentBitmap );
-    virtual void        drawMask( const SalTwoRect* pPosAry,
-                                  const SalBitmap& rSalBitmap,
-                                  SalColor nMaskColor );
-
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
-
-    // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
-
-    virtual sal_Bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
-
-    virtual bool            drawAlphaBitmap( const SalTwoRect&,
-                                             const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap );
-
-    virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
-                                           long nHeight, sal_uInt8 nTransparency );
-
-    CGPoint*                makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtAry);
-    // native widget rendering methods that require mirroring
-    virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, sal_Bool& rIsInside );
-    virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                           ControlState nState, const ImplControlValue& aValue,
-                                           const rtl::OUString& aCaption );
-    virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
-                                                const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
-
-    // get device resolution
-    virtual void            GetResolution( long& rDPIX, long& rDPIY );
-    // get the depth of the device
-    virtual sal_uInt16          GetBitCount() const;
-    // get the width of the device
-    virtual long            GetGraphicsWidth() const;
-
-    // set the clip region to empty
-    virtual void            ResetClipRegion();
-
-    // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
-    // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
-    // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
-    // set the fill color to a specific color, shapes will be
-    // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
-    // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool bInvertOnly );
-    // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
-    // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
-    // set the font
-    virtual sal_uInt16         SetFont( FontSelectPattern*, int nFallbackLevel );
-    // get the current font's etrics
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    // get kernign pairs of the current font
-    // return only PairCount if (pKernPairs == NULL)
-    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
-    // get the repertoire of the current font
-    virtual const ImplFontCharMap* GetImplFontCharMap() const;
-    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-    // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* );
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
-    // CreateFontSubset: a method to get a subset of glyhps of a font
-    // inside a new valid font file
-    // returns TRUE if creation of subset was successfull
-    // parameters: rToFile: contains a osl file URL to write the subset to
-    //             pFont: describes from which font to create a subset
-    //             pGlyphIDs: the glyph ids to be extracted
-    //             pEncoding: the character code corresponding to each glyph
-    //             pWidths: the advance widths of the correspoding glyphs (in PS font units)
-    //             nGlyphs: the number of glyphs
-    //             rInfo: additional outgoing information
-    // implementation note: encoding 0 with glyph id 0 should be added implicitly
-    // as "undefined character"
-    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
-                                              const PhysicalFontFace* pFont,
-                                              long* pGlyphIDs,
-                                              sal_uInt8* pEncoding,
-                                              sal_Int32* pWidths,
-                                              int nGlyphs,
-                                              FontSubsetInfo& rInfo // out parameter
-                                              );
-
-    // GetFontEncodingVector: a method to get the encoding map Unicode
-    // to font encoded character; this is only used for type1 fonts and
-    // may return NULL in case of unknown encoding vector
-    // if ppNonEncoded is set and non encoded characters (that is type1
-    // glyphs with only a name) exist it is set to the corresponding
-    // map for non encoded glyphs; the encoding vector contains -1
-    // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
-
-    // GetEmbedFontData: gets the font data for a font marked
-    // embeddable by GetDevFontList or NULL in case of error
-    // parameters: pFont: describes the font in question
-    //             pWidths: the widths of all glyphs from char code 0 to 255
-    //                      pWidths MUST support at least 256 members;
-    //             rInfo: additional outgoing information
-    //             pDataLen: out parameter, contains the byte length of the returned buffer
-    virtual const void* GetEmbedFontData( const PhysicalFontFace*,
-                                          const sal_Ucs* pUnicodes,
-                                          sal_Int32* pWidths,
-                                          FontSubsetInfo& rInfo,
-                                          long* pDataLen );
-    // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
-
-    virtual void            GetGlyphWidths( const PhysicalFontFace*,
-                                            bool bVertical,
-                                            Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc );
-
-    virtual sal_Bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& );
-    virtual sal_Bool                    GetGlyphOutline( sal_GlyphId nIndex, basegfx::B2DPolyPolygon& );
-
-    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
-    virtual bool                    supportsOperation( OutDevSupportType ) const;
-
-    // Query the platform layer for control support
-    virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
-
-    virtual SystemGraphicsData    GetGraphicsData() const;
-    virtual SystemFontData        GetSysFontData( int /* nFallbacklevel */ ) const;
-
-private:
-    // differences between VCL, Quartz and kHiThemeOrientation coordinate systems
-    // make some graphics seem to be vertically-mirrored from a VCL perspective
-    bool IsFlipped() const { return mbWindow; }
-
-    void ApplyXorContext();
-    void Pattern50Fill();
-    UInt32 getState( ControlState nState );
-    UInt32 getTrackState( ControlState nState );
-};
-
-class XorEmulation
-{
-public:
-                    XorEmulation();
-    /*final*/       ~XorEmulation();
-
-    void            SetTarget( int nWidth, int nHeight, int nBitmapDepth, CGContextRef, CGLayerRef );
-    bool            UpdateTarget();
-    void            Enable()            { mbIsEnabled = true; }
-    void            Disable()           { mbIsEnabled = false; }
-    bool            IsEnabled() const   { return mbIsEnabled; }
-    CGContextRef    GetTargetContext() const { return mxTargetContext; }
-    CGContextRef    GetMaskContext() const { return (mbIsEnabled ? mxMaskContext : NULL); }
-
-private:
-    CGLayerRef      mxTargetLayer;
-    CGContextRef    mxTargetContext;
-    CGContextRef    mxMaskContext;
-    CGContextRef    mxTempContext;
-    sal_uLong*          mpMaskBuffer;
-    sal_uLong*          mpTempBuffer;
-    int             mnBufferLongs;
-    bool            mbIsEnabled;
-};
-
-
-// --- some trivial inlines
-
-inline void AquaSalGraphics::RefreshRect( const CGRect& rRect )
-{
-    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
-}
-
-inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
-{
-    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
-}
-
-inline RGBAColor::RGBAColor( SalColor nSalColor )
-:   mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-,   mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-,   mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-,   mfAlpha( 1.0 )  // opaque
-{}
-
-inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha )
-:   mfRed( fRed )
-,   mfGreen( fGreen )
-,   mfBlue( fBlue )
-,   mfAlpha( fAlpha )
-{}
-
-#endif // _SV_SALGDI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#ifdef ENABLE_CORETEXT
+#include "aqua/coretext/salgdi.h"
+#else
+#include "aqua/atsui/salgdi.h"
+#endif
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 6f39cc9ee4b9..d52cd9483795 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -201,7 +201,11 @@ struct SystemFontData
 #if defined( WNT )
     HFONT           hFont;          // native font object
 #elif defined( QUARTZ )
+#ifdef ENABLE_CORETEXT
+    CTFontRef       rCTFont;
+#else
     void*           aATSUFontID;    // native font object
+#endif
 #elif defined( IOS )
     CTFontRef       rCTFont;        // native font object
 #elif defined( UNX )
@@ -218,7 +222,10 @@ struct SystemFontData
 #if defined( WNT )
         , hFont( 0 )
 #elif defined( QUARTZ )
+#ifdef ENABLE_CORETEXT
+#else
         , aATSUFontID( NULL )
+#endif
 #elif defined( IOS )
 #elif defined( UNX )
         , nFontId( NULL )