summaryrefslogtreecommitdiff
path: root/vcl/quartz
AgeCommit message (Collapse)Author
2014-01-28Resolves: #i124121# prevent italic emulation with ITALIC_DONTKNOW fontsHerbert Dürr
(cherry picked from commit a8cd1fab9a17df6179c31e1a73816f1bcd627a9b) Conflicts: vcl/aqua/source/gdi/ctfonts.cxx Change-Id: Ib2893a0ce119ac56ac7091fd18a652fe990e82ec
2014-01-24Related: #i123895# adjust VCL support for 64bit OSX portHerbert Dürr
(cherry picked from commit 677d987b931c509c4240840c4f21ccad2b518b12) Conflicts: vcl/aqua/source/a11y/aqua11ywrapperrow.mm vcl/inc/aqua/aquavcltypes.h vcl/inc/quartz/salgdi.h vcl/osx/DropTarget.cxx vcl/osx/salframe.cxx vcl/osx/salinst.cxx vcl/osx/salmenu.cxx vcl/osx/vclnsapp.mm Change-Id: I30d72e7caa1269982d176bc4d3baf604d5e7a84b
2014-01-17fix dropshadow on iostsahi glik
2014-01-17Indentation fixTor Lillqvist
Change-Id: Iab16c4ff664f9bcc53458e5f7c249d3fb030fe07
2014-01-16fix compile break on macostsahi glik
2014-01-16fix rendering issues in iOS with aquatsahi glik
2014-01-15Bin unused codeTor Lillqvist
Change-Id: Ie10881ab3f6e252c87fc3fedcf6a2b7fa0af2c56
2014-01-10Normalized aqua graphics line and fill colors to RGBAtsahi glik
2014-01-08Fix compilation error for 64-bit OS X by simplifying codeTor Lillqvist
The ifdef for __LP64__ is not needed as far as I can see. Fixes error: cannot initialize a parameter of type 'const sal_GlyphId *' (aka 'const unsigned int *') with an lvalue of type 'long *'. Change-Id: I89d3ba29a5cfd1a89141ec86c873eaf384cf446e
2014-01-06Resolves: #i123817# prepare codebase for updating to boost 1.55Herbert Dürr
(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153) Conflicts: basic/source/comp/parser.cxx basic/source/comp/token.cxx dbaccess/source/ui/dlg/generalpage.cxx sc/source/ui/unoobj/chart2uno.cxx vcl/quartz/salbmp.cxx Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899
2014-01-06Resolves: #i123840# add and use the sal_GlyphId typeHerbert Dürr
Using the central definition adds consistency and cleans up many ad hoc declarations. The type sal_GlyphId will become a class in the future so that its bitfield operations etc. can then be isolated into nice methods. (cherry picked from commit c0a84ad10964fb7a65b6239cbe1cef8698b5d17b) Conflicts: vcl/aqua/source/gdi/salatslayout.cxx vcl/aqua/source/gdi/salgdi.cxx vcl/generic/glyphs/gcach_ftyp.cxx vcl/generic/print/genpspgraphics.cxx vcl/generic/print/glyphset.cxx vcl/generic/print/glyphset.hxx vcl/headless/svptext.cxx vcl/inc/generic/genpspgraphics.h vcl/inc/generic/glyphcache.hxx vcl/inc/os2/salgdi.h vcl/inc/quartz/salgdi.h vcl/inc/salgdi.hxx vcl/inc/sallayout.hxx vcl/inc/unx/salgdi.h vcl/inc/vcl/fontmanager.hxx vcl/inc/win/salgdi.h vcl/os2/source/gdi/os2layout.cxx vcl/os2/source/gdi/salgdi3.cxx vcl/source/gdi/pdfwriter_impl.cxx vcl/source/gdi/sallayout.cxx vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/gcach_layout.cxx vcl/source/glyphs/glyphcache.cxx vcl/source/glyphs/graphite_layout.cxx vcl/unx/generic/fontmanager/fontmanager.cxx vcl/unx/generic/gdi/gcach_xpeer.cxx vcl/unx/generic/gdi/gcach_xpeer.hxx vcl/unx/generic/gdi/salgdi3.cxx vcl/unx/generic/gdi/xrender_peer.hxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/winlayout.cxx Change-Id: Ic629131950360e2df4c15db30d6a5362193c6330
2013-12-31Resolves: #i123840# normalize SalGraphics point count argument types...Herbert Dürr
to sal_uInt32 The old mixture of sal_uInt32, ULONG, sal_uLong, sal_uIntPtr gets consolidated. 4e9 points are more than enough for a SalGraphics. (cherry picked from commit 03f5dce97331acc1a5e832f956d711a5dc0aac0e) Conflicts: vcl/aqua/source/gdi/salgdi.cxx vcl/generic/print/genpspgraphics.cxx vcl/inc/os2/salgdi.h vcl/inc/quartz/salgdi.h vcl/inc/salgdi.hxx vcl/os2/source/gdi/salgdi.cxx vcl/os2/source/gdi/salgdi2.cxx vcl/source/gdi/salgdilayout.cxx vcl/unx/generic/gdi/salgdi.cxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx Change-Id: Iddf806256c7e5403158635e3f5f0049e9382500f
2013-12-26WaE: unused variable 'aRefreshRect'Tor Lillqvist
Change-Id: Ib327646572890b13f7049d2ba106c465d7c855f7
2013-12-25cppcheck: Prefer prefix ++/-- operators for non-primitive typesJulien Nabet
Change-Id: I8bd50f3c9ea3cfc770d530c9cbde0ad00e4def4c
2013-12-19The "fake DPI scale" was always 1Tor Lillqvist
Thanks to kendy for noticing. Change-Id: I6b62d5a0c1dc5df374629a8f7c6e7d2f7cd7ffbd
2013-12-18Add a view-only iOS test app using tiled renderingTor Lillqvist
I had to add some horrible hacks to make sure the test doc has been loaded into a Writer shell before retrieving its size and being able to render it. Obviously some better solution is needed. But this is just a testbed to get some profiling data. The app is built using an Xcode project, and in gbuild through a custom target based on the MobileLibreOffice one. Setting up the various files used (or not used...) at run-time should really be factored out from the CustomTarget files. Change-Id: I1711b0cae9d28a09b73476b2d37d98b1820c9943
2013-12-17Related: #i123840# normalize SalFrame resolution type to sal_Int32Herbert Dürr
(cherry picked from commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436) Conflicts: vcl/aqua/source/gdi/salgdi.cxx vcl/aqua/source/gdi/salprn.cxx vcl/aqua/source/window/salframe.cxx vcl/inc/aqua/salframe.h vcl/inc/aqua/salgdi.h vcl/inc/os2/salgdi.h vcl/os2/source/gdi/salgdi.cxx vcl/unx/generic/gdi/salgdi3.cxx Change-Id: I86f2902d765422b4b850619c72119ad4e03452d7
2013-12-14iOS tiled rendering workTor Lillqvist
Possibly quite broken intermediate commit. But anyway, now it is possible to render the tile diretly to a CGContext. Can be seen in the MobileLibreOffice app when build in the Debug_tile_tester configuration. See touch_lo_draw_tile() in viewsh.cxx. Unfortunately the old plain LibreOffice test app is now broken, though, and displays nothing at all. This refactoring and hacking in vcl was done in a quite ugly fashion, with ifdefs etc. But trust me, I did try, several times, for many days, to get where I wanted in an elegant and clean fashion. But doing it cleanly meant not being able to actually build it for days while trying to figure ut which bits go where and which class should be split into what base and derived class(es), and it was too much for my limited brain capacity. I just couldn't juggle all the vcl class structure in my head, especially as I don't have any good understanding of the general design of it all. Change-Id: Ia59d6a9cce15a63e63f94e8d8574bef21993fb1f
2013-12-12Related: #i123840# use CoreGraphic helper methods for primitivesHerbert Dürr
C++11 says that narrowing conversions in array initializers are illegal. This often happened for signed/unsigned and 32bit/64bit mismatches when initializing CoreGraphics elementary types. Using CoreGraphic helper methods for primitives is recommended. (cherry picked from commit 5e7c8cd9c6772d9b9e5747e74768c61143a7ed01) Conflicts: vcl/aqua/source/gdi/salgdi.cxx Change-Id: I5927790d97decea57ff236b0a52561e08f017163
2013-12-12Much better fix for the iOS text colour problemTor Lillqvist
Just use the same simple trick as for OS X in OutputDevice::ImplLayout(). Thanks to Khaled Hosny for pointing out this. This reverts commit 9aba69e8cc034526c53f6135a41fc62dc3c5dce3. Change-Id: I27ba92ef8ebd1ebdb9eb74f670d8170649078881
2013-12-12Fix the iOS coloured text problemTor Lillqvist
The eventual text colour is not known yet when LayoutText() is called. So we need to re-do the layout and justification in DrawText() in case we have a text colour. For some reason this is needed only on iOS. On OS X, the original code manages to display coloured text correctly. But then, on iOS a virtual device is used, and who knows what other strange things going on. Some of the scary warnings printed make you a tad unsure everything is working correcly... (Like "SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)") Change-Id: Ide99c163dea0f758a373c8dab9c54681ff57f624
2013-12-11Try to fix colour issuesTor Lillqvist
Use RGBA consistenly. Wonder why the code was changed to use BGRA at some point? I got the picture in the document to show up with correct colours but unfortunately not the RED GREEN BLUE etc text. Weird. Even weirder, if I add a temporary hack in CoreTextStyle::SetTextColor() to use some other colours for non-black text (instead of the ones passed in the parameter), those colours do show up. This is a mystery. Change-Id: I591424a19fa02b3f095035e989cbc49fff94b8ca
2013-12-06Re-organize OS X and iOS code in vcl a bitTor Lillqvist
Now with the ATSUI code gone is a good time for some re-organisation. Get rid of "aqua" in file names and the separate "coretext" folders. CoreText is all we use now for OS X (and has always been so for iOS), so no need for a "coretext" folder, we can keep the CoreText-using code under "quartz". Keep OS X -specific code in "osx". Ditto for headers. Keep "Aqua" as part of class names for now, though. This is also preparation for planned further unification between OS X and iOS code. Change-Id: Ic60bd73fea4ab98183e7c8a09c7d3f66b9a34223
2013-05-24Newer boost is more picky with null pointersTor Lillqvist
Change-Id: I7a2bcd802ad9316696398a2e176dc03ea25baed1
2013-04-11Log a null CGRect as "NULL"Tor Lillqvist
Change-Id: I94ef782a3d4cd86afe4c1e96426df771401a65d3
2013-04-08Add SAL_INFO output operator for CGColorRefTor Lillqvist
Change-Id: Ie14e6ab19e43961559de21e6e82bd13f647f4e1f
2013-04-08Add logging output operators for CGPoint and CGSizeTor Lillqvist
Change-Id: I04ce457f002cfc0fdf3ab741a389082614035b17
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07Add operator<< for CGRect for SAL_INFO goodnessTor Lillqvist
Change-Id: I144c93d0bdd8758dcdf490f29051c8dcaea500d8
2013-03-21Re-work the vcl aspects of the iOS portTor Lillqvist
Don't try to use similar code as for OS X to manage windows, events etc. I.e. don't use UIKit in vcl to do that. Instead, just do as in the Android port, use the "headless" vcl backend. Do keep using CoreText, though, not FreeType & fontconfig. Start changing the iOS "Viewer" app to correspond to the Android "desktop" app (so it should be renamed). Work in progress since a long time, several crucial details still missing, but committing for now. Change-Id: Iac5fbf8def415e4d0d21e5200450a373420ad7ee
2013-01-19AquaSalBitmap and IosSalBitmap were identical so unifyTor Lillqvist
Call it QuartzSalBitmap. The more we get rid of that "Aqua" term the better. Aqua is the name of a visual theme, not of an API. The Quartz 2D API is shared between OS X and iOS.