ooo-build r12064 - in trunk: . desktop patches/src680
- From: ccheney svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12064 - in trunk: . desktop patches/src680
- Date: Tue, 1 Apr 2008 04:35:42 +0100 (BST)
Author: ccheney
Date: Tue Apr 1 04:35:41 2008
New Revision: 12064
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12064&view=rev
Log:
2008-03-31 Chris Cheney <ccheney ubuntu com>
* desktop/calc.desktop.in.in,
desktop/draw.desktop.in.in,
desktop/impress.desktop.in.in,
desktop/math.desktop.in.in,
desktop/writer.desktop.in.in: update and sort mime-types.
* patches/src680/apply:
* patches/src680/ooo85470.workspace.cairotext01.diff: add patch from
Fedora for freetype/cairo.
* patches/src680/writer-default-font.diff: remove patch
Added:
trunk/patches/src680/ooo85470.workspace.cairotext01.diff
Removed:
trunk/patches/src680/writer-default-font.diff
Modified:
trunk/ChangeLog
trunk/desktop/calc.desktop.in.in
trunk/desktop/draw.desktop.in.in
trunk/desktop/impress.desktop.in.in
trunk/desktop/math.desktop.in.in
trunk/desktop/writer.desktop.in.in
trunk/patches/src680/apply
Modified: trunk/desktop/calc.desktop.in.in
==============================================================================
--- trunk/desktop/calc.desktop.in.in (original)
+++ trunk/desktop/calc.desktop.in.in Tue Apr 1 04:35:41 2008
@@ -8,7 +8,7 @@
InitialPreference=6
Categories=Office;Spreadsheet;
StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls ADD_OPENXML_SPREADSHEET_MIME@;
+MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv ADD_OPENXML_SPREADSHEET_MIME@;
_Name=OpenOffice.org Calc
_GenericName=Spreadsheet
_Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
Modified: trunk/desktop/draw.desktop.in.in
==============================================================================
--- trunk/desktop/draw.desktop.in.in (original)
+++ trunk/desktop/draw.desktop.in.in Tue Apr 1 04:35:41 2008
@@ -8,7 +8,7 @@
Categories=Graphics;VectorGraphics;
StartupNotify=false
InitialPreference=6
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
_Name=OpenOffice.org Draw
_GenericName=Drawing
_Comment=Create and edit drawings, flow charts, and logos by using Draw.
Modified: trunk/desktop/impress.desktop.in.in
==============================================================================
--- trunk/desktop/impress.desktop.in.in (original)
+++ trunk/desktop/impress.desktop.in.in Tue Apr 1 04:35:41 2008
@@ -7,7 +7,7 @@
Type=Application
Categories=Office;Presentation;
StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd ms-powerpoint ADD_OPENXML_PRESENTATION_MIME@;
+MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd sun xml impress template ADD_OPENXML_PRESENTATION_MIME@;
InitialPreference=5
_Name=OpenOffice.org Impress
_GenericName=Presentation
Modified: trunk/desktop/math.desktop.in.in
==============================================================================
--- trunk/desktop/math.desktop.in.in (original)
+++ trunk/desktop/math.desktop.in.in Tue Apr 1 04:35:41 2008
@@ -7,7 +7,7 @@
Icon=ooo-math OOO_BINSUFFIX@
Type=Application
StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
_Name=OpenOffice.org Math
_GenericName=Formula
_Comment=Create and edit scientific formulas and equations by using Math.
Modified: trunk/desktop/writer.desktop.in.in
==============================================================================
--- trunk/desktop/writer.desktop.in.in (original)
+++ trunk/desktop/writer.desktop.in.in Tue Apr 1 04:35:41 2008
@@ -7,7 +7,7 @@
Type=Application
Categories=Office;WordProcessor;
StartupNotify=false
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd ms-works ADD_OPENXML_WORD_MIME@;
+MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf ADD_OPENXML_WORD_MIME@;
InitialPreference=5
_Name=OpenOffice.org Writer
_GenericName=Word Processor
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Tue Apr 1 04:35:41 2008
@@ -1682,7 +1682,6 @@
system-lpsolve-rpath.diff, rengelha
[ UbuntuOnly ]
-writer-default-font.diff, mklose
human-icons-add.diff, mklose
[ UbuntuL10nOnly ]
@@ -1733,6 +1732,7 @@
system-lpsolve-rpath.diff, rengelha
#gccXXXXX.solenv.javaregistration.diff
ubuntu-mstopdf.diff, ccheney
+ooo85470.workspace.cairotext01.diff, ccheney
[ FedoraFixes ]
ooo64508.vcl.honourfontconfighinting.diff
Added: trunk/patches/src680/ooo85470.workspace.cairotext01.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ooo85470.workspace.cairotext01.diff Tue Apr 1 04:35:41 2008
@@ -0,0 +1,474 @@
+Index: vcl/inc/vcl/glyphcache.hxx
+diff -u vcl/inc/vcl/glyphcache.hxx:1.2 vcl/inc/vcl/glyphcache.hxx:1.2.282.1
+--- vcl/inc/vcl/glyphcache.hxx:1.2 Wed Apr 11 10:55:02 2007
++++ vcl/inc/vcl/glyphcache.hxx Fri Jan 25 00:53:45 2008
+@@ -186,6 +186,10 @@
+ virtual const ::rtl::OString* GetFontFileName() const { return NULL; }
+ virtual int GetFontFaceNumber() const { return 0; }
+ virtual bool TestFont() const { return true; }
++ virtual void* GetFtFace() const { return 0; }
++ virtual int GetLoadFlags() const { return 0; }
++ virtual bool NeedsArtificialBold() const { return false; }
++ virtual bool NeedsArtificialItalic() const { return false; }
+
+ const ImplFontSelectData& GetFontSelData() const { return maFontSelData; }
+
+Index: vcl/source/glyphs/gcach_ftyp.cxx
+diff -u vcl/source/glyphs/gcach_ftyp.cxx:1.147 vcl/source/glyphs/gcach_ftyp.cxx:1.147.96.1
+--- vcl/source/glyphs/gcach_ftyp.cxx:1.147 Mon Nov 26 07:13:41 2007
++++ vcl/source/glyphs/gcach_ftyp.cxx Tue Feb 5 08:22:27 2008
+@@ -518,6 +518,16 @@
+
+ // -----------------------------------------------------------------------
+
++void* FreetypeServerFont::GetFtFace() const
++{
++ if( maSizeFT )
++ pFTActivateSize( maSizeFT );
++
++ return maFaceFT;
++}
++
++// -----------------------------------------------------------------------
++
+ FreetypeManager::~FreetypeManager()
+ {
+ // This crashes on Solaris 10
+Index: vcl/source/glyphs/gcach_ftyp.hxx
+diff -u vcl/source/glyphs/gcach_ftyp.hxx:1.39 vcl/source/glyphs/gcach_ftyp.hxx:1.39.180.2
+--- vcl/source/glyphs/gcach_ftyp.hxx:1.39 Tue Jul 31 09:09:30 2007
++++ vcl/source/glyphs/gcach_ftyp.hxx Tue Feb 5 08:22:27 2008
+@@ -185,6 +185,10 @@
+ virtual const ::rtl::OString* GetFontFileName() const { return mpFontInfo->GetFontFileName(); }
+ virtual int GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); }
+ virtual bool TestFont() const;
++ virtual void* GetFtFace() const;
++ virtual int GetLoadFlags() const { return mnLoadFlags; }
++ virtual bool NeedsArtificialBold() const { return mbArtBold; }
++ virtual bool NeedsArtificialItalic() const { return mbArtItalic; }
+
+ virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
+
+Index: vcl/unx/inc/salgdi.h
+diff -u vcl/unx/inc/salgdi.h:1.41 vcl/unx/inc/salgdi.h:1.41.206.2
+--- vcl/unx/inc/salgdi.h:1.41 Wed Jun 27 13:41:23 2007
++++ vcl/unx/inc/salgdi.h Mon Jan 28 00:53:49 2008
+@@ -58,6 +58,8 @@
+ #include <vcl/dllapi.h>
+ #endif
+
++#include <deque>
++
+ #include "xfont.hxx"
+
+ // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+@@ -78,6 +80,19 @@
+
+ // -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
++class CairoFontsCache
++{
++private:
++ static int mnRefCount;
++ typedef std::deque< std::pair<void *, void*> > LRUFonts;
++ static LRUFonts maLRUFonts;
++public:
++ CairoFontsCache();
++ static void CacheFont(void *pFont, void *pId);
++ static void* FindCachedFont(void *pId);
++ ~CairoFontsCache();
++};
++
+ class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
+ {
+ friend class X11FontLayout;
+@@ -90,7 +105,8 @@
+ SalColormap *m_pDeleteColormap;
+ Drawable hDrawable_; // use
+ int m_nScreen;
+- void* pRenderFormat_;
++ void* pRenderFormat_;
++ CairoFontsCache m_aCairoFontsCache;
+
+ XLIB_Region pPaintRegion_;
+ XLIB_Region pClipRegion_;
+@@ -198,6 +214,7 @@
+ void DrawServerSimpleFontString( const ServerFontLayout& );
+ void DrawServerAAFontString( const ServerFontLayout& );
+ bool DrawServerAAForcedString( const ServerFontLayout& );
++ void DrawCairoAAFontString( const ServerFontLayout& );
+
+ void freeResources();
+ public:
+Index: vcl/unx/source/gdi/salgdi3.cxx
+diff -u vcl/unx/source/gdi/salgdi3.cxx:1.149 vcl/unx/source/gdi/salgdi3.cxx:1.149.66.7
+--- vcl/unx/source/gdi/salgdi3.cxx:1.149 Wed Dec 12 05:21:50 2007
++++ vcl/unx/source/gdi/salgdi3.cxx Thu Feb 28 10:37:07 2008
+@@ -123,6 +123,32 @@
+
+ #include <hash_set>
+
++struct cairo_surface_t;
++struct cairo_t;
++struct cairo_font_face_t;
++typedef void* FT_Face;
++struct cairo_matrix_t {
++ double xx; double yx;
++ double xy; double yy;
++ double x0; double y0;
++};
++struct cairo_glyph_t
++{
++ unsigned long index;
++ double x;
++ double y;
++};
++struct BOX
++{
++ short x1, x2, y1, y2;
++};
++struct _XRegion
++{
++ long size;
++ long numRects;
++ BOX *rects;
++ BOX extents;
++};
+ using namespace rtl;
+
+ // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+@@ -734,6 +760,306 @@
+ }
+
+ //--------------------------------------------------------------------------
++namespace {
++
++class CairoWrapper
++{
++private:
++ oslModule mpCairoLib;
++
++ cairo_surface_t* (*mp_xlib_surface_create_with_xrender_format)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int );
++ void (*mp_surface_destroy)(cairo_surface_t *);
++ cairo_t* (*mp_create)(cairo_surface_t *);
++ void (*mp_destroy)(cairo_t*);
++ void (*mp_clip)(cairo_t*);
++ void (*mp_rectangle)(cairo_t*, double, double, double, double);
++ cairo_font_face_t * (*mp_ft_font_face_create_for_ft_face)(FT_Face, int);
++ void (*mp_set_font_face)(cairo_t *, cairo_font_face_t *);
++ void (*mp_font_face_destroy)(cairo_font_face_t *);
++ void (*mp_matrix_init_identity)(cairo_matrix_t *);
++ void (*mp_matrix_scale)(cairo_matrix_t *, double, double);
++ void (*mp_matrix_rotate)(cairo_matrix_t *, double);
++ void (*mp_set_font_matrix)(cairo_t *, const cairo_matrix_t *);
++ void (*mp_show_glyphs)(cairo_t *, const cairo_glyph_t *, int );
++ void (*mp_set_source_rgb)(cairo_t *, double , double , double );
++
++ bool canEmbolden() const { return false; }
++
++ CairoWrapper();
++public:
++ static CairoWrapper& get();
++ bool isValid() const { return (mpCairoLib != NULL); }
++ bool isCairoRenderable(const ServerFont& rFont);
++
++ cairo_surface_t* xlib_surface_create_with_xrender_format(Display *pDisplay, Drawable drawable, Screen *pScreen, XRenderPictFormat *pFormat, int width, int height)
++ { return (*mp_xlib_surface_create_with_xrender_format)(pDisplay, drawable, pScreen, pFormat, width, height); }
++ void surface_destroy(cairo_surface_t *surface) { (*mp_surface_destroy)(surface); }
++ cairo_t* create(cairo_surface_t *surface) { return (*mp_create)(surface); }
++ void destroy(cairo_t *cr) { (*mp_destroy)(cr); }
++ void clip(cairo_t *cr) { (*mp_clip)(cr); }
++ void rectangle(cairo_t *cr, double x, double y, double width, double height)
++ { (*mp_rectangle)(cr, x, y, width, height); }
++ cairo_font_face_t* ft_font_face_create_for_ft_face(FT_Face face, int load_flags)
++ { return (*mp_ft_font_face_create_for_ft_face)(face, load_flags); }
++ void set_font_face(cairo_t *cr, cairo_font_face_t *font_face)
++ { (*mp_set_font_face)(cr, font_face); }
++ void font_face_destroy(cairo_font_face_t *font_face)
++ { (*mp_font_face_destroy)(font_face); }
++ void matrix_init_identity(cairo_matrix_t *matrix)
++ { (*mp_matrix_init_identity)(matrix); }
++ void matrix_scale(cairo_matrix_t *matrix, double sx, double sy)
++ { (*mp_matrix_scale)(matrix, sx, sy); }
++ void matrix_rotate(cairo_matrix_t *matrix, double radians)
++ { (*mp_matrix_rotate)(matrix, radians); }
++ void set_font_matrix(cairo_t *cr, const cairo_matrix_t *matrix)
++ { (*mp_set_font_matrix)(cr, matrix); }
++ void show_glyphs(cairo_t *cr, const cairo_glyph_t *glyphs, int no_glyphs)
++ { (*mp_show_glyphs)(cr, glyphs, no_glyphs); }
++ void set_source_rgb(cairo_t *cr, double red, double green, double blue)
++ { (*mp_set_source_rgb)(cr, red, green, blue); }
++};
++
++static CairoWrapper* pCairoInstance = NULL;
++
++CairoWrapper& CairoWrapper::get()
++{
++ if( ! pCairoInstance )
++ pCairoInstance = new CairoWrapper();
++ return *pCairoInstance;
++}
++
++CairoWrapper::CairoWrapper()
++: mpCairoLib( NULL )
++{
++ static const char* pDisableCairoText = getenv( "SAL_DISABLE_CAIROTEXT" );
++ if( pDisableCairoText && (pDisableCairoText[0] == '1') )
++ return;
++
++ int nDummy;
++ if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) )
++ return;
++
++
++ OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
++ mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
++ if( !mpCairoLib )
++ return;
++
++ mp_xlib_surface_create_with_xrender_format = (cairo_surface_t* (*)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int ))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_xlib_surface_create_with_xrender_format" );
++ mp_surface_destroy = (void(*)(cairo_surface_t*))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" );
++ mp_create = (cairo_t*(*)(cairo_surface_t*))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" );
++ mp_destroy = (void(*)(cairo_t*))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" );
++ mp_clip = (void(*)(cairo_t*))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_clip" );
++ mp_rectangle = (void(*)(cairo_t*, double, double, double, double))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_rectangle" );
++ mp_ft_font_face_create_for_ft_face = (cairo_font_face_t * (*)(FT_Face, int))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_ft_face" );
++ mp_set_font_face = (void (*)(cairo_t *, cairo_font_face_t *))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_face" );
++ mp_font_face_destroy = (void (*)(cairo_font_face_t *))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_font_face_destroy" );
++ mp_matrix_init_identity = (void (*)(cairo_matrix_t *))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_init_identity" );
++ mp_matrix_scale = (void (*)(cairo_matrix_t *, double, double))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_scale" );
++ mp_matrix_rotate = (void (*)(cairo_matrix_t *, double))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_rotate" );
++ mp_set_font_matrix = (void (*)(cairo_t *, const cairo_matrix_t *))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_matrix" );
++ mp_show_glyphs = (void (*)(cairo_t *, const cairo_glyph_t *, int ))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_show_glyphs" );
++ mp_set_source_rgb = (void (*)(cairo_t *, double , double , double ))
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_source_rgb" );
++
++ if( !(
++ mp_xlib_surface_create_with_xrender_format &&
++ mp_surface_destroy &&
++ mp_create &&
++ mp_destroy &&
++ mp_clip &&
++ mp_rectangle &&
++ mp_ft_font_face_create_for_ft_face &&
++ mp_set_font_face &&
++ mp_font_face_destroy &&
++ mp_matrix_init_identity &&
++ mp_matrix_scale &&
++ mp_matrix_rotate &&
++ mp_set_font_matrix &&
++ mp_show_glyphs &&
++ mp_set_source_rgb
++ ) )
++ {
++ osl_unloadModule( mpCairoLib );
++ mpCairoLib = NULL;
++#if OSL_DEBUG_LEVEL > 1
++ fprintf( stderr, "not all needed symbols were found\n" );
++#endif
++ }
++}
++
++bool CairoWrapper::isCairoRenderable(const ServerFont& rFont)
++{
++ return rFont.GetFtFace() && isValid() && rFont.GetAntialiasAdvice() &&
++ (rFont.NeedsArtificialBold() ? canEmbolden() : true);
++}
++
++} //namespace
++
++CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
++int CairoFontsCache::mnRefCount = 0;
++
++CairoFontsCache::CairoFontsCache()
++{
++ ++mnRefCount;
++}
++
++CairoFontsCache::~CairoFontsCache()
++{
++ --mnRefCount;
++ if (!mnRefCount && !maLRUFonts.empty())
++ {
++ CairoWrapper &rCairo = CairoWrapper::get();
++ LRUFonts::iterator aEnd = maLRUFonts.end();
++ for (LRUFonts::iterator aI = maLRUFonts.begin(); aI != aEnd; ++aI)
++ rCairo.font_face_destroy((cairo_font_face_t*)aI->first);
++ }
++}
++
++void CairoFontsCache::CacheFont(void *pFont, void* pId)
++{
++ maLRUFonts.push_front( std::pair<void*, void *>(pFont, pId) );
++ if (maLRUFonts.size() > 8)
++ {
++ CairoWrapper &rCairo = CairoWrapper::get();
++ rCairo.font_face_destroy((cairo_font_face_t*)maLRUFonts.back().first);
++ maLRUFonts.pop_back();
++ }
++}
++
++void* CairoFontsCache::FindCachedFont(void *pId)
++{
++ LRUFonts::iterator aEnd = maLRUFonts.end();
++ for (LRUFonts::iterator aI = maLRUFonts.begin(); aI != aEnd; ++aI)
++ if (aI->second == pId)
++ return aI->first;
++ return NULL;
++}
++
++void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout )
++{
++ static const int MAXGLYPHS = 160;
++ sal_Int32 aGlyphAry[ MAXGLYPHS ];
++ sal_Int32 aWidthAry[ MAXGLYPHS ];
++ std::vector<cairo_glyph_t> cairo_glyphs;
++ int nMaxGlyphs = rLayout.GetOrientation() ? 1 : MAXGLYPHS;
++
++ Point aPos;
++ int nStart = 0;
++ int nGlyphCount;
++ while ((nGlyphCount = rLayout.GetNextGlyphs(nMaxGlyphs, aGlyphAry, aPos, nStart, aWidthAry)))
++ {
++ long nXPos = aPos.X();
++ long nYPos = aPos.Y();
++ for (int i = 0; i < nGlyphCount; ++i)
++ {
++ cairo_glyph_t aGlyph;
++ aGlyph.index = aGlyphAry[i];
++ aGlyph.x = nXPos;
++ aGlyph.y = nYPos;
++ cairo_glyphs.push_back(aGlyph);
++ nXPos += aWidthAry[i];
++ }
++ }
++
++ if (cairo_glyphs.empty())
++ return;
++
++ // find a XRenderPictFormat compatible with the Drawable
++ XRenderPictFormat* pVisualFormat = static_cast<XRenderPictFormat*>(GetXRenderFormat());
++ if( !pVisualFormat )
++ {
++ Visual* pVisual = GetDisplay()->GetVisual( m_nScreen ).GetVisual();
++ pVisualFormat = XRenderPeer::GetInstance().FindVisualFormat( pVisual );
++ // cache the XRenderPictFormat
++ SetXRenderFormat( static_cast<void*>(pVisualFormat) );
++ }
++
++ DBG_ASSERT( pVisualFormat!=NULL, "no matching XRenderPictFormat for text" );
++ if( !pVisualFormat )
++ return;
++
++ CairoWrapper &rCairo = CairoWrapper::get();
++
++ Display* pDisplay = GetXDisplay();
++
++ cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
++ hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1);
++
++ /*
++ * It might be ideal to cache surface and cairo context between calls and
++ * only destroy it when the drawable changes, but to do that we need to at
++ * least change the SalFrame etc impls to dtor the SalGraphics *before* the
++ * destruction of the windows they reference
++ */
++ cairo_t *cr = rCairo.create(surface);
++ rCairo.surface_destroy(surface);
++
++ if( pClipRegion_ && !XEmptyRegion( pClipRegion_ ) )
++ {
++ for (long i = 0; i < pClipRegion_->numRects; ++i)
++ {
++ rCairo.rectangle(cr,
++ pClipRegion_->rects[i].x1,
++ pClipRegion_->rects[i].y1,
++ pClipRegion_->rects[i].x2 - pClipRegion_->rects[i].x1,
++ pClipRegion_->rects[i].y2 - pClipRegion_->rects[i].y1);
++ }
++ rCairo.clip(cr);
++ }
++
++ rCairo.set_source_rgb(cr,
++ SALCOLOR_RED(nTextColor_)/255.0,
++ SALCOLOR_GREEN(nTextColor_)/255.0,
++ SALCOLOR_BLUE(nTextColor_)/255.0);
++
++ ServerFont& rFont = rLayout.GetServerFont();
++
++ cairo_font_face_t* font_face = NULL;
++
++ void *pId = rFont.GetFtFace();
++ font_face = (cairo_font_face_t*)m_aCairoFontsCache.FindCachedFont(pId);
++ if (!font_face)
++ {
++ font_face = rCairo.ft_font_face_create_for_ft_face(pId, rFont.GetLoadFlags());
++ m_aCairoFontsCache.CacheFont(font_face, pId);
++ }
++
++ rCairo.set_font_face(cr, font_face);
++
++ cairo_matrix_t m;
++ const ImplFontSelectData& rFSD = rFont.GetFontSelData();
++ int nWidth = rFSD.mnWidth ? rFSD.mnWidth : rFSD.mnHeight;
++
++ rCairo.matrix_init_identity(&m);
++
++ if (rLayout.GetOrientation())
++ rCairo.matrix_rotate(&m, (3600 - rLayout.GetOrientation()) * M_PI / 1800.0);
++
++ rCairo.matrix_scale(&m, nWidth, rFSD.mnHeight);
++ if (rFont.NeedsArtificialItalic())
++ m.xy = -m.xx * 0x6000L / 0x10000L;
++
++ rCairo.set_font_matrix(cr, &m);
++ rCairo.show_glyphs(cr, &cairo_glyphs[0], cairo_glyphs.size());
++ rCairo.destroy(cr);
++}
++
++//--------------------------------------------------------------------------
+
+ void X11SalGraphics::DrawServerAAFontString( const ServerFontLayout& rLayout )
+ {
+@@ -1111,15 +1437,20 @@
+ // draw complex text
+ ServerFont& rFont = rLayout.GetServerFont();
+
+- X11GlyphPeer& rGlyphPeer = X11GlyphCache::GetInstance().GetPeer();
+- if( rGlyphPeer.GetGlyphSet( rFont, m_nScreen ) )
+- DrawServerAAFontString( rLayout );
++ if (CairoWrapper::get().isCairoRenderable(rFont))
++ DrawCairoAAFontString( rLayout );
++ else
++ {
++ X11GlyphPeer& rGlyphPeer = X11GlyphCache::GetInstance().GetPeer();
++ if( rGlyphPeer.GetGlyphSet( rFont, m_nScreen ) )
++ DrawServerAAFontString( rLayout );
+ #ifndef MACOSX /* ignore X11 fonts on MACOSX */
+- else if( !rGlyphPeer.ForcedAntialiasing( rFont, m_nScreen ) )
+- DrawServerSimpleFontString( rLayout );
++ else if( !rGlyphPeer.ForcedAntialiasing( rFont, m_nScreen ) )
++ DrawServerSimpleFontString( rLayout );
+ #endif // MACOSX
+- else
+- DrawServerAAForcedString( rLayout );
++ else
++ DrawServerAAForcedString( rLayout );
++ }
+ }
+
+ //--------------------------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
