[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/vcl solenv/clang-format vcl/inc
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 6 20:53:02 UTC 2019
include/vcl/outdev.hxx | 2
include/vcl/vcllayout.hxx | 132 ++++++++++++++++++++++++++++++++++++++++++
solenv/clang-format/blacklist | 1
vcl/inc/sallayout.hxx | 92 -----------------------------
4 files changed, 135 insertions(+), 92 deletions(-)
New commits:
commit af95ed72a4e3bfa5ab08da02a59e84a2bf0c4728
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Fri Aug 10 18:09:47 2018 +0200
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Aug 6 22:52:15 2019 +0200
vcl: separate SalLayout from the rest of sallayout.hxx
This way SalLayout can be created separately (and potentially reused)
outside vcl as well. Don't reformat the moved code, so git blame keeps
working.
This is a first step towards the goal of
<https://wiki.documentfoundation.org/Development/Budget2017#Text_layout_performance>,
in the context of code outside vcl.
Change-Id: I8b40313b5fa531d3b56c153cbc4b5ca3cec8f8df
Reviewed-on: https://gerrit.libreoffice.org/58851
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/77064
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e5d496a29e97..9d866708129c 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1315,7 +1315,7 @@ public:
SAL_DLLPRIVATE void ReMirror( vcl::Region &rRegion ) const;
SAL_DLLPRIVATE bool ImplIsRecordLayout() const;
virtual bool HasMirroredGraphics() const;
- SAL_DLLPRIVATE std::unique_ptr<SalLayout>
+ std::unique_ptr<SalLayout>
ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen,
const Point& rLogicPos = Point(0,0), long nLogicWidth=0,
const long* pLogicDXArray=nullptr, SalLayoutFlags flags = SalLayoutFlags::NONE,
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
new file mode 100644
index 000000000000..0089bc69f693
--- /dev/null
+++ b/include/vcl/vcllayout.hxx
@@ -0,0 +1,132 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_VCLLAYOUT_HXX
+#define INCLUDED_VCL_VCLLAYOUT_HXX
+
+#include <memory>
+
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <tools/gen.hxx>
+#include <vcl/devicecoordinate.hxx>
+#include <vcl/dllapi.h>
+
+class ImplLayoutArgs;
+class PhysicalFontFace;
+class SalGraphics;
+struct GlyphItem;
+namespace vcl
+{
+class TextLayoutCache;
+}
+
+// all positions/widths are in font units
+// one exception: drawposition is in pixel units
+
+// Unfortunately there is little documentation to help implementors of
+// new classes derived from SalLayout ("layout engines"), and the code
+// and data structures are far from obvious.
+
+// For instance, I *think* the important virtual functions in the
+// layout engines are called in this order:
+
+// * InitFont()
+// * LayoutText()
+// * AdjustLayout(), any number of times (but presumably
+// usually not at all or just once)
+// * Optionally, DrawText()
+
+// Functions that just return information like GetTexWidth() and
+// FillDXArray() are called after LayoutText() and before DrawText().
+
+// Another important questions is which parts of an ImplLayoutArgs can
+// be changed by callers between LayoutText() and AdjustLayout()
+// calls. It probably makes sense only if one assumes that the "string
+// related inputs" part are not changed after LayoutText().
+
+// But why use the same ImplLayoutArgs structure as parameter for both
+// LayoutText() and AdjustLayout() in the first place? And why
+// duplicate some of the fields in both SalLayout and ImplLayoutArgs
+// (mnMinCharPos, mnEndCharPos, mnLayoutFlags==mnFlags,
+// mnOrientation)? Lost in history...
+
+class VCL_PLUGIN_PUBLIC SalLayout
+{
+public:
+ virtual ~SalLayout();
+ // used by upper layers
+ Point& DrawBase() { return maDrawBase; }
+ const Point& DrawBase() const { return maDrawBase; }
+ Point& DrawOffset() { return maDrawOffset; }
+ const Point& DrawOffset() const { return maDrawOffset; }
+ Point GetDrawPosition( const Point& rRelative = Point(0,0) ) const;
+
+ virtual bool LayoutText( ImplLayoutArgs& ) = 0; // first step of layouting
+ virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting after fallback etc.
+ virtual void InitFont() const {}
+ virtual void DrawText( SalGraphics& ) const = 0;
+
+ int GetUnitsPerPixel() const { return mnUnitsPerPixel; }
+ int GetOrientation() const { return mnOrientation; }
+
+ // methods using string indexing
+ virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const = 0;
+ virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0;
+ virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( nullptr ); }
+ virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0;
+ virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
+
+ // methods using glyph indexing
+ virtual int GetNextGlyphs(int nLen, const GlyphItem** pGlyphs, Point& rPos, int&,
+ const PhysicalFontFace** pFallbackFonts = nullptr) const = 0;
+ virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const;
+ virtual bool GetBoundRect( SalGraphics&, tools::Rectangle& ) const;
+
+ // used by glyph+font+script fallback
+ virtual void MoveGlyph( int nStart, long nNewXPos ) = 0;
+ virtual void DropGlyph( int nStart ) = 0;
+ virtual void Simplify( bool bIsBase ) = 0;
+
+ virtual std::shared_ptr<vcl::TextLayoutCache>
+ CreateTextLayoutCache(OUString const&) const;
+
+protected:
+ // used by layout engines
+ SalLayout();
+
+ static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical );
+
+private:
+ SalLayout( const SalLayout& ) = delete;
+ SalLayout& operator=( const SalLayout& ) = delete;
+
+protected:
+ int mnMinCharPos;
+ int mnEndCharPos;
+
+ int mnUnitsPerPixel;
+ int mnOrientation;
+
+ mutable Point maDrawOffset;
+ Point maDrawBase;
+};
+
+#endif // INCLUDED_VCL_VCLLAYOUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index f6e2c9e1b485..5d501adb6bdd 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -8140,6 +8140,7 @@ include/vcl/unohelp2.hxx
include/vcl/unowrap.hxx
include/vcl/vclenum.hxx
include/vcl/vclevent.hxx
+include/vcl/vcllayout.hxx
include/vcl/vclmain.hxx
include/vcl/vclmedit.hxx
include/vcl/vclptr.hxx
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index c4a29dc9d0c9..a525bd5a6a97 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -31,6 +31,7 @@
#include <vcl/dllapi.h>
#include <vcl/vclenum.hxx> // for typedef sal_UCS4
#include <vcl/devicecoordinate.hxx>
+#include <vcl/vcllayout.hxx>
#include "salglyphid.hxx"
@@ -118,97 +119,6 @@ private:
// For nice SAL_INFO logging of ImplLayoutArgs values
std::ostream &operator <<(std::ostream& s, ImplLayoutArgs const &rArgs);
-// all positions/widths are in font units
-// one exception: drawposition is in pixel units
-
-// Unfortunately there is little documentation to help implementors of
-// new classes derived from SalLayout ("layout engines"), and the code
-// and data structures are far from obvious.
-
-// For instance, I *think* the important virtual functions in the
-// layout engines are called in this order:
-
-// * InitFont()
-// * LayoutText()
-// * AdjustLayout(), any number of times (but presumably
-// usually not at all or just once)
-// * Optionally, DrawText()
-
-// Functions that just return information like GetTexWidth() and
-// FillDXArray() are called after LayoutText() and before DrawText().
-
-// Another important questions is which parts of an ImplLayoutArgs can
-// be changed by callers between LayoutText() and AdjustLayout()
-// calls. It probably makes sense only if one assumes that the "string
-// related inputs" part are not changed after LayoutText().
-
-// But why use the same ImplLayoutArgs structure as parameter for both
-// LayoutText() and AdjustLayout() in the first place? And why
-// duplicate some of the fields in both SalLayout and ImplLayoutArgs
-// (mnMinCharPos, mnEndCharPos, mnLayoutFlags==mnFlags,
-// mnOrientation)? Lost in history...
-
-class VCL_PLUGIN_PUBLIC SalLayout
-{
-public:
- virtual ~SalLayout();
- // used by upper layers
- Point& DrawBase() { return maDrawBase; }
- const Point& DrawBase() const { return maDrawBase; }
- Point& DrawOffset() { return maDrawOffset; }
- const Point& DrawOffset() const { return maDrawOffset; }
- Point GetDrawPosition( const Point& rRelative = Point(0,0) ) const;
-
- virtual bool LayoutText( ImplLayoutArgs& ) = 0; // first step of layouting
- virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting after fallback etc.
- virtual void InitFont() const {}
- virtual void DrawText( SalGraphics& ) const = 0;
-
- int GetUnitsPerPixel() const { return mnUnitsPerPixel; }
- int GetOrientation() const { return mnOrientation; }
-
- // methods using string indexing
- virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const = 0;
- virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0;
- virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( nullptr ); }
- virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0;
- virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
-
- // methods using glyph indexing
- virtual int GetNextGlyphs(int nLen, const GlyphItem** pGlyphs, Point& rPos, int&,
- const PhysicalFontFace** pFallbackFonts = nullptr) const = 0;
- virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const;
- virtual bool GetBoundRect( SalGraphics&, tools::Rectangle& ) const;
-
- // used by glyph+font+script fallback
- virtual void MoveGlyph( int nStart, long nNewXPos ) = 0;
- virtual void DropGlyph( int nStart ) = 0;
- virtual void Simplify( bool bIsBase ) = 0;
-
- virtual std::shared_ptr<vcl::TextLayoutCache>
- CreateTextLayoutCache(OUString const&) const;
-
-protected:
- // used by layout engines
- SalLayout();
-
- static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical );
-
-private:
- SalLayout( const SalLayout& ) = delete;
- SalLayout& operator=( const SalLayout& ) = delete;
-
-protected:
- int mnMinCharPos;
- int mnEndCharPos;
-
- int mnUnitsPerPixel;
- int mnOrientation;
-
- mutable Point maDrawOffset;
- Point maDrawBase;
-};
-
class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
{
public:
More information about the Libreoffice-commits
mailing list