render text with cairo under gtk3, not headless solution

Change-Id: I309eaef08f597658c068170875733e5e1daa56ef
Reviewed-on: https://gerrit.libreoffice.org/14715
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

11 files changed, 60 insertions, 38 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a9430a5aeec3..680933383676 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -566,7 +566,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/unx/generic/plugadapt/salplug \
     vcl/unx/generic/printer/jobdata \
     vcl/unx/generic/printer/ppdparser \
-	vcl/unx/generic/gdi/x11windowprovider \
+    vcl/unx/generic/gdi/cairotextrender \
+    vcl/unx/generic/gdi/x11windowprovider \
     $(if $(filter TRUE,$(ENABLE_CUPS)),\
         vcl/unx/generic/printer/cupsmgr \
         vcl/unx/generic/printer/printerinfomanager \
@@ -582,6 +583,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
+	cairo \
 	cups \
 	dbus \
 	fontconfig \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 9b216dddd0ff..56135af18f78 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -89,7 +89,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/dtrans/X11_selection \
     vcl/unx/generic/dtrans/X11_service \
     vcl/unx/generic/dtrans/X11_transferable \
-    vcl/unx/generic/gdi/cairotextrender \
     vcl/unx/generic/gdi/x11cairotextrender \
     vcl/unx/generic/gdi/gcach_xpeer \
 	vcl/unx/generic/gdi/gdiimpl \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 917039b9fcc1..5ba57227de16 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/app/gtk3gtkinst \
     vcl/unx/gtk3/app/gtk3gtksys \
     vcl/unx/gtk3/app/gtk3fpicker \
+    vcl/unx/gtk3/gdi/gtk3cairotextrender \
     vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
     vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
     vcl/unx/gtk3/gdi/gtk3salprn-gtk \
diff --git a/vcl/headless/svptextrender.cxx b/vcl/headless/svptextrender.cxx
index 334c3411dcc4..72f4a85488c8 100644
--- a/vcl/headless/svptextrender.cxx
+++ b/vcl/headless/svptextrender.cxx
@@ -487,4 +487,9 @@ void SvpTextRender::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice )
     }
 }
 
+GlyphCache& SvpSalGraphics::getPlatformGlyphCache()
+{
+    return SvpGlyphCache::GetInstance();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx
index ff4f7e4cbb18..26ab3c98bc28 100644
--- a/vcl/inc/cairotextrender.hxx
+++ b/vcl/inc/cairotextrender.hxx
@@ -34,11 +34,9 @@ class ImplLayoutArgs;
 class ServerFontLayout;
 class PhysicalFontCollection;
 class PhysicalFontFace;
-struct _cairo_surface_t;
-typedef struct _cairo_surface cairo_surface_t;
 typedef struct _cairo cairo_t;
 
-class CairoFontsCache
+class VCL_DLLPUBLIC CairoFontsCache
 {
 public:
     struct CacheId
@@ -68,7 +66,7 @@ public:
     static void*                FindCachedFont(const CacheId &rId);
 };
 
-class CairoTextRender : public TextRenderImpl
+class VCL_DLLPUBLIC CairoTextRender : public TextRenderImpl
 {
     ServerFont*     mpServerFont[ MAX_FALLBACK ];
 
diff --git a/vcl/inc/devicetextrender.hxx b/vcl/inc/devicetextrender.hxx
deleted file mode 100644
index 3880e880c718..000000000000
--- a/vcl/inc/devicetextrender.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_VCL_INC_DEVICETEXTRENDER_HXX
-#define INCLUDED_VCL_INC_DEVICETEXTRENDER_HXX
-
-#include <basebmp/bitmapdevice.hxx>
-#include "textrender.hxx"
-
-class VCL_DLLPUBLIC DeviceTextRenderImpl : public TextRenderImpl
-{
-public:
-    virtual void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice) = 0;
-};
-
-#endif
-
-/* vim:set tabstop=4 shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 0c2f581ddd40..e9f51105143e 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -27,12 +27,13 @@
 
 #include "salgdi.hxx"
 #include "sallayout.hxx"
-#include "devicetextrender.hxx"
+#include "textrender.hxx"
 
 #ifdef IOS
 #define SvpSalGraphics AquaSalGraphics
 #else
 
+class GlyphCache;
 class ServerFont;
 
 class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics
@@ -53,6 +54,7 @@ protected:
     basegfx::B2IVector                   GetSize() { return m_aOrigDevice->getSize(); }
 
 public:
+    GlyphCache& getPlatformGlyphCache();
     void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice);
     void BlendTextColor(const basebmp::Color &rTextColor, const basebmp::BitmapDeviceSharedPtr &rAlphaMask,
                         const basegfx::B2IPoint &rDstPoint);
@@ -69,8 +71,8 @@ private:
     void ensureClip();
 
 protected:
-    vcl::Region                           m_aClipRegion;
-    std::unique_ptr<DeviceTextRenderImpl> m_xTextRenderImpl;
+    vcl::Region                         m_aClipRegion;
+    std::unique_ptr<TextRenderImpl>     m_xTextRenderImpl;
 
 protected:
     virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) SAL_OVERRIDE;
diff --git a/vcl/inc/headless/svptextrender.hxx b/vcl/inc/headless/svptextrender.hxx
index a4a9415aadf9..13d99f4eaf4f 100644
--- a/vcl/inc/headless/svptextrender.hxx
+++ b/vcl/inc/headless/svptextrender.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPTEXTRENDER_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPTEXTRENDER_HXX
 
-#include "devicetextrender.hxx"
+#include "textrender.hxx"
 #include <vcl/region.hxx>
 #include <deque>
 
-class VCL_DLLPUBLIC SvpTextRender : public DeviceTextRenderImpl
+class VCL_DLLPUBLIC SvpTextRender : public TextRenderImpl
 {
 private:
     SvpSalGraphics& m_rParent;
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index a3a8876a4f67..12c47c3ac715 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -24,7 +24,7 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/metric.hxx>
-
+#include <basebmp/bitmapdevice.hxx>
 #include "salgdi.hxx"
 #include "salglyphid.hxx"
 #include "fontsubset.hxx"
@@ -42,6 +42,8 @@ class TextRenderImpl
 public:
     virtual ~TextRenderImpl() {}
 
+    virtual void setDevice(basebmp::BitmapDeviceSharedPtr& /*rDevice*/) {}
+
     virtual void                    SetTextColor( SalColor nSalColor ) = 0;
     virtual sal_uInt16              SetFont( FontSelectPattern*, int nFallbackLevel ) = 0;
     virtual void                    GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 15742daf947e..2cbe6e0cc81b 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -26,11 +26,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <postx.h>
 
