diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-18 12:01:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-18 12:01:49 +0000 |
| commit | 9c48ea8482540a02be180daddb0b12752fb90daf (patch) | |
| tree | 155a2b5a149930ff9cc843d4358b5319f5cdf89d | |
| parent | 2652c7dda9b52db25cc06f2c99a91a853072520c (diff) | |
CWS-TOOLING: integrate CWS cairocanvastext01
2009-05-12 07:10:00 +0200 mox r271795 : Rename ::GetLayoutData() to ::GetSysTextLayoutData() to avoid build
breakage in sc module.
2009-05-11 23:40:57 +0200 mox r271794 : merge fixes (again). These files should have been removed by the rebase.
2009-05-11 20:17:44 +0200 mox r271791 : fix build breakage on UNX
2009-05-11 16:53:15 +0200 mox r271779 : Documentation fix
2009-05-11 16:49:16 +0200 mox r271778 : merge fixes
2009-05-11 14:10:36 +0200 mox r271769 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@271427 (milestone: DEV300:m47)
2009-05-11 10:55:11 +0200 mox r271760 : merge fixes
2009-05-11 10:49:44 +0200 mox r271759 : manual merge to DEV300_m47
2009-05-11 10:42:11 +0200 mox r271758 : merge fixes
2009-05-11 10:29:16 +0200 mox r271757 : Manual merge to DEV300_m47
2009-05-11 10:21:13 +0200 mox r271756 : manual merge to DEV300_m47
2009-05-11 10:10:29 +0200 mox r271755 : manual merge to DEV300_m47
2009-05-11 10:01:33 +0200 mox r271754 : Manual merge to DEV300_m47
2009-05-11 09:59:30 +0200 mox r271753 : manual merge to DEV300_m47
2009-05-11 09:57:33 +0200 mox r271752 : merge fixes
2009-05-11 09:56:05 +0200 mox r271751 : merge fixes
2009-05-11 09:53:26 +0200 mox r271749 : Manual merge to DEV300_m47
2009-05-11 09:49:34 +0200 mox r271748 : manual merge to DEV300_m47
2009-05-11 09:43:20 +0200 mox r271747 : manual merge to DEV300_m47
2009-05-11 09:30:10 +0200 mox r271745 : Manual merge to DEV300_m47
2009-05-11 09:28:59 +0200 mox r271744 : manual merge to DEV300_m47
2009-05-11 09:24:49 +0200 mox r271743 : Fix to merge
2009-05-11 09:21:55 +0200 mox r271742 : Manual merge to DEV300_m47
2009-05-11 09:18:13 +0200 mox r271741 : merge fixes
2009-05-11 09:00:50 +0200 mox r271739 : Manual merge to DEV300_m47
2009-05-09 13:26:10 +0200 mox r271734 : cleanup
2009-05-09 13:17:22 +0200 mox r271733 : WNT build fixes
2009-05-09 09:23:59 +0200 mox r271732 : Implement proper cross-platform font width calculation
Implement faux bold support
2009-02-21 19:47:08 +0100 mox r268339 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@267171 (milestone: DEV300:m41)
2009-01-19 21:51:21 +0100 mox r266530 : Fix compilation on win32
2009-01-19 21:37:20 +0100 mox r266529 : Fix typo
2009-01-19 21:35:28 +0100 mox r266528 : Better debug
2009-01-19 21:13:30 +0100 mox r266527 : Win32 fixes for proper text rendering
2009-01-19 21:12:56 +0100 mox r266526 : Win32 fixes for proper text rendering
2008-12-27 13:04:05 +0100 mox r265814 : configure fixes
2008-12-27 11:37:00 +0100 mox r265813 : x86_64 works only with system-cairo
2008-12-26 20:02:32 +0100 mox r265809 : Use the fix for 64bit builds
2008-12-25 16:58:11 +0100 mox r265802 : Fix build breaker on WNT
2008-12-24 23:04:58 +0100 mox r265801 : Unbreak build after rebase.
2008-12-23 18:52:32 +0100 mox r265790 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@265758 (milestone: DEV300:m38)
2008-12-23 18:23:09 +0100 mox r265789 : Fix the fix
2008-12-23 18:21:27 +0100 mox r265788 : Fix OS2 stuff
2008-12-11 19:50:40 +0100 mox r265354 : Fix build breaker on Mac
2008-12-09 22:00:53 +0100 mox r265139 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@264807 (milestone: DEV300:m37)
2008-12-08 23:02:32 +0100 thb r265052 : Removed outdated parts from readme
2008-12-08 22:26:54 +0100 mox r265051 : cleanup
2008-12-07 19:55:31 +0100 mox r264967 : Fix for non-intel processors.
2008-12-07 19:47:11 +0100 mox r264963 : sysdata fixes
2008-12-07 19:23:27 +0100 mox r264959 : Sysdata fixes
2008-12-07 19:01:48 +0100 mox r264958 : Fix sysdata usage
2008-12-07 11:41:33 +0100 mox r264951 : sysdata fixes
2008-12-07 11:38:32 +0100 mox r264950 : sysdata fixes
2008-12-06 23:15:06 +0100 mox r264947 : Try to fix error: __sync_val_compare_and_swap_4
2008-12-06 23:09:30 +0100 mox r264945 : Revert unnecessary change.
2008-12-06 23:04:40 +0100 mox r264944 : Use pre/postx from tools module.
2008-12-06 22:49:08 +0100 mox r264943 : Use proper pre/post includes.
2008-12-06 22:48:03 +0100 mox r264942 : Use pre/postx from tools module.
2008-12-06 22:24:10 +0100 mox r264941 : Fix build breaker.
2008-12-06 21:55:46 +0100 mox r264940 : Make pre/postx.h properly available
2008-12-06 21:54:23 +0100 mox r264939 : Make pre/postx.h properly available.
2008-12-06 21:43:09 +0100 mox r264938 : Try to fix error: __sync_val_compare_and_swap_4
2008-12-06 21:12:18 +0100 mox r264937 : Remove obsolete pre-built binaries
2008-12-06 21:07:40 +0100 mox r264936 : WNT: do not hardcode pixman version in cairo build
2008-12-06 19:26:44 +0100 mox r264934 : Revert pixman upgrade.
2008-12-06 18:35:14 +0100 mox r264933 : Fix build breaker
2008-12-06 18:31:11 +0100 mox r264932 : Use static pixman lib on unx/32bit to avoid linking problems
2008-12-06 17:22:52 +0100 mox r264930 : Update pixman to 0.13.2
2008-12-06 13:30:41 +0100 mox r264928 : Fix accidentally changed property
2008-12-06 13:09:00 +0100 mox r264927 : Fix accidental prop changes
2008-12-06 12:40:08 +0100 mox r264926 : Fix build breaker on Win32
2008-12-06 12:39:22 +0100 mox r264925 : Fix build breaker on Win32
2008-12-06 12:30:23 +0100 mox r264924 : Fix build breakers on win32
2008-12-06 11:45:33 +0100 mox r264923 : revert.
2008-12-06 11:43:05 +0100 mox r264922 : Try to fix header include problems on WNT
2008-12-06 09:57:35 +0100 mox r264921 : Cleanup accidental props
2008-11-29 14:43:51 +0100 mox r264580 : Move headers around to make all platforms compile
2008-11-29 14:41:59 +0100 mox r264579 : WaE fixes for X11
2008-11-29 13:13:49 +0100 mox r264578 : Fix build breaker on linux
2008-11-29 12:21:03 +0100 mox r264577 : Fix build breaker
2008-11-29 12:13:50 +0100 mox r264576 : Try to fix build breaker
2008-11-28 22:51:27 +0100 mox r264573 : Revert header includes to common style
2008-11-18 18:59:15 +0100 mox r263794 : Fix build breaker.
2008-11-17 20:28:19 +0100 mox r263740 : Revert most configure hacks
2008-11-17 20:12:51 +0100 mox r263739 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@263288 (milestone: DEV300:m35)
2008-11-14 21:22:22 +0100 mox r263698 : ZLIB_FIX define set
2008-11-14 18:48:22 +0100 mox r263694 : hardcode zlib paths
2008-11-14 16:23:07 +0100 mox r263683 : Fix typo
2008-11-13 20:16:13 +0100 mox r263662 : WaE fix
2008-11-13 19:44:29 +0100 mox r263661 : Properly include zlib headers for win32
2008-11-12 20:05:51 +0100 mox r263610 : Add debugging code.
2008-11-10 19:44:35 +0100 mox r263537 : Try to fix build breaker
2008-11-09 22:34:35 +0100 mox r263504 : Remove accidentally added svn:ignore properties.
2008-11-09 22:33:21 +0100 mox r263503 : prop should be actually deleted.
2008-11-09 22:30:06 +0100 mox r263502 : props should be empty.
2008-11-09 22:23:22 +0100 mox r263501 : Try fix props again...
2008-11-09 22:11:26 +0100 mox r263500 : try to fix svn:ignore
2008-11-09 21:30:01 +0100 mox r263499 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@262620 (milestone: DEV300:m34)
2008-11-09 20:30:55 +0100 mox r263498 : add missing cairo patch
2008-11-09 10:56:33 +0100 mox r263494 : Resync cairo module with cws cairosource01
2008-11-01 09:32:19 +0100 mox r262870 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@262620 (milestone: DEV300:m34)
2008-10-26 20:55:48 +0100 mox r262663 : Fix build breaker
2008-10-25 13:10:00 +0200 mox r262662 : CWS rebase to m33
2008-10-12 19:47:56 +0200 mox r262170 : Migrate CWS cairocanvastext01 to SVN.
63 files changed, 745 insertions, 312 deletions
diff --git a/canvas/overview.txt b/canvas/overview.txt index 0f9ada46dac9..5d508b04bc45 100644 --- a/canvas/overview.txt +++ b/canvas/overview.txt @@ -1,13 +1,10 @@ The new OOo Canvas Framework ============================ -The new OpenOffice.org canvas framework is the successor of the -system GUI and graphics backend VCL. It is planned for the -OpenOffice.org 2.0 release, and currently ready in a first developer -version, with X11, Java, and DirectX/GDI+ backends. This means, that -basic functionality is available, supplying just as much features as -to provide a VCL-equivalent feature set (except proper BiDi/CTL -support). +The new OpenOffice.org canvas framework is the successor of the system +GUI and graphics backend VCL. Basic functionality is available, +supplying just as much features as necessary to provide a +VCL-equivalent feature set (except proper BiDi/CTL support). For migration purposes, the new canvas and VCL will be shipped with OpenOffice.org for quite some time, allowing a step-by-step adaptation diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index a38553055ae0..ac530f5d4632 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -343,10 +343,12 @@ namespace cairocanvas // TODO(F2): alpha mpVirtualDevice->SetLayoutMode( nLayoutMode ); - mpVirtualDevice->DrawText( aOutpos, - text.Text, - ::canvas::tools::numeric_cast<USHORT>(text.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(text.Length) ); + + OSL_TRACE(":cairocanvas::CanvasHelper::drawText(O,t,f,v,r,d): %s", ::rtl::OUStringToOString( text.Text.copy( text.StartPosition, text.Length ), + RTL_TEXTENCODING_UTF8 ).getStr()); + + TextLayout* pTextLayout = new TextLayout(text, textDirection, 0, CanvasFont::Reference(dynamic_cast< CanvasFont* >( xFont.get() )), mpSurfaceProvider); + pTextLayout->draw( mpSurface, *mpVirtualDevice, aOutpos, viewState, renderState ); } return uno::Reference< rendering::XCachedPrimitive >(NULL); @@ -384,7 +386,7 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); // no output necessary // TODO(F2): What about the offset scalings? - pTextLayout->draw( *mpVirtualDevice, aOutpos, viewState, renderState ); + pTextLayout->draw( mpSurface, *mpVirtualDevice, aOutpos, viewState, renderState ); } } else diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index 2575c206f294..a3c6c9bba255 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -37,6 +37,9 @@ ************************************************************************/ #include <osl/diagnose.h> +#include <vcl/sysdata.hxx> +#include <vcl/bitmap.hxx> +#include <vcl/virdev.hxx> #include "cairo_cairo.hxx" diff --git a/canvas/source/cairo/cairo_quartz_cairo.hxx b/canvas/source/cairo/cairo_quartz_cairo.hxx index 31659bbf79f5..fe748d26640a 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.hxx +++ b/canvas/source/cairo/cairo_quartz_cairo.hxx @@ -38,10 +38,6 @@ #include <cairo-quartz.h> #include "postmac.h" -#include <vcl/sysdata.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/virdev.hxx> - namespace cairo { class QuartzSurface : public Surface diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 5078289a9c40..f822749cab20 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -31,6 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_canvas.hxx" +#include <math.h> + #include <canvas/debug.hxx> #include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> @@ -38,6 +40,13 @@ #include <vcl/metric.hxx> #include <vcl/virdev.hxx> +#ifdef WNT +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> +#endif +#include <vcl/sysdata.hxx> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> @@ -46,6 +55,17 @@ #include "cairo_textlayout.hxx" #include "cairo_spritecanvas.hxx" +#ifdef CAIRO_HAS_QUARTZ_SURFACE +# include "cairo_quartz_cairo.hxx" +#elif defined CAIRO_HAS_WIN32_SURFACE +# include "cairo_win32_cairo.hxx" +# include <cairo-win32.h> +#elif defined CAIRO_HAS_XLIB_SURFACE +# include "cairo_xlib_cairo.hxx" +# include <cairo-ft.h> +#else +# error Native API needed. +#endif using namespace ::cairo; using namespace ::com::sun::star; @@ -292,6 +312,11 @@ namespace cairocanvas cairo_set_font_size( pCairo, aFontRequest.CellSize ); } + /** TextLayout:draw + * + * This function uses the "toy" api of the cairo library + * + **/ bool TextLayout::draw( Cairo* pCairo ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -310,6 +335,248 @@ namespace cairocanvas return true; } + + /** + * TextLayout::isCairoRenderable + * + * Features currenly not supported by Cairo (VCL rendering is used as fallback): + * - vertical glyphs + * + * @return true, if text/font can be rendered with cairo + **/ + bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const + { +#if defined UNX && !defined QUARTZ + // is font usable? + if (!aSysFontData.nFontId) return false; +#endif + + // vertical glyph rendering is not supported in cairo for now + if (aSysFontData.bVerticalCharacterType) { + OSL_TRACE(":cairocanvas::TextLayout::isCairoRenderable(): ***************** VERTICAL CHARACTER STYLE!!! ****************"); + return false; + } + + return true; + } + + + /** + * TextLayout::draw + * + * Cairo-based text rendering. Draw text directly on the cairo surface with cairo fonts. + * Avoid using VCL VirtualDevices for that, bypassing VCL DrawText functions, when possible + * + * Note: some text effects are not rendered due to lacking generic canvas or cairo canvas + * implementation. See issues 92657, 92658, 92659, 92660, 97529 + * + * @return true, if successful + **/ + bool TextLayout::draw( SurfaceSharedPtr& pSurface, + OutputDevice& rOutDev, + const Point& rOutpos, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) const + { + ::osl::MutexGuard aGuard( m_aMutex ); + SystemTextLayoutData aSysLayoutData; +#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1) + LOGFONTW logfont; +#endif + setupLayoutMode( rOutDev, mnTextDirection ); + + // TODO(P2): cache that + ::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]); + + if( maLogicalAdvancements.getLength() ) + { + setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); + + // TODO(F3): ensure correct length and termination for DX + // array (last entry _must_ contain the overall width) + } + + aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text, + ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), + ::canvas::tools::numeric_cast<USHORT>(maText.Length), + maLogicalAdvancements.getLength() ? aOffsets.get() : NULL); + + // The ::GetSysTextLayoutData(), i.e. layouting of text to glyphs can change the font being used. + // The fallback checks need to be done after final font is known. + if (!isCairoRenderable(aSysLayoutData.aSysFontData)) // VCL FALLBACKS + { + OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): VCL FALLBACK %s%s%s%s - %s", + maLogicalAdvancements.getLength() ? "ADV " : "", + aSysLayoutData.aSysFontData.bAntialias ? "AA " : "", + aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "", + aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "", + ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ), + RTL_TEXTENCODING_UTF8 ).getStr()); + + if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances + { + rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(), + ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), + ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); + return true; + } + else // VCL FALLBACK - without advances + { + rOutDev.DrawText( rOutpos, maText.Text, + ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), + ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); + return true; + } + } + + if (aSysLayoutData.rGlyphData.empty()) return false; //??? false? + + /** + * Setup platform independent glyph vector into cairo-based glyphs vector. + **/ + + // setup glyphs + std::vector<cairo_glyph_t> cairo_glyphs; + cairo_glyphs.reserve( 256 ); + + for( int nStart = 0; nStart < (int) aSysLayoutData.rGlyphData.size(); nStart++ ) + { + cairo_glyph_t aGlyph; + SystemGlyphData systemGlyph = aSysLayoutData.rGlyphData.at(nStart); + aGlyph.index = systemGlyph.index; +#ifdef CAIRO_HAS_WIN32_SURFACE + // Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), while vcl/win/* uses ucs4 chars. + // Convert to standard indexes + aGlyph.index = cairo::ucs4toindex((unsigned int) aGlyph.index, aSysLayoutData.aSysFontData.hFont); +#endif + aGlyph.x = systemGlyph.x; + aGlyph.y = systemGlyph.y; + cairo_glyphs.push_back(aGlyph); + } + + if (cairo_glyphs.empty()) return true; //true or false?? + + /** + * Setup font + **/ + cairo_font_face_t* font_face = NULL; + +#ifdef CAIRO_HAS_QUARTZ_SURFACE + // TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont) + // when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend. + font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) aSysLayoutData.aSysFontData.aATSUFontID); + +#elif defined CAIRO_HAS_WIN32_SURFACE + #if (OSL_DEBUG_LEVEL > 1) + GetObjectW( aSysLayoutData.aSysFontData.hFont, sizeof(logfont), &logfont ); + #endif + // Note: cairo library uses logfont fallbacks when lfEscapement, lfOrientation and lfWidth are not zero. + // VCL always has non-zero value for lfWidth + font_face = cairo_win32_font_face_create_for_hfont(aSysLayoutData.aSysFontData.hFont); + +#elif defined CAIRO_HAS_XLIB_SURFACE + font_face = cairo_ft_font_face_create_for_ft_face((FT_Face)aSysLayoutData.aSysFontData.nFontId, + aSysLayoutData.aSysFontData.nFontFlags); +#else +# error Native API needed. +#endif + + CairoSharedPtr pSCairo = pSurface->getCairo(); + + cairo_set_font_face( pSCairo.get(), font_face); + + // create default font options. cairo_get_font_options() does not retrieve the surface defaults, + // only what has been set before with cairo_set_font_options() + cairo_font_options_t* options = cairo_font_options_create(); + if (aSysLayoutData.aSysFontData.bAntialias) { + // CAIRO_ANTIALIAS_GRAY provides more similar result to VCL Canvas, + // so we're not using CAIRO_ANTIALIAS_SUBPIXEL + cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY); + } + cairo_set_font_options( pSCairo.get(), options); + + // Font color + Color mTextColor = rOutDev.GetTextColor(); + cairo_set_source_rgb(pSCairo.get(), + mTextColor.GetRed()/255.0, + mTextColor.GetGreen()/255.0, + mTextColor.GetBlue()/255.0); + + // Font rotation and scaling + cairo_matrix_t m; + Font aFont = rOutDev.GetFont(); + FontMetric aMetric( rOutDev.GetFontMetric(aFont) ); + long nWidth = 0; + + // width calculation is deep magic and platform/font dependant. + // width == 0 means no scaling, and usually width == height means the same. + // Other values mean horizontal scaling (narrow or stretching) + // see issue #101566 + + //proper scale calculation across platforms + if (aFont.GetWidth() == 0) { + nWidth = aFont.GetHeight(); + } else { + // any scaling needs to be relative to the platform-dependent definition + // of width of the font + nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth(); + } + + cairo_matrix_init_identity(&m); + + if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0); + + cairo_matrix_scale(&m, nWidth, aFont.GetHeight()); + + //faux italics + if (aSysLayoutData.aSysFontData.bFakeItalic) m.xy = -m.xx * 0x6000L / 0x10000L; + + cairo_set_font_matrix(pSCairo.get(), &m); + + OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s", + aFont.GetWidth(), + aFont.GetHeight(), + aMetric.GetWidth(), + nWidth, + (int) rOutpos.X(), + (int) rOutpos.Y(), + cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, + maLogicalAdvancements.getLength() ? "ADV " : "", + aSysLayoutData.aSysFontData.bAntialias ? "AA " : "", + aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "", + aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "", +#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1) + ::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(), +#else + ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), +#endif + ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ), + RTL_TEXTENCODING_UTF8 ).getStr() + ); + + cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size()); + + //faux bold + if (aSysLayoutData.aSysFontData.bFakeBold) { + double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() ); + int total_steps = 2 * ((int) (bold_dx + 0.5)); + + // loop to draw the text for every half pixel of displacement + for (int nSteps = 0; nSteps < total_steps; nSteps++) { + for(int nGlyphIdx = 0; nGlyphIdx < (int) cairo_glyphs.size(); nGlyphIdx++) { + cairo_glyphs[nGlyphIdx].x += bold_dx * nSteps / total_steps; + } + cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size()); + } + OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): FAKEBOLD - dx:%d", (int) bold_dx); + } + + cairo_restore( pSCairo.get() ); + cairo_font_face_destroy(font_face); + return true; + } + + namespace { class OffsetTransformer @@ -363,41 +630,6 @@ namespace cairocanvas OffsetTransformer( aMatrix ) ); } - bool TextLayout::draw( OutputDevice& rOutDev, - const Point& rOutpos, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) const - { - ::osl::MutexGuard aGuard( m_aMutex ); - - setupLayoutMode( rOutDev, mnTextDirection ); - - if( maLogicalAdvancements.getLength() ) - { - // TODO(P2): cache that - ::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]); - setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); - - // TODO(F3): ensure correct length and termination for DX - // array (last entry _must_ contain the overall width) - - rOutDev.DrawTextArray( rOutpos, - maText.Text, - aOffsets.get(), - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); - } - else - { - rOutDev.DrawText( rOutpos, - maText.Text, - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); - } - - return true; - } - #define SERVICE_NAME "com.sun.star.rendering.TextLayout" #define IMPLEMENTATION_NAME "CairoCanvas::TextLayout" diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index fb98c434615d..9dbc004d551a 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -93,10 +93,12 @@ namespace cairocanvas virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); bool draw( ::cairo::Cairo* pCairo ); - bool draw( OutputDevice& rOutDev, + bool draw( SurfaceSharedPtr& pSurface, + OutputDevice& rOutDev, const Point& rOutpos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) const; + void setupTextOffsets( sal_Int32* outputOffsets, const ::com::sun::star::uno::Sequence< double >& inputOffsets, const ::com::sun::star::rendering::ViewState& viewState, @@ -112,7 +114,8 @@ namespace cairocanvas SurfaceProviderRef mpRefDevice; sal_Int8 mnTextDirection; - void useFont( ::cairo::Cairo* pCairo ); + void useFont( ::cairo::Cairo* pCairo ); + bool isCairoRenderable(SystemFontData aSysFontData) const; }; } diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index 56edf089b4cb..b679d5fdbf12 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.cxx @@ -284,6 +284,43 @@ namespace cairo return SurfaceSharedPtr(); } + + /** + * cairo::ucs4toindex: Convert ucs4 char to glyph index + * @param ucs4 an ucs4 char + * @param hfont current font + * + * @return true if successful + **/ + unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont) + { + wchar_t unicode[2]; + WORD glyph_index; + HDC hdc = NULL; + int i = 0; + + hdc = CreateCompatibleDC (NULL); + + if (!hdc) return 0; + if (!SetGraphicsMode (hdc, GM_ADVANCED)) { + DeleteDC (hdc); + return 0; + } + + SelectObject (hdc, hfont); + SetMapMode (hdc, MM_TEXT); + + unicode[0] = ucs4; + unicode[1] = 0; + if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) == GDI_ERROR) { + glyph_index = 0; + } + + DeleteDC (hdc); + return glyph_index; + } + + } // namespace cairo #endif // CAIRO_HAS_WIN32_SURFACE diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx index 2cacd1019ebc..3ecb04608355 100644 --- a/canvas/source/cairo/cairo_win32_cairo.hxx +++ b/canvas/source/cairo/cairo_win32_cairo.hxx @@ -66,6 +66,8 @@ namespace cairo { int getDepth() const; }; + + unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont); } #endif diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index 0dba5c2b44ce..65f0faae659e 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_canvas.hxx" -#include <prex.h> +#include <tools/prex.h> #include <X11/extensions/Xrender.h> #include <X11/Xlib.h> -#include <postx.h> +#include <tools/postx.h> #include "cairo_xlib_cairo.hxx" @@ -71,23 +71,23 @@ namespace cairo pRenderFormat(NULL) {} - X11SysData::X11SysData( const SystemGraphicsData* pSysDat ) : - pDisplay(pSysDat->pDisplay), - hDrawable(pSysDat->hDrawable), - pVisual(pSysDat->pVisual), - nScreen(pSysDat->nScreen), - nDepth(pSysDat->nDepth), - aColormap(pSysDat->aColormap), - pRenderFormat(pSysDat->pRenderFormat) + X11SysData::X11SysData( const SystemGraphicsData& pSysDat ) : + pDisplay(pSysDat.pDisplay), + hDrawable(pSysDat.hDrawable), + pVisual(pSysDat.pVisual), + nScreen(pSysDat.nScreen), + nDepth(pSysDat.nDepth), + aColormap(pSysDat.aColormap), + pRenderFormat(pSysDat.pRenderFormat) {} - X11SysData::X11SysData( const SystemEnvData* pSysDat ) : - pDisplay(pSysDat->pDisplay), - hDrawable(pSysDat->aWindow), - pVisual(pSysDat->pVisual), - nScreen(pSysDat->nScreen), - nDepth(pSysDat->nDepth), - aColormap(pSysDat->aColormap), + X11SysData::X11SysData( const SystemEnvData& pSysDat ) : + pDisplay(pSysDat.pDisplay), + hDrawable(pSysDat.aWindow), + pVisual(pSysDat.pVisual), + nScreen(pSysDat.nScreen), + nDepth(pSysDat.nDepth), + aColormap(pSysDat.aColormap), pRenderFormat(NULL) {} @@ -315,12 +315,12 @@ namespace cairo if( !pSysData ) return X11SysData(); else - return X11SysData(pSysData); + return X11SysData(*pSysData); } static X11SysData getSysData( const VirtualDevice& rVirDev ) { - return X11SysData( &rVirDev.GetSystemGfxData() ); + return X11SysData( rVirDev.GetSystemGfxData() ); } SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice, diff --git a/canvas/source/cairo/cairo_xlib_cairo.hxx b/canvas/source/cairo/cairo_xlib_cairo.hxx index 83bbfd0abfb6..eb5206f8b4eb 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.hxx +++ b/canvas/source/cairo/cairo_xlib_cairo.hxx @@ -42,8 +42,8 @@ namespace cairo { struct X11SysData { X11SysData(); - explicit X11SysData( const SystemGraphicsData* ); - explicit X11SysData( const SystemEnvData* ); + explicit X11SysData( const SystemGraphicsData& ); + explicit X11SysData( const SystemEnvData& ); void* pDisplay; // the relevant display connection long hDrawable; // a drawable diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk index 0466b1d07723..bd54254abf7e 100644 --- a/canvas/source/cairo/makefile.mk +++ b/canvas/source/cairo/makefile.mk @@ -99,12 +99,14 @@ SHL1STDLIBS+= -lcairo SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions CFLAGSCXX+=$(OBJCXXFLAGS) -SHL1STDLIBS+= -lpixman-1 -.ELSE +.ELSE # "$(GUIBASE)"=="aqua" + # Xlib SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj -SHL1STDLIBS+= -lfontconfig $(FREETYPELIB) -lX11 -lXrender -.ENDIF +SHL1STDLIBS+= -lfontconfig -lX11 -lXrender -lpixman-1 $(FREETYPE_LIBS) +CFLAGS+=$(FREETYPE_CFLAGS) + +.ENDIF # "$(GUIBASE)"=="aqua" .ELSE # "$(GUI)"=="UNX" diff --git a/canvas/source/cairo/postx.h b/canvas/source/cairo/postx.h deleted file mode 100644 index ca8f610f78ec..000000000000 --- a/canvas/source/cairo/postx.h +++ /dev/null @@ -1,81 +0,0 @@ -/************************************************************************* - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: postx.h,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: kz $ $Date: 2008-06-30 12:59:14 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. - * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ************************************************************************/ - -#ifndef _POSTX_H -#define _POSTX_H - -#if defined __cplusplus -} -#endif - -/* X-Types */ -#undef Window -#undef BYTE -#undef INT8 -#undef INT64 -#undef BOOL -#undef Font -#undef Cursor -#undef String -#undef KeyCode -#undef Region -#undef Icon -#undef Time -#undef Boolean - -#undef Min -#undef Max -#undef DestroyAll -#undef Success - -#undef Printer -/* #undef FontInfo */ -#undef Orientation - -#undef GetToken -#undef ReleaseToken -#undef InitializeToken -#undef NextRequest - -#ifdef KeyPress -#if KeyPress != 2 -Error KeyPress must be Equal 2 -#endif -#undef KeyPress -#endif -#define XLIB_KeyPress 2 - -#endif - diff --git a/canvas/source/cairo/prex.h b/canvas/source/cairo/prex.h deleted file mode 100644 index 6f1289fe9e5e..000000000000 --- a/canvas/source/cairo/prex.h +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: prex.h,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: kz $ $Date: 2008-06-30 12:58:44 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. - * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ************************************************************************/ - -#ifndef _PREX_H -#define _PREX_H - -#define Window XLIB_Window -#define BYTE XLIB_BYTE -#define INT8 XLIB_INT8 -#define INT64 XLIB_INT64 -#define BOOL XLIB_BOOL -#define Font XLIB_Font -#define Cursor XLIB_Cursor -#define String XLIB_String -#define KeyCode XLIB_KeyCode -#define Region XLIB_Region -#define Icon XLIB_Icon -#define Time XLIB_Time -#define Region XLIB_Region -#define Boolean XLIB_Boolean - -#if defined __cplusplus -extern "C" { -#endif - -#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher -#define __XKeyboardExtension__ 1 -#else -#define __XKeyboardExtension__ 0 -#endif - -#include <X11/X.h> -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/StringDefs.h> -#include <X11/extensions/Xrender.h> -#if __XKeyboardExtension__ -#include <X11/XKBlib.h> -#endif -typedef unsigned long Pixel; - -#undef DestroyAll -#define DestroyAll XLIB_DestroyAll -#define XLIB_DestroyAll 0 -#undef String -#define String XLIB_String - -#undef KeyCode -#define KeyCode XLIB_KeyCode //undef in intrinsics - -#define __Ol_OlXlibExt_h__ - -#endif - diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 74a3e000a9b0..0712f8ca074c 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -45,9 +45,7 @@ #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> -#endif - -#ifdef QUARTZ +#elif defined ( QUARTZ ) #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index ee9edb85bbdd..ff25d16c4841 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -46,9 +46,7 @@ #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> -#endif - -#ifdef QUARTZ +#elif defined ( QUARTZ ) #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index b6d0ce5ff916..eeacd037d7c1 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -55,6 +55,18 @@ #include <rtl/memory.h> #include <rtl/uuid.h> #include <rtl/process.h> + +#ifdef WNT +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> +#elif (defined QUARTZ) +#include "premac.h" +#include <Cocoa/Cocoa.h> +#include "postmac.h" +#endif +#include <vcl/sysdata.hxx> + #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/awt/vclxsystemdependentwindow.hxx> #include <toolkit/awt/vclxregion.hxx> @@ -108,12 +120,6 @@ #include <vcl/wrkwin.hxx> #include "toolkit/awt/vclxspinbutton.hxx" -#ifdef QUARTZ -#include "premac.h" -#include <Cocoa/Cocoa.h> -#include "postmac.h" -#endif -#include <vcl/sysdata.hxx> #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 907ccb797fd2..26e457d74583 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -33,13 +33,11 @@ #include <com/sun/star/lang/SystemDependent.hpp> #include <com/sun/star/awt/SystemDependentXWindow.hpp> -#if !defined(UNX) && !defined(OS2) +#ifdef WNT #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> -#endif - -#ifdef QUARTZ +#elif defined ( QUARTZ ) #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index f8dce643697a..4a5315008b9f 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -38,7 +38,12 @@ #include <vcl/wrkwin.hxx> #endif #include <vcl/window.hxx> -#ifdef QUARTZ + +#ifdef WNT +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> +#elif defined ( QUARTZ ) #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/vcl/unx/inc/postx.h b/tools/inc/tools/postx.h index 68a2c3a31cf8..68a2c3a31cf8 100644 --- a/vcl/unx/inc/postx.h +++ b/tools/inc/tools/postx.h diff --git a/vcl/unx/inc/prex.h b/tools/inc/tools/prex.h index 131e628efe2e..705e33ca5188 100644 --- a/vcl/unx/inc/prex.h +++ b/tools/inc/tools/prex.h @@ -50,7 +50,7 @@ extern "C" { #endif -#if defined(LINUX) || defined(FREEBSD) // should really check for xfree86 or for X11R6.1 and higher +#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher #define __XKeyboardExtension__ 1 #else #define __XKeyboardExtension__ 0 diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 660afffc37e9..e8fde61686a4 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -31,6 +31,9 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp ..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h ..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h +..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h +..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h + ..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx ..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx ..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index 476400f1564b..4c52c06a7393 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -348,6 +348,7 @@ public: virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const; private: // differences between VCL, Quartz and kHiThemeOrientation coordinate systems diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 661eb64b83ce..b1499e2c32d5 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -2298,6 +2298,43 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen ) // ----------------------------------------------------------------------- +SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const +{ + SystemFontData aSysFontData; + OSStatus err; + aSysFontData.nSize = sizeof( SystemFontData ); + + // NOTE: Native ATSU font fallbacks are used, not the VCL fallbacks. + ATSUFontID fontId; + err = ATSUGetAttribute( maATSUStyle, kATSUFontTag, sizeof(fontId), &fontId, 0 ); + if (err) fontId = 0; + aSysFontData.aATSUFontID = (void *) fontId; + + Boolean bFbold; + err = ATSUGetAttribute( maATSUStyle, kATSUQDBoldfaceTag, sizeof(bFbold), &bFbold, 0 ); + if (err) bFbold = FALSE; + aSysFontData.bFakeBold = (bool) bFbold; + + Boolean bFItalic; + err = ATSUGetAttribute( maATSUStyle, kATSUQDItalicTag, sizeof(bFItalic), &bFItalic, 0 ); + if (err) bFItalic = FALSE; + aSysFontData.bFakeItalic = (bool) bFItalic; + + ATSUVerticalCharacterType aVerticalCharacterType; + err = ATSUGetAttribute( maATSUStyle, kATSUVerticalCharacterTag, sizeof(aVerticalCharacterType), &aVerticalCharacterType, 0 ); + if (!err && aVerticalCharacterType == kATSUStronglyVertical) { + aSysFontData.bVerticalCharacterType = true; + } else { + aSysFontData.bVerticalCharacterType = false; + } + + aSysFontData.bAntialias = !mbNonAntialiasedText; + + return aSysFontData; +} + +// ----------------------------------------------------------------------- + SystemGraphicsData AquaSalGraphics::GetGraphicsData() const { SystemGraphicsData aRes; diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index c0bcfa35fae5..3f821f995a51 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -53,6 +53,8 @@ class ImplFontEntry; struct ImplObjStack; struct ImplKernPairData; struct SystemGraphicsData; +struct SystemFontData; +struct SystemTextLayoutData; class ImplFontCache; class ImplDevFontList; class ImplGetDevFontList; @@ -883,6 +885,12 @@ public: void SetFont( const Font& rNewFont ); const Font& GetFont() const { return maFont; } + + SystemFontData GetSysFontData( int nFallbacklevel ) const; + SystemTextLayoutData GetSysTextLayoutData( const Point& rStartPt, const XubString& rStr, + xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, + const sal_Int32* pDXAry = NULL ) const; + void SetTextColor( const Color& rColor ); const Color& GetTextColor() const { return maTextColor; } void SetTextFillColor(); diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index 2bbb44d67b42..5cf6e70f5114 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -57,6 +57,7 @@ struct FontSubsetInfo; class OutputDevice; class ServerFontLayout; struct SystemGraphicsData; +struct SystemFontData; namespace basegfx { class B2DVector; @@ -493,6 +494,7 @@ public: sal_uInt8 nTransparency, const OutputDevice *pOutDev ); virtual SystemGraphicsData GetGraphicsData() const = 0; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const = 0; }; #endif // _SV_SALGDI_HXX diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index d98a6373d6fc..2e2a5e80e761 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -31,10 +31,12 @@ #ifndef _SV_SYSDATA_HXX #define _SV_SYSDATA_HXX +#include <vector> + #ifdef QUARTZ // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; -typedef struct CGLayer *CGLayerRef; +typedef struct CGLayer *CGLayerRef; #ifdef __OBJC__ @class NSView; #else @@ -141,4 +143,50 @@ struct SystemWindowData #endif }; + +// -------------------- +// - SystemGlyphData - +// -------------------- + +struct SystemGlyphData +{ + unsigned long index; + double x; + double y; +}; + + +// -------------------- +// - SystemFontData - +// -------------------- + +struct SystemFontData +{ + unsigned long nSize; // size in bytes of this structure +#if defined( WNT ) + HFONT hFont; // native font object +#elif defined( QUARTZ ) + void* aATSUFontID; // native font object +#elif defined( UNX ) + void* nFontId; // native font id + int nFontFlags; // native font flags +#endif + bool bFakeBold; // Does this font need faking the bold style + bool bFakeItalic; // Does this font need faking the italic style + bool bAntialias; // Should this font be antialiased + bool bVerticalCharacterType; // Is the font using vertical character type +}; + +// -------------------- +// - SystemTextLayoutData - +// -------------------- + +struct SystemTextLayoutData +{ + unsigned long nSize; // size in bytes of this structure + std::vector<SystemGlyphData> rGlyphData; // glyph data + int orientation; // Text orientation + SystemFontData aSysFontData; // Font data for the text layout +}; + #endif // _SV_SYSDATA_HXX diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index 5e70f50ada79..1fb51f089100 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -328,6 +328,7 @@ public: virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; // Init/Deinit Graphics diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx index 546f4bf2b7cd..573fa7336fb0 100644 --- a/vcl/os2/source/gdi/salgdi3.cxx +++ b/vcl/os2/source/gdi/salgdi3.cxx @@ -1754,3 +1754,21 @@ void Os2SalGraphics::DrawServerFontLayout( const ServerFontLayout& ) //-------------------------------------------------------------------------- +SystemFontData Os2SalGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.hFont = mhFonts[nFallbacklevel]; + aSysFontData.bFakeBold = false; + aSysFontData.bFakeItalic = false; + aSysFontData.bAntialias = true; + aSysFontData.bVerticalCharacterType = false; + + return aSysFontData; +} + +//-------------------------------------------------------------------------- diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 521e56da207e..537964582ceb 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -63,6 +63,7 @@ #include <vcl/outdev.hxx> #include <vcl/edit.hxx> #include <vcl/fontcfg.hxx> +#include <vcl/sysdata.hxx> #ifndef _OSL_FILE_H #include <osl/file.h> #endif @@ -7700,6 +7701,97 @@ FontMetric OutputDevice::GetFontMetric( const Font& rFont ) const // ----------------------------------------------------------------------- +/** OutputDevice::GetSysFontData + * + * @param nFallbacklevel Fallback font level (0 = best matching font) + * + * Retrieve detailed font information in platform independent structure + * + * @return SystemFontData + **/ +SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const +{ + SystemFontData aSysFontData; + aSysFontData.nSize = sizeof(aSysFontData); + + if (!mpGraphics) ImplGetGraphics(); + if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel); + + return aSysFontData; +} + + +// ----------------------------------------------------------------------- + +/** OutputDevice::GetSysTextLayoutData + * + * @param rStartPt Start point of the text + * @param rStr Text string that will be transformed into layout of glyphs + * @param nIndex Position in the string from where layout will be done + * @param nLen Length of the string + * @param pDXAry Custom layout adjustment data + * + * Export finalized glyph layout data as platform independent SystemTextLayoutData + * (see vcl/inc/vcl/sysdata.hxx) + * + * Only parameters rStartPt and rStr are mandatory, the rest is optional + * (default values will be used) + * + * @return SystemTextLayoutData + **/ +SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, const XubString& rStr, xub_StrLen nIndex, xub_StrLen nLen, + const sal_Int32* pDXAry) const +{ + DBG_TRACE( "OutputDevice::GetSysTextLayoutData()" ); + DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); + + SystemTextLayoutData aSysLayoutData; + aSysLayoutData.nSize = sizeof(aSysLayoutData); + aSysLayoutData.rGlyphData.reserve( 256 ); + + if ( mpMetaFile ) { + if (pDXAry) + mpMetaFile->AddAction( new MetaTextArrayAction( rStartPt, rStr, pDXAry, nIndex, nLen ) ); + else + mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) ); + } + + if ( !IsDeviceOutputNecessary() ) return aSysLayoutData; + + SalLayout* rLayout = ImplLayout( rStr, nIndex, nLen, rStartPt, 0, pDXAry, true ); + + // setup glyphs + Point aPos; + sal_GlyphId aGlyphId; + int nFallbacklevel = 0; + for( int nStart = 0; rLayout->GetNextGlyphs( 1, &aGlyphId, aPos, nStart ); ) + { + // NOTE: Windows backend is producing unicode chars (ucs4), so on windows, + // ETO_GLYPH_INDEX is unusable, unless extra glyph conversion is made. + + SystemGlyphData aGlyph; + aGlyph.index = static_cast<unsigned long> (aGlyphId & GF_IDXMASK); + aGlyph.x = aPos.X(); + aGlyph.y = aPos.Y(); + aSysLayoutData.rGlyphData.push_back(aGlyph); + + int nLevel = (aGlyphId & GF_FONTMASK) >> GF_FONTSHIFT; + if (nLevel > nFallbacklevel && nLevel < MAX_FALLBACK) + nFallbacklevel = nLevel; + } + + // Get font data + aSysLayoutData.aSysFontData = GetSysFontData(nFallbacklevel); + aSysLayoutData.orientation = rLayout->GetOrientation(); + + rLayout->Release(); + + return aSysLayoutData; +} + +// ----------------------------------------------------------------------- + + long OutputDevice::GetMinKashida() const { DBG_TRACE( "OutputDevice::GetMinKashida()" ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index e30c36650aa4..9ad5d8e13705 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -45,9 +45,9 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xatom.h> -#include <postx.h> +#include <tools/postx.h> #include <dlfcn.h> #include <vcl/salbtype.hxx> diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index 4ee06961444a..cd3e286d167a 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -558,6 +558,22 @@ BOOL SvpSalGraphics::drawEPS( long, long, long, long, void*, ULONG ) return FALSE; } +SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.nFontId = 0; + aSysFontData.nFontFlags = 0; + aSysFontData.bFakeBold = false; + aSysFontData.bFakeItalic = false; + aSysFontData.bAntialias = true; + return aSysFontData; +} + SystemGraphicsData SvpSalGraphics::GetGraphicsData() const { SystemGraphicsData aRes; diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 984a77cccfad..1c71704c0031 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -169,6 +169,7 @@ public: virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; #endif diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 2ff48966c765..eb342a130d85 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -1398,6 +1398,22 @@ bool PspGraphics::filterText( const String& rOrig, String& rNewText, xub_StrLen return bRet && m_bSwallowFaxNo; } +SystemFontData PspGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.nFontId = 0; + aSysFontData.nFontFlags = 0; + aSysFontData.bFakeBold = false; + aSysFontData.bFakeItalic = false; + aSysFontData.bAntialias = true; + return aSysFontData; +} + SystemGraphicsData PspGraphics::GetGraphicsData() const { SystemGraphicsData aRes; diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index ba7d690a9f90..81e4a29b8d55 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -194,7 +194,9 @@ public: virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); + virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; #endif // _SVP_PSPGRAPHICS_HXX diff --git a/vcl/unx/inc/Xproto.h b/vcl/unx/inc/Xproto.h index 83d717818d9e..553c32221406 100644 --- a/vcl/unx/inc/Xproto.h +++ b/vcl/unx/inc/Xproto.h @@ -33,7 +33,7 @@ #include "sal/config.h" -#include "prex.h" +#include <tools/prex.h> #if defined __GNUC__ #pragma GCC system_header @@ -47,6 +47,6 @@ #pragma enable_warn #endif -#include "postx.h" +#include <tools/postx.h> #endif diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx index 970a8edf02c3..fd09bcca17e3 100644 --- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx @@ -31,11 +31,11 @@ #ifndef _VCL_GTKDATA_HXX #define _VCL_GTKDATA_HXX -#include <prex.h> +#include <tools/prex.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <postx.h> +#include <tools/postx.h> #include <saldisp.hxx> #include <saldata.hxx> diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index 1ceec7fb0c70..74394c71e4b2 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -31,12 +31,12 @@ #ifndef _VCL_GTKFRAME_HXX #define _VCL_GTKFRAME_HXX -#include <prex.h> +#include <tools/prex.h> #include <gtk/gtk.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> -#include <postx.h> +#include <tools/postx.h> #include <vcl/salframe.hxx> #include <vcl/sysdata.hxx> diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 5211367c355a..5bc7ab40b98e 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -31,11 +31,11 @@ #ifndef _VCL_GTKGDI_HXX #define _VCL_GTKGDI_HXX -#include <prex.h> +#include <tools/prex.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> -#include <postx.h> +#include <tools/postx.h> #include <salgdi.h> diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 5c31d889453c..219cc5f0a8ff 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -197,6 +197,7 @@ public: virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; #endif // _VCL_PSPGRAPHICS_H diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 55c8f8303052..bfe25b84d150 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -336,6 +336,7 @@ public: long nHeight, sal_uInt8 nTransparency ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; /* use to handle GraphicsExpose/NoExpose after XCopyArea & friends * if pFrame is not NULL, corresponding Paint events are generated diff --git a/vcl/unx/inc/svunx.h b/vcl/unx/inc/svunx.h index 7e6b98b33192..02572dea9084 100644 --- a/vcl/unx/inc/svunx.h +++ b/vcl/unx/inc/svunx.h @@ -31,8 +31,8 @@ #ifndef _SVUNX_H #define _SVUNX_H -#include <prex.h> -#include <postx.h> +#include <tools/prex.h> +#include <tools/postx.h> #endif diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx index a6146748fb8a..314854926ba1 100644 --- a/vcl/unx/inc/wmadaptor.hxx +++ b/vcl/unx/inc/wmadaptor.hxx @@ -37,9 +37,9 @@ #include <tools/gen.hxx> #include <vcl/dllapi.h> #ifndef _PREX_H -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlib.h> -#include <postx.h> +#include <tools/postx.h> #endif #include <vector> diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx index f2a0496f545d..8b87e268ca08 100644 --- a/vcl/unx/inc/xfont.hxx +++ b/vcl/unx/inc/xfont.hxx @@ -31,9 +31,9 @@ #define EXTENDED_FONTSTRUCT_HXX #ifndef _XLIB_H_ -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlib.h> -#include <postx.h> +#include <tools/postx.h> #endif #include <tools/ref.hxx> #include <rtl/tencinfo.h> diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx index b40cc888e7ac..fd8b3d5af559 100644 --- a/vcl/unx/source/app/i18n_cb.cxx +++ b/vcl/unx/source/app/i18n_cb.cxx @@ -34,10 +34,10 @@ #include <stdio.h> #include <string.h> #include <sal/alloca.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <XIM.h> diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 817fc2781e8c..cacffbcfdbb1 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -34,10 +34,10 @@ #include <stdio.h> #include <sal/alloca.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> diff --git a/vcl/unx/source/app/i18n_im.cxx b/vcl/unx/source/app/i18n_im.cxx index a47cefcef7dd..ae472d6323f4 100644 --- a/vcl/unx/source/app/i18n_im.cxx +++ b/vcl/unx/source/app/i18n_im.cxx @@ -44,11 +44,11 @@ #include <sal/alloca.h> #endif -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> #include <XIM.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <saldisp.hxx> diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx index b8ef7e74e635..cdaa5b1a9cf0 100644 --- a/vcl/unx/source/app/i18n_status.cxx +++ b/vcl/unx/source/app/i18n_status.cxx @@ -36,10 +36,10 @@ #endif #include <sal/alloca.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlib.h> #include <XIM.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx index 4a2bf13af3e0..188f159300b0 100644 --- a/vcl/unx/source/app/keysymnames.cxx +++ b/vcl/unx/source/app/keysymnames.cxx @@ -32,9 +32,9 @@ #include "precompiled_vcl.hxx" #ifndef SOLARIS -#include <prex.h> +#include <tools/prex.h> #include <X11/XKBlib.h> -#include <postx.h> +#include <tools/postx.h> #endif #include <saldisp.hxx> diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/source/app/randrwrapper.cxx index b079e2909e71..8d01b64d4680 100644 --- a/vcl/unx/source/app/randrwrapper.cxx +++ b/vcl/unx/source/app/randrwrapper.cxx @@ -31,9 +31,9 @@ #ifdef USE_RANDR -#include "prex.h" +#include <tools/prex.h> #include <X11/extensions/Xrandr.h> -#include "postx.h" +#include <tools/postx.h> #include "osl/module.h" #include "rtl/ustring.hxx" diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 3bcd1cf792da..328129ef3e29 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -52,7 +52,7 @@ #include <osl/module.h> #endif -#include <prex.h> +#include <tools/prex.h> #include <X11/cursorfont.h> #include "salcursors.h" #include "invert50.h" @@ -81,7 +81,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #endif #endif -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <sal/types.h> diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx index 5bc307b0146f..7e4e16579623 100644 --- a/vcl/unx/source/app/sm.cxx +++ b/vcl/unx/source/app/sm.cxx @@ -40,9 +40,9 @@ #include <osl/process.h> #include <osl/security.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xatom.h> -#include <postx.h> +#include <tools/postx.h> #include <sm.hxx> #include <saldata.hxx> #include <saldisp.hxx> diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index 37015b6e58d6..d15433865450 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -43,11 +43,11 @@ #include <rtl/locale.h> #include <osl/process.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/X.h> #include <X11/Xatom.h> #include <X11/Xresource.h> -#include <postx.h> +#include <tools/postx.h> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> diff --git a/vcl/unx/source/gdi/gcach_xpeer.hxx b/vcl/unx/source/gdi/gcach_xpeer.hxx index 73a924c60439..3af34ffd9297 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.hxx +++ b/vcl/unx/source/gdi/gcach_xpeer.hxx @@ -33,9 +33,9 @@ #include <vcl/glyphcache.hxx> -#include <prex.h> +#include <tools/prex.h> #include <X11/extensions/Xrender.h> -#include <postx.h> +#include <tools/postx.h> #include <vcl/dllapi.h> diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 4a4bccd86d2a..e8dfe391dc86 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -1504,6 +1504,22 @@ SystemGraphicsData PspGraphics::GetGraphicsData() const return aRes; } +SystemFontData PspGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.nFontId = 0; + aSysFontData.nFontFlags = 0; + aSysFontData.bFakeBold = false; + aSysFontData.bFakeItalic = false; + aSysFontData.bAntialias = true; + return aSysFontData; +} + bool PspGraphics::supportsOperation( OutDevSupportType ) const { return false; diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx index f70f445ed28c..4db44d664c16 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/source/gdi/salbmp.cxx @@ -37,9 +37,9 @@ #ifdef FREEBSD #include <sys/types.h> #endif -#include <prex.h> +#include <tools/prex.h> #include "Xproto.h" -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <osl/endian.h> #include <rtl/memory.h> diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index e2c41b52006b..9cbd9a075dff 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -50,6 +50,7 @@ #include "pspgraphics.h" #include "salvd.h" #include "xfont.hxx" +#include <vcl/sysdata.hxx> #include "xlfd_attr.hxx" #include "xlfd_smpl.hxx" #include "xlfd_extd.hxx" @@ -797,7 +798,11 @@ CairoWrapper::CairoWrapper() if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) ) return; +#ifdef MACOSX + OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.2.dylib" )); +#else OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" )); +#endif mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT ); if( !mpCairoLib ) return; @@ -1703,6 +1708,31 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe //-------------------------------------------------------------------------- +SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.nFontId = 0; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + if (mpServerFont[nFallbacklevel] != NULL) + { + ServerFont* rFont = mpServerFont[nFallbacklevel]; + aSysFontData.nFontId = rFont->GetFtFace(); + aSysFontData.nFontFlags = rFont->GetLoadFlags(); + aSysFontData.bFakeBold = rFont->NeedsArtificialBold(); + aSysFontData.bFakeItalic = rFont->NeedsArtificialItalic(); + aSysFontData.bAntialias = rFont->GetAntialiasAdvice(); + aSysFontData.bVerticalCharacterType = rFont->GetFontSelData().mbVertical; + } + + return aSysFontData; +} + +//-------------------------------------------------------------------------- + BOOL X11SalGraphics::CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData* pFont, diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/source/gdi/salvd.cxx index 3e00dcb63bef..915c42661fdc 100644 --- a/vcl/unx/source/gdi/salvd.cxx +++ b/vcl/unx/source/gdi/salvd.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <prex.h> +#include <tools/prex.h> #include <X11/extensions/Xrender.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <saldata.hxx> diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/source/gdi/xrender_peer.hxx index 24abd9d239e2..f1e2fd77a273 100644 --- a/vcl/unx/source/gdi/xrender_peer.hxx +++ b/vcl/unx/source/gdi/xrender_peer.hxx @@ -31,9 +31,9 @@ #ifndef _SV_XRENDER_PEER_HXX #define _SV_XRENDER_PEER_HXX -#include <prex.h> +#include <tools/prex.h> #include <X11/extensions/Xrender.h> -#include <postx.h> +#include <tools/postx.h> #include <vcl/salgtype.hxx> #include <osl/module.h> diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index 668493c6ccb3..2177c9549eff 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -37,9 +37,9 @@ #include <rtl/ustrbuf.hxx> #include <svunx.h> -#include <prex.h> +#include <tools/prex.h> #include <X11/Xatom.h> -#include <postx.h> +#include <tools/postx.h> #include <vcl/salinst.hxx> #include <saldata.hxx> diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 4f66bd3d5291..22e43999caa6 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -36,7 +36,7 @@ #include <stdlib.h> #include <unistd.h> -#include "prex.h" +#include <tools/prex.h> #include <X11/Xatom.h> #include <X11/keysym.h> #include "FWS.hxx" @@ -44,7 +44,7 @@ #ifndef SOLARIS #include <X11/extensions/dpms.h> #endif -#include "postx.h" +#include <tools/postx.h> #include "salunx.h" #include "saldata.hxx" diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 49b1a677c98b..eed6264f00bc 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <prex.h> +#include <tools/prex.h> #include <X11/Xlib.h> #include <X11/extensions/shape.h> -#include <postx.h> +#include <tools/postx.h> #include <salunx.h> #include <salstd.hxx> diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index f9d4681e0e6e..0475ea4a193e 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -352,6 +352,7 @@ public: virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; // Init/Deinit Graphics diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 16c055209088..99f276faa964 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -34,6 +34,10 @@ #include <string.h> #include <malloc.h> +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> +#include <vcl/sysdata.hxx> #include "tools/svwin.h" #include "wincomp.hxx" @@ -2849,3 +2853,26 @@ void WinSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) {} //-------------------------------------------------------------------------- + +SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const +{ + SystemFontData aSysFontData; + + if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; + if (nFallbacklevel < 0 ) nFallbacklevel = 0; + + aSysFontData.nSize = sizeof( SystemFontData ); + aSysFontData.hFont = mhFonts[nFallbacklevel]; + aSysFontData.bFakeBold = false; + aSysFontData.bFakeItalic = false; + aSysFontData.bAntialias = true; + aSysFontData.bVerticalCharacterType = false; + + OSL_TRACE("\r\n:WinSalGraphics::GetSysFontData(): FontID: %p, Fallback level: %d", + aSysFontData.hFont, + nFallbacklevel); + + return aSysFontData; +} + +//-------------------------------------------------------------------------- |