From 6edecb49c0b2e16df58a79b4b93c24567bfaafac Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 26 Jan 2016 00:13:56 +1100 Subject: vcl: rename Unix salgdi3.cxx to font.cxx Change-Id: I201f8e5281332ae9668f59060ea2a94f211a7c68 --- vcl/Library_vclplug_gen.mk | 2 +- vcl/unx/generic/gdi/font.cxx | 166 ++++++++++++++++++++++++++++++++++++++++ vcl/unx/generic/gdi/salgdi3.cxx | 166 ---------------------------------------- 3 files changed, 167 insertions(+), 167 deletions(-) create mode 100644 vcl/unx/generic/gdi/font.cxx delete mode 100644 vcl/unx/generic/gdi/salgdi3.cxx diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 79bd353cea57..859bc986a937 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -96,7 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/gdi/openglx11cairotextrender \ vcl/unx/generic/gdi/salbmp \ vcl/unx/generic/gdi/salgdi2 \ - vcl/unx/generic/gdi/salgdi3 \ + vcl/unx/generic/gdi/font \ vcl/unx/generic/gdi/salgdi \ vcl/unx/generic/gdi/salvd \ vcl/unx/generic/gdi/xrender_peer \ diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx new file mode 100644 index 000000000000..e0ca0423560a --- /dev/null +++ b/vcl/unx/generic/gdi/font.cxx @@ -0,0 +1,166 @@ +/* -*- 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 . + */ + +#include +#include + +#include "unx/saldisp.hxx" +#include "unx/salgdi.h" +#include "unx/salvd.h" +#include "textrender.hxx" + +GC +X11SalGraphics::GetFontGC() +{ + Display *pDisplay = GetXDisplay(); + + if( !pFontGC_ ) + { + XGCValues values; + values.subwindow_mode = ClipByChildren; + values.fill_rule = EvenOddRule; // Pict import/ Gradient + values.graphics_exposures = False; + values.foreground = nTextPixel_; + pFontGC_ = XCreateGC( pDisplay, hDrawable_, + GCSubwindowMode | GCFillRule + | GCGraphicsExposures | GCForeground, + &values ); + } + if( !bFontGC_ ) + { + XSetForeground( pDisplay, pFontGC_, nTextPixel_ ); + SetClipRegion( pFontGC_ ); + bFontGC_ = true; + } + + return pFontGC_; +} + +void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) +{ + mxTextRenderImpl->DrawServerFontLayout(rLayout); +} + +const FontCharMapPtr X11SalGraphics::GetFontCharMap() const +{ + return mxTextRenderImpl->GetFontCharMap(); +} + +bool X11SalGraphics::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCapabilities) const +{ + return mxTextRenderImpl->GetFontCapabilities(rGetImplFontCapabilities); +} + +// SalGraphics + +sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) +{ + return mxTextRenderImpl->SetFont(pEntry, nFallbackLevel); +} + +void +X11SalGraphics::SetTextColor( SalColor nSalColor ) +{ + mxTextRenderImpl->SetTextColor(nSalColor); + nTextPixel_ = GetPixel( nSalColor ); + bFontGC_ = false; +} + +bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, + const OUString& rFileURL, + const OUString& rFontName ) +{ + return mxTextRenderImpl->AddTempDevFont(pFontCollection, rFileURL, rFontName); +} + +void X11SalGraphics::ClearDevFontCache() +{ + mxTextRenderImpl->ClearDevFontCache(); +} + +void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) +{ + mxTextRenderImpl->GetDevFontList(pFontCollection); +} + +void +X11SalGraphics::GetFontMetric( ImplFontMetricDataPtr &rxFontMetric, int nFallbackLevel ) +{ + mxTextRenderImpl->GetFontMetric(rxFontMetric, nFallbackLevel); +} + +bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) +{ + return mxTextRenderImpl->GetGlyphBoundRect(aGlyphId, rRect); +} + +bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, + basegfx::B2DPolyPolygon& rPolyPoly ) +{ + return mxTextRenderImpl->GetGlyphOutline(aGlyphId, rPolyPoly); +} + +SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +{ + return mxTextRenderImpl->GetTextLayout(rArgs, nFallbackLevel); +} + +SystemFontData X11SalGraphics::GetSysFontData( int nFallbackLevel ) const +{ + return mxTextRenderImpl->GetSysFontData(nFallbackLevel); +} + +bool X11SalGraphics::CreateFontSubset( + const OUString& rToFile, + const PhysicalFontFace* pFont, + const sal_GlyphId* pGlyphIds, + const sal_uInt8* pEncoding, + sal_Int32* pWidths, + int nGlyphCount, + FontSubsetInfo& rInfo + ) +{ + return mxTextRenderImpl->CreateFontSubset(rToFile, pFont, + pGlyphIds, pEncoding, pWidths, nGlyphCount, rInfo); +} + +const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, size_t nLen, FontSubsetInfo& rInfo, long* pDataLen ) +{ + return mxTextRenderImpl->GetEmbedFontData(pFont, pUnicodes, pWidths, nLen, rInfo, pDataLen); +} + +void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen ) +{ + mxTextRenderImpl->FreeEmbedFontData(pData, nLen); +} + +const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded, std::set const** ppPriority) +{ + return mxTextRenderImpl->GetFontEncodingVector(pFont, pNonEncoded, ppPriority); +} + +void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, + bool bVertical, + Int32Vector& rWidths, + Ucs2UIntMap& rUnicodeEnc ) +{ + mxTextRenderImpl->GetGlyphWidths(pFont, bVertical, rWidths, rUnicodeEnc); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx deleted file mode 100644 index e0ca0423560a..000000000000 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ /dev/null @@ -1,166 +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/. - * - * 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 . - */ - -#include -#include - -#include "unx/saldisp.hxx" -#include "unx/salgdi.h" -#include "unx/salvd.h" -#include "textrender.hxx" - -GC -X11SalGraphics::GetFontGC() -{ - Display *pDisplay = GetXDisplay(); - - if( !pFontGC_ ) - { - XGCValues values; - values.subwindow_mode = ClipByChildren; - values.fill_rule = EvenOddRule; // Pict import/ Gradient - values.graphics_exposures = False; - values.foreground = nTextPixel_; - pFontGC_ = XCreateGC( pDisplay, hDrawable_, - GCSubwindowMode | GCFillRule - | GCGraphicsExposures | GCForeground, - &values ); - } - if( !bFontGC_ ) - { - XSetForeground( pDisplay, pFontGC_, nTextPixel_ ); - SetClipRegion( pFontGC_ ); - bFontGC_ = true; - } - - return pFontGC_; -} - -void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) -{ - mxTextRenderImpl->DrawServerFontLayout(rLayout); -} - -const FontCharMapPtr X11SalGraphics::GetFontCharMap() const -{ - return mxTextRenderImpl->GetFontCharMap(); -} - -bool X11SalGraphics::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCapabilities) const -{ - return mxTextRenderImpl->GetFontCapabilities(rGetImplFontCapabilities); -} - -// SalGraphics - -sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) -{ - return mxTextRenderImpl->SetFont(pEntry, nFallbackLevel); -} - -void -X11SalGraphics::SetTextColor( SalColor nSalColor ) -{ - mxTextRenderImpl->SetTextColor(nSalColor); - nTextPixel_ = GetPixel( nSalColor ); - bFontGC_ = false; -} - -bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, - const OUString& rFileURL, - const OUString& rFontName ) -{ - return mxTextRenderImpl->AddTempDevFont(pFontCollection, rFileURL, rFontName); -} - -void X11SalGraphics::ClearDevFontCache() -{ - mxTextRenderImpl->ClearDevFontCache(); -} - -void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) -{ - mxTextRenderImpl->GetDevFontList(pFontCollection); -} - -void -X11SalGraphics::GetFontMetric( ImplFontMetricDataPtr &rxFontMetric, int nFallbackLevel ) -{ - mxTextRenderImpl->GetFontMetric(rxFontMetric, nFallbackLevel); -} - -bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) -{ - return mxTextRenderImpl->GetGlyphBoundRect(aGlyphId, rRect); -} - -bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, - basegfx::B2DPolyPolygon& rPolyPoly ) -{ - return mxTextRenderImpl->GetGlyphOutline(aGlyphId, rPolyPoly); -} - -SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) -{ - return mxTextRenderImpl->GetTextLayout(rArgs, nFallbackLevel); -} - -SystemFontData X11SalGraphics::GetSysFontData( int nFallbackLevel ) const -{ - return mxTextRenderImpl->GetSysFontData(nFallbackLevel); -} - -bool X11SalGraphics::CreateFontSubset( - const OUString& rToFile, - const PhysicalFontFace* pFont, - const sal_GlyphId* pGlyphIds, - const sal_uInt8* pEncoding, - sal_Int32* pWidths, - int nGlyphCount, - FontSubsetInfo& rInfo - ) -{ - return mxTextRenderImpl->CreateFontSubset(rToFile, pFont, - pGlyphIds, pEncoding, pWidths, nGlyphCount, rInfo); -} - -const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, size_t nLen, FontSubsetInfo& rInfo, long* pDataLen ) -{ - return mxTextRenderImpl->GetEmbedFontData(pFont, pUnicodes, pWidths, nLen, rInfo, pDataLen); -} - -void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen ) -{ - mxTextRenderImpl->FreeEmbedFontData(pData, nLen); -} - -const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded, std::set const** ppPriority) -{ - return mxTextRenderImpl->GetFontEncodingVector(pFont, pNonEncoded, ppPriority); -} - -void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, - bool bVertical, - Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ) -{ - mxTextRenderImpl->GetGlyphWidths(pFont, bVertical, rWidths, rUnicodeEnc); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit