mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GSoC: Move TextOutRenderer definition to winlayout.hxx

Browse Source 
Change-Id: I705f92d5ad55d7612c6413436c801de13f5352a6
This commit is contained in:
Akash Jain
2016-08-18 20:51:25 +05:30
committed by Khaled Hosny
parent ce320a0ab1
commit 3eda74cf7e
2 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
vcl/inc/win/winlayout.hxx
View File

@@ -417,4 +417,102 @@ public:
#endif
class TextOutRenderer
{
protected:
explicit TextOutRenderer() = default;
TextOutRenderer(const TextOutRenderer &) = delete;
TextOutRenderer & operator = (const TextOutRenderer &) = delete;
public:
static TextOutRenderer & get();
virtual ~TextOutRenderer() = default;
virtual bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) = 0;
};
class ExTextOutRenderer : public TextOutRenderer
{
ExTextOutRenderer(const ExTextOutRenderer &) = delete;
ExTextOutRenderer & operator = (const ExTextOutRenderer &) = delete;
public:
explicit ExTextOutRenderer() = default;
virtual ~ExTextOutRenderer() override = default;
bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) override;
};
#if ENABLE_GRAPHITE_DWRITE
class D2DWriteTextOutRenderer : public TextOutRenderer
{
typedef HRESULT(WINAPI *pD2D1CreateFactory_t)(D2D1_FACTORY_TYPE,
REFIID, const D2D1_FACTORY_OPTIONS *, void **);
typedef HRESULT(WINAPI *pDWriteCreateFactory_t)(DWRITE_FACTORY_TYPE,
REFIID, IUnknown **);
static HINSTANCE mmD2d1, mmDWrite;
static pD2D1CreateFactory_t D2D1CreateFactory;
static pDWriteCreateFactory_t DWriteCreateFactory;
public:
static bool InitModules();
explicit D2DWriteTextOutRenderer();
virtual ~D2DWriteTextOutRenderer() override;
bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) override;
inline bool BindDC(HDC hDC, Rectangle const & rRect = Rectangle(0, 0, 0, 0)) {
RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() };
return SUCCEEDED(mpRT->BindDC(hDC, &rc));
}
bool BindFont(HDC hDC) /*override*/;
bool ReleaseFont() /*override*/;
std::vector<Rectangle> GetGlyphInkBoxes(uint16_t * pGid, uint16_t * pGidEnd) const /*override*/;
ID2D1RenderTarget * GetRenderTarget() const { return mpRT; }
IDWriteFontFace * GetFontFace() const { return mpFontFace; }
float GetEmHeight() const { return mlfEmHeight; }
inline HRESULT CreateRenderTarget() {
if (mpRT) mpRT->Release(); mpRT = nullptr;
return mpD2DFactory->CreateDCRenderTarget(&mRTProps, &mpRT);
}
inline bool Ready() const { return mpGdiInterop && mpRT; }
private:
static void CleanupModules();
// This is a singleton object disable copy ctor and assignemnt operator
D2DWriteTextOutRenderer(const D2DWriteTextOutRenderer &) = delete;
D2DWriteTextOutRenderer & operator = (const D2DWriteTextOutRenderer &) = delete;
bool GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const;
bool GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLayout const &rLayout, float const lfEmHeight, Rectangle &) const;
ID2D1Factory * mpD2DFactory;
IDWriteFactory * mpDWriteFactory;
IDWriteGdiInterop * mpGdiInterop;
ID2D1DCRenderTarget * mpRT;
const D2D1_RENDER_TARGET_PROPERTIES mRTProps;
IDWriteFontFace * mpFontFace;
float mlfEmHeight;
HDC mhDC;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

96
vcl/win/gdi/winlayout.cxx
View File

@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "win/winlayout.hxx"
#include "osl/module.h"
#include "osl/file.h"
@@ -56,102 +54,8 @@
std::unique_ptr<GlobalGlyphCache> GlyphCache::gGlobalGlyphCache(new GlobalGlyphCache);
GLuint WinFontInstance::mnGLyphyProgram = 0;
class TextOutRenderer
{
protected:
explicit TextOutRenderer() = default;
TextOutRenderer(const TextOutRenderer &) = delete;
TextOutRenderer & operator = (const TextOutRenderer &) = delete;
public:
static TextOutRenderer & get();
virtual ~TextOutRenderer() = default;
virtual bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) = 0;
};
class ExTextOutRenderer : public TextOutRenderer
{
ExTextOutRenderer(const ExTextOutRenderer &) = delete;
ExTextOutRenderer & operator = (const ExTextOutRenderer &) = delete;
public:
explicit ExTextOutRenderer() = default;
virtual ~ExTextOutRenderer() override = default;
bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) override;
};
#if ENABLE_GRAPHITE_DWRITE
class D2DWriteTextOutRenderer : public TextOutRenderer
{
typedef HRESULT(WINAPI *pD2D1CreateFactory_t)(D2D1_FACTORY_TYPE,
REFIID, const D2D1_FACTORY_OPTIONS *, void **);
typedef HRESULT(WINAPI *pDWriteCreateFactory_t)(DWRITE_FACTORY_TYPE,
REFIID, IUnknown **);
static HINSTANCE mmD2d1, mmDWrite;
static pD2D1CreateFactory_t D2D1CreateFactory;
static pDWriteCreateFactory_t DWriteCreateFactory;
public:
static bool InitModules();
explicit D2DWriteTextOutRenderer();
virtual ~D2DWriteTextOutRenderer() override;
bool operator ()(SalLayout const &rLayout, HDC hDC,
const Rectangle* pRectToErase,
Point* pPos, int* pGetNextGlypInfo) override;
inline bool BindDC(HDC hDC, Rectangle const & rRect = Rectangle(0, 0, 0, 0)) {
RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() };
return SUCCEEDED(mpRT->BindDC(hDC, &rc));
}
bool BindFont(HDC hDC) /*override*/;
bool ReleaseFont() /*override*/;
std::vector<Rectangle> GetGlyphInkBoxes(uint16_t * pGid, uint16_t * pGidEnd) const /*override*/;
ID2D1RenderTarget * GetRenderTarget() const { return mpRT; }
IDWriteFontFace * GetFontFace() const { return mpFontFace; }
float GetEmHeight() const { return mlfEmHeight; }
inline HRESULT CreateRenderTarget() {
if (mpRT) mpRT->Release(); mpRT = nullptr;
return mpD2DFactory->CreateDCRenderTarget(&mRTProps, &mpRT);
}
inline bool Ready() const { return mpGdiInterop && mpRT; }
private:
static void CleanupModules();
// This is a singleton object disable copy ctor and assignemnt operator
D2DWriteTextOutRenderer(const D2DWriteTextOutRenderer &) = delete;
D2DWriteTextOutRenderer & operator = (const D2DWriteTextOutRenderer &) = delete;
bool GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const;
bool GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLayout const &rLayout, float const lfEmHeight, Rectangle &) const;
ID2D1Factory * mpD2DFactory;
IDWriteFactory * mpDWriteFactory;
IDWriteGdiInterop * mpGdiInterop;
ID2D1DCRenderTarget * mpRT;
const D2D1_RENDER_TARGET_PROPERTIES mRTProps;
IDWriteFontFace * mpFontFace;
float mlfEmHeight;
HDC mhDC;
};
inline void WinFontInstance::CacheGlyphWidth( int nCharCode, int nCharWidth )
{
maWidthMap[ nCharCode ] = nCharWidth;