-#include <unx/salgdi.h>
-
 #if GTK_CHECK_VERSION(3,0,0)
 
 #include <headless/svpgdi.hxx>
+#include "textrender.hxx"
 
 class GtkSalFrame;
 class GtkSalGraphics : public SvpSalGraphics
@@ -57,6 +56,10 @@ public:
     void updateSettings( AllSettings& rSettings );
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
+
+    cairo_t* getCairoContext();
+    void clipRegion(cairo_t* cr);
+
 private:
     GtkWidget       *mpWindow;
     static GtkStyleContext *mpButtonStyle;
@@ -113,6 +116,7 @@ private:
 };
 
 #else
+#include <unx/salgdi.h>
 
 class GdkX11Pixmap;
 class GtkSalGraphics : public X11SalGraphics
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index e23f10318a24..774be5a377fa 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -16,6 +16,7 @@
 #include <unx/gtk/gtkgdi.hxx>
 #include <vcl/settings.hxx>
 #include "fontmanager.hxx"
+#include "gtk3cairotextrender.hxx"
 
 GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpEntryStyle = NULL;
@@ -1471,6 +1472,8 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
       mpFrame( pFrame ),
       mpWindow( pWindow )
 {
+    m_xTextRenderImpl.reset(new GtkCairoTextRender(*this));
+
     if(style_loaded)
         return;
 
@@ -1630,4 +1633,34 @@ void GtkSalGraphics::copyArea( long nDestX, long nDestY,
 #endif
 }
 
+cairo_t* GtkSalGraphics::getCairoContext()
+{
+    basebmp::RawMemorySharedArray data = mpFrame->m_aFrame->getBuffer();
+    basegfx::B2IVector size = mpFrame->m_aFrame->getSize();
+    sal_Int32 nStride = mpFrame->m_aFrame->getScanlineStride();
+    cairo_surface_t *target =
+        cairo_image_surface_create_for_data(data.get(),
+                                        CAIRO_FORMAT_RGB24,
+                                        size.getX(), size.getY(),
+                                        nStride);
+    cairo_t* cr = cairo_create(target);
+    cairo_surface_destroy(target);
+    return cr;
+//    return gdk_cairo_create(gtk_widget_get_window(mpFrame->getWindow()));
+}
+
+void GtkSalGraphics::clipRegion(cairo_t* cr)
+{
+    if (!m_aClipRegion.IsEmpty())
+    {
+        RectangleVector aRectangles;
+        m_aClipRegion.GetRegionRectangles(aRectangles);
+        for (RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter)
+        {
+            cairo_rectangle(cr, aRectIter->Left(), aRectIter->Top(), aRectIter->GetWidth(), aRectIter->GetHeight());
+        }
+        cairo_clip(cr);
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */