vcl: Consolidate the Linux font code under vcl/unx/generic/font
The FreeType/fontconfig font backend was spread over three directories mostly for historical reasons. Lets clean this up and consolidate it under one directory. helper.cxx holds the psp path helpers, so it goes to print/ next to the rest of the printing code. Change-Id: I67d20e3e4bdf71d978a79e672bb31d3dd1460595 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208522 Tested-by: Jenkins Reviewed-by: Khaled Hosny <khaled@libreoffice.org>
This commit is contained in:
Khaled Hosny
committed by
Khaled Hosny
Khaled Hosny
parent
51a3b7b1e3
commit
c88d615db8
@@ -198,7 +198,7 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
|
||||
// connectivity/source/inc/ado/Awrapadox.hxx, MS SDK adoctint.h
|
||||
&& s != "_CustomCellRenderer" // vcl/unx/gtk3/customcellrenderer.hxx
|
||||
&& s != "_CustomCellRendererClass" // vcl/unx/gtk3/customcellrenderer.cxx
|
||||
&& s != "_FcPattern" // vcl/inc/unx/fc_fontoptions.hxx
|
||||
&& s != "_FcPattern" // vcl/inc/unx/font/fc_fontoptions.hxx
|
||||
&& s != "_GdkDisplay"
|
||||
// vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
|
||||
&& s != "_GdkEvent" // vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
|
||||
|
||||
@@ -1174,7 +1174,7 @@ vcl/source/font/font.cxx:777
|
||||
vcl/source/outdev/textline.cxx:97
|
||||
(anonymous namespace)::WavyLineCache m_aItems
|
||||
10
|
||||
vcl/unx/generic/fontmanager/fontconfig.cxx:119
|
||||
vcl/unx/generic/font/fontconfig.cxx:119
|
||||
(anonymous namespace)::CachedFontConfigFontOptions lru_options_cache
|
||||
10
|
||||
vcl/unx/gtk3/a11y/atkutil.cxx:618
|
||||
|
||||
Vendored
+1
-1
@@ -3,7 +3,7 @@ we don't define DLL_EXPORT as there in general is no need to export
|
||||
freetype symbols from the (dynamkic) library that freetype gets linked
|
||||
into, cairo.dll and vcllo.dll (or mergedlo.dll). But there is one
|
||||
exception: FT_Done_MM_Var *must* be exported as the code in
|
||||
dlFT_Done_MM_Var() in vcl/unx/generic/glyphs/freetype_glyphcache.cxx
|
||||
dlFT_Done_MM_Var() in vcl/unx/generic/font/freetype_glyphcache.cxx
|
||||
wants to look it up and call it.
|
||||
|
||||
--- include/freetype/ftmm.h
|
||||
|
||||
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,postprocess,\
|
||||
endif
|
||||
|
||||
# For configurations that use fontconfig (cf. inclusion of
|
||||
# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
|
||||
# vcl/unx/generic/font/fontconfig.cxx in Library_vcl), add
|
||||
# instdir/share/fonts/truetype/fc_local.conf when it shall
|
||||
# contain content from at least one of external/more_fonts/fc_local.snippet
|
||||
# (conditional on MORE_FONTS in BUILD_TYPE) and
|
||||
|
||||
@@ -14066,15 +14066,15 @@ vcl/inc/toolbox.h
|
||||
vcl/inc/unx/X11Helper.hxx
|
||||
vcl/inc/unx/cairotextrender.hxx
|
||||
vcl/inc/unx/cupsmgr.hxx
|
||||
vcl/inc/unx/fc_fontoptions.hxx
|
||||
vcl/inc/unx/fontmanager.hxx
|
||||
vcl/inc/unx/freetype_glyphcache.hxx
|
||||
vcl/inc/unx/font/fc_fontoptions.hxx
|
||||
vcl/inc/unx/font/fontmanager.hxx
|
||||
vcl/inc/unx/font/freetype_glyphcache.hxx
|
||||
vcl/inc/unx/freetypetextrender.hxx
|
||||
vcl/inc/unx/gendisp.hxx
|
||||
vcl/inc/unx/geninst.h
|
||||
vcl/inc/unx/genprn.h
|
||||
vcl/inc/unx/genpspgraphics.h
|
||||
vcl/inc/unx/glyphcache.hxx
|
||||
vcl/inc/unx/font/glyphcache.hxx
|
||||
vcl/inc/unx/gtk/gloactiongroup.h
|
||||
vcl/inc/unx/gtk/glomenu.h
|
||||
vcl/inc/unx/gtk/gtkdata.hxx
|
||||
@@ -14690,10 +14690,10 @@ vcl/unx/generic/dtrans/movedata_curs.h
|
||||
vcl/unx/generic/dtrans/movedata_mask.h
|
||||
vcl/unx/generic/dtrans/nodrop_curs.h
|
||||
vcl/unx/generic/dtrans/nodrop_mask.h
|
||||
vcl/unx/generic/fontmanager/fontconfig.cxx
|
||||
vcl/unx/generic/fontmanager/fontmanager.cxx
|
||||
vcl/unx/generic/fontmanager/fontsubst.cxx
|
||||
vcl/unx/generic/fontmanager/helper.cxx
|
||||
vcl/unx/generic/font/fontconfig.cxx
|
||||
vcl/unx/generic/font/fontmanager.cxx
|
||||
vcl/unx/generic/font/fontsubst.cxx
|
||||
vcl/unx/generic/print/helper.cxx
|
||||
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
|
||||
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
|
||||
vcl/unx/generic/gdi/cairotextrender.cxx
|
||||
@@ -14701,8 +14701,8 @@ vcl/unx/generic/gdi/font.cxx
|
||||
vcl/unx/generic/gdi/freetypetextrender.cxx
|
||||
vcl/unx/generic/gdi/salgdi.cxx
|
||||
vcl/unx/generic/gdi/salvd.cxx
|
||||
vcl/unx/generic/glyphs/freetype_glyphcache.cxx
|
||||
vcl/unx/generic/glyphs/glyphcache.cxx
|
||||
vcl/unx/generic/font/freetype_glyphcache.cxx
|
||||
vcl/unx/generic/font/glyphcache.cxx
|
||||
vcl/unx/generic/print/genprnpsp.cxx
|
||||
vcl/unx/generic/print/genpspgraphics.cxx
|
||||
vcl/unx/generic/print/prtsetup.cxx
|
||||
|
||||
@@ -73,7 +73,7 @@ excludelist:
|
||||
vcl/unx/generic/gdi/font.cxx:
|
||||
# Complete type needed for implicit dtor
|
||||
- vcl/fontcharmap.hxx
|
||||
vcl/unx/generic/glyphs/freetype_glyphcache.cxx:
|
||||
vcl/unx/generic/font/freetype_glyphcache.cxx:
|
||||
# Needed for FreeType header macros
|
||||
- ft2build.h
|
||||
vcl/unx/generic/print/genpspgraphics.cxx:
|
||||
|
||||
+6
-6
@@ -668,12 +668,12 @@ vcl_headless_freetype_code=\
|
||||
vcl/unx/generic/app/gendata \
|
||||
vcl/unx/generic/gdi/cairotextrender \
|
||||
vcl/unx/generic/gdi/freetypetextrender \
|
||||
vcl/unx/generic/glyphs/freetype_glyphcache \
|
||||
vcl/unx/generic/glyphs/glyphcache \
|
||||
vcl/unx/generic/fontmanager/fontsubst \
|
||||
vcl/unx/generic/fontmanager/fontconfig \
|
||||
vcl/unx/generic/fontmanager/fontmanager \
|
||||
vcl/unx/generic/fontmanager/helper \
|
||||
vcl/unx/generic/font/freetype_glyphcache \
|
||||
vcl/unx/generic/font/glyphcache \
|
||||
vcl/unx/generic/font/fontsubst \
|
||||
vcl/unx/generic/font/fontconfig \
|
||||
vcl/unx/generic/font/fontmanager \
|
||||
vcl/unx/generic/print/helper \
|
||||
vcl/unx/generic/print/genpspgraphics \
|
||||
vcl/unx/generic/print/genprnpsp \
|
||||
vcl/unx/generic/print/prtsetup \
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/timer.hxx>
|
||||
#include <com/sun/star/lang/Locale.hpp>
|
||||
#include <unx/fc_fontoptions.hxx>
|
||||
#include <unx/font/fc_fontoptions.hxx>
|
||||
|
||||
#include <font/PhysicalFontFace.hxx>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <unx/glyphcache.hxx>
|
||||
#include <unx/font/glyphcache.hxx>
|
||||
#include <font/PhysicalFontFace.hxx>
|
||||
#include <font/LogicalFontInstance.hxx>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <textrender.hxx>
|
||||
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
|
||||
// Generic implementation that uses freetype, but DrawTextLayout()
|
||||
// still needs implementing (e.g. by Cairo or Skia).
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
#include "salprn.hxx"
|
||||
#include "quartz/salgdi.h"
|
||||
#include "headless/svpinst.hxx"
|
||||
#include "unx/fontmanager.hxx"
|
||||
#include "unx/font/fontmanager.hxx"
|
||||
#include "unx/gendata.hxx"
|
||||
|
||||
std::unique_ptr<SalPrinter> SvpSalInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ )
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <vcl/glyphitemcache.hxx>
|
||||
|
||||
#include <font/FontSelectPattern.hxx>
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
#include <QtPainter.hxx>
|
||||
#include <font/PhysicalFontCollection.hxx>
|
||||
#if USE_HEADLESS_CODE
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <unx/geninst.h>
|
||||
#include <unx/glyphcache.hxx>
|
||||
#include <unx/font/glyphcache.hxx>
|
||||
#endif
|
||||
#include <sallayout.hxx>
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
#include <QtTools.hxx>
|
||||
#include <QtTransferable.hxx>
|
||||
#if USE_HEADLESS_CODE
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#endif
|
||||
|
||||
#include <o3tl/enumarray.hxx>
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
|
||||
#include <skia/x11/textrender.hxx>
|
||||
|
||||
#include <unx/fc_fontoptions.hxx>
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/fc_fontoptions.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <sallayout.hxx>
|
||||
#include <skia/gdiimpl.hxx>
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
#include <unx/gendata.hxx>
|
||||
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
|
||||
#ifndef IOS
|
||||
|
||||
#include <unx/glyphcache.hxx>
|
||||
#include <unx/font/glyphcache.hxx>
|
||||
#include <printerinfomanager.hxx>
|
||||
|
||||
SalData::SalData() {}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
#include <unx/salobj.h>
|
||||
#include <unx/sm.hxx>
|
||||
#include <unx/wmadaptor.hxx>
|
||||
#include <unx/glyphcache.hxx>
|
||||
#include <unx/font/glyphcache.hxx>
|
||||
#include <o3tl/string_view.hxx>
|
||||
|
||||
#include <poll.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <string_view>
|
||||
|
||||
#include <o3tl/lru_map.hxx>
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <comphelper/sequence.hxx>
|
||||
#include <vcl/dropcache.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <osl/thread.h>
|
||||
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <unx/gendata.hxx>
|
||||
#include <unx/helper.hxx>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <unx/geninst.h>
|
||||
#include <font/PhysicalFontCollection.hxx>
|
||||
#include <font/fontsubstitution.hxx>
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <unotools/fontdefs.hxx>
|
||||
|
||||
// platform specific font substitution hooks
|
||||
+2
-2
@@ -23,7 +23,7 @@
|
||||
#include <utility>
|
||||
#include <vcl/fontcharmap.hxx>
|
||||
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
|
||||
#include <font/LogicalFontInstance.hxx>
|
||||
#include <fontattributes.hxx>
|
||||
@@ -57,7 +57,7 @@
|
||||
#include <tools/UnixWrappers.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <impfontcharmap.hxx>
|
||||
|
||||
static FT_Library aLibFT = nullptr;
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
#include <unx/gendata.hxx>
|
||||
|
||||
#include <font/LogicalFontInstance.hxx>
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
#include <comphelper/scopeguard.hxx>
|
||||
#include <unx/cairotextrender.hxx>
|
||||
#include <unx/fc_fontoptions.hxx>
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/fc_fontoptions.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
#include <unx/gendata.hxx>
|
||||
#include <headless/CairoCommon.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
#include <vcl/fontcharmap.hxx>
|
||||
#include <sal/log.hxx>
|
||||
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <unx/geninst.h>
|
||||
#include <unx/glyphcache.hxx>
|
||||
#include <unx/fc_fontoptions.hxx>
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/glyphcache.hxx>
|
||||
#include <unx/font/fc_fontoptions.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
#include <font/PhysicalFontFace.hxx>
|
||||
#include <font/FontMetricData.hxx>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <config_cairo_canvas.h>
|
||||
|
||||
#include <fontsubset.hxx>
|
||||
#include <unx/freetype_glyphcache.hxx>
|
||||
#include <unx/font/freetype_glyphcache.hxx>
|
||||
#include <unx/geninst.h>
|
||||
#include <unx/genpspgraphics.h>
|
||||
#include <font/LogicalFontInstance.hxx>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <vcl/CairoFormats.hxx>
|
||||
#include <vcl/decoview.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <unx/fontmanager.hxx>
|
||||
#include <unx/font/fontmanager.hxx>
|
||||
#include <o3tl/string_view.hxx>
|
||||
#include <scrollbarvalue.hxx>
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include "headless/svpgdi.hxx"
|
||||
#include "unx/fontmanager.hxx"
|
||||
#include "unx/glyphcache.hxx"
|
||||
#include "unx/font/fontmanager.hxx"
|
||||
#include "unx/font/glyphcache.hxx"
|
||||
|
||||
using namespace ::com::sun::star::uno;
|
||||
using namespace ::com::sun::star::lang;
|
||||
|
||||
Reference in New Issue
Block a user