diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-10 18:09:47 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-10 20:01:42 +0200 |
commit | a4f80a3a7c76efd9a73ec6803ccce7514bbc570e (patch) | |
tree | d4da2b6199091ad50ef6fbbd7406050ebc081132 /vcl | |
parent | 2f383611f356023948cd825688a95b5f9425fe13 (diff) |
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@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/sallayout.hxx | 90 |
1 files changed, 1 insertions, 89 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index b6fc7ed75a5c..123c339b525a 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -35,6 +35,7 @@ #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> // for typedef sal_UCS4 #include <vcl/devicecoordinate.hxx> +#include <vcl/vcllayout.hxx> #include "fontinstance.hxx" @@ -122,95 +123,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 bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int&, - const PhysicalFontFace** pFallbackFont = 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(); - -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 final : public SalLayout { public: |