diff --git a/CMakeLists.txt b/CMakeLists.txt index eb1696d9..fbcb3358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,11 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # - switch to 3.1.0 features # the docs say we need to set this up prior to project() -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8") +# the docs don't say this, but the CACHE part is important; see https://stackoverflow.com/questions/34208360/cmake-seems-to-ignore-cmake-osx-deployment-target +# TODO figure out what other variables must be set with CACHE +# TODO figure out if FORCE is needed here +# TODO figure out whether STRING "" is best or if something else is better; also what FORCE does because I forget and later I say it's needed +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE) # we want to disable incremental linking # see also: @@ -118,6 +122,18 @@ else() -static-libstdc++ ) endif() + + # TODO document this + if(ADDRESS_SANITIZER) + set(_COMMON_CFLAGS ${_COMMON_CFLAGS} + -fsanitize=address + -fno-omit-frame-pointer + ) + set(_COMMON_LDFLAGS ${_COMMON_LDFLAGS} + -fsanitize=address + -fno-omit-frame-pointer + ) + endif() endif() # problem: @@ -190,8 +206,9 @@ if(BUILD_SHARED_LIBS) endif() macro(_add_exec _name) + # TODOTODO re-add WIN32 when merging back add_executable(${_name} - WIN32 EXCLUDE_FROM_ALL + EXCLUDE_FROM_ALL ${ARGN}) target_link_libraries(${_name} libui ${_LIBUI_STATIC_RES}) _target_link_options_private(${_name} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..94bd199b --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,131 @@ +# Contributing to libui + +libui is an open source project that openly accepts contributions. I appreciate your help! + +## Rules for contributing code + +While libui is open to contributions, a number of recent, significantly large contributions and uncontributed forks have recently surfaced that do not present themselves in a form that makes it easy for libui to accept them. In order to give your contribution a high chance of being accepted into libui, please keep the following in mind as you prepare your contribution. + +### Commit messages and pull request description + +libui does not enforce rules about the length or detail that a commit message. I'm not looking for an essay. However, single-word descriptions of nontrivial changes are *not* acceptable. I should be able to get a glimpse of what a commit does from the commit message, even if it's just one sentence to describe a trivial change. (Yes, I know I haven't followed this rule strictly myself, but I try not to break it too.) And a commit message should encompass everything; typically, I make a number of incremental commits toward a feature, so the commit messages don't have to be too long to explain everything. + +Your pull request description, on the other hand, must be a summary of the sum total of all the changes made to libui. Don't just drop a pull request on me with a one-line-long elevator pitch of what you added. Describe your proposed API changes, implementation requirements, and any important consequences of your work. + +### Code formatting + +libui uses K&R C formatting rules for overall code structure: spaces after keywords like `if`, `{` on the same line as a statement with a space, `{` on its own line after a function or method signature (even those inside the class body), no space after the name of a function, etc. + +Use hard tabs, NOT spaces, for indentation. I use a proportional-width font and my text editor doesn't set tabs to a multiple of the space width, so I *will* be able to tell. If you use a fixed-width font, I suggest setting a tab width of 4 spaces per tab, but don't put diagrams in comments with hard tabs, because not everyone does this. + +Expressions should have a space around binary operators, and use parentheses where it would help humans gather the meaning of an expression, regardless of whether a computer could tell what is correct. + +When breaking expressions into multiple lines, always break *after* an operator, such as `,` or `&&`. + +There should be a newline between a function's variables and a function's code. After that, you can place newlines to delimit different parts of a function, but don't go crazy. + +In the event you are unsure of something, refer to existing libui code for examples. I may wind up fixing minor details later anyway, so don't fret about getting minor details right the first time. + +### Naming + +libui uses camel-case for naming, with a handful of very specific exceptions (namely GObject method names, where GObject itself enforces the naming convention). + +All public API names should begin with `ui` and followed by a capital letter. All public struct field names should begin with a capital letter. This is identical to the visibiilty rules of Go, assuming a package name of `ui`. + +Private API names — specifcally those used by more than one source file — should begin with `uipriv` and be followed by a capital letter. This avoids namespace collisions in static libraries. + +Static functions and static objects do not have naming restrictions. + +Acronyms should **NOT** be mixed-case. `http` for the first word in a camel-case name, `HTTP` for all else, but **NEVER** `Http`. This is possibly the only aspect of the controversial nature of code style that I consider indefensibly stupid. + +### API documentation + +(TODO I am writing an API documentation tool; once that becomes stable enough I can talk about documenting libui properly. You'll see vestiges of it throughout ui.h, though.) + +### Other commenting + +(TODO write this part) + +### Compatibility + +libui takes backward compatibility seriously. Your code should not break the current compatibility requirements. All platforms provide a series of macros, defined in the various `uipriv_*.h` files (or `winapi.hpp` on Windows), that specify the minimum required version. If you find yourself needing to remove these or ignore resultant warnings or errors, you're probably breaking compatibility. + +Choosing to drop older versions of Windows, GTK+, and OS X that I could have easily continued to support was not done lightly. If you want to discuss dropping support for an older version of any of these for the benefit of libui, file an issue pleading your case (see below). + +GTK+ versions are harder to drop because I am limited by Linux distribution packaging. In general, I will consider bumping GTK+ versions on a new Ubuntu LTS release, choosing the earliest version available on the major distributions at the time of the *previous* Ubuntu LTS release. As of writing, the next milestone will be *after* April 2018, and the target GTK+ version appears to be 3.18, judging by Ubuntu 16.04 LTS alone. This may be bumped back depending on other distros (or it may not be bumped at all), but you may wish to keep this in mind as you write. + +(TODO talk about future.c/.cpp/.m files) + +As for language compatibility, libui is written in C99. I have no intention of changing this. + +As for build system compatibility, libui uses CMake 3.1.0. If you wish to bump the version, file an issue pleading your case (but see below). + +**If you do plead your case**, keep in mind that "it's old" is not a sufficient reason to drop things. If you can prove that **virtually no one** uses the minimum version anymore, then that is stronger evidence. The best evidence, however, is that not upgrading will hold libui back in some significant way — but beware that there are some things I won't add to libui itself. + +### Windows-specific notes + +The Windows backend of libui is written in C++ using C++11. + +Despite using C++, please refrain from using the following: + +- using C++ in ui_windows.h (this file should still be C compatible) +- smart pointers +- namespaces +- `using namespace` +- ATL, MFC, WTL + +The following are not recommended, for consistency with the rest of libui: + +- variable declarations anywhere in a function (keep them all at the top) +- `for (int x...` (C++11 foreach syntax is fine, though) +- omitting the `struct` on type names for ordinary structs + +The format of a class should be + +```c++ +class name : public ancestor { + int privateVariable; + // etc. +public: + // public stuff here +}; +``` + +### GTK+-specific notes + +Avoid GNU-specific language features. I build with strict C99 conformance. + +### OS X-specific notes + +Avoid GNU-specific/clang-specific language features. I build with strict C99 conformance. + +libui is presently **not** ARC-compliant. Features that require ARC should be avoided for now. I may consider changing this in the future, but it will be a significant change. + +To ensure maximum compiler output in the event of a coding error, there should not be any implicit method calls in Objective-C code. For instance, don't do + +```objective-c +[[array objectAtIndex:i] method] +``` + +Instead, cast the result of `objectAtIndex:` to the appropriate type, and then call the method. (TODO learn about, then decide a policy on, soft-generics on things other than `id`) + +The format of a class should be + +```objective-c +@interface name : parent { + // ivars +} +// properties +- (ret)method:(int)arg; +// more methods +@end + +@implementation name + +- (ret)method:(int)arg +{ + // note the lack of semicolon +} + +@end +``` diff --git a/README.md b/README.md index 01275c0e..355bb009 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,20 @@ # libui: a portable GUI library for C This README is being written.
-[![Build Status](https://travis-ci.org/andlabs/libui.svg)](https://travis-ci.org/andlabs/libui) +[![Build Status](https://travis-ci.org/andlabs/libui.svg?branch=master)](https://travis-ci.org/andlabs/libui) ## Announcements +* **18 March 2018** + * Introduced an all-new formatted text API that allows you to process formatted text in ways that the old API wouldn't allow. You can read on the whole API [here](https://github.com/andlabs/libui/blob/8944a3fc5528445b9027b1294b6c86bae03eeb89/ui_attrstr.h). There is also a new examples for it: `drawtext`, which shows the whole API at a glance. It doesn't yet support measuring or manipulating text, nor does it currently support functions that would be necessary for things like text editors; all of this will be added back later. + * libui also now uses my [utf library](https://github.com/andlabs/utf) for UTF-8 and UTF-16 processing, to allow consistent behavior across platforms. This usage is not completely propagated throughout libui, but the Windows port uses it in most places now, and eventually this will become what libui will use throughout. + * Also introduced a formal set of contribution guidelines, see `CONTRIBUTING.md` for details. They are still WIP. + +* **17 February 2018** + * The longstanding Enter+Escape crashes on Windows have finally been fixed (thanks to @lxn). + * **Alpha 3.5 is now here.** This is a quickie release primiarly intended to deploy the above fix to package ui itself. **It is a partial binary release; sorry!** More new things will come in the next release, which will also introduce semver (so it will be called v0.4.0 instead). + * Alpha 3.5 also includes a new control gallery example. The screenshots below have not been updated yet. + * **27 November 2016** * Decided to split the table stuff into its own branch. It will be developed independently of everything else, along with a few other features. @@ -42,8 +52,8 @@ This README is being written.
*Note that today's entry (Eastern Time) may be updated later today.* -* ** 1.40.3 [02:20:46] I'll ahve to keep this in mind then, thanks [02:20:59] if only there was a cairo-specific attribute for alpha... + +FONT LOADING + +[00:10:08] andlabs: is there API yet to load from memory? last i checked i only found from file (which we use in builder). https://git.gnome.org/browse/gnome-builder/tree/libide/editor/ide-editor-map-bin.c#n115 +[00:13:12] mrmcq2u_ (mrmcq2u@109.79.53.90) joined the channel +[00:14:59] mrmcq2u (mrmcq2u@109.79.73.102) left IRC (Ping timeout: 181 seconds) +[00:15:19] hergertme: no, which is why I was asking =P +[00:15:30] I would have dug down if I could ensure at least something about the backends a GTK+ 3 program uses +[00:15:39] on all platforms except windows and os x +[00:16:11] to the best of my (partially outdated, given pace of foss) knowledge there isn't an api to load from memory +[00:16:28] you can possibly make a tmpdir and put a temp file in there +[00:16:52] and load that as your font dir in your FcConfig, so any PangoFontDescription would point to that one font, no matter what +[00:17:18] (using the API layed out in that link) +[00:18:18] dsr1014__ (dsr1014@c-73-72-102-18.hsd1.il.comcast.net) joined the channel +[00:35:18] simukis_ (simukis@78-60-58-6.static.zebra.lt) left IRC (Quit: simukis_) +[00:35:48] dreamon_ (dreamon@ppp-188-174-49-41.dynamic.mnet-online.de) joined the channel +[00:40:09] samtoday_ (samtoday@114-198-116-132.dyn.iinet.net.au) joined the channel +[00:40:32] mjog (mjog@120.18.225.46) joined the channel +[00:40:38] hergertme: not necessarily fontconfig +[00:40:45] it can be with ft2 or xft I guess +[00:40:55] especially since I want the API NOT to make the font part of the font panel +[00:42:07] what sort of deprecated code are you trying to support? +[00:42:35] both of those are deprecated in pango fwiw +[00:43:06] on Linux im pretty sure we use FC everywhere these days +[00:44:46] (and gtk_widget_set_font_map() is how you get your custom font into a widget without affecting the global font lists, as layed out in that link) +[00:49:14] vasaikar (vasaikar@125.16.97.121) joined the channel +[00:50:14] karlt (karl@2400:e780:801:224:f121:e611:d139:e70e) left IRC (Client exited) +[00:50:49] karlt (karl@2400:e780:801:224:f121:e611:d139:e70e) joined the channel +[00:51:43] PioneerAxon (PioneerAxo@122.171.61.146) left IRC (Ping timeout: 180 seconds) +[00:57:47] PioneerAxon (PioneerAxo@106.201.37.181) joined the channel +[01:03:01] karlt (karl@2400:e780:801:224:f121:e611:d139:e70e) left IRC (Ping timeout: 181 seconds) +[01:05:49] muhannad (muhannad@95.218.26.152) left IRC (Quit: muhannad) +[01:07:51] hergertme: hm +[01:07:54] all right, thanks +[01:08:05] hergertme: fwiw right now my requirement is 3.10 +[01:10:47] ah, well you'll probably be missing the neccesary font API on gtk_widget +[01:11:04] but pango should be fine even back as far as https://developer.gnome.org/pango/1.28/PangoFcFontMap.html +[01:11:56] good +[01:12:04] because this is for custom drawing into a DrawingArea +[01:14:12] presumably just create your PangoContext as normal, but call pango_context_set_font_map() with the map you've setup. now, the load a font from a file i dont think was added to FontConfig until later though (not sure what release) +[01:15:53] FcConfigAppFontAddFile() <-- that API +[01:16:30] great, and they don't say what version the API was added in teh docs +function: ide_editor_map_bin_add() + +- Mouse ClickLock: do we need to do anything special? *should* we? https://msdn.microsoft.com/en-us/library/windows/desktop/ms724947(v=vs.85).aspx +- consider a uiAnticipateDoubleClick() or uiDoubleClickTime() (for a uiQueueTimer()) or something: https://blogs.msdn.microsoft.com/oldnewthing/20041015-00/?p=37553 + +- determine whether MSGF_USER is for and if it's correct for our uiArea message filter (if we have one) + +- source file encoding and MSVC compiler itself? https://stackoverflow.com/questions/20518040/how-can-i-get-the-directwrite-padwrite-sample-to-work + - also need to worry about object file and output encoding... + - this also names the author of the padwrite sample + +- OpenType features TODOs + - https://stackoverflow.com/questions/32545675/what-are-the-default-typography-settings-used-by-idwritetextlayout + - feature/shaping interaction rules for arabic: https://www.microsoft.com/typography/OpenTypeDev/arabic/intro.htm + - other stuff, mostly about UIs and what users expect to be able to set + - https://klim.co.nz/blog/towards-an-ideal-opentype-user-interface/ + - https://libregraphicsmeeting.org/2016/designing-for-many-applications-opentype-features-ui/ + - https://www.youtube.com/watch?v=wEyDhsH076Y + - https://twitter.com/peter_works + - http://ilovetypography.com/2014/10/22/better-ui-for-better-typography-adobe-petition/ + - http://silgraphite.sourceforge.net/ui/studynote.html + +- add NXCOMPAT (DEP awareness) to the Windows builds + - and ASLR too? or is that not a linker setting + +OS X: embedding an Info.plist into a binary directly +https://www.objc.io/issues/6-build-tools/mach-o-executables/ +TODO will this let Dictation work? +TODO investigate ad-hoc codesigning + +https://blogs.msdn.microsoft.com/oldnewthing/20040112-00/?p=41083 def files for decoration (I forget if I said this earlier) + +TODO ClipCursor() stuff; probably not useful for libui but still +https://blogs.msdn.microsoft.com/oldnewthing/20140102-00/?p=2183 +https://blogs.msdn.microsoft.com/oldnewthing/20061117-03/?p=28973 +https://msdn.microsoft.com/en-us/library/windows/desktop/ms648383(v=vs.85).aspx + +https://cmake.org/Wiki/CMake_Useful_Variables +set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined") +On Unix systems, this will make linker report any unresolved symbols from object files (which is quite typical when you compile many targets in CMake projects, but do not bother with linking target dependencies in proper order). +(I used to have something like this back when I used makefiles; did it convert in? I forget) + +look into these for the os x port +https://developer.apple.com/documentation/appkit/view_management/nseditor?language=objc +https://developer.apple.com/documentation/appkit/view_management/nseditorregistration?language=objc + +for future versions of the os x port +https://developer.apple.com/documentation/appkit/nslayoutguide?language=objc and anchors +https://developer.apple.com/documentation/appkit/nsuserinterfacecompression?language=objc https://developer.apple.com/documentation/appkit/nsuserinterfacecompressionoptions?language=objc +though at some point we'll be able to use NSStackView and NSGridView directly, so... + +Cocoa PDFs +https://developer.apple.com/documentation/appkit/nspdfimagerep?language=objc +https://developer.apple.com/documentation/coregraphics?language=objc +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_pagination/osxp_pagination.html#//apple_ref/doc/uid/20001051-119037 +https://developer.apple.com/documentation/appkit/nsprintoperation/1529269-pdfoperationwithview?language=objc +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_printapps/osxp_printapps.html#//apple_ref/doc/uid/20000861-BAJBFGED +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_printingapi/osxp_printingapi.html#//apple_ref/doc/uid/10000083i-CH2-SW2 +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_printinfo/osxp_printinfo.html#//apple_ref/doc/uid/20000864-BAJBFGED +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_printlayoutpanel/osxp_printlayoutpanel.html#//apple_ref/doc/uid/20000863-BAJBFGED +https://developer.apple.com/documentation/appkit/nspagelayout?language=objc +https://developer.apple.com/documentation/appkit/nsprintinfo?language=objc +https://developer.apple.com/documentation/applicationservices/core_printing?language=objc +https://developer.apple.com/documentation/applicationservices/1463247-pmcreatesession?language=objc +https://developer.apple.com/documentation/applicationservices/pmprintsession?language=objc +https://developer.apple.com/documentation/applicationservices/1460101-pmsessionbegincgdocumentnodialog?language=objc +https://developer.apple.com/documentation/applicationservices/1463416-pmsessionbeginpagenodialog?language=objc +https://developer.apple.com/documentation/applicationservices/1506831-anonymous/kpmdestinationprocesspdf?language=objc +https://developer.apple.com/documentation/applicationservices/1461960-pmcreategenericprinter?language=objc +https://developer.apple.com/documentation/applicationservices/1460101-pmsessionbegincgdocumentnodialog?language=objc +https://developer.apple.com/documentation/applicationservices/1464527-pmsessionenddocumentnodialog?language=objc +https://developer.apple.com/documentation/applicationservices/1461952-pmsessiongetcggraphicscontext?language=objc +https://developer.apple.com/library/content/technotes/tn2248/_index.html +https://developer.apple.com/library/content/samplecode/PMPrinterPrintWithFile/Introduction/Intro.html +https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Printing/osxp_aboutprinting/osxp_aboutprt.html + +- run os x code with `OBJC_DEBUG_MISSING_POOLS=YES` and other `OBJC_HELP=YES` options + - turn off the autorelease pool to make sure we're not autoreleasing improperly + +TODO investigate -Weverything in clang alongside -Wall in MSVC (and in gcc too maybe...) + +mac os x accessibility +- https://developer.apple.com/documentation/appkit/nsworkspace/1524656-accessibilitydisplayshoulddiffer?language=objc +- https://developer.apple.com/documentation/appkit/nsworkspace/1526290-accessibilitydisplayshouldincrea?language=objc +- https://developer.apple.com/documentation/appkit/nsworkspace/1533006-accessibilitydisplayshouldreduce?language=objc + +uiEntry disabling bugs http://www.cocoabuilder.com/archive/cocoa/215525-nstextfield-bug-can-be.html +uiMultilineEntry disabling https://developer.apple.com/library/content/qa/qa1461/_index.html + +more TODOs: +- make no guarantee about buildability of feature branches diff --git a/oldhaiku.tgz b/_abort/oldhaiku.tgz similarity index 100% rename from oldhaiku.tgz rename to _abort/oldhaiku.tgz diff --git a/_future/otherattributes/ui.h b/_future/otherattributes/ui.h new file mode 100644 index 00000000..697f09bc --- /dev/null +++ b/_future/otherattributes/ui.h @@ -0,0 +1,190 @@ +_UI_ENUM(uiAttribute) { + uiAttributeFamily, + uiAttributeSize, // use Double + uiAttributeWeight, + uiAttributeItalic, + uiAttributeStretch, + uiAttributeColor, // use R, G, B, A + uiAttributeBackground, // use R, G, B, A + + // TODO kerning amount + // OS X: kCTKernAttributeName + // > 0: farther (TODO from advance or standard kerning?) + // == 0: no kerning + // < 0: closer (TODO same) + // undefined: standard kerning + // Pango: pango_attr_letter_spacing_new() + // parameter meaning unspecified + // Windows: requires Platform Update, SetLetterSpacing() + // parameter meaning unspecified + + uiAttributeUnderline, // enum uiDrawUnderlineStyle + // TODO what is the color in the case we don't specify it, black or the text color? + uiAttributeUnderlineColor, // enum uiDrawUnderlineColor + + // TODO kCTSuperscriptAttributeName vs below + // all it does is set the below attribute so + + // TODO kCTBaselineClassAttributeName, kCTBaselineInfoAttributeName, kCTBaselineReferenceInfoAttributeName + + // TODO strikethroughs? (pango yes, directwrite yes, os x no) + // TODO baseline offsets? (pango yes) + // TODO size scales? (pango yes) + // TODO fallbacks (pango: enable or disable) + + // TODO document that this will also enable language-specific font features (TODO on DirectWrite too?) + // TODO document that this should be strict BCP 47 form (A-Z, a-z, 0-9, and -) for maximum compatibility + uiAttributeLanguage, // BCP 47 string + + // These attributes represent typographic features. Each feature + // is a separate attribute, to make composition easier. The + // availability of for each attribute are defined by the font; the + // default values are defined by the font and/or by the OS. + // + // A note about features whose parameter is an enumeration: + // OS X defines typographic features using the AAT specification + // and converts to OpenType internally when needed, whereas + // other platforms use OpenType directly. OpenType is less + // precise about what each enumeration value means than AAT + // is, so enumeration values do not necessarily represent what + // OS X expects with all fonts. In cases where they do, libui + // provides an enumeration type to use. Otherwise, the AAT + // enumeration values are provided in comments for + // documentation purposes. + + // TODO kAllTypographicFeaturesType + + // AAT calls these "common ligatures" + uiAttributeStandardLigatures, // 0 = off, 1 = on + uiAttributeRequiredLigatures, // 0 = off, 1 = on + // AAT calls these "rare ligatures" + uiAttributeDiscretionaryLigatures, // 0 = off, 1 = on + uiAttributeContextualLigatures, // 0 = off, 1 = on + uiAttributeHistoricalLigatures, // 0 = off, 1 = on + + // TODO uiAttributeCursiveConnection, // 0 = none, 1 = some, 2 = all + + uiAttributeUnicase, // 0 = off, 1 = on + + // TODO uiAttributeLinguisticRearrangement, // 0 = off, 1 = on + + // TODO rename this + uiAttributeNumberSpacings, // enum uiAttributeNumberSpacing + + // TODO kSmartSwashType, falt and jalt + + // TODO kDiacriticsType + + uiAttributeSuperscripts, // enum uiAttributeSuperscript + + uiAttributeFractionForms, // enum uiAttributeFractionForm + + uiAttributeSlashedZero, // 0 = off, 1 = on + + uiAttributeMathematicalGreek, // 0 = off, 1 = on + + // AAT defines the following values: + // 0 = none + // 1 = dingbats + // 2 = pi characters + // 3 = fleurons + // 4 = decorative borders + // 5 = international symbols + // 6 = mathematical symbols + // OpenType says alphanumeric characters must(? TODO) have one form each and the bullet character U+2022 (•) can have many + uiAttributeOrnamentalForms, // an integer from 0 to a font-specified upper bound + // TODO provide a function to get the upper bound? + + // AAT calls this "character alternatives" and defines the + // following values: + // 0 = none + // OpenType calls this "access all alternates". + // TODO doesn't OpenType do the same about 0? + uiAttributeSpecificCharacterForm, // an integer from 0 to a font-specified upper bound + // TODO provide a function to get the upper bound? + + uiAttributeTitlingCapitalForms, // 0 = off, 1 = on + + // AAT calls these "character shapes" + uiAttributeHanCharacterForms, // enum uiAttributeHanCharacterForm + + // OpenType calls these "old-style" + uiAttributeLowercaseNumbers, // 0 = off, 1 = on + + // TODO kTextSpacingType + // see kKanaSpacingType below + + uiAttributeHanjaToHangul, // 0 = off, 1 = on + + // AAT defines the following values: + // 0 = none + // 1 = box + // 2 = rounded box + // 3 = circle + // 4 = inverted circle + // 5 = parentheses + // 6 = period + // 7 = roman numeral + // 8 = diamond + // 9 = inverted box + // 10 = inverted rounded box + // TODO rename to AnnotatedForms? + uiAttributeAnnotatedGlyphForms, // an integer from 0 to a font-specified upper bound + // TODO provide a function to get the upper bound? + + // TODO kKanaSpacingType + // TODO kIdeographicSpacingType + // can they be provided independently of kTextSpacingType? Core Text doesn't seem to + + // TODO kUnicodeDecompositionType + + uiAttributeRubyKanaForms, // 0 = off, 1 = on + + // TODO kCJKVerticalRomanPlacementType + // this is 'valt' in OpenType but I don't know if I want to make it selectable or not + + uiAttributeCJKRomansToItalics, // 0 = off, 1 = on + + // AAT calls this "case-sensitive layout" + uiAttributeCaseSensitiveForms, // 0 = off, 1 = on + // AAT: this is called "case-sensitive spacing" + uiAttributeCapitalSpacing, // 0 = off, 1 = on + + uiAttributeAlternateHorizontalKana, // 0 = off, 1 = on + uiAttributeAlternateVerticalKana, // 0 = off, 1 = on + + // TODO "Alternate"? unify all this + // TODO document that these are guaranteed to be consecutive + uiAttributeStylisticAlternate1, // 0 = off, 1 = on + uiAttributeStylisticAlternate2, // 0 = off, 1 = on + uiAttributeStylisticAlternate3, // 0 = off, 1 = on + uiAttributeStylisticAlternate4, // 0 = off, 1 = on + uiAttributeStylisticAlternate5, // 0 = off, 1 = on + uiAttributeStylisticAlternate6, // 0 = off, 1 = on + uiAttributeStylisticAlternate7, // 0 = off, 1 = on + uiAttributeStylisticAlternate8, // 0 = off, 1 = on + uiAttributeStylisticAlternate9, // 0 = off, 1 = on + uiAttributeStylisticAlternate10, // 0 = off, 1 = on + uiAttributeStylisticAlternate11, // 0 = off, 1 = on + uiAttributeStylisticAlternate12, // 0 = off, 1 = on + uiAttributeStylisticAlternate13, // 0 = off, 1 = on + uiAttributeStylisticAlternate14, // 0 = off, 1 = on + uiAttributeStylisticAlternate15, // 0 = off, 1 = on + uiAttributeStylisticAlternate16, // 0 = off, 1 = on + uiAttributeStylisticAlternate17, // 0 = off, 1 = on + uiAttributeStylisticAlternate18, // 0 = off, 1 = on + uiAttributeStylisticAlternate19, // 0 = off, 1 = on + uiAttributeStylisticAlternate20, // 0 = off, 1 = on + + uiAttributeContextualAlternates, // 0 = off, 1 = on + uiAttributeSwashes, // 0 = off, 1 = on + uiAttributeContextualSwashes, // 0 = off, 1 = on + + uiAttributeLowercaseCapForms, // enum uiAttributeCapForm + uiAttributeUppercaseCapForms, // enum uiAttributeCapForm + + // TODO kCJKRomanSpacingType + + // TODO uiAttributeSystem, (this might not be doable with DirectWrite) + // TODO uiAttributeCustom, +}; diff --git a/_future/textlanguageattr/README b/_future/textlanguageattr/README new file mode 100644 index 00000000..f3bb4916 --- /dev/null +++ b/_future/textlanguageattr/README @@ -0,0 +1 @@ +Removed because proper support on OS X doesn't come until 10.9 unless we use a font with an ltag table; none of the fonts I have come with ltag tables (none of the fonts on OS X do, or at least don't come with a sr entry in their ltag table, and OpenType has replaced ltag with what appears to be custom sub-tables of the GPOS and GSUB tables.) diff --git a/_future/textlanguageattr/attrstr_darwin.m b/_future/textlanguageattr/attrstr_darwin.m new file mode 100644 index 00000000..1717d875 --- /dev/null +++ b/_future/textlanguageattr/attrstr_darwin.m @@ -0,0 +1,19 @@ +struct fontParams { + uiDrawFontDescriptor desc; + uint16_t featureTypes[maxFeatures]; + uint16_t featureSelectors[maxFeatures]; + size_t nFeatures; + const char *language; +}; + + + // locale identifiers are specified as BCP 47: https://developer.apple.com/reference/corefoundation/cflocale?language=objc + case uiAttributeLanguage: + // LONGTERM FUTURE when we move to 10.9, switch to using kCTLanguageAttributeName + ensureFontInRange(p, start, end); + adjustFontInRange(p, start, end, ^(struct fontParams *fp) { + fp->language = (const char *) (spec->Value); + }); + break; + + desc = fontdescAppendFeatures(desc, fp->featureTypes, fp->featureSelectors, fp->nFeatures, fp->language); diff --git a/_future/textlanguageattr/attrstr_unix.c b/_future/textlanguageattr/attrstr_unix.c new file mode 100644 index 00000000..47d22b15 --- /dev/null +++ b/_future/textlanguageattr/attrstr_unix.c @@ -0,0 +1,9 @@ + PangoLanguage *lang; + + // language strings are specified as BCP 47: https://developer.gnome.org/pango/1.30/pango-Scripts-and-Languages.html#pango-language-from-string https://www.ietf.org/rfc/rfc3066.txt + case uiAttributeLanguage: + lang = pango_language_from_string((const char *) (spec->Value)); + addattr(p, start, end, + pango_attr_language_new(lang)); + // lang *cannot* be freed + break; diff --git a/_future/textlanguageattr/attrstr_windows.cpp b/_future/textlanguageattr/attrstr_windows.cpp new file mode 100644 index 00000000..f8238c7f --- /dev/null +++ b/_future/textlanguageattr/attrstr_windows.cpp @@ -0,0 +1,10 @@ + WCHAR *localeName; + + // locale names are specified as BCP 47: https://msdn.microsoft.com/en-us/library/windows/desktop/dd373814(v=vs.85).aspx https://www.ietf.org/rfc/rfc4646.txt + case uiAttributeLanguage: + localeName = toUTF16((char *) (spec->Value)); + hr = p->layout->SetLocaleName(localeName, range); + if (hr != S_OK) + logHRESULT(L"error applying locale name attribute", hr); + uiFree(localeName); + break; \ No newline at end of file diff --git a/_future/textlanguageattr/common_attrlist.c b/_future/textlanguageattr/common_attrlist.c new file mode 100644 index 00000000..680a2d09 --- /dev/null +++ b/_future/textlanguageattr/common_attrlist.c @@ -0,0 +1,2 @@ + case uiAttributeLanguage: + return asciiStringsEqualCaseFold((char *) (attr->spec.Value), (char *) (spec->Value)); diff --git a/_future/textlanguageattr/drawtext_example.c b/_future/textlanguageattr/drawtext_example.c new file mode 100644 index 00000000..e006e7e1 --- /dev/null +++ b/_future/textlanguageattr/drawtext_example.c @@ -0,0 +1,27 @@ +before "or any combination of the above" + + // thanks to https://twitter.com/codeman38/status/831924064012886017 + next = "\xD0\xB1\xD0\xB3\xD0\xB4\xD0\xBF\xD1\x82"; + uiAttributedStringAppendUnattributed(attrstr, "multiple languages (compare "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeItalic; + spec.Value = uiDrawTextItalicItalic; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + spec.Type = uiAttributeLanguage; + spec.Value = (uintptr_t) "ru"; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " to "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeItalic; + spec.Value = uiDrawTextItalicItalic; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + spec.Type = uiAttributeLanguage; + spec.Value = (uintptr_t) "sr"; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " \xE2\x80\x94 may require changing the font)"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); diff --git a/_future/textlanguageattr/fontmatch_darwin.m b/_future/textlanguageattr/fontmatch_darwin.m new file mode 100644 index 00000000..cd4df7a1 --- /dev/null +++ b/_future/textlanguageattr/fontmatch_darwin.m @@ -0,0 +1,112 @@ +// note: this doesn't work for languages; we have to parse the ltag table + +// fortunately features that aren't supported are simply ignored, so we can copy them all in +// LONGTERM FUTURE when we switch to 10.9, the language parameter won't be needed anymore +// LONGTERM FUTURE and on 10.10 we can use OpenType tags directly! +CTFontDescriptorRef fontdescAppendFeatures(CTFontDescriptorRef desc, const uint16_t *types, const uint16_t *selectors, size_t n, const char *language) +{ + CTFontDescriptorRef new; + CFMutableArrayRef outerArray; + CFDictionaryRef innerDict; + CFNumberRef numType, numSelector; + const void *keys[2], *values[2]; + size_t i; + CFArrayRef languages; + CFIndex il, nl; + CFStringRef curlang; + char d[2]; + + outerArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (outerArray == NULL) { + // TODO + } + keys[0] = kCTFontFeatureTypeIdentifierKey; + keys[1] = kCTFontFeatureSelectorIdentifierKey; + for (i = 0; i < n; i++) { + numType = CFNumberCreate(NULL, kCFNumberSInt16Type, + (const SInt16 *) (types + i)); + numSelector = CFNumberCreate(NULL, kCFNumberSInt16Type, + (const SInt16 *) (selectors + i)); + values[0] = numType; + values[1] = numSelector; + innerDict = CFDictionaryCreate(NULL, + keys, values, 2, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (innerDict == NULL) { + // TODO + } + CFArrayAppendValue(outerArray, innerDict); + CFRelease(innerDict); + CFRelease(numSelector); + CFRelease(numType); + } + + // now we have to take care of the language + if (language != NULL) { + languages = CTFontDescriptorCopyAttribute(desc, kCTFontLanguagesAttribute); + if (languages != NULL) { + nl = CFArrayGetCount(languages); + d[0] = language[0]; + if (d[0] >= 'A' && d[0] <= 'Z') + d[0] += 'a' - 'A'; + d[1] = language[1]; + if (d[1] >= 'A' && d[1] <= 'Z') + d[1] += 'a' - 'A'; + for (il = 0; il < nl; il++) { + char c[2]; + + curlang = (CFStringRef) CFArrayGetValueAtIndex(languages, il); + // TODO check for failure + CFStringGetBytes(curlang, CFRangeMake(0, 2), + kCFStringEncodingUTF8, 0, false, + (UInt8 *) c, 2, NULL); + if (c[0] >= 'A' && c[0] <= 'Z') + c[0] += 'a' - 'A'; + if (c[1] >= 'A' && c[1] <= 'Z') + c[1] += 'a' - 'A'; + if (c[0] == d[0] && c[1] == d[1]) + break; + } + if (il != nl) { + uint16_t typ; + + typ = kLanguageTagType; + il++; + numType = CFNumberCreate(NULL, kCFNumberSInt16Type, + (const SInt16 *) (&typ)); + numSelector = CFNumberCreate(NULL, kCFNumberCFIndexType, + &il); + values[0] = numType; + values[1] = numSelector; + innerDict = CFDictionaryCreate(NULL, + keys, values, 2, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (innerDict == NULL) { + // TODO + } + CFArrayAppendValue(outerArray, innerDict); + CFRelease(innerDict); + CFRelease(numSelector); + CFRelease(numType); + } + CFRelease(languages); + } + } + + keys[0] = kCTFontFeatureSettingsAttribute; + values[0] = outerArray; + innerDict = CFDictionaryCreate(NULL, + keys, values, 1, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease(outerArray); + new = CTFontDescriptorCreateCopyWithAttributes(desc, innerDict); + CFRelease(desc); + CFRelease(innerDict); + return new; +} diff --git a/_future/textlanguageattr/ui.h b/_future/textlanguageattr/ui.h new file mode 100644 index 00000000..2c3c9ec7 --- /dev/null +++ b/_future/textlanguageattr/ui.h @@ -0,0 +1,5 @@ +after UnderlineColor, before feature tags + + // TODO document that this will also enable language-specific font features (TODO on DirectWrite too?) + // TODO document that this should be strict BCP 47 form (A-Z, a-z, 0-9, and -) for maximum compatibility + uiAttributeLanguage, // BCP 47 string diff --git a/_future/unittest/checklist_attrstr b/_future/unittest/checklist_attrstr new file mode 100644 index 00000000..7ba0f244 --- /dev/null +++ b/_future/unittest/checklist_attrstr @@ -0,0 +1,25 @@ += attributed strings +attribute lengths are rounded to complete unicode codepoints +zero-length attributes are elided +consecutive attributes of the same type and value are merged +overlapping attributes of different types do not split each other +overlapping attributes of the same type but different values do split +empty string is allowed +empty string cannot have attributes +font family names are case-insensitive both in attributes and in descriptors +attributes are unique throughout a Unicode codepoint, not just to UTF-8 bytes +define what "it is an error" means in the case of uiFreeAttribute() and all uiAttributeValue() functions and constructors +does uiAttributeFamily() return a normalized string +should uiNewAttributeBackground() be renamed to uiNewAttributeBackgroundColor() and likewise for the type constant +should underline colors just ignore non-custom component arguments +should any color getter function accept a NULL pointer +what should uiAttributeUnderlineColor() do if the color type isn't Custom but the other pointers are non-NULL +should uiOpenTypeFeaturesGet() accept a NULL value pointer +what happens if uiOpenTypeFeaturesForEach() is given a NULl function pointer +should FeaturesAttribute be changed to OpenTypeFeaturesAttribute and likewise for the type enum +should uiNewFeaturesAttribute() accept NULL +should uiNewFamilyAttribute() accept NULL +it is an error in ForEach too +invalid values for uiDrawTextAlign +empty text layouts have one line +TODO figure out what to do if any field (particularly the font family name) in uiFontDescriptor is unset diff --git a/_future/unittest/opentype_test.c b/_future/unittest/opentype_test.c new file mode 100644 index 00000000..0c96108c --- /dev/null +++ b/_future/unittest/opentype_test.c @@ -0,0 +1,115 @@ +// 27 february 2018 +#ifndef TODO_TEST +#error TODO this is where libui itself goes +#endif +#include +#include "testing.h" + +#include +#include +#include +#include +typedef struct uiOpenTypeFeatures uiOpenTypeFeatures; +typedef int uiForEach; +enum { uiForEachContinue, uiForEachStop }; +typedef uiForEach (*uiOpenTypeFeaturesForEachFunc)(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data); +#define uiprivNew(x) ((x *) malloc(sizeof (x))) +#define uiprivAlloc(x,y) malloc(x) +#define uiprivRealloc(x,y,z) realloc(x,y) +#define uiprivFree free +#include "opentype.c" + +static void freeOpenType(void *otf) +{ + uiFreeOpenTypeFeatures((uiOpenTypeFeatures *) otf); +} + +testingTest(OpenTypeFeaturesAddGet) +{ + uiOpenTypeFeatures *otf; + int got; + uint32_t value; + + otf = uiNewOpenTypeFeatures(); + testingTDefer(t, freeOpenType, otf); + uiOpenTypeFeaturesAdd(otf, 'a', 'b', 'c', 'd', 12345); + got = uiOpenTypeFeaturesGet(otf, 'a', 'b', 'c', 'd', &value); + + if (!got) + testingTErrorf(t, "uiOpenTypeFeaturesGet() failed to get feature we added"); + else if (value != 12345) + testingTErrorf(t, "feature abcd: got %" PRIu32 ", want 12345", value); +} + +testingTest(OpenTypeFeaturesRemove) +{ + uiOpenTypeFeatures *otf; + uint32_t value; + + otf = uiNewOpenTypeFeatures(); + testingTDefer(t, freeOpenType, otf); + uiOpenTypeFeaturesAdd(otf, 'a', 'b', 'c', 'd', 12345); + uiOpenTypeFeaturesRemove(otf, 'a', 'b', 'c', 'd'); + + if (uiOpenTypeFeaturesGet(otf, 'a', 'b', 'c', 'd', &value)) + testingTErrorf(t, "uiOpenTypeFeaturesGet() succeeded in getting deleted feature; value %" PRIu32, value); +} + +testingTest(OpenTypeFeaturesCloneAdd) +{ + uiOpenTypeFeatures *otf, *otf2; + uint32_t value; + + otf = uiNewOpenTypeFeatures(); + testingTDefer(t, freeOpenType, otf); + uiOpenTypeFeaturesAdd(otf, 'a', 'b', 'c', 'd', 12345); + otf2 = uiOpenTypeFeaturesClone(otf); + testingTDefer(t, freeOpenType, otf2); + uiOpenTypeFeaturesAdd(otf2, 'q', 'w', 'e', 'r', 56789); + + if (uiOpenTypeFeaturesGet(otf, 'q', 'w', 'e', 'r', &value)) + testingTErrorf(t, "uiOpenTypeFeaturesGet() on original succeeded in getting feature added to clone; value %" PRIu32, value); +} + +testingTest(OpenTypeFeaturesCloneModify) +{ + uiOpenTypeFeatures *otf, *otf2; + uint32_t value; + + otf = uiNewOpenTypeFeatures(); + testingTDefer(t, freeOpenType, otf); + uiOpenTypeFeaturesAdd(otf, 'a', 'b', 'c', 'd', 12345); + otf2 = uiOpenTypeFeaturesClone(otf); + testingTDefer(t, freeOpenType, otf2); + uiOpenTypeFeaturesAdd(otf2, 'a', 'b', 'c', 'd', 56789); + + uiOpenTypeFeaturesGet(otf, 'a', 'b', 'c', 'd', &value); + if (value != 12345) + testingTErrorf(t, "uiOpenTypeFeaturesGet() on original: got %" PRIu32 ", want 12345", value); + uiOpenTypeFeaturesGet(otf2, 'a', 'b', 'c', 'd', &value); + if (value != 56789) + testingTErrorf(t, "uiOpenTypeFeaturesGet() on clone: got %" PRIu32 ", want 56789", value); +} + +testingTest(OpenTypeFeaturesCloneRemove) +{ + uiOpenTypeFeatures *otf, *otf2; + uint32_t value; + + otf = uiNewOpenTypeFeatures(); + testingTDefer(t, freeOpenType, otf); + uiOpenTypeFeaturesAdd(otf, 'a', 'b', 'c', 'd', 12345); + otf2 = uiOpenTypeFeaturesClone(otf); + testingTDefer(t, freeOpenType, otf2); + uiOpenTypeFeaturesRemove(otf2, 'a', 'b', 'c', 'd'); + + if (uiOpenTypeFeaturesGet(otf2, 'a', 'b', 'c', 'd', &value)) + testingTErrorf(t, "uiOpenTypeFeaturesGet() on clone succeeded in getting feature removed from clone; value %" PRIu32, value); + if (!uiOpenTypeFeaturesGet(otf, 'a', 'b', 'c', 'd', &value)) + testingTErrorf(t, "uiOpenTypeFeaturesGet() on original failed to get feature removed from clone"); +} + +int main(void) +{ + return testingMain(); +} diff --git a/_future/unittest/testing.h b/_future/unittest/testing.h new file mode 100644 index 00000000..550e5250 --- /dev/null +++ b/_future/unittest/testing.h @@ -0,0 +1,133 @@ +// 27 february 2018 + +#ifndef testingprivIncludeGuard_testing_h +#define testingprivIncludeGuard_testing_h + +#include + +#undef testingprivBadLanguageVersion +#ifdef __cplusplus +// TODO https://stackoverflow.com/questions/2324658/how-to-determine-the-version-of-the-c-standard-used-by-the-compiler implies this won't do with C++0x-era compilers, and https://wiki.apache.org/stdcxx/C++0xCompilerSupport doesn't talk about va_copy() so a simple version check for the C99 preprocessor may be wrong... +// TODO what if __cplusplus is blank (maybe only in that case, since IIRC C++98 requires __cplusplus to have a value)? +#if __cplusplus < 201103L +#define testingprivBadLanguageVersion +#endif +#elif !defined(__STDC_VERSION__) +#define testingprivBadLanguageVersion +#elif __STDC_VERSION__ < 199901L +#define testingprivBadLanguageVersion +#endif +#ifdef testingprivBadLanguageVersion +#error sorry, TODO requires either C99 or C++11; cannot continue +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +#define testingprivMkScaffold(name) \ + static inline void testingprivScaffold ## name(testingT *t) \ + { \ + bool failedNow = false, skippedNow = false; \ + try { name(t); } \ + catch (testingprivFailNowException e) { failedNow = true; } \ + catch (testingprivSkipNowException e) { skippedNow = true; } \ + /* TODO see if we should catch other exceptions too */ \ + /* don't call these in the catch blocks as they call longjmp() */ \ + if (failedNow) testingprivTDoFailNow(t); \ + if (skippedNow) testingprivTDoSkipNow(t); \ + } +#else +#define testingprivMkScaffold(name) \ + static inline void testingprivScaffold ## name(testingT *t) { name(t); } +#endif + +// references: +// - https://gitlab.gnome.org/GNOME/glib/blob/master/glib/gconstructor.h +// - https://gitlab.gnome.org/GNOME/glib/blob/master/gio/glib-compile-resources.c +// - https://msdn.microsoft.com/en-us/library/bb918180.aspx +#if defined(__cplusplus) +#define testingprivMkCtor(name, reg) \ + static reg ## Class testingprivCtor ## name(#name, testingprivScaffold ## name); +#elif defined(__GNUC__) +#define testingprivMkCtor(name, reg) \ + __attribute__((constructor)) static void testingprivCtor ## name(void) { reg(#name, testingprivScaffold ## name); } +#elif defined(_MSC_VER) +#define testingprivMkCtorPrototype(name, reg) \ + static int name(void) testingprivCtor ## name(void) { reg(#name, testingprivScaffold ## name); return 0; } \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) static int (*testingprivCtorPtr ## name)(void) = testingprivCtor ## name; +#elif defined(__SUNPRO_C) +#define testingprivMkCtor(name, reg) \ + _Pragma("init(testingprivCtor" #name ")") static void testingprivCtor ## name(void) { reg(#name, testingprivScaffold ## name); } +#else +#error unknown compiler for making constructors in C; cannot continue +#endif + +#define testingTest(Name) \ + void Test ## Name(testingT *t); \ + testingprivMkScaffold(Test ## Name) \ + testingprivMkCtor(Test ## Name, testingprivRegisterTest) \ + void Test ## Name(testingT *t) + +extern int testingMain(void); + +typedef struct testingT testingT; +#define testingTLogf(t, ...) \ + testingprivExpand(testingprivTLogfThen((void), t, __VA_ARGS__)) +#define testingTLogvf(t, format, ap) \ + testingprivTLogvfThen((void), t, format, ap) +#define testingTErrorf(t, ...) \ + testingprivExpand(testingprivTLogfThen(testingTFail, t, __VA_ARGS__)) +#define testingTErrorvf(t, format, ap) \ + testingprivTLogvfThen(testingTFail, t, format, ap) +#define testingTFatalf(t, ...) \ + testingprivExpand(testingprivTLogfThen(testingTFailNow, t, __VA_ARGS__)) +#define testingTFatalvf(t, format, ap) \ + testingprivTLogvfThen(testingTFailNow, t, format, ap) +#define testingTSkipf(t, ...) \ + testingprivExpand(testingprivTLogfThen(testingTSkipNow, t, __VA_ARGS__)) +#define testingTSkipvf(t, format, ap) \ + testingprivTLogvfThen(testingTSkipNow, t, format, ap) +extern void testingTFail(testingT *t); +#ifdef __cplusplus +#define testingTFailNow(t) (throw testingprivFailNowException()) +#define testingTSkipNow(t) (throw testingprivSkipNowException()) +#else +#define testingTFailNow(t) (testingprivTDoFailNow(t)) +#define testingTSkipNow(t) (testingprivTDoSkipNow(t)) +#endif +// TODO should the defered function also have t passed to it? +extern void testingTDefer(testingT *t, void (*f)(void *data), void *data); + +// TODO IEEE 754 helpers +// references: +// - https://www.sourceware.org/ml/libc-alpha/2009-04/msg00005.html +// - https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html +// - https://stackoverflow.com/questions/5085533/is-a-c-preprocessor-identical-to-a-c-preprocessor + +// TODO should __LINE__ arguments use intmax_t or uintmax_t instead of int? +extern void testingprivRegisterTest(const char *, void (*)(testingT *)); +// see https://stackoverflow.com/questions/32399191/va-args-expansion-using-msvc +#define testingprivExpand(x) x +#define testingprivTLogfThen(then, t, ...) ((testingprivTLogfFull(t, __FILE__, __LINE__, __VA_ARGS__)), (then(t))) +#define testingprivTLogvfThen(then, t, format, ap) ((testingprivTLogvfFull(t, __FILE__, __LINE__, format, ap)), (then(t))) +extern void testingprivTLogfFull(testingT *, const char *, int, const char *, ...); +extern void testingprivTLogvfFull(testingT *, const char *, int, const char *, va_list); +extern void testingprivTDoFailNow(testingT *); +extern void testingprivTDoSkipNow(testingT *); + +#ifdef __cplusplus +} +namespace { + class testingprivFailNowException {}; + class testingprivSkipNowException {}; + class testingprivRegisterTestClass { + public: + testingprivRegisterTestClass(const char *name, void (*f)(testingT *)) { testingprivRegisterTest(name, f); } + }; +} +#endif + +#endif diff --git a/_future/unittest/testing_testing.c b/_future/unittest/testing_testing.c new file mode 100644 index 00000000..eb334648 --- /dev/null +++ b/_future/unittest/testing_testing.c @@ -0,0 +1,144 @@ +// 27 february 2018 +#include +#include +#include +#include "testing.h" + +#define testingprivNew(T) ((T *) malloc(sizeof (T))) + +struct defer { + void (*f)(void *); + void *data; + struct defer *next; +}; + +struct testingT { + const char *name; + void (*f)(testingT *); + int failed; + int skipped; + jmp_buf returnNowBuf; + struct defer *defers; + int defersRun; + testingT *next; +}; + +static testingT *tests = NULL; + +void testingprivRegisterTest(const char *name, void (*f)(testingT *)) +{ + testingT *t; + + t = testingprivNew(testingT); + t->name = name; + t->f = f; + t->failed = 0; + t->skipped = 0; + t->defers = NULL; + t->defersRun = 0; + // TODO add in the order called + t->next = tests; + tests = t; +} + +static void runDefers(testingT *t) +{ + struct defer *d; + + if (t->defersRun) + return; + t->defersRun = 1; + for (d = t->defers; d != NULL; d = d->next) + (*(d->f))(d->data); +} + +int testingMain(void) +{ + testingT *t; + int anyFailed; + const char *status; + + // TODO see if this should run if all tests are skipped + if (tests == NULL) { + fprintf(stderr, "warning: no tests to run\n"); + // imitate Go here (TODO confirm this) + return 0; + } + + anyFailed = 0; + for (t = tests; t != NULL; t = t->next) { + printf("=== RUN %s\n", t->name); + if (setjmp(t->returnNowBuf) == 0) + (*(t->f))(t); + runDefers(t); + status = "PASS"; + if (t->failed) { + status = "FAIL"; + anyFailed = 1; + } else if (t->skipped) + // note that failed overrides skipped + status = "SKIP"; + printf("--- %s: %s (%s)\n", status, t->name, "TODO"); + } + + if (anyFailed) { + printf("FAIL\n"); + return 1; + } + printf("PASS\n"); + return 0; +} + +void testingprivTLogfFull(testingT *t, const char *file, int line, const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + testingprivTLogvfFull(t, file, line, format, ap); + va_end(ap); +} + +void testingprivTLogvfFull(testingT *t, const char *file, int line, const char *format, va_list ap) +{ + // TODO extract filename from file + printf("\t%s:%d: ", file, line); + // TODO split into lines separated by \n\t\t and trimming trailing empty lines + vprintf(format, ap); + printf("\n"); +} + +void testingTFail(testingT *t) +{ + t->failed = 1; +} + +static void returnNow(testingT *t) +{ + // run defers before calling longjmp() just to be safe + runDefers(t); + longjmp(t->returnNowBuf, 1); +} + +void testingprivTDoFailNow(testingT *t) +{ + testingTFail(t); + returnNow(t); +} + +void testingprivTDoSkipNow(testingT *t) +{ + t->skipped = 1; + returnNow(t); +} + +void testingTDefer(testingT *t, void (*f)(void *data), void *data) +{ + struct defer *d; + + d = testingprivNew(struct defer); + d->f = f; + d->data = data; + // add to the head of the list so defers are run in reverse order of how they were added + d->next = t->defers; + t->defers = d; +} diff --git a/_future/verticaltext/README b/_future/verticaltext/README new file mode 100644 index 00000000..99310823 --- /dev/null +++ b/_future/verticaltext/README @@ -0,0 +1,19 @@ +Proper vertical text support in uiDrawTextLayout was removed because DirectWrite doesn't add this until Windows 8.1 (unless I drop IDWriteTextLayout and do the script analysis myself; TODO consider this possibility). + +On OS X, setting the vertical forms attribute stacks non-vertical scripts in vertical text (rotates each individual glyph) with Core Text, whereas everything else — including Cocoa's text system — rotates entire non-vertical strings. Not sure what to do about this except manually detect which characters to apply the attribute to: +http://www.unicode.org/notes/tn22/RobustVerticalLayout.pdf +http://www.unicode.org/Public/vertical/revision-17/VerticalOrientation-17.txt + +In addition, with Core Text, the vertical forms attribute vertically centers the vertical glyphs on the bhorizontal baseline, rather than flush with the text. Using the baseline class attribute doesn't seem to work. +TODO investigate kCJKVerticalRomanPlacementType + +If readded, this will need to be a layout-wide setting, not a per-character setting. Pango works right this way; the current Pango code doesn't seem to work. + +More links: +https://www.w3.org/TR/2012/NOTE-jlreq-20120403/#line-composition +https://www.w3.org/TR/REC-CSS2/notes.html + +TODO indicate where in the attributes.c file that block of code should go (or drop it entirely for the reasons listed above) +TODO same for ui.h + +TODO vertical carets diff --git a/_future/verticaltext/attrstr_darwin.m b/_future/verticaltext/attrstr_darwin.m new file mode 100644 index 00000000..f56adc7f --- /dev/null +++ b/_future/verticaltext/attrstr_darwin.m @@ -0,0 +1,19 @@ + case uiAttributeVerticalForms: + if (spec->Value != 0) { + CFAttributedStringSetAttribute(p->mas, range, kCTVerticalFormsAttributeName, kCFBooleanTrue); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassRoman); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicCentered); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicLow); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicHigh); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassHanging); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassMath); + } else { + CFAttributedStringSetAttribute(p->mas, range, kCTVerticalFormsAttributeName, kCFBooleanFalse); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassRoman); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicCentered); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicLow); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassIdeographicHigh); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassHanging); +// CFAttributedStringSetAttribute(p->mas, range, kCTBaselineClassAttributeName, kCTBaselineClassMath); + } + break; diff --git a/_future/verticaltext/attrstr_unix.c b/_future/verticaltext/attrstr_unix.c new file mode 100644 index 00000000..e5e13617 --- /dev/null +++ b/_future/verticaltext/attrstr_unix.c @@ -0,0 +1,9 @@ + PangoGravity gravity; + + case uiAttributeVerticalForms: + gravity = PANGO_GRAVITY_SOUTH; + if (spec->Value != 0) + gravity = PANGO_GRAVITY_EAST; + addattr(p, start, end, + pango_attr_gravity_new(gravity)); + break; diff --git a/_future/verticaltext/attrstr_windows.cpp b/_future/verticaltext/attrstr_windows.cpp new file mode 100644 index 00000000..88369217 --- /dev/null +++ b/_future/verticaltext/attrstr_windows.cpp @@ -0,0 +1,15 @@ + uint32_t vertval; + + case uiAttributeVerticalForms: + // LONGTERM 8 and/or 8.1 add other methods for vertical text + op.p = p; + op.start = start; + op.end = end; + vertval = 0; + if (spec->Value != 0) + vertval = 1; + doOpenType("vert", vertval, &op); + doOpenType("vrt2", vertval, &op); + doOpenType("vkrn", vertval, &op); + doOpenType("vrtr", vertval, &op); + break; diff --git a/_future/verticaltext/common_attrlist.c b/_future/verticaltext/common_attrlist.c new file mode 100644 index 00000000..0b9ea921 --- /dev/null +++ b/_future/verticaltext/common_attrlist.c @@ -0,0 +1,2 @@ + case uiAttributeVerticalForms: + return boolsEqual(attr, spec); diff --git a/_future/verticaltext/drawtext_example.c b/_future/verticaltext/drawtext_example.c new file mode 100644 index 00000000..669bdaa8 --- /dev/null +++ b/_future/verticaltext/drawtext_example.c @@ -0,0 +1,18 @@ + next = "vertical glyph forms"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeVerticalForms; + spec.Value = 1; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " (which you can draw rotated for proper vertical text; for instance, "); + next = "\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeVerticalForms; + spec.Value = 1; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); diff --git a/_future/verticaltext/ui.h b/_future/verticaltext/ui.h new file mode 100644 index 00000000..98903ee9 --- /dev/null +++ b/_future/verticaltext/ui.h @@ -0,0 +1,2 @@ + // TODO rename to uiAttributeVertical? + uiAttributeVerticalForms, // 0 = off, 1 = on diff --git a/_notes/OS2 b/_notes/OS2 new file mode 100644 index 00000000..e5aa04e4 --- /dev/null +++ b/_notes/OS2 @@ -0,0 +1,25 @@ +https://twitter.com/OS2World/status/983822011389620224 + Hi. I recommend you today to start with OS/2 Warp 4.52 or ArcaOS ( The tools are almost the same of Warp 3). EDM/2 is a good place to start: http://www.edm2.com +https://twitter.com/OS2World/status/983822594465034240 + There is also an RPM with OS/2 Software (https://www.arcanoae.com/resources/downloadables/arca-noae-package-manager/ …), and you can get from it some parts of the OS/2 Toolkit. If you want to develop drivers you require the OS/2 Device Driver Kit. (that is more complex). You can also develop in Qt4 and compile things with gcc. +http://www.edm2.com/index.php/Main_Page +https://www.arcanoae.com/resources/downloadables/arca-noae-package-manager/ +http://www.edm2.com/index.php/IBM_OS/2_Toolkit_Documentation +https://www.os2world.com/forum/index.php?topic=953.0 +https://www.google.com/search?client=firefox-b-1&ei=QIPPWurPLs7OwAK65K24BA&q=%22OS%2F2+Toolkit%22+site%3Aamazon.com&oq=%22OS%2F2+Toolkit%22+site%3AAmazon.com&gs_l=psy-ab.3...160814.161293.0.161540.2.2.0.0.0.0.128.252.0j2.2.0....0...1c.1.64.psy-ab..0.0.0....0.itT9Og6hC5c +http://www.edm2.com/index.php/List_of_Presentation_Manager_Articles +https://www.ecsoft2.org/ +http://www.edm2.com/index.php/Cairo + http://www.edm2.com/index.php/Doodle +http://www.edm2.com/index.php/Workplace_Shell_Toolkit +http://wpstk.netlabs.org/en/site/index.xml +https://en.wikipedia.org/wiki/Workplace_Shell +https://www.google.com/search?q=OS2+alphablending&ie=utf-8&oe=utf-8&client=firefox-b-1 +http://www.edm2.com/index.php/List_of_Multimedia_Articles +alphablending: + http://www.osnews.com/story/369/Review-eComStation-OS2-1.0/page3/ + http://halfos.ru/documentation/33-os2-api-documentation/67-opengl-os2-developer-reference-guide.html + http://www.altools.com/ALTools/ALSee/ALSee-Image-Viewer.aspx + http://www.os2voice.org/vnewsarc/bn2007122.html + http://www.mozillazine.org/talkback.html?article=194 + https://books.google.com/books?id=9cpU5uYCzq4C&pg=PA202&lpg=PA202&dq=%22OS/2%22+alphablending&source=bl&ots=uatEop2jAL&sig=HAa_ofQSKsk6-8tBR6YZ6MRJG_0&hl=en&sa=X&ved=0ahUKEwiDq5HukLbaAhUk8IMKHR7aCw4Q6AEIWTAI#v=onepage&q=%22OS%2F2%22%20alphablending&f=false diff --git a/_notes/caretWidths b/_notes/caretWidths new file mode 100644 index 00000000..e9eef62b --- /dev/null +++ b/_notes/caretWidths @@ -0,0 +1 @@ +UWP has this (TODO check its implementation to see if it matches ours) https://docs.microsoft.com/en-us/uwp/api/windows.ui.viewmanagement.uisettings#Windows_UI_ViewManagement_UISettings_CaretWidth diff --git a/_notes/darwinAutoLayout b/_notes/darwinAutoLayout new file mode 100644 index 00000000..5a521fc0 --- /dev/null +++ b/_notes/darwinAutoLayout @@ -0,0 +1,6 @@ +https://developer.apple.com/library/mac/documentation/AppKit/Reference/NSLayoutConstraint_Class/ + https://developer.apple.com/documentation/uikit/nslayoutconstraint?language=objc +https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AutolayoutPG/ProgrammaticallyCreatingConstraints.html#//apple_ref/doc/uid/TP40010853-CH16-SW1 + https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/AutolayoutPG/ProgrammaticallyCreatingConstraints.html#//apple_ref/doc/uid/TP40010853-CH16-SW1 (Listing 13-3) +https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AutolayoutPG/WorkingwithScrollViews.html#//apple_ref/doc/uid/TP40010853-CH24-SW1 + https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/AutolayoutPG/WorkingwithScrollViews.html#//apple_ref/doc/uid/TP40010853-CH24-SW1 ("IMPORTANT Your layout must fully define..." large box) diff --git a/_notes/darwinNSAlertIcons b/_notes/darwinNSAlertIcons new file mode 100644 index 00000000..5e8acfed --- /dev/null +++ b/_notes/darwinNSAlertIcons @@ -0,0 +1,8 @@ +https://www.google.com/search?q=nsalert+error+icon&client=firefox-b&tbm=isch&source=iu&ictx=1&fir=2iRctS5fJByN0M%253A%252Cw324MTzjHa1bAM%252C_&usg=__x3wpwdNN1L8VI2kHtkKAXFMtpj4%3D&sa=X&ved=0ahUKEwjJzpjN2qDZAhVjw1kKHfOHDoQQ9QEIMTAB#imgrc=2iRctS5fJByN0M: +http://0xced.blogspot.com/2009/11/clalert-nsalert-done-right.html +https://gist.github.com/0xced/228140 +http://editra.org/uploads/code/artmac.html +http://mirror.informatimago.com/next/developer.apple.com/documentation/Carbon/Reference/IconServices/index.html +http://www.cocoabuilder.com/archive/cocoa/15427-iconref-to-nsimage.html +https://github.com/lukakerr/Swift-NSUserNotificationPrivate +https://stackoverflow.com/questions/32943220/the-sidebar-icon-image-name-in-osx diff --git a/_notes/misc b/_notes/misc new file mode 100644 index 00000000..649d6cb4 --- /dev/null +++ b/_notes/misc @@ -0,0 +1,197 @@ +windows data types, "open specifications" on msdn https://msdn.microsoft.com/en-us/library/cc230321.aspx + (I usually use https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx for windows data types) + +windows platform update for windows 7 +https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/hh802478(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/hh802480(v=vs.85).aspx + +DWM, header bars, toolbars +https://stackoverflow.com/questions/41106347/why-is-my-dwmextendframeintoclientaread-window-not-drawing-the-dwm-borders/41125616#41125616 +https://developer.gnome.org/hig/stable/header-bars.html.en +https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/OSXHIGuidelines/WindowTitleBarToolbar.html#//apple_ref/doc/uid/20000957-CH39-SW1 +https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/OSXHIGuidelines/ControlsAll.html#//apple_ref/doc/uid/20000957-CH46-SW2 +https://msdn.microsoft.com/en-us/library/windows/desktop/bb787329(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb787334(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb787337(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/cc835034(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb787345(v=vs.85).aspx + +rendering +https://www.youtube.com/watch?v=UUfXWzp0-DU + +text input on windows +https://blogs.msdn.microsoft.com/oldnewthing/20121025-00/?p=6253 +https://www.google.com/search?q=translatemessage+site%3Ahttp%3A%2F%2Farchives.miloush.net%2Fmichkap%2Farchive%2F&ie=utf-8&oe=utf-8 +http://archives.miloush.net/michkap/archive/2008/04/22/8415843.html +http://archives.miloush.net/michkap/archive/2007/03/25/1948887.html +http://archives.miloush.net/michkap/archive/2006/09/10/748775.html +http://archives.miloush.net/michkap/archive/2004/11/27/270931.html +https://stackoverflow.com/questions/41334851/since-translatemessage-returns-nonzero-unconditionally-how-can-i-tell-either +http://stackoverflow.com/questions/41334851/since-translatemessage-returns-nonzero-unconditionally-how-can-i-tell-either?noredirect=1#comment70107257_41334851 + +text layouts +https://developer.apple.com/reference/coretext/2110184-ctframe?language=objc +https://msdn.microsoft.com/en-us/library/windows/desktop/dd368203(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dd368205(v=vs.85).aspx +https://developer.gnome.org/pango/1.30/pango-Layout-Objects.html#pango-layout-set-font-description +https://developer.gnome.org/pango/1.30/pango-Fonts.html#PangoWeight-enum +https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c (code for small caps) +https://bugzilla.gnome.org/show_bug.cgi?id=766148 +https://developer.apple.com/documentation/coretext/ctline?preferredLanguage=occ +https://developer.apple.com/reference/coretext/1508876-ctlinegetstringindexforposition?language=objc +https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Introduction/Introduction.html#//apple_ref/doc/uid/TP40005533-CH1-SW1 +https://developer.apple.com/reference/coretext/2110184-ctframe?language=objc +https://developer.apple.com/reference/coretext/2168885-ctline?language=objc +https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html +http://asciiwwdc.com/2013/sessions/205 +https://developer.apple.com/reference/coretext/1511332-ctlinegetboundswithoptions?language=objc +https://stackoverflow.com/questions/19709751/ctlinegetboundswithoptions-what-does-the-returned-frame-origin-y-value-mean?rq=1 +https://imgur.com/a/lqhzC +https://imgur.com/a/hYeOL +https://www.google.com/search?q=ctline+%22paragraph+spacing%22&ie=utf-8&oe=utf-8 +http://stackoverflow.com/questions/8010615/how-do-i-determine-the-of-a-ctline-following-a-ctline +https://imgur.com/a/dlpm2 +https://stackoverflow.com/questions/41601845/am-i-missing-something-in-core-text-that-will-let-me-see-which-line-a-certain-po +https://www.google.com/search?q=%22core+text%22+%22combining+character%22&oq=%22core+text%22+%22combining+character%22&gs_l=serp.3...2526898.2528158.0.2528485.21.10.0.0.0.0.216.997.5j3j1.9.0....0...1c.1.64.serp..12.8.904...33i21k1j33i160k1.J69jsB9g0N0 +https://github.com/macvim-dev/macvim/issues/400#issuecomment-274292877 +https://bugs.webkit.org/show_bug.cgi?id=68287 +https://trac.webkit.org/changeset/95391 +https://trac.webkit.org/changeset/95391/trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp +http://stackoverflow.com/questions/41857213/is-there-any-way-i-can-get-precise-metrics-line-ascent-line-descent-etc-of +http://pawlan.com/monica/articles/texttutorial/int.html + +enter in entry fields, possibly other text layout issues, possibly keyboard shortcuts +https://developer.gnome.org/gtk3/3.10/GtkEntry.html "activate" signal +https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-10/gtk/gtkentry.c (not sure where) +https://developer.gnome.org/gtk3/3.10/GtkTextView.html signals section of contents +https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-10/gtk/gtktextview.c (not sure where; closed before I could find out again though gitlab might wreck it anyway) +https://developer.gnome.org/gtk3/3.10/gtk3-Bindings.html +https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-10/gtk/gtkwidget.c (not sure where) +https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-10/gtk/gtkbindings.c (not sure where) +https://gitlab.gnome.org/GNOME/gnome-builder/tree/master/libide/keybindings/ide-keybindings.c 404; TODO find the original cgit link in the chat logs to see what hergertme wanted me to see +https://gitlab.gnome.org/GNOME/gnome-builder/tree/master/libide/sourceview/ide-source-view.c likewise +https://gitlab.gnome.org/GNOME/gnome-builder/tree/master/libide/sourceview/ide-source-view-mode.c#n323 likewise + +rgb int->float conversion +https://stackoverflow.com/questions/41348339/how-to-convert-rgb-to-hexadecimal-using-gtk?noredirect=1#comment69903262_41348339 + +windows fonts, hi-dpi +https://stackoverflow.com/questions/41448320/dlgtemplateex-and-ds-shellfont-what-about-point-size + +windows default fonts +https://stackoverflow.com/questions/41505151/how-to-draw-text-with-the-default-ui-font-in-directwrite#41505750 + +uwp stuff +https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/inking-controls +https://msdn.microsoft.com/en-us/windows/uwp/controls-and-patterns/master-details + +cmake stuff +https://public.kitware.com/pipermail/cmake/2010-January/034669.html +https://cmake.org/cmake/help/v3.0/command/string.html +https://cmake.org/pipermail/cmake/2003-April/003599.html + +opentype features and locales +https://www.microsoft.com/typography/otspec/featurelist.htm +https://en.wikipedia.org/wiki/List_of_typographic_features +https://www.microsoft.com/typography/otspec160/scripttags.htm +https://msdn.microsoft.com/en-us/library/windows/desktop/dd371503(v=vs.85).aspx + +gspell (TODO figure out what I wanted from this; possibly spelling checking) +https://git.gnome.org/browse/gspell/tree/gspell/gspell-inline-checker-text-buffer.c +https://git.gnome.org/browse/gtk+/tree/gtk/gtktextview.c?h=gtk-3-10 + +other assorted notes on text +https://mail.gnome.org/archives/gtk-devel-list/2016-March/msg00037.html +https://mail.gnome.org/archives/gtk-devel-list/2016-June/msg00007.html +https://blogs.msdn.microsoft.com/tsfaware/ +https://stackoverflow.com/questions/40453186/what-is-the-correct-modern-way-to-handle-arbitrary-text-input-in-a-custom-contr +https://www.microsoft.com/typography/fonts/family.aspx + +windows ribbon +https://twitter.com/_Ninji/status/814918189708668929 (C08rw9TWgAMpLkC.jpg:large) + +https://developer.apple.com/library/content/samplecode/CocoaTipsAndTricks/Introduction/Intro.html#//apple_ref/doc/uid/DTS40010039 BlurryView and StaticObjcMethods in particular +printing https://developer.apple.com/library/content/samplecode/PMPrinterPrintWithFile/Introduction/Intro.html#//apple_ref/doc/uid/DTS10003958 +auto layout https://developer.apple.com/library/content/releasenotes/UserExperience/RNAutomaticLayout/index.html#//apple_ref/doc/uid/TP40010631 + +other stuff, mostly custom draw on windows +https://github.com/pauldotknopf/WindowsSDK7-Samples/blob/master/multimedia/DirectWrite/ChooseFont/ChooseFont.cpp at ChooseFontDialog::OnFontSizeNameEdit() definition +https://developer.gnome.org/gtk3/3.10/GtkColorButton.html +https://msdn.microsoft.com/en-us/library/windows/desktop/bb775951(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb775951(v=vs.85).aspx between BS_LEFTTEXT and BS_RADIOBUTTON +https://msdn.microsoft.com/en-us/library/windows/desktop/bb775923(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb775923(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb775802(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb775802(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb761837(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb761837(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/bb761847(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb761847(v=vs.85).aspx description + parameters +https://msdn.microsoft.com/en-us/library/windows/desktop/bb775483(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/bb775483(v=vs.85).aspx dwItemSpec parameter +https://msdn.microsoft.com/en-us/library/windows/desktop/bb775951(v=vs.85).aspx#BS_NOTIFY + https://msdn.microsoft.com/en-us/library/windows/desktop/bb775951(v=vs.85).aspx#BS_NOTIFY BS_NOTIFY to BS_RIGHT +http://stackoverflow.com/questions/17678261/how-to-change-color-of-a-button-while-keeping-buttons-functions-in-win32 +https://msdn.microsoft.com/en-us/library/windows/desktop/ff919569(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/ff919569(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/ff919573(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/ff919573(v=vs.85).aspx switch (pnm->hdr.code){ +http://stackoverflow.com/questions/36756094/will-the-device-context-of-a-child-window-have-the-same-text-metrics-and-text-ex +actually I think most if not all of these were from when I was trying to implement uiColorButton on Windows, so I'm not sure if I still need these, but meh... + +more miscellaneous +https://blogs.msdn.microsoft.com/oldnewthing/20160328-00/?p=93204 from "One is virtual memory" to "occured to them that their" +https://blogs.msdn.microsoft.com/oldnewthing/20160331-00/?p=93231 + https://msdn.microsoft.com/en-us/library/windows/desktop/aa373631(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/ms648395(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/ms648395(v=vs.85).aspx +https://blogs.msdn.microsoft.com/oldnewthing/20101118-00/?p=12253#comment-875273 "MTA implies poor service and fare hikes." + +from #gtk+ +[18:06:48] if i am doing an animation that needs to be updated at every duration(say every 50ms), should i use get_frame_time() from the frameclock to do that? (from add_tick_callback()) +[18:12:47] <~Company> zorcon: yes + +windows stuff: mostly aero tricks, sdk version macro notes, ribbon stuff, scrollbar stuff too +https://tools.stefankueng.com/SendMessage.html +https://sourceforge.net/p/sendmessage/code/HEAD/tree/trunk/src/SendMessage.vcxproj +https://sourceforge.net/p/sendmessage/code/HEAD/tree/trunk/src/stdafx.h +https://sourceforge.net/p/sendmessage/code/HEAD/tree/trunk/src/MainDlg.h +https://sourceforge.net/u/steveking/profile/ +https://github.com/stefankueng/BowPad/tree/master/src + sourceforge original +https://github.com/stefankueng/sktoolslib/blob/master/AeroControls.cpp + sourceforge original +https://tools.stefankueng.com/BowPad.html +https://www.codeproject.com/Articles/1084/Custom-Scrollbar-Library-version-1-1#_articleTop +https://www.google.com/search?client=firefox-b-1&biw=1080&bih=600&ei=gUHRWsrdMYayggf30bfoAw&q=%22aerocontrols.h%22&oq=%22aerocontrols.h%22&gs_l=psy-ab.3..35i39k1l6.1816.3367.0.3413.4.2.0.0.0.0.0.0..1.0....0...1c.1.64.psy-ab..3.1.211.6...211.0Ppw_OREAk0 + https://searchcode.com/codesearch/view/7295148/ + https://github.com/TortoiseGit/tortoisesvn/blob/master/src/Utils/MiscUI/AeroBaseDlg.h + https://github.com/TortoiseGit/tortoisesvn/blob/master/src/Utils/MiscUI/AeroControls.cpp + https://github.com/gavioto/stexbar/blob/master/Misc/FileTool/src/CleanVerifyDlg.h + +windows ribbon colors and dwm customization +https://github.com/stefankueng/BowPad/blob/master/src/MainWindow.cpp +https://msdn.microsoft.com/en-us/library/windows/desktop/dd940487(v=vs.85).aspx +https://github.com/yohei-yoshihara/GameOfLife3D/blob/master/GameOfLife3DLib/gameoflife3d/Ribbon.cpp +https://msdn.microsoft.com/en-us/library/windows/desktop/dd940404(v=vs.85).aspx +https://github.com/stefankueng/sktoolslib/blob/master/AeroColors.cpp +https://gist.github.com/emoacht/bfa852ccc16bdb5465bd +https://stackoverflow.com/questions/4258295/aero-how-to-draw-solid-opaque-colors-on-glass +https://github.com/ComponentFactory/Krypton +https://www.codeproject.com/Articles/620045/Custom-Controls-in-Win-API-Visual-Styles +https://blogs.msdn.microsoft.com/wpf/2010/11/30/systemcolors-reference/ +https://stackoverflow.com/questions/25639621/check-when-a-user-changes-windows-glass-brush-theme-color +https://msdn.microsoft.com/en-us/library/windows/desktop/aa969513(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/aa969527(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dd388198(v=vs.85).aspx +I hope the MFC ribbon can have customizable colors too, otherwise I'll have to do some serious image processing... + +windows debugging +https://msdn.microsoft.com/en-us/library/windows/desktop/hh780351(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/ff476881(v=vs.85).aspx#Debug + https://msdn.microsoft.com/en-us/library/windows/desktop/hh780343(v=vs.85).aspx + https://msdn.microsoft.com/en-us/library/windows/desktop/dn457937(v=vs.85).aspx + +more OS2 stuff +https://www.google.com/search?q=%22ibm+graphics+development+toolkit%22&ie=utf-8&oe=utf-8&client=firefox-b-1 +https://www.google.com/search?q=%22os%2F2+graphics+development+toolkit%22&ie=utf-8&oe=utf-8&client=firefox-b-1 +http://www.edm2.com/index.php/IBM_OS/2_Developer%27s_Packages diff --git a/_notes/tableNotes b/_notes/tableNotes new file mode 100644 index 00000000..b894d5a3 --- /dev/null +++ b/_notes/tableNotes @@ -0,0 +1,4 @@ +https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Protocols/NSOutlineViewDataSource_Protocol/index.html#//apple_ref/occ/intfm/NSOutlineViewDataSource/outlineView:child:ofItem: +https://developer.apple.com/library/mac/documentation/Cocoa/Reference/NSOutlineViewDelegate_Protocol/index.html#//apple_ref/occ/intfm/NSOutlineViewDelegate/outlineView:didAddRowView:forRow: + https://developer.apple.com/documentation/appkit/nsoutlineviewdelegate/1528320-outlineview?language=objc +https://github.com/mity/mctrl/blob/master/mctrl/treelist.c around treelist_set_subitem() diff --git a/_notes/textSelections b/_notes/textSelections new file mode 100644 index 00000000..a1bccba6 --- /dev/null +++ b/_notes/textSelections @@ -0,0 +1,3 @@ +http://www.catch22.net/tuts/transparent-text +https://msdn.microsoft.com/en-us/library/windows/desktop/ms724371(v=vs.85).aspx + TODO which color did I want from this list diff --git a/_notes/winARM64 b/_notes/winARM64 new file mode 100644 index 00000000..c22d5593 --- /dev/null +++ b/_notes/winARM64 @@ -0,0 +1,3 @@ +http://www.os2museum.com/wp/windows-10-arm64-on-qemu/ +https://docs.microsoft.com/en-us/windows/uwp/porting/apps-on-arm +http://pete.akeo.ie/2017/05/compiling-desktop-arm-applications-with.html diff --git a/_notes/windowsHighDPI b/_notes/windowsHighDPI new file mode 100644 index 00000000..0f69a507 --- /dev/null +++ b/_notes/windowsHighDPI @@ -0,0 +1,18 @@ +https://msdn.microsoft.com/en-us/library/windows/desktop/dn469266(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/mt744321(v=vs.85).aspx +!!!! http://stackoverflow.com/questions/41917279/do-child-windows-have-the-same-dpi-as-their-parents-in-a-per-monitor-aware-appli +https://msdn.microsoft.com/en-us/library/windows/desktop/mt843498(v=vs.85).aspx +https://msdn.microsoft.com/library/windows/desktop/mt791579(v=vs.85).aspx +https://blogs.windows.com/buildingapps/2017/04/04/high-dpi-scaling-improvements-desktop-applications-windows-10-creators-update/ +https://channel9.msdn.com/Events/Windows/Windows-Developer-Day-Creators-Update/High-DPI-Improvements-for-Desktop-Developers +https://social.msdn.microsoft.com/Forums/vstudio/en-US/31d2a89f-3518-403e-b1e4-bbe37ac1b0f0/per-monitor-high-dpi-awareness-wmdpichanged?forum=vcgeneral +https://stackoverflow.com/questions/36864894/scaling-the-non-client-area-title-bar-menu-bar-for-per-monitor-high-dpi-suppo/37624363 +https://stackoverflow.com/questions/41448320/dlgtemplateex-and-ds-shellfont-what-about-point-size +http://stackoverflow.com/questions/41917279/do-child-windows-have-the-same-dpi-as-their-parents-in-a-per-monitor-aware-appli + +https://msdn.microsoft.com/en-us/library/windows/desktop/dn469266(v=vs.85).aspx + https://msdn.microsoft.com/library/windows/desktop/mt843498(v=vs.85).aspx(d=robot) +https://msdn.microsoft.com/en-us/library/windows/desktop/dn469266(v=vs.85).aspx#appendix_c_common_high_dpi_issues + https://msdn.microsoft.com/library/windows/desktop/mt843498(v=vs.85).aspx(d=robot)#appendix_c_common_high_dpi_issues +https://msdn.microsoft.com/en-us/library/windows/desktop/dn469266(v=vs.85).aspx#addressing_high_dpi_issues + https://msdn.microsoft.com/library/windows/desktop/mt843498(v=vs.85).aspx(d=robot)#addressing_high_dpi_issues diff --git a/_notes/windowsPrinting b/_notes/windowsPrinting new file mode 100644 index 00000000..c5d0b6c7 --- /dev/null +++ b/_notes/windowsPrinting @@ -0,0 +1,7 @@ +https://msdn.microsoft.com/en-us/library/windows/desktop/ff686805(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dn495653(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/hh448422(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dd316975(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dd372919(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/ee264335(v=vs.85).aspx +https://msdn.microsoft.com/en-us/library/windows/desktop/dd145198(v=vs.85).aspx diff --git a/_notes/windowsUWPGlass b/_notes/windowsUWPGlass new file mode 100644 index 00000000..debe47cd --- /dev/null +++ b/_notes/windowsUWPGlass @@ -0,0 +1,25 @@ +https://twitter.com/omgubuntu/status/962765197109841922 +https://github.com/DominicMaas/SoundByte/blob/master/SoundByte.UWP/Resources/Brushes.xaml +https://docs.microsoft.com/en-us/windows/uwp/design/style/acrylic +https://www.google.com/search?q=uwp+acrylic+winapi&ie=utf-8&oe=utf-8&client=firefox-b-1 +https://stackoverflow.com/questions/43931709/acrylic-material-in-win32-app +https://stackoverflow.com/questions/44000217/mimicking-acrylic-in-a-win32-app +https://stackoverflow.com/questions/43699256/how-to-use-acrylic-accent-in-windows-10-creators-update +https://stackoverflow.com/questions/39135834/how-to-call-uwp-api-from-converted-win32-app-desktop-app-converter +https://stackoverflow.com/questions/32724187/how-do-you-set-the-glass-blend-colour-on-windows-10 +https://channel9.msdn.com/Events/Build/2017/B8034 +https://www.reddit.com/r/Windows10/comments/7lzyzc/since_the_taskbar_is_still_win32_and_it_can_have/ +https://thenextweb.com/microsoft/2017/05/15/microsoft-fluent-design-system-breaking-windows-10s-new-look/ +https://github.com/bbougot/AcrylicWPF +http://vhanla.codigobit.info/2015/07/enable-windows-10-aero-glass-aka-blur.html +http://undoc.airesoft.co.uk/user32.dll/SetWindowCompositionAttribute.php +http://undoc.airesoft.co.uk/user32.dll/GetWindowCompositionAttribute.php +https://msdn.microsoft.com/en-us/library/windows/desktop/aa969530(v=vs.85).aspx +https://github.com/bbougot/AcrylicWPF/blob/master/MainWindow.xaml.cs +https://www.google.com/search?q=%22WCA_ACCENT_POLICY%22&client=firefox-b-1&source=lnt&tbs=cdr%3A1%2Ccd_min%3A1%2F1%2F2001%2Ccd_max%3A12%2F31%2F2013&tbm= +https://github.com/sgothel/jogl/blob/master/src/nativewindow/native/win32/WindowsDWM.c +http://www.brandonfa.lk/win8/win8_devrel_head_x86/uxtheme.h +http://www.brandonfa.lk/win8/ +https://github.com/gamozolabs/pdblister +https://github.com/wbenny/pdbex +https://github.com/wbenny/pdbex/releases diff --git a/_wip/attrstr_metrics/common_OLD_drawtext.c b/_wip/attrstr_metrics/common_OLD_drawtext.c new file mode 100644 index 00000000..ca66796a --- /dev/null +++ b/_wip/attrstr_metrics/common_OLD_drawtext.c @@ -0,0 +1,92 @@ +// 10 february 2017 +#include "../ui.h" +#include "uipriv.h" + +// TODO this doesn't handle the case where nLines == 0 +// TODO this should never happen even if there are no characters?? +// TODO figure out how to make this work on GTK+ +void uiDrawCaret(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout, size_t pos, int *line) +{ + double xoff; + uiDrawTextLayoutLineMetrics m; + struct caretDrawParams cdp; + uiDrawPath *path; + uiDrawBrush brush; + + if (*line < 0) + *line = 0; + if (*line > (uiDrawTextLayoutNumLines(layout) - 1)) + *line = (uiDrawTextLayoutNumLines(layout) - 1); + // TODO cap pos + xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line); + while (xoff < 0) { + size_t start, end; + + uiDrawTextLayoutLineByteRange(layout, *line, &start, &end); + if (end < pos) // too far up + (*line)++; + else + (*line)--; + xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line); + } + uiDrawTextLayoutLineGetMetrics(layout, *line, &m); + + caretDrawParams(c, m.Height, &cdp); + + uiDrawSave(c); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, + // TODO add m.X? + x + xoff - cdp.xoff, y + m.Y, + cdp.width, m.Height); + uiDrawPathEnd(path); + brush.Type = uiDrawBrushTypeSolid; + brush.R = cdp.r; + brush.G = cdp.g; + brush.B = cdp.b; + brush.A = cdp.a; + uiDrawFill(c, path, &brush); + uiDrawFreePath(path); + + uiDrawRestore(c); +} + +void drawTextBackground(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout, size_t start, size_t end, uiDrawBrush *brush, int isSelection) +{ + int line, nLines; + size_t lstart, lend; + double layoutwid, layoutht; + + uiDrawTextLayoutExtents(layout, &layoutwid, &layoutht); + nLines = uiDrawTextLayoutNumLines(layout); + for (line = 0; line < nLines; line++) { + uiDrawTextLayoutLineByteRange(layout, line, &lstart, &lend); + if (start >= lstart && start < lend) + break; + } + while (end - start > 0) { + uiDrawTextLayoutLineMetrics m; + double startx, endx; + uiDrawPath *path; + + uiDrawTextLayoutLineByteRange(layout, line, &lstart, &lend); + if (lend > end) // don't cross lines + lend = end; + startx = uiDrawTextLayoutByteLocationInLine(layout, start, line); + // TODO explain this; note the use of start with lend + endx = layoutwid; + if (!isSelection || end <= lend) + endx = uiDrawTextLayoutByteLocationInLine(layout, lend, line); + uiDrawTextLayoutLineGetMetrics(layout, line, &m); + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, + x + startx, y + m.Y, + endx - startx, m.Height); + uiDrawPathEnd(path); + uiDrawFill(c, path, brush); + uiDrawFreePath(path); + line++; + start = lend; + } +} diff --git a/_wip/attrstr_metrics/common_OLD_uipriv_attrstr.h b/_wip/attrstr_metrics/common_OLD_uipriv_attrstr.h new file mode 100644 index 00000000..ec920954 --- /dev/null +++ b/_wip/attrstr_metrics/common_OLD_uipriv_attrstr.h @@ -0,0 +1,15 @@ + + +// TODO split these into a separate header file? + +// drawtext.c +struct caretDrawParams { + double r; + double g; + double b; + double a; + double xoff; + double width; +}; +extern void caretDrawParams(uiDrawContext *c, double height, struct caretDrawParams *p); +extern void drawTextBackground(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout, size_t start, size_t end, uiDrawBrush *brush, int isSelection); diff --git a/_wip/attrstr_metrics/darwin_OLD__appkit_drawtext.m b/_wip/attrstr_metrics/darwin_OLD__appkit_drawtext.m new file mode 100644 index 00000000..644a2bdf --- /dev/null +++ b/_wip/attrstr_metrics/darwin_OLD__appkit_drawtext.m @@ -0,0 +1,347 @@ +// 2 january 2017 +#import "uipriv_darwin.h" +#import "draw.h" + +@interface lineInfo : NSObject +@property NSRange glyphRange; +@property NSRange characterRange; +@property NSRect lineRect; +@property NSRect lineUsedRect; +@property NSRect glyphBoundingRect; +@property CGFloat baselineOffset; +@property double ascent; +@property double descent; +@property double leading; +@end + +@implementation lineInfo +@end + +struct uiDrawTextLayout { + // NSTextStorage is subclassed from NSMutableAttributedString + NSTextStorage *attrstr; + NSTextContainer *container; + NSLayoutManager *layoutManager; + + // the width as passed into uiDrawTextLayout constructors + double width; + +#if 0 /* TODO */ + // the *actual* size of the frame + // note: technically, metrics returned from frame are relative to CGPathGetPathBoundingBox(tl->path) + // however, from what I can gather, for a path created by CGPathCreateWithRect(), like we do (with a NULL transform), CGPathGetPathBoundingBox() seems to just return the standardized form of the rect used to create the path + // (this I confirmed through experimentation) + // so we can just use tl->size for adjustments + // we don't need to adjust coordinates by any origin since our rect origin is (0, 0) + CGSize size; +#endif + + NSMutableArray *lineInfo; + + // for converting CFAttributedString indices to byte offsets + size_t *u16tou8; + size_t nu16tou8; // TODO I don't like the casing of this name +}; + +static NSFont *fontdescToNSFont(uiDrawFontDescriptor *fd) +{ + NSFontDescriptor *desc; + NSFont *font; + + desc = fontdescToNSFontDescriptor(fd); + font = [NSFont fontWithDescriptor:desc size:fd->Size]; + [desc release]; + return font; +} + +static NSTextStorage *attrstrToTextStorage(uiAttributedString *s, uiDrawFontDescriptor *defaultFont) +{ + NSString *nsstr; + NSMutableDictionary *defaultAttrs; + NSTextStorage *attrstr; + + nsstr = [[NSString alloc] initWithCharacters:attrstrUTF16(s) + length:attrstrUTF16Len(s)]; + + defaultAttrs = [NSMutableDictionary new]; + [defaultAttrs setObject:fontdescToNSFont(defaultFont) + forKey:NSFontAttributeName]; + + attrstr = [[NSTextStorage alloc] initWithString:nsstr + attributes:defaultAttrs]; + [defaultAttrs release]; + [nsstr release]; + + [attrstr beginEditing]; + // TODO copy in the attributes + [attrstr endEditing]; + + return attrstr; +} + +// TODO fine-tune all the properties +uiDrawTextLayout *uiDrawNewTextLayout(uiAttributedString *s, uiDrawFontDescriptor *defaultFont, double width) +{ + uiDrawTextLayout *tl; + CGFloat cgwidth; + // TODO correct type? + NSUInteger index; + + tl = uiNew(uiDrawTextLayout); + tl->attrstr = attrstrToTextStorage(s, defaultFont); + tl->width = width; + + // TODO the documentation on the size property implies this might not be necessary? + cgwidth = (CGFloat) width; + if (cgwidth < 0) + cgwidth = CGFLOAT_MAX; + // TODO rename to tl->textContainer + tl->container = [[NSTextContainer alloc] initWithSize:NSMakeSize(cgwidth, CGFLOAT_MAX)]; + // TODO pull the reference for this + [tl->container setLineFragmentPadding:0]; + + tl->layoutManager = [[NSLayoutManager alloc] init]; + [tl->layoutManager setTypesetterBehavior:NSTypesetterLatestBehavior]; + + [tl->layoutManager addTextContainer:tl->container]; + [tl->attrstr addLayoutManager:tl->layoutManager]; + // and force a re-layout (TODO get source + [tl->layoutManager glyphRangeForTextContainer:tl->container]; + + // TODO equivalent of CTFrameProgression for RTL/LTR? + + // now collect line information; see https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/TextLayout/Tasks/CountLines.html + tl->lineInfo = [NSMutableArray new]; + index = 0; + while (index < [tl->layoutManager numberOfGlyphs]) { + NSRange glyphRange; + __block lineInfo *li; + + li = [lineInfo new]; + li.lineRect = [tl->layoutManager lineFragmentRectForGlyphAtIndex:index effectiveRange:&glyphRange]; + li.glyphRange = glyphRange; + li.characterRange = [tl->layoutManager characterRangeForGlyphRange:li.glyphRange actualGlyphRange:NULL]; + li.lineUsedRect = [tl->layoutManager lineFragmentUsedRectForGlyphAtIndex:index effectiveRange:NULL]; + li.glyphBoundingRect = [tl->layoutManager boundingRectForGlyphRange:li.glyphRange inTextContainer:tl->container]; + // and this is from http://www.cocoabuilder.com/archive/cocoa/308568-how-to-get-baseline-info.html and http://www.cocoabuilder.com/archive/cocoa/199283-height-and-location-of-text-within-line-in-nslayoutmanager-ignoring-spacing.html + li.baselineOffset = [[tl->layoutManager typesetter] baselineOffsetInLayoutManager:tl->layoutManager glyphIndex:index]; + li.ascent = 0; + li.descent = 0; + li.leading = 0; + // imitate what AppKit actually does (or seems to) + [tl->attrstr enumerateAttributesInRange:li.characterRange options:0 usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop) { + NSFont *f; + NSRect boundingRect; + double v, realAscent, realDescent, realLeading; + BOOL skipAdjust, doAdjust; + + f = (NSFont *) [attrs objectForKey:NSFontAttributeName]; + if (f == nil) { + f = [NSFont fontWithName:@"Helvetica" size:12.0]; + if (f == nil) + f = [NSFont systemFontOfSize:12.0]; + } + + boundingRect = [f boundingRectForFont]; + realAscent = [f ascender]; + realDescent = -[f descender]; + realLeading = [f leading]; + skipAdjust = NO; + doAdjust = NO; + if (NSMaxY(boundingRect) <= realAscent) { + // ascent entirely within bounding box + // don't do anything if there's leading; I'm guessing it's a combination of both of the reasons to skip below... (least sure of this one) + if (realLeading != 0) + skipAdjust = YES; + // does the descent slip outside the bounding box? + if (-realDescent <= NSMinY(boundingRect)) + // yes — I guess we should assume accents don't collide with the previous line's descent, though I'm not as sure of that as I am about the else clause below... + skipAdjust = YES; + } else { + // ascent outside bounding box — ascent does not include accents + // only skip adjustment if there isn't leading (apparently some fonts use the previous line's leading for accents? :/ ) + if (realLeading != 0) + skipAdjust = YES; + } + if (!skipAdjust) { + UniChar ch = 0xC0; + CGGlyph glyph; + + // there does not seem to be an AppKit API for this... + if (CTFontGetGlyphsForCharacters((CTFontRef) f, &ch, &glyph, 1) != false) { + NSRect bbox; + + bbox = [f boundingRectForGlyph:glyph]; + if (NSMaxY(bbox) > realAscent) + doAdjust = YES; + if (-realDescent > NSMinY(bbox)) + doAdjust = YES; + } + } + // TODO vertical + + v = [f ascender]; + // TODO get this one back out + if (doAdjust) + v += 0.2 * ([f ascender] + [f descender]); + //v = floor(v + 0.5); + if (li.ascent < v) + li.ascent = v; + + v = -[f descender];// floor(-[f descender] + 0.5); + if (li.descent < v) + li.descent = v; + + v = [f leading];//floor([f leading] + 0.5); + if (li.leading < v) + li.leading = v; + }]; + li.ascent = floor(li.ascent + 0.5); + li.descent = floor(li.descent + 0.5); + li.leading = floor(li.leading + 0.5); + [tl->lineInfo addObject:li]; + [li release]; + index = glyphRange.location + glyphRange.length; + } + + // and finally copy the UTF-16 to UTF-8 index conversion table + tl->u16tou8 = attrstrCopyUTF16ToUTF8(s, &(tl->nu16tou8)); + + return tl; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) +{ + uiFree(tl->u16tou8); + [tl->lineInfo release]; + [tl->layoutManager release]; + [tl->container release]; + [tl->attrstr release]; + uiFree(tl); +} + +// TODO document that (x,y) is the top-left corner of the *entire frame* +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) +{ + NSGraphicsContext *gc; + + CGContextFlush(c->c); // just to be safe + [NSGraphicsContext saveGraphicsState]; + gc = [NSGraphicsContext graphicsContextWithGraphicsPort:c->c flipped:YES]; + [NSGraphicsContext setCurrentContext:gc]; + + // TODO is this the right point? + // TODO does this draw with the proper default styles? + [tl->layoutManager drawGlyphsForGlyphRange:[tl->layoutManager glyphRangeForTextContainer:tl->container] + atPoint:NSMakePoint(x, y)]; + + [gc flushGraphics]; // just to be safe + [NSGraphicsContext restoreGraphicsState]; + // TODO release gc? +} + +// TODO update all of these { +// TODO document that the width and height of a layout is not necessarily the sum of the widths and heights of its constituent lines; this is definitely untrue on OS X, where lines are placed in such a way that the distance between baselines is always integral +// TODO width doesn't include trailing whitespace... +// TODO figure out how paragraph spacing should play into this +// } +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) +{ + NSRect r; + + // see https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/TextLayout/Tasks/StringHeight.html + r = [tl->layoutManager usedRectForTextContainer:tl->container]; + *width = r.size.width; + *height = r.size.height; +} + +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ + return [tl->lineInfo count]; +} + +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ + lineInfo *li; + + li = (lineInfo *) [tl->lineInfo objectAtIndex:line]; + *start = tl->u16tou8[li.characterRange.location]; + *end = tl->u16tou8[li.characterRange.location + li.characterRange.length]; +} + +void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m) +{ + lineInfo *li; + + li = (lineInfo *) [tl->lineInfo objectAtIndex:line]; + + m->X = li.lineRect.origin.x; + m->Y = li.lineRect.origin.y; + // if we use li.lineRect here we get the whole line, not just the part with stuff in it + m->Width = li.lineUsedRect.size.width; + m->Height = li.lineRect.size.height; + + // TODO is this correct? + m->BaselineY = (m->Y + m->Height) - li.baselineOffset; + m->Ascent = li.ascent; + m->Descent = li.descent; + m->Leading = li.leading; + + // TODO + m->ParagraphSpacingBefore = 0; + m->LineHeightSpace = 0; + m->LineSpacing = 0; + m->ParagraphSpacing = 0; +} + +void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, uiDrawTextLayoutHitTestResult *result) +{ +#if 0 /* TODO */ + CFIndex i; + CTLineRef line; + CFIndex pos; + + if (y >= 0) { + for (i = 0; i < tl->nLines; i++) { + double ltop, lbottom; + + ltop = tl->lineMetrics[i].Y; + lbottom = ltop + tl->lineMetrics[i].Height; + if (y >= ltop && y < lbottom) + break; + } + result->YPosition = uiDrawTextLayoutHitTestPositionInside; + if (i == tl->nLines) { + i--; + result->YPosition = uiDrawTextLayoutHitTestPositionAfter; + } + } else { + i = 0; + result->YPosition = uiDrawTextLayoutHitTestPositionBefore; + } + result->Line = i; + + result->XPosition = uiDrawTextLayoutHitTestPositionInside; + if (x < tl->lineMetrics[i].X) { + result->XPosition = uiDrawTextLayoutHitTestPositionBefore; + // and forcibly return the first character + x = tl->lineMetrics[i].X; + } else if (x > (tl->lineMetrics[i].X + tl->lineMetrics[i].Width)) { + result->XPosition = uiDrawTextLayoutHitTestPositionAfter; + // and forcibly return the last character + x = tl->lineMetrics[i].X + tl->lineMetrics[i].Width; + } + + line = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, i); + // TODO copy the part from the docs about this point + pos = CTLineGetStringIndexForPosition(line, CGPointMake(x, 0)); + if (pos == kCFNotFound) { + // TODO + } + result->Pos = tl->u16tou8[pos]; +#endif +} + +void uiDrawTextLayoutByteRangeToRectangle(uiDrawTextLayout *tl, size_t start, size_t end, uiDrawTextLayoutByteRangeRectangle *r) +{ +} diff --git a/_wip/attrstr_metrics/darwin_OLD__appkit_fontmatch.m b/_wip/attrstr_metrics/darwin_OLD__appkit_fontmatch.m new file mode 100644 index 00000000..8e81400f --- /dev/null +++ b/_wip/attrstr_metrics/darwin_OLD__appkit_fontmatch.m @@ -0,0 +1,223 @@ +// 3 january 2017 +#import "uipriv_darwin.h" + +// Stupidity: Core Text requires an **exact match for the entire traits dictionary**, otherwise it will **drop ALL the traits**. +// This seems to be true for every function in Core Text that advertises that it performs font matching; I can confirm at the time of writing this is the case for +// - CTFontDescriptorCreateMatchingFontDescriptors() (though the conditions here seem odd) +// - CTFontCreateWithFontDescriptor() +// - CTFontCreateCopyWithAttributes() +// And as a bonus prize, this also applies to Cocoa's NSFontDescriptor methods as well! +// We have to implement the closest match ourselves. +// This needs to be done early in the matching process; in particular, we have to do this before adding any features (such as small caps), because the matching descriptors won't have those. + +struct closeness { + NSUInteger index; + double weight; + double italic; + double stretch; + double distance; +}; + +static double doubleAttr(NSDictionary *traits, NSString *attr) +{ + NSNumber *n; + + n = (NSNumber *) [traits objectForKey:attr]; + return [n doubleValue]; +} + +struct italicCloseness { + double normal; + double oblique; + double italic; +}; + +// remember that in closeness, 0 means exact +// in this case, since we define the range, we use 0.5 to mean "close enough" (oblique for italic and italic for oblique) and 1 to mean "not a match" +static const struct italicCloseness italicClosenesses[] = { + [uiDrawTextItalicNormal] = { 0, 1, 1 }, + [uiDrawTextItalicOblique] = { 1, 0, 0.5 }, + [uiDrawTextItalicItalic] = { 1, 0.5, 0 }, +}; + +// Italics are hard because Core Text does NOT distinguish between italic and oblique. +// All Core Text provides is a slant value and the italic bit of the symbolic traits mask. +// However, Core Text does seem to guarantee (from experimentation; see below) that the slant will be nonzero if and only if the italic bit is set, so we don't need to use the slant value. +// Core Text also seems to guarantee that if a font lists itself as Italic or Oblique by name (font subfamily name, font style name, whatever), it will also have that bit set, so testing this bit does cover all fonts that name themselves as Italic and Oblique. (Again, this is from the below experimentation.) +// TODO there is still one catch that might matter from a user's POV: the reverse is not true — the italic bit can be set even if the style of the font face/subfamily/style isn't named as Italic (for example, script typefaces like Adobe's Palace Script MT Std); I don't know what to do about this... I know how to start: find a script font that has an italic form (Adobe's Palace Script MT Std does not; only Regular and Semibold) +// TODO see if the above applies to Cocoa as well +static double italicCloseness(NSFontDescriptor *desc, NSDictionary *traits, uiDrawTextItalic italic) +{ + const struct italicCloseness *ic = &(italicClosenesses[italic]); + NSNumber *num; + NSFontSymbolicTraits symbolic; + NSString *styleName; + NSRange range; + BOOL isOblique; + + num = (NSNumber *) [traits objectForKey:NSFontSymbolicTrait]; + // TODO this should really be a uint32_t-specific one + symbolic = (NSFontSymbolicTraits) [num unsignedIntegerValue]; + if ((symbolic & NSFontItalicTrait) == 0) + return ic->normal; + + // Okay, now we know it's either Italic or Oblique + // Pango's Core Text code just does a g_strrstr() (backwards case-sensitive search) for "Oblique" in the font's style name (see https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c); let's do that too I guess + // note that NSFontFaceAttribute is the Cocoa equivalent of the style name + isOblique = NO; // default value + styleName = (NSString *) [desc objectForKey:NSFontFaceAttribute]; + // TODO is styleName guaranteed? + // TODO NSLiteralSearch? + range = [styleName rangeOfString:@"Oblique" options:NSCaseInsensitiveSearch]; + if (range.location != NSNotFound) + return ic->oblique; + return ic->italic; +} + +static NSFontDescriptor *matchTraits(NSFontDescriptor *against, double targetWeight, uiDrawTextItalic targetItalic, double targetStretch) +{ + NSArray *matching; + NSUInteger i, n; + struct closeness *closeness; + NSFontDescriptor *current; + NSFontDescriptor *out; + + matching = [against matchingFontDescriptorsWithMandatoryKeys:nil]; + if (matching == nil) + // no matches; give the original back and hope for the best + return against; + n = [matching count]; + if (n == 0) { + // likewise +//TODO [matching release]; + return against; + } + + closeness = (struct closeness *) uiAlloc(n * sizeof (struct closeness), "struct closeness[]"); + for (i = 0; i < n; i++) { + NSDictionary *traits; + + closeness[i].index = i; + current = (NSFontDescriptor *) [matching objectAtIndex:i]; + traits = (NSDictionary *) [current objectForKey:NSFontTraitsAttribute]; + if (traits == nil) { + // couldn't get traits; be safe by ranking it lowest + // LONGTERM figure out what the longest possible distances are + closeness[i].weight = 3; + closeness[i].italic = 2; + closeness[i].stretch = 3; + continue; + } + closeness[i].weight = doubleAttr(traits, NSFontWeightTrait) - targetWeight; + closeness[i].italic = italicCloseness(current, traits, targetItalic); + closeness[i].stretch = doubleAttr(traits, NSFontWidthTrait) - targetStretch; + // TODO release traits? + } + + // now figure out the 3-space difference between the three and sort by that + // TODO merge this loop with the previous loop? + for (i = 0; i < n; i++) { + double weight, italic, stretch; + + weight = closeness[i].weight; + weight *= weight; + italic = closeness[i].italic; + italic *= italic; + stretch = closeness[i].stretch; + stretch *= stretch; + closeness[i].distance = sqrt(weight + italic + stretch); + } + qsort_b(closeness, n, sizeof (struct closeness), ^(const void *aa, const void *bb) { + const struct closeness *a = (const struct closeness *) aa; + const struct closeness *b = (const struct closeness *) bb; + + // via http://www.gnu.org/software/libc/manual/html_node/Comparison-Functions.html#Comparison-Functions + // LONGTERM is this really the best way? isn't it the same as if (*a < *b) return -1; if (*a > *b) return 1; return 0; ? + return (a->distance > b->distance) - (a->distance < b->distance); + }); + // and the first element of the sorted array is what we want + out = (NSFontDescriptor *) [matching objectAtIndex:closeness[0].index]; + // TODO is this correct? + [out retain]; // get rule + + // release everything + uiFree(closeness); +//TODO [matching release]; + // and release the original descriptor since we no longer need it + [against release]; + + return out; +} + +// since uiDrawTextWeight effectively corresponds to OS/2 weights (which roughly correspond to GDI, Pango, and DirectWrite weights, and to a lesser(? TODO) degree, CSS weights), let's just do what Core Text does with OS/2 weights +// TODO this will not be correct for system fonts, which use cached values that have no relation to the OS/2 weights; we need to figure out how to reconcile these +// for more information, see https://bugzilla.gnome.org/show_bug.cgi?id=766148 and TODO_put_blog_post_here_once_I_write_it (TODO keep this line when resolving the above TODO) +static const double weightsToCTWeights[] = { + -1.0, // 0..99 + -0.7, // 100..199 + -0.5, // 200..299 + -0.23, // 300..399 + 0.0, // 400..499 + 0.2, // 500..599 + 0.3, // 600..699 + 0.4, // 700..799 + 0.6, // 800..899 + 0.8, // 900..999 + 1.0, // 1000 +}; + +static double weightToCTWeight(uiDrawTextWeight weight) +{ + int weightClass; + double ctclass; + double rest, weightFloor, nextFloor; + + if (weight <= 0) + return -1.0; + if (weight >= 1000) + return 1.0; + + weightClass = weight / 100; + rest = (double) weight; + weightFloor = (double) (weightClass * 100); + nextFloor = (double) ((weightClass + 1) * 100); + rest = (rest - weightFloor) / (nextFloor - weightFloor); + + ctclass = weightsToCTWeights[weightClass]; + return fma(rest, + weightsToCTWeights[weightClass + 1] - ctclass, + ctclass); +} + +// based on what Core Text says about actual fonts (system fonts, system fonts in another folder to avoid using cached values, Adobe Font Folio 11, Google Fonts archive, fonts in Windows 7/8.1/10) +static const double stretchesToCTWidths[] = { + [uiDrawTextStretchUltraCondensed] = -0.400000, + [uiDrawTextStretchExtraCondensed] = -0.300000, + [uiDrawTextStretchCondensed] = -0.200000, + [uiDrawTextStretchSemiCondensed] = -0.100000, + [uiDrawTextStretchNormal] = 0.000000, + [uiDrawTextStretchSemiExpanded] = 0.100000, + [uiDrawTextStretchExpanded] = 0.200000, + [uiDrawTextStretchExtraExpanded] = 0.300000, + // this one isn't present in any of the fonts I tested, but it follows naturally from the pattern of the rest, so... (TODO verify by checking the font files directly) + [uiDrawTextStretchUltraExpanded] = 0.400000, +}; + +NSFontDescriptor *fontdescToNSFontDescriptor(uiDrawFontDescriptor *fd) +{ + NSMutableDictionary *attrs; + NSFontDescriptor *basedesc; + + attrs = [NSMutableDictionary new]; + [attrs setObject:[NSString stringWithUTF8String:fd->Family] + forKey:NSFontFamilyAttribute]; + [attrs setObject:[NSNumber numberWithDouble:fd->Size] + forKey:NSFontSizeAttribute]; + + basedesc = [[NSFontDescriptor alloc] initWithFontAttributes:attrs]; + [attrs release]; + return matchTraits(basedesc, + weightToCTWeight(fd->Weight), + fd->Italic, + stretchesToCTWidths[fd->Stretch]); +} diff --git a/_wip/attrstr_metrics/darwin_OLD__old_drawtext.m b/_wip/attrstr_metrics/darwin_OLD__old_drawtext.m new file mode 100644 index 00000000..72a8d2e6 --- /dev/null +++ b/_wip/attrstr_metrics/darwin_OLD__old_drawtext.m @@ -0,0 +1,268 @@ +// 6 september 2015 +#import "uipriv_darwin.h" + +// TODO double-check that we are properly handling allocation failures (or just toll free bridge from cocoa) +struct uiDrawFontFamilies { + CFArrayRef fonts; +}; + +uiDrawFontFamilies *uiDrawListFontFamilies(void) +{ + uiDrawFontFamilies *ff; + + ff = uiNew(uiDrawFontFamilies); + ff->fonts = CTFontManagerCopyAvailableFontFamilyNames(); + if (ff->fonts == NULL) + implbug("error getting available font names (no reason specified) (TODO)"); + return ff; +} + +int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) +{ + return CFArrayGetCount(ff->fonts); +} + +char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) +{ + CFStringRef familystr; + char *family; + + familystr = (CFStringRef) CFArrayGetValueAtIndex(ff->fonts, n); + // toll-free bridge + family = uiDarwinNSStringToText((NSString *) familystr); + // Get Rule means we do not free familystr + return family; +} + +void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) +{ + CFRelease(ff->fonts); + uiFree(ff); +} + +struct uiDrawTextFont { + CTFontRef f; +}; + +uiDrawTextFont *mkTextFont(CTFontRef f, BOOL retain) +{ + uiDrawTextFont *font; + + font = uiNew(uiDrawTextFont); + font->f = f; + if (retain) + CFRetain(font->f); + return font; +} + +uiDrawTextFont *mkTextFontFromNSFont(NSFont *f) +{ + // toll-free bridging; we do retain, though + return mkTextFont((CTFontRef) f, YES); +} + +static CFMutableDictionaryRef newAttrList(void) +{ + CFMutableDictionaryRef attr; + + attr = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + if (attr == NULL) + complain("error creating attribute dictionary in newAttrList()()"); + return attr; +} + +static void addFontFamilyAttr(CFMutableDictionaryRef attr, const char *family) +{ + CFStringRef cfstr; + + cfstr = CFStringCreateWithCString(NULL, family, kCFStringEncodingUTF8); + if (cfstr == NULL) + complain("error creating font family name CFStringRef in addFontFamilyAttr()"); + CFDictionaryAddValue(attr, kCTFontFamilyNameAttribute, cfstr); + CFRelease(cfstr); // dictionary holds its own reference +} + +static void addFontSizeAttr(CFMutableDictionaryRef attr, double size) +{ + CFNumberRef n; + + n = CFNumberCreate(NULL, kCFNumberDoubleType, &size); + CFDictionaryAddValue(attr, kCTFontSizeAttribute, n); + CFRelease(n); +} + +#if 0 +TODO +// See http://stackoverflow.com/questions/4810409/does-coretext-support-small-caps/4811371#4811371 and https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c for what these do +// And fortunately, unlike the traits (see below), unmatched features are simply ignored without affecting the other features :D +static void addFontSmallCapsAttr(CFMutableDictionaryRef attr) +{ + CFMutableArrayRef outerArray; + CFMutableDictionaryRef innerDict; + CFNumberRef numType, numSelector; + int num; + + outerArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (outerArray == NULL) + complain("error creating outer CFArray for adding small caps attributes in addFontSmallCapsAttr()"); + + // Apple's headers say these are deprecated, but a few fonts still rely on them + num = kLetterCaseType; + numType = CFNumberCreate(NULL, kCFNumberIntType, &num); + num = kSmallCapsSelector; + numSelector = CFNumberCreate(NULL, kCFNumberIntType, &num); + innerDict = newAttrList(); + CFDictionaryAddValue(innerDict, kCTFontFeatureTypeIdentifierKey, numType); + CFRelease(numType); + CFDictionaryAddValue(innerDict, kCTFontFeatureSelectorIdentifierKey, numSelector); + CFRelease(numSelector); + CFArrayAppendValue(outerArray, innerDict); + CFRelease(innerDict); // and likewise for CFArray + + // these are the non-deprecated versions of the above; some fonts have these instead + num = kLowerCaseType; + numType = CFNumberCreate(NULL, kCFNumberIntType, &num); + num = kLowerCaseSmallCapsSelector; + numSelector = CFNumberCreate(NULL, kCFNumberIntType, &num); + innerDict = newAttrList(); + CFDictionaryAddValue(innerDict, kCTFontFeatureTypeIdentifierKey, numType); + CFRelease(numType); + CFDictionaryAddValue(innerDict, kCTFontFeatureSelectorIdentifierKey, numSelector); + CFRelease(numSelector); + CFArrayAppendValue(outerArray, innerDict); + CFRelease(innerDict); // and likewise for CFArray + + CFDictionaryAddValue(attr, kCTFontFeatureSettingsAttribute, outerArray); + CFRelease(outerArray); +} +#endif + +#if 0 +// Named constants for these were NOT added until 10.11, and even then they were added as external symbols instead of macros, so we can't use them directly :( +// kode54 got these for me before I had access to El Capitan; thanks to him. +#define ourNSFontWeightUltraLight -0.800000 +#define ourNSFontWeightThin -0.600000 +#define ourNSFontWeightLight -0.400000 +#define ourNSFontWeightRegular 0.000000 +#define ourNSFontWeightMedium 0.230000 +#define ourNSFontWeightSemibold 0.300000 +#define ourNSFontWeightBold 0.400000 +#define ourNSFontWeightHeavy 0.560000 +#define ourNSFontWeightBlack 0.620000 +#endif + +// Now remember what I said earlier about having to add the small caps traits after calling the above? This gets a dictionary back so we can do so. +CFMutableDictionaryRef extractAttributes(CTFontDescriptorRef desc) +{ + CFDictionaryRef dict; + CFMutableDictionaryRef mdict; + + dict = CTFontDescriptorCopyAttributes(desc); + // this might not be mutable, so make a mutable copy + mdict = CFDictionaryCreateMutableCopy(NULL, 0, dict); + CFRelease(dict); + return mdict; +} + +uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) +{ + CTFontRef f; + CFMutableDictionaryRef attr; + CTFontDescriptorRef cfdesc; + + attr = newAttrList(); + addFontFamilyAttr(attr, desc->Family); + addFontSizeAttr(attr, desc->Size); + + // now we have to do the traits matching, so create a descriptor, match the traits, and then get the attributes back + cfdesc = CTFontDescriptorCreateWithAttributes(attr); + // TODO release attr? + cfdesc = matchTraits(cfdesc, desc->Weight, desc->Italic, desc->Stretch); + + // specify the initial size again just to be safe + f = CTFontCreateWithFontDescriptor(cfdesc, desc->Size, NULL); + // TODO release cfdesc? + + return mkTextFont(f, NO); // we hold the initial reference; no need to retain again +} + +void uiDrawFreeTextFont(uiDrawTextFont *font) +{ + CFRelease(font->f); + uiFree(font); +} + +uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) +{ + return (uintptr_t) (font->f); +} + +void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) +{ + // TODO +} + +// text sizes and user space points are identical: +// - https://developer.apple.com/library/mac/documentation/TextFonts/Conceptual/CocoaTextArchitecture/TypoFeatures/TextSystemFeatures.html#//apple_ref/doc/uid/TP40009459-CH6-51627-BBCCHIFF text points are 72 per inch +// - https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CocoaDrawingGuide/Transforms/Transforms.html#//apple_ref/doc/uid/TP40003290-CH204-SW5 user space points are 72 per inch +void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) +{ + metrics->Ascent = CTFontGetAscent(font->f); + metrics->Descent = CTFontGetDescent(font->f); + metrics->Leading = CTFontGetLeading(font->f); + metrics->UnderlinePos = CTFontGetUnderlinePosition(font->f); + metrics->UnderlineThickness = CTFontGetUnderlineThickness(font->f); +} + +// LONGTERM allow line separation and leading to be factored into a wrapping text layout + +// TODO reconcile differences in character wrapping on platforms +void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height) +{ + struct framesetter fs; + + mkFramesetter(layout, &fs); + *width = fs.extents.width; + *height = fs.extents.height; + freeFramesetter(&fs); +} + +// LONGTERM provide an equivalent to CTLineGetTypographicBounds() on uiDrawTextLayout? + +// LONGTERM keep this for later features and documentation purposes +#if 0 + + // LONGTERM provide a way to get the image bounds as a separate function later + bounds = CTLineGetImageBounds(line, c); + // though CTLineGetImageBounds() returns CGRectNull on error, it also returns CGRectNull on an empty string, so we can't reasonably check for error + + // CGContextSetTextPosition() positions at the baseline in the case of CTLineDraw(); we need the top-left corner instead + CTLineGetTypographicBounds(line, &yoff, NULL, NULL); + // remember that we're flipped, so we subtract + y -= yoff; + CGContextSetTextPosition(c, x, y); +#endif + +#if 0 +void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) +{ + CGColorSpaceRef colorspace; + CGFloat components[4]; + CGColorRef color; + + // for consistency with windows, use sRGB + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); + components[0] = r; + components[1] = g; + components[2] = b; + components[3] = a; + color = CGColorCreate(colorspace, components); + CGColorSpaceRelease(colorspace); + + CFAttributedStringSetAttribute(layout->mas, + rangeToCFRange(), + kCTForegroundColorAttributeName, + color); + CGColorRelease(color); // TODO safe? +} +#endif diff --git a/_wip/attrstr_metrics/darwin_OLD_drawtext.m b/_wip/attrstr_metrics/darwin_OLD_drawtext.m new file mode 100644 index 00000000..1fa5920e --- /dev/null +++ b/_wip/attrstr_metrics/darwin_OLD_drawtext.m @@ -0,0 +1,314 @@ +// 2 january 2017 +#import "uipriv_darwin.h" +#import "draw.h" + +// TODO on an empty string nLines == 0 +// we must prevent this somehow +// TODO in general, every function could be more robust, but we cannot have a situation where there are zero lines +// TODO what happens to extents if only whitespace? + +struct uiDrawTextLayout { + CFAttributedStringRef attrstr; + + // the width as passed into uiDrawTextLayout constructors + double width; + + CTFramesetterRef framesetter; + + // the *actual* size of the frame + // note: technically, metrics returned from frame are relative to CGPathGetPathBoundingBox(tl->path) + // however, from what I can gather, for a path created by CGPathCreateWithRect(), like we do (with a NULL transform), CGPathGetPathBoundingBox() seems to just return the standardized form of the rect used to create the path + // (this I confirmed through experimentation) + // so we can just use tl->size for adjustments + // we don't need to adjust coordinates by any origin since our rect origin is (0, 0) + CGSize size; + + CGPathRef path; + CTFrameRef frame; + + CFArrayRef lines; + CFIndex nLines; + // we compute this once when first creating the layout + uiDrawTextLayoutLineMetrics *lineMetrics; + + NSArray *backgroundBlocks; + + // for converting CFAttributedString indices from/to byte offsets + size_t *u8tou16; + size_t nUTF8; + size_t *u16tou8; + size_t nUTF16; +}; + +// TODO document that lines may or may not overlap because ours do in the case of multiple combining characters +static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size) +{ + uiDrawTextLayoutLineMetrics *metrics; + CFArrayRef lines; + CTLineRef line; + CFIndex i, n; + CGFloat ypos; + CGRect bounds, boundsNoLeading; + CGFloat ascent, descent, leading; + CGPoint *origins; + + lines = CTFrameGetLines(frame); + n = CFArrayGetCount(lines); + metrics = (uiDrawTextLayoutLineMetrics *) uiAlloc(n * sizeof (uiDrawTextLayoutLineMetrics), "uiDrawTextLayoutLineMetrics[] (text layout)"); + + origins = (CGPoint *) uiAlloc(n * sizeof (CGPoint), "CGPoint[] (text layout)"); + CTFrameGetLineOrigins(frame, CFRangeMake(0, n), origins); + + ypos = size.height; + for (i = 0; i < n; i++) { + line = (CTLineRef) CFArrayGetValueAtIndex(lines, i); + bounds = CTLineGetBoundsWithOptions(line, 0); + boundsNoLeading = CTLineGetBoundsWithOptions(line, kCTLineBoundsExcludeTypographicLeading); + + // this is equivalent to boundsNoLeading.size.height + boundsNoLeading.origin.y (manually verified) + ascent = bounds.size.height + bounds.origin.y; + descent = -boundsNoLeading.origin.y; + leading = -bounds.origin.y - descent; + + // Core Text always rounds these up for paragraph style calculations; there is a flag to control it but it's inaccessible (and this behavior is turned off for old versions of iPhoto) + ascent = floor(ascent + 0.5); + descent = floor(descent + 0.5); + if (leading > 0) + leading = floor(leading + 0.5); + + metrics[i].X = origins[i].x; + metrics[i].Y = origins[i].y - descent - leading; + metrics[i].Width = bounds.size.width; + metrics[i].Height = ascent + descent + leading; + + metrics[i].BaselineY = origins[i].y; + metrics[i].Ascent = ascent; + metrics[i].Descent = descent; + metrics[i].Leading = leading; + + // TODO + metrics[i].ParagraphSpacingBefore = 0; + metrics[i].LineHeightSpace = 0; + metrics[i].LineSpacing = 0; + metrics[i].ParagraphSpacing = 0; + + // and finally advance to the next line + ypos += metrics[i].Height; + } + + // okay, but now all these metrics are unflipped + // we need to flip them + for (i = 0; i < n; i++) { + metrics[i].Y = size.height - metrics[i].Y; + // go from bottom-left corner to top-left + metrics[i].Y -= metrics[i].Height; + metrics[i].BaselineY = size.height - metrics[i].BaselineY; + } + + uiFree(origins); + return metrics; +} + +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) +{ + uiDrawTextLayout *tl; + CGFloat cgwidth; + CFRange range, unused; + CGRect rect; + + tl = uiNew(uiDrawTextLayout); + tl->attrstr = attrstrToCoreFoundation(p, &(tl->backgroundBlocks)); + range.location = 0; + range.length = CFAttributedStringGetLength(tl->attrstr); + tl->width = p->Width; + + // TODO kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, kCTParagraphStyleSpecifierLineSpacingAdjustment for line spacing + tl->framesetter = CTFramesetterCreateWithAttributedString(tl->attrstr); + if (tl->framesetter == NULL) { + // TODO + } + + cgwidth = (CGFloat) (tl->width); + if (cgwidth < 0) + cgwidth = CGFLOAT_MAX; + tl->size = CTFramesetterSuggestFrameSizeWithConstraints(tl->framesetter, + range, + // TODO kCTFramePathWidthAttributeName? + NULL, + CGSizeMake(cgwidth, CGFLOAT_MAX), + &unused); // not documented as accepting NULL (TODO really?) + + rect.origin = CGPointZero; + rect.size = tl->size; + tl->path = CGPathCreateWithRect(rect, NULL); + tl->frame = CTFramesetterCreateFrame(tl->framesetter, + range, + tl->path, + // TODO kCTFramePathWidthAttributeName? + NULL); + if (tl->frame == NULL) { + // TODO + } + + tl->lines = CTFrameGetLines(tl->frame); + tl->nLines = CFArrayGetCount(tl->lines); + tl->lineMetrics = computeLineMetrics(tl->frame, tl->size); + + // and finally copy the UTF-8/UTF-16 conversion tables + tl->u8tou16 = attrstrCopyUTF8ToUTF16(p->String, &(tl->nUTF8)); + tl->u16tou8 = attrstrCopyUTF16ToUTF8(p->String, &(tl->nUTF16)); + + return tl; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) +{ + uiFree(tl->u16tou8); + uiFree(tl->u8tou16); + [tl->backgroundBlocks release]; + uiFree(tl->lineMetrics); + CFRelease(tl->frame); + CFRelease(tl->path); + CFRelease(tl->framesetter); + CFRelease(tl->attrstr); + uiFree(tl); +} + +// TODO document that (x,y) is the top-left corner of the *entire frame* +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) +{ + backgroundBlock b; + CGAffineTransform textMatrix; + + CGContextSaveGState(c->c); + // save the text matrix because it's not part of the graphics state + textMatrix = CGContextGetTextMatrix(c->c); + + for (b in tl->backgroundBlocks) + b(c, tl, x, y); + + // Core Text doesn't draw onto a flipped view correctly; we have to pretend it was unflipped + // see the iOS bits of the first example at https://developer.apple.com/library/mac/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW1 (iOS is naturally flipped) + // TODO how is this affected by a non-identity CTM? + CGContextTranslateCTM(c->c, 0, c->height); + CGContextScaleCTM(c->c, 1.0, -1.0); + CGContextSetTextMatrix(c->c, CGAffineTransformIdentity); + + // wait, that's not enough; we need to offset y values to account for our new flipping + // TODO explain this calculation + y = c->height - tl->size.height - y; + + // CTFrameDraw() draws in the path we specified when creating the frame + // this means that in our usage, CTFrameDraw() will draw at (0,0) + // so move the origin to be at (x,y) instead + // TODO are the signs correct? + CGContextTranslateCTM(c->c, x, y); + + CTFrameDraw(tl->frame, c->c); + + CGContextSetTextMatrix(c->c, textMatrix); + CGContextRestoreGState(c->c); +} + +// TODO document that the width and height of a layout is not necessarily the sum of the widths and heights of its constituent lines +// TODO width doesn't include trailing whitespace... +// TODO figure out how paragraph spacing should play into this +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) +{ + *width = tl->size.width; + *height = tl->size.height; +} + +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ + return tl->nLines; +} + +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ + CTLineRef lr; + CFRange range; + + lr = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, line); + range = CTLineGetStringRange(lr); + *start = tl->u16tou8[range.location]; + *end = tl->u16tou8[range.location + range.length]; +} + +void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m) +{ + *m = tl->lineMetrics[line]; +} + +// in the case of overlapping lines, we read lines first to last and use their bottommost point (Y + Height) to determine where the next line should start for hit-testing +// TODO should we document this? +void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line) +{ + int i; + CTLineRef ln; + CFIndex p; + + for (i = 0; i < tl->nLines; i++) { + double ltop, lbottom; + + ltop = tl->lineMetrics[i].Y; + lbottom = ltop + tl->lineMetrics[i].Height; + // y will already >= ltop at this point since the past lbottom should == (or at least >=, see above) ltop + if (y < lbottom) + break; + } + if (i == tl->nLines) + i--; + *line = i; + + ln = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, i); + // note: according to the docs, we pass a y of 0 for this since the is the baseline of that line (the point is relative to the line) + // note: x is relative to the line origin + x -= tl->lineMetrics[*line].X; + p = CTLineGetStringIndexForPosition(ln, CGPointMake(x, 0)); + if (p == kCFNotFound) { + // TODO + } + *pos = tl->u16tou8[p]; +} + +double uiDrawTextLayoutByteLocationInLine(uiDrawTextLayout *tl, size_t pos, int line) +{ + CTLineRef lr; + CFRange range; + + pos = tl->u8tou16[pos]; + if (line < 0 || line >= tl->nLines) + return -1; + lr = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, line); + range = CTLineGetStringRange(lr); + // note: >, not >=, because the position at end is valid! + if (pos < range.location || pos > (range.location + range.length)) + return -1; + // no point in checking the return; we already validated everything and 0 is a valid return for the first index :/ + // note: the result is relative to the line origin (TODO find documentation to support this) + // TODO document that these functions do this + return CTLineGetOffsetForStringIndex(lr, pos, NULL) + tl->lineMetrics[line].X; +} + +void caretDrawParams(uiDrawContext *c, double height, struct caretDrawParams *p) +{ + NSColor *cc; + CGFloat cr, cg, cb, ca; + + // Interface Builder sets this as the insertion point color for a NSTextView by default + cc = [NSColor controlTextColor]; + // the given color may not be an RGBA color, which will cause the -getRed:green:blue:alpha: call to throw an exception + cc = [cc colorUsingColorSpace:[NSColorSpace sRGBColorSpace]]; + [cc getRed:&cr green:&cg blue:&cb alpha:&ca]; + p->r = cr; + p->g = cg; + p->b = cb; + p->a = ca; + // both cc and the controlTextColor it was made from will be autoreleased since they aren't new or init calls + // TODO disabled carets have some blending applied... + + // okay there doesn't seem to be any defined metrics for these, argh... + p->width = 1; + p->xoff = 0; +} diff --git a/_wip/attrstr_metrics/numlinesbyterange b/_wip/attrstr_metrics/numlinesbyterange new file mode 100644 index 00000000..46a7ba21 --- /dev/null +++ b/_wip/attrstr_metrics/numlinesbyterange @@ -0,0 +1,60 @@ +darwin +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ + return CFArrayGetCount([tl->forLines lines]); +} + +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ + CTLineRef lr; + CFRange range; + + lr = (CTLineRef) CFArrayGetValueAtIndex([tl->forLines lines], line); + range = CTLineGetStringRange(lr); + *start = tl->u16tou8[range.location]; + if (tl->empty) + *end = *start; + else + *end = tl->u16tou8[range.location + range.length]; +} + + +unix +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ + return pango_layout_get_line_count(tl->layout); +} + +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ + PangoLayoutLine *pll; + + pll = pango_layout_get_line_readonly(tl->layout, line); + *start = pll->start_index; + *end = pll->start_index + pll->length; + // TODO unref pll? +} + + +windows +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ +return 0; +#if 0 +TODO + return tl->nLines; +#endif +} + +// DirectWrite doesn't provide a direct way to do this, so we have to do this manually +// TODO does that comment still apply here or to the code at the top of this file? +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ +#if 0 +TODO + *start = tl->lineInfo[line].startPos; + *start = tl->u16tou8[*start]; + *end = tl->lineInfo[line].endPos - tl->lineInfo[line].newlineCount; + *end = tl->u16tou8[*end]; +#endif +} diff --git a/_wip/attrstr_metrics/old_ui_attrstr.h b/_wip/attrstr_metrics/old_ui_attrstr.h new file mode 100644 index 00000000..ebe9308d --- /dev/null +++ b/_wip/attrstr_metrics/old_ui_attrstr.h @@ -0,0 +1,72 @@ + +typedef struct uiDrawTextLayoutLineMetrics uiDrawTextLayoutLineMetrics; + +// Height will equal ParagraphSpacingBefore + LineHeightSpace + Ascent + Descent + Leading + LineSpacing + ParagraphSpacing. +// The above values are listed in vertical order, from top to bottom. +// Ascent + Descent + Leading will give you the typographic bounds +// of the text. BaselineY is the boundary between Ascent and Descent. +// X, Y, and BaselineY are all in the layout's coordinate system, so the +// start point of the baseline will be at (X, BaselineY). All values are +// nonnegative. +struct uiDrawTextLayoutLineMetrics { + // This describes the overall bounding box of the line. + double X; + double Y; + double Width; + double Height; + + // This describes the typographic bounds of the line. + double BaselineY; + double Ascent; + double Descent; + double Leading; + + // This describes any additional whitespace. + // TODO come up with better names for these. + double ParagraphSpacingBefore; + double LineHeightSpace; + double LineSpacing; + double ParagraphSpacing; + + // TODO trailing whitespace? +}; + +// uiDrawTextLayoutNumLines() returns the number of lines in tl. +// This number will always be greater than or equal to 1; a text +// layout with no text only has one line. +_UI_EXTERN int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl); + +// uiDrawTextLayoutLineByteRange() returns the byte indices of the +// text that falls into the given line of tl as [start, end). +_UI_EXTERN void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end); + +_UI_EXTERN void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m); + +// TODO rewrite this documentation + +// uiDrawTextLayoutHitTest() returns the byte offset and line closest +// to the given point. The point is relative to the top-left of the layout. +// If the point is outside the layout itself, the closest point is chosen; +// this allows the function to be used for cursor positioning with the +// mouse. Do keep the returned line in mind if used in this way; the +// user might click on the end of a line, at which point the cursor +// might be at the trailing edge of the last grapheme on the line +// (subject to the operating system's APIs). +_UI_EXTERN void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line); + +// uiDrawTextLayoutByteLocationInLine() returns the point offset +// into the given line that the given byte position stands. This is +// relative to the line's X position (as returned by +// uiDrawTextLayoutLineGetMetrics()), which in turn is relative to +// the top-left of the layout. This function can be used for cursor +// positioning: if start and end are the start and end of the line +// (as returned by uiDrawTextLayoutLineByteRange()), you will get +// the correct offset, even if pos is at the end of the line. If pos is not +// in the range [start, end], a negative value will be returned, +// indicating you need to move the cursor to another line. +// TODO make sure this works right for right-aligned and center-aligned lines and justified lines and RTL text +_UI_EXTERN double uiDrawTextLayoutByteLocationInLine(uiDrawTextLayout *tl, size_t pos, int line); + +_UI_EXTERN void uiDrawCaret(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout, size_t pos, int *line); +// TODO allow blinking +// TODO allow secondary carets diff --git a/_wip/attrstr_metrics/textDarwinEmptyLayout.diff b/_wip/attrstr_metrics/textDarwinEmptyLayout.diff new file mode 100644 index 00000000..bff4959f --- /dev/null +++ b/_wip/attrstr_metrics/textDarwinEmptyLayout.diff @@ -0,0 +1,171 @@ +diff --git a/darwin/attrstr.m b/darwin/attrstr.m +index fd45ec25..86039fad 100644 +--- a/darwin/attrstr.m ++++ b/darwin/attrstr.m +@@ -403,8 +403,13 @@ static CTParagraphStyleRef mkParagraphStyle(uiDrawTextLayoutParams *p) + return ps; + } + +-CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks) ++static const UniChar emptyChars[] = { 0x20, 0x0 }; ++static const CFIndex emptyCharCount = 1; ++ ++CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, BOOL *isEmpty, NSArray **backgroundBlocks) + { ++ const UniChar *chars; ++ CFIndex charCount; + CFStringRef cfstr; + CFMutableDictionaryRef defaultAttrs; + CTFontRef defaultCTFont; +@@ -413,7 +418,15 @@ CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, NSArray + CFMutableAttributedStringRef mas; + struct foreachParams fep; + +- cfstr = CFStringCreateWithCharacters(NULL, attrstrUTF16(p->String), attrstrUTF16Len(p->String)); ++ *isEmpty = NO; ++ chars = attrstrUTF16(p->String); ++ charCount = attrstrUTF16Len(p->String); ++ if (charCount == 0) { ++ *isEmpty = YES; ++ chars = emptyChars; ++ charCount = emptyCharCount; ++ } ++ cfstr = CFStringCreateWithCharacters(NULL, chars, charCount); + if (cfstr == NULL) { + // TODO + } +diff --git a/darwin/drawtext.m b/darwin/drawtext.m +index 1fa5920e..65912383 100644 +--- a/darwin/drawtext.m ++++ b/darwin/drawtext.m +@@ -2,13 +2,16 @@ + #import "uipriv_darwin.h" + #import "draw.h" + +-// TODO on an empty string nLines == 0 +-// we must prevent this somehow +-// TODO in general, every function could be more robust, but we cannot have a situation where there are zero lines ++// TODO in general, every function could be more robust + // TODO what happens to extents if only whitespace? ++// TODO for empty layouts: ++// - check if alignment correct compared to other OSs, or expected behavior at all ++// - double-check if uiAttributedString allows zero-length attributes; I forget if I did + + struct uiDrawTextLayout { + CFAttributedStringRef attrstr; ++ // this is needed because Core Text will give us an empty line array on a frame made with an empty string ++ BOOL isEmpty; + + // the width as passed into uiDrawTextLayout constructors + double width; +@@ -41,7 +44,7 @@ + }; + + // TODO document that lines may or may not overlap because ours do in the case of multiple combining characters +-static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size) ++static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size, BOOL isEmpty) + { + uiDrawTextLayoutLineMetrics *metrics; + CFArrayRef lines; +@@ -79,6 +82,8 @@ + metrics[i].X = origins[i].x; + metrics[i].Y = origins[i].y - descent - leading; + metrics[i].Width = bounds.size.width; ++ if (isEmpty) ++ metrics[i].Width = 0; + metrics[i].Height = ascent + descent + leading; + + metrics[i].BaselineY = origins[i].y; +@@ -117,7 +122,7 @@ + CGRect rect; + + tl = uiNew(uiDrawTextLayout); +- tl->attrstr = attrstrToCoreFoundation(p, &(tl->backgroundBlocks)); ++ tl->attrstr = attrstrToCoreFoundation(p, &(tl->isEmpty), &(tl->backgroundBlocks)); + range.location = 0; + range.length = CFAttributedStringGetLength(tl->attrstr); + tl->width = p->Width; +@@ -152,7 +157,7 @@ + + tl->lines = CTFrameGetLines(tl->frame); + tl->nLines = CFArrayGetCount(tl->lines); +- tl->lineMetrics = computeLineMetrics(tl->frame, tl->size); ++ tl->lineMetrics = computeLineMetrics(tl->frame, tl->size, tl->isEmpty); + + // and finally copy the UTF-8/UTF-16 conversion tables + tl->u8tou16 = attrstrCopyUTF8ToUTF16(p->String, &(tl->nUTF8)); +@@ -180,6 +185,9 @@ void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) + backgroundBlock b; + CGAffineTransform textMatrix; + ++ if (tl->isEmpty) ++ return; ++ + CGContextSaveGState(c->c); + // save the text matrix because it's not part of the graphics state + textMatrix = CGContextGetTextMatrix(c->c); +@@ -216,6 +224,8 @@ void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) + void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) + { + *width = tl->size.width; ++ if (tl->isEmpty) ++ *width = 0; + *height = tl->size.height; + } + +@@ -233,6 +243,8 @@ void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start + range = CTLineGetStringRange(lr); + *start = tl->u16tou8[range.location]; + *end = tl->u16tou8[range.location + range.length]; ++ if (tl->isEmpty) ++ *start = *end; + } + + void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m) +@@ -262,14 +274,17 @@ void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *p + *line = i; + + ln = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, i); +- // note: according to the docs, we pass a y of 0 for this since the is the baseline of that line (the point is relative to the line) +- // note: x is relative to the line origin + x -= tl->lineMetrics[*line].X; +- p = CTLineGetStringIndexForPosition(ln, CGPointMake(x, 0)); +- if (p == kCFNotFound) { +- // TODO ++ *pos = 0; ++ if (!tl->isEmpty) { ++ // note: according to the docs, we pass a y of 0 for this since the is the baseline of that line (the point is relative to the line) ++ // note: x is relative to the line origin ++ p = CTLineGetStringIndexForPosition(ln, CGPointMake(x, 0)); ++ if (p == kCFNotFound) { ++ // TODO ++ } ++ *pos = tl->u16tou8[p]; + } +- *pos = tl->u16tou8[p]; + } + + double uiDrawTextLayoutByteLocationInLine(uiDrawTextLayout *tl, size_t pos, int line) +@@ -282,6 +297,9 @@ void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *p + return -1; + lr = (CTLineRef) CFArrayGetValueAtIndex(tl->lines, line); + range = CTLineGetStringRange(lr); ++ // TODO is the behavior of this part correct? ++ if (tl->isEmpty) ++ range.length = 0; + // note: >, not >=, because the position at end is valid! + if (pos < range.location || pos > (range.location + range.length)) + return -1; +diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h +index 0303c32c..d44ee410 100644 +--- a/darwin/uipriv_darwin.h ++++ b/darwin/uipriv_darwin.h +@@ -151,7 +151,7 @@ extern void fontdescFromCTFontDescriptor(CTFontDescriptorRef ctdesc, uiDrawFontD + extern void initUnderlineColors(void); + extern void uninitUnderlineColors(void); + typedef void (^backgroundBlock)(uiDrawContext *c, uiDrawTextLayout *layout, double x, double y); +-extern CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks); ++extern CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, BOOL *isEmpty, NSArray **backgroundBlocks); + + // aat.m + typedef void (^aatBlock)(uint16_t type, uint16_t selector); diff --git a/_wip/attrstr_metrics/unix_OLD__old_drawtext.c b/_wip/attrstr_metrics/unix_OLD__old_drawtext.c new file mode 100644 index 00000000..7677f076 --- /dev/null +++ b/_wip/attrstr_metrics/unix_OLD__old_drawtext.c @@ -0,0 +1,217 @@ +// 6 september 2015 +#include "uipriv_unix.h" +#include "draw.h" + +struct uiDrawFontFamilies { + PangoFontFamily **f; + int n; +}; + +uiDrawFontFamilies *uiDrawListFontFamilies(void) +{ + uiDrawFontFamilies *ff; + PangoFontMap *map; + + ff = uiNew(uiDrawFontFamilies); + map = pango_cairo_font_map_get_default(); + pango_font_map_list_families(map, &(ff->f), &(ff->n)); + // do not free map; it's a shared resource + return ff; +} + +int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) +{ + return ff->n; +} + +char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) +{ + PangoFontFamily *f; + + f = ff->f[n]; + return uiUnixStrdupText(pango_font_family_get_name(f)); +} + +void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) +{ + g_free(ff->f); + uiFree(ff); +} + +struct uiDrawTextFont { + PangoFont *f; +}; + +uiDrawTextFont *mkTextFont(PangoFont *f, gboolean ref) +{ + uiDrawTextFont *font; + + font = uiNew(uiDrawTextFont); + font->f = f; + if (ref) + g_object_ref(font->f); + return font; +} + + + +PangoFont *pangoDescToPangoFont(PangoFontDescription *pdesc) +{ + PangoFont *f; + PangoContext *context; + + // in this case, the context is necessary for the metrics to be correct + context = mkGenericPangoCairoContext(); + f = pango_font_map_load_font(pango_cairo_font_map_get_default(), context, pdesc); + if (f == NULL) { + // LONGTERM + g_error("[libui] no match in pangoDescToPangoFont(); report to andlabs"); + } + g_object_unref(context); + return f; +} + +uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) +{ + PangoFont *f; + PangoFontDescription *pdesc; + + pdesc = pango_font_description_new(); + pango_font_description_set_family(pdesc, + desc->Family); + pango_font_description_set_size(pdesc, + (gint) (desc->Size * PANGO_SCALE)); + pango_font_description_set_weight(pdesc, + pangoWeights[desc->Weight]); + pango_font_description_set_style(pdesc, + pangoItalics[desc->Italic]); + pango_font_description_set_stretch(pdesc, + pangoStretches[desc->Stretch]); + f = pangoDescToPangoFont(pdesc); + pango_font_description_free(pdesc); + return mkTextFont(f, FALSE); // we hold the initial reference; no need to ref +} + +void uiDrawFreeTextFont(uiDrawTextFont *font) +{ + g_object_unref(font->f); + uiFree(font); +} + +uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) +{ + return (uintptr_t) (font->f); +} + +void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) +{ + PangoFontDescription *pdesc; + + // this creates a copy; we free it later + pdesc = pango_font_describe(font->f); + + // TODO + + pango_font_description_free(pdesc); +} + +// See https://developer.gnome.org/pango/1.30/pango-Cairo-Rendering.html#pango-Cairo-Rendering.description +// Note that we convert to double before dividing to make sure the floating-point stuff is right +#define pangoToCairo(pango) (((double) (pango)) / PANGO_SCALE) +#define cairoToPango(cairo) ((gint) ((cairo) * PANGO_SCALE)) + +void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) +{ + PangoFontMetrics *pm; + + pm = pango_font_get_metrics(font->f, NULL); + metrics->Ascent = pangoToCairo(pango_font_metrics_get_ascent(pm)); + metrics->Descent = pangoToCairo(pango_font_metrics_get_descent(pm)); + // Pango doesn't seem to expose this :( Use 0 and hope for the best. + metrics->Leading = 0; + metrics->UnderlinePos = pangoToCairo(pango_font_metrics_get_underline_position(pm)); + metrics->UnderlineThickness = pangoToCairo(pango_font_metrics_get_underline_thickness(pm)); + pango_font_metrics_unref(pm); +} + +// note: PangoCairoLayouts are tied to a given cairo_t, so we can't store one in this device-independent structure +struct uiDrawTextLayout { + char *s; + ptrdiff_t *graphemes; + PangoFont *defaultFont; + double width; + PangoAttrList *attrs; +}; + +uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width) +{ + uiDrawTextLayout *layout; + PangoContext *context; + + layout = uiNew(uiDrawTextLayout); + layout->s = g_strdup(text); + context = mkGenericPangoCairoContext(); + layout->graphemes = graphemes(layout->s, context); + g_object_unref(context); + layout->defaultFont = defaultFont->f; + g_object_ref(layout->defaultFont); // retain a copy + uiDrawTextLayoutSetWidth(layout, width); + layout->attrs = pango_attr_list_new(); + return layout; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *layout) +{ + pango_attr_list_unref(layout->attrs); + g_object_unref(layout->defaultFont); + uiFree(layout->graphemes); + g_free(layout->s); + uiFree(layout); +} + +void uiDrawTextLayoutSetWidth(uiDrawTextLayout *layout, double width) +{ + layout->width = width; +} + +static void prepareLayout(uiDrawTextLayout *layout, PangoLayout *pl) +{ + // again, this makes a copy + desc = pango_font_describe(layout->defaultFont); + + pango_layout_set_attributes(pl, layout->attrs); +} + +void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout) +{ + PangoLayout *pl; + + pl = pango_cairo_create_layout(c->cr); +} + +static void addAttr(uiDrawTextLayout *layout, PangoAttribute *attr, int startChar, int endChar) +{ + attr->start_index = layout->graphemes[startChar]; + attr->end_index = layout->graphemes[endChar]; + pango_attr_list_insert(layout->attrs, attr); + // pango_attr_list_insert() takes attr; we don't free it +} + +void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) +{ + PangoAttribute *attr; + guint16 rr, gg, bb, aa; + + rr = (guint16) (r * 65535); + gg = (guint16) (g * 65535); + bb = (guint16) (b * 65535); + aa = (guint16) (a * 65535); + + attr = pango_attr_foreground_new(rr, gg, bb); + addAttr(layout, attr, startChar, endChar); + + // TODO what if aa == 0? + attr = FUTURE_pango_attr_foreground_alpha_new(aa); + if (attr != NULL) + addAttr(layout, attr, startChar, endChar); +} diff --git a/_wip/attrstr_metrics/unix_OLD_drawtext.c b/_wip/attrstr_metrics/unix_OLD_drawtext.c new file mode 100644 index 00000000..dbd2d709 --- /dev/null +++ b/_wip/attrstr_metrics/unix_OLD_drawtext.c @@ -0,0 +1,227 @@ +// 17 january 2017 +#include "uipriv_unix.h" +#include "draw.h" + +// TODO +// - if the RTL override is at the beginning of a line, the preceding space is included? +// - nLines == 0: mostly works, except the width is wrong if the paragraph alignment is center or right... +// - TODO check whitespace and line bounds + +struct uiDrawTextLayout { + PangoLayout *layout; + GPtrArray *backgroundClosures; + uiDrawTextLayoutLineMetrics *lineMetrics; + // TODO change everything to use this + int nLines; +}; + +// TODO neither these nor the overall extents seem to include trailing whitespace... we need to figure that out too +static void computeLineMetrics(uiDrawTextLayout *tl) +{ + PangoLayoutIter *iter; + PangoLayoutLine *pll; + PangoRectangle lineStartPos, lineExtents; + int i, n; + uiDrawTextLayoutLineMetrics *m; + + n = tl->nLines; // TODO remove this variable + tl->lineMetrics = (uiDrawTextLayoutLineMetrics *) uiAlloc(n * sizeof (uiDrawTextLayoutLineMetrics), "uiDrawTextLayoutLineMetrics[] (text layout)"); + iter = pango_layout_get_iter(tl->layout); + + m = tl->lineMetrics; + for (i = 0; i < n; i++) { + int baselineY; + + // TODO we use this instead of _get_yrange() because of the block of text in that function's description about how line spacing is distributed in Pango; we have to worry about this when we start adding line spacing... + baselineY = pango_layout_iter_get_baseline(iter); + pll = pango_layout_iter_get_line_readonly(iter); + pango_layout_index_to_pos(tl->layout, pll->start_index, &lineStartPos); + pango_layout_line_get_extents(pll, NULL, &lineExtents); + // TODO unref pll? + + // TODO is this correct for RTL glyphs? + m->X = pangoToCairo(lineStartPos.x); + // TODO fix the whole combined not being updated shenanigans in the static build (here because ugh) + m->Y = pangoToCairo(baselineY - PANGO_ASCENT(lineExtents)); + // TODO this does not include the last space if any + m->Width = pangoToCairo(lineExtents.width); + m->Height = pangoToCairo(lineExtents.height); + + m->BaselineY = pangoToCairo(baselineY); + m->Ascent = pangoToCairo(PANGO_ASCENT(lineExtents)); + m->Descent = pangoToCairo(PANGO_DESCENT(lineExtents)); + m->Leading = 0; // TODO + + m->ParagraphSpacingBefore = 0; // TODO + m->LineHeightSpace = 0; // TODO + m->LineSpacing = 0; // TODO + m->ParagraphSpacing = 0; // TODO + + // don't worry about the return value; we're not using this after the last line + pango_layout_iter_next_line(iter); + m++; + } + + pango_layout_iter_free(iter); +} + +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) +{ + uiDrawTextLayout *tl; + PangoContext *context; + PangoFontDescription *desc; + PangoAttrList *attrs; + int pangoWidth; + + tl = uiNew(uiDrawTextLayout); + + // in this case, the context is necessary to create the layout + // the layout takes a ref on the context so we can unref it afterward + context = mkGenericPangoCairoContext(); + tl->layout = pango_layout_new(context); + g_object_unref(context); + + // this is safe; pango_layout_set_text() copies the string + pango_layout_set_text(tl->layout, uiAttributedStringString(p->String), -1); + + desc = pango_font_description_new(); + pango_font_description_set_family(desc, p->DefaultFont->Family); + pango_font_description_set_style(desc, pangoItalics[p->DefaultFont->Italic]); + // for the most part, pango weights correlate to ours + // the differences: + // - Book — libui: 350, Pango: 380 + // - Ultra Heavy — libui: 950, Pango: 1000 + // TODO figure out what to do about this misalignment + pango_font_description_set_weight(desc, p->DefaultFont->Weight); + pango_font_description_set_stretch(desc, pangoStretches[p->DefaultFont->Stretch]); + // see https://developer.gnome.org/pango/1.30/pango-Fonts.html#pango-font-description-set-size and https://developer.gnome.org/pango/1.30/pango-Glyph-Storage.html#pango-units-from-double + pango_font_description_set_size(desc, pango_units_from_double(p->DefaultFont->Size)); + pango_layout_set_font_description(tl->layout, desc); + // this is safe; the description is copied + pango_font_description_free(desc); + + pangoWidth = cairoToPango(p->Width); + if (p->Width < 0) + pangoWidth = -1; + pango_layout_set_width(tl->layout, pangoWidth); + + pango_layout_set_alignment(tl->layout, pangoAligns[p->Align]); + + attrs = attrstrToPangoAttrList(p, &(tl->backgroundClosures)); + pango_layout_set_attributes(tl->layout, attrs); + pango_attr_list_unref(attrs); + + tl->nLines = pango_layout_get_line_count(tl->layout); + computeLineMetrics(tl); + + return tl; +} + +void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m) +{ + *m = tl->lineMetrics[line]; +} + +// TODO +#if 0 +{ + PangoLayoutLine *pll; + + pll = pango_layout_get_line_readonly(tl->layout, line); + // TODO unref? +} +#endif + +// note: Pango will not let us place the cursor at the end of a line the same way other OSs do; see https://git.gnome.org/browse/pango/tree/pango/pango-layout.c?id=f4cbd27f4e5bf8490ea411190d41813e14f12165#n4204 +// ideally there'd be a way to say "I don't need this hack; I'm well behaved" but GTK+ 2 and 3 AND Qt 4 and 5 all behave like this, with the behavior seeming to date back to TkTextView, so... +void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line) +{ + int p, trailing; + int i; + + // this is layout-global, so it takes line origins into account + pango_layout_xy_to_index(tl->layout, + cairoToPango(x), cairoToPango(y), + &p, &trailing); + // on a trailing hit, align to the nearest cluster + // fortunately Pango provides that info directly + if (trailing != 0) + p += trailing; + *pos = p; + + for (i = 0; i < tl->nLines; i++) { + double ltop, lbottom; + + ltop = tl->lineMetrics[i].Y; + lbottom = ltop + tl->lineMetrics[i].Height; + // y will already >= ltop at this point since the past lbottom should == ltop + if (y < lbottom) + break; + } + if (i == pango_layout_get_line_count(tl->layout)) + i--; + *line = i; +} + +double uiDrawTextLayoutByteLocationInLine(uiDrawTextLayout *tl, size_t pos, int line) +{ + PangoLayoutLine *pll; + gboolean trailing; + int pangox; + + if (line < 0 || line >= tl->nLines) + return -1; + pll = pango_layout_get_line_readonly(tl->layout, line); + // note: >, not >=, because the position at end is valid! + if (pos < pll->start_index || pos > (pll->start_index + pll->length)) + return -1; + // this behavior seems correct + // there's also PadWrite's TextEditor::GetCaretRect() but that requires state... + // TODO where does this fail? + // TODO optimize everything to avoid calling strlen() + trailing = 0; + if (pos != 0 && pos != strlen(pango_layout_get_text(tl->layout)) && pos == (pll->start_index + pll->length)) { + pos--; + trailing = 1; + } + pango_layout_line_index_to_x(pll, pos, trailing, &pangox); + // TODO unref pll? + // this is relative to the beginning of the line + return pangoToCairo(pangox) + tl->lineMetrics[line].X; +} + +// note: we can't use gtk_render_insertion_cursor() because that doesn't take information about what line to render on +// we'll just recreate what it does +void caretDrawParams(uiDrawContext *c, double height, struct caretDrawParams *p) +{ + GdkColor *color; + GdkRGBA rgba; + gfloat aspectRatio; + gint width, xoff; + + gtk_style_context_get_style(c->style, + "cursor-color", &color, + "cursor-aspect-ratio", &aspectRatio, + NULL); + if (color != NULL) { + p->r = ((double) (color->red)) / 65535.0; + p->g = ((double) (color->green)) / 65535.0; + p->b = ((double) (color->blue)) / 65535.0; + p->a = 1.0; + gdk_color_free(color); + } else { + gtk_style_context_get_color(c->style, GTK_STATE_FLAG_NORMAL, &rgba); + p->r = rgba.red; + p->g = rgba.green; + p->b = rgba.blue; + p->a = rgba.alpha; + } + + // GTK+ itself uses integer arithmetic here; let's do the same + width = height * aspectRatio + 1; + // TODO this is for LTR + xoff = width / 2; + + p->xoff = xoff; + p->width = width; +} diff --git a/_wip/attrstr_metrics/windows_OLD__old_drawtext.cpp b/_wip/attrstr_metrics/windows_OLD__old_drawtext.cpp new file mode 100644 index 00000000..dec0478d --- /dev/null +++ b/_wip/attrstr_metrics/windows_OLD__old_drawtext.cpp @@ -0,0 +1,311 @@ +// 22 december 2015 +#include "uipriv_windows.hpp" +#include "draw.hpp" +// TODO really migrate + +// notes: +// only available in windows 8 and newer: +// - character spacing +// - kerning control +// - justficiation (how could I possibly be making this up?!) +// - vertical text (SERIOUSLY?! WHAT THE ACTUAL FUCK, MICROSOFT?!?!?!? DID YOU NOT THINK ABOUT THIS THE FIRST TIME, TRYING TO IMPROVE THE INTERNATIONALIZATION OF WINDOWS 7?!?!?! bonus: some parts of MSDN even say 8.1 and up only!) + +struct uiDrawFontFamilies { + fontCollection *fc; +}; + +uiDrawFontFamilies *uiDrawListFontFamilies(void) +{ + struct uiDrawFontFamilies *ff; + + ff = uiNew(struct uiDrawFontFamilies); + ff->fc = loadFontCollection(); + return ff; +} + +int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) +{ + return ff->fc->fonts->GetFontFamilyCount(); +} + +char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) +{ + IDWriteFontFamily *family; + WCHAR *wname; + char *name; + HRESULT hr; + + hr = ff->fc->fonts->GetFontFamily(n, &family); + if (hr != S_OK) + logHRESULT(L"error getting font out of collection", hr); + wname = fontCollectionFamilyName(ff->fc, family); + name = toUTF8(wname); + uiFree(wname); + family->Release(); + return name; +} + +void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) +{ + fontCollectionFree(ff->fc); + uiFree(ff); +} + +struct uiDrawTextFont { + IDWriteFont *f; + WCHAR *family; // save for convenience in uiDrawNewTextLayout() + double size; +}; + +uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size) +{ + uiDrawTextFont *font; + WCHAR *copy; + HRESULT hr; + + font = uiNew(uiDrawTextFont); + font->f = df; + if (addRef) + font->f->AddRef(); + if (copyFamily) { + copy = (WCHAR *) uiAlloc((wcslen(family) + 1) * sizeof (WCHAR), "WCHAR[]"); + wcscpy(copy, family); + font->family = copy; + } else + font->family = family; + font->size = size; + return font; +} + +// TODO MinGW-w64 is missing this one +#define DWRITE_FONT_WEIGHT_SEMI_LIGHT (DWRITE_FONT_WEIGHT(350)) + +uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) +{ + uiDrawTextFont *font; + IDWriteFontCollection *collection; + UINT32 index; + BOOL exists; + struct dwriteAttr attr; + IDWriteFontFamily *family; + WCHAR *wfamily; + IDWriteFont *match; + HRESULT hr; + + // always get the latest available font information + hr = dwfactory->GetSystemFontCollection(&collection, TRUE); + if (hr != S_OK) + logHRESULT(L"error getting system font collection", hr); + + wfamily = toUTF16(desc->Family); + hr = collection->FindFamilyName(wfamily, &index, &exists); + if (hr != S_OK) + logHRESULT(L"error finding font family", hr); + if (!exists) + implbug("LONGTERM family not found in uiDrawLoadClosestFont()", hr); + hr = collection->GetFontFamily(index, &family); + if (hr != S_OK) + logHRESULT(L"error loading font family", hr); + + attr.weight = desc->Weight; + attr.italic = desc->Italic; + attr.stretch = desc->Stretch; + attrToDWriteAttr(&attr); + hr = family->GetFirstMatchingFont( + attr.dweight, + attr.dstretch, + attr.ditalic, + &match); + if (hr != S_OK) + logHRESULT(L"error loading font", hr); + + font = mkTextFont(match, + FALSE, // we own the initial reference; no need to add another one + wfamily, FALSE, // will be freed with font + desc->Size); + + family->Release(); + collection->Release(); + + return font; +} + +void uiDrawFreeTextFont(uiDrawTextFont *font) +{ + font->f->Release(); + uiFree(font->family); + uiFree(font); +} + +uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) +{ + return (uintptr_t) (font->f); +} + +void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) +{ + // TODO + + desc->Size = font->size; + + // TODO +} + +// text sizes are 1/72 of an inch +// points in Direct2D are 1/96 of an inch (https://msdn.microsoft.com/en-us/library/windows/desktop/ff684173%28v=vs.85%29.aspx, https://msdn.microsoft.com/en-us/library/windows/desktop/hh447022%28v=vs.85%29.aspx) +// As for the actual conversion from design units, see: +// - http://cboard.cprogramming.com/windows-programming/136733-directwrite-font-height-issues.html +// - https://sourceforge.net/p/vstgui/mailman/message/32483143/ +// - http://xboxforums.create.msdn.com/forums/t/109445.aspx +// - https://msdn.microsoft.com/en-us/library/dd183564%28v=vs.85%29.aspx +// - http://www.fontbureau.com/blog/the-em/ +// TODO make points here about how DIPs in DirectWrite == DIPs in Direct2D; if not, figure out what they really are? for the width and layout functions later +static double scaleUnits(double what, double designUnitsPerEm, double size) +{ + return (what / designUnitsPerEm) * (size * (96.0 / 72.0)); +} + +void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) +{ + DWRITE_FONT_METRICS dm; + + font->f->GetMetrics(&dm); + metrics->Ascent = scaleUnits(dm.ascent, dm.designUnitsPerEm, font->size); + metrics->Descent = scaleUnits(dm.descent, dm.designUnitsPerEm, font->size); + // TODO what happens if dm.xxx is negative? + // TODO remember what this was for + metrics->Leading = scaleUnits(dm.lineGap, dm.designUnitsPerEm, font->size); + metrics->UnderlinePos = scaleUnits(dm.underlinePosition, dm.designUnitsPerEm, font->size); + metrics->UnderlineThickness = scaleUnits(dm.underlineThickness, dm.designUnitsPerEm, font->size); +} + +// some attributes, such as foreground color, can't be applied until after we establish a Direct2D context :/ so we have to prepare all attributes in advance +// also since there's no way to clear the attributes from a layout en masse (apart from overwriting them all), we'll play it safe by creating a new layout each time +enum layoutAttrType { + layoutAttrColor, +}; + +struct layoutAttr { + enum layoutAttrType type; + int start; + int end; + double components[4]; +}; + +struct uiDrawTextLayout { + WCHAR *text; + size_t textlen; + size_t *graphemes; + double width; + IDWriteTextFormat *format; + std::vector *attrs; +}; + +uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width) +{ + uiDrawTextLayout *layout; + HRESULT hr; + + layout = uiNew(uiDrawTextLayout); + + hr = dwfactory->CreateTextFormat(defaultFont->family, + NULL, + defaultFont->f->GetWeight(), + defaultFont->f->GetStyle(), + defaultFont->f->GetStretch(), + + if (hr != S_OK) + logHRESULT(L"error creating IDWriteTextFormat", hr); + + layout->text = toUTF16(text); + layout->textlen = wcslen(layout->text); + layout->graphemes = graphemes(layout->text); + + uiDrawTextLayoutSetWidth(layout, width); + + layout->attrs = new std::vector; + + return layout; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *layout) +{ + delete layout->attrs; + layout->format->Release(); + uiFree(layout->graphemes); + uiFree(layout->text); + uiFree(layout); +} + + +IDWriteTextLayout *prepareLayout(uiDrawTextLayout *layout, ID2D1RenderTarget *rt) +{ + IDWriteTextLayout *dl; + DWRITE_TEXT_RANGE range; + IUnknown *unkBrush; + HRESULT hr; + + for (const struct layoutAttr &attr : *(layout->attrs)) { + range.startPosition = layout->graphemes[attr.start]; + range.length = layout->graphemes[attr.end] - layout->graphemes[attr.start]; + switch (attr.type) { + case layoutAttrColor: + if (rt == NULL) // determining extents, not drawing + break; + unkBrush = mkSolidBrush(rt, + attr.components[0], + attr.components[1], + attr.components[2], + attr.components[3]); + hr = dl->SetDrawingEffect(unkBrush, range); + unkBrush->Release(); // associated with dl + break; + default: + hr = E_FAIL; + logHRESULT(L"invalid text attribute type", hr); + } + if (hr != S_OK) + logHRESULT(L"error adding attribute to text layout", hr); + } + + + + return dl; +} + + +void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout) +{ + IDWriteTextLayout *dl; + D2D1_POINT_2F pt; + ID2D1Brush *black; + HRESULT hr; + + // TODO document that fully opaque black is the default text color; figure out whether this is upheld in various scenarios on other platforms + black = mkSolidBrush(c->rt, 0.0, 0.0, 0.0, 1.0); + + dl = prepareLayout(layout, c->rt); + pt.x = x; + pt.y = y; + // TODO D2D1_DRAW_TEXT_OPTIONS_NO_SNAP? + // TODO D2D1_DRAW_TEXT_OPTIONS_CLIP? + // TODO when setting 8.1 as minimum, D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT? + c->rt->DrawTextLayout(pt, dl, black, D2D1_DRAW_TEXT_OPTIONS_NONE); + dl->Release(); + + black->Release(); +} + +void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) +{ + struct layoutAttr attr; + + attr.type = layoutAttrColor; + attr.start = startChar; + attr.end = endChar; + attr.components[0] = r; + attr.components[1] = g; + attr.components[2] = b; + attr.components[3] = a; + layout->attrs->push_back(attr); +} diff --git a/_wip/attrstr_metrics/windows_OLD_drawtext.cpp b/_wip/attrstr_metrics/windows_OLD_drawtext.cpp new file mode 100644 index 00000000..201d3a1d --- /dev/null +++ b/_wip/attrstr_metrics/windows_OLD_drawtext.cpp @@ -0,0 +1,667 @@ +// 17 january 2017 +#include "uipriv_windows.hpp" +#include "draw.hpp" + +// TODO +// - consider the warnings about antialiasing in the PadWrite sample +// - if that's not a problem, do we have overlapping rects in the hittest sample? I can't tell... +// - empty string: nLines == 1 and all checks out except extents has x == 0 when not left aligned +// - paragraph alignment is subject to RTL mirroring; see if it is on other platforms +// - add overhang info to metrics? + +// TODO verify our renderer is correct, especially with regards to snapping + +struct uiDrawTextLayout { + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + std::vector *backgroundFuncs; + UINT32 nLines; + struct lineInfo *lineInfo; + // for converting DirectWrite indices from/to byte offsets + size_t *u8tou16; + size_t nUTF8; + size_t *u16tou8; + size_t nUTF16; +}; + +// TODO copy notes about DirectWrite DIPs being equal to Direct2D DIPs here + +// typographic points are 1/72 inch; this parameter is 1/96 inch +// fortunately Microsoft does this too, in https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554%28v=vs.85%29.aspx +#define pointSizeToDWriteSize(size) (size * (96.0 / 72.0)) + +struct lineInfo { + size_t startPos; // in UTF-16 points + size_t endPos; + size_t newlineCount; + double x; + double y; + double width; + double height; + double baseline; +}; + +// this function is deeply indebted to the PadWrite sample: https://github.com/Microsoft/Windows-classic-samples/blob/master/Samples/Win7Samples/multimedia/DirectWrite/PadWrite/TextEditor.cpp +static void computeLineInfo(uiDrawTextLayout *tl) +{ + DWRITE_LINE_METRICS *dlm; + size_t nextStart; + UINT32 i, j; + DWRITE_HIT_TEST_METRICS *htm; + UINT32 nFragments, unused; + HRESULT hr; + + // TODO make sure this is legal; if not, switch to GetMetrics() and use its line count field instead + hr = tl->layout->GetLineMetrics(NULL, 0, &(tl->nLines)); + // ugh, HRESULT_TO_WIN32() is an inline function and is not constexpr so we can't use switch here + if (hr == S_OK) { + // TODO what do we do here + } else if (hr != E_NOT_SUFFICIENT_BUFFER) + logHRESULT(L"error getting number of lines in IDWriteTextLayout", hr); + tl->lineInfo = (struct lineInfo *) uiAlloc(tl->nLines * sizeof (struct lineInfo), "struct lineInfo[] (text layout)"); + + dlm = new DWRITE_LINE_METRICS[tl->nLines]; + // we can't pass NULL here; it outright crashes if we do + // TODO verify the numbers haven't changed + hr = tl->layout->GetLineMetrics(dlm, tl->nLines, &unused); + if (hr != S_OK) + logHRESULT(L"error getting IDWriteTextLayout line metrics", hr); + + // assume the first line starts at position 0 and the string flow is incremental + nextStart = 0; + for (i = 0; i < tl->nLines; i++) { + tl->lineInfo[i].startPos = nextStart; + tl->lineInfo[i].endPos = nextStart + dlm[i].length; + tl->lineInfo[i].newlineCount = dlm[i].newlineLength; + nextStart = tl->lineInfo[i].endPos; + + // a line can have multiple fragments; for example, if there's a bidirectional override in the middle of a line + hr = tl->layout->HitTestTextRange(tl->lineInfo[i].startPos, (tl->lineInfo[i].endPos - tl->lineInfo[i].newlineCount) - tl->lineInfo[i].startPos, + 0, 0, + NULL, 0, &nFragments); + if (hr != S_OK && hr != E_NOT_SUFFICIENT_BUFFER) + logHRESULT(L"error getting IDWriteTextLayout line fragment count", hr); + htm = new DWRITE_HIT_TEST_METRICS[nFragments]; + // TODO verify unused == nFragments? + hr = tl->layout->HitTestTextRange(tl->lineInfo[i].startPos, (tl->lineInfo[i].endPos - tl->lineInfo[i].newlineCount) - tl->lineInfo[i].startPos, + 0, 0, + htm, nFragments, &unused); + // TODO can this return E_NOT_SUFFICIENT_BUFFER again? + if (hr != S_OK) + logHRESULT(L"error getting IDWriteTextLayout line fragment metrics", hr); + // TODO verify htm.textPosition and htm.length against dtm[i]/tl->lineInfo[i]? + tl->lineInfo[i].x = htm[0].left; + tl->lineInfo[i].y = htm[0].top; + // TODO does this not include trailing whitespace? I forget + tl->lineInfo[i].width = htm[0].width; + tl->lineInfo[i].height = htm[0].height; + for (j = 1; j < nFragments; j++) { + // this is correct even if the leftmost fragment on the line is RTL + if (tl->lineInfo[i].x > htm[j].left) + tl->lineInfo[i].x = htm[j].left; + tl->lineInfo[i].width += htm[j].width; + // TODO verify y and height haven't changed? + } + // TODO verify dlm[i].height == htm.height? + delete[] htm; + + // TODO on Windows 8.1 and/or 10 we can use DWRITE_LINE_METRICS1 to get specific info about the ascent and descent; do we have an alternative? + // TODO and even on those platforms can we somehow split tyographic leading from spacing? + // TODO and on that note, can we have both line spacing proportionally above and uniformly below? + tl->lineInfo[i].baseline = dlm[i].baseline; + } + + delete[] dlm; +} + +// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before) +static std::map dwriteAligns = { + { uiDrawTextAlignLeft, DWRITE_TEXT_ALIGNMENT_LEADING }, + { uiDrawTextAlignCenter, DWRITE_TEXT_ALIGNMENT_CENTER }, + { uiDrawTextAlignRight, DWRITE_TEXT_ALIGNMENT_TRAILING }, +}; + +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) +{ + uiDrawTextLayout *tl; + WCHAR *wDefaultFamily; + DWRITE_WORD_WRAPPING wrap; + FLOAT maxWidth; + HRESULT hr; + + tl = uiNew(uiDrawTextLayout); + + wDefaultFamily = toUTF16(p->DefaultFont->Family); + hr = dwfactory->CreateTextFormat( + wDefaultFamily, NULL, + uiprivWeightToDWriteWeight(p->DefaultFont->Weight), + uiprivItalicToDWriteStyle(p->DefaultFont->Italic), + uiprivStretchToDWriteStretch(p->DefaultFont->Stretch), + pointSizeToDWriteSize(p->DefaultFont->Size), + // see http://stackoverflow.com/questions/28397971/idwritefactorycreatetextformat-failing and https://msdn.microsoft.com/en-us/library/windows/desktop/dd368203.aspx + // TODO use the current locale? + L"", + &(tl->format)); + if (hr != S_OK) + logHRESULT(L"error creating IDWriteTextFormat", hr); + hr = tl->format->SetTextAlignment(dwriteAligns[p->Align]); + if (hr != S_OK) + logHRESULT(L"error applying text layout alignment", hr); + + hr = dwfactory->CreateTextLayout( + (const WCHAR *) attrstrUTF16(p->String), attrstrUTF16Len(p->String), + tl->format, + // FLOAT is float, not double, so this should work... TODO + FLT_MAX, FLT_MAX, + &(tl->layout)); + if (hr != S_OK) + logHRESULT(L"error creating IDWriteTextLayout", hr); + + // and set the width + // this is the only wrapping mode (apart from "no wrap") available prior to Windows 8.1 (TODO verify this fact) (TODO this should be the default anyway) + wrap = DWRITE_WORD_WRAPPING_WRAP; + maxWidth = (FLOAT) (p->Width); + if (p->Width < 0) { + // TODO is this wrapping juggling even necessary? + wrap = DWRITE_WORD_WRAPPING_NO_WRAP; + // setting the max width in this case technically isn't needed since the wrap mode will simply ignore the max width, but let's do it just to be safe + maxWidth = FLT_MAX; // see TODO above + } + hr = tl->layout->SetWordWrapping(wrap); + if (hr != S_OK) + logHRESULT(L"error setting IDWriteTextLayout word wrapping mode", hr); + hr = tl->layout->SetMaxWidth(maxWidth); + if (hr != S_OK) + logHRESULT(L"error setting IDWriteTextLayout max layout width", hr); + + attrstrToIDWriteTextLayoutAttrs(p, tl->layout, &(tl->backgroundFuncs)); + + computeLineInfo(tl); + + // and finally copy the UTF-8/UTF-16 index conversion tables + tl->u8tou16 = attrstrCopyUTF8ToUTF16(p->String, &(tl->nUTF8)); + tl->u16tou8 = attrstrCopyUTF16ToUTF8(p->String, &(tl->nUTF16)); + + // TODO can/should this be moved elsewhere? + uiFree(wDefaultFamily); + return tl; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) +{ + uiFree(tl->u16tou8); + uiFree(tl->u8tou16); + uiFree(tl->lineInfo); + delete tl->backgroundFuncs; + tl->layout->Release(); + tl->format->Release(); + uiFree(tl); +} + +static HRESULT mkSolidBrush(ID2D1RenderTarget *rt, double r, double g, double b, double a, ID2D1SolidColorBrush **brush) +{ + D2D1_BRUSH_PROPERTIES props; + D2D1_COLOR_F color; + + ZeroMemory(&props, sizeof (D2D1_BRUSH_PROPERTIES)); + props.opacity = 1.0; + // identity matrix + props.transform._11 = 1; + props.transform._22 = 1; + color.r = r; + color.g = g; + color.b = b; + color.a = a; + return rt->CreateSolidColorBrush( + &color, + &props, + brush); +} + +static ID2D1SolidColorBrush *mustMakeSolidBrush(ID2D1RenderTarget *rt, double r, double g, double b, double a) +{ + ID2D1SolidColorBrush *brush; + HRESULT hr; + + hr = mkSolidBrush(rt, r, g, b, a, &brush); + if (hr != S_OK) + logHRESULT(L"error creating solid brush", hr); + return brush; +} + +// some of the stuff we want to do isn't possible with what DirectWrite provides itself; we need to do it ourselves +// this is based on http://www.charlespetzold.com/blog/2014/01/Character-Formatting-Extensions-with-DirectWrite.html +class textRenderer : public IDWriteTextRenderer { + ULONG refcount; + ID2D1RenderTarget *rt; + BOOL snap; + ID2D1SolidColorBrush *black; +public: + textRenderer(ID2D1RenderTarget *rt, BOOL snap, ID2D1SolidColorBrush *black) + { + this->refcount = 1; + this->rt = rt; + this->snap = snap; + this->black = black; + } + + // IUnknown + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) + { + if (ppvObject == NULL) + return E_POINTER; + if (riid == IID_IUnknown || + riid == __uuidof (IDWritePixelSnapping) || + riid == __uuidof (IDWriteTextRenderer)) { + this->AddRef(); + *ppvObject = this; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; + } + + virtual ULONG STDMETHODCALLTYPE AddRef(void) + { + this->refcount++; + return this->refcount; + } + + virtual ULONG STDMETHODCALLTYPE Release(void) + { + this->refcount--; + if (this->refcount == 0) { + delete this; + return 0; + } + return this->refcount; + } + + // IDWritePixelSnapping + virtual HRESULT STDMETHODCALLTYPE GetCurrentTransform(void *clientDrawingContext, DWRITE_MATRIX *transform) + { + D2D1_MATRIX_3X2_F d2dtf; + + if (transform == NULL) + return E_POINTER; + this->rt->GetTransform(&d2dtf); + transform->m11 = d2dtf._11; + transform->m12 = d2dtf._12; + transform->m21 = d2dtf._21; + transform->m22 = d2dtf._22; + transform->dx = d2dtf._31; + transform->dy = d2dtf._32; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetPixelsPerDip(void *clientDrawingContext, FLOAT *pixelsPerDip) + { + FLOAT dpix, dpiy; + + if (pixelsPerDip == NULL) + return E_POINTER; + this->rt->GetDpi(&dpix, &dpiy); + *pixelsPerDip = dpix / 96; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE IsPixelSnappingDisabled(void *clientDrawingContext, BOOL *isDisabled) + { + if (isDisabled == NULL) + return E_POINTER; + *isDisabled = !this->snap; + return S_OK; + } + + // IDWriteTextRenderer + virtual HRESULT STDMETHODCALLTYPE DrawGlyphRun(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuringMode, const DWRITE_GLYPH_RUN *glyphRun, const DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription, IUnknown *clientDrawingEffect) + { + D2D1_POINT_2F baseline; + textDrawingEffect *t = (textDrawingEffect *) clientDrawingEffect; + ID2D1SolidColorBrush *brush; + + baseline.x = baselineOriginX; + baseline.y = baselineOriginY; + brush = this->black; + if (t != NULL && t->hasColor) { + HRESULT hr; + + hr = mkSolidBrush(this->rt, t->r, t->g, t->b, t->a, &brush); + if (hr != S_OK) + return hr; + } + this->rt->DrawGlyphRun( + baseline, + glyphRun, + brush, + measuringMode); + if (t != NULL && t->hasColor) + brush->Release(); + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE DrawInlineObject(void *clientDrawingContext, FLOAT originX, FLOAT originY, IDWriteInlineObject *inlineObject, BOOL isSideways, BOOL isRightToLeft, IUnknown *clientDrawingEffect) + { + if (inlineObject == NULL) + return E_POINTER; + return inlineObject->Draw(clientDrawingContext, this, + originX, originY, + isSideways, isRightToLeft, + clientDrawingEffect); + } + + virtual HRESULT STDMETHODCALLTYPE DrawStrikethrough(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *clientDrawingEffect) + { + // we don't support strikethrough + return E_UNEXPECTED; + } + + virtual HRESULT STDMETHODCALLTYPE DrawUnderline(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, const DWRITE_UNDERLINE *underline, IUnknown *clientDrawingEffect) + { + textDrawingEffect *t = (textDrawingEffect *) clientDrawingEffect; + ID2D1SolidColorBrush *brush; + D2D1_RECT_F rect; + D2D1::Matrix3x2F pixeltf; + FLOAT dpix, dpiy; + D2D1_POINT_2F pt; + + if (underline == NULL) + return E_POINTER; + if (t == NULL) // we can only get here through an underline + return E_UNEXPECTED; + brush = this->black; + if (t->hasUnderlineColor) { + HRESULT hr; + + hr = mkSolidBrush(this->rt, t->ur, t->ug, t->ub, t->ua, &brush); + if (hr != S_OK) + return hr; + } else if (t->hasColor) { + // TODO formalize this rule + HRESULT hr; + + hr = mkSolidBrush(this->rt, t->r, t->g, t->b, t->a, &brush); + if (hr != S_OK) + return hr; + } + rect.left = baselineOriginX; + rect.top = baselineOriginY + underline->offset; + rect.right = rect.left + underline->width; + rect.bottom = rect.top + underline->thickness; + switch (t->u) { + case uiDrawUnderlineStyleSingle: + this->rt->FillRectangle(&rect, brush); + break; + case uiDrawUnderlineStyleDouble: + // TODO do any of the matrix methods return errors? + // TODO standardize double-underline shape across platforms? wavy underline shape? + this->rt->GetTransform(&pixeltf); + this->rt->GetDpi(&dpix, &dpiy); + pixeltf = pixeltf * D2D1::Matrix3x2F::Scale(dpix / 96, dpiy / 96); + pt.x = 0; + pt.y = rect.top; + pt = pixeltf.TransformPoint(pt); + rect.top = (FLOAT) ((int) (pt.y + 0.5)); + pixeltf.Invert(); + pt = pixeltf.TransformPoint(pt); + rect.top = pt.y; + // first line + rect.top -= underline->thickness; + // and it seems we need to recompute this + rect.bottom = rect.top + underline->thickness; + this->rt->FillRectangle(&rect, brush); + // second line + rect.top += 2 * underline->thickness; + rect.bottom = rect.top + underline->thickness; + this->rt->FillRectangle(&rect, brush); + break; + case uiDrawUnderlineStyleSuggestion: + { // TODO get rid of the extra block + // TODO properly clean resources on failure + // TODO use fully qualified C overloads for all methods + // TODO ensure all methods properly have errors handled + ID2D1PathGeometry *path; + ID2D1GeometrySink *sink; + double amplitude, period, xOffset, yOffset; + double t; + bool first = true; + HRESULT hr; + + hr = d2dfactory->CreatePathGeometry(&path); + if (hr != S_OK) + return hr; + hr = path->Open(&sink); + if (hr != S_OK) + return hr; + amplitude = underline->thickness; + period = 5 * underline->thickness; + xOffset = baselineOriginX; + yOffset = baselineOriginY + underline->offset; + for (t = 0; t < underline->width; t++) { + double x, angle, y; + D2D1_POINT_2F pt; + + x = t + xOffset; + angle = 2 * uiPi * fmod(x, period) / period; + y = amplitude * sin(angle) + yOffset; + pt.x = x; + pt.y = y; + if (first) { + sink->BeginFigure(pt, D2D1_FIGURE_BEGIN_HOLLOW); + first = false; + } else + sink->AddLine(pt); + } + sink->EndFigure(D2D1_FIGURE_END_OPEN); + hr = sink->Close(); + if (hr != S_OK) + return hr; + sink->Release(); + this->rt->DrawGeometry(path, brush, underline->thickness); + path->Release(); + } + break; + } + if (t->hasUnderlineColor || t->hasColor) + brush->Release(); + return S_OK; + } +}; + +// TODO this ignores clipping? +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) +{ + D2D1_POINT_2F pt; + ID2D1SolidColorBrush *black; + textRenderer *renderer; + HRESULT hr; + + for (const auto &f : *(tl->backgroundFuncs)) + f(c, tl, x, y); + + // TODO document that fully opaque black is the default text color; figure out whether this is upheld in various scenarios on other platforms + // TODO figure out if this needs to be cleaned out + black = mustMakeSolidBrush(c->rt, 0.0, 0.0, 0.0, 1.0); + +#define renderD2D 0 +#define renderOur 1 +#if renderD2D + pt.x = x; + pt.y = y; + // TODO D2D1_DRAW_TEXT_OPTIONS_NO_SNAP? + // TODO D2D1_DRAW_TEXT_OPTIONS_CLIP? + // TODO LONGTERM when setting 8.1 as minimum (TODO verify), D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT? + // TODO what is our pixel snapping setting related to the OPTIONS enum values? + c->rt->DrawTextLayout(pt, tl->layout, black, D2D1_DRAW_TEXT_OPTIONS_NONE); +#endif +#if renderD2D && renderOur + // draw ours semitransparent so we can check + // TODO get the actual color Charles Petzold uses and use that + black->Release(); + black = mustMakeSolidBrush(c->rt, 1.0, 0.0, 0.0, 0.75); +#endif +#if renderOur + renderer = new textRenderer(c->rt, + TRUE, // TODO FALSE for no-snap? + black); + hr = tl->layout->Draw(NULL, + renderer, + x, y); + if (hr != S_OK) + logHRESULT(L"error drawing IDWriteTextLayout", hr); + renderer->Release(); +#endif + + black->Release(); +} + +// TODO for a single line the height includes the leading; should it? TextEdit on OS X always includes the leading and/or paragraph spacing, otherwise Klee won't work... +// TODO width does not include trailing whitespace +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) +{ + DWRITE_TEXT_METRICS metrics; + HRESULT hr; + + hr = tl->layout->GetMetrics(&metrics); + if (hr != S_OK) + logHRESULT(L"error getting IDWriteTextLayout layout metrics", hr); + *width = metrics.width; + // TODO make sure the behavior of this on empty strings is the same on all platforms (ideally should be 0-width, line height-height; TODO note this in the docs too) + *height = metrics.height; +} + +int uiDrawTextLayoutNumLines(uiDrawTextLayout *tl) +{ + return tl->nLines; +} + +// DirectWrite doesn't provide a direct way to do this, so we have to do this manually +// TODO does that comment still apply here or to the code at the top of this file? +void uiDrawTextLayoutLineByteRange(uiDrawTextLayout *tl, int line, size_t *start, size_t *end) +{ + *start = tl->lineInfo[line].startPos; + *start = tl->u16tou8[*start]; + *end = tl->lineInfo[line].endPos - tl->lineInfo[line].newlineCount; + *end = tl->u16tou8[*end]; +} + +void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLayoutLineMetrics *m) +{ + m->X = tl->lineInfo[line].x; + m->Y = tl->lineInfo[line].y; + m->Width = tl->lineInfo[line].width; + m->Height = tl->lineInfo[line].height; + + // TODO rename tl->lineInfo[line].baseline to .baselineOffset or something of the sort to make its meaning more clear + m->BaselineY = tl->lineInfo[line].y + tl->lineInfo[line].baseline; + m->Ascent = tl->lineInfo[line].baseline; + m->Descent = tl->lineInfo[line].height - tl->lineInfo[line].baseline; + m->Leading = 0; // TODO + + m->ParagraphSpacingBefore = 0; // TODO + m->LineHeightSpace = 0; // TODO + m->LineSpacing = 0; // TODO + m->ParagraphSpacing = 0; // TODO +} + +// this algorithm comes from Microsoft's PadWrite sample, following TextEditor::SetSelectionFromPoint() +// TODO go back through all of these and make sure we convert coordinates properly +// TODO same for OS X +void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line) +{ + DWRITE_HIT_TEST_METRICS m; + BOOL trailing, inside; + size_t p; + UINT32 i; + HRESULT hr; + + hr = tl->layout->HitTestPoint(x, y, + &trailing, &inside, + &m); + if (hr != S_OK) + logHRESULT(L"error hit-testing IDWriteTextLayout", hr); + p = m.textPosition; + // on a trailing hit, align to the nearest cluster + if (trailing) { + DWRITE_HIT_TEST_METRICS m2; + FLOAT x, y; // crashes if I skip these :/ + + hr = tl->layout->HitTestTextPosition(m.textPosition, trailing, + &x, &y, &m2); + if (hr != S_OK) + logHRESULT(L"error aligning trailing hit to nearest cluster", hr); + p = m2.textPosition + m2.length; + } + *pos = tl->u16tou8[p]; + + for (i = 0; i < tl->nLines; i++) { + double ltop, lbottom; + + ltop = tl->lineInfo[i].y; + lbottom = ltop + tl->lineInfo[i].height; + // y will already >= ltop at this point since the past lbottom should == ltop + if (y < lbottom) + break; + } + if (i == tl->nLines) + i--; + *line = i; +} + +double uiDrawTextLayoutByteLocationInLine(uiDrawTextLayout *tl, size_t pos, int line) +{ + BOOL trailing; + DWRITE_HIT_TEST_METRICS m; + FLOAT x, y; + HRESULT hr; + + if (line < 0 || line >= tl->nLines) + return -1; + pos = tl->u8tou16[pos]; + // note: >, not >=, because the position at endPos is valid! + if (pos < tl->lineInfo[line].startPos || pos > tl->lineInfo[line].endPos) + return -1; + // this behavior seems correct + // there's also PadWrite's TextEditor::GetCaretRect() but that requires state... + // TODO where does this fail? + trailing = FALSE; + if (pos != 0 && pos != tl->nUTF16 && pos == tl->lineInfo[line].endPos) { + pos--; + trailing = TRUE; + } + hr = tl->layout->HitTestTextPosition(pos, trailing, + &x, &y, &m); + if (hr != S_OK) + logHRESULT(L"error calling IDWriteTextLayout::HitTestTextPosition()", hr); + return x; +} + +void caretDrawParams(uiDrawContext *c, double height, struct caretDrawParams *p) +{ + DWORD caretWidth; + + // there seems to be no defined caret color + // the best I can come up with is "inverts colors underneath" (according to https://msdn.microsoft.com/en-us/library/windows/desktop/ms648397(v=vs.85).aspx) which I have no idea how to do (TODO) + // just return black for now + p->r = 0.0; + p->g = 0.0; + p->b = 0.0; + p->a = 1.0; + + if (SystemParametersInfoW(SPI_GETCARETWIDTH, 0, &caretWidth, 0) == 0) + // don't log the failure, fall back gracefully + // the instruction to use this comes from https://msdn.microsoft.com/en-us/library/windows/desktop/ms648399(v=vs.85).aspx + // and we have to assume GetSystemMetrics() always succeeds, so + caretWidth = GetSystemMetrics(SM_CXBORDER); + // TODO make this a function and split it out of areautil.cpp + { + FLOAT dpix, dpiy; + + // TODO can we pass NULL for dpiy? + c->rt->GetDpi(&dpix, &dpiy); + // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd756649%28v=vs.85%29.aspx (and others; search "direct2d mouse") + p->width = ((double) (caretWidth * 96)) / dpix; + } + // and there doesn't seem to be this either... (TODO check what PadWrite does?) + p->xoff = 0; +} diff --git a/_wip/examples_drawtext/attributes.c b/_wip/examples_drawtext/attributes.c new file mode 100644 index 00000000..ed3cb973 --- /dev/null +++ b/_wip/examples_drawtext/attributes.c @@ -0,0 +1,912 @@ +// 11 february 2017 +#include "drawtext.h" + +static uiAttributedString *attrstr; + +#define nFeatures 256 +static uiOpenTypeFeatures *features[nFeatures]; +static int curFeature = 0; + +static uiOpenTypeFeatures *addFeature(const char tag[4], uint32_t value) +{ + uiOpenTypeFeatures *otf; + + if (curFeature >= nFeatures) { + fprintf(stderr, "TODO (also TODO is there a panic function?)\n"); + exit(EXIT_FAILURE); + } + otf = uiNewOpenTypeFeatures(); + uiOpenTypeFeaturesAdd(otf, tag[0], tag[1], tag[2], tag[3], value); + features[curFeature] = otf; + curFeature++; + return otf; +} + +// some of these examples come from Microsoft's and Apple's lists of typographic features and also https://www.fontfont.com/staticcontent/downloads/FF_OT_User_Guide.pdf +static void setupAttributedString(void) +{ + uiAttributeSpec spec; + size_t start, end; + const char *next; + uiOpenTypeFeatures *otf; + int i; + + attrstr = uiNewAttributedString("uiAttributedString isn't just for plain text! It supports "); + + next = "multiple fonts"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFamily; + spec.Family = "Courier New"; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple sizes"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeSize; + spec.Double = 18; + uiAttributedStringSetAttribute(attrstr, + &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple weights"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeWeight; + spec.Value = (uintptr_t) uiDrawTextWeightBold; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple italics"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeItalic; + spec.Value = (uintptr_t) uiDrawTextItalicItalic; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple stretches"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeStretch; + spec.Value = (uintptr_t) uiDrawTextStretchCondensed; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple colors"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeColor; + // Direct2D "Crimson" (#DC143C) + spec.R = 0.8627450980392156; + spec.G = 0.0784313725490196; + spec.B = 0.2352941176470588; + spec.A = 0.75; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple backgrounds"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeBackground; + // Direct2D "Peach Puff" (#FFDAB9) + // TODO choose a darker color + spec.R = 1.0; + spec.G = 0.85490196078431372; + spec.B = 0.7254901960784313; + spec.A = 0.5; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "multiple"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeUnderline; + spec.Value = uiDrawUnderlineStyleSingle; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " "); + next = "underlines"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeUnderline; + spec.Value = uiDrawUnderlineStyleDouble; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + spec.Type = uiAttributeUnderlineColor; + spec.Value = uiDrawUnderlineColorCustom; + spec.R = 0.5; + spec.G = 0.0; + spec.B = 1.0; + spec.A = 1.0; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " ("); + next = "including underlines for spelling correction and the like"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeUnderline; + spec.Value = uiDrawUnderlineStyleSuggestion; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + spec.Type = uiAttributeUnderlineColor; + spec.Value = uiDrawUnderlineColorSpelling; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + // TODO randomize these ranges better + // TODO make some overlap to test that + // TODO also change colors to light foreground dark background + next = "or any combination of the above"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeWeight; + spec.Value = (uintptr_t) uiDrawTextWeightBold; + uiAttributedStringSetAttribute(attrstr, &spec, start, end - 8); + spec.Type = uiAttributeItalic; + spec.Value = (uintptr_t) uiDrawTextItalicItalic; + uiAttributedStringSetAttribute(attrstr, &spec, start + 3, end - 4); + spec.Type = uiAttributeColor; + spec.R = 0.8627450980392156; + spec.G = 0.0784313725490196; + spec.B = 0.2352941176470588; + spec.A = 0.75; + uiAttributedStringSetAttribute(attrstr, &spec, start + 12, end); + spec.Type = uiAttributeFamily; + spec.Family = "Helvetica"; + uiAttributedStringSetAttribute(attrstr, &spec, start + 8, end - 1); + spec.Type = uiAttributeBackground; + spec.R = 1.0; + spec.G = 0.85490196078431372; + spec.B = 0.7254901960784313; + spec.A = 0.5; + uiAttributedStringSetAttribute(attrstr, &spec, start + 5, end - 7); + spec.Type = uiAttributeUnderline; + spec.Value = uiDrawUnderlineStyleSingle; + uiAttributedStringSetAttribute(attrstr, &spec, start + 9, end - 1); + + // TODO rewrite this to talk about OpenTpe instead + // TODO also shorten this to something more useful and that covers the general gist of things (and combines features arbitrarily like the previous demo) when we add a general OpenType demo (see the last TODO in this function) + uiAttributedStringAppendUnattributed(attrstr, ". In addition, a variety of typographical features are available (depending on the chosen font) that can be switched on (or off, if the font enables them by default): "); + + next = "fi"; + uiAttributedStringAppendUnattributed(attrstr, "standard ligatures like f+i ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("liga", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + // note the use of LTR marks and RTL embeds to make sure the bidi algorithm doesn't kick in for our demonstration (it will produce incorrect results) + // see also: https://www.w3.org/International/articles/inline-bidi-markup/#nomarkup + next = "\xD9\x84\xD8\xA7"; + uiAttributedStringAppendUnattributed(attrstr, "required ligatures like \xE2\x80\xAB\xD9\x84\xE2\x80\xAC+\xE2\x80\xAB\xD8\xA7\xE2\x80\xAC (\xE2\x80\x8E\xE2\x80\xAB"); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("rlig", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, "\xE2\x80\xAC)"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "ct"; + uiAttributedStringAppendUnattributed(attrstr, "discretionary/rare ligatures like c+t ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("dlig", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "the"; + uiAttributedStringAppendUnattributed(attrstr, "contextual ligatures like h+e in the ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("clig", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + otf = addFeature("hlig", 1); + // This technically isn't what is meant by "historical ligatures", but Core Text's internal AAT-to-OpenType mapping says to include it, so we include it too + uiOpenTypeFeaturesAdd(otf, 'h', 'i', 's', 't', 1); + next = "\xC3\x9F"; + uiAttributedStringAppendUnattributed(attrstr, "historical ligatures like the decomposition of \xC3\x9F ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = otf; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + // TODO a different word than "writing"? + next = "UnICasE wRITInG"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("unic", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "316"; + uiAttributedStringAppendUnattributed(attrstr, "proportional ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("pnum", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ") and tabular/monospaced ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("tnum", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ") numbers"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "123"; + uiAttributedStringAppendUnattributed(attrstr, "superscipts ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("sups", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "123"; + uiAttributedStringAppendUnattributed(attrstr, "subscripts ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("subs", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "1st"; + uiAttributedStringAppendUnattributed(attrstr, "ordinals ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ordn", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "H2O"; + uiAttributedStringAppendUnattributed(attrstr, "scientific inferiors ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("sinf", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "2/3"; + uiAttributedStringAppendUnattributed(attrstr, "fraction forms ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); +#if 0 /* TODO */ + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFractionForms; + spec.Value = uiAttributeFractionFormNone; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ", "); +#endif + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("afrc", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ", "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("frac", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "0"; + uiAttributedStringAppendUnattributed(attrstr, "slashed zeroes ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("zero", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("zero", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xCE\xA0\xCE\xA3"; + uiAttributedStringAppendUnattributed(attrstr, "mathematical greek ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("mgrk", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("mgrk", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "qwertyuiop\xE2\x80\xA2"; + uiAttributedStringAppendUnattributed(attrstr, "ornamental forms ("); + for (i = 1; i < 11; i++) { + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ornm", i); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + next = "\xE2\x80\xA2"; + } + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "g"; + uiAttributedStringAppendUnattributed(attrstr, "specific forms/alternates ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("aalt", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("aalt", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "ABCDEFGQWERTY"; + uiAttributedStringAppendUnattributed(attrstr, "titling capital forms ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("titl", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("titl", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xE7\x80\x86"; + uiAttributedStringAppendUnattributed(attrstr, "alternate Han character forms ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("jp78", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("jp83", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + otf = addFeature("onum", 0); + // Core Text's internal AAT-to-OpenType mapping says to include this, so we include it too + // TODO is it always set? + uiOpenTypeFeaturesAdd(otf, 'l', 'n', 'u', 'm', 0); + next = "0123456789"; + uiAttributedStringAppendUnattributed(attrstr, "lowercase numbers ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = otf; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + otf = addFeature("onum", 1); + uiOpenTypeFeaturesAdd(otf, 'l', 'n', 'u', 'm', 1); + spec.Features = otf; + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xE4\xBC\xBD"; + uiAttributedStringAppendUnattributed(attrstr, "hanja to hangul translation ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("hngl", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("hngl", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xE3\x81\x82"; + uiAttributedStringAppendUnattributed(attrstr, "annotated glyph forms ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("nalt", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("nalt", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("nalt", 4); // AAT inverted circle + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xE3\x81\x82"; + uiAttributedStringAppendUnattributed(attrstr, "ruby forms of kana ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ruby", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ruby", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "now is the time"; + uiAttributedStringAppendUnattributed(attrstr, "italic forms of Latin letters in CJK fonts ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ital", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("ital", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "{I} > {J}"; + uiAttributedStringAppendUnattributed(attrstr, "case-sensitive character forms, such as punctuation ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("case", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("case", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "ABC"; + uiAttributedStringAppendUnattributed(attrstr, "specialized spacing between uppercase letters ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("cpsp", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("cpsp", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "\xE3\x82\xB9\xE3\x83\x98\xE3\x83\x88"; + uiAttributedStringAppendUnattributed(attrstr, "alternate horizontal ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("hkna", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("hkna", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ") and vertical ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("vkna", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("vkna", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ") kana forms"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "g"; + uiAttributedStringAppendUnattributed(attrstr, "stylistic alternates ("); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + for (i = 1; i <= 20; i++) { + char tag[4]; + + tag[0] = 's'; + tag[1] = 's'; + tag[2] = '0'; + if (i >= 10) + tag[2] = '1'; + tag[3] = (i % 10) + '0'; // TODO see how I wrote this elsewhere + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Features = addFeature(tag, 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + } + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "first"; + uiAttributedStringAppendUnattributed(attrstr, "contextual alternates ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("calt", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("calt", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "FONT"; + uiAttributedStringAppendUnattributed(attrstr, "swashes ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("swsh", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("swsh", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "Font"; + uiAttributedStringAppendUnattributed(attrstr, "contextual swashes ("); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("cswh", 0); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("cswh", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ")"); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "Small Caps"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("smcp", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ", "); + next = "Petite Caps"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("pcap", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, ", "); + + next = "SMALL UPPERCASES"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("c2sp", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + uiAttributedStringAppendUnattributed(attrstr, ", and "); + next = "PETITE UPPERCASES"; + start = uiAttributedStringLen(attrstr); + end = start + strlen(next); + uiAttributedStringAppendUnattributed(attrstr, next); + spec.Type = uiAttributeFeatures; + spec.Features = addFeature("c2pc", 1); + uiAttributedStringSetAttribute(attrstr, &spec, start, end); + + uiAttributedStringAppendUnattributed(attrstr, "."); + + // TODO write a dedicated example for experimenting with typographic features like the one in gtk3-demo +} + +static char fontFamily[] = "Times New Roman"; +// TODO should be const; look at constructor function? +static uiDrawFontDescriptor defaultFont = { + .Family = fontFamily, + .Size = 12, + .Weight = uiDrawTextWeightNormal, + .Italic = uiDrawTextItalicNormal, + .Stretch = uiDrawTextStretchNormal, +}; +static uiDrawTextLayoutParams params; + +#define margins 10 + +static uiBox *panel; +static uiCheckbox *showLineBounds; +static uiFontButton *fontButton; + +// TODO should be const? +static uiDrawBrush fillBrushes[4] = { + { + .Type = uiDrawBrushTypeSolid, + .R = 1.0, + .G = 0.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 0.0, + .B = 1.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 1.0, + .A = 0.5, + }, +}; + +static void draw(uiAreaDrawParams *p) +{ + uiDrawPath *path; + uiDrawTextLayout *layout; + uiDrawBrush b; + + b.Type = uiDrawBrushTypeSolid; + + // only clip the text, not the guides + uiDrawSave(p->Context); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins, margins, + p->AreaWidth - 2 * margins, + p->AreaHeight - 2 * margins); + uiDrawPathEnd(path); + uiDrawClip(p->Context, path); + uiDrawFreePath(path); + + params.Width = p->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawText(p->Context, layout, margins, margins); + + uiDrawRestore(p->Context); + + if (uiCheckboxChecked(showLineBounds)) { + uiDrawTextLayoutLineMetrics m; + int i, n; + int fill = 0; + + n = uiDrawTextLayoutNumLines(layout); + for (i = 0; i < n; i++) { + uiDrawTextLayoutLineGetMetrics(layout, i, &m); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins + m.X, margins + m.Y, + m.Width, m.Height); + uiDrawPathEnd(path); + uiDrawFill(p->Context, path, fillBrushes + fill); + uiDrawFreePath(path); + fill = (fill + 1) % 4; + } + } + + uiDrawFreeTextLayout(layout); +} + +static struct example attributesExample; + +static void changeFont(uiFontButton *b, void *data) +{ + if (defaultFont.Family != fontFamily) + uiFreeText(defaultFont.Family); + // TODO rename defaultFont + uiFontButtonFont(fontButton, &defaultFont); + redraw(); +} + +// TODO share? +static void checkboxChecked(uiCheckbox *c, void *data) +{ + redraw(); +} + +static uiCheckbox *newCheckbox(const char *text) +{ + uiCheckbox *c; + + c = uiNewCheckbox(text); + uiCheckboxOnToggled(c, checkboxChecked, NULL); + uiBoxAppend(panel, uiControl(c), 0); + return c; +} + +struct example *mkAttributesExample(void) +{ + panel = uiNewVerticalBox(); + showLineBounds = newCheckbox("Show Line Bounds"); + fontButton = uiNewFontButton(); + uiFontButtonOnChanged(fontButton, changeFont, NULL); + // TODO set the font button to the current defaultFont + uiBoxAppend(panel, uiControl(fontButton), 0); + + attributesExample.name = "Attributed Text"; + attributesExample.panel = uiControl(panel); + attributesExample.draw = draw; + attributesExample.mouse = NULL; + attributesExample.key = NULL; + + setupAttributedString(); + params.String = attrstr; + params.DefaultFont = &defaultFont; + params.Align = uiDrawTextAlignLeft; + + return &attributesExample; +} diff --git a/_wip/examples_drawtext/basic.c b/_wip/examples_drawtext/basic.c new file mode 100644 index 00000000..ede973b3 --- /dev/null +++ b/_wip/examples_drawtext/basic.c @@ -0,0 +1,267 @@ +// 17 january 2017 +#include "drawtext.h" + +static const char *text = + "It is with a kind of fear that I begin to write the history of my life. " + "I have, as it were, a superstitious hesitation in lifting the veil that " + "clings about my childhood like a golden mist. The task of writing an " + "autobiography is a difficult one. When I try to classify my earliest " + "impressions, I find that fact and fancy look alike across the years that " + "link the past with the present. The woman paints the child's experiences " + "in her own fantasy. A few impressions stand out vividly from the first " + "years of my life; but \"the shadows of the prison-house are on the rest.\" " + "Besides, many of the joys and sorrows of childhood have lost their " + "poignancy; and many incidents of vital importance in my early education " + "have been forgotten in the excitement of great discoveries. In order, " + "therefore, not to be tedious I shall try to present in a series of " + "sketches only the episodes that seem to me to be the most interesting " + "and important." + ""; +static char fontFamily[] = "Palatino"; +// TODO should be const; look at constructor function? +static uiDrawFontDescriptor defaultFont = { + .Family = fontFamily, + .Size = 18, + .Weight = uiDrawTextWeightNormal, + .Italic = uiDrawTextItalicNormal, + .Stretch = uiDrawTextStretchNormal, +}; +static uiAttributedString *attrstr; +static uiDrawTextLayoutParams params; + +#define margins 10 + +static uiBox *panel; +static uiCheckbox *showExtents; +static uiCheckbox *showLineBounds; +static uiCheckbox *showLineGuides; + +// TODO should this be const? +static double strokeDashes[] = { 5, 2 }; +// TODO this should be const +static uiDrawStrokeParams strokeParams = { + .Cap = uiDrawLineCapFlat, + .Join = uiDrawLineJoinMiter, + .Thickness = 1, + .MiterLimit = uiDrawDefaultMiterLimit, + .Dashes = strokeDashes, + .NumDashes = 2, + .DashPhase = 0, +}; + +// TODO should be const? +static uiDrawBrush fillBrushes[4] = { + { + .Type = uiDrawBrushTypeSolid, + .R = 1.0, + .G = 0.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 0.0, + .B = 1.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 1.0, + .A = 0.5, + }, +}; +// TODO come up with better colors +static uiDrawBrush strokeBrushes[3] = { + // baseline + { + .Type = uiDrawBrushTypeSolid, + .R = 0.5, + .G = 0.5, + .B = 0.0, + .A = 0.75, + }, + // ascent + { + .Type = uiDrawBrushTypeSolid, + .R = 1.0, + .G = 0.0, + .B = 1.0, + .A = 0.75, + }, + // descent + { + .Type = uiDrawBrushTypeSolid, + .R = 0.5, + .G = 0.75, + .B = 1.0, + .A = 0.75, + }, +}; + +static void draw(uiAreaDrawParams *p) +{ + uiDrawPath *path; + uiDrawTextLayout *layout; + uiDrawBrush b; + + b.Type = uiDrawBrushTypeSolid; + + // only clip the text, not the guides + uiDrawSave(p->Context); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins, margins, + p->AreaWidth - 2 * margins, + p->AreaHeight - 2 * margins); + uiDrawPathEnd(path); + uiDrawClip(p->Context, path); + uiDrawFreePath(path); + + // TODO get rid of this later +#if 0 + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, -100, -100, + p->AreaWidth * 2, + p->AreaHeight * 2); + uiDrawPathEnd(path); + b.R = 0.0; + b.G = 1.0; + b.B = 0.0; + b.A = 1.0; + uiDrawFill(p->Context, path, &b); + uiDrawFreePath(path); +#endif + + params.Width = p->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawText(p->Context, layout, margins, margins); + + uiDrawRestore(p->Context); + + if (uiCheckboxChecked(showExtents)) { + double width, height; + + uiDrawTextLayoutExtents(layout, &width, &height); + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins, margins, + width, height); + uiDrawPathEnd(path); + b.R = 1.0; + b.G = 0.0; + b.B = 1.0; + b.A = 0.5; + uiDrawStroke(p->Context, path, &b, &strokeParams); + uiDrawFreePath(path); + } + + if (uiCheckboxChecked(showLineBounds) || uiCheckboxChecked(showLineGuides)) { + uiDrawTextLayoutLineMetrics m; + int i, n; + int fill = 0; + + n = uiDrawTextLayoutNumLines(layout); + for (i = 0; i < n; i++) { + uiDrawTextLayoutLineGetMetrics(layout, i, &m); + + if (uiCheckboxChecked(showLineBounds)) { + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins + m.X, margins + m.Y, + m.Width, m.Height); + uiDrawPathEnd(path); + uiDrawFill(p->Context, path, fillBrushes + fill); + uiDrawFreePath(path); + fill = (fill + 1) % 4; + } + if (uiCheckboxChecked(showLineGuides)) { + // baseline + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathNewFigure(path, + margins + m.X, + margins + m.BaselineY); + uiDrawPathLineTo(path, + margins + m.X + m.Width, + margins + m.BaselineY); + uiDrawPathEnd(path); + uiDrawStroke(p->Context, path, &(strokeBrushes[0]), &strokeParams); + uiDrawFreePath(path); + + // ascent line + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathNewFigure(path, + margins + m.X, + margins + m.BaselineY - m.Ascent); + uiDrawPathLineTo(path, + margins + m.X + m.Width, + margins + m.BaselineY - m.Ascent); + uiDrawPathEnd(path); + uiDrawStroke(p->Context, path, &(strokeBrushes[1]), &strokeParams); + uiDrawFreePath(path); + + // descent line + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathNewFigure(path, + margins + m.X, + margins + m.BaselineY + m.Descent); + uiDrawPathLineTo(path, + margins + m.X + m.Width, + margins + m.BaselineY + m.Descent); + uiDrawPathEnd(path); + uiDrawStroke(p->Context, path, &(strokeBrushes[2]), &strokeParams); + uiDrawFreePath(path); + } + } + } + + uiDrawFreeTextLayout(layout); +} + +static struct example basicExample; + +// TODO share? +static void checkboxChecked(uiCheckbox *c, void *data) +{ + redraw(); +} + +static uiCheckbox *newCheckbox(const char *text) +{ + uiCheckbox *c; + + c = uiNewCheckbox(text); + uiCheckboxOnToggled(c, checkboxChecked, NULL); + uiBoxAppend(panel, uiControl(c), 0); + return c; +} + +struct example *mkBasicExample(void) +{ + panel = uiNewVerticalBox(); + showExtents = newCheckbox("Show Layout Extents"); + showLineBounds = newCheckbox("Show Line Bounds"); + showLineGuides = newCheckbox("Show Line Guides"); + + basicExample.name = "Basic Paragraph of Text"; + basicExample.panel = uiControl(panel); + basicExample.draw = draw; + basicExample.mouse = NULL; + basicExample.key = NULL; + + attrstr = uiNewAttributedString(text); + params.String = attrstr; + params.DefaultFont = &defaultFont; + params.Align = uiDrawTextAlignLeft; + + return &basicExample; +} + +// TODO on GTK+ an area by itself in a window doesn't get expand properties set properly? diff --git a/_wip/examples_drawtext/drawtext.h b/_wip/examples_drawtext/drawtext.h new file mode 100644 index 00000000..484dcec9 --- /dev/null +++ b/_wip/examples_drawtext/drawtext.h @@ -0,0 +1,29 @@ +// 20 january 2017 +#include +#include +#include +#include "../../ui.h" + +struct example { + const char *name; + uiControl *panel; + void (*draw)(uiAreaDrawParams *p); + void (*mouse)(uiAreaMouseEvent *e); + int (*key)(uiAreaKeyEvent *e); + // TODO key? +}; + +// main.c +extern void redraw(void); + +// basic.c +extern struct example *mkBasicExample(void); + +// hittest.c +extern struct example *mkHitTestExample(void); + +// attributes.c +extern struct example *mkAttributesExample(void); + +// emptystr_hittest.c +extern struct example *mkEmptyStringExample(void); diff --git a/_wip/examples_drawtext/emptystr_hittest.c b/_wip/examples_drawtext/emptystr_hittest.c new file mode 100644 index 00000000..fba386d8 --- /dev/null +++ b/_wip/examples_drawtext/emptystr_hittest.c @@ -0,0 +1,254 @@ +// 20 january 2017 +#include "drawtext.h" + +// TODO FOR THIS FILE +// get rid of it once we rewrite this example (which requires having more fine-grained scrolling control) + +// TODO double-check ligatures on all platforms to make sure we can place the cursor at the right place +// TODO the hiding and showing does not work properly on GTK+ +// TODO using the arrow keys allows us to walk back to the end of the line on some platforms (TODO which?); IIRC arrow keys shouldn't do that +// TODO make sure to check the cursor positions of RTL on all platforms + +static const char *text = ""; +static char fontFamily[] = "Helvetica"; +static uiDrawFontDescriptor defaultFont = { + .Family = fontFamily, + .Size = 14, + .Weight = uiDrawTextWeightNormal, + .Italic = uiDrawTextItalicNormal, + .Stretch = uiDrawTextStretchNormal, +}; +static uiAttributedString *attrstr; +static uiDrawTextLayoutParams params; + +#define margins 10 + +static uiBox *panel; +static uiBox *vbox; +static uiLabel *caretLabel; +static uiCheckbox *showLineBounds; +static uiFontButton *fontButton; +static uiCombobox *textAlign; + +static int caretLine = -1; +static size_t caretPos; + +// TODO should be const? +static uiDrawBrush fillBrushes[4] = { + { + .Type = uiDrawBrushTypeSolid, + .R = 1.0, + .G = 0.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 0.0, + .B = 1.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 1.0, + .A = 0.5, + }, +}; + +static void draw(uiAreaDrawParams *p) +{ + uiDrawPath *path; + uiDrawTextLayout *layout; + uiDrawTextLayoutLineMetrics m; + + // only clip the text, not the guides + uiDrawSave(p->Context); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins, margins, + p->AreaWidth - 2 * margins, + p->AreaHeight - 2 * margins); + uiDrawPathEnd(path); + uiDrawClip(p->Context, path); + uiDrawFreePath(path); + + params.Width = p->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawText(p->Context, layout, margins, margins); + + uiDrawRestore(p->Context); + + if (caretLine == -1) { + caretLine = uiDrawTextLayoutNumLines(layout) - 1; + caretPos = uiAttributedStringLen(attrstr); + } + uiDrawCaret(p->Context, margins, margins, + layout, caretPos, &caretLine); + + if (uiCheckboxChecked(showLineBounds)) { + int i, n; + int fill = 0; + + n = uiDrawTextLayoutNumLines(layout); + for (i = 0; i < n; i++) { + uiDrawTextLayoutLineGetMetrics(layout, i, &m); + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins + m.X, margins + m.Y, + m.Width, m.Height); + uiDrawPathEnd(path); + uiDrawFill(p->Context, path, fillBrushes + fill); + uiDrawFreePath(path); + fill = (fill + 1) % 4; + } + } + + uiDrawFreeTextLayout(layout); +} + +static void mouse(uiAreaMouseEvent *e) +{ + uiDrawTextLayout *layout; + char labelText[128]; + + if (e->Down != 1) + return; + + params.Width = e->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawTextLayoutHitTest(layout, + e->X - margins, e->Y - margins, + &caretPos, &caretLine); + uiDrawFreeTextLayout(layout); + + // TODO move this into the draw handler so it is reflected by keyboard-based position changes + // urgh %zd is not supported by MSVC with sprintf() + // TODO get that part in test/ about having no other option + sprintf(labelText, "pos %d line %d", + (int) caretPos, caretLine); + uiLabelSetText(caretLabel, labelText); + + redraw(); +} + +static int key(uiAreaKeyEvent *e) +{ + size_t grapheme; + + if (e->Up) + return 0; + if (e->Key != 0) + return 0; + switch (e->ExtKey) { + case uiExtKeyUp: + // TODO + return 1; + case uiExtKeyDown: + // TODO + return 1; + case uiExtKeyLeft: + grapheme = uiAttributedStringByteIndexToGrapheme(attrstr, caretPos); + if (grapheme == 0) + return 0; + grapheme--; + caretPos = uiAttributedStringGraphemeToByteIndex(attrstr, grapheme); + redraw(); + return 1; + case uiExtKeyRight: + grapheme = uiAttributedStringByteIndexToGrapheme(attrstr, caretPos); + if (grapheme == uiAttributedStringNumGraphemes(attrstr)) + return 0; + grapheme++; + caretPos = uiAttributedStringGraphemeToByteIndex(attrstr, grapheme); + redraw(); + return 1; + } + return 0; +} + +static struct example hitTestExample; + +// TODO share? +static void checkboxChecked(uiCheckbox *c, void *data) +{ + redraw(); +} + +static void changeFont(uiFontButton *b, void *data) +{ + if (defaultFont.Family != fontFamily) + uiFreeText(defaultFont.Family); + // TODO rename defaultFont + uiFontButtonFont(fontButton, &defaultFont); + printf("{\n\tfamily: %s\n\tsize: %g\n\tweight: %d\n\titalic: %d\n\tstretch: %d\n}\n", + defaultFont.Family, + defaultFont.Size, + (int) (defaultFont.Weight), + (int) (defaultFont.Italic), + (int) (defaultFont.Stretch)); + redraw(); +} + +static void changeTextAlign(uiCombobox *c, void *data) +{ + // note the order of the items added below + params.Align = (uiDrawTextAlign) uiComboboxSelected(textAlign); + redraw(); +} + +// TODO share? +static uiCheckbox *newCheckbox(uiBox *box, const char *text) +{ + uiCheckbox *c; + + c = uiNewCheckbox(text); + uiCheckboxOnToggled(c, checkboxChecked, NULL); + uiBoxAppend(box, uiControl(c), 0); + return c; +} + +struct example *mkEmptyStringExample(void) +{ + panel = uiNewHorizontalBox(); + vbox = uiNewVerticalBox(); + // TODO the second vbox causes this not to stretch at least on OS X + uiBoxAppend(panel, uiControl(vbox), 1); + caretLabel = uiNewLabel("Caret information is shown here"); + uiBoxAppend(vbox, uiControl(caretLabel), 0); + showLineBounds = newCheckbox(vbox, "Show Line Bounds (for debugging metrics)"); + vbox = uiNewVerticalBox(); + uiBoxAppend(panel, uiControl(vbox), 0); + fontButton = uiNewFontButton(); + uiFontButtonOnChanged(fontButton, changeFont, NULL); + // TODO set the font button to the current defaultFont + uiBoxAppend(vbox, uiControl(fontButton), 0); + textAlign = uiNewCombobox(); + // note that these are in the order in the enum + uiComboboxAppend(textAlign, "Left"); + uiComboboxAppend(textAlign, "Center"); + uiComboboxAppend(textAlign, "Right"); + uiComboboxOnSelected(textAlign, changeTextAlign, NULL); + uiBoxAppend(vbox, uiControl(textAlign), 0); + + hitTestExample.name = "Empty String"; + hitTestExample.panel = uiControl(panel); + hitTestExample.draw = draw; + hitTestExample.mouse = mouse; + hitTestExample.key = key; + + attrstr = uiNewAttributedString(text); + params.String = attrstr; + params.DefaultFont = &defaultFont; + params.Align = uiDrawTextAlignLeft; + + return &hitTestExample; +} diff --git a/_wip/examples_drawtext/hittest.c b/_wip/examples_drawtext/hittest.c new file mode 100644 index 00000000..a8092b47 --- /dev/null +++ b/_wip/examples_drawtext/hittest.c @@ -0,0 +1,262 @@ +// 20 january 2017 +#include "drawtext.h" + +// TODO double-check ligatures on all platforms to make sure we can place the cursor at the right place +// TODO using the arrow keys allows us to walk back to the end of the line on some platforms (TODO which?); IIRC arrow keys shouldn't do that +// TODO make sure to check the cursor positions of RTL on all platforms + +static const char *text = + "Each of the glyphs an end user interacts with are called graphemes. " + "If you enter a byte range in the text boxes below and click the button, you can see the blue box move to surround that byte range, as well as what the actual byte range necessary is. " + // TODO rephrase this; I don't think this code will use those grapheme functions... + "You'll also see the index of the first grapheme; uiAttributedString has facilities for converting between UTF-8 code points and grapheme indices. " + "Additionally, click on the string to move the caret. Watch the status text at the bottom change too. " + "That being said: " + "\xC3\x93O\xCC\x81 (combining accents) " + "A\xCC\xAA\xEF\xB8\xA0 (multiple combining characters) " + "\xE2\x80\xAE#\xE2\x80\xAC (RTL glyph) " + "\xF0\x9F\x92\xBB (non-BMP character) " + "\xF0\x9F\x92\xBB\xCC\x80 (combined non-BMP character; may render strangely) " + ""; +static char fontFamily[] = "Helvetica"; +static uiDrawFontDescriptor defaultFont = { + .Family = fontFamily, + .Size = 14, + .Weight = uiDrawTextWeightNormal, + .Italic = uiDrawTextItalicNormal, + .Stretch = uiDrawTextStretchNormal, +}; +static uiAttributedString *attrstr; +static uiDrawTextLayoutParams params; + +#define margins 10 + +static uiBox *panel; +static uiBox *vbox; +static uiLabel *caretLabel; +static uiCheckbox *showLineBounds; +static uiFontButton *fontButton; +static uiCombobox *textAlign; + +static int caretLine = -1; +static size_t caretPos; + +// TODO should be const? +static uiDrawBrush fillBrushes[4] = { + { + .Type = uiDrawBrushTypeSolid, + .R = 1.0, + .G = 0.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 0.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 0.0, + .B = 1.0, + .A = 0.5, + }, + { + .Type = uiDrawBrushTypeSolid, + .R = 0.0, + .G = 1.0, + .B = 1.0, + .A = 0.5, + }, +}; + +static void draw(uiAreaDrawParams *p) +{ + uiDrawPath *path; + uiDrawTextLayout *layout; + uiDrawTextLayoutLineMetrics m; + + // only clip the text, not the guides + uiDrawSave(p->Context); + + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins, margins, + p->AreaWidth - 2 * margins, + p->AreaHeight - 2 * margins); + uiDrawPathEnd(path); + uiDrawClip(p->Context, path); + uiDrawFreePath(path); + + params.Width = p->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawText(p->Context, layout, margins, margins); + + uiDrawRestore(p->Context); + + if (caretLine == -1) { + caretLine = uiDrawTextLayoutNumLines(layout) - 1; + caretPos = uiAttributedStringLen(attrstr); + } + uiDrawCaret(p->Context, margins, margins, + layout, caretPos, &caretLine); + + if (uiCheckboxChecked(showLineBounds)) { + int i, n; + int fill = 0; + + n = uiDrawTextLayoutNumLines(layout); + for (i = 0; i < n; i++) { + uiDrawTextLayoutLineGetMetrics(layout, i, &m); + path = uiDrawNewPath(uiDrawFillModeWinding); + uiDrawPathAddRectangle(path, margins + m.X, margins + m.Y, + m.Width, m.Height); + uiDrawPathEnd(path); + uiDrawFill(p->Context, path, fillBrushes + fill); + uiDrawFreePath(path); + fill = (fill + 1) % 4; + } + } + + uiDrawFreeTextLayout(layout); +} + +static void mouse(uiAreaMouseEvent *e) +{ + uiDrawTextLayout *layout; + char labelText[128]; + + if (e->Down != 1) + return; + + params.Width = e->AreaWidth - 2 * margins; + layout = uiDrawNewTextLayout(¶ms); + uiDrawTextLayoutHitTest(layout, + e->X - margins, e->Y - margins, + &caretPos, &caretLine); + uiDrawFreeTextLayout(layout); + + // TODO move this into the draw handler so it is reflected by keyboard-based position changes + // urgh %zd is not supported by MSVC with sprintf() + // TODO get that part in test/ about having no other option + sprintf(labelText, "pos %d line %d", + (int) caretPos, caretLine); + uiLabelSetText(caretLabel, labelText); + + redraw(); +} + +static int key(uiAreaKeyEvent *e) +{ + size_t grapheme; + + if (e->Up) + return 0; + if (e->Key != 0) + return 0; + switch (e->ExtKey) { + case uiExtKeyUp: + // TODO + return 1; + case uiExtKeyDown: + // TODO + return 1; + case uiExtKeyLeft: + grapheme = uiAttributedStringByteIndexToGrapheme(attrstr, caretPos); + if (grapheme == 0) + return 0; + grapheme--; + caretPos = uiAttributedStringGraphemeToByteIndex(attrstr, grapheme); + redraw(); + return 1; + case uiExtKeyRight: + grapheme = uiAttributedStringByteIndexToGrapheme(attrstr, caretPos); + if (grapheme == uiAttributedStringNumGraphemes(attrstr)) + return 0; + grapheme++; + caretPos = uiAttributedStringGraphemeToByteIndex(attrstr, grapheme); + redraw(); + return 1; + } + return 0; +} + +static struct example hitTestExample; + +// TODO share? +static void checkboxChecked(uiCheckbox *c, void *data) +{ + redraw(); +} + +static void changeFont(uiFontButton *b, void *data) +{ + if (defaultFont.Family != fontFamily) + uiFreeText(defaultFont.Family); + // TODO rename defaultFont + uiFontButtonFont(fontButton, &defaultFont); + printf("{\n\tfamily: %s\n\tsize: %g\n\tweight: %d\n\titalic: %d\n\tstretch: %d\n}\n", + defaultFont.Family, + defaultFont.Size, + (int) (defaultFont.Weight), + (int) (defaultFont.Italic), + (int) (defaultFont.Stretch)); + redraw(); +} + +static void changeTextAlign(uiCombobox *c, void *data) +{ + // note the order of the items added below + params.Align = (uiDrawTextAlign) uiComboboxSelected(textAlign); + redraw(); +} + +// TODO share? +static uiCheckbox *newCheckbox(uiBox *box, const char *text) +{ + uiCheckbox *c; + + c = uiNewCheckbox(text); + uiCheckboxOnToggled(c, checkboxChecked, NULL); + uiBoxAppend(box, uiControl(c), 0); + return c; +} + +struct example *mkHitTestExample(void) +{ + panel = uiNewHorizontalBox(); + vbox = uiNewVerticalBox(); + // TODO the second vbox causes this not to stretch at least on OS X + uiBoxAppend(panel, uiControl(vbox), 1); + caretLabel = uiNewLabel("Caret information is shown here"); + uiBoxAppend(vbox, uiControl(caretLabel), 0); + showLineBounds = newCheckbox(vbox, "Show Line Bounds (for debugging metrics)"); + vbox = uiNewVerticalBox(); + uiBoxAppend(panel, uiControl(vbox), 0); + fontButton = uiNewFontButton(); + uiFontButtonOnChanged(fontButton, changeFont, NULL); + // TODO set the font button to the current defaultFont + uiBoxAppend(vbox, uiControl(fontButton), 0); + textAlign = uiNewCombobox(); + // note that these are in the order in the enum + uiComboboxAppend(textAlign, "Left"); + uiComboboxAppend(textAlign, "Center"); + uiComboboxAppend(textAlign, "Right"); + uiComboboxOnSelected(textAlign, changeTextAlign, NULL); + uiBoxAppend(vbox, uiControl(textAlign), 0); + + hitTestExample.name = "Hit-Testing and Grapheme Boundaries"; + hitTestExample.panel = uiControl(panel); + hitTestExample.draw = draw; + hitTestExample.mouse = mouse; + hitTestExample.key = key; + + attrstr = uiNewAttributedString(text); + params.String = attrstr; + params.DefaultFont = &defaultFont; + params.Align = uiDrawTextAlignLeft; + + return &hitTestExample; +} diff --git a/_wip/examples_drawtext/httext.gz b/_wip/examples_drawtext/httext.gz new file mode 100644 index 00000000..7fd947cf Binary files /dev/null and b/_wip/examples_drawtext/httext.gz differ diff --git a/_wip/examples_drawtext/main.c b/_wip/examples_drawtext/main.c new file mode 100644 index 00000000..4e72b25e --- /dev/null +++ b/_wip/examples_drawtext/main.c @@ -0,0 +1,136 @@ +// 17 january 2017 +#include "drawtext.h" + +static uiWindow *mainwin; +static uiBox *box; +static uiCombobox *exampleList; +static uiArea *area; +static uiAreaHandler handler; + +#define nExamples 20 +static struct example *examples[nExamples]; +static int curExample = 0; + +static void onExampleChanged(uiCombobox *c, void *data) +{ + uiControlHide(examples[curExample]->panel); + curExample = uiComboboxSelected(exampleList); + uiControlShow(examples[curExample]->panel); + redraw(); +} + +void redraw(void) +{ + uiAreaQueueRedrawAll(area); +} + +static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p) +{ + examples[curExample]->draw(p); +} + +static void handlerMouseEvent(uiAreaHandler *a, uiArea *area, uiAreaMouseEvent *e) +{ + if (examples[curExample]->mouse != NULL) + examples[curExample]->mouse(e); +} + +static void handlerMouseCrossed(uiAreaHandler *ah, uiArea *a, int left) +{ + // do nothing +} + +static void handlerDragBroken(uiAreaHandler *ah, uiArea *a) +{ + // do nothing +} + +static int handlerKeyEvent(uiAreaHandler *ah, uiArea *a, uiAreaKeyEvent *e) +{ + if (examples[curExample]->key != NULL) + return examples[curExample]->key(e); + return 0; +} + +static int onClosing(uiWindow *w, void *data) +{ + uiControlDestroy(uiControl(mainwin)); + uiQuit(); + return 0; +} + +static int shouldQuit(void *data) +{ + uiControlDestroy(uiControl(mainwin)); + return 1; +} + +int main(void) +{ + uiInitOptions o; + const char *err; + int n; + + handler.Draw = handlerDraw; + handler.MouseEvent = handlerMouseEvent; + handler.MouseCrossed = handlerMouseCrossed; + handler.DragBroken = handlerDragBroken; + handler.KeyEvent = handlerKeyEvent; + + memset(&o, 0, sizeof (uiInitOptions)); + err = uiInit(&o); + if (err != NULL) { + fprintf(stderr, "error initializing ui: %s\n", err); + uiFreeInitError(err); + return 1; + } + + uiOnShouldQuit(shouldQuit, NULL); + + mainwin = uiNewWindow("libui Text-Drawing Example", 640, 480, 1); + uiWindowOnClosing(mainwin, onClosing, NULL); + + box = uiNewVerticalBox(); + uiWindowSetChild(mainwin, uiControl(box)); + + exampleList = uiNewCombobox(); + uiBoxAppend(box, uiControl(exampleList), 0); + + area = uiNewArea(&handler); + uiBoxAppend(box, uiControl(area), 1); + + n = 0; + examples[n] = mkBasicExample(); + uiComboboxAppend(exampleList, examples[n]->name); + uiControlHide(examples[n]->panel); + uiBoxAppend(box, examples[n]->panel, 0); + n++; + examples[n] = mkHitTestExample(); + uiComboboxAppend(exampleList, examples[n]->name); + uiControlHide(examples[n]->panel); + uiBoxAppend(box, examples[n]->panel, 0); + n++; + examples[n] = mkAttributesExample(); + uiComboboxAppend(exampleList, examples[n]->name); + uiControlHide(examples[n]->panel); + uiBoxAppend(box, examples[n]->panel, 0); + n++; + examples[n] = mkEmptyStringExample(); + uiComboboxAppend(exampleList, examples[n]->name); + uiControlHide(examples[n]->panel); + uiBoxAppend(box, examples[n]->panel, 0); + n++; + // and set things up for the initial state + uiComboboxSetSelected(exampleList, 0); + uiComboboxOnSelected(exampleList, onExampleChanged, NULL); + // and set up the first one + onExampleChanged(NULL, NULL); + + uiControlShow(uiControl(mainwin)); + uiMain(); + + // TODO free examples + + uiUninit(); + return 0; +} diff --git a/_wip/examples_drawtext_CMakeLists.txt b/_wip/examples_drawtext_CMakeLists.txt new file mode 100644 index 00000000..f2289d21 --- /dev/null +++ b/_wip/examples_drawtext_CMakeLists.txt @@ -0,0 +1,58 @@ +# 3 june 2016 + +if(WIN32) + set(_EXAMPLE_RESOURCES_RC resources.rc) +endif() + +macro(_add_example _name) + _add_exec(${_name} ${ARGN}) + # because Microsoft's toolchain is dumb + if(MSVC) + set_property(TARGET ${_name} APPEND_STRING PROPERTY + LINK_FLAGS " /ENTRY:mainCRTStartup") + endif() +endmacro() + +_add_example(controlgallery + controlgallery/main.c + ${_EXAMPLE_RESOURCES_RC} +) + +_add_example(histogram + histogram/main.c + ${_EXAMPLE_RESOURCES_RC} +) + +_add_example(cpp-multithread + cpp-multithread/main.cpp + ${_EXAMPLE_RESOURCES_RC} +) +if(NOT WIN32) + target_link_libraries(cpp-multithread pthread) +endif() + +_add_example(drawtext + drawtext/attributes.c + drawtext/basic.c + drawtext/emptystr_hittest.c + drawtext/hittest.c + drawtext/main.c + ${_EXAMPLE_RESOURCES_RC} +) +target_include_directories(drawtext + PRIVATE drawtext) + +_add_example(opentype + opentype/main.c + ${_EXAMPLE_RESOURCES_RC} +) +target_include_directories(opentype + PRIVATE opentype) + +add_custom_target(examples + DEPENDS + controlgallery + histogram + cpp-multithread + drawtext + opentype) diff --git a/_wip/examples_opentype/main.c b/_wip/examples_opentype/main.c new file mode 100644 index 00000000..0872aaa2 --- /dev/null +++ b/_wip/examples_opentype/main.c @@ -0,0 +1,201 @@ +// 10 june 2017 +#include +#include +#include +#include +#include "../../ui.h" + +// TODO the grid simply flat out does not work on OS X + +uiWindow *mainwin; +uiFontButton *fontButton; +uiEntry *textEntry; +uiCheckbox *nullFeatures; +uiArea *area; + +uiAttributedString *attrstr = NULL; + +static void remakeAttrStr(void) +{ + char *text; + uiOpenTypeFeatures *otf; + uiAttributeSpec spec; + + if (attrstr != NULL) + uiFreeAttributedString(attrstr); + + text = uiEntryText(textEntry); + attrstr = uiNewAttributedString(text); + uiFreeText(text); + + if (!uiCheckboxChecked(nullFeatures)) { + otf = uiNewOpenTypeFeatures(); + // TODO + spec.Type = uiAttributeFeatures; + spec.Features = otf; + uiAttributedStringSetAttribute(attrstr, &spec, + 0, uiAttributedStringLen(attrstr)); + // and uiAttributedString copied otf + uiFreeOpenTypeFeatures(otf); + } + + uiAreaQueueRedrawAll(area); +} + +// TODO make a variable of main()? in all programs? +static uiAreaHandler handler; + +static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p) +{ + uiDrawTextLayout *layout; + uiDrawTextLayoutParams lp; + uiDrawFontDescriptor desc; + + memset(&lp, 0, sizeof (uiDrawTextLayoutParams)); + lp.String = attrstr; + uiFontButtonFont(fontButton, &desc); + lp.DefaultFont = &desc; + lp.Width = p->AreaWidth; + lp.Align = uiDrawTextAlignLeft; + layout = uiDrawNewTextLayout(&lp); + uiDrawText(p->Context, layout, 0, 0); + uiDrawFreeTextLayout(layout); +} + +static void handlerMouseEvent(uiAreaHandler *a, uiArea *area, uiAreaMouseEvent *e) +{ + // do nothing +} + +static void handlerMouseCrossed(uiAreaHandler *ah, uiArea *a, int left) +{ + // do nothing +} + +static void handlerDragBroken(uiAreaHandler *ah, uiArea *a) +{ + // do nothing +} + +static int handlerKeyEvent(uiAreaHandler *ah, uiArea *a, uiAreaKeyEvent *e) +{ + // reject all keys + return 0; +} + +static void onFontChanged(uiFontButton *b, void *data) +{ + remakeAttrStr(); +} + +static void onTextChanged(uiEntry *e, void *data) +{ + remakeAttrStr(); +} + +static void onNULLToggled(uiCheckbox *c, void *data) +{ + remakeAttrStr(); +} + +static int onClosing(uiWindow *w, void *data) +{ + // TODO change the others to be like this? (the others destroy here rather than later) + // TODO move this below uiQuit()? + uiControlHide(uiControl(w)); + uiQuit(); + return 0; +} + +static int shouldQuit(void *data) +{ + uiControlDestroy(uiControl(mainwin)); + return 1; +} + +int main(void) +{ + uiInitOptions o; + const char *err; + uiGrid *grid; + uiBox *vbox; + + handler.Draw = handlerDraw; + handler.MouseEvent = handlerMouseEvent; + handler.MouseCrossed = handlerMouseCrossed; + handler.DragBroken = handlerDragBroken; + handler.KeyEvent = handlerKeyEvent; + + memset(&o, 0, sizeof (uiInitOptions)); + err = uiInit(&o); + if (err != NULL) { + fprintf(stderr, "error initializing ui: %s\n", err); + uiFreeInitError(err); + return 1; + } + + uiOnShouldQuit(shouldQuit, NULL); + + // TODO 800x600? the size of the GTK+ example? + mainwin = uiNewWindow("libui OpenType Features Example", 640, 480, 1); + uiWindowSetMargined(mainwin, 1); + uiWindowOnClosing(mainwin, onClosing, NULL); + + grid = uiNewGrid(); + uiGridSetPadded(grid, 1); + uiWindowSetChild(mainwin, uiControl(grid)); + + fontButton = uiNewFontButton(); + uiFontButtonOnChanged(fontButton, onFontChanged, NULL); + uiGridAppend(grid, uiControl(fontButton), + 0, 0, 1, 1, + // TODO are these Y values correct? + 0, uiAlignFill, 0, uiAlignCenter); + + textEntry = uiNewEntry(); + uiEntrySetText(textEntry, "afford afire aflight"); + uiEntryOnChanged(textEntry, onTextChanged, NULL); + uiGridAppend(grid, uiControl(textEntry), + 1, 0, 1, 1, + // TODO are these Y values correct too? + // TODO add a baseline align? or a form align? + 1, uiAlignFill, 0, uiAlignCenter); + + vbox = uiNewVerticalBox(); + uiBoxSetPadded(vbox, 1); + uiGridAppend(grid, uiControl(vbox), + 0, 1, 1, 1, + 0, uiAlignFill, 1, uiAlignFill); + + nullFeatures = uiNewCheckbox("NULL uiOpenTypeFeatures"); + uiCheckboxOnToggled(nullFeatures, onNULLToggled, NULL); + uiBoxAppend(vbox, uiControl(nullFeatures), 0); + + // TODO separator (if other stuff isn't a tab) + + // TODO needed for this to be testable on os x without rewriting everything again + { + int x; + + for (x = 0; x < 10; x++) + uiBoxAppend(vbox, uiControl(uiNewEntry()), 0); + } + + // TODO other stuff + + area = uiNewArea(&handler); + uiGridAppend(grid, uiControl(area), + 1, 1, 1, 1, + 1, uiAlignFill, 1, uiAlignFill); + + // and set up the initial draw + remakeAttrStr(); + + uiControlShow(uiControl(mainwin)); + uiMain(); + + uiControlDestroy(uiControl(mainwin)); + uiFreeAttributedString(attrstr); + uiUninit(); + return 0; +} diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 7f704032..4ef742d6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,13 +1,19 @@ # 3 june 2016 list(APPEND _LIBUI_SOURCES + common/attribute.c + common/attrlist.c + common/attrstr.c common/areaevents.c common/control.c common/debug.c +# common/drawtext.c common/matrix.c + common/opentype.c common/shouldquit.c common/table.c common/userbugs.c + common/utf.c ) set(_LIBUI_SOURCES ${_LIBUI_SOURCES} PARENT_SCOPE) diff --git a/common/areaevents.c b/common/areaevents.c index cf3c288c..491a7283 100644 --- a/common/areaevents.c +++ b/common/areaevents.c @@ -10,11 +10,13 @@ For GTK+, we pull the double-click time and double-click distance, which work th On GTK+ this will also allow us to discard the GDK_BUTTON_2PRESS and GDK_BUTTON_3PRESS events, so the button press stream will be just like on other platforms. Thanks to mclasen, garnacho_, halfline, and tristan in irc.gimp.net/#gtk+. + +TODO note the bits about asymmetry and g_rcClick initial value not mattering in the oldnewthing article */ // x, y, xdist, ydist, and c.rect must have the same units // so must time, maxTime, and c.prevTime -int clickCounterClick(clickCounter *c, int button, int x, int y, uintptr_t time, uintptr_t maxTime, int32_t xdist, int32_t ydist) +int uiprivClickCounterClick(uiprivClickCounter *c, int button, int x, int y, uintptr_t time, uintptr_t maxTime, int32_t xdist, int32_t ydist) { // different button than before? if so, don't count if (button != c->curButton) @@ -48,7 +50,7 @@ int clickCounterClick(clickCounter *c, int button, int x, int y, uintptr_t time, return c->count; } -void clickCounterReset(clickCounter *c) +void uiprivClickCounterReset(uiprivClickCounter *c) { c->curButton = 0; c->rectX0 = 0; @@ -149,7 +151,7 @@ static const struct { { 0xFFFF, 0 }, }; -int fromScancode(uintptr_t scancode, uiAreaKeyEvent *ke) +int uiprivFromScancode(uintptr_t scancode, uiAreaKeyEvent *ke) { int i; diff --git a/common/attribute.c b/common/attribute.c new file mode 100644 index 00000000..4a8f0160 --- /dev/null +++ b/common/attribute.c @@ -0,0 +1,266 @@ +// 19 february 2018 +#include "../ui.h" +#include "uipriv.h" +#include "attrstr.h" + +struct uiAttribute { + int ownedByUser; + size_t refcount; + uiAttributeType type; + union { + char *family; + double size; + uiTextWeight weight; + uiTextItalic italic; + uiTextStretch stretch; + struct { + double r; + double g; + double b; + double a; + // put this here so we can reuse this structure + uiUnderlineColor underlineColor; + } color; + uiUnderline underline; + uiOpenTypeFeatures *features; + } u; +}; + +static uiAttribute *newAttribute(uiAttributeType type) +{ + uiAttribute *a; + + a = uiprivNew(uiAttribute); + a->ownedByUser = 1; + a->refcount = 0; + a->type = type; + return a; +} + +// returns a to allow expressions like b = uiprivAttributeRetain(a) +// TODO would this allow us to copy attributes between strings in a foreach func, and if so, should that be allowed? +uiAttribute *uiprivAttributeRetain(uiAttribute *a) +{ + a->ownedByUser = 0; + a->refcount++; + return a; +} + +static void destroy(uiAttribute *a) +{ + switch (a->type) { + case uiAttributeTypeFamily: + uiprivFree(a->u.family); + break; + case uiAttributeTypeFeatures: + uiFreeOpenTypeFeatures(a->u.features); + break; + } + uiprivFree(a); +} + +void uiprivAttributeRelease(uiAttribute *a) +{ + if (a->ownedByUser) + /* TODO implementation bug: we can't release an attribute we don't own */; + a->refcount--; + if (a->refcount == 0) + destroy(a); +} + +void uiFreeAttribute(uiAttribute *a) +{ + if (!a->ownedByUser) + /* TODO user bug: you can't free an attribute you don't own */; + destroy(a); +} + +uiAttributeType uiAttributeGetType(const uiAttribute *a) +{ + return a->type; +} + +uiAttribute *uiNewFamilyAttribute(const char *family) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeFamily); + a->u.family = (char *) uiprivAlloc((strlen(family) + 1) * sizeof (char), "char[] (uiAttribute)"); + strcpy(a->u.family, family); + return a; +} + +const char *uiAttributeFamily(const uiAttribute *a) +{ + return a->u.family; +} + +uiAttribute *uiNewSizeAttribute(double size) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeSize); + a->u.size = size; + return a; +} + +double uiAttributeSize(const uiAttribute *a) +{ + return a->u.size; +} + +uiAttribute *uiNewWeightAttribute(uiTextWeight weight) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeWeight); + a->u.weight = weight; + return a; +} + +uiTextWeight uiAttributeWeight(const uiAttribute *a) +{ + return a->u.weight; +} + +uiAttribute *uiNewItalicAttribute(uiTextItalic italic) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeItalic); + a->u.italic = italic; + return a; +} + +uiTextItalic uiAttributeItalic(const uiAttribute *a) +{ + return a->u.italic; +} + +uiAttribute *uiNewStretchAttribute(uiTextStretch stretch) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeStretch); + a->u.stretch = stretch; + return a; +} + +uiTextStretch uiAttributeStretch(const uiAttribute *a) +{ + return a->u.stretch; +} + +uiAttribute *uiNewColorAttribute(double r, double g, double b, double a) +{ + uiAttribute *at; + + at = newAttribute(uiAttributeTypeColor); + at->u.color.r = r; + at->u.color.g = g; + at->u.color.b = b; + at->u.color.a = a; + return at; +} + +void uiAttributeColor(const uiAttribute *a, double *r, double *g, double *b, double *alpha) +{ + *r = a->u.color.r; + *g = a->u.color.g; + *b = a->u.color.b; + *alpha = a->u.color.a; +} + +uiAttribute *uiNewBackgroundAttribute(double r, double g, double b, double a) +{ + uiAttribute *at; + + at = newAttribute(uiAttributeTypeBackground); + at->u.color.r = r; + at->u.color.g = g; + at->u.color.b = b; + at->u.color.a = a; + return at; +} + +uiAttribute *uiNewUnderlineAttribute(uiUnderline u) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeUnderline); + a->u.underline = u; + return a; +} + +uiUnderline uiAttributeUnderline(const uiAttribute *a) +{ + return a->u.underline; +} + +uiAttribute *uiNewUnderlineColorAttribute(uiUnderlineColor u, double r, double g, double b, double a) +{ + uiAttribute *at; + + at = uiNewColorAttribute(r, g, b, a); + at->type = uiAttributeTypeUnderlineColor; + at->u.color.underlineColor = u; + return at; +} + +void uiAttributeUnderlineColor(const uiAttribute *a, uiUnderlineColor *u, double *r, double *g, double *b, double *alpha) +{ + *u = a->u.color.underlineColor; + uiAttributeColor(a, r, g, b, alpha); +} + +uiAttribute *uiNewFeaturesAttribute(const uiOpenTypeFeatures *otf) +{ + uiAttribute *a; + + a = newAttribute(uiAttributeTypeFeatures); + a->u.features = uiOpenTypeFeaturesClone(otf); + return a; +} + +const uiOpenTypeFeatures *uiAttributeFeatures(const uiAttribute *a) +{ + return a->u.features; +} + +int uiprivAttributeEqual(const uiAttribute *a, const uiAttribute *b) +{ + if (a == b) + return 1; + if (a->type != b->type) + return 0; + switch (a->type) { + case uiAttributeTypeFamily: + return uiprivStricmp(a->u.family, b->u.family); + case uiAttributeTypeSize: + // TODO is the use of == correct? + return a->u.size == b->u.size; + case uiAttributeTypeWeight: + return a->u.weight == b->u.weight; + case uiAttributeTypeItalic: + return a->u.italic == b->u.italic; + case uiAttributeTypeStretch: + return a->u.stretch == b->u.stretch; + case uiAttributeTypeUnderline: + return a->u.underline == b->u.underline; + case uiAttributeTypeUnderlineColor: + if (a->u.color.underlineColor != b->u.color.underlineColor) + return 0; + // fall through + case uiAttributeTypeColor: + case uiAttributeTypeBackground: + // TODO is the use of == correct? + return (a->u.color.r == b->u.color.r) && + (a->u.color.g == b->u.color.g) && + (a->u.color.b == b->u.color.b) && + (a->u.color.a == b->u.color.a); + case uiAttributeTypeFeatures: + return uiprivOpenTypeFeaturesEqual(a->u.features, b->u.features); + } + // TODO should not be reached + return 0; +} diff --git a/common/attrlist.c b/common/attrlist.c new file mode 100644 index 00000000..377778eb --- /dev/null +++ b/common/attrlist.c @@ -0,0 +1,612 @@ +// 16 december 2016 +#include "../ui.h" +#include "uipriv.h" +#include "attrstr.h" + +/* +An attribute list is a doubly linked list of attributes. +Attribute start positions are inclusive and attribute end positions are exclusive (or in other words, [start, end)). +The list is kept sorted in increasing order by start position. Whether or not the sort is stable is undefined, so no temporal information should be expected to stay. +Overlapping attributes are not allowed; if an attribute is added that conflicts with an existing one, the existing one is removed. +In addition, the linked list tries to reduce fragmentation: if an attribute is added that just expands another, then there will only be one entry in alist, not two. (TODO does it really?) +The linked list is not a ring; alist->fist->prev == NULL and alist->last->next == NULL. +TODO verify that this disallows attributes of length zero +*/ + +struct attr { + uiAttribute *val; + size_t start; + size_t end; + struct attr *prev; + struct attr *next; +}; + +struct uiprivAttrList { + struct attr *first; + struct attr *last; +}; + +// if before is NULL, add to the end of the list +static void attrInsertBefore(uiprivAttrList *alist, struct attr *a, struct attr *before) +{ + // if the list is empty, this is the first item + if (alist->first == NULL) { + alist->first = a; + alist->last = a; + return; + } + + // add to the end + if (before == NULL) { + struct attr *oldlast; + + oldlast = alist->last; + alist->last = a; + a->prev = oldlast; + oldlast->next = a; + return; + } + + // add to the beginning + if (before == alist->first) { + struct attr *oldfirst; + + oldfirst = alist->first; + alist->first = a; + oldfirst->prev = a; + a->next = oldfirst; + return; + } + + // add to the middle + a->prev = before->prev; + a->next = before; + before->prev = a; + a->prev->next = a; +} + +static int attrHasPos(struct attr *a, size_t pos) +{ + if (pos < a->start) + return 0; + return pos < a->end; +} + +// returns 1 if there was an intersection and 0 otherwise +static int attrRangeIntersect(struct attr *a, size_t *start, size_t *end) +{ + // is the range outside a entirely? + if (*start >= a->end) + return 0; + if (*end < a->start) + return 0; + + // okay, so there is an overlap + // compute the intersection + if (*start < a->start) + *start = a->start; + if (*end > a->end) + *end = a->end; + return 1; +} + +// returns the old a->next, for forward iteration +static struct attr *attrUnlink(uiprivAttrList *alist, struct attr *a) +{ + struct attr *p, *n; + + p = a->prev; + n = a->next; + a->prev = NULL; + a->next = NULL; + + // only item in list? + if (p == NULL && n == NULL) { + alist->first = NULL; + alist->last = NULL; + return NULL; + } + // start of list? + if (p == NULL) { + n->prev = NULL; + alist->first = n; + return n; + } + // end of list? + if (n == NULL) { + p->next = NULL; + alist->last = p; + return NULL; + } + // middle of list + p->next = n; + n->prev = p; + return n; +} + +// returns the old a->next, for forward iteration +static struct attr *attrDelete(uiprivAttrList *alist, struct attr *a) +{ + struct attr *next; + + next = attrUnlink(alist, a); + uiprivAttributeRelease(a->val); + uiprivFree(a); + return next; +} + +// attrDropRange() removes attributes without deleting characters. +// +// If the attribute needs no change, then nothing is done. +// +// If the attribute needs to be deleted, it is deleted. +// +// If the attribute only needs to be resized at the end, it is adjusted. +// +// If the attribute only needs to be resized at the start, it is adjusted, unlinked, and returned in tail. +// +// Otherwise, the attribute needs to be split. The existing attribute is adjusted to make the left half and a new attribute with the right half. This attribute is kept unlinked and returned in tail. +// +// In all cases, the return value is the next attribute to look at in a forward sequential loop. +static struct attr *attrDropRange(uiprivAttrList *alist, struct attr *a, size_t start, size_t end, struct attr **tail) +{ + struct attr *b; + + // always pre-initialize tail to NULL + *tail = NULL; + + if (!attrRangeIntersect(a, &start, &end)) + // out of range; nothing to do + return a->next; + + // just outright delete the attribute? + // the inequalities handle attributes entirely inside the range + // if both are equal, the attribute's range is equal to the range + if (a->start >= start && a->end <= end) + return attrDelete(alist, a); + + // only chop off the start or end? + if (a->start == start) { // chop off the start + // we are dropping the left half, so set a->start and unlink + a->start = end; + *tail = a; + return attrUnlink(alist, a); + } + if (a->end == end) { // chop off the end + // we are dropping the right half, so just set a->end + a->end = start; + return a->next; + } + + // we'll need to split the attribute into two + b = uiprivNew(struct attr); + b->val = uiprivAttributeRetain(a->val); + b->start = end; + b->end = a->end; + *tail = b; + + a->end = start; + return a->next; +} + +static void attrGrow(uiprivAttrList *alist, struct attr *a, size_t start, size_t end) +{ + struct attr *before; + + // adjusting the end is simple: if it ends before our new end, just set the new end + if (a->end < end) + a->end = end; + + // adjusting the start is harder + // if the start is before our new start, we are done + // otherwise, we have to move the start back AND reposition the attribute to keep the sorted order + if (a->start <= start) + return; + a->start = start; + attrUnlink(alist, a); + for (before = alist->first; before != NULL; before = before->next) + if (before->start > a->start) + break; + attrInsertBefore(alist, a, before); +} + +// returns the right side of the split, which is unlinked, or NULL if no split was done +static struct attr *attrSplitAt(uiprivAttrList *alist, struct attr *a, size_t at) +{ + struct attr *b; + + // no splittng needed? + // note the equality: we don't need to split at start or end + // in the end case, the last split point is at - 1; at itself is outside the range, and at - 1 results in the right hand side having length 1 + if (at <= a->start) + return NULL; + if (at >= a->end) + return NULL; + + b = uiprivNew(struct attr); + b->val = uiprivAttributeRetain(a->val); + b->start = at; + b->end = a->end; + + a->end = at; + return b; +} + +// attrDeleteRange() removes attributes while deleting characters. +// +// If the attribute does not include the deleted range, then nothing is done (though the start and end are adjusted as necessary). +// +// If the attribute needs to be deleted, it is deleted. +// +// Otherwise, the attribute only needs the start or end deleted, and it is adjusted. +// +// In all cases, the return value is the next attribute to look at in a forward sequential loop. +// TODO rewrite this comment +static struct attr *attrDeleteRange(uiprivAttrList *alist, struct attr *a, size_t start, size_t end) +{ + size_t ostart, oend; + size_t count; + + ostart = start; + oend = end; + count = oend - ostart; + + if (!attrRangeIntersect(a, &start, &end)) { + // out of range + // adjust if necessary + if (a->start >= ostart) + a->start -= count; + if (a->end >= oend) + a->end -= count; + return a->next; + } + + // just outright delete the attribute? + // the inequalities handle attributes entirely inside the range + // if both are equal, the attribute's range is equal to the range + if (a->start >= start && a->end <= end) + return attrDelete(alist, a); + + // only chop off the start or end? + if (a->start == start) { // chop off the start + // if we weren't adjusting positions this would just be setting a->start to end + // but since this is deleting from the start, we need to adjust both by count + a->start = end - count; + a->end -= count; + return a->next; + } + if (a->end == end) { // chop off the end + // a->start is already good + a->end = start; + return a->next; + } + + // in this case, the deleted range is inside the attribute + // we can clear it by just removing count from a->end + a->end -= count; + return a->next; +} + +uiprivAttrList *uiprivNewAttrList(void) +{ + return uiprivNew(uiprivAttrList); +} + +void uiprivFreeAttrList(uiprivAttrList *alist) +{ + struct attr *a, *next; + + a = alist->first; + while (a != NULL) { + next = a->next; + uiprivAttributeRelease(a->val); + uiprivFree(a); + a = next; + } + uiprivFree(alist); +} + +void uiprivAttrListInsertAttribute(uiprivAttrList *alist, uiAttribute *val, size_t start, size_t end) +{ + struct attr *a; + struct attr *before; + struct attr *tail = NULL; + int split = 0; + uiAttributeType valtype; + + // first, figure out where in the list this should go + // in addition, if this attribute overrides one that already exists, split that one apart so this one can take over + before = alist->first; + valtype = uiAttributeGetType(val); + while (before != NULL) { + size_t lstart, lend; + + // once we get to the first point after start, we know where to insert + if (before->start > start) + break; + + // if we have already split a prior instance of this attribute, don't bother doing it again + if (split) + goto next; + + // should we split this attribute? + if (uiAttributeGetType(before->val) != valtype) + goto next; + lstart = start; + lend = end; + if (!attrRangeIntersect(before, &lstart, &lend)) + goto next; + + // okay so this might conflict; if the val is the same as the one we want, we need to expand the existing attribute, not fragment anything + // TODO will this reduce fragmentation if we first add from 0 to 2 and then from 2 to 4? or do we have to do that separately? + if (uiprivAttributeEqual(before->val, val)) { + attrGrow(alist, before, start, end); + return; + } + // okay the values are different; we need to split apart + before = attrDropRange(alist, before, start, end, &tail); + split = 1; + continue; + + next: + before = before->next; + } + + // if we got here, we know we have to add the attribute before before + a = uiprivNew(struct attr); + a->val = uiprivAttributeRetain(val); + a->start = start; + a->end = end; + attrInsertBefore(alist, a, before); + + // and finally, if we split, insert the remainder + if (tail == NULL) + return; + // note we start at before; it won't be inserted before that by the sheer nature of how the code above works + for (; before != NULL; before = before->next) + if (before->start > tail->start) + break; + attrInsertBefore(alist, tail, before); +} + +void uiprivAttrListInsertCharactersUnattributed(uiprivAttrList *alist, size_t start, size_t count) +{ + struct attr *a; + struct attr *tails = NULL; + + // every attribute before the insertion point can either cross into the insertion point or not + // if it does, we need to split that attribute apart at the insertion point, keeping only the old attribute in place, adjusting the new tail, and preparing it for being re-added later + for (a = alist->first; a != NULL; a = a->next) { + struct attr *tail; + + // stop once we get to the insertion point + if (a->start >= start) + break; + // only do something if overlapping + if (!attrHasPos(a, start)) + continue; + + tail = attrSplitAt(alist, a, start); + // adjust the new tail for the insertion + tail->start += count; + tail->end += count; + // and queue it for re-adding later + // we can safely use tails as if it was singly-linked since it's just a temporary list; we properly merge them back in below and they'll be doubly-linked again then + // TODO actually we could probably save some time by making then doubly-linked now and adding them in one fell swoop, but that would make things a bit more complicated... + tail->next = tails; + tails = tail; + } + + // at this point in the attribute list, we are at or after the insertion point + // all the split-apart attributes will be at the insertion point + // therefore, we can just add them all back now, and the list will still be sorted correctly + while (tails != NULL) { + struct attr *next; + + // make all the links NULL before insertion, just to be safe + next = tails->next; + tails->next = NULL; + attrInsertBefore(alist, tails, a); + tails = next; + } + + // every remaining attribute will be either at or after the insertion point + // we just need to move them ahead + for (; a != NULL; a = a->next) { + a->start += count; + a->end += count; + } +} + +// The attributes are those of character start - 1. +// If start == 0, the attributes are those of character 0. +/* +This is an obtuse function. Here's some diagrams to help. + +Given the input string + abcdefghi (positions: 012345678 9) +and attribute set + red start 0 end 3 + bold start 2 end 6 + underline start 5 end 8 +or visually: + 012345678 9 + rrr------ + --bbbb--- + -----uuu- +If we insert qwe to result in positions 0123456789AB C: + +before 0, 1, 2 (grow the red part, move everything else down) + red -> start 0 (no change) end 3+3=6 + bold -> start 2+3=5 end 6+3=9 + underline -> start 5+3=8 end 8+3=B +before 3 (grow red and bold, move underline down) + red -> start 0 (no change) end 3+3=6 + bold -> start 2 (no change) end 6+3=9 + underline -> start 5+3=8 end 8+3=B +before 4, 5 (keep red, grow bold, move underline down) + red -> start 0 (no change) end 3 (no change) + bold -> start 2 (no change) end 6+3=9 + underline -> start 5+3=8 end 8+3=B +before 6 (keep red, grow bold and underline) + red -> start 0 (no change) end 3 (no change) + bold -> start 2 (no change) end 6+3=9 + underline -> start 5 (no change) end 8+3=B +before 7, 8 (keep red and bold, grow underline) + red -> start 0 (no change) end 3 (no change) + bold -> start 2 (no change) end 6 (no change) + underline -> start 5 (no change) end 8+3=B +before 9 (keep all three) + red -> start 0 (no change) end 3 (no change) + bold -> start 2 (no change) end 6 (no change) + underline -> start 5 (no change) end 8 (no change) + +result: + 0 1 2 3 4 5 6 7 8 9 + red E E E e n n n n n n + bold s s S E E E e n n n +underline s s s s s S E E e n +N = none +E = end only +S = start and end +uppercase = in original range, lowercase = not + +which results in our algorithm: + for each attribute + if start < insertion point + move start up + else if start == insertion point + if start != 0 + move start up + if end <= insertion point + move end up +*/ +// TODO does this ensure the list remains sorted? +void uiprivAttrListInsertCharactersExtendingAttributes(uiprivAttrList *alist, size_t start, size_t count) +{ + struct attr *a; + + for (a = alist->first; a != NULL; a = a->next) { + if (a->start < start) + a->start += count; + else if (a->start == start && start != 0) + a->start += count; + if (a->end <= start) + a->end += count; + } +} + +// TODO replace at point with — replaces with first character's attributes + +void uiprivAttrListRemoveAttribute(uiprivAttrList *alist, uiAttributeType type, size_t start, size_t end) +{ + struct attr *a; + struct attr *tails = NULL; // see uiprivAttrListInsertCharactersUnattributed() above + struct attr *tailsAt = NULL; + + a = alist->first; + while (a != NULL) { + size_t lstart, lend; + struct attr *tail; + + // this defines where to re-attach the tails + // (all the tails will have their start at end, so we can just insert them all before tailsAt) + if (a->start >= end) { + tailsAt = a; + // and at this point we're done, so + break; + } + if (uiAttributeGetType(a->val) != type) + goto next; + lstart = start; + lend = end; + if (!attrRangeIntersect(a, &lstart, &lend)) + goto next; + a = attrDropRange(alist, a, start, end, &tail); + if (tail != NULL) { + tail->next = tails; + tails = tail; + } + continue; + + next: + a = a->next; + } + + while (tails != NULL) { + struct attr *next; + + // make all the links NULL before insertion, just to be safe + next = tails->next; + tails->next = NULL; + attrInsertBefore(alist, tails, a); + tails = next; + } +} + +// TODO merge this with the above +void uiprivAttrListRemoveAttributes(uiprivAttrList *alist, size_t start, size_t end) +{ + struct attr *a; + struct attr *tails = NULL; // see uiprivAttrListInsertCharactersUnattributed() above + struct attr *tailsAt = NULL; + + a = alist->first; + while (a != NULL) { + size_t lstart, lend; + struct attr *tail; + + // this defines where to re-attach the tails + // (all the tails will have their start at end, so we can just insert them all before tailsAt) + if (a->start >= end) { + tailsAt = a; + // and at this point we're done, so + break; + } + lstart = start; + lend = end; + if (!attrRangeIntersect(a, &lstart, &lend)) + goto next; + a = attrDropRange(alist, a, start, end, &tail); + if (tail != NULL) { + tail->next = tails; + tails = tail; + } + continue; + + next: + a = a->next; + } + + while (tails != NULL) { + struct attr *next; + + // make all the links NULL before insertion, just to be safe + next = tails->next; + tails->next = NULL; + attrInsertBefore(alist, tails, a); + tails = next; + } +} + +void uiprivAttrListRemoveCharacters(uiprivAttrList *alist, size_t start, size_t end) +{ + struct attr *a; + + a = alist->first; + while (a != NULL) + a = attrDeleteRange(alist, a, start, end); +} + +void uiprivAttrListForEach(const uiprivAttrList *alist, const uiAttributedString *s, uiAttributedStringForEachAttributeFunc f, void *data) +{ + struct attr *a; + uiForEach ret; + + for (a = alist->first; a != NULL; a = a->next) { + ret = (*f)(s, a->val, a->start, a->end, data); + if (ret == uiForEachStop) + // TODO for all: break or return? + break; + } +} diff --git a/common/attrstr.c b/common/attrstr.c new file mode 100644 index 00000000..f2cdb66b --- /dev/null +++ b/common/attrstr.c @@ -0,0 +1,357 @@ +// 3 december 2016 +#include "../ui.h" +#include "uipriv.h" +#include "attrstr.h" + +struct uiAttributedString { + char *s; + size_t len; + + uiprivAttrList *attrs; + + // indiscriminately keep a UTF-16 copy of the string on all platforms so we can hand this off to the grapheme calculator + // this ensures no one platform has a speed advantage (sorry GTK+) + uint16_t *u16; + size_t u16len; + + size_t *u8tou16; + size_t *u16tou8; + + // this is lazily created to keep things from getting *too* slow + uiprivGraphemes *graphemes; +}; + +static void resize(uiAttributedString *s, size_t u8, size_t u16) +{ + s->len = u8; + s->s = (char *) uiprivRealloc(s->s, (s->len + 1) * sizeof (char), "char[] (uiAttributedString)"); + s->u8tou16 = (size_t *) uiprivRealloc(s->u8tou16, (s->len + 1) * sizeof (size_t), "size_t[] (uiAttributedString)"); + s->u16len = u16; + s->u16 = (uint16_t *) uiprivRealloc(s->u16, (s->u16len + 1) * sizeof (uint16_t), "uint16_t[] (uiAttributedString)"); + s->u16tou8 = (size_t *) uiprivRealloc(s->u16tou8, (s->u16len + 1) * sizeof (size_t), "size_t[] (uiAttributedString)"); +} + +uiAttributedString *uiNewAttributedString(const char *initialString) +{ + uiAttributedString *s; + + s = uiprivNew(uiAttributedString); + s->attrs = uiprivNewAttrList(); + uiAttributedStringAppendUnattributed(s, initialString); + return s; +} + +// TODO make sure that all implementations of uiprivNewGraphemes() work fine with empty strings; in particular, the Windows one might not +static void recomputeGraphemes(uiAttributedString *s) +{ + if (s->graphemes != NULL) + return; + if (uiprivGraphemesTakesUTF16()) { + s->graphemes = uiprivNewGraphemes(s->u16, s->u16len); + return; + } + s->graphemes = uiprivNewGraphemes(s->s, s->len); +} + +static void invalidateGraphemes(uiAttributedString *s) +{ + if (s->graphemes == NULL) + return; + uiprivFree(s->graphemes->pointsToGraphemes); + uiprivFree(s->graphemes->graphemesToPoints); + uiprivFree(s->graphemes); + s->graphemes = NULL; +} + +void uiFreeAttributedString(uiAttributedString *s) +{ + uiprivFreeAttrList(s->attrs); + invalidateGraphemes(s); + uiprivFree(s->u16tou8); + uiprivFree(s->u8tou16); + uiprivFree(s->u16); + uiprivFree(s->s); + uiprivFree(s); +} + +const char *uiAttributedStringString(const uiAttributedString *s) +{ + return s->s; +} + +size_t uiAttributedStringLen(const uiAttributedString *s) +{ + return s->len; +} + +static void u8u16len(const char *str, size_t *n8, size_t *n16) +{ + uint32_t rune; + char buf[4]; + uint16_t buf16[2]; + + *n8 = 0; + *n16 = 0; + while (*str) { + str = uiprivUTF8DecodeRune(str, 0, &rune); + // TODO document the use of the function vs a pointer subtract here + // TODO also we need to consider namespace collision with utf.h... + *n8 += uiprivUTF8EncodeRune(rune, buf); + *n16 += uiprivUTF16EncodeRune(rune, buf16); + } +} + +void uiAttributedStringAppendUnattributed(uiAttributedString *s, const char *str) +{ + uiAttributedStringInsertAtUnattributed(s, str, s->len); +} + +// this works (and returns true, which is what we want) at s->len too because s->s[s->len] is always going to be 0 due to us allocating s->len + 1 bytes and because uiprivRealloc() always zero-fills allocated memory +static int onCodepointBoundary(uiAttributedString *s, size_t at) +{ + uint8_t c; + + // for uiNewAttributedString() + if (s->s == NULL && at == 0) + return 1; + c = (uint8_t) (s->s[at]); + return c < 0x80 || c >= 0xC0; +} + +// TODO note that at must be on a codeoint boundary +void uiAttributedStringInsertAtUnattributed(uiAttributedString *s, const char *str, size_t at) +{ + uint32_t rune; + char buf[4]; + uint16_t buf16[2]; + size_t n8, n16; // TODO make loop-local? to avoid using them in the wrong place again + size_t old, old16; + size_t oldn8, oldn16; + size_t oldlen, old16len; + size_t at16; + size_t i; + + if (!onCodepointBoundary(s, at)) { + // TODO + } + + at16 = 0; + if (s->u8tou16 != NULL) + at16 = s->u8tou16[at]; + + // do this first to reclaim memory + invalidateGraphemes(s); + + // first figure out how much we need to grow by + // this includes post-validated UTF-8 + u8u16len(str, &n8, &n16); + + // and resize + old = at; + old16 = at16; + oldlen = s->len; + old16len = s->u16len; + resize(s, s->len + n8, s->u16len + n16); + + // move existing characters out of the way + // note the use of memmove(): https://twitter.com/rob_pike/status/737797688217894912 + memmove( + s->s + at + n8, + s->s + at, + (oldlen - at) * sizeof (char)); + memmove( + s->u16 + at16 + n16, + s->u16 + at16, + (old16len - at16) * sizeof (uint16_t)); + // note the + 1 for these; we want to copy the terminating null too + memmove( + s->u8tou16 + at + n8, + s->u8tou16 + at, + (oldlen - at + 1) * sizeof (size_t)); + memmove( + s->u16tou8 + at16 + n16, + s->u16tou8 + at16, + (old16len - at16 + 1) * sizeof (size_t)); + oldn8 = n8; + oldn16 = n16; + + // and copy + while (*str) { + size_t n; + + str = uiprivUTF8DecodeRune(str, 0, &rune); + n = uiprivUTF8EncodeRune(rune, buf); + n16 = uiprivUTF16EncodeRune(rune, buf16); + s->s[old] = buf[0]; + s->u8tou16[old] = old16; + if (n > 1) { + s->s[old + 1] = buf[1]; + s->u8tou16[old + 1] = old16; + } + if (n > 2) { + s->s[old + 2] = buf[2]; + s->u8tou16[old + 2] = old16; + } + if (n > 3) { + s->s[old + 3] = buf[3]; + s->u8tou16[old + 3] = old16; + } + s->u16[old16] = buf16[0]; + s->u16tou8[old16] = old; + if (n16 > 1) { + s->u16[old16 + 1] = buf16[1]; + s->u16tou8[old16 + 1] = old; + } + old += n; + old16 += n16; + } + // and have an index for the end of the string + // TODO is this done by the below? +//TODO s->u8tou16[old] = old16; +//TODO s->u16tou8[old16] = old; + + // and adjust the prior values in the conversion tables + // use <= so the terminating 0 gets updated too + for (i = 0; i <= oldlen - at; i++) + s->u8tou16[at + oldn8 + i] += s->u16len - old16len; + for (i = 0; i <= old16len - at16; i++) + s->u16tou8[at16 + oldn16 + i] += s->len - oldlen; + + // and finally do the attributes + uiprivAttrListInsertCharactersUnattributed(s->attrs, at, n8); +} + +// TODO document that end is the first index that will be maintained +void uiAttributedStringDelete(uiAttributedString *s, size_t start, size_t end) +{ + size_t start16, end16; + size_t count, count16; + size_t i; + + if (!onCodepointBoundary(s, start)) { + // TODO + } + if (!onCodepointBoundary(s, end)) { + // TODO + } + + count = end - start; + start16 = s->u8tou16[start]; + end16 = s->u8tou16[end]; + count16 = end16 - start16; + + invalidateGraphemes(s); + + // overwrite old characters + memmove( + s->s + start, + s->s + end, + (s->len - end) * sizeof (char)); + memmove( + s->u16 + start16, + s->u16 + end16, + (s->u16len - end16) * sizeof (uint16_t)); + // note the + 1 for these; we want to copy the terminating null too + memmove( + s->u8tou16 + start, + s->u8tou16 + end, + (s->len - end + 1) * sizeof (size_t)); + memmove( + s->u16tou8 + start16, + s->u16tou8 + end16, + (s->u16len - end16 + 1) * sizeof (size_t)); + + // update the conversion tables + // note the use of <= to include the null terminator + for (i = 0; i <= count; i++) + s->u8tou16[start + i] -= count16; + for (i = 0; i <= count16; i++) + s->u16tou8[start16 + i] -= count; + + // null-terminate the string + s->s[start + count] = 0; + s->u16[start16 + count16] = 0; + + // fix up attributes + uiprivAttrListRemoveCharacters(s->attrs, start, end); + + // and finally resize + resize(s, start + count, start16 + count16); +} + +void uiAttributedStringSetAttribute(uiAttributedString *s, uiAttribute *a, size_t start, size_t end) +{ + uiprivAttrListInsertAttribute(s->attrs, a, start, end); +} + +// LONGTERM introduce an iterator object instead? +void uiAttributedStringForEachAttribute(const uiAttributedString *s, uiAttributedStringForEachAttributeFunc f, void *data) +{ + uiprivAttrListForEach(s->attrs, s, f, data); +} + +// TODO figure out if we should count the grapheme past the end +size_t uiAttributedStringNumGraphemes(uiAttributedString *s) +{ + recomputeGraphemes(s); + return s->graphemes->len; +} + +size_t uiAttributedStringByteIndexToGrapheme(uiAttributedString *s, size_t pos) +{ + recomputeGraphemes(s); + if (uiprivGraphemesTakesUTF16()) + pos = s->u8tou16[pos]; + return s->graphemes->pointsToGraphemes[pos]; +} + +size_t uiAttributedStringGraphemeToByteIndex(uiAttributedString *s, size_t pos) +{ + recomputeGraphemes(s); + pos = s->graphemes->graphemesToPoints[pos]; + if (uiprivGraphemesTakesUTF16()) + pos = s->u16tou8[pos]; + return pos; +} + +// helpers for platform-specific code + +const uint16_t *uiprivAttributedStringUTF16String(const uiAttributedString *s) +{ + return s->u16; +} + +size_t uiprivAttributedStringUTF16Len(const uiAttributedString *s) +{ + return s->u16len; +} + +// TODO is this still needed given the below? +size_t uiprivAttributedStringUTF8ToUTF16(const uiAttributedString *s, size_t n) +{ + return s->u8tou16[n]; +} + +size_t *uiprivAttributedStringCopyUTF8ToUTF16Table(const uiAttributedString *s, size_t *n) +{ + size_t *out; + size_t nbytes; + + nbytes = (s->len + 1) * sizeof (size_t); + *n = s->len; + out = (size_t *) uiprivAlloc(nbytes, "size_t[] (uiAttributedString)"); + memmove(out, s->u8tou16, nbytes); + return out; +} + +size_t *uiprivAttributedStringCopyUTF16ToUTF8Table(const uiAttributedString *s, size_t *n) +{ + size_t *out; + size_t nbytes; + + nbytes = (s->u16len + 1) * sizeof (size_t); + *n = s->u16len; + out = (size_t *) uiprivAlloc(nbytes, "size_t[] (uiAttributedString)"); + memmove(out, s->u16tou8, nbytes); + return out; +} diff --git a/common/attrstr.h b/common/attrstr.h new file mode 100644 index 00000000..69ada5c1 --- /dev/null +++ b/common/attrstr.h @@ -0,0 +1,46 @@ +// 19 february 2018 + +#ifdef __cplusplus +extern "C" { +#endif + +// attribute.c +extern uiAttribute *uiprivAttributeRetain(uiAttribute *a); +extern void uiprivAttributeRelease(uiAttribute *a); +extern int uiprivAttributeEqual(const uiAttribute *a, const uiAttribute *b); + +// opentype.c +extern int uiprivOpenTypeFeaturesEqual(const uiOpenTypeFeatures *a, const uiOpenTypeFeatures *b); + +// attrlist.c +typedef struct uiprivAttrList uiprivAttrList; +extern uiprivAttrList *uiprivNewAttrList(void); +extern void uiprivFreeAttrList(uiprivAttrList *alist); +extern void uiprivAttrListInsertAttribute(uiprivAttrList *alist, uiAttribute *val, size_t start, size_t end); +extern void uiprivAttrListInsertCharactersUnattributed(uiprivAttrList *alist, size_t start, size_t count); +extern void uiprivAttrListInsertCharactersExtendingAttributes(uiprivAttrList *alist, size_t start, size_t count); +extern void uiprivAttrListRemoveAttribute(uiprivAttrList *alist, uiAttributeType type, size_t start, size_t end); +extern void uiprivAttrListRemoveAttributes(uiprivAttrList *alist, size_t start, size_t end); +extern void uiprivAttrListRemoveCharacters(uiprivAttrList *alist, size_t start, size_t end); +extern void uiprivAttrListForEach(const uiprivAttrList *alist, const uiAttributedString *s, uiAttributedStringForEachAttributeFunc f, void *data); + +// attrstr.c +extern const uint16_t *uiprivAttributedStringUTF16String(const uiAttributedString *s); +extern size_t uiprivAttributedStringUTF16Len(const uiAttributedString *s); +extern size_t uiprivAttributedStringUTF8ToUTF16(const uiAttributedString *s, size_t n); +extern size_t *uiprivAttributedStringCopyUTF8ToUTF16Table(const uiAttributedString *s, size_t *n); +extern size_t *uiprivAttributedStringCopyUTF16ToUTF8Table(const uiAttributedString *s, size_t *n); + +// per-OS graphemes.c/graphemes.cpp/graphemes.m/etc. +typedef struct uiprivGraphemes uiprivGraphemes; +struct uiprivGraphemes { + size_t len; + size_t *pointsToGraphemes; + size_t *graphemesToPoints; +}; +extern int uiprivGraphemesTakesUTF16(void); +extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len); + +#ifdef __cplusplus +} +#endif diff --git a/common/control.c b/common/control.c index 28066461..98cb94aa 100644 --- a/common/control.c +++ b/common/control.c @@ -57,14 +57,14 @@ void uiControlDisable(uiControl *c) (*(c->Disable))(c); } -#define uiControlSignature 0x7569436F +#define uiprivControlSignature 0x7569436F uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr) { uiControl *c; - c = (uiControl *) uiAlloc(size, typenamestr); - c->Signature = uiControlSignature; + c = (uiControl *) uiprivAlloc(size, typenamestr); + c->Signature = uiprivControlSignature; c->OSSignature = OSsig; c->TypeSignature = typesig; return c; @@ -73,8 +73,8 @@ uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const c void uiFreeControl(uiControl *c) { if (uiControlParent(c) != NULL) - userbug("You cannot destroy a uiControl while it still has a parent. (control: %p)", c); - uiFree(c); + uiprivUserBug("You cannot destroy a uiControl while it still has a parent. (control: %p)", c); + uiprivFree(c); } void uiControlVerifySetParent(uiControl *c, uiControl *parent) @@ -82,12 +82,12 @@ void uiControlVerifySetParent(uiControl *c, uiControl *parent) uiControl *curParent; if (uiControlToplevel(c)) - userbug("You cannot give a toplevel uiControl a parent. (control: %p)", c); + uiprivUserBug("You cannot give a toplevel uiControl a parent. (control: %p)", c); curParent = uiControlParent(c); if (parent != NULL && curParent != NULL) - userbug("You cannot give a uiControl a parent while it already has one. (control: %p; current parent: %p; new parent: %p)", c, curParent, parent); + uiprivUserBug("You cannot give a uiControl a parent while it already has one. (control: %p; current parent: %p; new parent: %p)", c, curParent, parent); if (parent == NULL && curParent == NULL) - implbug("attempt to double unparent uiControl %p", c); + uiprivImplBug("attempt to double unparent uiControl %p", c); } int uiControlEnabledToUser(uiControl *c) diff --git a/common/controlsigs.h b/common/controlsigs.h index 1cbf18d5..944afa9b 100644 --- a/common/controlsigs.h +++ b/common/controlsigs.h @@ -1,5 +1,7 @@ // 24 april 2016 +// LONGTERM if I don't decide to remove these outright, should they be renamed uiprivTypeNameSignature? these aren't real symbols, so... + #define uiAreaSignature 0x41726561 #define uiBoxSignature 0x426F784C #define uiButtonSignature 0x42746F6E diff --git a/common/debug.c b/common/debug.c index 97280b47..aa24e29f 100644 --- a/common/debug.c +++ b/common/debug.c @@ -2,20 +2,20 @@ #include "../ui.h" #include "uipriv.h" -void _implbug(const char *file, const char *line, const char *func, const char *format, ...) +void uiprivDoImplBug(const char *file, const char *line, const char *func, const char *format, ...) { va_list ap; va_start(ap, format); - realbug(file, line, func, "POSSIBLE IMPLEMENTATION BUG; CONTACT ANDLABS:\n", format, ap); + uiprivRealBug(file, line, func, "POSSIBLE IMPLEMENTATION BUG; CONTACT ANDLABS:\n", format, ap); va_end(ap); } -void _userbug(const char *file, const char *line, const char *func, const char *format, ...) +void uiprivDoUserBug(const char *file, const char *line, const char *func, const char *format, ...) { va_list ap; va_start(ap, format); - realbug(file, line, func, "You have a bug: ", format, ap); + uiprivRealBug(file, line, func, "You have a bug: ", format, ap); va_end(ap); } diff --git a/common/matrix.c b/common/matrix.c index 676885d1..93d4d357 100644 --- a/common/matrix.c +++ b/common/matrix.c @@ -18,7 +18,7 @@ void uiDrawMatrixSetIdentity(uiDrawMatrix *m) // see https://msdn.microsoft.com/en-us/library/windows/desktop/ff684171%28v=vs.85%29.aspx#skew_transform // TODO see if there's a way we can avoid the multiplication -void fallbackSkew(uiDrawMatrix *m, double x, double y, double xamount, double yamount) +void uiprivFallbackSkew(uiDrawMatrix *m, double x, double y, double xamount, double yamount) { uiDrawMatrix n; @@ -31,7 +31,7 @@ void fallbackSkew(uiDrawMatrix *m, double x, double y, double xamount, double ya uiDrawMatrixMultiply(m, &n); } -void scaleCenter(double xCenter, double yCenter, double *x, double *y) +void uiprivScaleCenter(double xCenter, double yCenter, double *x, double *y) { *x = xCenter - (*x * xCenter); *y = yCenter - (*y * yCenter); @@ -39,7 +39,7 @@ void scaleCenter(double xCenter, double yCenter, double *x, double *y) // the basic algorithm is from cairo // but it's the same algorithm as the transform point, just without M31 and M32 taken into account, so let's just do that instead -void fallbackTransformSize(uiDrawMatrix *m, double *x, double *y) +void uiprivFallbackTransformSize(uiDrawMatrix *m, double *x, double *y) { uiDrawMatrix m2; diff --git a/common/opentype.c b/common/opentype.c new file mode 100644 index 00000000..e579b612 --- /dev/null +++ b/common/opentype.c @@ -0,0 +1,165 @@ +// 25 february 2018 +#include +#include "../ui.h" +#include "uipriv.h" +#include "attrstr.h" + +struct feature { + char a; + char b; + char c; + char d; + uint32_t value; +}; + +struct uiOpenTypeFeatures { + struct feature *data; + size_t len; + size_t cap; +}; + +#define bytecount(n) ((n) * sizeof (struct feature)) + +uiOpenTypeFeatures *uiNewOpenTypeFeatures(void) +{ + uiOpenTypeFeatures *otf; + + otf = uiprivNew(uiOpenTypeFeatures); + otf->cap = 16; + otf->data = (struct feature *) uiprivAlloc(bytecount(otf->cap), "struct feature[]"); + otf->len = 0; + return otf; +} + +void uiFreeOpenTypeFeatures(uiOpenTypeFeatures *otf) +{ + uiprivFree(otf->data); + uiprivFree(otf); +} + +uiOpenTypeFeatures *uiOpenTypeFeaturesClone(const uiOpenTypeFeatures *otf) +{ + uiOpenTypeFeatures *ret; + + ret = uiprivNew(uiOpenTypeFeatures); + ret->len = otf->len; + ret->cap = otf->cap; + ret->data = (struct feature *) uiprivAlloc(bytecount(ret->cap), "struct feature[]"); + memset(ret->data, 0, bytecount(ret->cap)); + memmove(ret->data, otf->data, bytecount(ret->len)); + return ret; +} + +#define intdiff(a, b) (((int) (a)) - ((int) (b))) + +static int featurecmp(const void *a, const void *b) +{ + const struct feature *f = (const struct feature *) a; + const struct feature *g = (const struct feature *) b; + + if (f->a != g->a) + return intdiff(f->a, g->a); + if (f->b != g->b) + return intdiff(f->b, g->b); + if (f->c != g->c) + return intdiff(f->c, g->c); + return intdiff(f->d, g->d); +} + +static struct feature mkkey(char a, char b, char c, char d) +{ + struct feature f; + + f.a = a; + f.b = b; + f.c = c; + f.d = d; + return f; +} + +#define find(pkey, otf) bsearch(pkey, otf->data, otf->len, sizeof (struct feature), featurecmp) + +void uiOpenTypeFeaturesAdd(uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value) +{ + struct feature *f; + struct feature key; + + // replace existing value if any + key = mkkey(a, b, c, d); + f = (struct feature *) find(&key, otf); + if (f != NULL) { + f->value = value; + return; + } + + // if we got here, the tag is new + if (otf->len == otf->cap) { + otf->cap *= 2; + otf->data = (struct feature *) uiprivRealloc(otf->data, bytecount(otf->cap), "struct feature[]"); + } + f = otf->data + otf->len; + f->a = a; + f->b = b; + f->c = c; + f->d = d; + f->value = value; + // LONGTERM qsort here is overkill + otf->len++; + qsort(otf->data, otf->len, sizeof (struct feature), featurecmp); +} + +void uiOpenTypeFeaturesRemove(uiOpenTypeFeatures *otf, char a, char b, char c, char d) +{ + struct feature *f; + struct feature key; + ptrdiff_t index; + size_t count; + + key = mkkey(a, b, c, d); + f = (struct feature *) find(&key, otf); + if (f == NULL) + return; + + index = f - otf->data; + count = otf->len - index - 1; + memmove(f + 1, f, bytecount(count)); + otf->len--; +} + +int uiOpenTypeFeaturesGet(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t *value) +{ + const struct feature *f; + struct feature key; + + key = mkkey(a, b, c, d); + f = (const struct feature *) find(&key, otf); + if (f == NULL) + return 0; + *value = f->value; + return 1; +} + +void uiOpenTypeFeaturesForEach(const uiOpenTypeFeatures *otf, uiOpenTypeFeaturesForEachFunc f, void *data) +{ + size_t n; + const struct feature *p; + uiForEach ret; + + p = otf->data; + for (n = 0; n < otf->len; n++) { + ret = (*f)(otf, p->a, p->b, p->c, p->d, p->value, data); + // TODO for all: require exact match? + if (ret == uiForEachStop) + return; + p++; + } +} + +int uiprivOpenTypeFeaturesEqual(const uiOpenTypeFeatures *a, const uiOpenTypeFeatures *b) +{ + if (a == b) + return 1; + if (a->len != b->len) + return 0; + return memcmp(a->data, b->data, bytecount(a->len)) == 0; +} diff --git a/common/shouldquit.c b/common/shouldquit.c index 4e7aa5c3..df57b6c5 100644 --- a/common/shouldquit.c +++ b/common/shouldquit.c @@ -8,7 +8,7 @@ static int defaultOnShouldQuit(void *data) } static int (*onShouldQuit)(void *) = defaultOnShouldQuit; -static void *onShouldQuitData; +static void *onShouldQuitData = NULL; void uiOnShouldQuit(int (*f)(void *), void *data) { @@ -16,7 +16,7 @@ void uiOnShouldQuit(int (*f)(void *), void *data) onShouldQuitData = data; } -int shouldQuit(void) +int uiprivShouldQuit(void) { return (*onShouldQuit)(onShouldQuitData); } diff --git a/common/uipriv.h b/common/uipriv.h index d6b54e89..6441ada5 100644 --- a/common/uipriv.h +++ b/common/uipriv.h @@ -1,41 +1,47 @@ // 6 april 2015 +// note: this file should not include ui.h, as the OS-specific ui_*.h files are included between that one and this one in the OS-specific uipriv_*.h* files +#include +#include +#include "controlsigs.h" +#include "utf.h" + #ifdef __cplusplus extern "C" { #endif -#include -#include "controlsigs.h" +// OS-specific init.* or main.* files +extern uiInitOptions uiprivOptions; -extern uiInitOptions options; +// OS-specific alloc.* files +extern void *uiprivAlloc(size_t, const char *); +#define uiprivNew(T) ((T *) uiprivAlloc(sizeof (T), #T)) +extern void *uiprivRealloc(void *, size_t, const char *); +extern void uiprivFree(void *); -extern void *uiAlloc(size_t, const char *); -#define uiNew(T) ((T *) uiAlloc(sizeof (T), #T)) -extern void *uiRealloc(void *, size_t, const char *); -extern void uiFree(void *); - -// ugh, this was only introduced in MSVC 2015... +// debug.c and OS-specific debug.* files +// TODO get rid of this mess... +// ugh, __func__ was only introduced in MSVC 2015... #ifdef _MSC_VER -#define __func__ __FUNCTION__ +#define uiprivMacro__func__ __FUNCTION__ +#else +#define uiprivMacro__func__ __func__ #endif -extern void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap); -#define _ns2(s) #s -#define _ns(s) _ns2(s) -extern void _implbug(const char *file, const char *line, const char *func, const char *format, ...); -#define implbug(...) _implbug(__FILE__, _ns(__LINE__), __func__, __VA_ARGS__) -extern void _userbug(const char *file, const char *line, const char *func, const char *format, ...); -#define userbug(...) _userbug(__FILE__, _ns(__LINE__), __func__, __VA_ARGS__) - -// control.c -extern uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr); +extern void uiprivRealBug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap); +#define uiprivMacro_ns2(s) #s +#define uiprivMacro_ns(s) uiprivMacro_ns2(s) +extern void uiprivDoImplBug(const char *file, const char *line, const char *func, const char *format, ...); +#define uiprivImplBug(...) uiprivDoImplBug(__FILE__, uiprivMacro_ns(__LINE__), uiprivMacro__func__, __VA_ARGS__) +extern void uiprivDoUserBug(const char *file, const char *line, const char *func, const char *format, ...); +#define uiprivUserBug(...) uiprivDoUserBug(__FILE__, uiprivMacro_ns(__LINE__), uiprivMacro__func__, __VA_ARGS__) // shouldquit.c -extern int shouldQuit(void); +extern int uiprivShouldQuit(void); // areaevents.c -typedef struct clickCounter clickCounter; +typedef struct uiprivClickCounter uiprivClickCounter; // you should call Reset() to zero-initialize a new instance // it doesn't matter that all the non-count fields are zero: the first click will fail the curButton test straightaway, so it'll return 1 and set the rest of the structure accordingly -struct clickCounter { +struct uiprivClickCounter { int curButton; int rectX0; int rectY0; @@ -44,14 +50,17 @@ struct clickCounter { uintptr_t prevTime; int count; }; -int clickCounterClick(clickCounter *c, int button, int x, int y, uintptr_t time, uintptr_t maxTime, int32_t xdist, int32_t ydist); -extern void clickCounterReset(clickCounter *); -extern int fromScancode(uintptr_t, uiAreaKeyEvent *); +extern int uiprivClickCounterClick(uiprivClickCounter *c, int button, int x, int y, uintptr_t time, uintptr_t maxTime, int32_t xdist, int32_t ydist); +extern void uiprivClickCounterReset(uiprivClickCounter *); +extern int uiprivFromScancode(uintptr_t, uiAreaKeyEvent *); // matrix.c -extern void fallbackSkew(uiDrawMatrix *, double, double, double, double); -extern void scaleCenter(double, double, double *, double *); -extern void fallbackTransformSize(uiDrawMatrix *, double *, double *); +extern void uiprivFallbackSkew(uiDrawMatrix *, double, double, double, double); +extern void uiprivScaleCenter(double, double, double *, double *); +extern void uiprivFallbackTransformSize(uiDrawMatrix *, double *, double *); + +// OS-specific text.* files +extern int uiprivStricmp(const char *a, const char *b); #ifdef __cplusplus } diff --git a/common/userbugs.c b/common/userbugs.c index 0a85874c..09cc703d 100644 --- a/common/userbugs.c +++ b/common/userbugs.c @@ -4,5 +4,5 @@ void uiUserBugCannotSetParentOnToplevel(const char *type) { - userbug("You cannot make a %s a child of another uiControl,", type); + uiprivUserBug("You cannot make a %s a child of another uiControl,", type); } diff --git a/common/utf.c b/common/utf.c new file mode 100644 index 00000000..5577529b --- /dev/null +++ b/common/utf.c @@ -0,0 +1,348 @@ +// utf by pietro gagliardi (andlabs) — https://github.com/andlabs/utf/ +// 10 november 2016 +// function names have been altered to avoid namespace collisions in libui static builds (see utf.h) +#include "utf.h" + +// this code imitates Go's unicode/utf8 and unicode/utf16 +// the biggest difference is that a rune is unsigned instead of signed (because Go guarantees what a right shift on a signed number will do, whereas C does not) +// it is also an imitation so we can license it under looser terms than the Go source +#define badrune 0xFFFD + +// encoded must be at most 4 bytes +// TODO clean this code up somehow +size_t uiprivUTF8EncodeRune(uint32_t rune, char *encoded) +{ + uint8_t b, c, d, e; + size_t n; + + // not in the valid range for Unicode + if (rune > 0x10FFFF) + rune = badrune; + // surrogate runes cannot be encoded + if (rune >= 0xD800 && rune < 0xE000) + rune = badrune; + + if (rune < 0x80) { // ASCII bytes represent themselves + b = (uint8_t) (rune & 0xFF); + n = 1; + goto done; + } + if (rune < 0x800) { // two-byte encoding + c = (uint8_t) (rune & 0x3F); + c |= 0x80; + rune >>= 6; + b = (uint8_t) (rune & 0x1F); + b |= 0xC0; + n = 2; + goto done; + } + if (rune < 0x10000) { // three-byte encoding + d = (uint8_t) (rune & 0x3F); + d |= 0x80; + rune >>= 6; + c = (uint8_t) (rune & 0x3F); + c |= 0x80; + rune >>= 6; + b = (uint8_t) (rune & 0x0F); + b |= 0xE0; + n = 3; + goto done; + } + // otherwise use a four-byte encoding + e = (uint8_t) (rune & 0x3F); + e |= 0x80; + rune >>= 6; + d = (uint8_t) (rune & 0x3F); + d |= 0x80; + rune >>= 6; + c = (uint8_t) (rune & 0x3F); + c |= 0x80; + rune >>= 6; + b = (uint8_t) (rune & 0x07); + b |= 0xF0; + n = 4; + +done: + encoded[0] = b; + if (n > 1) + encoded[1] = c; + if (n > 2) + encoded[2] = d; + if (n > 3) + encoded[3] = e; + return n; +} + +const char *uiprivUTF8DecodeRune(const char *s, size_t nElem, uint32_t *rune) +{ + uint8_t b, c; + uint8_t lowestAllowed, highestAllowed; + size_t i, expected; + int bad; + + b = (uint8_t) (*s); + if (b < 0x80) { // ASCII bytes represent themselves + *rune = b; + s++; + return s; + } + // 0xC0 and 0xC1 cover 2-byte overlong equivalents + // 0xF5 to 0xFD cover values > 0x10FFFF + // 0xFE and 0xFF were never defined (always illegal) + if (b < 0xC2 || b > 0xF4) { // invalid + *rune = badrune; + s++; + return s; + } + + // this determines the range of allowed first continuation bytes + lowestAllowed = 0x80; + highestAllowed = 0xBF; + switch (b) { + case 0xE0: + // disallow 3-byte overlong equivalents + lowestAllowed = 0xA0; + break; + case 0xED: + // disallow surrogate characters + highestAllowed = 0x9F; + break; + case 0xF0: + // disallow 4-byte overlong equivalents + lowestAllowed = 0x90; + break; + case 0xF4: + // disallow values > 0x10FFFF + highestAllowed = 0x8F; + break; + } + + // and this determines how many continuation bytes are expected + expected = 1; + if (b >= 0xE0) + expected++; + if (b >= 0xF0) + expected++; + if (nElem != 0) { // are there enough bytes? + nElem--; + if (nElem < expected) { // nope + *rune = badrune; + s++; + return s; + } + } + + // ensure that everything is correct + // if not, **only** consume the initial byte + bad = 0; + for (i = 0; i < expected; i++) { + c = (uint8_t) (s[1 + i]); + if (c < lowestAllowed || c > highestAllowed) { + bad = 1; + break; + } + // the old lowestAllowed and highestAllowed is only for the first continuation byte + lowestAllowed = 0x80; + highestAllowed = 0xBF; + } + if (bad) { + *rune = badrune; + s++; + return s; + } + + // now do the topmost bits + if (b < 0xE0) + *rune = b & 0x1F; + else if (b < 0xF0) + *rune = b & 0x0F; + else + *rune = b & 0x07; + s++; // we can finally move on + + // now do the continuation bytes + for (; expected; expected--) { + c = (uint8_t) (*s); + s++; + c &= 0x3F; // strip continuation bits + *rune <<= 6; + *rune |= c; + } + + return s; +} + +// encoded must have at most 2 elements +size_t uiprivUTF16EncodeRune(uint32_t rune, uint16_t *encoded) +{ + uint16_t low, high; + + // not in the valid range for Unicode + if (rune > 0x10FFFF) + rune = badrune; + // surrogate runes cannot be encoded + if (rune >= 0xD800 && rune < 0xE000) + rune = badrune; + + if (rune < 0x10000) { + encoded[0] = (uint16_t) rune; + return 1; + } + + rune -= 0x10000; + low = (uint16_t) (rune & 0x3FF); + rune >>= 10; + high = (uint16_t) (rune & 0x3FF); + encoded[0] = high | 0xD800; + encoded[1] = low | 0xDC00; + return 2; +} + +// TODO see if this can be cleaned up somehow +const uint16_t *uiprivUTF16DecodeRune(const uint16_t *s, size_t nElem, uint32_t *rune) +{ + uint16_t high, low; + + if (*s < 0xD800 || *s >= 0xE000) { + // self-representing character + *rune = *s; + s++; + return s; + } + if (*s >= 0xDC00) { + // out-of-order surrogates + *rune = badrune; + s++; + return s; + } + if (nElem == 1) { // not enough elements + *rune = badrune; + s++; + return s; + } + high = *s; + high &= 0x3FF; + if (s[1] < 0xDC00 || s[1] >= 0xE000) { + // bad surrogate pair + *rune = badrune; + s++; + return s; + } + s++; + low = *s; + s++; + low &= 0x3FF; + *rune = high; + *rune <<= 10; + *rune |= low; + *rune += 0x10000; + return s; +} + +// TODO find a way to reduce the code in all of these somehow +// TODO find a way to remove u as well +size_t uiprivUTF8RuneCount(const char *s, size_t nElem) +{ + size_t len; + uint32_t rune; + + if (nElem != 0) { + const char *t, *u; + + len = 0; + t = s; + while (nElem != 0) { + u = uiprivUTF8DecodeRune(t, nElem, &rune); + len++; + nElem -= u - t; + t = u; + } + return len; + } + len = 0; + while (*s) { + s = uiprivUTF8DecodeRune(s, nElem, &rune); + len++; + } + return len; +} + +size_t uiprivUTF8UTF16Count(const char *s, size_t nElem) +{ + size_t len; + uint32_t rune; + uint16_t encoded[2]; + + if (nElem != 0) { + const char *t, *u; + + len = 0; + t = s; + while (nElem != 0) { + u = uiprivUTF8DecodeRune(t, nElem, &rune); + len += uiprivUTF16EncodeRune(rune, encoded); + nElem -= u - t; + t = u; + } + return len; + } + len = 0; + while (*s) { + s = uiprivUTF8DecodeRune(s, nElem, &rune); + len += uiprivUTF16EncodeRune(rune, encoded); + } + return len; +} + +size_t uiprivUTF16RuneCount(const uint16_t *s, size_t nElem) +{ + size_t len; + uint32_t rune; + + if (nElem != 0) { + const uint16_t *t, *u; + + len = 0; + t = s; + while (nElem != 0) { + u = uiprivUTF16DecodeRune(t, nElem, &rune); + len++; + nElem -= u - t; + t = u; + } + return len; + } + len = 0; + while (*s) { + s = uiprivUTF16DecodeRune(s, nElem, &rune); + len++; + } + return len; +} + +size_t uiprivUTF16UTF8Count(const uint16_t *s, size_t nElem) +{ + size_t len; + uint32_t rune; + char encoded[4]; + + if (nElem != 0) { + const uint16_t *t, *u; + + len = 0; + t = s; + while (nElem != 0) { + u = uiprivUTF16DecodeRune(t, nElem, &rune); + len += uiprivUTF8EncodeRune(rune, encoded); + nElem -= u - t; + t = u; + } + return len; + } + len = 0; + while (*s) { + s = uiprivUTF16DecodeRune(s, nElem, &rune); + len += uiprivUTF8EncodeRune(rune, encoded); + } + return len; +} diff --git a/common/utf.h b/common/utf.h new file mode 100644 index 00000000..41e556f8 --- /dev/null +++ b/common/utf.h @@ -0,0 +1,65 @@ +// utf by pietro gagliardi (andlabs) — https://github.com/andlabs/utf/ +// 10 november 2016 + +// note the overridden names with uipriv at the beginning; this avoids potential symbol clashes when building libui as a static library +// LONGTERM find a way to encode the name overrides directly into the utf library + +#ifdef __cplusplus +extern "C" { +#endif + +// TODO (for utf itself as well) should this go outside the extern "C" block or not +#include +#include + +// if nElem == 0, assume the buffer has no upper limit and is '\0' terminated +// otherwise, assume buffer is NOT '\0' terminated but is bounded by nElem *elements* + +extern size_t uiprivUTF8EncodeRune(uint32_t rune, char *encoded); +extern const char *uiprivUTF8DecodeRune(const char *s, size_t nElem, uint32_t *rune); +extern size_t uiprivUTF16EncodeRune(uint32_t rune, uint16_t *encoded); +extern const uint16_t *uiprivUTF16DecodeRune(const uint16_t *s, size_t nElem, uint32_t *rune); + +extern size_t uiprivUTF8RuneCount(const char *s, size_t nElem); +extern size_t uiprivUTF8UTF16Count(const char *s, size_t nElem); +extern size_t uiprivUTF16RuneCount(const uint16_t *s, size_t nElem); +extern size_t uiprivUTF16UTF8Count(const uint16_t *s, size_t nElem); + +#ifdef __cplusplus +} + +// Provide overloads on Windows for using these functions with wchar_t and WCHAR when wchar_t is a keyword in C++ mode (the default). +// Otherwise, you'd need to cast to pass a wchar_t pointer, WCHAR pointer, or equivalent to these functions. +// We use __wchar_t to be independent of the setting; see https://blogs.msdn.microsoft.com/oldnewthing/20161201-00/?p=94836 (ironically posted one day after I initially wrote this code!). +// TODO check this on MinGW-w64 +// TODO check this under /Wall +// TODO C-style casts enough? or will that fail in /Wall? +// TODO same for UniChar/unichar on Mac? if both are unsigned then we have nothing to worry about +#if defined(_MSC_VER) + +inline size_t uiprivUTF16EncodeRune(uint32_t rune, __wchar_t *encoded) +{ + return uiprivUTF16EncodeRune(rune, reinterpret_cast(encoded)); +} + +inline const __wchar_t *uiprivUTF16DecodeRune(const __wchar_t *s, size_t nElem, uint32_t *rune) +{ + const uint16_t *ret; + + ret = uiprivUTF16DecodeRune(reinterpret_cast(s), nElem, rune); + return reinterpret_cast(ret); +} + +inline size_t uiprivUTF16RuneCount(const __wchar_t *s, size_t nElem) +{ + return uiprivUTF16RuneCount(reinterpret_cast(s), nElem); +} + +inline size_t uiprivUTF16UTF8Count(const __wchar_t *s, size_t nElem) +{ + return uiprivUTF16UTF8Count(reinterpret_cast(s), nElem); +} + +#endif + +#endif diff --git a/darwin/CMakeLists.txt b/darwin/CMakeLists.txt index f0c936b5..051fdcbc 100644 --- a/darwin/CMakeLists.txt +++ b/darwin/CMakeLists.txt @@ -1,9 +1,11 @@ # 3 june 2016 list(APPEND _LIBUI_SOURCES + darwin/aat.m darwin/alloc.m darwin/area.m darwin/areaevents.m + darwin/attrstr.m darwin/autolayout.m darwin/box.m darwin/button.m @@ -18,7 +20,12 @@ list(APPEND _LIBUI_SOURCES darwin/editablecombo.m darwin/entry.m darwin/fontbutton.m + darwin/fontmatch.m + darwin/fonttraits.m + darwin/fontvariation.m darwin/form.m + darwin/future.m + darwin/graphemes.m darwin/grid.m darwin/group.m darwin/image.m @@ -27,6 +34,7 @@ list(APPEND _LIBUI_SOURCES darwin/map.m darwin/menu.m darwin/multilineentry.m + darwin/opentype.m darwin/progressbar.m darwin/radiobuttons.m darwin/scrollview.m @@ -37,12 +45,14 @@ list(APPEND _LIBUI_SOURCES darwin/tab.m darwin/table.m darwin/text.m + darwin/undocumented.m darwin/util.m darwin/window.m darwin/winmoveresize.m ) set(_LIBUI_SOURCES ${_LIBUI_SOURCES} PARENT_SCOPE) +# TODO is this correct? list(APPEND _LIBUI_INCLUDEDIRS darwin ) @@ -53,6 +63,7 @@ if(NOT BUILD_SHARED_LIBS) set(_LIBUINAME libui-temporary PARENT_SCOPE) endif() # thanks to Mr-Hide in irc.freenode.net/#cmake +# TODO remove all these temporary files after linking the final archive file macro(_handle_static) set_target_properties(${_LIBUINAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}") diff --git a/darwin/aat.m b/darwin/aat.m new file mode 100644 index 00000000..05f0b268 --- /dev/null +++ b/darwin/aat.m @@ -0,0 +1,403 @@ +// 14 february 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// TODO explain the purpose of this file + +static void boolspec(uint32_t value, uint16_t type, uint16_t ifTrue, uint16_t ifFalse, uiprivAATBlock f) +{ + // TODO are values other than 1 accepted for true by OpenType itself? (same for the rest of the file) + if (value != 0) { + f(type, ifTrue); + return; + } + f(type, ifFalse); +} + +// TODO remove the need for this +// TODO remove x8tox32() +#define x8tox32(x) ((uint32_t) (((uint8_t) (x)) & 0xFF)) +#define mkTag(a, b, c, d) \ + ((x8tox32(a) << 24) | \ + (x8tox32(b) << 16) | \ + (x8tox32(c) << 8) | \ + x8tox32(d)) + +// TODO double-check drawtext example to make sure all of these are used properly (I already screwed dlig up by putting clig twice instead) +void uiprivOpenTypeToAAT(char a, char b, char c, char d, uint32_t value, uiprivAATBlock f) +{ + switch (mkTag(a, b, c, d)) { + case mkTag('l', 'i', 'g', 'a'): + boolspec(value, kLigaturesType, + kCommonLigaturesOnSelector, + kCommonLigaturesOffSelector, + f); + break; + case mkTag('r', 'l', 'i', 'g'): + boolspec(value, kLigaturesType, + kRequiredLigaturesOnSelector, + kRequiredLigaturesOffSelector, + f); + break; + case mkTag('d', 'l', 'i', 'g'): + boolspec(value, kLigaturesType, + kRareLigaturesOnSelector, + kRareLigaturesOffSelector, + f); + break; + case mkTag('c', 'l', 'i', 'g'): + boolspec(value, kLigaturesType, + kContextualLigaturesOnSelector, + kContextualLigaturesOffSelector, + f); + break; + case mkTag('h', 'l', 'i', 'g'): + // This technically isn't what is meant by "historical ligatures", but Core Text's internal AAT-to-OpenType mapping says to include it, so we include it too + case mkTag('h', 'i', 's', 't'): + boolspec(value, kLigaturesType, + kHistoricalLigaturesOnSelector, + kHistoricalLigaturesOffSelector, + f); + break; + case mkTag('u', 'n', 'i', 'c'): + // TODO is this correct, or should we provide an else case? + if (value != 0) + // this is undocumented; it comes from Core Text's internal AAT-to-OpenType conversion table + f(kLetterCaseType, 14); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('p', 'n', 'u', 'm'): + if (value != 0) + f(kNumberSpacingType, kProportionalNumbersSelector); + break; + case mkTag('t', 'n', 'u', 'm'): + if (value != 0) + f(kNumberSpacingType, kMonospacedNumbersSelector); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('s', 'u', 'p', 's'): + if (value != 0) + f(kVerticalPositionType, kSuperiorsSelector); + break; + case mkTag('s', 'u', 'b', 's'): + if (value != 0) + f(kVerticalPositionType, kInferiorsSelector); + break; + case mkTag('o', 'r', 'd', 'n'): + if (value != 0) + f(kVerticalPositionType, kOrdinalsSelector); + break; + case mkTag('s', 'i', 'n', 'f'): + if (value != 0) + f(kVerticalPositionType, kScientificInferiorsSelector); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('a', 'f', 'r', 'c'): + if (value != 0) + f(kFractionsType, kVerticalFractionsSelector); + break; + case mkTag('f', 'r', 'a', 'c'): + if (value != 0) + f(kFractionsType, kDiagonalFractionsSelector); + break; + + case mkTag('z', 'e', 'r', 'o'): + boolspec(value, kTypographicExtrasType, + kSlashedZeroOnSelector, + kSlashedZeroOffSelector, + f); + break; + case mkTag('m', 'g', 'r', 'k'): + boolspec(value, kMathematicalExtrasType, + kMathematicalGreekOnSelector, + kMathematicalGreekOffSelector, + f); + break; + case mkTag('o', 'r', 'n', 'm'): + f(kOrnamentSetsType, (uint16_t) value); + break; + case mkTag('a', 'a', 'l', 't'): + f(kCharacterAlternativesType, (uint16_t) value); + break; + case mkTag('t', 'i', 't', 'l'): + // TODO is this correct, or should we provide an else case? + if (value != 0) + f(kStyleOptionsType, kTitlingCapsSelector); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('t', 'r', 'a', 'd'): + if (value != 0) + f(kCharacterShapeType, kTraditionalCharactersSelector); + break; + case mkTag('s', 'm', 'p', 'l'): + if (value != 0) + f(kCharacterShapeType, kSimplifiedCharactersSelector); + break; + case mkTag('j', 'p', '7', '8'): + if (value != 0) + f(kCharacterShapeType, kJIS1978CharactersSelector); + break; + case mkTag('j', 'p', '8', '3'): + if (value != 0) + f(kCharacterShapeType, kJIS1983CharactersSelector); + break; + case mkTag('j', 'p', '9', '0'): + if (value != 0) + f(kCharacterShapeType, kJIS1990CharactersSelector); + break; + case mkTag('e', 'x', 'p', 't'): + if (value != 0) + f(kCharacterShapeType, kExpertCharactersSelector); + break; + case mkTag('j', 'p', '0', '4'): + if (value != 0) + f(kCharacterShapeType, kJIS2004CharactersSelector); + break; + case mkTag('h', 'o', 'j', 'o'): + if (value != 0) + f(kCharacterShapeType, kHojoCharactersSelector); + break; + case mkTag('n', 'l', 'c', 'k'): + if (value != 0) + f(kCharacterShapeType, kNLCCharactersSelector); + break; + case mkTag('t', 'n', 'a', 'm'): + if (value != 0) + f(kCharacterShapeType, kTraditionalNamesCharactersSelector); + break; + + case mkTag('o', 'n', 'u', 'm'): + // Core Text's internal AAT-to-OpenType mapping says to include this, so we include it too + // TODO is it always set? + case mkTag('l', 'n', 'u', 'm'): + // TODO is this correct, or should we provide an else case? + if (value != 0) + f(kNumberCaseType, kLowerCaseNumbersSelector); + break; + case mkTag('h', 'n', 'g', 'l'): + // TODO is this correct, or should we provide an else case? + if (value != 0) + f(kTransliterationType, kHanjaToHangulSelector); + break; + case mkTag('n', 'a', 'l', 't'): + f(kAnnotationType, (uint16_t) value); + break; + case mkTag('r', 'u', 'b', 'y'): + // include this for completeness + boolspec(value, kRubyKanaType, + kRubyKanaSelector, + kNoRubyKanaSelector, + f); + // this is the current one + boolspec(value, kRubyKanaType, + kRubyKanaOnSelector, + kRubyKanaOffSelector, + f); + break; + case mkTag('i', 't', 'a', 'l'): + // include this for completeness + boolspec(value, kItalicCJKRomanType, + kCJKItalicRomanSelector, + kNoCJKItalicRomanSelector, + f); + // this is the current one + boolspec(value, kItalicCJKRomanType, + kCJKItalicRomanOnSelector, + kCJKItalicRomanOffSelector, + f); + break; + case mkTag('c', 'a', 's', 'e'): + boolspec(value, kCaseSensitiveLayoutType, + kCaseSensitiveLayoutOnSelector, + kCaseSensitiveLayoutOffSelector, + f); + break; + case mkTag('c', 'p', 's', 'p'): + boolspec(value, kCaseSensitiveLayoutType, + kCaseSensitiveSpacingOnSelector, + kCaseSensitiveSpacingOffSelector, + f); + break; + case mkTag('h', 'k', 'n', 'a'): + boolspec(value, kAlternateKanaType, + kAlternateHorizKanaOnSelector, + kAlternateHorizKanaOffSelector, + f); + break; + case mkTag('v', 'k', 'n', 'a'): + boolspec(value, kAlternateKanaType, + kAlternateVertKanaOnSelector, + kAlternateVertKanaOffSelector, + f); + break; + case mkTag('s', 's', '0', '1'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltOneOnSelector, + kStylisticAltOneOffSelector, + f); + break; + case mkTag('s', 's', '0', '2'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltTwoOnSelector, + kStylisticAltTwoOffSelector, + f); + break; + case mkTag('s', 's', '0', '3'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltThreeOnSelector, + kStylisticAltThreeOffSelector, + f); + break; + case mkTag('s', 's', '0', '4'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltFourOnSelector, + kStylisticAltFourOffSelector, + f); + break; + case mkTag('s', 's', '0', '5'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltFiveOnSelector, + kStylisticAltFiveOffSelector, + f); + break; + case mkTag('s', 's', '0', '6'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltSixOnSelector, + kStylisticAltSixOffSelector, + f); + break; + case mkTag('s', 's', '0', '7'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltSevenOnSelector, + kStylisticAltSevenOffSelector, + f); + break; + case mkTag('s', 's', '0', '8'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltEightOnSelector, + kStylisticAltEightOffSelector, + f); + break; + case mkTag('s', 's', '0', '9'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltNineOnSelector, + kStylisticAltNineOffSelector, + f); + break; + case mkTag('s', 's', '1', '0'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltTenOnSelector, + kStylisticAltTenOffSelector, + f); + break; + case mkTag('s', 's', '1', '1'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltElevenOnSelector, + kStylisticAltElevenOffSelector, + f); + break; + case mkTag('s', 's', '1', '2'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltTwelveOnSelector, + kStylisticAltTwelveOffSelector, + f); + break; + case mkTag('s', 's', '1', '3'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltThirteenOnSelector, + kStylisticAltThirteenOffSelector, + f); + break; + case mkTag('s', 's', '1', '4'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltFourteenOnSelector, + kStylisticAltFourteenOffSelector, + f); + break; + case mkTag('s', 's', '1', '5'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltFifteenOnSelector, + kStylisticAltFifteenOffSelector, + f); + break; + case mkTag('s', 's', '1', '6'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltSixteenOnSelector, + kStylisticAltSixteenOffSelector, + f); + break; + case mkTag('s', 's', '1', '7'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltSeventeenOnSelector, + kStylisticAltSeventeenOffSelector, + f); + break; + case mkTag('s', 's', '1', '8'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltEighteenOnSelector, + kStylisticAltEighteenOffSelector, + f); + break; + case mkTag('s', 's', '1', '9'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltNineteenOnSelector, + kStylisticAltNineteenOffSelector, + f); + break; + case mkTag('s', 's', '2', '0'): + boolspec(value, kStylisticAlternativesType, + kStylisticAltTwentyOnSelector, + kStylisticAltTwentyOffSelector, + f); + break; + case mkTag('c', 'a', 'l', 't'): + boolspec(value, kContextualAlternatesType, + kContextualAlternatesOnSelector, + kContextualAlternatesOffSelector, + f); + break; + case mkTag('s', 'w', 's', 'h'): + boolspec(value, kContextualAlternatesType, + kSwashAlternatesOnSelector, + kSwashAlternatesOffSelector, + f); + break; + case mkTag('c', 's', 'w', 'h'): + boolspec(value, kContextualAlternatesType, + kContextualSwashAlternatesOnSelector, + kContextualSwashAlternatesOffSelector, + f); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('s', 'm', 'c', 'p'): + if (value != 0) { + // include this for compatibility (some fonts that come with OS X still use this!) + // TODO make it boolean? + f(kLetterCaseType, kSmallCapsSelector); + // this is the current one + f(kLowerCaseType, kLowerCaseSmallCapsSelector); + } + break; + case mkTag('p', 'c', 'a', 'p'): + if (value != 0) + f(kLowerCaseType, kLowerCasePetiteCapsSelector); + break; + + // TODO will the following handle all cases properly, or are elses going to be needed? + case mkTag('c', '2', 's', 'c'): + if (value != 0) + f(kUpperCaseType, kUpperCaseSmallCapsSelector); + break; + case mkTag('c', '2', 'p', 'c'): + if (value != 0) + f(kUpperCaseType, kUpperCasePetiteCapsSelector); + break; + } + // TODO handle this properly + // (it used to return 0 when this still returned the number of selectors produced but IDK what properly is anymore) +} diff --git a/darwin/alloc.m b/darwin/alloc.m index e271b90e..fbafc153 100644 --- a/darwin/alloc.m +++ b/darwin/alloc.m @@ -37,11 +37,11 @@ void uninitAlloc(void) ptr = [v pointerValue]; [str appendString:[NSString stringWithFormat:@"%p %s\n", ptr, *TYPE(ptr)]]; } - userbug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", [str UTF8String]); + uiprivUserBug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", [str UTF8String]); [str release]; } -void *uiAlloc(size_t size, const char *type) +void *uiprivAlloc(size_t size, const char *type) { void *out; @@ -57,21 +57,21 @@ void *uiAlloc(size_t size, const char *type) return DATA(out); } -void *uiRealloc(void *p, size_t new, const char *type) +void *uiprivRealloc(void *p, size_t new, const char *type) { void *out; size_t *s; if (p == NULL) - return uiAlloc(new, type); + return uiprivAlloc(new, type); p = BASE(p); out = realloc(p, EXTRA + new); if (out == NULL) { - fprintf(stderr, "memory exhausted in uiRealloc()\n"); + fprintf(stderr, "memory exhausted in uiprivRealloc()\n"); abort(); } s = SIZE(out); - if (new <= *s) + if (new > *s) memset(((uint8_t *) DATA(out)) + *s, 0, new - *s); *s = new; [allocations removeObject:[NSValue valueWithPointer:p]]; @@ -79,10 +79,10 @@ void *uiRealloc(void *p, size_t new, const char *type) return DATA(out); } -void uiFree(void *p) +void uiprivFree(void *p) { if (p == NULL) - implbug("attempt to uiFree(NULL)"); + uiprivImplBug("attempt to uiprivFree(NULL)"); p = BASE(p); free(p); [allocations removeObject:[NSValue valueWithPointer:p]]; diff --git a/darwin/area.m b/darwin/area.m index 23162e6c..1442479a 100644 --- a/darwin/area.m +++ b/darwin/area.m @@ -390,7 +390,7 @@ int sendAreaEvents(NSEvent *e) void uiAreaSetSize(uiArea *a, int width, int height) { if (!a->scrolling) - userbug("You cannot call uiAreaSetSize() on a non-scrolling uiArea. (area: %p)", a); + uiprivUserBug("You cannot call uiAreaSetSize() on a non-scrolling uiArea. (area: %p)", a); [a->area setScrollingSize:NSMakeSize(width, height)]; } @@ -402,7 +402,7 @@ void uiAreaQueueRedrawAll(uiArea *a) void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height) { if (!a->scrolling) - userbug("You cannot call uiAreaScrollTo() on a non-scrolling uiArea. (area: %p)", a); + uiprivUserBug("You cannot call uiAreaScrollTo() on a non-scrolling uiArea. (area: %p)", a); [a->area scrollRectToVisible:NSMakeRect(x, y, width, height)]; // don't worry about the return value; it just says whether scrolling was needed } diff --git a/darwin/attrstr.h b/darwin/attrstr.h new file mode 100644 index 00000000..02a3418d --- /dev/null +++ b/darwin/attrstr.h @@ -0,0 +1,91 @@ +// 4 march 2018 +#import "../common/attrstr.h" + +// opentype.m +extern CFArrayRef uiprivOpenTypeFeaturesToCTFeatures(const uiOpenTypeFeatures *otf); + +// aat.m +typedef void (^uiprivAATBlock)(uint16_t type, uint16_t selector); +extern void uiprivOpenTypeToAAT(char a, char b, char c, char d, uint32_t value, uiprivAATBlock f); + +// fontmatch.m +@interface uiprivFontStyleData : NSObject { + CTFontRef font; + CTFontDescriptorRef desc; + CFDictionaryRef traits; + CTFontSymbolicTraits symbolic; + double weight; + double width; + BOOL didStyleName; + CFStringRef styleName; + BOOL didVariation; + CFDictionaryRef variation; + BOOL hasRegistrationScope; + CTFontManagerScope registrationScope; + BOOL didPostScriptName; + CFStringRef postScriptName; + CTFontFormat fontFormat; + BOOL didPreferredSubFamilyName; + CFStringRef preferredSubFamilyName; + BOOL didSubFamilyName; + CFStringRef subFamilyName; + BOOL didFullName; + CFStringRef fullName; + BOOL didPreferredFamilyName; + CFStringRef preferredFamilyName; + BOOL didFamilyName; + CFStringRef familyName; + BOOL didVariationAxes; + CFArrayRef variationAxes; +} +- (id)initWithFont:(CTFontRef)f; +- (id)initWithDescriptor:(CTFontDescriptorRef)d; +- (BOOL)prepare; +- (void)ensureFont; +- (CTFontSymbolicTraits)symbolicTraits; +- (double)weight; +- (double)width; +- (CFStringRef)styleName; +- (CFDictionaryRef)variation; +- (BOOL)hasRegistrationScope; +- (CTFontManagerScope)registrationScope; +- (CFStringRef)postScriptName; +- (CFDataRef)table:(CTFontTableTag)tag; +- (CTFontFormat)fontFormat; +- (CFStringRef)fontName:(CFStringRef)key; +- (CFStringRef)preferredSubFamilyName; +- (CFStringRef)subFamilyName; +- (CFStringRef)fullName; +- (CFStringRef)preferredFamilyName; +- (CFStringRef)familyName; +- (CFArrayRef)variationAxes; +@end +extern CTFontDescriptorRef uiprivFontDescriptorToCTFontDescriptor(uiFontDescriptor *fd); +extern CTFontDescriptorRef uiprivCTFontDescriptorAppendFeatures(CTFontDescriptorRef desc, const uiOpenTypeFeatures *otf); +extern void uiprivFontDescriptorFromCTFontDescriptor(CTFontDescriptorRef ctdesc, uiFontDescriptor *uidesc); + +// fonttraits.m +extern void uiprivProcessFontTraits(uiprivFontStyleData *d, uiFontDescriptor *out); + +// fontvariation.m +extern NSDictionary *uiprivMakeVariationAxisDict(CFArrayRef axes, CFDataRef avarTable); +extern void uiprivProcessFontVariation(uiprivFontStyleData *d, NSDictionary *axisDict, uiFontDescriptor *out); + +// attrstr.m +extern void uiprivInitUnderlineColors(void); +extern void uiprivUninitUnderlineColors(void); +extern CFAttributedStringRef uiprivAttributedStringToCFAttributedString(uiDrawTextLayoutParams *p, NSArray **backgroundParams); + +// drawtext.m +// TODO figure out where this type should *really* go in all the headers... +@interface uiprivDrawTextBackgroundParams : NSObject { + size_t start; + size_t end; + double r; + double g; + double b; + double a; +} +- (id)initWithStart:(size_t)s end:(size_t)e r:(double)red g:(double)green b:(double)blue a:(double)alpha; +- (void)draw:(CGContextRef)c layout:(uiDrawTextLayout *)layout at:(double)x y:(double)y utf8Mapping:(const size_t *)u16tou8; +@end diff --git a/darwin/attrstr.m b/darwin/attrstr.m new file mode 100644 index 00000000..7d62bcfe --- /dev/null +++ b/darwin/attrstr.m @@ -0,0 +1,505 @@ +// 12 february 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// this is what AppKit does internally +// WebKit does this too; see https://github.com/adobe/webkit/blob/master/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm +static NSColor *spellingColor = nil; +static NSColor *grammarColor = nil; +static NSColor *auxiliaryColor = nil; + +static NSColor *tryColorNamed(NSString *name) +{ + NSImage *img; + + img = [NSImage imageNamed:name]; + if (img == nil) + return nil; + return [NSColor colorWithPatternImage:img]; +} + +void uiprivInitUnderlineColors(void) +{ + spellingColor = tryColorNamed(@"NSSpellingDot"); + if (spellingColor == nil) { + // WebKit says this is needed for "older systems"; not sure how old, but 10.11 AppKit doesn't look for this + spellingColor = tryColorNamed(@"SpellingDot"); + if (spellingColor == nil) + spellingColor = [NSColor redColor]; + } + [spellingColor retain]; // override autoreleasing + + grammarColor = tryColorNamed(@"NSGrammarDot"); + if (grammarColor == nil) { + // WebKit says this is needed for "older systems"; not sure how old, but 10.11 AppKit doesn't look for this + grammarColor = tryColorNamed(@"GrammarDot"); + if (grammarColor == nil) + grammarColor = [NSColor greenColor]; + } + [grammarColor retain]; // override autoreleasing + + auxiliaryColor = tryColorNamed(@"NSCorrectionDot"); + if (auxiliaryColor == nil) { + // WebKit says this is needed for "older systems"; not sure how old, but 10.11 AppKit doesn't look for this + auxiliaryColor = tryColorNamed(@"CorrectionDot"); + if (auxiliaryColor == nil) + auxiliaryColor = [NSColor blueColor]; + } + [auxiliaryColor retain]; // override autoreleasing +} + +void uiprivUninitUnderlineColors(void) +{ + [auxiliaryColor release]; + auxiliaryColor = nil; + [grammarColor release]; + grammarColor = nil; + [spellingColor release]; + spellingColor = nil; +} + +// TODO opentype features are lost when using uiFontDescriptor, so a handful of fonts in the font panel ("Titling" variants of some fonts and possibly others but those are the examples I know about) cannot be represented by uiFontDescriptor; what *can* we do about this since this info is NOT part of the font on other platforms? +// TODO see if we could use NSAttributedString? +// TODO consider renaming this struct and the fep variable(s) +// TODO restructure all this so the important details at the top are below with the combined font attributes type? +// TODO in fact I should just write something to explain everything in this file... +struct foreachParams { + CFMutableAttributedStringRef mas; + NSMutableArray *backgroundParams; +}; + +// unlike the other systems, Core Text rolls family, size, weight, italic, width, AND opentype features into the "font" attribute +// instead of incrementally adjusting CTFontRefs (which, judging from NSFontManager, seems finicky and UI-centric), we use a custom class to incrementally store attributes that go into a CTFontRef, and then convert everything to CTFonts en masse later +// https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/AttributedStrings/Tasks/ChangingAttrStrings.html#//apple_ref/doc/uid/20000162-BBCBGCDG says we must have -hash and -isEqual: workign properly for this to work, so we must do that too, using a basic xor-based hash and leveraging Cocoa -hash implementations where useful and feasible (if not necessary) +// TODO structure and rewrite this part +// TODO re-find sources proving support of custom attributes +// TODO what if this is NULL? +static const CFStringRef combinedFontAttrName = CFSTR("libuiCombinedFontAttribute"); + +enum { + cFamily, + cSize, + cWeight, + cItalic, + cStretch, + cFeatures, + nc, +}; + +static const int toc[] = { + [uiAttributeTypeFamily] = cFamily, + [uiAttributeTypeSize] = cSize, + [uiAttributeTypeWeight] = cWeight, + [uiAttributeTypeItalic] = cItalic, + [uiAttributeTypeStretch] = cStretch, + [uiAttributeTypeFeatures] = cFeatures, +}; + +static uiForEach featuresHash(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data) +{ + NSUInteger *hash = (NSUInteger *) data; + uint32_t tag; + + tag = (((uint32_t) a) & 0xFF) << 24; + tag |= (((uint32_t) b) & 0xFF) << 16; + tag |= (((uint32_t) c) & 0xFF) << 8; + tag |= ((uint32_t) d) & 0xFF; + *hash ^= tag; + *hash ^= value; + return uiForEachContinue; +} + +@interface uiprivCombinedFontAttr : NSObject { + uiAttribute *attrs[nc]; + BOOL hasHash; + NSUInteger hash; +} +- (void)addAttribute:(uiAttribute *)attr; +- (CTFontRef)toCTFontWithDefaultFont:(uiFontDescriptor *)defaultFont; +@end + +@implementation uiprivCombinedFontAttr + +- (id)init +{ + self = [super init]; + if (self) { + memset(self->attrs, 0, nc * sizeof (uiAttribute *)); + self->hasHash = NO; + } + return self; +} + +- (void)dealloc +{ + int i; + + for (i = 0; i < nc; i++) + if (self->attrs[i] != NULL) { + uiprivAttributeRelease(self->attrs[i]); + self->attrs[i] = NULL; + } + [super dealloc]; +} + +- (id)copyWithZone:(NSZone *)zone +{ + uiprivCombinedFontAttr *ret; + int i; + + ret = [[uiprivCombinedFontAttr allocWithZone:zone] init]; + for (i = 0; i < nc; i++) + if (self->attrs[i] != NULL) + ret->attrs[i] = uiprivAttributeRetain(self->attrs[i]); + ret->hasHash = self->hasHash; + ret->hash = self->hash; + return ret; +} + +- (void)addAttribute:(uiAttribute *)attr +{ + int index; + + index = toc[uiAttributeGetType(attr)]; + if (self->attrs[index] != NULL) + uiprivAttributeRelease(self->attrs[index]); + self->attrs[index] = uiprivAttributeRetain(attr); + self->hasHash = NO; +} + +- (BOOL)isEqual:(id)bb +{ + uiprivCombinedFontAttr *b = (uiprivCombinedFontAttr *) bb; + int i; + + if (b == nil) + return NO; + for (i = 0; i < nc; i++) { + if (self->attrs[i] == NULL && b->attrs[i] == NULL) + continue; + if (self->attrs[i] == NULL || b->attrs[i] == NULL) + return NO; + if (!uiprivAttributeEqual(self->attrs[i], b->attrs[i])) + return NO; + } + return YES; +} + +- (NSUInteger)hash +{ + if (self->hasHash) + return self->hash; + @autoreleasepool { + NSString *family; + NSNumber *size; + + self->hash = 0; + if (self->attrs[cFamily] != NULL) { + family = [NSString stringWithUTF8String:uiAttributeFamily(self->attrs[cFamily])]; + // TODO make sure this aligns with case-insensitive compares when those are done in common/attribute.c + self->hash ^= [[family uppercaseString] hash]; + } + if (self->attrs[cSize] != NULL) { + size = [NSNumber numberWithDouble:uiAttributeSize(self->attrs[cSize])]; + self->hash ^= [size hash]; + } + if (self->attrs[cWeight] != NULL) + self->hash ^= (NSUInteger) uiAttributeWeight(self->attrs[cWeight]); + if (self->attrs[cItalic] != NULL) + self->hash ^= (NSUInteger) uiAttributeItalic(self->attrs[cItalic]); + if (self->attrs[cStretch] != NULL) + self->hash ^= (NSUInteger) uiAttributeStretch(self->attrs[cStretch]); + if (self->attrs[cFeatures] != NULL) + uiOpenTypeFeaturesForEach(uiAttributeFeatures(self->attrs[cFeatures]), featuresHash, &(self->hash)); + self->hasHash = YES; + } + return self->hash; +} + +- (CTFontRef)toCTFontWithDefaultFont:(uiFontDescriptor *)defaultFont +{ + uiFontDescriptor uidesc; + CTFontDescriptorRef desc; + CTFontRef font; + + uidesc = *defaultFont; + if (self->attrs[cFamily] != NULL) + // TODO const-correct uiFontDescriptor or change this function below + uidesc.Family = (char *) uiAttributeFamily(self->attrs[cFamily]); + if (self->attrs[cSize] != NULL) + uidesc.Size = uiAttributeSize(self->attrs[cSize]); + if (self->attrs[cWeight] != NULL) + uidesc.Weight = uiAttributeWeight(self->attrs[cWeight]); + if (self->attrs[cItalic] != NULL) + uidesc.Italic = uiAttributeItalic(self->attrs[cItalic]); + if (self->attrs[cStretch] != NULL) + uidesc.Stretch = uiAttributeStretch(self->attrs[cStretch]); + desc = uiprivFontDescriptorToCTFontDescriptor(&uidesc); + if (self->attrs[cFeatures] != NULL) + desc = uiprivCTFontDescriptorAppendFeatures(desc, uiAttributeFeatures(self->attrs[cFeatures])); + font = CTFontCreateWithFontDescriptor(desc, uidesc.Size, NULL); + CFRelease(desc); // TODO correct? + return font; +} + +@end + +static void addFontAttributeToRange(struct foreachParams *p, size_t start, size_t end, uiAttribute *attr) +{ + uiprivCombinedFontAttr *cfa; + CFRange range; + size_t diff; + + while (start < end) { + cfa = (uiprivCombinedFontAttr *) CFAttributedStringGetAttribute(p->mas, start, combinedFontAttrName, &range); + if (cfa == nil) + cfa = [uiprivCombinedFontAttr new]; + else + cfa = [cfa copy]; + [cfa addAttribute:attr]; + // clamp range within [start, end) + if (range.location < start) { + diff = start - range.location; + range.location = start; + range.length -= diff; + } + if ((range.location + range.length) > end) + range.length = end - range.location; + CFAttributedStringSetAttribute(p->mas, range, combinedFontAttrName, cfa); + [cfa release]; + start += range.length; + } +} + +static CGColorRef mkcolor(double r, double g, double b, double a) +{ + CGColorSpaceRef colorspace; + CGColorRef color; + CGFloat components[4]; + + // TODO we should probably just create this once and recycle it throughout program execution... + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); + if (colorspace == NULL) { + // TODO + } + components[0] = r; + components[1] = g; + components[2] = b; + components[3] = a; + color = CGColorCreate(colorspace, components); + CFRelease(colorspace); + return color; +} + +static void addBackgroundAttribute(struct foreachParams *p, size_t start, size_t end, double r, double g, double b, double a) +{ + uiprivDrawTextBackgroundParams *dtb; + + // TODO make sure this works properly with line paragraph spacings (after figuring out what that means, of course) + if (FUTURE_kCTBackgroundColorAttributeName != NULL) { + CGColorRef color; + CFRange range; + + color = mkcolor(r, g, b, a); + range.location = start; + range.length = end - start; + CFAttributedStringSetAttribute(p->mas, range, *FUTURE_kCTBackgroundColorAttributeName, color); + CFRelease(color); + return; + } + + dtb = [[uiprivDrawTextBackgroundParams alloc] initWithStart:start end:end r:r g:g b:b a:a]; + [p->backgroundParams addObject:dtb]; + [dtb release]; +} + +static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute *attr, size_t start, size_t end, void *data) +{ + struct foreachParams *p = (struct foreachParams *) data; + CFRange range; + CGColorRef color; + int32_t us; + CFNumberRef num; + double r, g, b, a; + uiUnderlineColor colorType; + + start = uiprivAttributedStringUTF8ToUTF16(s, start); + end = uiprivAttributedStringUTF8ToUTF16(s, end); + range.location = start; + range.length = end - start; + switch (uiAttributeGetType(attr)) { + case uiAttributeTypeFamily: + case uiAttributeTypeSize: + case uiAttributeTypeWeight: + case uiAttributeTypeItalic: + case uiAttributeTypeStretch: + case uiAttributeTypeFeatures: + addFontAttributeToRange(p, start, end, attr); + break; + case uiAttributeTypeColor: + uiAttributeColor(attr, &r, &g, &b, &a); + color = mkcolor(r, g, b, a); + CFAttributedStringSetAttribute(p->mas, range, kCTForegroundColorAttributeName, color); + CFRelease(color); + break; + case uiAttributeTypeBackground: + uiAttributeColor(attr, &r, &g, &b, &a); + addBackgroundAttribute(p, start, end, r, g, b, a); + break; + // TODO turn into a class, like we did with the font attributes, or even integrate *into* the font attributes + case uiAttributeTypeUnderline: + switch (uiAttributeUnderline(attr)) { + case uiUnderlineNone: + us = kCTUnderlineStyleNone; + break; + case uiUnderlineSingle: + us = kCTUnderlineStyleSingle; + break; + case uiUnderlineDouble: + us = kCTUnderlineStyleDouble; + break; + case uiUnderlineSuggestion: + // TODO incorrect if a solid color + us = kCTUnderlineStyleThick; + break; + } + num = CFNumberCreate(NULL, kCFNumberSInt32Type, &us); + CFAttributedStringSetAttribute(p->mas, range, kCTUnderlineStyleAttributeName, num); + CFRelease(num); + break; + case uiAttributeTypeUnderlineColor: + uiAttributeUnderlineColor(attr, &colorType, &r, &g, &b, &a); + switch (colorType) { + case uiUnderlineColorCustom: + color = mkcolor(r, g, b, a); + break; + case uiUnderlineColorSpelling: + color = [spellingColor CGColor]; + break; + case uiUnderlineColorGrammar: + color = [grammarColor CGColor]; + break; + case uiUnderlineColorAuxiliary: + color = [auxiliaryColor CGColor]; + break; + } + CFAttributedStringSetAttribute(p->mas, range, kCTUnderlineColorAttributeName, color); + if (colorType == uiUnderlineColorCustom) + CFRelease(color); + break; + } + return uiForEachContinue; +} + +static void applyFontAttributes(CFMutableAttributedStringRef mas, uiFontDescriptor *defaultFont) +{ + uiprivCombinedFontAttr *cfa; + CTFontRef font; + CFRange range; + CFIndex n; + + n = CFAttributedStringGetLength(mas); + + // first apply the default font to the entire string + // TODO is this necessary given the #if 0'd code in uiprivAttributedStringToCFAttributedString()? + cfa = [uiprivCombinedFontAttr new]; + font = [cfa toCTFontWithDefaultFont:defaultFont]; + [cfa release]; + range.location = 0; + range.length = n; + CFAttributedStringSetAttribute(mas, range, kCTFontAttributeName, font); + CFRelease(font); + + // now go through, replacing every uiprivCombinedFontAttr with the proper CTFontRef + // we are best off treating series of identical fonts as single ranges ourselves for parity across platforms, even if OS X does something similar itself + range.location = 0; + while (range.location < n) { + // TODO consider seeing if CFAttributedStringGetAttributeAndLongestEffectiveRange() can make things faster by reducing the number of potential iterations, either here or above + cfa = (uiprivCombinedFontAttr *) CFAttributedStringGetAttribute(mas, range.location, combinedFontAttrName, &range); + if (cfa != nil) { + font = [cfa toCTFontWithDefaultFont:defaultFont]; + CFAttributedStringSetAttribute(mas, range, kCTFontAttributeName, font); + CFRelease(font); + } + range.location += range.length; + } + + // and finally, get rid of all the uiprivCombinedFontAttrs as we won't need them anymore + range.location = 0; + range.length = 0; + CFAttributedStringRemoveAttribute(mas, range, combinedFontAttrName); +} + +static const CTTextAlignment ctaligns[] = { + [uiDrawTextAlignLeft] = kCTTextAlignmentLeft, + [uiDrawTextAlignCenter] = kCTTextAlignmentCenter, + [uiDrawTextAlignRight] = kCTTextAlignmentRight, +}; + +static CTParagraphStyleRef mkParagraphStyle(uiDrawTextLayoutParams *p) +{ + CTParagraphStyleRef ps; + CTParagraphStyleSetting settings[16]; + size_t nSettings = 0; + + settings[nSettings].spec = kCTParagraphStyleSpecifierAlignment; + settings[nSettings].valueSize = sizeof (CTTextAlignment); + settings[nSettings].value = ctaligns + p->Align; + nSettings++; + + ps = CTParagraphStyleCreate(settings, nSettings); + if (ps == NULL) { + // TODO + } + return ps; +} + +// TODO either rename this (on all platforms) to uiprivDrawTextLayoutParams... or rename this file or both or split the struct or something else... +CFAttributedStringRef uiprivAttributedStringToCFAttributedString(uiDrawTextLayoutParams *p, NSArray **backgroundParams) +{ + CFStringRef cfstr; + CFMutableDictionaryRef defaultAttrs; + CTParagraphStyleRef ps; + CFAttributedStringRef base; + CFMutableAttributedStringRef mas; + struct foreachParams fep; + + cfstr = CFStringCreateWithCharacters(NULL, uiprivAttributedStringUTF16String(p->String), uiprivAttributedStringUTF16Len(p->String)); + if (cfstr == NULL) { + // TODO + } + defaultAttrs = CFDictionaryCreateMutable(NULL, 0, + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (defaultAttrs == NULL) { + // TODO + } +#if 0 /* TODO */ + ffp.desc = *(p->DefaultFont); + defaultCTFont = fontdescToCTFont(&ffp); + CFDictionaryAddValue(defaultAttrs, kCTFontAttributeName, defaultCTFont); + CFRelease(defaultCTFont); +#endif + ps = mkParagraphStyle(p); + CFDictionaryAddValue(defaultAttrs, kCTParagraphStyleAttributeName, ps); + CFRelease(ps); + + base = CFAttributedStringCreate(NULL, cfstr, defaultAttrs); + if (base == NULL) { + // TODO + } + CFRelease(cfstr); + CFRelease(defaultAttrs); + mas = CFAttributedStringCreateMutableCopy(NULL, 0, base); + CFRelease(base); + + CFAttributedStringBeginEditing(mas); + fep.mas = mas; + fep.backgroundParams = [NSMutableArray new]; + uiAttributedStringForEachAttribute(p->String, processAttribute, &fep); + applyFontAttributes(mas, p->DefaultFont); + CFAttributedStringEndEditing(mas); + + *backgroundParams = fep.backgroundParams; + return mas; +} diff --git a/darwin/autolayout.m b/darwin/autolayout.m index 9964155f..3bf4acb7 100644 --- a/darwin/autolayout.m +++ b/darwin/autolayout.m @@ -12,9 +12,7 @@ NSLayoutConstraint *mkConstraint(id view1, NSLayoutAttribute attr1, NSLayoutRela attribute:attr2 multiplier:multiplier constant:c]; - // apparently only added in 10.9 - if ([constraint respondsToSelector:@selector(setIdentifier:)]) - [((id) constraint) setIdentifier:desc]; + FUTURE_NSLayoutConstraint_setIdentifier(constraint, desc); return constraint; } diff --git a/darwin/box.m b/darwin/box.m index 18d536d5..6a1941ea 100644 --- a/darwin/box.m +++ b/darwin/box.m @@ -428,7 +428,7 @@ void uiBoxAppend(uiBox *b, uiControl *c, int stretchy) // LONGTERM on other platforms // or at leat allow this and implicitly turn it into a spacer if (c == NULL) - userbug("You cannot add NULL to a uiBox."); + uiprivUserBug("You cannot add NULL to a uiBox."); [b->view append:c stretchy:stretchy]; } diff --git a/darwin/debug.m b/darwin/debug.m index c91c6a73..aff66e0d 100644 --- a/darwin/debug.m +++ b/darwin/debug.m @@ -3,7 +3,7 @@ // LONGTERM don't halt on release builds -void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) +void uiprivRealBug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) { NSMutableString *str; NSString *formatted; diff --git a/darwin/draw.h b/darwin/draw.h new file mode 100644 index 00000000..41629809 --- /dev/null +++ b/darwin/draw.h @@ -0,0 +1,6 @@ +// 6 january 2017 + +struct uiDrawContext { + CGContextRef c; + CGFloat height; // needed for text; see below +}; diff --git a/darwin/draw.m b/darwin/draw.m index 262ad3e2..cf7d8f13 100644 --- a/darwin/draw.m +++ b/darwin/draw.m @@ -1,5 +1,6 @@ // 6 september 2015 #import "uipriv_darwin.h" +#import "draw.h" struct uiDrawPath { CGMutablePathRef path; @@ -11,7 +12,7 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode mode) { uiDrawPath *p; - p = uiNew(uiDrawPath); + p = uiprivNew(uiDrawPath); p->path = CGPathCreateMutable(); p->fillMode = mode; return p; @@ -20,13 +21,13 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode mode) void uiDrawFreePath(uiDrawPath *p) { CGPathRelease((CGPathRef) (p->path)); - uiFree(p); + uiprivFree(p); } void uiDrawPathNewFigure(uiDrawPath *p, double x, double y) { if (p->ended) - userbug("You cannot call uiDrawPathNewFigure() on a uiDrawPath that has already been ended. (path; %p)", p); + uiprivUserBug("You cannot call uiDrawPathNewFigure() on a uiDrawPath that has already been ended. (path; %p)", p); CGPathMoveToPoint(p->path, NULL, x, y); } @@ -36,7 +37,7 @@ void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, d double startx, starty; if (p->ended) - userbug("You cannot call uiDrawPathNewFigureWithArc() on a uiDrawPath that has already been ended. (path; %p)", p); + uiprivUserBug("You cannot call uiDrawPathNewFigureWithArc() on a uiDrawPath that has already been ended. (path; %p)", p); sinStart = sin(startAngle); cosStart = cos(startAngle); startx = xCenter + radius * cosStart; @@ -49,7 +50,7 @@ void uiDrawPathLineTo(uiDrawPath *p, double x, double y) { // TODO refine this to require being in a path if (p->ended) - implbug("attempt to add line to ended path in uiDrawPathLineTo()"); + uiprivImplBug("attempt to add line to ended path in uiDrawPathLineTo()"); CGPathAddLineToPoint(p->path, NULL, x, y); } @@ -59,7 +60,7 @@ void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radiu // TODO likewise if (p->ended) - implbug("attempt to add arc to ended path in uiDrawPathArcTo()"); + uiprivImplBug("attempt to add arc to ended path in uiDrawPathArcTo()"); if (sweep > 2 * uiPi) sweep = 2 * uiPi; cw = false; @@ -76,7 +77,7 @@ void uiDrawPathBezierTo(uiDrawPath *p, double c1x, double c1y, double c2x, doubl { // TODO likewise if (p->ended) - implbug("attempt to add bezier to ended path in uiDrawPathBezierTo()"); + uiprivImplBug("attempt to add bezier to ended path in uiDrawPathBezierTo()"); CGPathAddCurveToPoint(p->path, NULL, c1x, c1y, c2x, c2y, @@ -87,14 +88,14 @@ void uiDrawPathCloseFigure(uiDrawPath *p) { // TODO likewise if (p->ended) - implbug("attempt to close figure of ended path in uiDrawPathCloseFigure()"); + uiprivImplBug("attempt to close figure of ended path in uiDrawPathCloseFigure()"); CGPathCloseSubpath(p->path); } void uiDrawPathAddRectangle(uiDrawPath *p, double x, double y, double width, double height) { if (p->ended) - userbug("You cannot call uiDrawPathAddRectangle() on a uiDrawPath that has already been ended. (path; %p)", p); + uiprivUserBug("You cannot call uiDrawPathAddRectangle() on a uiDrawPath that has already been ended. (path; %p)", p); CGPathAddRect(p->path, NULL, CGRectMake(x, y, width, height)); } @@ -103,16 +104,11 @@ void uiDrawPathEnd(uiDrawPath *p) p->ended = TRUE; } -struct uiDrawContext { - CGContextRef c; - CGFloat height; // needed for text; see below -}; - uiDrawContext *newContext(CGContextRef ctxt, CGFloat height) { uiDrawContext *c; - c = uiNew(uiDrawContext); + c = uiprivNew(uiDrawContext); c->c = ctxt; c->height = height; return c; @@ -120,7 +116,7 @@ uiDrawContext *newContext(CGContextRef ctxt, CGFloat height) void freeContext(uiDrawContext *c) { - uiFree(c); + uiprivFree(c); } // a stroke is identical to a fill of a stroked path @@ -136,7 +132,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro uiDrawPath p2; if (!path->ended) - userbug("You cannot call uiDrawStroke() on a uiDrawPath that has not been ended. (path: %p)", path); + uiprivUserBug("You cannot call uiDrawStroke() on a uiDrawPath that has not been ended. (path: %p)", path); switch (p->Cap) { case uiDrawLineCapFlat: @@ -164,7 +160,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro // create a temporary path identical to the previous one dashPath = (CGPathRef) path->path; if (p->NumDashes != 0) { - dashes = (CGFloat *) uiAlloc(p->NumDashes * sizeof (CGFloat), "CGFloat[]"); + dashes = (CGFloat *) uiprivAlloc(p->NumDashes * sizeof (CGFloat), "CGFloat[]"); for (i = 0; i < p->NumDashes; i++) dashes[i] = p->Dashes[i]; dashPath = CGPathCreateCopyByDashingPath(path->path, @@ -172,7 +168,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro p->DashPhase, dashes, p->NumDashes); - uiFree(dashes); + uiprivFree(dashes); } // the documentation is wrong: this produces a path suitable for calling CGPathCreateCopyByStrokingPath(), not for filling directly // the cast is safe; we never modify the CGPathRef and always cast it back to a CGPathRef anyway @@ -222,10 +218,14 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b) // gradients need a color space // for consistency with windows, use sRGB colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); + if (colorspace == NULL) { + // TODO + } + // TODO add NULL check to other uses of CGColorSpace // make the gradient - colors = uiAlloc(b->NumStops * 4 * sizeof (CGFloat), "CGFloat[]"); - locations = uiAlloc(b->NumStops * sizeof (CGFloat), "CGFloat[]"); + colors = uiprivAlloc(b->NumStops * 4 * sizeof (CGFloat), "CGFloat[]"); + locations = uiprivAlloc(b->NumStops * sizeof (CGFloat), "CGFloat[]"); for (i = 0; i < b->NumStops; i++) { colors[i * 4 + 0] = b->Stops[i].R; colors[i * 4 + 1] = b->Stops[i].G; @@ -234,8 +234,8 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b) locations[i] = b->Stops[i].Pos; } gradient = CGGradientCreateWithColorComponents(colorspace, colors, locations, b->NumStops); - uiFree(locations); - uiFree(colors); + uiprivFree(locations); + uiprivFree(colors); // because we're mucking with clipping, we need to save the graphics state and restore it later CGContextSaveGState(ctxt); @@ -280,7 +280,7 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b) void uiDrawFill(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b) { if (!path->ended) - userbug("You cannot call uiDrawStroke() on a uiDrawPath that has not been ended. (path: %p)", path); + uiprivUserBug("You cannot call uiDrawStroke() on a uiDrawPath that has not been ended. (path: %p)", path); CGContextAddPath(c->c, (CGPathRef) (path->path)); switch (b->Type) { case uiDrawBrushTypeSolid: @@ -294,7 +294,7 @@ void uiDrawFill(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b) // TODO return; } - userbug("Unknown brush type %d passed to uiDrawFill().", b->Type); + uiprivUserBug("Unknown brush type %d passed to uiDrawFill().", b->Type); } static void m2c(uiDrawMatrix *m, CGAffineTransform *c) @@ -334,7 +334,7 @@ void uiDrawMatrixScale(uiDrawMatrix *m, double xCenter, double yCenter, double x m2c(m, &c); xt = x; yt = y; - scaleCenter(xCenter, yCenter, &xt, &yt); + uiprivScaleCenter(xCenter, yCenter, &xt, &yt); c = CGAffineTransformTranslate(c, xt, yt); c = CGAffineTransformScale(c, x, y); c = CGAffineTransformTranslate(c, -xt, -yt); @@ -354,7 +354,7 @@ void uiDrawMatrixRotate(uiDrawMatrix *m, double x, double y, double amount) void uiDrawMatrixSkew(uiDrawMatrix *m, double x, double y, double xamount, double yamount) { - fallbackSkew(m, x, y, xamount, yamount); + uiprivFallbackSkew(m, x, y, xamount, yamount); } void uiDrawMatrixMultiply(uiDrawMatrix *dest, uiDrawMatrix *src) @@ -425,7 +425,7 @@ void uiDrawTransform(uiDrawContext *c, uiDrawMatrix *m) void uiDrawClip(uiDrawContext *c, uiDrawPath *path) { if (!path->ended) - userbug("You cannot call uiDrawCilp() on a uiDrawPath that has not been ended. (path: %p)", path); + uiprivUserBug("You cannot call uiDrawCilp() on a uiDrawPath that has not been ended. (path: %p)", path); CGContextAddPath(c->c, (CGPathRef) (path->path)); switch (path->fillMode) { case uiDrawFillModeWinding: @@ -447,8 +447,3 @@ void uiDrawRestore(uiDrawContext *c) { CGContextRestoreGState(c->c); } - -void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout) -{ - doDrawText(c->c, c->height, x, y, layout); -} diff --git a/darwin/drawtext.m b/darwin/drawtext.m index c376536a..c04b402b 100644 --- a/darwin/drawtext.m +++ b/darwin/drawtext.m @@ -1,655 +1,214 @@ -// 6 september 2015 +// 7 march 2018 #import "uipriv_darwin.h" +#import "draw.h" +#import "attrstr.h" -// TODO -#define complain(...) implbug(__VA_ARGS__) - -// TODO double-check that we are properly handling allocation failures (or just toll free bridge from cocoa) -struct uiDrawFontFamilies { - CFArrayRef fonts; -}; - -uiDrawFontFamilies *uiDrawListFontFamilies(void) -{ - uiDrawFontFamilies *ff; - - ff = uiNew(uiDrawFontFamilies); - ff->fonts = CTFontManagerCopyAvailableFontFamilyNames(); - if (ff->fonts == NULL) - implbug("error getting available font names (no reason specified) (TODO)"); - return ff; +// problem: for a CTFrame made from an empty string, the CTLine array will be empty, and we will crash when doing anything requiring a CTLine +// solution: for those cases, maintain a separate framesetter just for computing those things +// in the usual case, the separate copy will just be identical to the regular one, with extra references to everything within +@interface uiprivTextFrame : NSObject { + CFAttributedStringRef attrstr; + NSArray *backgroundParams; + CTFramesetterRef framesetter; + CGSize size; + CGPathRef path; + CTFrameRef frame; } +- (id)initWithLayoutParams:(uiDrawTextLayoutParams *)p; +- (void)draw:(uiDrawContext *)c textLayout:(uiDrawTextLayout *)tl at:(double)x y:(double)y; +- (void)returnWidth:(double *)width height:(double *)height; +- (CFArrayRef)lines; +@end -int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) +@implementation uiprivDrawTextBackgroundParams + +- (id)initWithStart:(size_t)s end:(size_t)e r:(double)red g:(double)green b:(double)blue a:(double)alpha { - return CFArrayGetCount(ff->fonts); -} - -char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) -{ - CFStringRef familystr; - char *family; - - familystr = (CFStringRef) CFArrayGetValueAtIndex(ff->fonts, n); - // toll-free bridge - family = uiDarwinNSStringToText((NSString *) familystr); - // Get Rule means we do not free familystr - return family; -} - -void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) -{ - CFRelease(ff->fonts); - uiFree(ff); -} - -struct uiDrawTextFont { - CTFontRef f; -}; - -uiDrawTextFont *mkTextFont(CTFontRef f, BOOL retain) -{ - uiDrawTextFont *font; - - font = uiNew(uiDrawTextFont); - font->f = f; - if (retain) - CFRetain(font->f); - return font; -} - -uiDrawTextFont *mkTextFontFromNSFont(NSFont *f) -{ - // toll-free bridging; we do retain, though - return mkTextFont((CTFontRef) f, YES); -} - -static CFMutableDictionaryRef newAttrList(void) -{ - CFMutableDictionaryRef attr; - - attr = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - if (attr == NULL) - complain("error creating attribute dictionary in newAttrList()()"); - return attr; -} - -static void addFontFamilyAttr(CFMutableDictionaryRef attr, const char *family) -{ - CFStringRef cfstr; - - cfstr = CFStringCreateWithCString(NULL, family, kCFStringEncodingUTF8); - if (cfstr == NULL) - complain("error creating font family name CFStringRef in addFontFamilyAttr()"); - CFDictionaryAddValue(attr, kCTFontFamilyNameAttribute, cfstr); - CFRelease(cfstr); // dictionary holds its own reference -} - -static void addFontSizeAttr(CFMutableDictionaryRef attr, double size) -{ - CFNumberRef n; - - n = CFNumberCreate(NULL, kCFNumberDoubleType, &size); - CFDictionaryAddValue(attr, kCTFontSizeAttribute, n); - CFRelease(n); -} - -#if 0 -TODO -// See http://stackoverflow.com/questions/4810409/does-coretext-support-small-caps/4811371#4811371 and https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c for what these do -// And fortunately, unlike the traits (see below), unmatched features are simply ignored without affecting the other features :D -static void addFontSmallCapsAttr(CFMutableDictionaryRef attr) -{ - CFMutableArrayRef outerArray; - CFMutableDictionaryRef innerDict; - CFNumberRef numType, numSelector; - int num; - - outerArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); - if (outerArray == NULL) - complain("error creating outer CFArray for adding small caps attributes in addFontSmallCapsAttr()"); - - // Apple's headers say these are deprecated, but a few fonts still rely on them - num = kLetterCaseType; - numType = CFNumberCreate(NULL, kCFNumberIntType, &num); - num = kSmallCapsSelector; - numSelector = CFNumberCreate(NULL, kCFNumberIntType, &num); - innerDict = newAttrList(); - CFDictionaryAddValue(innerDict, kCTFontFeatureTypeIdentifierKey, numType); - CFRelease(numType); - CFDictionaryAddValue(innerDict, kCTFontFeatureSelectorIdentifierKey, numSelector); - CFRelease(numSelector); - CFArrayAppendValue(outerArray, innerDict); - CFRelease(innerDict); // and likewise for CFArray - - // these are the non-deprecated versions of the above; some fonts have these instead - num = kLowerCaseType; - numType = CFNumberCreate(NULL, kCFNumberIntType, &num); - num = kLowerCaseSmallCapsSelector; - numSelector = CFNumberCreate(NULL, kCFNumberIntType, &num); - innerDict = newAttrList(); - CFDictionaryAddValue(innerDict, kCTFontFeatureTypeIdentifierKey, numType); - CFRelease(numType); - CFDictionaryAddValue(innerDict, kCTFontFeatureSelectorIdentifierKey, numSelector); - CFRelease(numSelector); - CFArrayAppendValue(outerArray, innerDict); - CFRelease(innerDict); // and likewise for CFArray - - CFDictionaryAddValue(attr, kCTFontFeatureSettingsAttribute, outerArray); - CFRelease(outerArray); -} -#endif - -// Named constants for these were NOT added until 10.11, and even then they were added as external symbols instead of macros, so we can't use them directly :( -// kode54 got these for me before I had access to El Capitan; thanks to him. -#define ourNSFontWeightUltraLight -0.800000 -#define ourNSFontWeightThin -0.600000 -#define ourNSFontWeightLight -0.400000 -#define ourNSFontWeightRegular 0.000000 -#define ourNSFontWeightMedium 0.230000 -#define ourNSFontWeightSemibold 0.300000 -#define ourNSFontWeightBold 0.400000 -#define ourNSFontWeightHeavy 0.560000 -#define ourNSFontWeightBlack 0.620000 -static const CGFloat ctWeights[] = { - // yeah these two have their names swapped; blame Pango - [uiDrawTextWeightThin] = ourNSFontWeightUltraLight, - [uiDrawTextWeightUltraLight] = ourNSFontWeightThin, - [uiDrawTextWeightLight] = ourNSFontWeightLight, - // for this one let's go between Light and Regular - // we're doing nearest so if there happens to be an exact value hopefully it's close enough - [uiDrawTextWeightBook] = ourNSFontWeightLight + ((ourNSFontWeightRegular - ourNSFontWeightLight) / 2), - [uiDrawTextWeightNormal] = ourNSFontWeightRegular, - [uiDrawTextWeightMedium] = ourNSFontWeightMedium, - [uiDrawTextWeightSemiBold] = ourNSFontWeightSemibold, - [uiDrawTextWeightBold] = ourNSFontWeightBold, - // for this one let's go between Bold and Heavy - [uiDrawTextWeightUltraBold] = ourNSFontWeightBold + ((ourNSFontWeightHeavy - ourNSFontWeightBold) / 2), - [uiDrawTextWeightHeavy] = ourNSFontWeightHeavy, - [uiDrawTextWeightUltraHeavy] = ourNSFontWeightBlack, -}; - -// Unfortunately there are still no named constants for these. -// Let's just use normalized widths. -// As far as I can tell (OS X only ships with condensed fonts, not expanded fonts; TODO), regardless of condensed or expanded, negative means condensed and positive means expanded. -// TODO verify this is correct -static const CGFloat ctStretches[] = { - [uiDrawTextStretchUltraCondensed] = -1.0, - [uiDrawTextStretchExtraCondensed] = -0.75, - [uiDrawTextStretchCondensed] = -0.5, - [uiDrawTextStretchSemiCondensed] = -0.25, - [uiDrawTextStretchNormal] = 0.0, - [uiDrawTextStretchSemiExpanded] = 0.25, - [uiDrawTextStretchExpanded] = 0.5, - [uiDrawTextStretchExtraExpanded] = 0.75, - [uiDrawTextStretchUltraExpanded] = 1.0, -}; - -struct closeness { - CFIndex index; - CGFloat weight; - CGFloat italic; - CGFloat stretch; - CGFloat distance; -}; - -// Stupidity: CTFont requires an **exact match for the entire traits dictionary**, otherwise it will **drop ALL the traits**. -// We have to implement the closest match ourselves. -// Also we have to do this before adding the small caps flags, because the matching descriptors won't have those. -CTFontDescriptorRef matchTraits(CTFontDescriptorRef against, uiDrawTextWeight weight, uiDrawTextItalic italic, uiDrawTextStretch stretch) -{ - CGFloat targetWeight; - CGFloat italicCloseness, obliqueCloseness, normalCloseness; - CGFloat targetStretch; - CFArrayRef matching; - CFIndex i, n; - struct closeness *closeness; - CTFontDescriptorRef current; - CTFontDescriptorRef out; - - targetWeight = ctWeights[weight]; - switch (italic) { - case uiDrawTextItalicNormal: - italicCloseness = 1; - obliqueCloseness = 1; - normalCloseness = 0; - break; - case uiDrawTextItalicOblique: - italicCloseness = 0.5; - obliqueCloseness = 0; - normalCloseness = 1; - break; - case uiDrawTextItalicItalic: - italicCloseness = 0; - obliqueCloseness = 0.5; - normalCloseness = 1; - break; + self = [super init]; + if (self) { + self->start = s; + self->end = e; + self->r = red; + self->g = green; + self->b = blue; + self->a = alpha; } - targetStretch = ctStretches[stretch]; - - matching = CTFontDescriptorCreateMatchingFontDescriptors(against, NULL); - if (matching == NULL) - // no matches; give the original back and hope for the best - return against; - n = CFArrayGetCount(matching); - if (n == 0) { - // likewise - CFRelease(matching); - return against; - } - - closeness = (struct closeness *) uiAlloc(n * sizeof (struct closeness), "struct closeness[]"); - for (i = 0; i < n; i++) { - CFDictionaryRef traits; - CFNumberRef cfnum; - CTFontSymbolicTraits symbolic; - - closeness[i].index = i; - - current = CFArrayGetValueAtIndex(matching, i); - traits = CTFontDescriptorCopyAttribute(current, kCTFontTraitsAttribute); - if (traits == NULL) { - // couldn't get traits; be safe by ranking it lowest - // LONGTERM figure out what the longest possible distances are - closeness[i].weight = 3; - closeness[i].italic = 2; - closeness[i].stretch = 3; - continue; - } - - symbolic = 0; // assume no symbolic traits if none are listed - cfnum = CFDictionaryGetValue(traits, kCTFontSymbolicTrait); - if (cfnum != NULL) { - SInt32 s; - - if (CFNumberGetValue(cfnum, kCFNumberSInt32Type, &s) == false) - complain("error getting symbolic traits in matchTraits()"); - symbolic = (CTFontSymbolicTraits) s; - // Get rule; do not release cfnum - } - - // now try weight - cfnum = CFDictionaryGetValue(traits, kCTFontWeightTrait); - if (cfnum != NULL) { - CGFloat val; - - // LONGTERM instead of complaining for this and width and possibly also symbolic traits above, should we just fall through to the default? - if (CFNumberGetValue(cfnum, kCFNumberCGFloatType, &val) == false) - complain("error getting weight value in matchTraits()"); - closeness[i].weight = val - targetWeight; - } else - // okay there's no weight key; let's try the literal meaning of the symbolic constant - // LONGTERM is the weight key guaranteed? - if ((symbolic & kCTFontBoldTrait) != 0) - closeness[i].weight = ourNSFontWeightBold - targetWeight; - else - closeness[i].weight = ourNSFontWeightRegular - targetWeight; - - // italics is a bit harder because Core Text doesn't expose a concept of obliqueness - // Pango just does a g_strrstr() (backwards case-sensitive search) for "Oblique" in the font's style name (see https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c); let's do that too I guess - if ((symbolic & kCTFontItalicTrait) != 0) - closeness[i].italic = italicCloseness; - else { - CFStringRef styleName; - BOOL isOblique; - - isOblique = NO; // default value - styleName = CTFontDescriptorCopyAttribute(current, kCTFontStyleNameAttribute); - if (styleName != NULL) { - CFRange range; - - // note the use of the toll-free bridge for the string literal, since CFSTR() *can* return NULL - range = CFStringFind(styleName, (CFStringRef) @"Oblique", kCFCompareBackwards); - if (range.location != kCFNotFound) - isOblique = YES; - CFRelease(styleName); - } - if (isOblique) - closeness[i].italic = obliqueCloseness; - else - closeness[i].italic = normalCloseness; - } - - // now try width - // TODO this does not seem to be enough for Skia's extended variants; the width trait is 0 but the Expanded flag is on - // TODO verify the rest of this matrix (what matrix?) - cfnum = CFDictionaryGetValue(traits, kCTFontWidthTrait); - if (cfnum != NULL) { - CGFloat val; - - if (CFNumberGetValue(cfnum, kCFNumberCGFloatType, &val) == false) - complain("error getting width value in matchTraits()"); - closeness[i].stretch = val - targetStretch; - } else - // okay there's no width key; let's try the literal meaning of the symbolic constant - // LONGTERM is the width key guaranteed? - if ((symbolic & kCTFontExpandedTrait) != 0) - closeness[i].stretch = 1.0 - targetStretch; - else if ((symbolic & kCTFontCondensedTrait) != 0) - closeness[i].stretch = -1.0 - targetStretch; - else - closeness[i].stretch = 0.0 - targetStretch; - - CFRelease(traits); - } - - // now figure out the 3-space difference between the three and sort by that - for (i = 0; i < n; i++) { - CGFloat weight, italic, stretch; - - weight = closeness[i].weight; - weight *= weight; - italic = closeness[i].italic; - italic *= italic; - stretch = closeness[i].stretch; - stretch *= stretch; - closeness[i].distance = sqrt(weight + italic + stretch); - } - qsort_b(closeness, n, sizeof (struct closeness), ^(const void *aa, const void *bb) { - const struct closeness *a = (const struct closeness *) aa; - const struct closeness *b = (const struct closeness *) bb; - - // via http://www.gnu.org/software/libc/manual/html_node/Comparison-Functions.html#Comparison-Functions - // LONGTERM is this really the best way? isn't it the same as if (*a < *b) return -1; if (*a > *b) return 1; return 0; ? - return (a->distance > b->distance) - (a->distance < b->distance); - }); - // and the first element of the sorted array is what we want - out = CFArrayGetValueAtIndex(matching, closeness[0].index); - CFRetain(out); // get rule - - // release everything - uiFree(closeness); - CFRelease(matching); - // and release the original descriptor since we no longer need it - CFRelease(against); - - return out; + return self; } -// Now remember what I said earlier about having to add the small caps traits after calling the above? This gets a dictionary back so we can do so. -CFMutableDictionaryRef extractAttributes(CTFontDescriptorRef desc) -{ - CFDictionaryRef dict; - CFMutableDictionaryRef mdict; - - dict = CTFontDescriptorCopyAttributes(desc); - // this might not be mutable, so make a mutable copy - mdict = CFDictionaryCreateMutableCopy(NULL, 0, dict); - CFRelease(dict); - return mdict; -} - -uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) -{ - CTFontRef f; - CFMutableDictionaryRef attr; - CTFontDescriptorRef cfdesc; - - attr = newAttrList(); - addFontFamilyAttr(attr, desc->Family); - addFontSizeAttr(attr, desc->Size); - - // now we have to do the traits matching, so create a descriptor, match the traits, and then get the attributes back - cfdesc = CTFontDescriptorCreateWithAttributes(attr); - // TODO release attr? - cfdesc = matchTraits(cfdesc, desc->Weight, desc->Italic, desc->Stretch); - - // specify the initial size again just to be safe - f = CTFontCreateWithFontDescriptor(cfdesc, desc->Size, NULL); - // TODO release cfdesc? - - return mkTextFont(f, NO); // we hold the initial reference; no need to retain again -} - -void uiDrawFreeTextFont(uiDrawTextFont *font) -{ - CFRelease(font->f); - uiFree(font); -} - -uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) -{ - return (uintptr_t) (font->f); -} - -void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) +- (void)draw:(CGContextRef)c layout:(uiDrawTextLayout *)layout at:(double)x y:(double)y utf8Mapping:(const size_t *)u16tou8 { // TODO } -// text sizes and user space points are identical: -// - https://developer.apple.com/library/mac/documentation/TextFonts/Conceptual/CocoaTextArchitecture/TypoFeatures/TextSystemFeatures.html#//apple_ref/doc/uid/TP40009459-CH6-51627-BBCCHIFF text points are 72 per inch -// - https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CocoaDrawingGuide/Transforms/Transforms.html#//apple_ref/doc/uid/TP40003290-CH204-SW5 user space points are 72 per inch -void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) +@end + +@implementation uiprivTextFrame + +- (id)initWithLayoutParams:(uiDrawTextLayoutParams *)p { - metrics->Ascent = CTFontGetAscent(font->f); - metrics->Descent = CTFontGetDescent(font->f); - metrics->Leading = CTFontGetLeading(font->f); - metrics->UnderlinePos = CTFontGetUnderlinePosition(font->f); - metrics->UnderlineThickness = CTFontGetUnderlineThickness(font->f); -} + CFRange range; + CGFloat cgwidth; + CFRange unused; + CGRect rect; -struct uiDrawTextLayout { - CFMutableAttributedStringRef mas; - CFRange *charsToRanges; - double width; -}; + self = [super init]; + if (self) { + self->attrstr = uiprivAttributedStringToCFAttributedString(p, &(self->backgroundParams)); + // TODO kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, kCTParagraphStyleSpecifierLineSpacingAdjustment for line spacing + self->framesetter = CTFramesetterCreateWithAttributedString(self->attrstr); + if (self->framesetter == NULL) { + // TODO + } -uiDrawTextLayout *uiDrawNewTextLayout(const char *str, uiDrawTextFont *defaultFont, double width) -{ - uiDrawTextLayout *layout; - CFAttributedStringRef immutable; - CFMutableDictionaryRef attr; - CFStringRef backing; - CFIndex i, j, n; + range.location = 0; + range.length = CFAttributedStringGetLength(self->attrstr); - layout = uiNew(uiDrawTextLayout); + cgwidth = (CGFloat) (p->Width); + if (cgwidth < 0) + cgwidth = CGFLOAT_MAX; + self->size = CTFramesetterSuggestFrameSizeWithConstraints(self->framesetter, + range, + // TODO kCTFramePathWidthAttributeName? + NULL, + CGSizeMake(cgwidth, CGFLOAT_MAX), + &unused); // not documented as accepting NULL (TODO really?) - // TODO docs say we need to use a different set of key callbacks - // TODO see if the font attribute key callbacks need to be the same - attr = newAttrList(); - // this will retain defaultFont->f; no need to worry - CFDictionaryAddValue(attr, kCTFontAttributeName, defaultFont->f); - - immutable = CFAttributedStringCreate(NULL, (CFStringRef) [NSString stringWithUTF8String:str], attr); - if (immutable == NULL) - complain("error creating immutable attributed string in uiDrawNewTextLayout()"); - CFRelease(attr); - - layout->mas = CFAttributedStringCreateMutableCopy(NULL, 0, immutable); - if (layout->mas == NULL) - complain("error creating attributed string in uiDrawNewTextLayout()"); - CFRelease(immutable); - - uiDrawTextLayoutSetWidth(layout, width); - - // unfortunately the CFRanges for attributes expect UTF-16 codepoints - // we want graphemes - // fortunately CFStringGetRangeOfComposedCharactersAtIndex() is here for us - // https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/Strings/Articles/stringsClusters.html says that this does work on all multi-codepoint graphemes (despite the name), and that this is the preferred function for this particular job anyway - backing = CFAttributedStringGetString(layout->mas); - n = CFStringGetLength(backing); - // allocate one extra, just to be safe - layout->charsToRanges = (CFRange *) uiAlloc((n + 1) * sizeof (CFRange), "CFRange[]"); - i = 0; - j = 0; - while (i < n) { - CFRange range; - - range = CFStringGetRangeOfComposedCharactersAtIndex(backing, i); - i = range.location + range.length; - layout->charsToRanges[j] = range; - j++; + rect.origin = CGPointZero; + rect.size = self->size; + self->path = CGPathCreateWithRect(rect, NULL); + self->frame = CTFramesetterCreateFrame(self->framesetter, + range, + self->path, + // TODO kCTFramePathWidthAttributeName? + NULL); + if (self->frame == NULL) { + // TODO + } } - // and set the last one - layout->charsToRanges[j].location = i; - layout->charsToRanges[j].length = 0; - - return layout; + return self; } -void uiDrawFreeTextLayout(uiDrawTextLayout *layout) +- (void)dealloc { - uiFree(layout->charsToRanges); - CFRelease(layout->mas); - uiFree(layout); + CFRelease(self->frame); + CFRelease(self->path); + CFRelease(self->framesetter); + [self->backgroundParams release]; + CFRelease(self->attrstr); + [super dealloc]; } -void uiDrawTextLayoutSetWidth(uiDrawTextLayout *layout, double width) +- (void)draw:(uiDrawContext *)c textLayout:(uiDrawTextLayout *)tl at:(double)x y:(double)y { - layout->width = width; -} + uiprivDrawTextBackgroundParams *dtb; + CGAffineTransform textMatrix; -struct framesetter { - CTFramesetterRef fs; - CFMutableDictionaryRef frameAttrib; - CGSize extents; -}; + CGContextSaveGState(c->c); + // save the text matrix because it's not part of the graphics state + textMatrix = CGContextGetTextMatrix(c->c); -// TODO CTFrameProgression for RTL/LTR -// TODO kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, kCTParagraphStyleSpecifierLineSpacingAdjustment for line spacing -static void mkFramesetter(uiDrawTextLayout *layout, struct framesetter *fs) -{ - CFRange fitRange; - CGFloat width; + for (dtb in self->backgroundParams) + /* TODO */; - fs->fs = CTFramesetterCreateWithAttributedString(layout->mas); - if (fs->fs == NULL) - complain("error creating CTFramesetter object in mkFramesetter()"); - - // TODO kCTFramePathWidthAttributeName? - fs->frameAttrib = NULL; - - width = layout->width; - if (layout->width < 0) - width = CGFLOAT_MAX; - // TODO these seem to be floor()'d or truncated? - fs->extents = CTFramesetterSuggestFrameSizeWithConstraints(fs->fs, - CFRangeMake(0, 0), - fs->frameAttrib, - CGSizeMake(width, CGFLOAT_MAX), - &fitRange); // not documented as accepting NULL -} - -static void freeFramesetter(struct framesetter *fs) -{ - if (fs->frameAttrib != NULL) - CFRelease(fs->frameAttrib); - CFRelease(fs->fs); -} - -// LONGTERM allow line separation and leading to be factored into a wrapping text layout - -// TODO reconcile differences in character wrapping on platforms -void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height) -{ - struct framesetter fs; - - mkFramesetter(layout, &fs); - *width = fs.extents.width; - *height = fs.extents.height; - freeFramesetter(&fs); -} - -// Core Text doesn't draw onto a flipped view correctly; we have to do this -// see the iOS bits of the first example at https://developer.apple.com/library/mac/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW1 (iOS is naturally flipped) -// TODO how is this affected by the CTM? -static void prepareContextForText(CGContextRef c, CGFloat cheight, double *y) -{ - CGContextSaveGState(c); - CGContextTranslateCTM(c, 0, cheight); - CGContextScaleCTM(c, 1.0, -1.0); - CGContextSetTextMatrix(c, CGAffineTransformIdentity); + // Core Text doesn't draw onto a flipped view correctly; we have to pretend it was unflipped + // see the iOS bits of the first example at https://developer.apple.com/library/mac/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW1 (iOS is naturally flipped) + // TODO how is this affected by a non-identity CTM? + CGContextTranslateCTM(c->c, 0, c->height); + CGContextScaleCTM(c->c, 1.0, -1.0); + CGContextSetTextMatrix(c->c, CGAffineTransformIdentity); // wait, that's not enough; we need to offset y values to account for our new flipping - *y = cheight - *y; + // TODO explain this calculation + y = c->height - self->size.height - y; + + // CTFrameDraw() draws in the path we specified when creating the frame + // this means that in our usage, CTFrameDraw() will draw at (0,0) + // so move the origin to be at (x,y) instead + // TODO are the signs correct? + CGContextTranslateCTM(c->c, x, y); + + CTFrameDraw(self->frame, c->c); + + CGContextSetTextMatrix(c->c, textMatrix); + CGContextRestoreGState(c->c); } -// TODO placement is incorrect for Helvetica -void doDrawText(CGContextRef c, CGFloat cheight, double x, double y, uiDrawTextLayout *layout) +- (void)returnWidth:(double *)width height:(double *)height { - struct framesetter fs; - CGRect rect; - CGPathRef path; - CTFrameRef frame; - - prepareContextForText(c, cheight, &y); - mkFramesetter(layout, &fs); - - // oh, and since we're flipped, y is the bottom-left coordinate of the rectangle, not the top-left - // since we are flipped, we subtract - y -= fs.extents.height; - - rect.origin = CGPointMake(x, y); - rect.size = fs.extents; - path = CGPathCreateWithRect(rect, NULL); - - frame = CTFramesetterCreateFrame(fs.fs, - CFRangeMake(0, 0), - path, - fs.frameAttrib); - if (frame == NULL) - complain("error creating CTFrame object in doDrawText()"); - CTFrameDraw(frame, c); - CFRelease(frame); - - CFRelease(path); - - freeFramesetter(&fs); - CGContextRestoreGState(c); + if (width != NULL) + *width = self->size.width; + if (height != NULL) + *height = self->size.height; } -// LONGTERM provide an equivalent to CTLineGetTypographicBounds() on uiDrawTextLayout? - -// LONGTERM keep this for later features and documentation purposes -#if 0 - w = CTLineGetTypographicBounds(line, &ascent, &descent, NULL); - // though CTLineGetTypographicBounds() returns 0 on error, it also returns 0 on an empty string, so we can't reasonably check for error - CFRelease(line); - - // LONGTERM provide a way to get the image bounds as a separate function later - bounds = CTLineGetImageBounds(line, c); - // though CTLineGetImageBounds() returns CGRectNull on error, it also returns CGRectNull on an empty string, so we can't reasonably check for error - - // CGContextSetTextPosition() positions at the baseline in the case of CTLineDraw(); we need the top-left corner instead - CTLineGetTypographicBounds(line, &yoff, NULL, NULL); - // remember that we're flipped, so we subtract - y -= yoff; - CGContextSetTextPosition(c, x, y); -#endif - -static CFRange charsToRange(uiDrawTextLayout *layout, int startChar, int endChar) +- (CFArrayRef)lines { - CFRange start, end; - CFRange out; - - start = layout->charsToRanges[startChar]; - end = layout->charsToRanges[endChar]; - out.location = start.location; - out.length = end.location - start.location; - return out; + return CTFrameGetLines(self->frame); } -#define rangeToCFRange() charsToRange(layout, startChar, endChar) +@end -void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) +struct uiDrawTextLayout { + uiprivTextFrame *frame; + uiprivTextFrame *forLines; + BOOL empty; + + // for converting CFAttributedString indices from/to byte offsets + size_t *u8tou16; + size_t nUTF8; + size_t *u16tou8; + size_t nUTF16; +}; + +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) { - CGColorSpaceRef colorspace; - CGFloat components[4]; - CGColorRef color; + uiDrawTextLayout *tl; - // for consistency with windows, use sRGB - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); - components[0] = r; - components[1] = g; - components[2] = b; - components[3] = a; - color = CGColorCreate(colorspace, components); - CGColorSpaceRelease(colorspace); + tl = uiprivNew(uiDrawTextLayout); + tl->frame = [[uiprivTextFrame alloc] initWithLayoutParams:p]; + if (uiAttributedStringLen(p->String) != 0) + tl->forLines = [tl->frame retain]; + else { + uiAttributedString *space; + uiDrawTextLayoutParams p2; - CFAttributedStringSetAttribute(layout->mas, - rangeToCFRange(), - kCTForegroundColorAttributeName, - color); - CGColorRelease(color); // TODO safe? + tl->empty = YES; + space = uiNewAttributedString(" "); + p2 = *p; + p2.String = space; + tl->forLines = [[uiprivTextFrame alloc] initWithLayoutParams:&p2]; + uiFreeAttributedString(space); + } + + // and finally copy the UTF-8/UTF-16 conversion tables + tl->u8tou16 = uiprivAttributedStringCopyUTF8ToUTF16Table(p->String, &(tl->nUTF8)); + tl->u16tou8 = uiprivAttributedStringCopyUTF16ToUTF8Table(p->String, &(tl->nUTF16)); + return tl; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) +{ + uiprivFree(tl->u16tou8); + uiprivFree(tl->u8tou16); + [tl->forLines release]; + [tl->frame release]; + uiprivFree(tl); +} + +// TODO document that (x,y) is the top-left corner of the *entire frame* +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) +{ + [tl->frame draw:c textLayout:tl at:x y:y]; +} + +// TODO document that the width and height of a layout is not necessarily the sum of the widths and heights of its constituent lines +// TODO width doesn't include trailing whitespace... +// TODO figure out how paragraph spacing should play into this +// TODO standardize and document the behavior of this on an empty layout +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) +{ + // TODO explain this, given the above + [tl->frame returnWidth:width height:NULL]; + [tl->forLines returnWidth:NULL height:height]; } diff --git a/darwin/fontbutton.m b/darwin/fontbutton.m index 22bc6465..0ef57d81 100644 --- a/darwin/fontbutton.m +++ b/darwin/fontbutton.m @@ -1,7 +1,8 @@ // 14 april 2016 #import "uipriv_darwin.h" +#import "attrstr.h" -@interface fontButton : NSButton { +@interface uiprivFontButton : NSButton { uiFontButton *libui_b; NSFont *libui_font; } @@ -11,20 +12,20 @@ - (void)activateFontButton; - (void)deactivateFontButton:(BOOL)activatingAnother; - (void)deactivateOnClose:(NSNotification *)note; -- (uiDrawTextFont *)libuiFont; +- (void)getfontdesc:(uiFontDescriptor *)uidesc; @end // only one may be active at one time -static fontButton *activeFontButton = nil; +static uiprivFontButton *activeFontButton = nil; struct uiFontButton { uiDarwinControl c; - fontButton *button; + uiprivFontButton *button; void (*onChanged)(uiFontButton *, void *); void *onChangedData; }; -@implementation fontButton +@implementation uiprivFontButton - (id)initWithFrame:(NSRect)frame libuiFontButton:(uiFontButton *)b { @@ -138,9 +139,16 @@ struct uiFontButton { NSFontPanelCollectionModeMask; } -- (uiDrawTextFont *)libuiFont +- (void)getfontdesc:(uiFontDescriptor *)uidesc { - return mkTextFontFromNSFont(self->libui_font); + CTFontRef ctfont; + CTFontDescriptorRef ctdesc; + + ctfont = (CTFontRef) (self->libui_font); + ctdesc = CTFontCopyFontDescriptor(ctfont); + uiprivFontDescriptorFromCTFontDescriptor(ctdesc, uidesc); + CFRelease(ctdesc); + uidesc->Size = CTFontGetSize(ctfont); } @end @@ -149,16 +157,16 @@ uiDarwinControlAllDefaults(uiFontButton, button) // we do not want font change events to be sent to any controls other than the font buttons // see main.m for more details -BOOL fontButtonInhibitSendAction(SEL sel, id from, id to) +BOOL uiprivFontButtonInhibitSendAction(SEL sel, id from, id to) { if (sel != @selector(changeFont:)) return NO; - return ![to isKindOfClass:[fontButton class]]; + return ![to isKindOfClass:[uiprivFontButton class]]; } // we do not want NSFontPanelValidation messages to be sent to any controls other than the font buttons when a font button is active // see main.m for more details -BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override) +BOOL uiprivFontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override) { if (activeFontButton == nil) return NO; @@ -170,10 +178,10 @@ BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override) // we also don't want the panel to be usable when there's a dialog running; see stddialogs.m for more details on that // unfortunately the panel seems to ignore -setWorksWhenModal: so we'll have to do things ourselves -@interface nonModalFontPanel : NSFontPanel +@interface uiprivNonModalFontPanel : NSFontPanel @end -@implementation nonModalFontPanel +@implementation uiprivNonModalFontPanel - (BOOL)worksWhenModal { @@ -182,9 +190,9 @@ BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override) @end -void setupFontPanel(void) +void uiprivSetupFontPanel(void) { - [NSFontManager setFontPanelFactory:[nonModalFontPanel class]]; + [NSFontManager setFontPanelFactory:[uiprivNonModalFontPanel class]]; } static void defaultOnChanged(uiFontButton *b, void *data) @@ -192,9 +200,9 @@ static void defaultOnChanged(uiFontButton *b, void *data) // do nothing } -uiDrawTextFont *uiFontButtonFont(uiFontButton *b) +void uiFontButtonFont(uiFontButton *b, uiFontDescriptor *desc) { - return [b->button libuiFont]; + [b->button getfontdesc:desc]; } void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data) @@ -209,10 +217,16 @@ uiFontButton *uiNewFontButton(void) uiDarwinNewControl(uiFontButton, b); - b->button = [[fontButton alloc] initWithFrame:NSZeroRect libuiFontButton:b]; + b->button = [[uiprivFontButton alloc] initWithFrame:NSZeroRect libuiFontButton:b]; uiDarwinSetControlFont(b->button, NSRegularControlSize); uiFontButtonOnChanged(b, defaultOnChanged, NULL); return b; } + +void uiFreeFontButtonFont(uiFontDescriptor *desc) +{ + // TODO ensure this is synchronized with fontmatch.m + uiFreeText((char *) (desc->Family)); +} diff --git a/darwin/fontmatch.m b/darwin/fontmatch.m new file mode 100644 index 00000000..2c240b95 --- /dev/null +++ b/darwin/fontmatch.m @@ -0,0 +1,494 @@ +// 3 january 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// TODOs: +// - switching from Skia to a non-fvar-based font crashes because the CTFontDescriptorRef we get has an empty variation dictionary for some reason... +// - Futura causes the Courier New in the drawtext example to be bold for some reason... + +// Core Text exposes font style info in two forms: +// - Fonts with a QuickDraw GX font variation (fvar) table, a feature +// adopted by OpenType, expose variations directly. +// - All other fonts have Core Text normalize the font style info +// into a traits dictionary. +// Of course this setup doesn't come without its hiccups and +// glitches. In particular, not only are the exact rules not well +// defined, but also font matching doesn't work as we want it to +// (exactly how varies based on the way the style info is exposed). +// So we'll have to implement style matching ourselves. +// We can use Core Text's matching to get a complete list of +// *possible* matches, and then we can filter out the ones we don't +// want ourselves. +// +// To make things easier for us, we'll match by converting Core +// Text's values back into libui values. This allows us to also use the +// normalization code for filling in uiFontDescriptors from +// Core Text fonts and font descriptors. +// +// Style matching needs to be done early in the font loading process; +// in particular, we have to do this before adding any features, +// because the descriptors returned by Core Text's own font +// matching won't have any. + +@implementation uiprivFontStyleData + +- (id)initWithFont:(CTFontRef)f +{ + self = [super init]; + if (self) { + self->font = f; + CFRetain(self->font); + self->desc = CTFontCopyFontDescriptor(self->font); + if (![self prepare]) { + [self release]; + return nil; + } + } + return self; +} + +- (id)initWithDescriptor:(CTFontDescriptorRef)d +{ + self = [super init]; + if (self) { + self->font = NULL; + self->desc = d; + CFRetain(self->desc); + if (![self prepare]) { + [self release]; + return nil; + } + } + return self; +} + +- (void)dealloc +{ +#define REL(x) if (x != NULL) { CFRelease(x); x = NULL; } + REL(self->variationAxes); + REL(self->familyName); + REL(self->preferredFamilyName); + REL(self->fullName); + REL(self->subFamilyName); + REL(self->preferredSubFamilyName); + REL(self->postScriptName); + REL(self->variation); + REL(self->styleName); + REL(self->traits); + CFRelease(self->desc); + REL(self->font); + [super dealloc]; +} + +- (BOOL)prepare +{ + CFNumberRef num; + Boolean success; + + self->traits = NULL; + self->symbolic = 0; + self->weight = 0; + self->width = 0; + self->didStyleName = NO; + self->styleName = NULL; + self->didVariation = NO; + self->variation = NULL; + self->hasRegistrationScope = NO; + self->registrationScope = 0; + self->didPostScriptName = NO; + self->postScriptName = NULL; + self->fontFormat = 0; + self->didPreferredSubFamilyName = NO; + self->preferredSubFamilyName = NULL; + self->didSubFamilyName = NO; + self->subFamilyName = NULL; + self->didFullName = NO; + self->fullName = NULL; + self->didPreferredFamilyName = NO; + self->preferredFamilyName = NULL; + self->didFamilyName = NO; + self->familyName = NULL; + self->didVariationAxes = NO; + self->variationAxes = NULL; + + self->traits = (CFDictionaryRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontTraitsAttribute); + if (self->traits == NULL) + return NO; + + num = (CFNumberRef) CFDictionaryGetValue(self->traits, kCTFontSymbolicTrait); + if (num == NULL) + return NO; + if (CFNumberGetValue(num, kCFNumberSInt32Type, &(self->symbolic)) == false) + return NO; + + num = (CFNumberRef) CFDictionaryGetValue(self->traits, kCTFontWeightTrait); + if (num == NULL) + return NO; + if (CFNumberGetValue(num, kCFNumberDoubleType, &(self->weight)) == false) + return NO; + + num = (CFNumberRef) CFDictionaryGetValue(self->traits, kCTFontWidthTrait); + if (num == NULL) + return NO; + if (CFNumberGetValue(num, kCFNumberDoubleType, &(self->width)) == false) + return NO; + + // do these now for the sake of error checking + num = (CFNumberRef) CTFontDescriptorCopyAttribute(desc, kCTFontRegistrationScopeAttribute); + self->hasRegistrationScope = num != NULL; + if (self->hasRegistrationScope) { + success = CFNumberGetValue(num, kCFNumberSInt32Type, &(self->registrationScope)); + CFRelease(num); + if (success == false) + return NO; + } + + num = (CFNumberRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontFormatAttribute); + if (num == NULL) + return NO; + success = CFNumberGetValue(num, kCFNumberSInt32Type, &(self->fontFormat)); + CFRelease(num); + if (success == false) + return NO; + + return YES; +} + +- (void)ensureFont +{ + if (self->font != NULL) + return; + self->font = CTFontCreateWithFontDescriptor(self->desc, 0.0, NULL); +} + +- (CTFontSymbolicTraits)symbolicTraits +{ + return self->symbolic; +} + +- (double)weight +{ + return self->weight; +} + +- (double)width +{ + return self->width; +} + +- (CFStringRef)styleName +{ + if (!self->didStyleName) { + self->didStyleName = YES; + self->styleName = (CFStringRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontStyleNameAttribute); + // The code we use this for (guessItalicOblique() below) checks if this is NULL or not, so we're good. + } + return self->styleName; +} + +- (CFDictionaryRef)variation +{ + if (!self->didVariation) { + self->didVariation = YES; + self->variation = (CFDictionaryRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontVariationAttribute); + // This being NULL is used to determine whether a font uses variations at all, so we don't need to worry now. + } + return self->variation; +} + +- (BOOL)hasRegistrationScope +{ + return self->hasRegistrationScope; +} + +- (CTFontManagerScope)registrationScope +{ + return self->registrationScope; +} + +- (CFStringRef)postScriptName +{ + if (!self->didPostScriptName) { + self->didPostScriptName = YES; + [self ensureFont]; + self->postScriptName = CTFontCopyPostScriptName(self->font); + } + return self->postScriptName; +} + +- (CFDataRef)table:(CTFontTableTag)tag +{ + [self ensureFont]; + return CTFontCopyTable(self->font, tag, kCTFontTableOptionNoOptions); +} + +- (CTFontFormat)fontFormat +{ + return self->fontFormat; +} + +// We don't need to worry if this or any of the functions that use it return NULL, because the code that uses it (libFontRegistry.dylib bug workarounds in fonttraits.m) checks for NULL. +- (CFStringRef)fontName:(CFStringRef)key +{ + [self ensureFont]; + return CTFontCopyName(self->font, key); +} + +#define FONTNAME(sel, did, var, key) \ + - (CFStringRef)sel \ + { \ + if (!did) { \ + did = YES; \ + var = [self fontName:key]; \ + } \ + return var; \ + } +FONTNAME(preferredSubFamilyName, + self->didPreferredSubFamilyName, + self->preferredSubFamilyName, + UNDOC_kCTFontPreferredSubFamilyNameKey) +FONTNAME(subFamilyName, + self->didSubFamilyName, + self->subFamilyName, + kCTFontSubFamilyNameKey) +FONTNAME(fullName, + self->didFullName, + self->fullName, + kCTFontFullNameKey) +FONTNAME(preferredFamilyName, + self->didPreferredFamilyName, + self->preferredFamilyName, + UNDOC_kCTFontPreferredFamilyNameKey) +FONTNAME(familyName, + self->didFamilyName, + self->familyName, + kCTFontFamilyNameKey) + +- (CFArrayRef)variationAxes +{ + if (!self->didVariationAxes) { + self->didVariationAxes = YES; + [self ensureFont]; + self->variationAxes = CTFontCopyVariationAxes(self->font); + // We don't care about the return value because we call this only on fonts that we know have variations anyway. + } + return self->variationAxes; +} + +@end + +struct closeness { + CFIndex index; + uiTextWeight weight; + double italic; + uiTextStretch stretch; + double distance; +}; + +// remember that in closeness, 0 means exact +// in this case, since we define the range, we use 0.5 to mean "close enough" (oblique for italic and italic for oblique) and 1 to mean "not a match" +static const double italicClosenessNormal[] = { 0, 1, 1 }; +static const double italicClosenessOblique[] = { 1, 0, 0.5 }; +static const double italicClosenessItalic[] = { 1, 0.5, 0 }; +static const double *italicClosenesses[] = { + [uiTextItalicNormal] = italicClosenessNormal, + [uiTextItalicOblique] = italicClosenessOblique, + [uiTextItalicItalic] = italicClosenessItalic, +}; + +// Core Text doesn't seem to differentiate between Italic and Oblique. +// Pango's Core Text code just does a g_strrstr() (backwards case-sensitive search) for "Oblique" in the font's style name (see https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c); let's do that too I guess +static uiTextItalic guessItalicOblique(uiprivFontStyleData *d) +{ + CFStringRef styleName; + BOOL isOblique; + + isOblique = NO; // default value + styleName = [d styleName]; + if (styleName != NULL) { + CFRange range; + + range = CFStringFind(styleName, CFSTR("Oblique"), kCFCompareBackwards); + if (range.location != kCFNotFound) + isOblique = YES; + } + if (isOblique) + return uiTextItalicOblique; + return uiTextItalicItalic; +} + +// Italics are hard because Core Text does NOT distinguish between italic and oblique. +// All Core Text provides is a slant value and the italic bit of the symbolic traits mask. +// However, Core Text does seem to guarantee (from experimentation; see below) that the slant will be nonzero if and only if the italic bit is set, so we don't need to use the slant value. +// Core Text also seems to guarantee that if a font lists itself as Italic or Oblique by name (font subfamily name, font style name, whatever), it will also have that bit set, so testing this bit does cover all fonts that name themselves as Italic and Oblique. (Again, this is from the below experimentation.) +// TODO there is still one catch that might matter from a user's POV: the reverse is not true — the italic bit can be set even if the style of the font face/subfamily/style isn't named as Italic (for example, script typefaces like Adobe's Palace Script MT Std); I don't know what to do about this... I know how to start: find a script font that has an italic form (Adobe's Palace Script MT Std does not; only Regular and Semibold) +static void setItalic(uiprivFontStyleData *d, uiFontDescriptor *out) +{ + out->Italic = uiTextItalicNormal; + if (([d symbolicTraits] & kCTFontItalicTrait) != 0) + out->Italic = guessItalicOblique(d); +} + +static void fillDescStyleFields(uiprivFontStyleData *d, NSDictionary *axisDict, uiFontDescriptor *out) +{ + setItalic(d, out); + if (axisDict != nil) + uiprivProcessFontVariation(d, axisDict, out); + else + uiprivProcessFontTraits(d, out); +} + +static CTFontDescriptorRef matchStyle(CTFontDescriptorRef against, uiFontDescriptor *styles) +{ + CFArrayRef matching; + CFIndex i, n; + struct closeness *closeness; + CTFontDescriptorRef current; + CTFontDescriptorRef out; + uiprivFontStyleData *d; + NSDictionary *axisDict; + + matching = CTFontDescriptorCreateMatchingFontDescriptors(against, NULL); + if (matching == NULL) + // no matches; give the original back and hope for the best + return against; + n = CFArrayGetCount(matching); + if (n == 0) { + // likewise + CFRelease(matching); + return against; + } + + current = (CTFontDescriptorRef) CFArrayGetValueAtIndex(matching, 0); + d = [[uiprivFontStyleData alloc] initWithDescriptor:current]; + axisDict = nil; + if ([d variation] != NULL) + axisDict = uiprivMakeVariationAxisDict([d variationAxes], [d table:kCTFontTableAvar]); + + closeness = (struct closeness *) uiprivAlloc(n * sizeof (struct closeness), "struct closeness[]"); + for (i = 0; i < n; i++) { + uiFontDescriptor fields; + + closeness[i].index = i; + if (i != 0) { + current = (CTFontDescriptorRef) CFArrayGetValueAtIndex(matching, i); + d = [[uiprivFontStyleData alloc] initWithDescriptor:current]; + } + fillDescStyleFields(d, axisDict, &fields); + closeness[i].weight = fields.Weight - styles->Weight; + closeness[i].italic = italicClosenesses[styles->Italic][fields.Italic]; + closeness[i].stretch = fields.Stretch - styles->Stretch; + [d release]; + } + + // now figure out the 3-space difference between the three and sort by that + // TODO merge this loop with the previous loop? + for (i = 0; i < n; i++) { + double weight, italic, stretch; + + weight = (double) (closeness[i].weight); + weight *= weight; + italic = closeness[i].italic; + italic *= italic; + stretch = (double) (closeness[i].stretch); + stretch *= stretch; + closeness[i].distance = sqrt(weight + italic + stretch); + } + qsort_b(closeness, n, sizeof (struct closeness), ^(const void *aa, const void *bb) { + const struct closeness *a = (const struct closeness *) aa; + const struct closeness *b = (const struct closeness *) bb; + + // via http://www.gnu.org/software/libc/manual/html_node/Comparison-Functions.html#Comparison-Functions + // LONGTERM is this really the best way? isn't it the same as if (*a < *b) return -1; if (*a > *b) return 1; return 0; ? + return (a->distance > b->distance) - (a->distance < b->distance); + }); + // and the first element of the sorted array is what we want + out = CFArrayGetValueAtIndex(matching, closeness[0].index); + CFRetain(out); // get rule + + // release everything + if (axisDict != nil) + [axisDict release]; + uiprivFree(closeness); + CFRelease(matching); + // and release the original descriptor since we no longer need it + CFRelease(against); + + return out; +} + +CTFontDescriptorRef uiprivFontDescriptorToCTFontDescriptor(uiFontDescriptor *fd) +{ + CFMutableDictionaryRef attrs; + CFStringRef cffamily; + CFNumberRef cfsize; + CTFontDescriptorRef basedesc; + + attrs = CFDictionaryCreateMutable(NULL, 2, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (attrs == NULL) { + // TODO + } + cffamily = CFStringCreateWithCString(NULL, fd->Family, kCFStringEncodingUTF8); + if (cffamily == NULL) { + // TODO + } + CFDictionaryAddValue(attrs, kCTFontFamilyNameAttribute, cffamily); + CFRelease(cffamily); + cfsize = CFNumberCreate(NULL, kCFNumberDoubleType, &(fd->Size)); + CFDictionaryAddValue(attrs, kCTFontSizeAttribute, cfsize); + CFRelease(cfsize); + + basedesc = CTFontDescriptorCreateWithAttributes(attrs); + CFRelease(attrs); // TODO correct? + return matchStyle(basedesc, fd); +} + +// fortunately features that aren't supported are simply ignored, so we can copy them all in +CTFontDescriptorRef uiprivCTFontDescriptorAppendFeatures(CTFontDescriptorRef desc, const uiOpenTypeFeatures *otf) +{ + CTFontDescriptorRef new; + CFArrayRef featuresArray; + CFDictionaryRef attrs; + const void *keys[1], *values[1]; + + featuresArray = uiprivOpenTypeFeaturesToCTFeatures(otf); + keys[0] = kCTFontFeatureSettingsAttribute; + values[0] = featuresArray; + attrs = CFDictionaryCreate(NULL, + keys, values, 1, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease(featuresArray); + new = CTFontDescriptorCreateCopyWithAttributes(desc, attrs); + CFRelease(attrs); + CFRelease(desc); + return new; +} + +void uiprivFontDescriptorFromCTFontDescriptor(CTFontDescriptorRef ctdesc, uiFontDescriptor *uidesc) +{ + CFStringRef cffamily; + uiprivFontStyleData *d; + NSDictionary *axisDict; + + cffamily = (CFStringRef) CTFontDescriptorCopyAttribute(ctdesc, kCTFontFamilyNameAttribute); + if (cffamily == NULL) { + // TODO + } + // TODO normalize this by adding a uiDarwinCFStringToText() + uidesc->Family = uiDarwinNSStringToText((NSString *) cffamily); + CFRelease(cffamily); + + d = [[uiprivFontStyleData alloc] initWithDescriptor:ctdesc]; + axisDict = nil; + if ([d variation] != NULL) + axisDict = uiprivMakeVariationAxisDict([d variationAxes], [d table:kCTFontTableAvar]); + fillDescStyleFields(d, axisDict, uidesc); + if (axisDict != nil) + [axisDict release]; + [d release]; +} diff --git a/darwin/fonttraits.m b/darwin/fonttraits.m new file mode 100644 index 00000000..a51492c9 --- /dev/null +++ b/darwin/fonttraits.m @@ -0,0 +1,223 @@ +// 1 november 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// This is the part of the font style matching and normalization code +// that handles fonts that use a traits dictionary. +// +// Matching stupidity: Core Text requires an **exact match for the +// entire traits dictionary**, otherwise it will **drop ALL the traits**. +// +// Normalization stupidity: Core Text uses its own scaled values for +// weight and width, but the values are different if the font is not +// registered and if said font is TrueType or OpenType. The values +// for all other cases do have some named constants starting with +// OS X 10.11, but even these aren't very consistent in practice. +// +// Of course, none of this is documented anywhere, so I had to do +// both trial-and-error AND reverse engineering to figure out what's +// what. We'll just convert Core Text's values into libui constants +// and use those for matching. + +static BOOL fontRegistered(uiprivFontStyleData *d) +{ + if (![d hasRegistrationScope]) + // header says this should be treated as the same as not registered + return NO; + // examination of Core Text shows this is accurate + return [d registrationScope] != kCTFontManagerScopeNone; +} + +// Core Text does (usWidthClass / 10) - 0.5 here. +// This roughly maps to our values with increments of 0.1, except for the fact 0 and 10 are allowed by Core Text, despite being banned by TrueType and OpenType themselves. +// We'll just treat them as identical to 1 and 9, respectively. +static const uiTextStretch os2WidthsToStretches[] = { + uiTextStretchUltraCondensed, + uiTextStretchUltraCondensed, + uiTextStretchExtraCondensed, + uiTextStretchCondensed, + uiTextStretchSemiCondensed, + uiTextStretchNormal, + uiTextStretchSemiExpanded, + uiTextStretchExpanded, + uiTextStretchExtraExpanded, + uiTextStretchUltraExpanded, + uiTextStretchUltraExpanded, +}; + +static const CFStringRef exceptions[] = { + CFSTR("LucidaGrande"), + CFSTR(".LucidaGrandeUI"), + CFSTR("STHeiti"), + CFSTR("STXihei"), + CFSTR("TimesNewRomanPSMT"), + NULL, +}; + +static void trySecondaryOS2Values(uiprivFontStyleData *d, uiFontDescriptor *out, BOOL *hasWeight, BOOL *hasWidth) +{ + CFDataRef os2; + uint16_t usWeightClass, usWidthClass; + CFStringRef psname; + const CFStringRef *ex; + + *hasWeight = NO; + *hasWidth = NO; + + // only applies to unregistered fonts + if (fontRegistered(d)) + return; + + os2 = [d table:kCTFontTableOS2]; + if (os2 == NULL) + // no OS2 table, so no secondary values + return; + + if (CFDataGetLength(os2) > 77) { + const UInt8 *b; + + b = CFDataGetBytePtr(os2); + + usWeightClass = ((uint16_t) (b[4])) << 8; + usWeightClass |= (uint16_t) (b[5]); + if (usWeightClass <= 1000) { + if (usWeightClass < 11) + usWeightClass *= 100; + *hasWeight = YES; + } + + usWidthClass = ((uint16_t) (b[6])) << 8; + usWidthClass |= (uint16_t) (b[7]); + if (usWidthClass <= 10) + *hasWidth = YES; + } else { + usWeightClass = 0; + *hasWeight = YES; + + usWidthClass = 0; + *hasWidth = YES; + } + if (*hasWeight) + // we can just use this directly + out->Weight = usWeightClass; + if (*hasWidth) + out->Stretch = os2WidthsToStretches[usWidthClass]; + CFRelease(os2); + + // don't use secondary weights in the event of special predefined names + psname = [d postScriptName]; + for (ex = exceptions; *ex != NULL; ex++) + if (CFEqual(psname, *ex)) { + *hasWeight = NO; + break; + } +} + +static BOOL testTTFOTFSubfamilyName(CFStringRef name, CFStringRef want) +{ + CFRange range; + + if (name == NULL) + return NO; + range.location = 0; + range.length = CFStringGetLength(name); + return CFStringFindWithOptions(name, want, range, + (kCFCompareCaseInsensitive | kCFCompareBackwards | kCFCompareNonliteral), NULL) != false; +} + +static BOOL testTTFOTFSubfamilyNames(uiprivFontStyleData *d, CFStringRef want) +{ + switch ([d fontFormat]) { + case kCTFontFormatOpenTypePostScript: + case kCTFontFormatOpenTypeTrueType: + case kCTFontFormatTrueType: + break; + default: + return NO; + } + + if (testTTFOTFSubfamilyName([d preferredSubFamilyName], want)) + return YES; + if (testTTFOTFSubfamilyName([d subFamilyName], want)) + return YES; + if (testTTFOTFSubfamilyName([d fullName], want)) + return YES; + if (testTTFOTFSubfamilyName([d preferredFamilyName], want)) + return YES; + return testTTFOTFSubfamilyName([d familyName], want); +} + +// work around a bug in libFontRegistry.dylib +static BOOL shouldReallyBeThin(uiprivFontStyleData *d) +{ + return testTTFOTFSubfamilyNames(d, CFSTR("W1")); +} + +// work around a bug in libFontRegistry.dylib +static BOOL shouldReallyBeSemiCondensed(uiprivFontStyleData *d) +{ + return testTTFOTFSubfamilyNames(d, CFSTR("Semi Condensed")); +} + +void uiprivProcessFontTraits(uiprivFontStyleData *d, uiFontDescriptor *out) +{ + double weight, width; + BOOL hasWeight, hasWidth; + + hasWeight = NO; + hasWidth = NO; + trySecondaryOS2Values(d, out, &hasWeight, &hasWidth); + + weight = [d weight]; + width = [d width]; + + if (!hasWeight) + // TODO this scale is a bit lopsided + if (weight <= -0.7) + out->Weight = uiTextWeightThin; + else if (weight <= -0.5) + out->Weight = uiTextWeightUltraLight; + else if (weight <= -0.3) + out->Weight = uiTextWeightLight; + else if (weight <= -0.23) { + out->Weight = uiTextWeightBook; + if (shouldReallyBeThin(d)) + out->Weight = uiTextWeightThin; + } else if (weight <= 0.0) + out->Weight = uiTextWeightNormal; + else if (weight <= 0.23) + out->Weight = uiTextWeightMedium; + else if (weight <= 0.3) + out->Weight = uiTextWeightSemiBold; + else if (weight <= 0.4) + out->Weight = uiTextWeightBold; + else if (weight <= 0.5) + out->Weight = uiTextWeightUltraBold; + else if (weight <= 0.7) + out->Weight = uiTextWeightHeavy; + else + out->Weight = uiTextWeightUltraHeavy; + + if (!hasWidth) + // TODO this scale is a bit lopsided + if (width <= -0.7) { + out->Stretch = uiTextStretchUltraCondensed; + if (shouldReallyBeSemiCondensed(d)) + out->Stretch = uiTextStretchSemiCondensed; + } else if (width <= -0.5) + out->Stretch = uiTextStretchExtraCondensed; + else if (width <= -0.2) + out->Stretch = uiTextStretchCondensed; + else if (width <= -0.1) + out->Stretch = uiTextStretchSemiCondensed; + else if (width <= 0.0) + out->Stretch = uiTextStretchNormal; + else if (width <= 0.1) + out->Stretch = uiTextStretchSemiExpanded; + else if (width <= 0.2) + out->Stretch = uiTextStretchExpanded; + else if (width <= 0.6) + out->Stretch = uiTextStretchExtraExpanded; + else + out->Stretch = uiTextStretchUltraExpanded; +} diff --git a/darwin/fontvariation.m b/darwin/fontvariation.m new file mode 100644 index 00000000..6dfb3ab1 --- /dev/null +++ b/darwin/fontvariation.m @@ -0,0 +1,336 @@ +// 2 november 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// This is the part of the font style matching and normalization code +// that handles fonts that use the fvar table. +// +// Matching stupidity: Core Text **doesn't even bother** matching +// these, even if you tell it to do so explicitly. It'll always return +// all variations for a given font. +// +// Normalization stupidity: Core Text doesn't normalize the fvar +// table values for us, so we'll have to do it ourselves. Furthermore, +// Core Text doesn't provide an API for accessing the avar table, if +// any, so we must do so ourselves. (TODO does Core Text even +// follow the avar table if a font has it?) +// +// Thankfully, normalization is well-defined in both TrueType and +// OpenType and seems identical in both, so we can just normalize +// the values and then convert them linearly to libui values for +// matching. +// +// References: +// - https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6fvar.html +// - https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6avar.html +// - https://www.microsoft.com/typography/otspec/fvar.htm +// - https://www.microsoft.com/typography/otspec/otvaroverview.htm#CSN +// - https://www.microsoft.com/typography/otspec/otff.htm +// - https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6.html#Types +// - https://www.microsoft.com/typography/otspec/avar.htm + +// TODO Skia doesn't quite map correctly; notice what passes for condensed in the drawtext example +// TODO also investigate Marker Felt not working right in Thin and Wide modes (but that's probably the other file, putting it here just so I don't forget) + +#define fvarWeight 0x77676874 +#define fvarWidth 0x77647468 + +// TODO explain why these are signed +typedef int32_t fixed1616; +typedef int16_t fixed214; + +// note that Microsoft's data type list implies that *all* fixed-point types have the same format; it only gives specific examples for the 2.14 format, which confused me because I thought 16.16 worked differently, but eh +static fixed1616 doubleToFixed1616(double d) +{ + double ipart, fpart; + long flong; + int16_t i16; + uint32_t ret; + + fpart = modf(d, &ipart); + // fpart must be unsigned; modf() gives us fpart with the same sign as d (so we have to adjust both ipart and fpart appropriately) + if (fpart < 0) { + ipart -= 1; + fpart = 1 + fpart; + } + fpart *= 65536; + flong = lround(fpart); + i16 = (int16_t) ipart; + ret = (uint32_t) ((uint16_t) i16); + ret <<= 16; + ret |= (uint16_t) (flong & 0xFFFF); + return (fixed1616) ret; +} + +// see also https://stackoverflow.com/questions/8506317/fixed-point-unsigned-division-in-c and freetype's FT_DivFix() +// TODO figure out the specifics of freetype's more complex implementation that shifts b and juggles signs +static fixed1616 fixed1616Divide(fixed1616 a, fixed1616 b) +{ + uint32_t u; + int64_t a64; + + u = (uint32_t) a; + a64 = (int64_t) (((uint64_t) u) << 16); + return (fixed1616) (a64 / b); +} + +static fixed214 fixed1616ToFixed214(fixed1616 f) +{ + uint32_t t; + uint32_t topbit; + + t = (uint32_t) (f + 0x00000002); + topbit = t & 0x80000000; + t >>= 2; + if (topbit != 0) + t |= 0xC000000; + return (fixed214) (t & 0xFFFF); +} + +static double fixed214ToDouble(fixed214 f) +{ + uint16_t u; + double base; + double frac; + + u = (uint16_t) f; + switch ((u >> 14) & 0x3) { + case 0: + base = 0; + break; + case 1: + base = 1; + break; + case 2: + base = -2; + break; + case 3: + base = -1; + } + frac = ((double) (u & 0x3FFF)) / 16384; + return base + frac; +} + +static fixed1616 fixed214ToFixed1616(fixed214 f) +{ + int32_t t; + + t = (int32_t) ((int16_t) f); + t <<= 2; + return (fixed1616) (t - 0x00000002); +} + +static const fixed1616 fixed1616Negative1 = (int32_t) ((uint32_t) 0xFFFF0000); +static const fixed1616 fixed1616Zero = 0x00000000; +static const fixed1616 fixed1616Positive1 = 0x00010000; + +static fixed1616 fixed1616Normalize(fixed1616 val, fixed1616 min, fixed1616 max, fixed1616 def) +{ + if (val < min) + val = min; + if (val > max) + val = max; + if (val < def) + return fixed1616Divide(-(def - val), (def - min)); + if (val > def) + return fixed1616Divide((val - def), (max - def)); + return fixed1616Zero; +} + +static fixed214 normalizedTo214(fixed1616 val, const fixed1616 *avarMappings, size_t avarCount) +{ + if (val < fixed1616Negative1) + val = fixed1616Negative1; + if (val > fixed1616Positive1) + val = fixed1616Positive1; + if (avarCount != 0) { + size_t start, end; + fixed1616 startFrom, endFrom; + fixed1616 startTo, endTo; + + for (end = 0; end < avarCount; end += 2) { + endFrom = avarMappings[end]; + endTo = avarMappings[end + 1]; + if (endFrom >= val) + break; + } + if (endFrom == val) + val = endTo; + else { + start = end - 2; + startFrom = avarMappings[start]; + startTo = avarMappings[start + 1]; + val = fixed1616Divide((val - startFrom), (endFrom - startFrom)); + // TODO find a font with an avar table and make sure this works, or if we need to use special code for this too + val *= (endTo - startTo); + val += startTo; + } + } + return fixed1616ToFixed214(val); +} + +static fixed1616 *avarExtract(CFDataRef table, CFIndex index, size_t *n) +{ + const UInt8 *b; + size_t off; + size_t i, nEntries; + fixed1616 *entries; + fixed1616 *p; + + b = CFDataGetBytePtr(table); + off = 8; +#define nextuint16be() ((((uint16_t) (b[off])) << 8) | ((uint16_t) (b[off + 1]))) + for (; index > 0; index--) { + nEntries = (size_t) nextuint16be(); + off += 2; + off += 4 * nEntries; + } + nEntries = nextuint16be(); + *n = nEntries * 2; + entries = (fixed1616 *) uiprivAlloc(*n * sizeof (fixed1616), "fixed1616[]"); + p = entries; + for (i = 0; i < *n; i++) { + *p++ = fixed214ToFixed1616((fixed214) nextuint16be()); + off += 2; + } + return entries; +} + +static BOOL extractAxisDictValue(CFDictionaryRef dict, CFStringRef key, fixed1616 *out) +{ + CFNumberRef num; + double v; + + num = (CFNumberRef) CFDictionaryGetValue(dict, key); + if (CFNumberGetValue(num, kCFNumberDoubleType, &v) == false) + return NO; + *out = doubleToFixed1616(v); + return YES; +} + +// TODO here and elsewhere: make sure all Objective-C classes and possibly also custom method names have uipriv prefixes +@interface fvarAxis : NSObject { + fixed1616 min; + fixed1616 max; + fixed1616 def; + fixed1616 *avarMappings; + size_t avarCount; +} +- (id)initWithIndex:(CFIndex)i dict:(CFDictionaryRef)dict avarTable:(CFDataRef)table; +- (double)normalize:(double)v; +@end + +@implementation fvarAxis + +- (id)initWithIndex:(CFIndex)i dict:(CFDictionaryRef)dict avarTable:(CFDataRef)table +{ + self = [super init]; + if (self) { + self->avarMappings = NULL; + self->avarCount = 0; + if (!extractAxisDictValue(dict, kCTFontVariationAxisMinimumValueKey, &(self->min))) + goto fail; + if (!extractAxisDictValue(dict, kCTFontVariationAxisMaximumValueKey, &(self->max))) + goto fail; + if (!extractAxisDictValue(dict, kCTFontVariationAxisDefaultValueKey, &(self->def))) + goto fail; + if (table != NULL) + self->avarMappings = avarExtract(table, i, &(self->avarCount)); + } + return self; + +fail: + [self release]; + return nil; +} + +- (void)dealloc +{ + if (self->avarMappings != NULL) { + uiprivFree(self->avarMappings); + self->avarMappings = NULL; + } + [super dealloc]; +} + +- (double)normalize:(double)d +{ + fixed1616 n; + fixed214 n2; + + n = doubleToFixed1616(d); + n = fixed1616Normalize(n, self->min, self->max, self->def); + n2 = normalizedTo214(n, self->avarMappings, self->avarCount); + return fixed214ToDouble(n2); +} + +@end + +NSDictionary *uiprivMakeVariationAxisDict(CFArrayRef axes, CFDataRef avarTable) +{ + CFDictionaryRef axis; + CFIndex i, n; + NSMutableDictionary *out; + + n = CFArrayGetCount(axes); + out = [NSMutableDictionary new]; + for (i = 0; i < n; i++) { + CFNumberRef key; + + axis = (CFDictionaryRef) CFArrayGetValueAtIndex(axes, i); + key = (CFNumberRef) CFDictionaryGetValue(axis, kCTFontVariationAxisIdentifierKey); + [out setObject:[[fvarAxis alloc] initWithIndex:i dict:axis avarTable:avarTable] + forKey:((NSNumber *) key)]; + } + if (avarTable != NULL) + CFRelease(avarTable); + return out; +} + +#define fvarAxisKey(n) [NSNumber numberWithUnsignedInteger:n] + +static BOOL tryAxis(NSDictionary *axisDict, CFDictionaryRef var, NSNumber *key, double *out) +{ + fvarAxis *axis; + CFNumberRef num; + + axis = (fvarAxis *) [axisDict objectForKey:key]; + if (axis == nil) + return NO; + num = (CFNumberRef) CFDictionaryGetValue(var, (CFNumberRef) key); + if (num == nil) + return NO; + if (CFNumberGetValue(num, kCFNumberDoubleType, out) == false) { + // TODO + return NO; + } + *out = [axis normalize:*out]; + return YES; +} + +void uiprivProcessFontVariation(uiprivFontStyleData *d, NSDictionary *axisDict, uiFontDescriptor *out) +{ + CFDictionaryRef var; + double v; + + out->Weight = uiTextWeightNormal; + out->Stretch = uiTextStretchNormal; + + var = [d variation]; + + if (tryAxis(axisDict, var, fvarAxisKey(fvarWeight), &v)) { + // v is now a value between -1 and 1 scaled linearly between discrete points + // we want a linear value between 0 and 1000 with 400 being normal + if (v < 0) { + v += 1; + out->Weight = (uiTextWeight) (v * 400); + } else if (v > 0) + out->Weight += (uiTextWeight) (v * 600); + } + + if (tryAxis(axisDict, var, fvarAxisKey(fvarWidth), &v)) { + // likewise, but with stretches, we go from 0 to 8 with 4 being directly between the two, so this is sufficient + v += 1; + out->Stretch = (uiTextStretch) (v * 4); + } +} diff --git a/darwin/form.m b/darwin/form.m index 7cdb965a..613818a9 100644 --- a/darwin/form.m +++ b/darwin/form.m @@ -530,7 +530,7 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy) // LONGTERM on other platforms // or at leat allow this and implicitly turn it into a spacer if (c == NULL) - userbug("You cannot add NULL to a uiForm."); + uiprivUserBug("You cannot add NULL to a uiForm."); [f->view append:toNSString(label) c:c stretchy:stretchy]; } diff --git a/darwin/future.m b/darwin/future.m new file mode 100644 index 00000000..a262d009 --- /dev/null +++ b/darwin/future.m @@ -0,0 +1,53 @@ +// 19 may 2017 +#import "uipriv_darwin.h" + +// functions and constants FROM THE FUTURE! +// note: for constants, dlsym() returns the address of the constant itself, as if we had done &constantName + +// added in OS X 10.10; we need 10.8 +CFStringRef *FUTURE_kCTFontOpenTypeFeatureTag = NULL; +CFStringRef *FUTURE_kCTFontOpenTypeFeatureValue = NULL; + +// added in OS X 10.12; we need 10.8 +CFStringRef *FUTURE_kCTBackgroundColorAttributeName = NULL; + +// note that we treat any error as "the symbols aren't there" (and don't care if dlclose() failed) +void loadFutures(void) +{ + void *handle; + + // dlsym() walks the dependency chain, so opening the current process should be sufficient + handle = dlopen(NULL, RTLD_LAZY); + if (handle == NULL) + return; +#define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn) + GET(FUTURE_kCTFontOpenTypeFeatureTag, kCTFontOpenTypeFeatureTag); + GET(FUTURE_kCTFontOpenTypeFeatureValue, kCTFontOpenTypeFeatureValue); + GET(FUTURE_kCTBackgroundColorAttributeName, kCTBackgroundColorAttributeName); + dlclose(handle); +} + +// wrappers for methods that exist in the future that we can check for with respondsToSelector: +// keep them in one place for convenience + +// apparently only added in 10.9; we need 10.8 +void FUTURE_NSLayoutConstraint_setIdentifier(NSLayoutConstraint *constraint, NSString *identifier) +{ + id cid = (id) constraint; + + if ([constraint respondsToSelector:@selector(setIdentifier:)]) + [cid setIdentifier:identifier]; +} + +// added in 10.11; we need 10.8 +// return whether this was done because we recreate its effects if not (see winmoveresize.m) +BOOL FUTURE_NSWindow_performWindowDragWithEvent(NSWindow *w, NSEvent *initialEvent) +{ + id cw = (id) w; + + if ([w respondsToSelector:@selector(performWindowDragWithEvent:)]) { + [cw performWindowDragWithEvent:initialEvent]; + return YES; + } + return NO; +} diff --git a/darwin/graphemes.m b/darwin/graphemes.m new file mode 100644 index 00000000..a92534f3 --- /dev/null +++ b/darwin/graphemes.m @@ -0,0 +1,59 @@ +// 3 december 2016 +#import "uipriv_darwin.h" +#import "attrstr.h" + +// CFStringGetRangeOfComposedCharactersAtIndex() is the function for grapheme clusters +// https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/Strings/Articles/stringsClusters.html says that this does work on all multi-codepoint graphemes (despite the name), and that this is the preferred function for this particular job anyway + +int uiprivGraphemesTakesUTF16(void) +{ + return 1; +} + +uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len) +{ + uiprivGraphemes *g; + UniChar *str = (UniChar *) s; + CFStringRef cfstr; + size_t ppos, gpos; + CFRange range; + size_t i; + + g = uiprivNew(uiprivGraphemes); + + cfstr = CFStringCreateWithCharactersNoCopy(NULL, str, len, kCFAllocatorNull); + if (cfstr == NULL) { + // TODO + } + + // first figure out how many graphemes there are + g->len = 0; + ppos = 0; + while (ppos < len) { + range = CFStringGetRangeOfComposedCharactersAtIndex(cfstr, ppos); + g->len++; + ppos = range.location + range.length; + } + + g->pointsToGraphemes = (size_t *) uiprivAlloc((len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + g->graphemesToPoints = (size_t *) uiprivAlloc((g->len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + + // now calculate everything + // fortunately due to the use of CFRange we can do this in one loop trivially! + ppos = 0; + gpos = 0; + while (ppos < len) { + range = CFStringGetRangeOfComposedCharactersAtIndex(cfstr, ppos); + for (i = 0; i < range.length; i++) + g->pointsToGraphemes[range.location + i] = gpos; + g->graphemesToPoints[gpos] = range.location; + gpos++; + ppos = range.location + range.length; + } + // and set the last one + g->pointsToGraphemes[ppos] = gpos; + g->graphemesToPoints[gpos] = ppos; + + CFRelease(cfstr); + return g; +} diff --git a/darwin/grid.m b/darwin/grid.m index d5c5fb1e..218a5f63 100644 --- a/darwin/grid.m +++ b/darwin/grid.m @@ -288,11 +288,11 @@ struct uiGrid { // now build a topological map of the grid gg[y][x] // also figure out which cells contain spanned views so they can be ignored later // treat hidden controls by keeping the indices -1 - gg = (int **) uiAlloc(ycount * sizeof (int *), "int[][]"); - gspan = (BOOL **) uiAlloc(ycount * sizeof (BOOL *), "BOOL[][]"); + gg = (int **) uiprivAlloc(ycount * sizeof (int *), "int[][]"); + gspan = (BOOL **) uiprivAlloc(ycount * sizeof (BOOL *), "BOOL[][]"); for (y = 0; y < ycount; y++) { - gg[y] = (int *) uiAlloc(xcount * sizeof (int), "int[]"); - gspan[y] = (BOOL *) uiAlloc(xcount * sizeof (BOOL), "BOOL[]"); + gg[y] = (int *) uiprivAlloc(xcount * sizeof (int), "int[]"); + gspan[y] = (BOOL *) uiprivAlloc(xcount * sizeof (BOOL), "BOOL[]"); for (x = 0; x < xcount; x++) gg[y][x] = -1; // empty } @@ -344,9 +344,9 @@ struct uiGrid { // now build a topological map of the grid's views gv[y][x] // for any empty cell, create a dummy view - gv = (NSView ***) uiAlloc(ycount * sizeof (NSView **), "NSView *[][]"); + gv = (NSView ***) uiprivAlloc(ycount * sizeof (NSView **), "NSView *[][]"); for (y = 0; y < ycount; y++) { - gv[y] = (NSView **) uiAlloc(xcount * sizeof (NSView *), "NSView *[]"); + gv[y] = (NSView **) uiprivAlloc(xcount * sizeof (NSView *), "NSView *[]"); for (x = 0; x < xcount; x++) if (gg[y][x] == -1) { gv[y][x] = [[NSView alloc] initWithFrame:NSZeroRect]; @@ -360,8 +360,8 @@ struct uiGrid { } // now figure out which rows and columns really expand - hexpand = (BOOL *) uiAlloc(xcount * sizeof (BOOL), "BOOL[]"); - vexpand = (BOOL *) uiAlloc(ycount * sizeof (BOOL), "BOOL[]"); + hexpand = (BOOL *) uiprivAlloc(xcount * sizeof (BOOL), "BOOL[]"); + vexpand = (BOOL *) uiprivAlloc(ycount * sizeof (BOOL), "BOOL[]"); // first, which don't span for (gc in self->children) { if (!uiControlVisible(gc.c)) @@ -522,16 +522,16 @@ struct uiGrid { // TODO make all expanding rows/columns the same height/width // and finally clean up - uiFree(hexpand); - uiFree(vexpand); + uiprivFree(hexpand); + uiprivFree(vexpand); for (y = 0; y < ycount; y++) { - uiFree(gg[y]); - uiFree(gv[y]); - uiFree(gspan[y]); + uiprivFree(gg[y]); + uiprivFree(gv[y]); + uiprivFree(gspan[y]); } - uiFree(gg); - uiFree(gv); - uiFree(gspan); + uiprivFree(gg); + uiprivFree(gv); + uiprivFree(gspan); } - (void)append:(gridChild *)gc @@ -574,7 +574,7 @@ struct uiGrid { break; } if (!found) - userbug("Existing control %p is not in grid %p; you cannot add other controls next to it", c, self->g); + uiprivUserBug("Existing control %p is not in grid %p; you cannot add other controls next to it", c, self->g); switch (at) { case uiAtLeading: @@ -742,9 +742,9 @@ static gridChild *toChild(uiControl *c, int xspan, int yspan, int hexpand, uiAli gridChild *gc; if (xspan < 0) - userbug("You cannot have a negative xspan in a uiGrid cell."); + uiprivUserBug("You cannot have a negative xspan in a uiGrid cell."); if (yspan < 0) - userbug("You cannot have a negative yspan in a uiGrid cell."); + uiprivUserBug("You cannot have a negative yspan in a uiGrid cell."); gc = [gridChild new]; gc.xspan = xspan; gc.yspan = yspan; @@ -763,7 +763,7 @@ void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int ysp // LONGTERM on other platforms // or at leat allow this and implicitly turn it into a spacer if (c == NULL) - userbug("You cannot add NULL to a uiGrid."); + uiprivUserBug("You cannot add NULL to a uiGrid."); gc = toChild(c, xspan, yspan, hexpand, halign, vexpand, valign, g); gc.left = left; gc.top = top; diff --git a/darwin/image.m b/darwin/image.m index b62de31d..aa1b945b 100644 --- a/darwin/image.m +++ b/darwin/image.m @@ -11,23 +11,23 @@ uiImage *uiNewImage(double width, double height) { uiImage *i; - i = uiNew(uiImage); + i = uiprivNew(uiImage); i->size = NSMakeSize(width, height); i->i = [[NSImage alloc] initWithSize:i->size]; i->swizzled = [NSMutableArray new]; return i; } -void uiFreeImage(uiImage *i) +void Image(uiImage *i) { NSValue *v; [i->i release]; // to be safe, do this after releasing the image for (v in i->swizzled) - uiFree([v pointerValue]); + uiprivFree([v pointerValue]); [i->swizzled release]; - uiFree(i); + uiprivFree(i); } void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, int pixelStride) @@ -40,7 +40,7 @@ void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, in // OS X demands that R and B are in the opposite order from what we expect // we must swizzle :( // LONGTERM test on a big-endian system - swizzled = (uint8_t *) uiAlloc((pixelStride * pixelHeight * 4) * sizeof (uint8_t), "uint8_t[]"); + swizzled = (uint8_t *) uiprivAlloc((pixelStride * pixelHeight * 4) * sizeof (uint8_t), "uint8_t[]"); bp = (uint8_t *) pixels; sp = swizzled; for (y = 0; y < pixelHeight * pixelStride; y += pixelStride) diff --git a/darwin/main.m b/darwin/main.m index 59a8683b..6d149fc3 100644 --- a/darwin/main.m +++ b/darwin/main.m @@ -1,5 +1,6 @@ // 6 april 2015 #import "uipriv_darwin.h" +#import "attrstr.h" static BOOL canQuit = NO; static NSAutoreleasePool *globalPool; @@ -26,7 +27,7 @@ static BOOL stepsIsRunning; { if (colorButtonInhibitSendAction(sel, from, to)) return NO; - if (fontButtonInhibitSendAction(sel, from, to)) + if (uiprivFontButtonInhibitSendAction(sel, from, to)) return NO; return [super sendAction:sel to:to from:from]; } @@ -38,7 +39,7 @@ static BOOL stepsIsRunning; { id override; - if (fontButtonOverrideTargetForAction(sel, from, to, &override)) + if (uiprivFontButtonOverrideTargetForAction(sel, from, to, &override)) return override; return [super targetForAction:sel to:to from:from]; } @@ -56,7 +57,7 @@ static BOOL stepsIsRunning; NSEvent *e; if (!canQuit) - implbug("call to [NSApp terminate:] when not ready to terminate; definitely contact andlabs"); + uiprivImplBug("call to [NSApp terminate:] when not ready to terminate; definitely contact andlabs"); [realNSApp() stop:realNSApp()]; // stop: won't register until another event has passed; let's synthesize one @@ -90,7 +91,7 @@ static BOOL stepsIsRunning; { // for debugging NSLog(@"in applicationShouldTerminate:"); - if (shouldQuit()) { + if (uiprivShouldQuit()) { canQuit = YES; // this will call terminate:, which is the same as uiQuit() return NSTerminateNow; @@ -105,12 +106,12 @@ static BOOL stepsIsRunning; @end -uiInitOptions options; +uiInitOptions uiprivOptions; const char *uiInit(uiInitOptions *o) { @autoreleasepool { - options = *o; + uiprivOptions = *o; app = [[applicationClass sharedApplication] retain]; // don't check for a NO return; something (launch services?) causes running from application bundles to always return NO when asking to change activation policy, even if the change is to the same activation policy! // see https://github.com/andlabs/ui/issues/6 @@ -119,12 +120,16 @@ const char *uiInit(uiInitOptions *o) [realNSApp() setDelegate:delegate]; initAlloc(); + loadFutures(); + loadUndocumented(); // always do this so we always have an application menu appDelegate().menuManager = [[menuManager new] autorelease]; [realNSApp() setMainMenu:[appDelegate().menuManager makeMenubar]]; - setupFontPanel(); + uiprivSetupFontPanel(); + + uiprivInitUnderlineColors(); } globalPool = [[NSAutoreleasePool alloc] init]; @@ -134,12 +139,12 @@ const char *uiInit(uiInitOptions *o) void uiUninit(void) { - if (!globalPool) { - userbug("You must call uiInit() first!"); - } + if (!globalPool) + uiprivUserBug("You must call uiInit() first!"); [globalPool release]; @autoreleasepool { + uiprivUninitUnderlineColors(); [delegate release]; [realNSApp() setDelegate:nil]; [app release]; diff --git a/darwin/map.m b/darwin/map.m index 46a7b8d2..190218a1 100644 --- a/darwin/map.m +++ b/darwin/map.m @@ -12,7 +12,7 @@ struct mapTable *newMap(void) { struct mapTable *m; - m = uiNew(struct mapTable); + m = uiprivNew(struct mapTable); m->m = [[NSMapTable alloc] initWithKeyOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality) valueOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality) capacity:0]; @@ -22,9 +22,9 @@ struct mapTable *newMap(void) void mapDestroy(struct mapTable *m) { if ([m->m count] != 0) - implbug("attempt to destroy map with items inside"); + uiprivImplBug("attempt to destroy map with items inside"); [m->m release]; - uiFree(m); + uiprivFree(m); } void *mapGet(struct mapTable *m, void *key) diff --git a/darwin/menu.m b/darwin/menu.m index 735cac50..79adbae6 100644 --- a/darwin/menu.m +++ b/darwin/menu.m @@ -71,7 +71,7 @@ static void mapItemReleaser(void *key, void *value) - (IBAction)onQuitClicked:(id)sender { - if (shouldQuit()) + if (uiprivShouldQuit()) uiQuit(); } @@ -80,17 +80,17 @@ static void mapItemReleaser(void *key, void *value) switch (smi->type) { case typeQuit: if (self->hasQuit) - userbug("You can't have multiple Quit menu items in one program."); + uiprivUserBug("You can't have multiple Quit menu items in one program."); self->hasQuit = YES; break; case typePreferences: if (self->hasPreferences) - userbug("You can't have multiple Preferences menu items in one program."); + uiprivUserBug("You can't have multiple Preferences menu items in one program."); self->hasPreferences = YES; break; case typeAbout: if (self->hasAbout) - userbug("You can't have multiple About menu items in one program."); + uiprivUserBug("You can't have multiple About menu items in one program."); self->hasAbout = YES; break; } @@ -212,7 +212,7 @@ void uiMenuItemDisable(uiMenuItem *item) void uiMenuItemOnClicked(uiMenuItem *item, void (*f)(uiMenuItem *, uiWindow *, void *), void *data) { if (item->type == typeQuit) - userbug("You can't call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); + uiprivUserBug("You can't call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); item->onClicked = f; item->onClickedData = data; } @@ -239,9 +239,9 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name) uiMenuItem *item; if (menusFinalized) - userbug("You can't create a new menu item after menus have been finalized."); + uiprivUserBug("You can't create a new menu item after menus have been finalized."); - item = uiNew(uiMenuItem); + item = uiprivNew(uiMenuItem); item->type = type; switch (item->type) { @@ -315,11 +315,11 @@ uiMenu *uiNewMenu(const char *name) uiMenu *m; if (menusFinalized) - userbug("You can't create a new menu after menus have been finalized."); + uiprivUserBug("You can't create a new menu after menus have been finalized."); if (menus == nil) menus = [NSMutableArray new]; - m = uiNew(uiMenu); + m = uiprivNew(uiMenu); m->menu = [[NSMenu alloc] initWithTitle:toNSString(name)]; // use automatic menu item enabling for all menus for consistency's sake @@ -359,10 +359,10 @@ void uninitMenus(void) v = (NSValue *) obj; mi = (uiMenuItem *) [v pointerValue]; - uiFree(mi); + uiprivFree(mi); }]; [m->items release]; - uiFree(m); + uiprivFree(m); }]; [menus release]; } diff --git a/darwin/opentype.m b/darwin/opentype.m new file mode 100644 index 00000000..84dbde36 --- /dev/null +++ b/darwin/opentype.m @@ -0,0 +1,113 @@ +// 11 may 2017 +#import "uipriv_darwin.h" +#import "attrstr.h" + +struct addCTFeatureEntryParams { + CFMutableArrayRef array; + const void *tagKey; + BOOL tagIsNumber; + CFNumberType tagType; + const void *tagValue; + const void *valueKey; + CFNumberType valueType; + const void *valueValue; +}; + +static void addCTFeatureEntry(struct addCTFeatureEntryParams *p) +{ + CFDictionaryRef featureDict; + CFNumberRef tagNum, valueNum; + const void *keys[2], *values[2]; + + keys[0] = p->tagKey; + tagNum = NULL; + values[0] = p->tagValue; + if (p->tagIsNumber) { + tagNum = CFNumberCreate(NULL, p->tagType, p->tagValue); + values[0] = tagNum; + } + + keys[1] = p->valueKey; + valueNum = CFNumberCreate(NULL, p->valueType, p->valueValue); + values[1] = valueNum; + + featureDict = CFDictionaryCreate(NULL, + keys, values, 2, + // TODO are these correct? + &kCFCopyStringDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (featureDict == NULL) { + // TODO + } + CFArrayAppendValue(p->array, featureDict); + + CFRelease(featureDict); + CFRelease(valueNum); + if (p->tagIsNumber) + CFRelease(tagNum); +} + +static uiForEach otfArrayForEachAAT(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data) +{ + __block struct addCTFeatureEntryParams p; + + p.array = (CFMutableArrayRef) data; + p.tagIsNumber = YES; + uiprivOpenTypeToAAT(a, b, c, d, value, ^(uint16_t type, uint16_t selector) { + p.tagKey = kCTFontFeatureTypeIdentifierKey; + p.tagType = kCFNumberSInt16Type; + p.tagValue = (const SInt16 *) (&type); + p.valueKey = kCTFontFeatureSelectorIdentifierKey; + p.valueType = kCFNumberSInt16Type; + p.valueValue = (const SInt16 *) (&selector); + addCTFeatureEntry(&p); + }); + return uiForEachContinue; +} + +// TODO find out which fonts differ in AAT small caps and test them with this +static uiForEach otfArrayForEachOT(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data) +{ + struct addCTFeatureEntryParams p; + char tagcstr[5]; + CFStringRef tagstr; + + p.array = (CFMutableArrayRef) data; + + p.tagKey = *FUTURE_kCTFontOpenTypeFeatureTag; + p.tagIsNumber = NO; + tagcstr[0] = a; + tagcstr[1] = b; + tagcstr[2] = c; + tagcstr[3] = d; + tagcstr[4] = '\0'; + tagstr = CFStringCreateWithCString(NULL, tagcstr, kCFStringEncodingUTF8); + if (tagstr == NULL) { + // TODO + } + p.tagValue = tagstr; + + p.valueKey = *FUTURE_kCTFontOpenTypeFeatureValue; + p.valueType = kCFNumberSInt32Type; + p.valueValue = (const SInt32 *) (&value); + addCTFeatureEntry(&p); + + CFRelease(tagstr); + return uiForEachContinue; +} + +CFArrayRef uiprivOpenTypeFeaturesToCTFeatures(const uiOpenTypeFeatures *otf) +{ + CFMutableArrayRef array; + uiOpenTypeFeaturesForEachFunc f; + + array = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (array == NULL) { + // TODO + } + f = otfArrayForEachAAT; + if (FUTURE_kCTFontOpenTypeFeatureTag != NULL && FUTURE_kCTFontOpenTypeFeatureValue != NULL) + f = otfArrayForEachOT; + uiOpenTypeFeaturesForEach(otf, f, array); + return array; +} diff --git a/darwin/progressbar.m b/darwin/progressbar.m index b5382281..1f5390ff 100644 --- a/darwin/progressbar.m +++ b/darwin/progressbar.m @@ -48,7 +48,7 @@ void uiProgressBarSetValue(uiProgressBar *p, int value) } if (value < 0 || value > 100) - userbug("Value %d out of range for a uiProgressBar.", value); + uiprivUserBug("Value %d out of range for a uiProgressBar.", value); // on 10.8 there's an animation when the progress bar increases, just like with Aero if (value == 100) { diff --git a/darwin/scrollview.m b/darwin/scrollview.m index b0b4040c..b583a00f 100644 --- a/darwin/scrollview.m +++ b/darwin/scrollview.m @@ -39,7 +39,7 @@ NSScrollView *mkScrollView(struct scrollViewCreateParams *p, struct scrollViewDa [sv setAllowsMagnification:NO]; [sv setDocumentView:p->DocumentView]; - d = uiNew(struct scrollViewData); + d = uiprivNew(struct scrollViewData); scrollViewSetScrolling(sv, d, p->HScroll, p->VScroll); *dout = d; @@ -57,5 +57,5 @@ void scrollViewSetScrolling(NSScrollView *sv, struct scrollViewData *d, BOOL hsc void scrollViewFreeData(NSScrollView *sv, struct scrollViewData *d) { - uiFree(d); + uiprivFree(d); } diff --git a/darwin/sierra.h b/darwin/sierra.h new file mode 100644 index 00000000..1a76cb76 --- /dev/null +++ b/darwin/sierra.h @@ -0,0 +1,79 @@ +// 2 june 2017 + +// The OS X 10.12 SDK introduces a number of new names for +// existing constants to align the naming conventions of +// Objective-C and Swift (particularly in AppKit). +// +// Unfortunately, in a baffling move, instead of using the existing +// AvailabilityMacros.h method of marking things deprecated, they +// rewrote the relevant constants in ways that make +// source-compatible building much more annoying: +// +// - The replacement names are now the only names in the enum +// or define sets they used to be in. +// - The old names are provided as static const variables, which +// means any code that used the old names in a switch case now +// spit out a compiler warning in strict C99 mode (TODO and in C++ mode?). +// - The old names are marked with new deprecated-symbol +// macros that are *not* compatible with the AvailabilityMacros.h +// macros, meaning their deprecation warnings still come +// through. (It should be noted that AvailabilityMacros.h was still +// updated for 10.12 regardless, hence our #ifdef below.) +// +// As far as I can gather, these facts are not documented *at all*, so +// in the meantime, other open-source projects just use their own +// #defines to maintain source compatibility, either by making the +// new names available everywhere or the old ones un-deprecated. +// We choose the latter. +// TODO file a radar on the issue (after determining C++ compatibility) so this can be pinned down once and for all +// TODO after that, link my stackoverflow question here too +// TODO make sure this #ifdef does actually work on older systems + +#ifdef MAC_OS_X_VERSION_10_12 + +#define NSControlKeyMask NSEventModifierFlagControl +#define NSAlternateKeyMask NSEventModifierFlagOption +#define NSShiftKeyMask NSEventModifierFlagShift +#define NSCommandKeyMask NSEventModifierFlagCommand + +#define NSLeftMouseDown NSEventTypeLeftMouseDown +#define NSRightMouseDown NSEventTypeRightMouseDown +#define NSOtherMouseDown NSEventTypeOtherMouseDown +#define NSLeftMouseUp NSEventTypeLeftMouseUp +#define NSRightMouseUp NSEventTypeRightMouseUp +#define NSOtherMouseUp NSEventTypeOtherMouseUp +#define NSLeftMouseDragged NSEventTypeLeftMouseDragged +#define NSRightMouseDragged NSEventTypeRightMouseDragged +#define NSOtherMouseDragged NSEventTypeOtherMouseDragged +#define NSKeyDown NSEventTypeKeyDown +#define NSKeyUp NSEventTypeKeyUp +#define NSFlagsChanged NSEventTypeFlagsChanged +#define NSApplicationDefined NSEventTypeApplicationDefined +#define NSPeriodic NSEventTypePeriodic +#define NSMouseMoved NSEventTypeMouseMoved + +#define NSRegularControlSize NSControlSizeRegular +#define NSSmallControlSize NSControlSizeSmall + +#define NSAnyEventMask NSEventMaskAny +#define NSLeftMouseDraggedMask NSEventMaskLeftMouseDragged +#define NSLeftMouseUpMask NSEventMaskLeftMouseUp + +#define NSTickMarkAbove NSTickMarkPositionAbove + +#define NSLinearSlider NSSliderTypeLinear + +#define NSInformationalAlertStyle NSAlertStyleInformational +#define NSCriticalAlertStyle NSAlertStyleCritical + +#define NSBorderlessWindowMask NSWindowStyleMaskBorderless +#define NSTitledWindowMask NSWindowStyleMaskTitled +#define NSClosableWindowMask NSWindowStyleMaskClosable +#define NSMiniaturizableWindowMask NSWindowStyleMaskMiniaturizable +#define NSResizableWindowMask NSWindowStyleMaskResizable + +#endif + +// TODO /Users/pietro/src/github.com/andlabs/libui/darwin/stddialogs.m:83:15: warning: 'beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:' is deprecated: first deprecated in macOS 10.10 - Use -beginSheetModalForWindow:completionHandler: instead [-Wdeprecated-declarations] + +// TODO https://developer.apple.com/library/content/releasenotes/Miscellaneous/RN-Foundation-OSX10.12/ diff --git a/darwin/text.m b/darwin/text.m index f0d3dab6..8efd36fe 100644 --- a/darwin/text.m +++ b/darwin/text.m @@ -17,3 +17,8 @@ void uiFreeText(char *s) { free(s); } + +int uiprivStricmp(const char *a, const char *b) +{ + return strcasecmp(a, b); +} diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h index 78f31af5..8b95e315 100644 --- a/darwin/uipriv_darwin.h +++ b/darwin/uipriv_darwin.h @@ -1,7 +1,9 @@ // 6 january 2015 +// note: as of OS X Sierra, the -mmacosx-version-min compiler options governs deprecation warnings; keep these around anyway just in case #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_8 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_8 #import +#include // see future.m #import "../ui.h" #import "../ui_darwin.h" #import "../common/uipriv.h" @@ -17,6 +19,8 @@ #define NSAppKitVersionNumber10_9 1265 #endif +/*TODO remove this*/typedef struct uiImage uiImage; + // menu.m @interface menuManager : NSObject { struct mapTable *items; @@ -106,15 +110,10 @@ extern BOOL keycodeModifier(unsigned short keycode, uiModifiers *mod); extern uiDrawContext *newContext(CGContextRef, CGFloat); extern void freeContext(uiDrawContext *); -// drawtext.m -extern uiDrawTextFont *mkTextFont(CTFontRef f, BOOL retain); -extern uiDrawTextFont *mkTextFontFromNSFont(NSFont *f); -extern void doDrawText(CGContextRef c, CGFloat cheight, double x, double y, uiDrawTextLayout *layout); - // fontbutton.m -extern BOOL fontButtonInhibitSendAction(SEL sel, id from, id to); -extern BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override); -extern void setupFontPanel(void); +extern BOOL uiprivFontButtonInhibitSendAction(SEL sel, id from, id to); +extern BOOL uiprivFontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override); +extern void uiprivSetupFontPanel(void); // colorbutton.m extern BOOL colorButtonInhibitSendAction(SEL sel, id from, id to); @@ -142,3 +141,16 @@ extern NSImage *imageImage(uiImage *); // winmoveresize.m extern void doManualMove(NSWindow *w, NSEvent *initialEvent); extern void doManualResize(NSWindow *w, NSEvent *initialEvent, uiWindowResizeEdge edge); + +// future.m +extern CFStringRef *FUTURE_kCTFontOpenTypeFeatureTag; +extern CFStringRef *FUTURE_kCTFontOpenTypeFeatureValue; +extern CFStringRef *FUTURE_kCTBackgroundColorAttributeName; +extern void loadFutures(void); +extern void FUTURE_NSLayoutConstraint_setIdentifier(NSLayoutConstraint *constraint, NSString *identifier); +extern BOOL FUTURE_NSWindow_performWindowDragWithEvent(NSWindow *w, NSEvent *initialEvent); + +// undocumented.m +extern CFStringRef UNDOC_kCTFontPreferredSubFamilyNameKey; +extern CFStringRef UNDOC_kCTFontPreferredFamilyNameKey; +extern void loadUndocumented(void); diff --git a/darwin/undocumented.m b/darwin/undocumented.m new file mode 100644 index 00000000..0e016dd6 --- /dev/null +++ b/darwin/undocumented.m @@ -0,0 +1,31 @@ +// 3 november 2017 +#import "uipriv_darwin.h" + +// functions and constants FROM THE DEPTHS BELOW! +// note: for constants, dlsym() returns the address of the constant itself, as if we had done &constantName +// we also provide default values just in case + +// these values come from 10.12.6 +CFStringRef UNDOC_kCTFontPreferredSubFamilyNameKey = CFSTR("CTFontPreferredSubFamilyName"); +CFStringRef UNDOC_kCTFontPreferredFamilyNameKey = CFSTR("CTFontPreferredFamilyName"); + +// note that we treat any error as "the symbols aren't there" (and don't care if dlclose() failed) +void loadUndocumented(void) +{ + void *handle; + CFStringRef *str; + + // dlsym() walks the dependency chain, so opening the current process should be sufficient + handle = dlopen(NULL, RTLD_LAZY); + if (handle == NULL) + return; +#define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn) + GET(str, kCTFontPreferredSubFamilyNameKey); +NSLog(@"get %p", str); + if (str != NULL) + UNDOC_kCTFontPreferredSubFamilyNameKey = *str; + GET(str, kCTFontPreferredFamilyNameKey); + if (str != NULL) + UNDOC_kCTFontPreferredFamilyNameKey = *str; + dlclose(handle); +} diff --git a/darwin/winmoveresize.m b/darwin/winmoveresize.m index 9145b7bb..2753b93b 100644 --- a/darwin/winmoveresize.m +++ b/darwin/winmoveresize.m @@ -48,12 +48,10 @@ void doManualMove(NSWindow *w, NSEvent *initialEvent) BOOL (^handleEvent)(NSEvent *e); __block BOOL done; - // this is only available on 10.11 and newer (LONGTERM FUTURE) - // but use it if available; this lets us use the real OS dragging code, which means we can take advantage of OS features like Spaces - if ([w respondsToSelector:@selector(performWindowDragWithEvent:)]) { - [((id) w) performWindowDragWithEvent:initialEvent]; + // 10.11 gives us a method to handle this for us + // use it if available; this lets us use the real OS dragging code, which means we can take advantage of OS features like Spaces + if (FUTURE_NSWindow_performWindowDragWithEvent(w, initialEvent)) return; - } mdp.w = w; mdp.initialFrame = [mdp.w frame]; diff --git a/doc/export/ctweights b/doc/export/ctweights new file mode 100644 index 00000000..0bdbd0d4 --- /dev/null +++ b/doc/export/ctweights @@ -0,0 +1,750 @@ +// pseudo-go + +func (f *CTFont) IsRegistered() bool { + n := f.Attribute(kCTFontRegistrationScopeAttribute) + if n == nil { + return false + } + return n.(*CFNumber).Uint32Value() == kCTFontManagerScopeNone +} + +// this type is in libFontRegistry.dylib; functions like x_list.Prepend() are called things like x_list_prepend() there +type x_list struct { + Data interface{} + Next *x_list +} + +func (x *x_list) Prepend(data interface{}) *x_list { + y := malloc(sizeof (x_list)) + if y != nil { + y.data = data + y.next = x + return y + } + return x +} + +func (x *x_list) Reverse() *x_list { + if x == nil { + return nil + } + + var old, next *x_list + + next = nil + for { + old = x + x = old.next + old.next = next + next = old + if x == nil { + break + } + } + return old +} + +func (x *x_list) Concat(y *x_list) *x_list { + if x == nil { + return y + } + start := x + z := x + for { + x = z + z = z.next + if z == nil { + break + } + } + x.next = y + return start +} + +// based on CoreGraphics dylib's _CGFontCopyName +// note that this is different from the public API function CGFontCopyPostScriptName() (which is font type-independent) +// also note that in reality these keys are strings but the implementation of the function turns them into ints and only uses them as such +const ( + kCGFontNameKeyPostScriptName = 0x6 + kCGFontNameKeyPreferredSubfamily = 0x11 + kCGFontNameKeyFontSubfamily = 0x2 + kCGFontNameKeyFullName = 0x4 + kCGFontNameKeyPreferredFamily = 0x10 + kCGFontNameKeyFontFamily = 0x1 +) +func (f *CGFont) CopyName(key int) (string, bool) { + table := f.TableForTag('name') + b := table.Bytes() + n := table.Len() + + // this code looks weird, but we're imitating the assembly, or the effective effects thereof + offCount := uint16(0) + offStringOffset := uint16(2) + if n > 1 { + offCount = 2 + offStringOffset = 4 + } + + count := uint16(0) + if int(offCount) <= n { + count = uint16be(b[offCount:offCount + 2]) + } + + offNameRecord := offStringOffset + 2 + stringOffset := uint16(0) + if int(offNameRecord) <= n { + stringOffset = uint16be(b[offStringOffset:offStringOffset + 2]) + } + + type NameRecord struct { + PlatformID uint16 + PlatformSpecificID uint16 + LanguageID uint16 + NameID uint16 + Length uint16 + Offset uint16 + } + + var nameList *x_list + + addrStrings := offNameRecords + (12 * count) + if addrStrings != stringOffset { + goto hasLanguageTags + } + pos := offNameRecords + if count == 0 { + // TODO note assembly logic here + } else { + for { + var nr NameRecord + + nr.PlatformID = 0 + next := pos + 2 + if int(next) <= n { + nr.PlatformID = uint16be(b[pos:pos + 2]) + pos = next + } + + nr.PlatformSpecificID = 0 + next = pos + 2 + if int(next) <= n { + nr.PlatformSpecificID = uint16be(b[pos:pos + 2]) + pos = next + } + + nr.LanguageID = 0 + next = pos + 2 + if int(next) <= n { + nr.LanguageID = uint16be(b[pos:pos + 2]) + pos = next + } + + nr.NameID = 0 + next = pos + 2 + if int(next) <= n { + nr.NameID = uint16be(b[pos:pos + 2]) + pos = next + } + + nr.Length = 0 + next = pos + 2 + if int(next) <= n { + nr.Length = uint16be(b[pos:pos + 2]) + pos = next + } + + nr.Offset = 0 + next = pos + 2 + if int(next) <= n { + nr.Offset = uint16be(b[pos:pos + 2]) + pos = next + } + + strpos := stringOffset + nr.Offset + if strpos >= n { + // TODO put comment about imitating the assembly comparisons here + } else { + realLen := nr.Length + strend = strpos + nr.Length + if strend > n { + realLen = nr.Length - strpos + strend = strpos + realLen + } + b := malloc(12 + realLen + 1) + if b != nil { + name := (*sfnt_name_t)(b) + name.PlatformID = nr.PlatformID + name.PlatformSpecificID = nr.PlatformSpecificID + name.LanguageID = nr.LanguageID + name.NameID = nr.NameID + name.Length = realLen + memcpy(&(name.Name), b[strpos:strend], realLen) + name.Name[realLen] = 0 + nameList = nameList.Prepend(name) + } + } + count-- + if count == 0 { + break + } + } + } + nameList = nameList.Reverse() + +hasLanguageTags: + add_localized_names := func(platformID uint16, platformSpecificID uint16, to *x_list) *x_list { + out := (*x_list)(nil) + if nameList == nil { + xx TODO logic verbatim etc. + } else { + x := nameList + for { + name := (*sfnt_name_t)(x.data) + if name.PlatformID != platformID { + xx TODO + } else { + if platformSpecificID == 0xFFFF || name.PlatformSpecificID == platformSpecificID { + out = out.Prepend(name) + } + } + x = x.next + if x == nil { + break + } + } + } + out = out.Reverse() + return to.Concat(out) + } + localized := (*x_list)(nil) + localized = add_localized_names(0x1, 0xFFFF, localized) + localized = add_localized_names(0, 0xFFFF, localized) + localized = add_localized_names(0x3, 0xFFFF, localized) + localized = add_localized_names(0x1, 0, localized) + localized = add_localized_names(0x3, 0x9, localized) + localized = add_localized_names(0x3, 0x409, localized) + + sysLocale := CFLocaleGetSystem() + +} + +// based on libFontRegistry.dylib's __ZNK8OS2Table15DetermineWeightERf — OS2Table::DetermineWeight(float&) const +func RegistryDetermineOS2Weight(table *CFData) (float32, bool) { + if table == nil { + return 0, false + } + if table.Len() < 78 { + return 0, false + } + + b := table.Bytes() + usWeightClass := uint16be(b[4:6]) + if usWeightClass >= 10 { + // do nothing; we are preserving the original asm comparisons + } else { + usWeightClass *= 100 + } + /* TODO: +000000000000b37e mov dx, word [rax+4] +000000000000b382 mov cx, dx +000000000000b385 rol cx, 0x8 +000000000000b389 movzx esi, cx +000000000000b38c imul ecx, ecx, 100 +000000000000b38f cmp esi, 10 +000000000000b392 cmovae cx, si +000000000000b396 test dx, dx +000000000000b399 cmove cx, si + what's the function of the last two instructions? */ + + // note that this is an unsigned comparison, so underflow will result in a number > 998 + // the effect is the same as (usWeightClass == 0) || (usWeightClass >= 1000) + if (usWeightClass - 1) > 998 { + // note the - 2 here; the switch cases below reflect that! + // also note that b[0x22] and panose will be unsigned, so underflow will result in a number > 9 + panose := b[0x22] - 2 + if panose > 9 { + return 0, false + } + switch panose { + case 0: + return float32as(-0.500000, 0xbf000000), true + case 1: + return float32as(-0.400000, 0xbecccccd), true + case 2: + // yes, this returns false; I don't know why + return float32as(-0.300000, 0xbe99999a), false + case 3: + return float32as(-0.230000, 0xbe6b851f), true + case 4: + return float32as(0.230000, 0x3e6b851f), true + case 5: + return float32as(0.250000, 0x3e800000), true + case 6: + return float32as(0.400000, 0x3ecccccd), true + case 7: + return float32as(0.560000, 0x3f0f5c29), true + case 8: + return float32as(0.620000, 0x3f1eb852), true + case 9: + return float32as(0.800000, 0x3f4ccccd), true + } + // should not reach here + } + + // let's mimic the assembly here too + // the gotos avoid the massive if nesting + // also note I'm using Go idioms and not saying "else return", imagine those if you must + if usWeightClass > 100 { + if usWeightClass > 200 { + goto do201AndUp + } + return float32as(-0.500000, 0xbf000000), true + } + return float32as(-0.800000, 0xbf4ccccd), true + +do201AndUp: + if usWeightClass > 300 { + if usWeightClass > 400 { + goto do401AndUp + } + return float32as(0.000000, 0x0), true + } + return float32as(-0.400000, 0xbecccccd), true + +do401AndUp: + if usWeightClass > 500 { + if usWeightClass > 600 { + goto do601AndUp + } + return float32as(0.250000, 0x3e800000), true + } + return float32as(0.230000, 0x3e6b851f), true + +do601AndUp: + if usWeightClass > 700 { + if usWeightClass > 800 { + goto do801AndUp + } + return float32as(0.500000, 0x3f000000), true + } + return float32as(0.400000, 0x3ecccccd), true + +do801AndUp: + if usWeightClass > 900 { + if usWeightClass > 950 { + return float32(0.800000, 0x3f4ccccd), true + } + return float32(0.750000, 0x3f400000), true + } + return float32as(0.620000, 0x3f1eb852), true +} + +// based on libFontRegistry.dylib's __ZN11TFontTraitsC2EP6CGFontRK13TFontMetadata — TFontTraits::TFontTraits(CGFont*, TFontMetadata const&) +func (f *Font) WeightFromFontRegistry32() float32 { + var weight float32 + var hasWeight bool = false + + cgfont := f.CGFont() + if f.RegistryHasMetadata() { + wv := f.RegistryMetadataValueForKey("MTD_Typeface_Weight_VisualDescriptor") + if wv != nil { + if wn, ok := wv.(string); ok { + // note: uses CFStringCompare(0) + switch wn { + case "reg": + weight = float32as(0.000000, 0x0) + hasWeight = true + case "semi": + weight = float32as(0.300000, 0x3e99999a) + hasWeight = true + case "bold": + weight = float32as(0.400000, 0x3ecccccd) + hasWeight = true + case "light": + weight = float32as(-0.400000, 0xbecccccd) + hasWeight = true + case "med": + weight = float32as(0.230000, 0x3e6b851f) + hasWeight = true + case "heavy": + weight = float32as(0.560000, 0x3f0f5c29) + hasWeight = true + case "black": + weight = float32as(0.620000, 0x3f1eb852) + hasWeight = true + case "thin": + weight = float32as(-0.600000, 0xbf19999a) + hasWeight = true + case "ulight": + weight = float32as(-0.800000, 0xbf4ccccd) + hasWeight = true + } + } + } + } + + cgpsname, ok := cgfont.CopyName(kCGFontNameKeyPostScriptName) + if ok { + // note: uses CFStringCompare(0) + switch cgpsname { + case "LucidaGrande", + ".LucidaGrandeUI", + ".Keyboard": + weight = float32as(0.000000, 0x0) + hasWeight = true + case "STHeiti": + weight = float32as(0.240000, 0x3e75c28f) + hasWeight = true + case "STXihei": + weight = float32as(-0.100000, 0xbdcccccd) + hasWeight = true + case "TimesNewRomanPSMT": + weight = float32as(0.000000, 0x0) + hasWeight = true + } + } + + styleGlossaryStrings := []int{ + kCGFontNameKeyPreferredSubfamily, + kCGFontNameKeyFontSubfamily, + kCGFontNameKeyFullName, + kCGFontNameKeyPreferredFamily, + kCGFontNameKeyFontFamily, + } + weightNameMap := []struct { + key string + val float32 + }{ + { "Ultra Light", float32as(-0.800000f, 0xbf4ccccd) }, + { "Ultra Black", float32as(0.750000f, 0x3f400000) }, + { "Extra Light", float32as(-0.500000f, 0xbf000000) }, + { "UltraBlack", float32as(0.750000f, 0x3f400000) }, + { "ExtraBlack", float32as(0.800000f, 0x3f4ccccd) }, + { "UltraLight", float32as(-0.800000f, 0xbf4ccccd) }, + { "ExtraLight", float32as(-0.500000f, 0xbf000000) }, + { "Ultra Thin", float32as(-0.800000f, 0xbf4ccccd) }, + { "Extra Thin", float32as(-0.800000f, 0xbf4ccccd) }, + { "Heavy Face", float32as(0.560000f, 0x3f0f5c29) }, + { "Semi Light", float32as(-0.200000f, 0xbe4ccccd) }, + { "Extra Bold", float32as(0.500000f, 0x3f000000) }, + { "Ultra Bold", float32as(0.700000f, 0x3f333333) }, + { "HeavyFace", float32as(0.560000f, 0x3f0f5c29) }, + { "ExtraBold", float32as(0.500000f, 0x3f000000) }, + { "UltraBold", float32as(0.700000f, 0x3f333333) }, + { "Ext Black", float32as(0.800000f, 0x3f4ccccd) }, + { "SemiLight", float32as(-0.200000f, 0xbe4ccccd) }, + { "Demi Bold", float32as(0.250000f, 0x3e800000) }, + { "Semi Bold", float32as(0.300000f, 0x3e99999a) }, + { "Ext Light", float32as(-0.500000f, 0xbf000000) }, + { "Ext Bold", float32as(0.500000f, 0x3f000000) }, + { "DemiBold", float32as(0.250000f, 0x3e800000) }, + { "SemiBold", float32as(0.300000f, 0x3e99999a) }, + { "HairLine", float32as(-0.800000f, 0xbf4ccccd) }, + { "Ext Thin", float32as(-0.800000f, 0xbf4ccccd) }, + { "Medium", float32as(0.230000f, 0x3e6b851f) }, + { "Poster", float32as(0.800000f, 0x3f4ccccd) }, + { "Light", float32as(-0.400000f, 0xbecccccd) }, + { "Ultra", float32as(0.500000f, 0x3f000000) }, + { "Heavy", float32as(0.560000f, 0x3f0f5c29) }, + { "Extra", float32as(0.500000f, 0x3f000000) }, + { "Black", float32as(0.620000f, 0x3f1eb852) }, + { "Super", float32as(0.620000f, 0x3f1eb852) }, + { "Obese", float32as(0.850000f, 0x3f59999a) }, + { "Lite", float32as(-0.400000f, 0xbecccccd) }, + { "Book", float32as(-0.230000f, 0xbe6b851f) }, + { "Demi", float32as(0.250000f, 0x3e800000) }, + { "Semi", float32as(0.300000f, 0x3e99999a) }, + { "Thin", float32as(-0.500000f, 0xbf000000) }, + { "Bold", float32as(0.400000f, 0x3ecccccd) }, + { "Nord", float32as(0.800000f, 0x3f4ccccd) }, + { "Fat", float32as(0.750000f, 0x3f400000) }, + { "W1", float32as(-0.230000f, 0xbe6b851f) }, + { "W2", float32as(-0.500000f, 0xbf000000) }, + { "W3", float32as(-0.230000f, 0xbe6b851f) }, + { "W4", float32as(0.000000f, 0x0) }, + { "W5", float32as(0.230000f, 0x3e6b851f) }, + { "W6", float32as(0.300000f, 0x3e99999a) }, + { "W7", float32as(0.440000f, 0x3ee147ae) }, + { "W8", float32as(0.540000f, 0x3f0a3d71) }, + { "W9", float32as(0.620000f, 0x3f1eb852) }, + } + for _, key := range styleGlossaryStrings { + if hasWeight { + break + } + str, ok := cgfont.CopyName(key) + if !ok { + continue + } + for _, m := range weightNameMap { + if str.FindWithOptions(m.key, CFRangeMake(0, str.CFStringLength()), kCFCompareCaseInsensitive | kCFCompareBackwards | kCFCompareNonliteral, nil) { + weight = m.val + hasWeight = true + break + } + } + } + + if !hasWeight { + os2table := cgfont.TableForTag('OS/2') + weight, hasWeight = RegistryDetermineOS2Weight(os2table) + } + + if !hasWeight { + headtable := cgfont.TableForTag('head') + if headtable != nil { + if headtable.Len() >= 54 { + b := headtable.Bytes() + if (b[0x2d] & 1) != 0 { + weight = float32as(0.400000, 0x3ecccccd) + hasWeight = true + } + } + } + } + + styleGlossaryAbbreviationKeys := []int{ + kCGFontNameKeyPreferredSubfamily, + kCGFontNameKeyFontSubfamily, + } + abbreviatedWeightNameMap := []struct { + key string + val float32 + }{ + { "EL", float32as(-0.200000, 0xbe4ccccd) }, + { "EB", float32as(0.500000, 0x3f000000) }, + { "SB", float32as(0.300000, 0x3e99999a) }, + { "UH", float32as(0.800000, 0x3f4ccccd) }, + { "U", float32as(0.700000, 0x3f333333) }, + { "L", float32as(-0.400000, 0xbecccccd) }, + { "H", float32as(0.560000, 0x3f0f5c29) }, + { "B", float32as(0.400000, 0x3ecccccd) }, + { "M", float32as(0.230000, 0x3e6b851f) }, + { "R", float32as(0.000000, 0x0) }, + } + if !hasWeight { + for _, key := range styleGlossaryAbbreviationStrings { + str, ok := cgfont.CopyName(key) + if !ok { + continue + } + for _, m := range abbreviatedWeightNameMap { + if str.Compare(m.key, kCFCompareCaseInsensitive) == kCFCompareEqualTo { + weight = m.val + hasWeight = true + break + } + } + if hasWeight { + break + } + } + } + + if !hasWeight { + return float32as(0.000000, 0x0) + } + return weight +} + +// because Core Text gets registry traits as a CFDictionary, convert the float to a double with CFNumber as that is what actually would be done +func (f *Font) WeightFromFontRegistry() float64 { + return CFNumberWithFloat32(f.WeightFromFontRegistry32()).Float64Value() +} + +// based on CoreText dylib's __Z13WeightOfClasst — WeightOfClass(unsigned short) +func CoreText_WeightOfClass(usWeightClass uint16) float64 { + if usWeightClass >= 11 { + // do nothing; we are preserving the original asm comparisons + // and yes, this one is 11, but the one above is 10 + } else { + usWeightClass *= 100 + } + + // figure out what two floats our weight will be between + i := usWeightClass / 100 + j := i + 1 + if j > 10 { + j = 10 + } + b := float64(i * 100) + c := float64(j * 100) + + a := float64(0) + if b != c { + a = float64(usWeightClass) + a -= b + c -= b + a /= c + } + scales := []float32{ + float32as(-1.000000, 0xbf800000), + float32as(-0.700000, 0xbf333333), + float32as(-0.500000, 0xbf000000), + float32as(-0.230000, 0xbe6b851f), + float32as(0.000000, 0x0), + float32as(0.200000, 0x3e4ccccd), + float32as(0.300000, 0x3e99999a), + float32as(0.400000, 0x3ecccccd), + float32as(0.600000, 0x3f19999a), + float32as(0.800000, 0x3f4ccccd), + float32as(1.000000, 0x3f800000), + } + c = float64(scale[i]) + b = float64[scale[j]) + return fma(a, b, c) +} + +// based on CoreText dylib's __ZL33CreateTraitsByStyleGlossaryStringPK10__CFString — CreateTraitsByStyleGlossaryString(__CFString const*) +func CoreText_WeightByStyleGlossaryString(str string) (weight float64, ok bool) { + str.Fold(kCFCompareCaseInsensitive, nil) + weightNameMap := []struct { + key string + val float32 + }{ + { "ultra light", float32as(-0.800000, 0xbf4ccccd) }, + { "ultra black", float32as(0.750000, 0x3f400000) }, + { "extra light", float32as(-0.500000, 0xbf000000) }, + { "ultralight", float32as(-0.800000, 0xbf4ccccd) }, + { "ultrablack", float32as(0.750000, 0x3f400000) }, + { "extrablack", float32as(0.800000, 0x3f4ccccd) }, + { "extralight", float32as(-0.500000, 0xbf000000) } + { "heavy face", float32as(0.560000, 0x3f0f5c29) }, + { "semi light", float32as(-0.200000, 0xbe4ccccd) }, + { "extra bold", float32as(0.500000, 0x3f000000) }, + { "ultra bold", float32as(0.700000, 0x3f333333) }, + { "heavyface", float32as(0.560000, 0x3f0f5c29) }, + { "extrabold", float32as(0.500000, 0x3f000000) }, + { "ultrabold", float32as(0.700000, 0x3f333333) }, + { "semilight", float32as(-0.200000, 0xbe4ccccd) }, + { "demi bold", float32as(0.250000, 0x3e800000) }, + { "semi bold", float32as(0.300000, 0x3e99999a) }, + { "demibold", float32as(0.250000, 0x3e800000) }, + { "semibold", float32as(0.300000, 0x3e99999a) }, + { "hairline", float32as(-0.700000, 0xbf333333) }, + { "medium", float32as(0.230000, 0x3e6b851f) }, + { "poster", float32as(0.800000, 0x3f4ccccd) }, + { "light", float32as(-0.400000, 0xbecccccd) }, + { "heavy", float32as(0.560000, 0x3f0f5c29) }, + { "extra", float32as(0.500000, 0x3f000000) }, + { "black", float32as(0.620000, 0x3f1eb852) }, + { "super", float32as(0.620000, 0x3f1eb852) }, + { "obese", float32as(0.850000, 0x3f59999a) }, + { "lite", float32as(-0.400000, 0xbecccccd) }, + { "book", float32as(-0.230000, 0xbe6b851f) }, + { "demi", float32as(0.250000, 0x3e800000) }, + { "semi", float32as(0.300000, 0x3e99999a) }, + { "thin", float32as(-0.500000, 0xbf000000) }, + { "bold", float32as(0.400000, 0x3ecccccd) }, + { "nord", float32as(0.800000, 0x3f4ccccd) }, + { "fat", float32as(0.750000, 0x3f400000) }, + { "w1", float32as(-0.700000, 0xbf333333) }, + { "w2", float32as(-0.500000, 0xbf000000) }, + { "w3", float32as(-0.230000, 0xbe6b851f) }, + { "w4", float32as(0.000000, 0x0) }, + { "w5", float32as(0.230000, 0x3e6b851f) }, + { "w6", float32as(0.300000, 0x3e99999a) }, + { "w7", float32as(0.440000, 0x3ee147ae) }, + { "w8", float32as(0.540000, 0x3f0a3d71) }, + { "w9", float32as(0.620000, 0x3f1eb852) }, + } + for _, m := range weightNameMap { + if strstr(str, m.key) != nil { + val := CFNumberWithFloat32(m.val) + return val.Float64Value(), true + } + } + return 0, false +} + +// based on CoreText dylib's __ZNK9TBaseFont29CreateTraitsValuesPerFontInfoEP12MetadataFlag — TBaseFont::CreateTraitsValuesPerFontInfo(MetadataFlag*) const +func (f *CTFont) Weight() float64 { + if f.IsRegistered() { + return f.WeightFromFontRegistry() + } + + weight := float64as(2.0, 0x4000000000000000) + ebx := -1 + hasWeight := false + + name := f.Name(kCTFontPostScriptNameKey) + if name != nil { + switch *name { + case "LucidaGrande": + weight = float64as(0.000000, 0x0) + hasWeight = true + case ".LucidaGrandeUI": + weight = float64as(0.000000, 0x0) + hasWeight = true + case "STHeiti": + weight = float64as(0.240000, 0x3fceb851eb851eb8) + hasWeight = true + case "STXihei": + weight = float64as(-0.100000, 0xbfb999999999999a) + hasWeight = true + case "TimesNewRomanPSMT": + weight = float64as(0.000000, 0x0) + hasWeight = true + // there is one more hardcoded case, for "Times-Roman", but that will only set the class style, not the weight + } + } + + os2table := f.Table('OS/2') + if os2table != nil { + if !hasWeight { + var usWeightClass uint16 + + valid := false + if os2table.Len() > 77 { + b := os2table.Bytes() + usWeightClass = uint16be(b[4:6]) + if usWeightClass > 1000 { + weight = 0 + hasWeight = false + } else { + valid = true + } + } else { + usWeightClass = 0 + valid = true + } + if valid { + weight = CoreText_WeightOfClass(usWeightClass) + hasWeight = true + } + } + } + + styleGlossaryNames := []string{ + kCTFontSubFamilyNameKey, + kCTFontFullNameKey, + kCTFontFamilyNameKey, + } + for _, key := range styleGlossaryNames { + name := f.Name(key) + if name == nil { + continue + } + candidate, ok := CoreText_WeightByStyleGlossaryString(*name) + if !ok { + continue + } + if !hasWeight { + weight = candidate + hasWeight = true + } + } + + if hasWeight { + return weight + } + return 0 +} + +func (f *Font) ShouldEnableBoldSymbolicTrait() bool { + if f.IsRegistered() { + return f.ShouldEnableBoldSymbolicTraitFromRegistry() + } + no := f.Weight() <= float64as(0.239000, 0x3fce978d4fdf3b64) + return !no +} diff --git a/doc/export/ctweightsannotated b/doc/export/ctweightsannotated new file mode 100644 index 00000000..8df56f25 --- /dev/null +++ b/doc/export/ctweightsannotated @@ -0,0 +1,149 @@ +-0.100000 0xbdcccccd registered postscript name "STXihei" +-0.100000 0xbfb999999999999a unregistered postscript name "STXihei" +-0.200000 0xbe4ccccd registered subfamily abbr "EL" +-0.200000 0xbe4ccccd "Semi Light" +-0.200000 0xbe4ccccd "SemiLight" +-0.200000 0xbe4ccccd "semi light" +-0.200000 0xbe4ccccd "semilight" +-0.230000 0xbe6b851f "Book" +-0.230000 0xbe6b851f "W1" +-0.230000 0xbe6b851f "W3" +-0.230000 0xbe6b851f "book" +-0.230000 0xbe6b851f "w3" +-0.230000 0xbe6b851f panose 5 +-0.400000 0xbecccccd registered subfamily abbr "L" +-0.400000 0xbecccccd "Light" +-0.400000 0xbecccccd "Lite" +-0.400000 0xbecccccd "light" +-0.400000 0xbecccccd "light" +-0.400000 0xbecccccd "lite" +-0.400000 0xbecccccd registered OS2 weights 3, 201 - 300 +-0.400000 0xbecccccd panose 3 +-0.500000 0xbf000000 "Ext Light" +-0.500000 0xbf000000 "Extra Light" +-0.500000 0xbf000000 "ExtraLight" +-0.500000 0xbf000000 "Thin" +-0.500000 0xbf000000 "W2" +-0.500000 0xbf000000 "extra light" +-0.500000 0xbf000000 "extralight" +-0.500000 0xbf000000 "thin" +-0.500000 0xbf000000 "w2" +-0.500000 0xbf000000 registered OS2 weights 2, 101 - 200 +-0.500000 0xbf000000 panose 2 +-0.600000 0xbf19999a "thin" +-0.700000 0xbf333333 "hairline" +-0.700000 0xbf333333 "w1" +-0.800000 0xbf4ccccd "Ext Thin" +-0.800000 0xbf4ccccd "Extra Thin" +-0.800000 0xbf4ccccd "HairLine" +-0.800000 0xbf4ccccd "Ultra Light" +-0.800000 0xbf4ccccd "Ultra Thin" +-0.800000 0xbf4ccccd "UltraLight" +-0.800000 0xbf4ccccd "ulight" +-0.800000 0xbf4ccccd "ultra light" +-0.800000 0xbf4ccccd "ultralight" +-0.800000 0xbf4ccccd registered OS2 weights 1, 10 - 100 +0.000000 0x0 registered postscript name ".Keyboard" +0.000000 0x0 registered postscript name ".LucidaGrandeUI" +0.000000 0x0 unregistered postscript name ".LucidaGrandeUI" +0.000000 0x0 registered postscript name "LucidaGrande" +0.000000 0x0 unregistered postscript name "LucidaGrande" +0.000000 0x0 registered subfamily abbr "R" +0.000000 0x0 registered postscript name "TimesNewRomanPSMT" +0.000000 0x0 unregistered postscript name "TimesNewRomanPSMT" +0.000000 0x0 "W4" +0.000000 0x0 "reg" +0.000000 0x0 "w4" +0.000000 0x0 registered OS2 weights 4, 301 - 400 +0.000000 0x0 default +0.230000 0x3e6b851f registered OS2 weights 5, 401 - 500 +0.230000 0x3e6b851f registered subfamily abbr "M" +0.230000 0x3e6b851f "Medium" +0.230000 0x3e6b851f "W5" +0.230000 0x3e6b851f "med" +0.230000 0x3e6b851f "medium" +0.230000 0x3e6b851f "w5" +0.230000 0x3e6b851f panose 6 +0.240000 0x3e75c28f registered postscript name "STHeiti" +0.240000 0x3fceb851eb851eb8 unregistered postscript name "STHeiti" +0.250000 0x3e800000 "Demi Bold" +0.250000 0x3e800000 "Demi" +0.250000 0x3e800000 "DemiBold" +0.250000 0x3e800000 "demi bold" +0.250000 0x3e800000 "demi" +0.250000 0x3e800000 "demibold" +0.250000 0x3e800000 registered OS2 weights 6, 501 - 600 +0.250000 0x3e800000 panose 7 +0.300000 0x3e99999a registered subfamily abbr "SB" +0.300000 0x3e99999a "Semi Bold" +0.300000 0x3e99999a "Semi" +0.300000 0x3e99999a "SemiBold" +0.300000 0x3e99999a "W6" +0.300000 0x3e99999a "semi bold" +0.300000 0x3e99999a "semi" +0.300000 0x3e99999a "semi" +0.300000 0x3e99999a "semibold" +0.300000 0x3e99999a "w6" +0.400000 0x3ecccccd registered subfamily abbr "B" +0.400000 0x3ecccccd "Bold" +0.400000 0x3ecccccd "bold" +0.400000 0x3ecccccd "bold" +0.400000 0x3ecccccd 'head'[0x2D] & 1 +0.400000 0x3ecccccd registered OS2 weights 7, 601 - 700 +0.400000 0x3ecccccd panose 8 +0.440000 0x3ee147ae "W7" +0.440000 0x3ee147ae "w7" +0.500000 0x3f000000 registered subfamily abbr "EB" +0.500000 0x3f000000 "Ext Bold" +0.500000 0x3f000000 "Extra Bold" +0.500000 0x3f000000 "Extra" +0.500000 0x3f000000 "ExtraBold" +0.500000 0x3f000000 "Ultra" +0.500000 0x3f000000 "extra bold" +0.500000 0x3f000000 "extra" +0.500000 0x3f000000 "extrabold" +0.500000 0x3f000000 registered OS2 weights 8, 701 - 800 +0.540000 0x3f0a3d71 "W8" +0.540000 0x3f0a3d71 "w8" +0.560000 0x3f0f5c29 registered subfamily abbr "H" +0.560000 0x3f0f5c29 "Heavy Face" +0.560000 0x3f0f5c29 "Heavy" +0.560000 0x3f0f5c29 "HeavyFace" +0.560000 0x3f0f5c29 "heavy face" +0.560000 0x3f0f5c29 "heavy" +0.560000 0x3f0f5c29 "heavy" +0.560000 0x3f0f5c29 "heavyface" +0.560000 0x3f0f5c29 panose 9 +0.620000 0x3f1eb852 "Black" +0.620000 0x3f1eb852 "Super" +0.620000 0x3f1eb852 "W9" +0.620000 0x3f1eb852 "black" +0.620000 0x3f1eb852 "black" +0.620000 0x3f1eb852 "super" +0.620000 0x3f1eb852 "w9" +0.620000 0x3f1eb852 registered OS2 weights 9, 801 - 900 +0.620000 0x3f1eb852 panose 10 +0.700000 0x3f333333 registered subfamily abbr "U" +0.700000 0x3f333333 "Ultra Bold" +0.700000 0x3f333333 "UltraBold" +0.700000 0x3f333333 "ultra bold" +0.700000 0x3f333333 "ultrabold" +0.750000 0x3f400000 "Fat" +0.750000 0x3f400000 "Ultra Black" +0.750000 0x3f400000 "UltraBlack" +0.750000 0x3f400000 "fat" +0.750000 0x3f400000 "ultra black" +0.750000 0x3f400000 "ultrablack" +0.750000 0x3f400000 registered OS2 weights 901 - 950 +0.800000 0x3f4ccccd "Ext Black" +0.800000 0x3f4ccccd "ExtraBlack" +0.800000 0x3f4ccccd "Nord" +0.800000 0x3f4ccccd "Poster" +0.800000 0x3f4ccccd registered subfamily abbr "UH" +0.800000 0x3f4ccccd "extrablack" +0.800000 0x3f4ccccd "nord" +0.800000 0x3f4ccccd "poster" +0.800000 0x3f4ccccd registered OS2 weights 951 - 999 +0.800000 0x3f4ccccd panose 11 +0.850000 0x3f59999a "Obese" +0.850000 0x3f59999a "obese" diff --git a/doc/export/ctweightscombined b/doc/export/ctweightscombined new file mode 100644 index 00000000..d5017938 --- /dev/null +++ b/doc/export/ctweightscombined @@ -0,0 +1,146 @@ +-0.100000 + postscript name "STXihei" (which, according to http://www.typophile.com/node/93813, means "ST Hei Light", and so we can assume it's the Light version of STHeiti, which I think is Medium though is given Regular status below because meh) + +-0.200000 + subfamily abbreviation "EL" (???????????) + style string contains "Semi Light" + style string contains "SemiLight" + +-0.230000 + style string contains "Book" + style string contains "W1" (registered fonts only; probably a typo and -0.7 was expected instead) + style string contains "W3" + panose 5 + +-0.400000 + subfamily abbreviation "L" + style string contains "Light" + style string contains "Lite" + ATSD style "light" + OS2 weights 3, 201 - 300 + panose 3 + +-0.500000 + style string contains "Ext Light" + style string contains "Extra Light" + style string contains "ExtraLight" + style string contains "Thin" + style string contains "W2" + OS2 weights 2, 101 - 200 + panose 2 + +-0.600000 + ATSD style "thin" + +-0.700000 + style string contains "hairline" + style string contains "w1" + +-0.800000 + style string contains "Ext Thin" + style string contains "Extra Thin" + style string contains "HairLine" + style string contains "Ultra Light" + style string contains "Ultra Thin" + style string contains "UltraLight" + ATSD style "ulight" + OS2 weights 1, 10 - 100 + +0.000000 + ostscript name ".Keyboard" + postscript name ".LucidaGrandeUI" + postscript name "LucidaGrande" + subfamily abbreviation "R" + postscript name "TimesNewRomanPSMT" + style string contains "W4" + ATSD style "reg" + OS2 weights 4, 301 - 400 + default + +0.230000 + OS2 weights 5, 401 - 500 + subfamily abbreviation "M" + style string contains "Medium" + style string contains "W5" + ATSD style "med" + panose 6 + +0.240000 + postscript name "STHeiti" + +0.250000 + style string contains "Demi Bold" + style string contains "Demi" + style string contains "DemiBold" + OS2 weights 6, 501 - 600 + panose 7 + +0.300000 + subfamily abbreviation "SB" + style string contains "Semi Bold" + style string contains "Semi" + style string contains "SemiBold" + style string contains "W6" + ATSD style "semi" + +0.400000 + subfamily abbreviation "B" + style string contains "Bold" + ATSD style "bold" + ('head' table byte 0x2D) & 1 != 0 + OS2 weights 7, 601 - 700 + panose 8 + +0.440000 + style string contains "W7" + +0.500000 + subfamily abbreviation "EB" + style string contains "Ext Bold" + style string contains "Extra Bold" + style string contains "Extra" + style string contains "ExtraBold" + style string contains "Ultra" + OS2 weights 8, 701 - 800 + +0.540000 + style string contains "W8" + +0.560000 + subfamily abbreviation "H" + style string contains "Heavy Face" + style string contains "Heavy" + style string contains "HeavyFace" + ATSD style "heavy" + panose 9 + +0.620000 + style string contains "Black" + style string contains "Super" + style string contains "W9" + ATSD style "black" + OS2 weights 9, 801 - 900 + panose 10 + +0.700000 + subfamily abbreviation "U" + style string contains "Ultra Bold" + style string contains "UltraBold" + +0.750000 + style string contains "Fat" + style string contains "Ultra Black" + style string contains "UltraBlack" + OS2 weights 901 - 950 + +0.800000 + style string contains "Ext Black" + style string contains "ExtraBlack" + style string contains "Nord" + style string contains "Poster" + subfamily abbreviation "UH" + OS2 weights 951 - 999 + panose 11 + +0.850000 + style string contains "Obese" diff --git a/doc/export/ctweightsprocessed b/doc/export/ctweightsprocessed new file mode 100644 index 00000000..fe315cc7 --- /dev/null +++ b/doc/export/ctweightsprocessed @@ -0,0 +1,149 @@ +-0.100000 0xbdcccccd "STXihei" +-0.100000 0xbfb999999999999a "STXihei" +-0.200000 0xbe4ccccd "EL" +-0.200000 0xbe4ccccd "Semi Light" +-0.200000 0xbe4ccccd "SemiLight" +-0.200000 0xbe4ccccd "semi light" +-0.200000 0xbe4ccccd "semilight" +-0.230000 0xbe6b851f "Book" +-0.230000 0xbe6b851f "W1" +-0.230000 0xbe6b851f "W3" +-0.230000 0xbe6b851f "book" +-0.230000 0xbe6b851f "w3" +-0.230000 0xbe6b851f panose 5 +-0.400000 0xbecccccd "L" +-0.400000 0xbecccccd "Light" +-0.400000 0xbecccccd "Lite" +-0.400000 0xbecccccd "light" +-0.400000 0xbecccccd "light" +-0.400000 0xbecccccd "lite" +-0.400000 0xbecccccd 3, 201 - 300 +-0.400000 0xbecccccd panose 3 +-0.500000 0xbf000000 "Ext Light" +-0.500000 0xbf000000 "Extra Light" +-0.500000 0xbf000000 "ExtraLight" +-0.500000 0xbf000000 "Thin" +-0.500000 0xbf000000 "W2" +-0.500000 0xbf000000 "extra light" +-0.500000 0xbf000000 "extralight" +-0.500000 0xbf000000 "thin" +-0.500000 0xbf000000 "w2" +-0.500000 0xbf000000 2, 101 - 200 +-0.500000 0xbf000000 panose 2 +-0.600000 0xbf19999a "thin" +-0.700000 0xbf333333 "hairline" +-0.700000 0xbf333333 "w1" +-0.800000 0xbf4ccccd "Ext Thin" +-0.800000 0xbf4ccccd "Extra Thin" +-0.800000 0xbf4ccccd "HairLine" +-0.800000 0xbf4ccccd "Ultra Light" +-0.800000 0xbf4ccccd "Ultra Thin" +-0.800000 0xbf4ccccd "UltraLight" +-0.800000 0xbf4ccccd "ulight" +-0.800000 0xbf4ccccd "ultra light" +-0.800000 0xbf4ccccd "ultralight" +-0.800000 0xbf4ccccd 1, 10 - 100 +0.000000 0x0 ".Keyboard" +0.000000 0x0 ".LucidaGrandeUI" +0.000000 0x0 ".LucidaGrandeUI" +0.000000 0x0 "LucidaGrande" +0.000000 0x0 "LucidaGrande" +0.000000 0x0 "R" +0.000000 0x0 "TimesNewRomanPSMT" +0.000000 0x0 "TimesNewRomanPSMT" +0.000000 0x0 "W4" +0.000000 0x0 "reg" +0.000000 0x0 "w4" +0.000000 0x0 4, 301 - 400 +0.000000 0x0 default +0.230000 0x3e6b851f 5, 401 - 500 +0.230000 0x3e6b851f "M" +0.230000 0x3e6b851f "Medium" +0.230000 0x3e6b851f "W5" +0.230000 0x3e6b851f "med" +0.230000 0x3e6b851f "medium" +0.230000 0x3e6b851f "w5" +0.230000 0x3e6b851f panose 6 +0.240000 0x3e75c28f "STHeiti" +0.240000 0x3fceb851eb851eb8 "STHeiti" +0.250000 0x3e800000 "Demi Bold" +0.250000 0x3e800000 "Demi" +0.250000 0x3e800000 "DemiBold" +0.250000 0x3e800000 "demi bold" +0.250000 0x3e800000 "demi" +0.250000 0x3e800000 "demibold" +0.250000 0x3e800000 6, 501 - 600 +0.250000 0x3e800000 panose 7 +0.300000 0x3e99999a "SB" +0.300000 0x3e99999a "Semi Bold" +0.300000 0x3e99999a "Semi" +0.300000 0x3e99999a "SemiBold" +0.300000 0x3e99999a "W6" +0.300000 0x3e99999a "semi bold" +0.300000 0x3e99999a "semi" +0.300000 0x3e99999a "semi" +0.300000 0x3e99999a "semibold" +0.300000 0x3e99999a "w6" +0.400000 0x3ecccccd "B" +0.400000 0x3ecccccd "Bold" +0.400000 0x3ecccccd "bold" +0.400000 0x3ecccccd "bold" +0.400000 0x3ecccccd 'head'[0x2D] & 1 +0.400000 0x3ecccccd 7, 601 - 700 +0.400000 0x3ecccccd panose 8 +0.440000 0x3ee147ae "W7" +0.440000 0x3ee147ae "w7" +0.500000 0x3f000000 "EB" +0.500000 0x3f000000 "Ext Bold" +0.500000 0x3f000000 "Extra Bold" +0.500000 0x3f000000 "Extra" +0.500000 0x3f000000 "ExtraBold" +0.500000 0x3f000000 "Ultra" +0.500000 0x3f000000 "extra bold" +0.500000 0x3f000000 "extra" +0.500000 0x3f000000 "extrabold" +0.500000 0x3f000000 8, 701 - 800 +0.540000 0x3f0a3d71 "W8" +0.540000 0x3f0a3d71 "w8" +0.560000 0x3f0f5c29 "H" +0.560000 0x3f0f5c29 "Heavy Face" +0.560000 0x3f0f5c29 "Heavy" +0.560000 0x3f0f5c29 "HeavyFace" +0.560000 0x3f0f5c29 "heavy face" +0.560000 0x3f0f5c29 "heavy" +0.560000 0x3f0f5c29 "heavy" +0.560000 0x3f0f5c29 "heavyface" +0.560000 0x3f0f5c29 panose 9 +0.620000 0x3f1eb852 "Black" +0.620000 0x3f1eb852 "Super" +0.620000 0x3f1eb852 "W9" +0.620000 0x3f1eb852 "black" +0.620000 0x3f1eb852 "black" +0.620000 0x3f1eb852 "super" +0.620000 0x3f1eb852 "w9" +0.620000 0x3f1eb852 9, 801 - 900 +0.620000 0x3f1eb852 panose 10 +0.700000 0x3f333333 "U" +0.700000 0x3f333333 "Ultra Bold" +0.700000 0x3f333333 "UltraBold" +0.700000 0x3f333333 "ultra bold" +0.700000 0x3f333333 "ultrabold" +0.750000 0x3f400000 "Fat" +0.750000 0x3f400000 "Ultra Black" +0.750000 0x3f400000 "UltraBlack" +0.750000 0x3f400000 "fat" +0.750000 0x3f400000 "ultra black" +0.750000 0x3f400000 "ultrablack" +0.750000 0x3f400000 901 - 950 +0.800000 0x3f4ccccd "Ext Black" +0.800000 0x3f4ccccd "ExtraBlack" +0.800000 0x3f4ccccd "Nord" +0.800000 0x3f4ccccd "Poster" +0.800000 0x3f4ccccd "UH" +0.800000 0x3f4ccccd "extrablack" +0.800000 0x3f4ccccd "nord" +0.800000 0x3f4ccccd "poster" +0.800000 0x3f4ccccd 951 - 999 +0.800000 0x3f4ccccd panose 11 +0.850000 0x3f59999a "Obese" +0.850000 0x3f59999a "obese" diff --git a/doc/export/ctweightsraw b/doc/export/ctweightsraw new file mode 100644 index 00000000..502d473e --- /dev/null +++ b/doc/export/ctweightsraw @@ -0,0 +1,149 @@ +0.000000 0x0 "reg" +0.300000 0x3e99999a "semi" +0.400000 0x3ecccccd "bold" +-0.400000 0xbecccccd "light" +0.230000 0x3e6b851f "med" +0.560000 0x3f0f5c29 "heavy" +0.620000 0x3f1eb852 "black" +-0.600000 0xbf19999a "thin" +-0.800000 0xbf4ccccd "ulight" +0.000000 0x0 "LucidaGrande" +0.000000 0x0 ".LucidaGrandeUI" +0.000000 0x0 ".Keyboard" +0.240000 0x3e75c28f "STHeiti" +-0.100000 0xbdcccccd "STXihei" +0.000000 0x0 "TimesNewRomanPSMT" +-0.800000 0xbf4ccccd "Ultra Light" +0.750000 0x3f400000 "Ultra Black" +-0.500000 0xbf000000 "Extra Light" +0.750000 0x3f400000 "UltraBlack" +0.800000 0x3f4ccccd "ExtraBlack" +-0.800000 0xbf4ccccd "UltraLight" +-0.500000 0xbf000000 "ExtraLight" +-0.800000 0xbf4ccccd "Ultra Thin" +-0.800000 0xbf4ccccd "Extra Thin" +0.560000 0x3f0f5c29 "Heavy Face" +-0.200000 0xbe4ccccd "Semi Light" +0.500000 0x3f000000 "Extra Bold" +0.700000 0x3f333333 "Ultra Bold" +0.560000 0x3f0f5c29 "HeavyFace" +0.500000 0x3f000000 "ExtraBold" +0.700000 0x3f333333 "UltraBold" +0.800000 0x3f4ccccd "Ext Black" +-0.200000 0xbe4ccccd "SemiLight" +0.250000 0x3e800000 "Demi Bold" +0.300000 0x3e99999a "Semi Bold" +-0.500000 0xbf000000 "Ext Light" +0.500000 0x3f000000 "Ext Bold" +0.250000 0x3e800000 "DemiBold" +0.300000 0x3e99999a "SemiBold" +-0.800000 0xbf4ccccd "HairLine" +-0.800000 0xbf4ccccd "Ext Thin" +0.230000 0x3e6b851f "Medium" +0.800000 0x3f4ccccd "Poster" +-0.400000 0xbecccccd "Light" +0.500000 0x3f000000 "Ultra" +0.560000 0x3f0f5c29 "Heavy" +0.500000 0x3f000000 "Extra" +0.620000 0x3f1eb852 "Black" +0.620000 0x3f1eb852 "Super" +0.850000 0x3f59999a "Obese" +-0.400000 0xbecccccd "Lite" +-0.230000 0xbe6b851f "Book" +0.250000 0x3e800000 "Demi" +0.300000 0x3e99999a "Semi" +-0.500000 0xbf000000 "Thin" +0.400000 0x3ecccccd "Bold" +0.800000 0x3f4ccccd "Nord" +0.750000 0x3f400000 "Fat" +-0.230000 0xbe6b851f "W1" +-0.500000 0xbf000000 "W2" +-0.230000 0xbe6b851f "W3" +0.000000 0x0 "W4" +0.230000 0x3e6b851f "W5" +0.300000 0x3e99999a "W6" +0.440000 0x3ee147ae "W7" +0.540000 0x3f0a3d71 "W8" +0.620000 0x3f1eb852 "W9" +-0.800000 0xbf4ccccd 1, 10 - 100 +-0.500000 0xbf000000 2, 101 - 200 +-0.400000 0xbecccccd 3, 201 - 300 +0.000000 0x0 4, 301 - 400 +0.230000 0x3e6b851f 5, 401 - 500 +0.250000 0x3e800000 6, 501 - 600 +0.400000 0x3ecccccd 7, 601 - 700 +0.500000 0x3f000000 8, 701 - 800 +0.620000 0x3f1eb852 9, 801 - 900 +0.750000 0x3f400000 901 - 950 +0.800000 0x3f4ccccd 951 - 999 +-0.500000 0xbf000000 panose 2 +-0.400000 0xbecccccd panose 3 +-0.230000 0xbe6b851f panose 5 +0.230000 0x3e6b851f panose 6 +0.250000 0x3e800000 panose 7 +0.400000 0x3ecccccd panose 8 +0.560000 0x3f0f5c29 panose 9 +0.620000 0x3f1eb852 panose 10 +0.800000 0x3f4ccccd panose 11 +0.400000 0x3ecccccd 'head'[0x2D] & 1 +-0.200000 0xbe4ccccd "EL" +0.500000 0x3f000000 "EB" +0.300000 0x3e99999a "SB" +0.800000 0x3f4ccccd "UH" +0.700000 0x3f333333 "U" +-0.400000 0xbecccccd "L" +0.560000 0x3f0f5c29 "H" +0.400000 0x3ecccccd "B" +0.230000 0x3e6b851f "M" +0.000000 0x0 "R" +0.000000 0x0 default +0.000000 0x0 "LucidaGrande" +0.000000 0x0 ".LucidaGrandeUI" +0.240000 0x3fceb851eb851eb8 "STHeiti" +-0.100000 0xbfb999999999999a "STXihei" +0.000000 0x0 "TimesNewRomanPSMT" +-0.800000 0xbf4ccccd "ultra light" +0.750000 0x3f400000 "ultra black" +-0.500000 0xbf000000 "extra light" +-0.800000 0xbf4ccccd "ultralight" +0.750000 0x3f400000 "ultrablack" +0.800000 0x3f4ccccd "extrablack" +-0.500000 0xbf000000 "extralight" +0.560000 0x3f0f5c29 "heavy face" +-0.200000 0xbe4ccccd "semi light" +0.500000 0x3f000000 "extra bold" +0.700000 0x3f333333 "ultra bold" +0.560000 0x3f0f5c29 "heavyface" +0.500000 0x3f000000 "extrabold" +0.700000 0x3f333333 "ultrabold" +-0.200000 0xbe4ccccd "semilight" +0.250000 0x3e800000 "demi bold" +0.300000 0x3e99999a "semi bold" +0.250000 0x3e800000 "demibold" +0.300000 0x3e99999a "semibold" +-0.700000 0xbf333333 "hairline" +0.230000 0x3e6b851f "medium" +0.800000 0x3f4ccccd "poster" +-0.400000 0xbecccccd "light" +0.560000 0x3f0f5c29 "heavy" +0.500000 0x3f000000 "extra" +0.620000 0x3f1eb852 "black" +0.620000 0x3f1eb852 "super" +0.850000 0x3f59999a "obese" +-0.400000 0xbecccccd "lite" +-0.230000 0xbe6b851f "book" +0.250000 0x3e800000 "demi" +0.300000 0x3e99999a "semi" +-0.500000 0xbf000000 "thin" +0.400000 0x3ecccccd "bold" +0.800000 0x3f4ccccd "nord" +0.750000 0x3f400000 "fat" +-0.700000 0xbf333333 "w1" +-0.500000 0xbf000000 "w2" +-0.230000 0xbe6b851f "w3" +0.000000 0x0 "w4" +0.230000 0x3e6b851f "w5" +0.300000 0x3e99999a "w6" +0.440000 0x3ee147ae "w7" +0.540000 0x3f0a3d71 "w8" +0.620000 0x3f1eb852 "w9" diff --git a/doc/export/ctweightvalues b/doc/export/ctweightvalues new file mode 100644 index 00000000..acbcb794 --- /dev/null +++ b/doc/export/ctweightvalues @@ -0,0 +1,247 @@ +registered font, preexisting metadata weight +"reg": float32as(0.000000, 0x0) +"semi": float32as(0.300000, 0x3e99999a) +"bold": float32as(0.400000, 0x3ecccccd) +"light": float32as(-0.400000, 0xbecccccd) +"med": float32as(0.230000, 0x3e6b851f) +"heavy": float32as(0.560000, 0x3f0f5c29) +"black": float32as(0.620000, 0x3f1eb852) +"thin": float32as(-0.600000, 0xbf19999a) +"ulight": float32as(-0.800000, 0xbf4ccccd) + +registered font, postscript name (probably only for TrueType and OpenType) special cases, overrides the above +"LucidaGrande": float32as(0.000000, 0x0) +".LucidaGrandeUI": float32as(0.000000, 0x0) +".Keyboard": float32as(0.000000, 0x0) +"STHeiti": float32as(0.240000, 0x3e75c28f) +"STXihei": float32as(-0.100000, 0xbdcccccd) +"TimesNewRomanPSMT": float32as(0.000000, 0x0) + +registered font, style glossary strings, tried in this order (possibly TrueType and OpenType only): preferred subfamily, subfamily, full name, preferred family, family; case-insensitive search, reverse search, "nonliteral" (kCFCompareNonliteral) +"Ultra Light": float32as(-0.800000, 0xbf4ccccd) +"Ultra Black": float32as(0.750000, 0x3f400000) +"Extra Light": float32as(-0.500000, 0xbf000000) +"UltraBlack": float32as(0.750000, 0x3f400000) +"ExtraBlack": float32as(0.800000, 0x3f4ccccd) +"UltraLight": float32as(-0.800000, 0xbf4ccccd) +"ExtraLight": float32as(-0.500000, 0xbf000000) +"Ultra Thin": float32as(-0.800000, 0xbf4ccccd) +"Extra Thin": float32as(-0.800000, 0xbf4ccccd) +"Heavy Face": float32as(0.560000, 0x3f0f5c29) +"Semi Light": float32as(-0.200000, 0xbe4ccccd) +"Extra Bold": float32as(0.500000, 0x3f000000) +"Ultra Bold": float32as(0.700000, 0x3f333333) +"HeavyFace": float32as(0.560000, 0x3f0f5c29) +"ExtraBold": float32as(0.500000, 0x3f000000) +"UltraBold": float32as(0.700000, 0x3f333333) +"Ext Black": float32as(0.800000, 0x3f4ccccd) +"SemiLight": float32as(-0.200000, 0xbe4ccccd) +"Demi Bold": float32as(0.250000, 0x3e800000) +"Semi Bold": float32as(0.300000, 0x3e99999a) +"Ext Light": float32as(-0.500000, 0xbf000000) +"Ext Bold": float32as(0.500000, 0x3f000000) +"DemiBold": float32as(0.250000, 0x3e800000) +"SemiBold": float32as(0.300000, 0x3e99999a) +"HairLine": float32as(-0.800000, 0xbf4ccccd) +"Ext Thin": float32as(-0.800000, 0xbf4ccccd) +"Medium": float32as(0.230000, 0x3e6b851f) +"Poster": float32as(0.800000, 0x3f4ccccd) +"Light": float32as(-0.400000, 0xbecccccd) +"Ultra": float32as(0.500000, 0x3f000000) +"Heavy": float32as(0.560000, 0x3f0f5c29) +"Extra": float32as(0.500000, 0x3f000000) +"Black": float32as(0.620000, 0x3f1eb852) +"Super": float32as(0.620000, 0x3f1eb852) +"Obese": float32as(0.850000, 0x3f59999a) +"Lite": float32as(-0.400000, 0xbecccccd) +"Book": float32as(-0.230000, 0xbe6b851f) +"Demi": float32as(0.250000, 0x3e800000) +"Semi": float32as(0.300000, 0x3e99999a) +"Thin": float32as(-0.500000, 0xbf000000) +"Bold": float32as(0.400000, 0x3ecccccd) +"Nord": float32as(0.800000, 0x3f4ccccd) +"Fat": float32as(0.750000, 0x3f400000) +"W1": float32as(-0.230000, 0xbe6b851f) +"W2": float32as(-0.500000, 0xbf000000) +"W3": float32as(-0.230000, 0xbe6b851f) +"W4": float32as(0.000000, 0x0) +"W5": float32as(0.230000, 0x3e6b851f) +"W6": float32as(0.300000, 0x3e99999a) +"W7": float32as(0.440000, 0x3ee147ae) +"W8": float32as(0.540000, 0x3f0a3d71) +"W9": float32as(0.620000, 0x3f1eb852) + +registered font, OS2 weights; table length >= 78 +1, 10 - 100: float32as(-0.800000, 0xbf4ccccd) +2, 101 - 200: float32as(-0.500000, 0xbf000000) +3, 201 - 300: float32as(-0.400000, 0xbecccccd) +4, 301 - 400: float32as(0.000000, 0x0) +5, 401 - 500: float32as(0.230000, 0x3e6b851f) +6, 501 - 600: float32as(0.250000, 0x3e800000) +7, 601 - 700: float32as(0.400000, 0x3ecccccd) +8, 701 - 800: float32as(0.500000, 0x3f000000) +9, 801 - 900: float32as(0.620000, 0x3f1eb852) +901 - 950: float32as(0.750000, 0x3f400000) +951 - 999: float32as(0.800000, 0x3f4ccccd) +0, 1000: panose +panose 2: float32as(-0.500000, 0xbf000000) +panose 3: float32as(-0.400000, 0xbecccccd) +panose 4: !!!! see note should be float32as(-0.300000, 0xbe99999a) but is treated as invalid instead due to returning false instead of true +panose 5: float32as(-0.230000, 0xbe6b851f) +panose 6: float32as(0.230000, 0x3e6b851f) +panose 7: float32as(0.250000, 0x3e800000) +panose 8: float32as(0.400000, 0x3ecccccd) +panose 9: float32as(0.560000, 0x3f0f5c29) +panose 10: float32as(0.620000, 0x3f1eb852) +panose 11: float32as(0.800000, 0x3f4ccccd) + +registered font, head table, low bit of byte 0x2D +'head'[0x2D] & 1: float32as(0.400000, 0x3ecccccd) + +registered font, abbreviated weight glossary, checks for (possibly in TrueType and OpenType only) in order: preferred subfamily, family; case-insensitive strict comparison +"EL": float32as(-0.200000, 0xbe4ccccd) +"EB": float32as(0.500000, 0x3f000000) +"SB": float32as(0.300000, 0x3e99999a) +"UH": float32as(0.800000, 0x3f4ccccd) +"U": float32as(0.700000, 0x3f333333) +"L": float32as(-0.400000, 0xbecccccd) +"H": float32as(0.560000, 0x3f0f5c29) +"B": float32as(0.400000, 0x3ecccccd) +"M": float32as(0.230000, 0x3e6b851f) +"R": float32as(0.000000, 0x0) + +registered font +default: float32as(0.000000, 0x0) + +// based on CoreText dylib's __Z13WeightOfClasst — WeightOfClass(unsigned short) +func CoreText_WeightOfClass(usWeightClass uint16) float64 { + if usWeightClass >= 11 { + // do nothing; we are preserving the original asm comparisons + // and yes, this one is 11, but the one above is 10 + } else { + usWeightClass *= 100 + } + + // figure out what two floats our weight will be between + i := usWeightClass / 100 + j := i + 1 + if j > 10 { + j = 10 + } + b := float64(i * 100) + c := float64(j * 100) + + a := float64(0) + if b != c { + a = float64(usWeightClass) + a -= b + c -= b + a /= c + } + scales := []float32{ + float32as(-1.000000, 0xbf800000), + float32as(-0.700000, 0xbf333333), + float32as(-0.500000, 0xbf000000), + float32as(-0.230000, 0xbe6b851f), + float32as(0.000000, 0x0), + float32as(0.200000, 0x3e4ccccd), + float32as(0.300000, 0x3e99999a), + float32as(0.400000, 0x3ecccccd), + float32as(0.600000, 0x3f19999a), + float32as(0.800000, 0x3f4ccccd), + float32as(1.000000, 0x3f800000), + } + c = float64(scale[i]) + b = float64[scale[j]) + return fma(a, b, c) +} + +unregistered font: kCTFontPostScriptNameKey defaults +"LucidaGrande": float64as(0.000000, 0x0) +".LucidaGrandeUI": float64as(0.000000, 0x0) +"STHeiti": float64as(0.240000, 0x3fceb851eb851eb8) +"STXihei": float64as(-0.100000, 0xbfb999999999999a) +"TimesNewRomanPSMT": float64as(0.000000, 0x0) + + + os2table := f.Table('OS/2') + if os2table != nil { + if !hasWeight { + var usWeightClass uint16 + + valid := false + if os2table.Len() > 77 { + b := os2table.Bytes() + usWeightClass = uint16be(b[4:6]) + if usWeightClass > 1000 { + weight = 0 + hasWeight = false + } else { + valid = true + } + } else { + usWeightClass = 0 + valid = true + } + if valid { + weight = CoreText_WeightOfClass(usWeightClass) + hasWeight = true + } + } + } + + +unregistered font, style glossary, checks against kCTFontSubFamilyNameKey, kCTFontFullNameKey, kCTFontFamilyNameKey; case-insensitive (folded by Unicode rules) strstr() +"ultra light": float32as(-0.800000, 0xbf4ccccd) +"ultra black": float32as(0.750000, 0x3f400000) +"extra light": float32as(-0.500000, 0xbf000000) +"ultralight": float32as(-0.800000, 0xbf4ccccd) +"ultrablack": float32as(0.750000, 0x3f400000) +"extrablack": float32as(0.800000, 0x3f4ccccd) +"extralight": float32as(-0.500000, 0xbf000000) +"heavy face": float32as(0.560000, 0x3f0f5c29) +"semi light": float32as(-0.200000, 0xbe4ccccd) +"extra bold": float32as(0.500000, 0x3f000000) +"ultra bold": float32as(0.700000, 0x3f333333) +"heavyface": float32as(0.560000, 0x3f0f5c29) +"extrabold": float32as(0.500000, 0x3f000000) +"ultrabold": float32as(0.700000, 0x3f333333) +"semilight": float32as(-0.200000, 0xbe4ccccd) +"demi bold": float32as(0.250000, 0x3e800000) +"semi bold": float32as(0.300000, 0x3e99999a) +"demibold": float32as(0.250000, 0x3e800000) +"semibold": float32as(0.300000, 0x3e99999a) +"hairline": float32as(-0.700000, 0xbf333333) +"medium": float32as(0.230000, 0x3e6b851f) +"poster": float32as(0.800000, 0x3f4ccccd) +"light": float32as(-0.400000, 0xbecccccd) +"heavy": float32as(0.560000, 0x3f0f5c29) +"extra": float32as(0.500000, 0x3f000000) +"black": float32as(0.620000, 0x3f1eb852) +"super": float32as(0.620000, 0x3f1eb852) +"obese": float32as(0.850000, 0x3f59999a) +"lite": float32as(-0.400000, 0xbecccccd) +"book": float32as(-0.230000, 0xbe6b851f) +"demi": float32as(0.250000, 0x3e800000) +"semi": float32as(0.300000, 0x3e99999a) +"thin": float32as(-0.500000, 0xbf000000) +"bold": float32as(0.400000, 0x3ecccccd) +"nord": float32as(0.800000, 0x3f4ccccd) +"fat": float32as(0.750000, 0x3f400000) +"w1": float32as(-0.700000, 0xbf333333) +"w2": float32as(-0.500000, 0xbf000000) +"w3": float32as(-0.230000, 0xbe6b851f) +"w4": float32as(0.000000, 0x0) +"w5": float32as(0.230000, 0x3e6b851f) +"w6": float32as(0.300000, 0x3e99999a) +"w7": float32as(0.440000, 0x3ee147ae) +"w8": float32as(0.540000, 0x3f0a3d71) +"w9": float32as(0.620000, 0x3f1eb852) + +func (f *Font) ShouldEnableBoldSymbolicTrait() bool { + if f.IsRegistered() { + return f.ShouldEnableBoldSymbolicTraitFromRegistry() + } + no := f.Weight() <= float64as(0.239000, 0x3fce978d4fdf3b64) + return !no +} diff --git a/doc/export/ctwidths b/doc/export/ctwidths new file mode 100644 index 00000000..dd6d2ca2 --- /dev/null +++ b/doc/export/ctwidths @@ -0,0 +1,160 @@ +xx pseudo-go + +func (f *CTFont) RegistryWidth32() float32 { + metadata visual descriptors + { "med", float32as(0.000000, 0x0) }, + { "cond", float32as(-0.200000, 0xbe4ccccd) }, + { "ext", float32as(0.200000, 0x3e4ccccd) }, + + style dictionary + { "Extra Compressed", float32as(-0.700000, 0xbf333333) }, + { "Ultra Compressed", float32as(-0.700000, 0xbf333333) }, + { "Ultra Condensed", float32as(-0.700000, 0xbf333333) }, + { "Extra Condensed", float32as(-0.500000, 0xbf000000) }, + { "Extra Extended", float32as(0.400000, 0x3ecccccd) }, + { "Ext Compressed", float32as(-0.700000, 0xbf333333) }, + { "Ultra Expanded", float32as(0.800000, 0x3f4ccccd) }, + { "Ultra Extended", float32as(0.800000, 0x3f4ccccd) }, + { "Extra Expanded", float32as(0.400000, 0x3ecccccd) }, + xx TODO this is weird, but correct... + { "Semi Condensed", float32as(-0.700000, 0xbf333333) }, + { "Semi Condensed", float32as(-0.100000, 0xbdcccccd) }, + xx end TODO + { "Ext Condensed", float32as(-0.500000, 0xbf000000) }, + { "SemiCondensed", float32as(-0.100000, 0xbdcccccd) }, + { "ExtraExpanded", float32as(0.400000, 0x3ecccccd) }, + { "Semi Expanded", float32as(0.100000, 0x3dcccccd) }, + { "Semi Extended", float32as(0.100000, 0x3dcccccd) }, + { "Ext Expanded", float32as(0.400000, 0x3ecccccd) }, + { "Ext Extended", float32as(0.400000, 0x3ecccccd) }, + { "SemiExpanded", float32as(0.100000, 0x3dcccccd) }, + { "Extra Narrow", float32as(-0.500000, 0xbf000000) }, + { "ExtraNarrow", float32as(-0.500000, 0xbf000000) }, + { "Extra Wide", float32as(0.800000, 0x3f4ccccd) }, + { "Ultra Cond", float32as(-0.700000, 0xbf333333) }, + { "Compressed", float32as(-0.500000, 0xbf000000) }, + { "Extra Cond", float32as(-0.500000, 0xbf000000) }, + { "Semi Cond", float32as(-0.100000, 0xbdcccccd) }, + { "Condensed", float32as(-0.200000, 0xbe4ccccd) }, + { "ExtraWide", float32as(0.800000, 0x3f4ccccd) }, + { "Extended", float32as(0.200000, 0x3e4ccccd) }, + { "Expanded", float32as(0.200000, 0x3e4ccccd) }, + { "Ext Cond", float32as(-0.500000, 0xbf000000) }, + { "Narrow", float32as(-0.400000 , 0xbecccccd) }, + { "Compact", float32as(-0.400000, 0xbecccccd) }, + { "Cond", float32as(-0.200000, 0xbe4ccccd) }, + { "Wide", float32as(0.600000, 0x3f19999a) }, + { "Thin", float32as(-0.700000, 0xbf333333) }, + + get os2 table + if os2table.Len() >= 78 { + usWidthClass := uint16be(b[6:8]) - 1 + xx this handles the case where the original usWidthClass == 0 + if usWidthClass > 8 { + panose := b[0x23] - 2 + if panose > 6 { + xx TODO + } else { + switch panose { + case 0, 1, 2: + width = float32as(0.000000, 0x0) + case 3: + width = float32as(0.200000, 0x3e4ccccd) + case 4: + width = float32as(-0.200000, 0xbe4ccccd) + case 5: + width = float32as(0.400000, 0x3ecccccd) + case 6: + width = float32as(-0.400000, 0xbecccccd) + } + } + } + switch usWidthClass { + case 0: + width = float32as(-0.700000, 0xbf333333) + case 1: + width = float32as(-0.500000, 0xbf000000) + case 2: + width = float32as(-0.200000, 0xbe4ccccd) + case 3: + width = float32as(-0.100000, 0xbdcccccd) + case 4: + width = float32as(0.000000, 0x0) + case 5: + width = float32as(0.100000, 0x3dcccccd) + case 6: + width = float32as(0.400000, 0x3ecccccd) + case 7: + width = float32as(0.600000, 0x3f19999a) + case 8: + width = float32as(0.800000, 0x3f4ccccd) + } + } + + headtable := f.CopyTable('head') + if headtable != nil { + if headtable.Len() >= 54 { + x := b[0x2d] + if (x & 0x20) != 0 { + width = float32as(-0.200000, 0xbe4ccccd) + } else if (x & 0x40) != 0 { + width = float32as(0.200000, 0x3e4ccccd) + } + } + } + + xx and if all else fails + return float32as(0.000000, 0x0) +} + +func (f *CTFont) Width() float64 { + if f.IsRegistered() { + return f.RegistryWidth() + } + + width := 0.0 + hasWidth := false + + if there is an OS2 table { + var usWidthClass uint16 + + valid := false + if it's 78 bytes or more { + usWidthClass = uint16be(table[6:8]) + if usWeightClass <= 10 { + valid = true + } else { + valid = false + } + } else { + usWidthClass = 0 + valid = true + } + if valid { + ten := float64as(10.000000, 0x4024000000000000) + negPointFive := float64as(-0.500000, 0xbfe0000000000000) + width = (float64(usWidthClass) div ten) + negPointFive + hasWidth = true + } + } + + then there's the style glossary strings comparison: + { "semi condensed", float32as(-0.100000, 0xbdcccccd) }, + { "extra expanded", float32as(0.400000, 0x3ecccccd) }, + { "semicondensed", float32as(-0.100000, 0xbdcccccd) }, + { "extraexpanded", float32as(0.400000, 0x3ecccccd) }, + { "semi expanded", float32as(0.100000, 0x3dcccccd) }, + { "semiexpanded", float32as(0.100000, 0x3dcccccd) }, + { "extra narrow", float32as(-0.500000, 0xbf000000) }, + { "extranarrow", float32as(-0.500000, 0xbf000000) }, + { "extra wide", float32as(0.800000, 0x3f4ccccd) }, + { "condensed", float32as(-0.200000, 0xbe4ccccd) }, + { "extrawide", float32as(0.800000, 0x3f4ccccd) }, + { "extended", float32as(0.200000, 0x3e4ccccd) }, + { "expanded", float32as(0.200000, 0x3e4ccccd) }, + { "narrow", float32as(-0.400000, 0xbecccccd) }, + { "wide", float32as(0.600000, 0x3f19999a) }, + { "thin", float32as(-0.700000, 0xbf333333) }, + + otherwise just return float64as(0.000000, 0x0) +} diff --git a/doc/export/ctwidthscombined b/doc/export/ctwidthscombined new file mode 100644 index 00000000..fe4ad9d9 --- /dev/null +++ b/doc/export/ctwidthscombined @@ -0,0 +1,77 @@ +-0.100000 + style string contains "Semi Cond" + style string contains "Semi Condensed"; unregistered fonts only (see below) + style string contains "SemiCondensed" + OS2 width 4 + +-0.200000 + ('head' table byte 0x2d) & 0x20 != 0 + ATSD style "cond" + panose 6 + style string contains "Cond" + style string contains "Condensed" + OS2 width 3 + +-0.400000 + panose 8 + style string contains "Compact" + style string contains "Narrow" + +-0.500000 + style string contains "Compressed" + style string contains "Ext Cond" + style string contains "Ext Condensed" + style string contains "Extra Cond" + style string contains "Extra Condensed" + style string contains "Extra Narrow" + style string contains "ExtraNarrow" + OS2 width 2 + +-0.700000 + style string contains "Ext Compressed" + style string contains "Extra Compressed" + style string contains "Semi Condensed" (this is probably a typo, since another "Semi Condensed" with a value of -0.1 follows this in the table it comes from); registered fonts only + style string contains "Thin" + style string contains "Ultra Compressed" + style string contains "Ultra Cond" + style string contains "Ultra Condensed" + OS2 width 1 + +0.000000 + default + ATSD style "med" + panose 2, 3, 4 + OS2 width 5 + +0.100000 + style string contains "Semi Expanded" + style string contains "Semi Extended" + style string contains "SemiExpanded" + OS2 width 6 + +0.200000 + ('head' table byte 0x2d) & 0x40 != 0 + ATSD style "ext" + panose 5 + style string contains "Expanded" + style string contains "Extended" + +0.400000 + panose 7 + style string contains "Ext Expanded" + style string contains "Ext Extended" + style string contains "Extra Expanded" + style string contains "Extra Extended" + style string contains "ExtraExpanded" + OS2 width 7 + +0.600000 + style string contains "Wide" + OS2 width 8 + +0.800000 + style string contains "Extra Wide" + style string contains "ExtraWide" + style string contains "Ultra Expanded" + style string contains "Ultra Extended" + OS2 width 9 diff --git a/doc/export/ctwidthsprocessed b/doc/export/ctwidthsprocessed new file mode 100644 index 00000000..26f9fcc2 --- /dev/null +++ b/doc/export/ctwidthsprocessed @@ -0,0 +1,73 @@ +-0.100000 0xbdcccccd registered "Semi Cond" +-0.100000 0xbdcccccd registered "Semi Condensed" +-0.100000 0xbdcccccd registered "SemiCondensed" +-0.100000 0xbdcccccd registered OS2 4 +-0.100000 0xbdcccccd unregistered "semi condensed" +-0.100000 0xbdcccccd unregistered "semicondensed" +-0.200000 0xbe4ccccd head[0x2d] & 0x20 +-0.200000 0xbe4ccccd metadata "cond" +-0.200000 0xbe4ccccd panose 6 +-0.200000 0xbe4ccccd registered "Cond" +-0.200000 0xbe4ccccd registered "Condensed" +-0.200000 0xbe4ccccd registered OS2 3 +-0.200000 0xbe4ccccd unregistered "condensed" +-0.400000 0xbecccccd panose 8 +-0.400000 0xbecccccd registered "Compact" +-0.400000 0xbecccccd registered "Narrow" +-0.400000 0xbecccccd unregistered "narrow" +-0.500000 0xbf000000 registered "Compressed" +-0.500000 0xbf000000 registered "Ext Cond" +-0.500000 0xbf000000 registered "Ext Condensed" +-0.500000 0xbf000000 registered "Extra Cond" +-0.500000 0xbf000000 registered "Extra Condensed" +-0.500000 0xbf000000 registered "Extra Narrow" +-0.500000 0xbf000000 registered "ExtraNarrow" +-0.500000 0xbf000000 registered OS2 2 +-0.500000 0xbf000000 unregistered "extra narrow" +-0.500000 0xbf000000 unregistered "extranarrow" +-0.700000 0xbf333333 registered "Ext Compressed" +-0.700000 0xbf333333 registered "Extra Compressed" +-0.700000 0xbf333333 registered "Semi Condensed" +-0.700000 0xbf333333 registered "Thin" +-0.700000 0xbf333333 registered "Ultra Compressed" +-0.700000 0xbf333333 registered "Ultra Cond" +-0.700000 0xbf333333 registered "Ultra Condensed" +-0.700000 0xbf333333 registered OS2 1 +-0.700000 0xbf333333 unregistered "thin" +0.000000 0x0 default +0.000000 0x0 metadata "med" +0.000000 0x0 panose 2, 3, 4 +0.000000 0x0 registered OS2 5 +0.000000 0x0 registered default +0.100000 0x3dcccccd registered "Semi Expanded" +0.100000 0x3dcccccd registered "Semi Extended" +0.100000 0x3dcccccd registered "SemiExpanded" +0.100000 0x3dcccccd registered OS2 6 +0.100000 0x3dcccccd unregistered "semi expanded" +0.100000 0x3dcccccd unregistered "semiexpanded" +0.200000 0x3e4ccccd head[0x2d] & 0x40 +0.200000 0x3e4ccccd metadata "ext" +0.200000 0x3e4ccccd panose 5 +0.200000 0x3e4ccccd registered "Expanded" +0.200000 0x3e4ccccd registered "Extended" +0.200000 0x3e4ccccd unregistered "expanded" +0.200000 0x3e4ccccd unregistered "extended" +0.400000 0x3ecccccd panose 7 +0.400000 0x3ecccccd registered "Ext Expanded" +0.400000 0x3ecccccd registered "Ext Extended" +0.400000 0x3ecccccd registered "Extra Expanded" +0.400000 0x3ecccccd registered "Extra Extended" +0.400000 0x3ecccccd registered "ExtraExpanded" +0.400000 0x3ecccccd registered OS2 7 +0.400000 0x3ecccccd unregistered "extra expanded" +0.400000 0x3ecccccd unregistered "extraexpanded" +0.600000 0x3f19999a registered "Wide" +0.600000 0x3f19999a registered OS2 8 +0.600000 0x3f19999a unregistered "wide" +0.800000 0x3f4ccccd registered "Extra Wide" +0.800000 0x3f4ccccd registered "ExtraWide" +0.800000 0x3f4ccccd registered "Ultra Expanded" +0.800000 0x3f4ccccd registered "Ultra Extended" +0.800000 0x3f4ccccd registered OS2 9 +0.800000 0x3f4ccccd unregistered "extra wide" +0.800000 0x3f4ccccd unregistered "extrawide" diff --git a/doc/export/ctwidthvalues b/doc/export/ctwidthvalues new file mode 100644 index 00000000..fbccfc3f --- /dev/null +++ b/doc/export/ctwidthvalues @@ -0,0 +1,112 @@ +metadata "med": float32as(0.000000, 0x0) +metadata "cond": float32as(-0.200000, 0xbe4ccccd) +metadata "ext": float32as(0.200000, 0x3e4ccccd) + +registered "Extra Compressed": float32as(-0.700000, 0xbf333333) +registered "Ultra Compressed": float32as(-0.700000, 0xbf333333) +registered "Ultra Condensed": float32as(-0.700000, 0xbf333333) +registered "Extra Condensed": float32as(-0.500000, 0xbf000000) +registered "Extra Extended": float32as(0.400000, 0x3ecccccd) +registered "Ext Compressed": float32as(-0.700000, 0xbf333333) +registered "Ultra Expanded": float32as(0.800000, 0x3f4ccccd) +registered "Ultra Extended": float32as(0.800000, 0x3f4ccccd) +registered "Extra Expanded": float32as(0.400000, 0x3ecccccd) +registered "Semi Condensed": float32as(-0.700000, 0xbf333333) +registered "Semi Condensed": float32as(-0.100000, 0xbdcccccd) +registered "Ext Condensed": float32as(-0.500000, 0xbf000000) +registered "SemiCondensed": float32as(-0.100000, 0xbdcccccd) +registered "ExtraExpanded": float32as(0.400000, 0x3ecccccd) +registered "Semi Expanded": float32as(0.100000, 0x3dcccccd) +registered "Semi Extended": float32as(0.100000, 0x3dcccccd) +registered "Ext Expanded": float32as(0.400000, 0x3ecccccd) +registered "Ext Extended": float32as(0.400000, 0x3ecccccd) +registered "SemiExpanded": float32as(0.100000, 0x3dcccccd) +registered "Extra Narrow": float32as(-0.500000, 0xbf000000) +registered "ExtraNarrow": float32as(-0.500000, 0xbf000000) +registered "Extra Wide": float32as(0.800000, 0x3f4ccccd) +registered "Ultra Cond": float32as(-0.700000, 0xbf333333) +registered "Compressed": float32as(-0.500000, 0xbf000000) +registered "Extra Cond": float32as(-0.500000, 0xbf000000) +registered "Semi Cond": float32as(-0.100000, 0xbdcccccd) +registered "Condensed": float32as(-0.200000, 0xbe4ccccd) +registered "ExtraWide": float32as(0.800000, 0x3f4ccccd) +registered "Extended": float32as(0.200000, 0x3e4ccccd) +registered "Expanded": float32as(0.200000, 0x3e4ccccd) +registered "Ext Cond": float32as(-0.500000, 0xbf000000) +registered "Narrow": float32as(-0.400000 , 0xbecccccd) +registered "Compact": float32as(-0.400000, 0xbecccccd) +registered "Cond": float32as(-0.200000, 0xbe4ccccd) +registered "Wide": float32as(0.600000, 0x3f19999a) +registered "Thin": float32as(-0.700000, 0xbf333333) + +panose 2, 3, 4: float32as(0.000000, 0x0) +panose 5: float32as(0.200000, 0x3e4ccccd) +panose 6: float32as(-0.200000, 0xbe4ccccd) +panose 7: float32as(0.400000, 0x3ecccccd) +panose 8: float32as(-0.400000, 0xbecccccd) + +registered OS2 1: float32as(-0.700000, 0xbf333333) +registered OS2 2: float32as(-0.500000, 0xbf000000) +registered OS2 3: float32as(-0.200000, 0xbe4ccccd) +registered OS2 4: float32as(-0.100000, 0xbdcccccd) +registered OS2 5: float32as(0.000000, 0x0) +registered OS2 6: float32as(0.100000, 0x3dcccccd) +registered OS2 7: float32as(0.400000, 0x3ecccccd) +registered OS2 8: float32as(0.600000, 0x3f19999a) +registered OS2 9: float32as(0.800000, 0x3f4ccccd) + +head[0x2d] & 0x20: float32as(-0.200000, 0xbe4ccccd) +head[0x2d] & 0x40: float32as(0.200000, 0x3e4ccccd) + +registered default: float32as(0.000000, 0x0) + +func (f *CTFont) Width() float64 { + if f.IsRegistered() { + return f.RegistryWidth() + } + + width := 0.0 + hasWidth := false + + if there is an OS2 table { + var usWidthClass uint16 + + valid := false + if it's 78 bytes or more { + usWidthClass = uint16be(table[6:8]) + if usWeightClass <= 10 { + valid = true + } else { + valid = false + } + } else { + usWidthClass = 0 + valid = true + } + if valid { + ten := float64as(10.000000, 0x4024000000000000) + negPointFive := float64as(-0.500000, 0xbfe0000000000000) + width = (float64(usWidthClass) div ten) + negPointFive + hasWidth = true + } + } + + then there's the style glossary strings comparison: +unregistered "semi condensed": float32as(-0.100000, 0xbdcccccd) +unregistered "extra expanded": float32as(0.400000, 0x3ecccccd) +unregistered "semicondensed": float32as(-0.100000, 0xbdcccccd) +unregistered "extraexpanded": float32as(0.400000, 0x3ecccccd) +unregistered "semi expanded": float32as(0.100000, 0x3dcccccd) +unregistered "semiexpanded": float32as(0.100000, 0x3dcccccd) +unregistered "extra narrow": float32as(-0.500000, 0xbf000000) +unregistered "extranarrow": float32as(-0.500000, 0xbf000000) +unregistered "extra wide": float32as(0.800000, 0x3f4ccccd) +unregistered "condensed": float32as(-0.200000, 0xbe4ccccd) +unregistered "extrawide": float32as(0.800000, 0x3f4ccccd) +unregistered "extended": float32as(0.200000, 0x3e4ccccd) +unregistered "expanded": float32as(0.200000, 0x3e4ccccd) +unregistered "narrow": float32as(-0.400000, 0xbecccccd) +unregistered "wide": float32as(0.600000, 0x3f19999a) +unregistered "thin": float32as(-0.700000, 0xbf333333) + +default: float64as(0.000000, 0x0) diff --git a/doc/export/fvar.swift b/doc/export/fvar.swift new file mode 100644 index 00000000..3d81c9d8 --- /dev/null +++ b/doc/export/fvar.swift @@ -0,0 +1,73 @@ +// 2 november 2017 +import Cocoa +import CoreText + +func fourccString(_ k: FourCharCode) -> String { + var c: [UInt8] = [0, 0, 0, 0] + c[0] = UInt8((k >> 24) & 0xFF) + c[1] = UInt8((k >> 16) & 0xFF) + c[2] = UInt8((k >> 8) & 0xFF) + c[3] = UInt8(k & 0xFF) + return String(bytes: c, encoding: .utf8)! +} + +var weightMin: Double = 0 +var weightMax: Double = 0 +var weightDef: Double = 0 +var weightVals: [String: Double] = [:] + +let attrs: [String: String] = [ + kCTFontFamilyNameAttribute as String: "Skia", +] +let bd = CTFontDescriptorCreateWithAttributes(attrs as CFDictionary) +let matches = CTFontDescriptorCreateMatchingFontDescriptors(bd, nil) as! [CTFontDescriptor] +let mfont = CTFontCreateWithFontDescriptor(matches[0], 0.0, nil) +let master = CTFontCopyVariationAxes(mfont) as! [NSDictionary] +master.forEach { d in + print("axis {") + d.forEach { k, v in + if (k as! String) == (kCTFontVariationAxisIdentifierKey as String) { + let c = v as! FourCharCode + print("\t\(k) \(fourccString(c))") + } else { + print("\t\(k) \(v)") + } + } + print("}") + if (d[kCTFontVariationAxisNameKey] as! String) == "Weight" { + weightMin = d[kCTFontVariationAxisMinimumValueKey] as! Double + weightMax = d[kCTFontVariationAxisMaximumValueKey] as! Double + weightDef = d[kCTFontVariationAxisDefaultValueKey] as! Double + } +} +print("") +matches.forEach { d in + let f = CTFontDescriptorCopyAttribute(d, kCTFontVariationAttribute) as! [FourCharCode: Double] + let n = CTFontDescriptorCopyAttribute(d, kCTFontStyleNameAttribute) as! String + print("\(n) {") + f.forEach { k, v in + print("\t\(fourccString(k)) \(v)") + } + print("}") + weightVals[n] = weightDef + if let v = f[2003265652] { + weightVals[n] = v + } +} +print("") +weightVals.forEach { k, v in + let basicScaled = (v - weightMin) / (weightMax - weightMin) + print("\(k) basic scaled = \(basicScaled) (OS2 \(UInt16(basicScaled * 1000)))") + // https://www.microsoft.com/typography/otspec/otvaroverview.htm#CSN + var opentypeScaled: Double = 0 + if v < weightDef { + opentypeScaled = -((weightDef - v) / (weightDef - weightMin)) + } else if v > weightDef { + opentypeScaled = (v - weightDef) / (weightMax - weightDef) + } + print("\(k) opentype scaled = \(opentypeScaled)") +} +print("") +print("\(String(describing: CTFontDescriptorCreateMatchingFontDescriptors(CTFontDescriptorCreateCopyWithVariation(matches[0], FourCharCode(2003265652) as CFNumber, CGFloat(weightMax)), Set([kCTFontVariationAttribute as String]) as CFSet)))") +print("") +print("\(CTFontCopyTable(mfont, CTFontTableTag(kCTFontTableAvar), []) != nil)") diff --git a/doc/export/ttfixedtest.go b/doc/export/ttfixedtest.go new file mode 100644 index 00000000..217afa50 --- /dev/null +++ b/doc/export/ttfixedtest.go @@ -0,0 +1,58 @@ +// 2 november 2017 +package main + +import ( + "fmt" +) + +type fixed1616 uint32 +type fixed214 uint16 + +func fixed1616To214(f fixed1616) fixed214 { + f += 0x00000002 + g := int32(f) >> 2 + return fixed214(uint32(g) & 0xFFFF) +} + +func (f fixed1616) In214Range() bool { + base := int16((f >> 16) & 0xFFFF) + return base >= -2 && base < 2 +} + +func (f fixed1616) String() string { + base := int16((f >> 16) & 0xFFFF) + frac := float64(f & 0xFFFF) / 65536 + res := float64(base) + frac + return fmt.Sprintf("%f 0x%08X", res, uint32(f)) +} + +func (f fixed214) String() string { + base := []int16{ + 0, + 1, + -2, + -1, + }[(f & 0xC000) >> 14] + frac := float64(f & 0x3FFF) / 16384 + res := float64(base) + frac + return fmt.Sprintf("%f 0x%04X", res, uint16(f)) +} + +func main() { + fmt.Println(fixed214(0x7fff)) + fmt.Println(fixed214(0x8000)) + fmt.Println(fixed214(0x4000)) + fmt.Println(fixed214(0xc000)) + fmt.Println(fixed214(0x7000)) + fmt.Println(fixed214(0x0000)) + fmt.Println(fixed214(0x0001)) + fmt.Println(fixed214(0xffff)) + + fmt.Println() + + for i := uint64(0x00000000); i <= 0xFFFFFFFF; i++ { + j := fixed1616(i) + if !j.In214Range() { continue } + fmt.Println(j, "->", fixed1616To214(j)) + } +} diff --git a/doc/export/weightlist1.sh b/doc/export/weightlist1.sh new file mode 100644 index 00000000..0a1267ea --- /dev/null +++ b/doc/export/weightlist1.sh @@ -0,0 +1,8 @@ +# 21 october 2017 +gawk ' +BEGIN { FS = "\t+" } +!/float..as/ { next } +{ i = 0; if ($1 == "") i++ } +(NF-i) != 2 { next } +{ print } +' "$@" diff --git a/doc/export/weightlist2.sh b/doc/export/weightlist2.sh new file mode 100644 index 00000000..df2c546d --- /dev/null +++ b/doc/export/weightlist2.sh @@ -0,0 +1,10 @@ +# 21 october 2017 +gawk ' +{ + gsub(/float..as\(/, "") + gsub(/,/, "", $(NF - 1)) + gsub(/\)$/, "") + split($0, parts, /:/) + print $(NF - 1) "\t" $NF "\t" parts[1] +} +' "$@" diff --git a/doc/export/weightlist3.sh b/doc/export/weightlist3.sh new file mode 100644 index 00000000..f772226b --- /dev/null +++ b/doc/export/weightlist3.sh @@ -0,0 +1,3 @@ +# 21 october 2017 +sort -t$'\t' -k1,1 -k2,2 "$@" | + column -t -s$'\t' diff --git a/doc/export/writewidths.c b/doc/export/writewidths.c new file mode 100644 index 00000000..2ba7d01b --- /dev/null +++ b/doc/export/writewidths.c @@ -0,0 +1,3 @@ +// 22 october 2017 +extern int realMain(void); +int main(void) { return realMain(); } diff --git a/doc/export/writewidths.out b/doc/export/writewidths.out new file mode 100644 index 00000000..83f6b413 --- /dev/null +++ b/doc/export/writewidths.out @@ -0,0 +1,11 @@ +unregistered OS2 0: float64as(-0.5, 0xbfe0000000000000) +unregistered OS2 1: float64as(-0.4, 0xbfd999999999999a) +unregistered OS2 2: float64as(-0.3, 0xbfd3333333333333) +unregistered OS2 3: float64as(-0.2, 0xbfc999999999999a) +unregistered OS2 4: float64as(-0.1, 0xbfb9999999999998) +unregistered OS2 5: float64as(0, 0x0000000000000000) +unregistered OS2 6: float64as(0.1, 0x3fb9999999999998) +unregistered OS2 7: float64as(0.2, 0x3fc9999999999998) +unregistered OS2 8: float64as(0.3, 0x3fd3333333333334) +unregistered OS2 9: float64as(0.4, 0x3fd999999999999a) +unregistered OS2 10: float64as(0.5, 0x3fe0000000000000) diff --git a/doc/export/writewidths.processed b/doc/export/writewidths.processed new file mode 100644 index 00000000..e0437d81 --- /dev/null +++ b/doc/export/writewidths.processed @@ -0,0 +1,11 @@ +-0.1 0xbfb9999999999998 unregistered OS2 4 +-0.2 0xbfc999999999999a unregistered OS2 3 +-0.3 0xbfd3333333333333 unregistered OS2 2 +-0.4 0xbfd999999999999a unregistered OS2 1 +-0.5 0xbfe0000000000000 unregistered OS2 0 +0 0x0000000000000000 unregistered OS2 5 +0.1 0x3fb9999999999998 unregistered OS2 6 +0.2 0x3fc9999999999998 unregistered OS2 7 +0.3 0x3fd3333333333334 unregistered OS2 8 +0.4 0x3fd999999999999a unregistered OS2 9 +0.5 0x3fe0000000000000 unregistered OS2 10 diff --git a/doc/export/writewidths.s b/doc/export/writewidths.s new file mode 100644 index 00000000..d10208d5 --- /dev/null +++ b/doc/export/writewidths.s @@ -0,0 +1,51 @@ +# 22 october 2017 +# clang -o writewidths writewidths.c writewidths.s -g -Wall -Wextra -pedantic -g +# thanks to: +# - http://www.idryman.org/blog/2014/12/02/writing-64-bit-assembly-on-mac-os-x/ +# - https://developer.apple.com/library/content/documentation/DeveloperTools/Reference/Assembler/060-i386_Addressing_Modes_and_Assembler_Instructions/i386_intructions.html#//apple_ref/doc/uid/TP30000825-TPXREF101 +# - https://stackoverflow.com/questions/46309041/trivial-macos-assembly-64-bit-program-has-incorrect-stack-alignment +# - https://www.google.com/search?q=macos+implement+main+in+assembly+-nasm&oq=macos+implement+main+in+assembly+-nasm&gs_l=psy-ab.3...12877.13839.0.13988.6.6.0.0.0.0.117.407.4j1.5.0....0...1.1.64.psy-ab..1.0.0....0.et6MkokjvwA +# - https://stackoverflow.com/questions/2529185/what-are-cfi-directives-in-gnu-assembler-gas-used-for + +.section __DATA,__data + +double10: + .quad 0x4024000000000000 +doubleNeg05: + .quad 0xbfe0000000000000 + +fmt: + .asciz "unregistered OS2 %ld:\tfloat64as(%g, 0x%016lx)\n" + +.section __TEXT,__text +.globl _realMain +_realMain: + pushq %rbp + movq %rsp, %rbp + addq $8, %rsp + + xorq %rcx, %rcx +loop: + pushq %rcx + # the code from core text + movzwl %cx, %ecx + xorps %xmm0, %xmm0 + cvtsi2sdl %ecx, %xmm0 + divsd double10(%rip), %xmm0 + addsd doubleNeg05(%rip), %xmm0 + # end core text code + popq %rcx + pushq %rcx + movd %xmm0, %rdx + movzwq %cx, %rsi + leaq fmt(%rip), %rdi + callq _printf + popq %rcx + incw %cx + cmpw $10, %cx + jbe loop + + xorq %rax, %rax + subq $8, %rsp + popq %rbp + ret diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3a9ec4c9..61ed7b82 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -30,9 +30,21 @@ _add_example(cpp-multithread if(NOT WIN32) target_link_libraries(cpp-multithread pthread) endif() +if(APPLE) + # since we use a deployment target of 10.8, the non-C++11-compliant libstdc++ is chosen by default; we need C++11 + # see issue #302 for more details + target_compile_options(cpp-multithread PRIVATE --stdlib=libc++) + target_link_libraries(cpp-multithread --stdlib=libc++) +endif() + +_add_example(drawtext + drawtext/main.c + ${_EXAMPLE_RESOURCES_RC} +) add_custom_target(examples DEPENDS controlgallery histogram - cpp-multithread) + cpp-multithread + drawtext) diff --git a/examples/drawtext/main.c b/examples/drawtext/main.c new file mode 100644 index 00000000..d94d2572 --- /dev/null +++ b/examples/drawtext/main.c @@ -0,0 +1,219 @@ +// 10 march 2018 +#include +#include +#include "../../ui.h" + +uiWindow *mainwin; +uiArea *area; +uiAreaHandler handler; +uiFontButton *fontButton; +uiCombobox *alignment; + +uiAttributedString *attrstr; + +static void appendWithAttribute(const char *what, uiAttribute *attr, uiAttribute *attr2) +{ + size_t start, end; + + start = uiAttributedStringLen(attrstr); + end = start + strlen(what); + uiAttributedStringAppendUnattributed(attrstr, what); + uiAttributedStringSetAttribute(attrstr, attr, start, end); + if (attr2 != NULL) + uiAttributedStringSetAttribute(attrstr, attr2, start, end); +} + +static void makeAttributedString(void) +{ + uiAttribute *attr, *attr2; + uiOpenTypeFeatures *otf; + + attrstr = uiNewAttributedString( + "Drawing strings with libui is done with the uiAttributedString and uiDrawTextLayout objects.\n" + "uiAttributedString lets you have a variety of attributes: "); + + attr = uiNewFamilyAttribute("Courier New"); + appendWithAttribute("font family", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewSizeAttribute(18); + appendWithAttribute("font size", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewWeightAttribute(uiTextWeightBold); + appendWithAttribute("font weight", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewItalicAttribute(uiTextItalicItalic); + appendWithAttribute("font italicness", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewStretchAttribute(uiTextStretchCondensed); + appendWithAttribute("font stretch", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewColorAttribute(0.75, 0.25, 0.5, 0.75); + appendWithAttribute("text color", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + attr = uiNewBackgroundAttribute(0.5, 0.5, 0.25, 0.5); + appendWithAttribute("text background color", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + + attr = uiNewUnderlineAttribute(uiUnderlineSingle); + appendWithAttribute("underline style", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, ", "); + + uiAttributedStringAppendUnattributed(attrstr, "and "); + attr = uiNewUnderlineAttribute(uiUnderlineDouble); + attr2 = uiNewUnderlineColorAttribute(uiUnderlineColorCustom, 1.0, 0.0, 0.5, 1.0); + appendWithAttribute("underline color", attr, attr2); + uiAttributedStringAppendUnattributed(attrstr, ". "); + + uiAttributedStringAppendUnattributed(attrstr, "Furthermore, there are attributes allowing for "); + attr = uiNewUnderlineAttribute(uiUnderlineSuggestion); + attr2 = uiNewUnderlineColorAttribute(uiUnderlineColorSpelling, 0, 0, 0, 0); + appendWithAttribute("special underlines for indicating spelling errors", attr, attr2); + uiAttributedStringAppendUnattributed(attrstr, " (and other types of errors) "); + + uiAttributedStringAppendUnattributed(attrstr, "and control over OpenType features such as ligatures (for instance, "); + otf = uiNewOpenTypeFeatures(); + uiOpenTypeFeaturesAdd(otf, 'l', 'i', 'g', 'a', 0); + attr = uiNewFeaturesAttribute(otf); + appendWithAttribute("afford", attr, NULL); + uiAttributedStringAppendUnattributed(attrstr, " vs. "); + uiOpenTypeFeaturesAdd(otf, 'l', 'i', 'g', 'a', 1); + attr = uiNewFeaturesAttribute(otf); + appendWithAttribute("afford", attr, NULL); + uiFreeOpenTypeFeatures(otf); + uiAttributedStringAppendUnattributed(attrstr, ").\n"); + + uiAttributedStringAppendUnattributed(attrstr, "Use the controls opposite to the text to control properties of the text."); +} + +static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p) +{ + uiDrawTextLayout *textLayout; + uiFontDescriptor defaultFont; + uiDrawTextLayoutParams params; + + params.String = attrstr; + uiFontButtonFont(fontButton, &defaultFont); + params.DefaultFont = &defaultFont; + params.Width = p->AreaWidth; + params.Align = (uiDrawTextAlign) uiComboboxSelected(alignment); + textLayout = uiDrawNewTextLayout(¶ms); + uiDrawText(p->Context, textLayout, 0, 0); + uiDrawFreeTextLayout(textLayout); + uiFreeFontButtonFont(&defaultFont); +} + +static void handlerMouseEvent(uiAreaHandler *a, uiArea *area, uiAreaMouseEvent *e) +{ + // do nothing +} + +static void handlerMouseCrossed(uiAreaHandler *ah, uiArea *a, int left) +{ + // do nothing +} + +static void handlerDragBroken(uiAreaHandler *ah, uiArea *a) +{ + // do nothing +} + +static int handlerKeyEvent(uiAreaHandler *ah, uiArea *a, uiAreaKeyEvent *e) +{ + // reject all keys + return 0; +} + +static void onFontChanged(uiFontButton *b, void *data) +{ + uiAreaQueueRedrawAll(area); +} + +static void onComboboxSelected(uiCombobox *b, void *data) +{ + uiAreaQueueRedrawAll(area); +} + +static int onClosing(uiWindow *w, void *data) +{ + uiControlDestroy(uiControl(mainwin)); + uiQuit(); + return 0; +} + +static int shouldQuit(void *data) +{ + uiControlDestroy(uiControl(mainwin)); + return 1; +} + +int main(void) +{ + uiInitOptions o; + const char *err; + uiBox *hbox, *vbox; + uiForm *form; + + handler.Draw = handlerDraw; + handler.MouseEvent = handlerMouseEvent; + handler.MouseCrossed = handlerMouseCrossed; + handler.DragBroken = handlerDragBroken; + handler.KeyEvent = handlerKeyEvent; + + memset(&o, 0, sizeof (uiInitOptions)); + err = uiInit(&o); + if (err != NULL) { + fprintf(stderr, "error initializing ui: %s\n", err); + uiFreeInitError(err); + return 1; + } + + uiOnShouldQuit(shouldQuit, NULL); + + makeAttributedString(); + + mainwin = uiNewWindow("libui Text-Drawing Example", 640, 480, 1); + uiWindowSetMargined(mainwin, 1); + uiWindowOnClosing(mainwin, onClosing, NULL); + + hbox = uiNewHorizontalBox(); + uiBoxSetPadded(hbox, 1); + uiWindowSetChild(mainwin, uiControl(hbox)); + + vbox = uiNewVerticalBox(); + uiBoxSetPadded(vbox, 1); + uiBoxAppend(hbox, uiControl(vbox), 0); + + fontButton = uiNewFontButton(); + uiFontButtonOnChanged(fontButton, onFontChanged, NULL); + uiBoxAppend(vbox, uiControl(fontButton), 0); + + form = uiNewForm(); + uiFormSetPadded(form, 1); + // TODO on OS X if this is set to 1 then the window can't resize; does the form not have the concept of stretchy trailing space? + uiBoxAppend(vbox, uiControl(form), 0); + + alignment = uiNewCombobox(); + // note that the items match with the values of the uiDrawTextAlign values + uiComboboxAppend(alignment, "Left"); + uiComboboxAppend(alignment, "Center"); + uiComboboxAppend(alignment, "Right"); + uiComboboxSetSelected(alignment, 0); // start with left alignment + uiComboboxOnSelected(alignment, onComboboxSelected, NULL); + uiFormAppend(form, "Alignment", uiControl(alignment), 0); + + area = uiNewArea(&handler); + uiBoxAppend(hbox, uiControl(area), 1); + + uiControlShow(uiControl(mainwin)); + uiMain(); + uiFreeAttributedString(attrstr); + uiUninit(); + return 0; +} diff --git a/stats.osxdrawtext b/stats.osxdrawtext new file mode 100644 index 00000000..15c9c6c5 --- /dev/null +++ b/stats.osxdrawtext @@ -0,0 +1,43 @@ +diff --git a/darwin/drawtext.m b/darwin/drawtext.m +index a84b68b..c95bbde 100644 +--- a/darwin/drawtext.m ++++ b/darwin/drawtext.m +@@ -108,7 +108,7 @@ static CFAttributedStringRef attrstrToCoreFoundation(uiAttributedString *s, uiDr + boundsNoLeading = CTLineGetBoundsWithOptions(line, kCTLineBoundsExcludeTypographicLeading); + + // this is equivalent to boundsNoLeading.size.height + boundsNoLeading.origin.y (manually verified) +- ascent = bounds.size.height + bounds.origin.y; ++if(i!=5) ascent = bounds.size.height + bounds.origin.y; + descent = -boundsNoLeading.origin.y; + // TODO does this preserve leading sign? + leading = -bounds.origin.y - descent; +@@ -119,11 +119,20 @@ static CFAttributedStringRef attrstrToCoreFoundation(uiAttributedString *s, uiDr + if (leading > 0) + leading = floor(leading + 0.5); + ++NSLog(@"line %d", (int)i); ++NSLog(@"ypos %g", ypos); ++if (i>0) { ++NSLog(@"expected Y: %g", metrics[i - 1].Y - metrics[i - 1].Height); ++} ++ + metrics[i].X = origins[i].x; + metrics[i].Y = origins[i].y - descent - leading; + metrics[i].Width = bounds.size.width; + metrics[i].Height = ascent + descent + leading; + ++NSLog(@"o %g a %g d %g l %g", origins[i].y, ascent, descent, leading); ++NSLog(@"actual Y: %g height: %g", metrics[i].Y, metrics[i].Height); ++ + metrics[i].BaselineY = origins[i].y; + metrics[i].Ascent = ascent; + metrics[i].Descent = descent; +@@ -148,7 +157,7 @@ static CFAttributedStringRef attrstrToCoreFoundation(uiAttributedString *s, uiDr + metrics[i].BaselineY = size.height - metrics[i].BaselineY; + // TODO also adjust by metrics[i].Height? + } +- ++NSLog(@"==="); + uiFree(origins); + return metrics; + } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b753a7d4..621b43e9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,9 +19,9 @@ _add_exec(tester page7a.c page7b.c page7c.c - page8.c - page9.c - page10.c +# page8.c +# page9.c +# page10.c page11.c page12.c page13.c diff --git a/test/drawtests.c b/test/drawtests.c index b6de753f..5c409294 100644 --- a/test/drawtests.c +++ b/test/drawtests.c @@ -4,6 +4,7 @@ // TODO // - test multiple clips // - test saving and restoring clips +// - copy tests from https://github.com/Microsoft/WinObjC struct drawtest { const char *name; diff --git a/test/main.c b/test/main.c index f33f30ab..c760f493 100644 --- a/test/main.c +++ b/test/main.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) page7 = makePage7(); uiTabAppend(innerTab, "Page 7", uiControl(page7)); - page8 = makePage8(); +/* page8 = makePage8(); uiTabAppend(innerTab, "Page 8", uiControl(page8)); page9 = makePage9(); @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) page10 = makePage10(); uiTabAppend(innerTab, "Page 10", uiControl(page10)); - +*/ innerTab = newTab(); uiTabAppend(outerTab, "Pages 11-15", uiControl(innerTab)); diff --git a/ui.h b/ui.h index 5852bf6d..03108a81 100644 --- a/ui.h +++ b/ui.h @@ -2,6 +2,11 @@ // TODO add a uiVerifyControlType() function that can be used by control implementations to verify controls +// TODOs +// - make getters that return whether something exists accept a NULL pointer to discard the value (and thus only return that the thing exists?) +// - const-correct everything +// - normalize documentation between typedefs and structs + #ifndef __LIBUI_UI_H__ #define __LIBUI_UI_H__ @@ -34,6 +39,12 @@ extern "C" { // TODO uiBool? +// uiForEach represents the return value from one of libui's various ForEach functions. +_UI_ENUM(uiForEach) { + uiForEachContinue, + uiForEachStop, +}; + typedef struct uiInitOptions uiInitOptions; struct uiInitOptions { @@ -475,90 +486,513 @@ _UI_EXTERN void uiDrawClip(uiDrawContext *c, uiDrawPath *path); _UI_EXTERN void uiDrawSave(uiDrawContext *c); _UI_EXTERN void uiDrawRestore(uiDrawContext *c); -// TODO manage the use of Text, Font, and TextFont, and of the uiDrawText prefix in general +// uiAttribute stores information about an attribute in a +// uiAttributedString. +// +// You do not create uiAttributes directly; instead, you create a +// uiAttribute of a given type using the specialized constructor +// functions. For every Unicode codepoint in the uiAttributedString, +// at most one value of each attribute type can be applied. +// +// uiAttributes are immutable and the uiAttributedString takes +// ownership of the uiAttribute object once assigned, copying its +// contents as necessary. +typedef struct uiAttribute uiAttribute; -///// TODO reconsider this -typedef struct uiDrawFontFamilies uiDrawFontFamilies; +// uiFreeAttribute() frees a uiAttribute. You generally do not need to +// call this yourself, as uiAttributedString does this for you. In fact, +// it is an error to call this function on a uiAttribute that has been +// given to a uiAttributedString. You can call this, however, if you +// created a uiAttribute that you aren't going to use later. +_UI_EXTERN void uiFreeAttribute(uiAttribute *a); -_UI_EXTERN uiDrawFontFamilies *uiDrawListFontFamilies(void); -_UI_EXTERN int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff); -_UI_EXTERN char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n); -_UI_EXTERN void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff); -///// END TODO - -typedef struct uiDrawTextLayout uiDrawTextLayout; -typedef struct uiDrawTextFont uiDrawTextFont; -typedef struct uiDrawTextFontDescriptor uiDrawTextFontDescriptor; -typedef struct uiDrawTextFontMetrics uiDrawTextFontMetrics; - -_UI_ENUM(uiDrawTextWeight) { - uiDrawTextWeightThin, - uiDrawTextWeightUltraLight, - uiDrawTextWeightLight, - uiDrawTextWeightBook, - uiDrawTextWeightNormal, - uiDrawTextWeightMedium, - uiDrawTextWeightSemiBold, - uiDrawTextWeightBold, - uiDrawTextWeightUltraBold, - uiDrawTextWeightHeavy, - uiDrawTextWeightUltraHeavy, +// uiAttributeType holds the possible uiAttribute types that may be +// returned by uiAttributeGetType(). Refer to the documentation for +// each type's constructor function for details on each type. +_UI_ENUM(uiAttributeType) { + uiAttributeTypeFamily, + uiAttributeTypeSize, + uiAttributeTypeWeight, + uiAttributeTypeItalic, + uiAttributeTypeStretch, + uiAttributeTypeColor, + uiAttributeTypeBackground, + uiAttributeTypeUnderline, + uiAttributeTypeUnderlineColor, + uiAttributeTypeFeatures, }; -_UI_ENUM(uiDrawTextItalic) { - uiDrawTextItalicNormal, - uiDrawTextItalicOblique, - uiDrawTextItalicItalic, +// uiAttributeGetType() returns the type of a. +// TODO I don't like this name +_UI_EXTERN uiAttributeType uiAttributeGetType(const uiAttribute *a); + +// uiNewFamilyAttribute() creates a new uiAttribute that changes the +// font family of the text it is applied to. family is copied; you do not +// need to keep it alive after uiNewFamilyAttribute() returns. Font +// family names are case-insensitive. +_UI_EXTERN uiAttribute *uiNewFamilyAttribute(const char *family); + +// uiAttributeFamily() returns the font family stored in a. The +// returned string is owned by a. It is an error to call this on a +// uiAttribute that does not hold a font family. +_UI_EXTERN const char *uiAttributeFamily(const uiAttribute *a); + +// uiNewSizeAttribute() creates a new uiAttribute that changes the +// size of the text it is applied to, in typographical points. +_UI_EXTERN uiAttribute *uiNewSizeAttribute(double size); + +// uiAttributeSize() returns the font size stored in a. It is an error to +// call this on a uiAttribute that does not hold a font size. +_UI_EXTERN double uiAttributeSize(const uiAttribute *a); + +// uiTextWeight represents possible text weights. These roughly +// map to the OSx2 text weight field of TrueType and OpenType +// fonts, or to CSS weight numbers. The named constants are +// nominal values; the actual values may vary by font and by OS, +// though this isn't particularly likely. Any value between +// uiTextWeightMinimum and uiDrawTextWeightMaximum, +// inclusive, is allowed. +// +// Note that due to restrictions in early versions of Windows, some +// fonts have "special" weights be exposed in many programs as +// separate font families. This is perhaps most notable with +// Arial Black. libui does not do this, even on Windows (because the +// DirectWrite API libui uses on Windows does not do this); to +// specify Arial Black, use family Arial and weight uiTextWeightBlack. +_UI_ENUM(uiTextWeight) { + uiTextWeightMinimum = 0, + uiTextWeightThin = 100, + uiTextWeightUltraLight = 200, + uiTextWeightLight = 300, + uiTextWeightBook = 350, + uiTextWeightNormal = 400, + uiTextWeightMedium = 500, + uiTextWeightSemiBold = 600, + uiTextWeightBold = 700, + uiTextWeightUltraBold = 800, + uiTextWeightHeavy = 900, + uiTextWeightUltraHeavy = 950, + uiTextWeightMaximum = 1000, }; -_UI_ENUM(uiDrawTextStretch) { - uiDrawTextStretchUltraCondensed, - uiDrawTextStretchExtraCondensed, - uiDrawTextStretchCondensed, - uiDrawTextStretchSemiCondensed, - uiDrawTextStretchNormal, - uiDrawTextStretchSemiExpanded, - uiDrawTextStretchExpanded, - uiDrawTextStretchExtraExpanded, - uiDrawTextStretchUltraExpanded, +// uiNewWeightAttribute() creates a new uiAttribute that changes the +// weight of the text it is applied to. It is an error to specify a weight +// outside the range [uiTextWeightMinimum, +// uiTextWeightMaximum]. +_UI_EXTERN uiAttribute *uiNewWeightAttribute(uiTextWeight weight); + +// uiAttributeWeight() returns the font weight stored in a. It is an error +// to call this on a uiAttribute that does not hold a font weight. +_UI_EXTERN uiTextWeight uiAttributeWeight(const uiAttribute *a); + +// uiTextItalic represents possible italic modes for a font. Italic +// represents "true" italics where the slanted glyphs have custom +// shapes, whereas oblique represents italics that are merely slanted +// versions of the normal glyphs. Most fonts usually have one or the +// other. +_UI_ENUM(uiTextItalic) { + uiTextItalicNormal, + uiTextItalicOblique, + uiTextItalicItalic, }; -struct uiDrawTextFontDescriptor { - const char *Family; +// uiNewItalicAttribute() creates a new uiAttribute that changes the +// italic mode of the text it is applied to. It is an error to specify an +// italic mode not specified in uiTextItalic. +_UI_EXTERN uiAttribute *uiNewItalicAttribute(uiTextItalic italic); + +// uiAttributeItalic() returns the font italic mode stored in a. It is an +// error to call this on a uiAttribute that does not hold a font italic +// mode. +_UI_EXTERN uiTextItalic uiAttributeItalic(const uiAttribute *a); + +// uiTextStretch represents possible stretches (also called "widths") +// of a font. +// +// Note that due to restrictions in early versions of Windows, some +// fonts have "special" stretches be exposed in many programs as +// separate font families. This is perhaps most notable with +// Arial Condensed. libui does not do this, even on Windows (because +// the DirectWrite API libui uses on Windows does not do this); to +// specify Arial Condensed, use family Arial and stretch +// uiTextStretchCondensed. +_UI_ENUM(uiTextStretch) { + uiTextStretchUltraCondensed, + uiTextStretchExtraCondensed, + uiTextStretchCondensed, + uiTextStretchSemiCondensed, + uiTextStretchNormal, + uiTextStretchSemiExpanded, + uiTextStretchExpanded, + uiTextStretchExtraExpanded, + uiTextStretchUltraExpanded, +}; + +// uiNewStretchAttribute() creates a new uiAttribute that changes the +// stretch of the text it is applied to. It is an error to specify a strech +// not specified in uiTextStretch. +_UI_EXTERN uiAttribute *uiNewStretchAttribute(uiTextStretch stretch); + +// uiAttributeStretch() returns the font stretch stored in a. It is an +// error to call this on a uiAttribute that does not hold a font stretch. +_UI_EXTERN uiTextStretch uiAttributeStretch(const uiAttribute *a); + +// uiNewColorAttribute() creates a new uiAttribute that changes the +// color of the text it is applied to. It is an error to specify an invalid +// color. +_UI_EXTERN uiAttribute *uiNewColorAttribute(double r, double g, double b, double a); + +// uiAttributeColor() returns the text color stored in a. It is an +// error to call this on a uiAttribute that does not hold a text color. +_UI_EXTERN void uiAttributeColor(const uiAttribute *a, double *r, double *g, double *b, double *alpha); + +// uiNewBackgroundAttribute() creates a new uiAttribute that +// changes the background color of the text it is applied to. It is an +// error to specify an invalid color. +_UI_EXTERN uiAttribute *uiNewBackgroundAttribute(double r, double g, double b, double a); + +// TODO reuse uiAttributeColor() for background colors, or make a new function... + +// uiUnderline specifies a type of underline to use on text. +_UI_ENUM(uiUnderline) { + uiUnderlineNone, + uiUnderlineSingle, + uiUnderlineDouble, + uiUnderlineSuggestion, // wavy or dotted underlines used for spelling/grammar checkers +}; + +// uiNewUnderlineAttribute() creates a new uiAttribute that changes +// the type of underline on the text it is applied to. It is an error to +// specify an underline type not specified in uiUnderline. +_UI_EXTERN uiAttribute *uiNewUnderlineAttribute(uiUnderline u); + +// uiAttributeUnderline() returns the underline type stored in a. It is +// an error to call this on a uiAttribute that does not hold an underline +// style. +_UI_EXTERN uiUnderline uiAttributeUnderline(const uiAttribute *a); + +// uiUnderlineColor specifies the color of any underline on the text it +// is applied to, regardless of the type of underline. In addition to +// being able to specify a custom color, you can explicitly specify +// platform-specific colors for suggestion underlines; to use them +// correctly, pair them with uiUnderlineSuggestion (though they can +// be used on other types of underline as well). +// +// If an underline type is applied but no underline color is +// specified, the text color is used instead. If an underline color +// is specified without an underline type, the underline color +// attribute is ignored, but not removed from the uiAttributedString. +_UI_ENUM(uiUnderlineColor) { + uiUnderlineColorCustom, + uiUnderlineColorSpelling, + uiUnderlineColorGrammar, + uiUnderlineColorAuxiliary, // for instance, the color used by smart replacements on macOS or in Microsoft Office +}; + +// uiNewUnderlineColorAttribute() creates a new uiAttribute that +// changes the color of the underline on the text it is applied to. +// It is an error to specify an underline color not specified in +// uiUnderlineColor. +// +// If the specified color type is uiUnderlineColorCustom, it is an +// error to specify an invalid color value. Otherwise, the color values +// are ignored and should be specified as zero. +_UI_EXTERN uiAttribute *uiNewUnderlineColorAttribute(uiUnderlineColor u, double r, double g, double b, double a); + +// uiAttributeUnderlineColor() returns the underline color stored in +// a. It is an error to call this on a uiAttribute that does not hold an +// underline color. +_UI_EXTERN void uiAttributeUnderlineColor(const uiAttribute *a, uiUnderlineColor *u, double *r, double *g, double *b, double *alpha); + +// uiOpenTypeFeatures represents a set of OpenType feature +// tag-value pairs, for applying OpenType features to text. +// OpenType feature tags are four-character codes defined by +// OpenType that cover things from design features like small +// caps and swashes to language-specific glyph shapes and +// beyond. Each tag may only appear once in any given +// uiOpenTypeFeatures instance. Each value is a 32-bit integer, +// often used as a Boolean flag, but sometimes as an index to choose +// a glyph shape to use. +// +// If a font does not support a certain feature, that feature will be +// ignored. (TODO verify this on all OSs) +// +// See the OpenType specification at +// https://www.microsoft.com/typography/otspec/featuretags.htm +// for the complete list of available features, information on specific +// features, and how to use them. +// TODO invalid features +typedef struct uiOpenTypeFeatures uiOpenTypeFeatures; + +// uiOpenTypeFeaturesForEachFunc is the type of the function +// invoked by uiOpenTypeFeaturesForEach() for every OpenType +// feature in otf. Refer to that function's documentation for more +// details. +typedef uiForEach (*uiOpenTypeFeaturesForEachFunc)(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data); + +// @role uiOpenTypeFeatures constructor +// uiNewOpenTypeFeatures() returns a new uiOpenTypeFeatures +// instance, with no tags yet added. +_UI_EXTERN uiOpenTypeFeatures *uiNewOpenTypeFeatures(void); + +// @role uiOpenTypeFeatures destructor +// uiFreeOpenTypeFeatures() frees otf. +_UI_EXTERN void uiFreeOpenTypeFeatures(uiOpenTypeFeatures *otf); + +// uiOpenTypeFeaturesClone() makes a copy of otf and returns it. +// Changing one will not affect the other. +_UI_EXTERN uiOpenTypeFeatures *uiOpenTypeFeaturesClone(const uiOpenTypeFeatures *otf); + +// uiOpenTypeFeaturesAdd() adds the given feature tag and value +// to otf. The feature tag is specified by a, b, c, and d. If there is +// already a value associated with the specified tag in otf, the old +// value is removed. +_UI_EXTERN void uiOpenTypeFeaturesAdd(uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value); + +// uiOpenTypeFeaturesRemove() removes the given feature tag +// and value from otf. If the tag is not present in otf, +// uiOpenTypeFeaturesRemove() does nothing. +_UI_EXTERN void uiOpenTypeFeaturesRemove(uiOpenTypeFeatures *otf, char a, char b, char c, char d); + +// uiOpenTypeFeaturesGet() determines whether the given feature +// tag is present in otf. If it is, *value is set to the tag's value and +// nonzero is returned. Otherwise, zero is returned. +// +// Note that if uiOpenTypeFeaturesGet() returns zero, value isn't +// changed. This is important: if a feature is not present in a +// uiOpenTypeFeatures, the feature is NOT treated as if its +// value was zero anyway. Script-specific font shaping rules and +// font-specific feature settings may use a different default value +// for a feature. You should likewise not treat a missing feature as +// having a value of zero either. Instead, a missing feature should +// be treated as having some unspecified default value. +_UI_EXTERN int uiOpenTypeFeaturesGet(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t *value); + +// uiOpenTypeFeaturesForEach() executes f for every tag-value +// pair in otf. The enumeration order is unspecified. You cannot +// modify otf while uiOpenTypeFeaturesForEach() is running. +_UI_EXTERN void uiOpenTypeFeaturesForEach(const uiOpenTypeFeatures *otf, uiOpenTypeFeaturesForEachFunc f, void *data); + +// uiNewFeaturesAttribute() creates a new uiAttribute that changes +// the font family of the text it is applied to. otf is copied; you may +// free it after uiNewFeaturesAttribute() returns. +_UI_EXTERN uiAttribute *uiNewFeaturesAttribute(const uiOpenTypeFeatures *otf); + +// uiAttributeFeatures() returns the OpenType features stored in a. +// The returned uiOpenTypeFeatures object is owned by a. It is an +// error to call this on a uiAttribute that does not hold OpenType +// features. +_UI_EXTERN const uiOpenTypeFeatures *uiAttributeFeatures(const uiAttribute *a); + +// uiAttributedString represents a string of UTF-8 text that can +// optionally be embellished with formatting attributes. libui +// provides the list of formatting attributes, which cover common +// formatting traits like boldface and color as well as advanced +// typographical features provided by OpenType like superscripts +// and small caps. These attributes can be combined in a variety of +// ways. +// +// Attributes are applied to runs of Unicode codepoints in the string. +// Zero-length runs are elided. Consecutive runs that have the same +// attribute type and value are merged. Each attribute is independent +// of each other attribute; overlapping attributes of different types +// do not split each other apart, but different values of the same +// attribute type do. +// +// The empty string can also be represented by uiAttributedString, +// but because of the no-zero-length-attribute rule, it will not have +// attributes. +// +// A uiAttributedString takes ownership of all attributes given to +// it, as it may need to duplicate or delete uiAttribute objects at +// any time. By extension, when you free a uiAttributedString, +// all uiAttributes within will also be freed. Each method will +// describe its own rules in more details. +// +// In addition, uiAttributedString provides facilities for moving +// between grapheme clusters, which represent a character +// from the point of view of the end user. The cursor of a text editor +// is always placed on a grapheme boundary, so you can use these +// features to move the cursor left or right by one "character". +// TODO does uiAttributedString itself need this +// +// uiAttributedString does not provide enough information to be able +// to draw itself onto a uiDrawContext or respond to user actions. +// In order to do that, you'll need to use a uiDrawTextLayout, which +// is built from the combination of a uiAttributedString and a set of +// layout-specific properties. +typedef struct uiAttributedString uiAttributedString; + +// uiAttributedStringForEachAttributeFunc is the type of the function +// invoked by uiAttributedStringForEachAttribute() for every +// attribute in s. Refer to that function's documentation for more +// details. +typedef uiForEach (*uiAttributedStringForEachAttributeFunc)(const uiAttributedString *s, const uiAttribute *a, size_t start, size_t end, void *data); + +// @role uiAttributedString constructor +// uiNewAttributedString() creates a new uiAttributedString from +// initialString. The string will be entirely unattributed. +_UI_EXTERN uiAttributedString *uiNewAttributedString(const char *initialString); + +// @role uiAttributedString destructor +// uiFreeAttributedString() destroys the uiAttributedString s. +// It will also free all uiAttributes within. +_UI_EXTERN void uiFreeAttributedString(uiAttributedString *s); + +// uiAttributedStringString() returns the textual content of s as a +// '\0'-terminated UTF-8 string. The returned pointer is valid until +// the next change to the textual content of s. +_UI_EXTERN const char *uiAttributedStringString(const uiAttributedString *s); + +// uiAttributedStringLength() returns the number of UTF-8 bytes in +// the textual content of s, excluding the terminating '\0'. +_UI_EXTERN size_t uiAttributedStringLen(const uiAttributedString *s); + +// uiAttributedStringAppendUnattributed() adds the '\0'-terminated +// UTF-8 string str to the end of s. The new substring will be +// unattributed. +_UI_EXTERN void uiAttributedStringAppendUnattributed(uiAttributedString *s, const char *str); + +// uiAttributedStringInsertAtUnattributed() adds the '\0'-terminated +// UTF-8 string str to s at the byte position specified by at. The new +// substring will be unattributed; existing attributes will be moved +// along with their text. +_UI_EXTERN void uiAttributedStringInsertAtUnattributed(uiAttributedString *s, const char *str, size_t at); + +// TODO add the Append and InsertAtExtendingAttributes functions +// TODO and add functions that take a string + length + +// uiAttributedStringDelete() deletes the characters and attributes of +// s in the byte range [start, end). +_UI_EXTERN void uiAttributedStringDelete(uiAttributedString *s, size_t start, size_t end); + +// TODO add a function to uiAttributedString to get an attribute's value at a specific index or in a specific range, so we can edit + +// uiAttributedStringSetAttribute() sets a in the byte range [start, end) +// of s. Any existing attributes in that byte range of the same type are +// removed. s takes ownership of a; you should not use it after +// uiAttributedStringSetAttribute() returns. +_UI_EXTERN void uiAttributedStringSetAttribute(uiAttributedString *s, uiAttribute *a, size_t start, size_t end); + +// uiAttributedStringForEachAttribute() enumerates all the +// uiAttributes in s. It is an error to modify s in f. Within f, s still +// owns the attribute; you can neither free it nor save it for later +// use. +// TODO reword the above for consistency (TODO and find out what I meant by that) +// TODO define an enumeration order (or mark it as undefined); also define how consecutive runs of identical attributes are handled here and sync with the definition of uiAttributedString itself +_UI_EXTERN void uiAttributedStringForEachAttribute(const uiAttributedString *s, uiAttributedStringForEachAttributeFunc f, void *data); + +// TODO const correct this somehow (the implementation needs to mutate the structure) +_UI_EXTERN size_t uiAttributedStringNumGraphemes(uiAttributedString *s); + +// TODO const correct this somehow (the implementation needs to mutate the structure) +_UI_EXTERN size_t uiAttributedStringByteIndexToGrapheme(uiAttributedString *s, size_t pos); + +// TODO const correct this somehow (the implementation needs to mutate the structure) +_UI_EXTERN size_t uiAttributedStringGraphemeToByteIndex(uiAttributedString *s, size_t pos); + +// uiFontDescriptor provides a complete description of a font where +// one is needed. Currently, this means as the default font of a +// uiDrawTextLayout and as the data returned by uiFontButton. +// All the members operate like the respective uiAttributes. +typedef struct uiFontDescriptor uiFontDescriptor; + +struct uiFontDescriptor { + // TODO const-correct this or figure out how to deal with this when getting a value + char *Family; double Size; - uiDrawTextWeight Weight; - uiDrawTextItalic Italic; - uiDrawTextStretch Stretch; + uiTextWeight Weight; + uiTextItalic Italic; + uiTextStretch Stretch; }; -struct uiDrawTextFontMetrics { - double Ascent; - double Descent; - double Leading; - // TODO do these two mean the same across all platforms? - double UnderlinePos; - double UnderlineThickness; +// uiDrawTextLayout is a concrete representation of a +// uiAttributedString that can be displayed in a uiDrawContext. +// It includes information important for the drawing of a block of +// text, including the bounding box to wrap the text within, the +// alignment of lines of text within that box, areas to mark as +// being selected, and other things. +// +// Unlike uiAttributedString, the content of a uiDrawTextLayout is +// immutable once it has been created. +// +// TODO talk about OS-specific differences with text drawing that libui can't account for... +typedef struct uiDrawTextLayout uiDrawTextLayout; + +// uiDrawTextAlign specifies the alignment of lines of text in a +// uiDrawTextLayout. +// TODO should this really have Draw in the name? +_UI_ENUM(uiDrawTextAlign) { + uiDrawTextAlignLeft, + uiDrawTextAlignCenter, + uiDrawTextAlignRight, }; -_UI_EXTERN uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc); -_UI_EXTERN void uiDrawFreeTextFont(uiDrawTextFont *font); -_UI_EXTERN uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font); -_UI_EXTERN void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc); -// TODO make copy with given attributes methods? -// TODO yuck this name -_UI_EXTERN void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics); +// uiDrawTextLayoutParams describes a uiDrawTextLayout. +// DefaultFont is used to render any text that is not attributed +// sufficiently in String. Width determines the width of the bounding +// box of the text; the height is determined automatically. +typedef struct uiDrawTextLayoutParams uiDrawTextLayoutParams; -// TODO initial line spacing? and what about leading? -_UI_EXTERN uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width); -_UI_EXTERN void uiDrawFreeTextLayout(uiDrawTextLayout *layout); -// TODO get width -_UI_EXTERN void uiDrawTextLayoutSetWidth(uiDrawTextLayout *layout, double width); -_UI_EXTERN void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height); +// TODO const-correct this somehow +struct uiDrawTextLayoutParams { + uiAttributedString *String; + uiFontDescriptor *DefaultFont; + double Width; + uiDrawTextAlign Align; +}; -// and the attributes that you can set on a text layout -_UI_EXTERN void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a); +// @role uiDrawTextLayout constructor +// uiDrawNewTextLayout() creates a new uiDrawTextLayout from +// the given parameters. +// +// TODO +// - allow creating a layout out of a substring +// - allow marking compositon strings +// - allow marking selections, even after creation +// - add the following functions: +// - uiDrawTextLayoutHeightForWidth() (returns the height that a layout would need to be to display the entire string at a given width) +// - uiDrawTextLayoutRangeForSize() (returns what substring would fit in a given size) +// - uiDrawTextLayoutNewWithHeight() (limits amount of string used by the height) +// - some function to fix up a range (for text editing) +_UI_EXTERN uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *params); -_UI_EXTERN void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout); +// @role uiDrawFreeTextLayout destructor +// uiDrawFreeTextLayout() frees tl. The underlying +// uiAttributedString is not freed. +_UI_EXTERN void uiDrawFreeTextLayout(uiDrawTextLayout *tl); + +// uiDrawText() draws tl in c with the top-left point of tl at (x, y). +_UI_EXTERN void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y); + +// uiDrawTextLayoutExtents() returns the width and height of tl +// in width and height. The returned width may be smaller than +// the width passed into uiDrawNewTextLayout() depending on +// how the text in tl is wrapped. Therefore, you can use this +// function to get the actual size of the text layout. +_UI_EXTERN void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height); + +// TODO metrics functions + +// TODO number of lines visible for clipping rect, range visible for clipping rect? + +// uiFontButton is a button that allows users to choose a font when they click on it. +typedef struct uiFontButton uiFontButton; +#define uiFontButton(this) ((uiFontButton *) (this)) +// uiFontButtonFont() returns the font currently selected in the uiFontButton in desc. +// uiFontButtonFont() allocates resources in desc; when you are done with the font, call uiFreeFontButtonFont() to release them. +// uiFontButtonFont() does not allocate desc itself; you must do so. +// TODO have a function that sets an entire font descriptor to a range in a uiAttributedString at once, for SetFont? +_UI_EXTERN void uiFontButtonFont(uiFontButton *b, uiFontDescriptor *desc); +// TOOD SetFont, mechanics +// uiFontButtonOnChanged() sets the function that is called when the font in the uiFontButton is changed. +_UI_EXTERN void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data); +// uiNewFontButton() creates a new uiFontButton. The default font selected into the uiFontButton is OS-defined. +_UI_EXTERN uiFontButton *uiNewFontButton(void); +// uiFreeFontButtonFont() frees resources allocated in desc by uiFontButtonFont(). +// After calling uiFreeFontButtonFont(), the contents of desc should be assumed to be undefined (though since you allocate desc itself, you can safely reuse desc for other font descriptors). +// Calling uiFreeFontButtonFont() on a uiFontDescriptor not returned by uiFontButtonFont() results in undefined behavior. +_UI_EXTERN void uiFreeFontButtonFont(uiFontDescriptor *desc); _UI_ENUM(uiModifiers) { uiModifierCtrl = 1 << 0, @@ -639,14 +1073,6 @@ struct uiAreaKeyEvent { int Up; }; -typedef struct uiFontButton uiFontButton; -#define uiFontButton(this) ((uiFontButton *) (this)) -// TODO document this returns a new font -_UI_EXTERN uiDrawTextFont *uiFontButtonFont(uiFontButton *b); -// TOOD SetFont, mechanics -_UI_EXTERN void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data); -_UI_EXTERN uiFontButton *uiNewFontButton(void); - typedef struct uiColorButton uiColorButton; #define uiColorButton(this) ((uiColorButton *) (this)) _UI_EXTERN void uiColorButtonColor(uiColorButton *b, double *r, double *g, double *bl, double *a); diff --git a/ui_unix.h b/ui_unix.h index 5a91257b..ed019260 100644 --- a/ui_unix.h +++ b/ui_unix.h @@ -16,6 +16,7 @@ struct uiUnixControl { uiControl c; uiControl *parent; gboolean addedBefore; + gboolean explicitlyHidden; void (*SetContainer)(uiUnixControl *, GtkContainer *, gboolean); }; #define uiUnixControl(this) ((uiUnixControl *) (this)) @@ -58,11 +59,13 @@ _UI_EXTERN void uiUnixControlSetContainer(uiUnixControl *, GtkContainer *, gbool #define uiUnixControlDefaultShow(type) \ static void type ## Show(uiControl *c) \ { \ + /*TODO part of massive hack about hidden before*/uiUnixControl(c)->explicitlyHidden=FALSE; \ gtk_widget_show(type(c)->widget); \ } #define uiUnixControlDefaultHide(type) \ static void type ## Hide(uiControl *c) \ { \ + /*TODO part of massive hack about hidden before*/uiUnixControl(c)->explicitlyHidden=TRUE; \ gtk_widget_hide(type(c)->widget); \ } #define uiUnixControlDefaultEnabled(type) \ @@ -86,7 +89,8 @@ _UI_EXTERN void uiUnixControlSetContainer(uiUnixControl *, GtkContainer *, gbool { \ if (!uiUnixControl(c)->addedBefore) { \ g_object_ref_sink(type(c)->widget); /* our own reference, which we release in Destroy() */ \ - gtk_widget_show(type(c)->widget); \ + /* massive hack notes: without any of this, nothing gets shown when we show a window; without the if, all things get shown even if some were explicitly hidden (TODO why don't we just show everything except windows on create? */ \ + /*TODO*/if(!uiUnixControl(c)->explicitlyHidden) gtk_widget_show(type(c)->widget); \ uiUnixControl(c)->addedBefore = TRUE; \ } \ if (remove) \ diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt index e967f29a..b9a5bf21 100644 --- a/unix/CMakeLists.txt +++ b/unix/CMakeLists.txt @@ -6,6 +6,7 @@ pkg_check_modules(GTK REQUIRED gtk+-3.0) list(APPEND _LIBUI_SOURCES unix/alloc.c unix/area.c + unix/attrstr.c unix/box.c unix/button.c unix/cellrendererbutton.c @@ -23,6 +24,7 @@ list(APPEND _LIBUI_SOURCES unix/editablecombo.c unix/entry.c unix/fontbutton.c + unix/fontmatch.c unix/form.c unix/future.c unix/graphemes.c @@ -33,6 +35,7 @@ list(APPEND _LIBUI_SOURCES unix/main.c unix/menu.c unix/multilineentry.c + unix/opentype.c unix/progressbar.c unix/radiobuttons.c unix/separator.c @@ -56,6 +59,7 @@ set(_LIBUINAME libui PARENT_SCOPE) if(NOT BUILD_SHARED_LIBS) set(_LIBUINAME libui-temporary PARENT_SCOPE) endif() +# TODO remove all these temporary files after linking the final archive file macro(_handle_static) set_target_properties(${_LIBUINAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}") diff --git a/unix/alloc.c b/unix/alloc.c index 2561efa6..2fdd2052 100644 --- a/unix/alloc.c +++ b/unix/alloc.c @@ -39,11 +39,11 @@ void uninitAlloc(void) return; } g_ptr_array_foreach(allocations, uninitComplain, &str); - userbug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", str); + uiprivUserBug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", str); g_free(str); } -void *uiAlloc(size_t size, const char *type) +void *uiprivAlloc(size_t size, const char *type) { void *out; @@ -54,31 +54,31 @@ void *uiAlloc(size_t size, const char *type) return DATA(out); } -void *uiRealloc(void *p, size_t new, const char *type) +void *uiprivRealloc(void *p, size_t new, const char *type) { void *out; size_t *s; if (p == NULL) - return uiAlloc(new, type); + return uiprivAlloc(new, type); p = BASE(p); out = g_realloc(p, EXTRA + new); s = SIZE(out); - if (new <= *s) + if (new > *s) memset(((uint8_t *) DATA(out)) + *s, 0, new - *s); *s = new; if (g_ptr_array_remove(allocations, p) == FALSE) - implbug("%p not found in allocations array in uiRealloc()", p); + uiprivImplBug("%p not found in allocations array in uiprivRealloc()", p); g_ptr_array_add(allocations, out); return DATA(out); } -void uiFree(void *p) +void uiprivFree(void *p) { if (p == NULL) - implbug("attempt to uiFree(NULL)"); + uiprivImplBug("attempt to uiprivFree(NULL)"); p = BASE(p); g_free(p); if (g_ptr_array_remove(allocations, p) == FALSE) - implbug("%p not found in allocations array in uiFree()", p); + uiprivImplBug("%p not found in allocations array in uiprivFree()", p); } diff --git a/unix/area.c b/unix/area.c index c46447cc..cba1f5e7 100644 --- a/unix/area.c +++ b/unix/area.c @@ -19,7 +19,7 @@ struct areaWidget { // construct-only parameters aare not set until after the init() function has returned // we need this particular object available during init(), so put it here instead of in uiArea // keep a pointer in uiArea for convenience, though - clickCounter cc; + uiprivClickCounter cc; }; struct areaWidgetClass { @@ -45,7 +45,7 @@ struct uiArea { int scrollHeight; // note that this is a pointer; see above - clickCounter *cc; + uiprivClickCounter *cc; // for user window drags GdkEventButton *dragevent; @@ -68,7 +68,7 @@ static void areaWidget_init(areaWidget *aw) gtk_widget_set_can_focus(GTK_WIDGET(aw), TRUE); - clickCounterReset(&(aw->cc)); + uiprivClickCounterReset(&(aw->cc)); } static void areaWidget_dispose(GObject *obj) @@ -92,6 +92,9 @@ static void areaWidget_size_allocate(GtkWidget *w, GtkAllocation *allocation) if (!a->scrolling) // we must redraw everything on resize because Windows requires it + // TODO https://developer.gnome.org/gtk3/3.10/GtkWidget.html#gtk-widget-set-redraw-on-allocate ? + // TODO drop this rule; it was stupid and documenting this was stupid — let platforms where it matters do it on their own + // TODO or do we not, for parity of performance? gtk_widget_queue_resize(w); } @@ -119,7 +122,8 @@ static gboolean areaWidget_draw(GtkWidget *w, cairo_t *cr) uiAreaDrawParams dp; double clipX0, clipY0, clipX1, clipY1; - dp.Context = newContext(cr); + dp.Context = newContext(cr, + gtk_widget_get_style_context(a->widget)); loadAreaSize(a, &(dp.AreaWidth), &(dp.AreaHeight)); @@ -257,7 +261,7 @@ static gboolean areaWidget_button_press_event(GtkWidget *w, GdkEventButton *e) // e->time is guint32 // e->x and e->y are floating-point; just make them 32-bit integers // maxTime and maxDistance... are gint, which *should* fit, hopefully... - me.Count = clickCounterClick(a->cc, me.Down, + me.Count = uiprivClickCounterClick(a->cc, me.Down, e->x, e->y, e->time, maxTime, maxDistance, maxDistance); @@ -305,7 +309,7 @@ static gboolean onCrossing(areaWidget *aw, int left) uiArea *a = aw->a; (*(a->ah->MouseCrossed))(a->ah, a, left); - clickCounterReset(a->cc); + uiprivClickCounterReset(a->cc); return GDK_EVENT_PROPAGATE; } @@ -407,7 +411,7 @@ static int areaKeyEvent(uiArea *a, int up, GdkEventKey *e) goto keyFound; } - if (fromScancode(e->hardware_keycode - 8, &ke)) + if (uiprivFromScancode(e->hardware_keycode - 8, &ke)) goto keyFound; // no supported key found; treat as unhandled @@ -495,7 +499,7 @@ uiUnixControlAllDefaults(uiArea) void uiAreaSetSize(uiArea *a, int width, int height) { if (!a->scrolling) - userbug("You cannot call uiAreaSetSize() on a non-scrolling uiArea. (area: %p)", a); + uiprivUserBug("You cannot call uiAreaSetSize() on a non-scrolling uiArea. (area: %p)", a); a->scrollWidth = width; a->scrollHeight = height; gtk_widget_queue_resize(a->areaWidget); @@ -517,7 +521,7 @@ void uiAreaBeginUserWindowMove(uiArea *a) GtkWidget *toplevel; if (a->dragevent == NULL) - userbug("cannot call uiAreaBeginUserWindowMove() outside of a Mouse() with Down != 0"); + uiprivUserBug("cannot call uiAreaBeginUserWindowMove() outside of a Mouse() with Down != 0"); // TODO don't we have a libui function for this? did I scrap it? // TODO widget or areaWidget? toplevel = gtk_widget_get_toplevel(a->widget); @@ -557,7 +561,7 @@ void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge) GtkWidget *toplevel; if (a->dragevent == NULL) - userbug("cannot call uiAreaBeginUserWindowResize() outside of a Mouse() with Down != 0"); + uiprivUserBug("cannot call uiAreaBeginUserWindowResize() outside of a Mouse() with Down != 0"); // TODO don't we have a libui function for this? did I scrap it? // TODO widget or areaWidget? toplevel = gtk_widget_get_toplevel(a->widget); diff --git a/unix/attrstr.c b/unix/attrstr.c new file mode 100644 index 00000000..a378e452 --- /dev/null +++ b/unix/attrstr.c @@ -0,0 +1,145 @@ +// 12 february 2017 +#include "uipriv_unix.h" +#include "attrstr.h" + +// TODO pango alpha attributes turn 0 into 65535 :| + +// TODO make this name less generic? +struct foreachParams { + PangoAttrList *attrs; +}; + +static void addattr(struct foreachParams *p, size_t start, size_t end, PangoAttribute *attr) +{ + if (attr == NULL) // in case of a future attribute + return; + attr->start_index = start; + attr->end_index = end; + pango_attr_list_insert(p->attrs, attr); +} + +static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute *attr, size_t start, size_t end, void *data) +{ + struct foreachParams *p = (struct foreachParams *) data; + double r, g, b, a; + PangoUnderline underline; + uiUnderlineColor colorType; + const uiOpenTypeFeatures *features; + GString *featurestr; + + switch (uiAttributeGetType(attr)) { + case uiAttributeTypeFamily: + addattr(p, start, end, + pango_attr_family_new(uiAttributeFamily(attr))); + break; + case uiAttributeTypeSize: + addattr(p, start, end, + pango_attr_size_new(cairoToPango(uiAttributeSize(attr)))); + break; + case uiAttributeTypeWeight: + // TODO reverse the misalignment from drawtext.c if it is corrected + addattr(p, start, end, + pango_attr_weight_new(uiprivWeightToPangoWeight(uiAttributeWeight(attr)))); + break; + case uiAttributeTypeItalic: + addattr(p, start, end, + pango_attr_style_new(uiprivItalicToPangoStyle(uiAttributeItalic(attr)))); + break; + case uiAttributeTypeStretch: + addattr(p, start, end, + pango_attr_stretch_new(uiprivStretchToPangoStretch(uiAttributeStretch(attr)))); + break; + case uiAttributeTypeColor: + uiAttributeColor(attr, &r, &g, &b, &a); + addattr(p, start, end, + pango_attr_foreground_new( + (guint16) (r * 65535.0), + (guint16) (g * 65535.0), + (guint16) (b * 65535.0))); + addattr(p, start, end, + FUTURE_pango_attr_foreground_alpha_new( + (guint16) (a * 65535.0))); + break; + case uiAttributeTypeBackground: + // TODO make sure this works properly with line paragraph spacings (after figuring out what that means, of course) + uiAttributeColor(attr, &r, &g, &b, &a); + addattr(p, start, end, + pango_attr_background_new( + (guint16) (r * 65535.0), + (guint16) (g * 65535.0), + (guint16) (b * 65535.0))); + addattr(p, start, end, + FUTURE_pango_attr_background_alpha_new( + (guint16) (a * 65535.0))); + break; + case uiAttributeTypeUnderline: + switch (uiAttributeUnderline(attr)) { + case uiUnderlineNone: + underline = PANGO_UNDERLINE_NONE; + break; + case uiUnderlineSingle: + underline = PANGO_UNDERLINE_SINGLE; + break; + case uiUnderlineDouble: + underline = PANGO_UNDERLINE_DOUBLE; + break; + case uiUnderlineSuggestion: + underline = PANGO_UNDERLINE_ERROR; + break; + } + addattr(p, start, end, + pango_attr_underline_new(underline)); + break; + case uiAttributeTypeUnderlineColor: + uiAttributeUnderlineColor(attr, &colorType, &r, &g, &b, &a); + switch (colorType) { + case uiUnderlineColorCustom: + addattr(p, start, end, + pango_attr_underline_color_new( + (guint16) (r * 65535.0), + (guint16) (g * 65535.0), + (guint16) (b * 65535.0))); + break; + case uiUnderlineColorSpelling: + // TODO GtkTextView style property error-underline-color + addattr(p, start, end, + pango_attr_underline_color_new(65535, 0, 0)); + break; + case uiUnderlineColorGrammar: + // TODO find a more appropriate color + addattr(p, start, end, + pango_attr_underline_color_new(0, 65535, 0)); + break; + case uiUnderlineColorAuxiliary: + // TODO find a more appropriate color + addattr(p, start, end, + pango_attr_underline_color_new(0, 0, 65535)); + break; + } + break; + case uiAttributeTypeFeatures: + // only generate an attribute if the features object is not NULL + // TODO state that this is allowed + features = uiAttributeFeatures(attr); + if (features == NULL) + break; + featurestr = uiprivOpenTypeFeaturesToPangoCSSFeaturesString(features); + addattr(p, start, end, + FUTURE_pango_attr_font_features_new(featurestr->str)); + g_string_free(featurestr, TRUE); + break; + default: + // TODO complain + ; + } + return uiForEachContinue; +} + +PangoAttrList *uiprivAttributedStringToPangoAttrList(uiDrawTextLayoutParams *p) +{ + struct foreachParams fep; + + fep.attrs = pango_attr_list_new(); + uiAttributedStringForEachAttribute(p->String, processAttribute, &fep); + return fep.attrs; +} diff --git a/unix/attrstr.h b/unix/attrstr.h new file mode 100644 index 00000000..984ac1f5 --- /dev/null +++ b/unix/attrstr.h @@ -0,0 +1,20 @@ +// 11 march 2018 +#include "../common/attrstr.h" + +// See https://developer.gnome.org/pango/1.30/pango-Cairo-Rendering.html#pango-Cairo-Rendering.description +// For the conversion, see https://developer.gnome.org/pango/1.30/pango-Glyph-Storage.html#pango-units-to-double and https://developer.gnome.org/pango/1.30/pango-Glyph-Storage.html#pango-units-from-double +#define pangoToCairo(pango) (pango_units_to_double(pango)) +#define cairoToPango(cairo) (pango_units_from_double(cairo)) + +// opentype.c +extern GString *uiprivOpenTypeFeaturesToPangoCSSFeaturesString(const uiOpenTypeFeatures *otf); + +// fontmatch.c +extern PangoWeight uiprivWeightToPangoWeight(uiTextWeight w); +extern PangoStyle uiprivItalicToPangoStyle(uiTextItalic i); +extern PangoStretch uiprivStretchToPangoStretch(uiTextStretch s); +extern PangoFontDescription *uiprivFontDescriptorToPangoFontDescription(const uiFontDescriptor *uidesc); +extern void uiprivFontDescriptorFromPangoFontDescription(PangoFontDescription *pdesc, uiFontDescriptor *uidesc); + +// attrstr.c +extern PangoAttrList *uiprivAttributedStringToPangoAttrList(uiDrawTextLayoutParams *p); diff --git a/unix/child.c b/unix/child.c index b4a09677..b6e48807 100644 --- a/unix/child.c +++ b/unix/child.c @@ -33,7 +33,7 @@ struct child *newChild(uiControl *child, uiControl *parent, GtkContainer *parent if (child == NULL) return NULL; - c = uiNew(struct child); + c = uiprivNew(struct child); c->c = child; c->widget = GTK_WIDGET(uiControlHandle(c->c)); @@ -82,7 +82,7 @@ void childRemove(struct child *c) if (c->box != NULL) gtk_widget_destroy(c->box); - uiFree(c); + uiprivFree(c); } void childDestroy(struct child *c) diff --git a/unix/debug.c b/unix/debug.c index c948db62..fd97c9ed 100644 --- a/unix/debug.c +++ b/unix/debug.c @@ -3,7 +3,7 @@ // LONGTERM don't halt on release builds -void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) +void uiprivRealBug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) { char *a, *b; diff --git a/unix/draw.c b/unix/draw.c index 2d7a6367..15abb611 100644 --- a/unix/draw.c +++ b/unix/draw.c @@ -2,18 +2,20 @@ #include "uipriv_unix.h" #include "draw.h" -uiDrawContext *newContext(cairo_t *cr) +uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style) { uiDrawContext *c; - c = uiNew(uiDrawContext); + c = uiprivNew(uiDrawContext); c->cr = cr; + c->style = style; return c; } void freeContext(uiDrawContext *c) { - uiFree(c); + // free neither cr nor style; we own neither + uiprivFree(c); } static cairo_pattern_t *mkbrush(uiDrawBrush *b) @@ -37,7 +39,7 @@ static cairo_pattern_t *mkbrush(uiDrawBrush *b) // case uiDrawBrushTypeImage: } if (cairo_pattern_status(pat) != CAIRO_STATUS_SUCCESS) - implbug("error creating pattern in mkbrush(): %s", + uiprivImplBug("error creating pattern in mkbrush(): %s", cairo_status_to_string(cairo_pattern_status(pat))); switch (b->Type) { case uiDrawBrushTypeLinearGradient: diff --git a/unix/draw.h b/unix/draw.h index dbd82ff5..9eec2846 100644 --- a/unix/draw.h +++ b/unix/draw.h @@ -3,6 +3,7 @@ // draw.c struct uiDrawContext { cairo_t *cr; + GtkStyleContext *style; }; // drawpath.c diff --git a/unix/drawmatrix.c b/unix/drawmatrix.c index ac7ac579..7d15d920 100644 --- a/unix/drawmatrix.c +++ b/unix/drawmatrix.c @@ -39,7 +39,7 @@ void uiDrawMatrixScale(uiDrawMatrix *m, double xCenter, double yCenter, double x m2c(m, &c); xt = x; yt = y; - scaleCenter(xCenter, yCenter, &xt, &yt); + uiprivScaleCenter(xCenter, yCenter, &xt, &yt); cairo_matrix_translate(&c, xt, yt); cairo_matrix_scale(&c, x, y); cairo_matrix_translate(&c, -xt, -yt); @@ -59,7 +59,7 @@ void uiDrawMatrixRotate(uiDrawMatrix *m, double x, double y, double amount) void uiDrawMatrixSkew(uiDrawMatrix *m, double x, double y, double xamount, double yamount) { - fallbackSkew(m, x, y, xamount, yamount); + uiprivFallbackSkew(m, x, y, xamount, yamount); } void uiDrawMatrixMultiply(uiDrawMatrix *dest, uiDrawMatrix *src) diff --git a/unix/drawpath.c b/unix/drawpath.c index a0165fb8..28eeb981 100644 --- a/unix/drawpath.c +++ b/unix/drawpath.c @@ -28,7 +28,7 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode mode) { uiDrawPath *p; - p = uiNew(uiDrawPath); + p = uiprivNew(uiDrawPath); p->pieces = g_array_new(FALSE, TRUE, sizeof (struct piece)); p->fillMode = mode; return p; @@ -37,13 +37,13 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode mode) void uiDrawFreePath(uiDrawPath *p) { g_array_free(p->pieces, TRUE); - uiFree(p); + uiprivFree(p); } static void add(uiDrawPath *p, struct piece *piece) { if (p->ended) - userbug("You cannot modify a uiDrawPath that has been ended. (path: %p)", p); + uiprivUserBug("You cannot modify a uiDrawPath that has been ended. (path: %p)", p); g_array_append_vals(p->pieces, piece, 1); } @@ -145,7 +145,7 @@ void runPath(uiDrawPath *p, cairo_t *cr) void (*arc)(cairo_t *, double, double, double, double, double); if (!p->ended) - userbug("You cannot draw with a uiDrawPath that has not been ended. (path: %p)", p); + uiprivUserBug("You cannot draw with a uiDrawPath that has not been ended. (path: %p)", p); cairo_new_path(cr); for (i = 0; i < p->pieces->len; i++) { piece = &g_array_index(p->pieces, struct piece, i); diff --git a/unix/drawtext.c b/unix/drawtext.c index 7078e1ac..477e9ca3 100644 --- a/unix/drawtext.c +++ b/unix/drawtext.c @@ -1,88 +1,10 @@ -// 6 september 2015 +// 11 march 2018 #include "uipriv_unix.h" #include "draw.h" +#include "attrstr.h" -struct uiDrawFontFamilies { - PangoFontFamily **f; - int n; -}; - -uiDrawFontFamilies *uiDrawListFontFamilies(void) -{ - uiDrawFontFamilies *ff; - PangoFontMap *map; - - ff = uiNew(uiDrawFontFamilies); - map = pango_cairo_font_map_get_default(); - pango_font_map_list_families(map, &(ff->f), &(ff->n)); - // do not free map; it's a shared resource - return ff; -} - -int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) -{ - return ff->n; -} - -char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) -{ - PangoFontFamily *f; - - f = ff->f[n]; - return uiUnixStrdupText(pango_font_family_get_name(f)); -} - -void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) -{ - g_free(ff->f); - uiFree(ff); -} - -struct uiDrawTextFont { - PangoFont *f; -}; - -uiDrawTextFont *mkTextFont(PangoFont *f, gboolean ref) -{ - uiDrawTextFont *font; - - font = uiNew(uiDrawTextFont); - font->f = f; - if (ref) - g_object_ref(font->f); - return font; -} - -static const PangoWeight pangoWeights[] = { - [uiDrawTextWeightThin] = PANGO_WEIGHT_THIN, - [uiDrawTextWeightUltraLight] = PANGO_WEIGHT_ULTRALIGHT, - [uiDrawTextWeightLight] = PANGO_WEIGHT_LIGHT, - [uiDrawTextWeightBook] = PANGO_WEIGHT_BOOK, - [uiDrawTextWeightNormal] = PANGO_WEIGHT_NORMAL, - [uiDrawTextWeightMedium] = PANGO_WEIGHT_MEDIUM, - [uiDrawTextWeightSemiBold] = PANGO_WEIGHT_SEMIBOLD, - [uiDrawTextWeightBold] = PANGO_WEIGHT_BOLD, - [uiDrawTextWeightUltraBold] = PANGO_WEIGHT_ULTRABOLD, - [uiDrawTextWeightHeavy] = PANGO_WEIGHT_HEAVY, - [uiDrawTextWeightUltraHeavy] = PANGO_WEIGHT_ULTRAHEAVY, -}; - -static const PangoStyle pangoItalics[] = { - [uiDrawTextItalicNormal] = PANGO_STYLE_NORMAL, - [uiDrawTextItalicOblique] = PANGO_STYLE_OBLIQUE, - [uiDrawTextItalicItalic] = PANGO_STYLE_ITALIC, -}; - -static const PangoStretch pangoStretches[] = { - [uiDrawTextStretchUltraCondensed] = PANGO_STRETCH_ULTRA_CONDENSED, - [uiDrawTextStretchExtraCondensed] = PANGO_STRETCH_EXTRA_CONDENSED, - [uiDrawTextStretchCondensed] = PANGO_STRETCH_CONDENSED, - [uiDrawTextStretchSemiCondensed] = PANGO_STRETCH_SEMI_CONDENSED, - [uiDrawTextStretchNormal] = PANGO_STRETCH_NORMAL, - [uiDrawTextStretchSemiExpanded] = PANGO_STRETCH_SEMI_EXPANDED, - [uiDrawTextStretchExpanded] = PANGO_STRETCH_EXPANDED, - [uiDrawTextStretchExtraExpanded] = PANGO_STRETCH_EXTRA_EXPANDED, - [uiDrawTextStretchUltraExpanded] = PANGO_STRETCH_ULTRA_EXPANDED, +struct uiDrawTextLayout { + PangoLayout *layout; }; // we need a context for a few things @@ -91,203 +13,69 @@ static const PangoStretch pangoStretches[] = { // so let's use gdk_pango_context_get() instead; even though it's for the default screen only, it's good enough for us #define mkGenericPangoCairoContext() (gdk_pango_context_get()) -PangoFont *pangoDescToPangoFont(PangoFontDescription *pdesc) -{ - PangoFont *f; - PangoContext *context; - - // in this case, the context is necessary for the metrics to be correct - context = mkGenericPangoCairoContext(); - f = pango_font_map_load_font(pango_cairo_font_map_get_default(), context, pdesc); - if (f == NULL) { - // LONGTERM - g_error("[libui] no match in pangoDescToPangoFont(); report to andlabs"); - } - g_object_unref(context); - return f; -} - -uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) -{ - PangoFont *f; - PangoFontDescription *pdesc; - - pdesc = pango_font_description_new(); - pango_font_description_set_family(pdesc, - desc->Family); - pango_font_description_set_size(pdesc, - (gint) (desc->Size * PANGO_SCALE)); - pango_font_description_set_weight(pdesc, - pangoWeights[desc->Weight]); - pango_font_description_set_style(pdesc, - pangoItalics[desc->Italic]); - pango_font_description_set_stretch(pdesc, - pangoStretches[desc->Stretch]); - f = pangoDescToPangoFont(pdesc); - pango_font_description_free(pdesc); - return mkTextFont(f, FALSE); // we hold the initial reference; no need to ref -} - -void uiDrawFreeTextFont(uiDrawTextFont *font) -{ - g_object_unref(font->f); - uiFree(font); -} - -uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) -{ - return (uintptr_t) (font->f); -} - -void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) -{ - PangoFontDescription *pdesc; - - // this creates a copy; we free it later - pdesc = pango_font_describe(font->f); - - // TODO - - pango_font_description_free(pdesc); -} - -// See https://developer.gnome.org/pango/1.30/pango-Cairo-Rendering.html#pango-Cairo-Rendering.description -// Note that we convert to double before dividing to make sure the floating-point stuff is right -#define pangoToCairo(pango) (((double) (pango)) / PANGO_SCALE) -#define cairoToPango(cairo) ((gint) ((cairo) * PANGO_SCALE)) - -void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) -{ - PangoFontMetrics *pm; - - pm = pango_font_get_metrics(font->f, NULL); - metrics->Ascent = pangoToCairo(pango_font_metrics_get_ascent(pm)); - metrics->Descent = pangoToCairo(pango_font_metrics_get_descent(pm)); - // Pango doesn't seem to expose this :( Use 0 and hope for the best. - metrics->Leading = 0; - metrics->UnderlinePos = pangoToCairo(pango_font_metrics_get_underline_position(pm)); - metrics->UnderlineThickness = pangoToCairo(pango_font_metrics_get_underline_thickness(pm)); - pango_font_metrics_unref(pm); -} - -// note: PangoCairoLayouts are tied to a given cairo_t, so we can't store one in this device-independent structure -struct uiDrawTextLayout { - char *s; - ptrdiff_t *graphemes; - PangoFont *defaultFont; - double width; - PangoAttrList *attrs; +static const PangoAlignment pangoAligns[] = { + [uiDrawTextAlignLeft] = PANGO_ALIGN_LEFT, + [uiDrawTextAlignCenter] = PANGO_ALIGN_CENTER, + [uiDrawTextAlignRight] = PANGO_ALIGN_RIGHT, }; -uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width) +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) { - uiDrawTextLayout *layout; + uiDrawTextLayout *tl; PangoContext *context; - - layout = uiNew(uiDrawTextLayout); - layout->s = g_strdup(text); - context = mkGenericPangoCairoContext(); - layout->graphemes = graphemes(layout->s, context); - g_object_unref(context); - layout->defaultFont = defaultFont->f; - g_object_ref(layout->defaultFont); // retain a copy - uiDrawTextLayoutSetWidth(layout, width); - layout->attrs = pango_attr_list_new(); - return layout; -} - -void uiDrawFreeTextLayout(uiDrawTextLayout *layout) -{ - pango_attr_list_unref(layout->attrs); - g_object_unref(layout->defaultFont); - uiFree(layout->graphemes); - g_free(layout->s); - uiFree(layout); -} - -void uiDrawTextLayoutSetWidth(uiDrawTextLayout *layout, double width) -{ - layout->width = width; -} - -static void prepareLayout(uiDrawTextLayout *layout, PangoLayout *pl) -{ PangoFontDescription *desc; - int width; + PangoAttrList *attrs; + int pangoWidth; - pango_layout_set_text(pl, layout->s, -1); - - // again, this makes a copy - desc = pango_font_describe(layout->defaultFont); - // this is safe; the description is copied - pango_layout_set_font_description(pl, desc); - pango_font_description_free(desc); - - width = cairoToPango(layout->width); - if (layout->width < 0) - width = -1; - pango_layout_set_width(pl, width); - - pango_layout_set_attributes(pl, layout->attrs); -} - -void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height) -{ - PangoContext *context; - PangoLayout *pl; - PangoRectangle logical; + tl = uiprivNew(uiDrawTextLayout); // in this case, the context is necessary to create the layout // the layout takes a ref on the context so we can unref it afterward context = mkGenericPangoCairoContext(); - pl = pango_layout_new(context); + tl->layout = pango_layout_new(context); g_object_unref(context); - prepareLayout(layout, pl); - pango_layout_get_extents(pl, NULL, &logical); + // this is safe; pango_layout_set_text() copies the string + pango_layout_set_text(tl->layout, uiAttributedStringString(p->String), -1); - g_object_unref(pl); + desc = uiprivFontDescriptorToPangoFontDescription(p->DefaultFont); + pango_layout_set_font_description(tl->layout, desc); + // this is safe; the description is copied + pango_font_description_free(desc); + pangoWidth = cairoToPango(p->Width); + if (p->Width < 0) + pangoWidth = -1; + pango_layout_set_width(tl->layout, pangoWidth); + + pango_layout_set_alignment(tl->layout, pangoAligns[p->Align]); + + attrs = uiprivAttributedStringToPangoAttrList(p); + pango_layout_set_attributes(tl->layout, attrs); + pango_attr_list_unref(attrs); + + return tl; +} + +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) +{ + g_object_unref(tl->layout); + uiprivFree(tl); +} + +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) +{ + // TODO have an implicit save/restore on each drawing functions instead? and is this correct? + cairo_set_source_rgb(c->cr, 0.0, 0.0, 0.0); + cairo_move_to(c->cr, x, y); + pango_cairo_show_layout(c->cr, tl->layout); +} + +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) +{ + PangoRectangle logical; + + pango_layout_get_extents(tl->layout, NULL, &logical); *width = pangoToCairo(logical.width); *height = pangoToCairo(logical.height); } - -void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout) -{ - PangoLayout *pl; - - pl = pango_cairo_create_layout(c->cr); - prepareLayout(layout, pl); - - cairo_move_to(c->cr, x, y); - pango_cairo_show_layout(c->cr, pl); - - g_object_unref(pl); -} - -static void addAttr(uiDrawTextLayout *layout, PangoAttribute *attr, int startChar, int endChar) -{ - attr->start_index = layout->graphemes[startChar]; - attr->end_index = layout->graphemes[endChar]; - pango_attr_list_insert(layout->attrs, attr); - // pango_attr_list_insert() takes attr; we don't free it -} - -void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) -{ - PangoAttribute *attr; - guint16 rr, gg, bb, aa; - - rr = (guint16) (r * 65535); - gg = (guint16) (g * 65535); - bb = (guint16) (b * 65535); - aa = (guint16) (a * 65535); - - attr = pango_attr_foreground_new(rr, gg, bb); - addAttr(layout, attr, startChar, endChar); - - // TODO what if aa == 0? - attr = FUTURE_pango_attr_foreground_alpha_new(aa); - if (attr != NULL) - addAttr(layout, attr, startChar, endChar); -} diff --git a/unix/fontbutton.c b/unix/fontbutton.c index f8047e08..d239952b 100644 --- a/unix/fontbutton.c +++ b/unix/fontbutton.c @@ -1,5 +1,6 @@ // 14 april 2016 #include "uipriv_unix.h" +#include "attrstr.h" struct uiFontButton { uiUnixControl c; @@ -26,16 +27,14 @@ static void defaultOnChanged(uiFontButton *b, void *data) // do nothing } -uiDrawTextFont *uiFontButtonFont(uiFontButton *b) +void uiFontButtonFont(uiFontButton *b, uiFontDescriptor *desc) { - PangoFont *f; - PangoFontDescription *desc; + PangoFontDescription *pdesc; - desc = gtk_font_chooser_get_font_desc(b->fc); - f = pangoDescToPangoFont(desc); - // desc is transfer-full and thus is a copy - pango_font_description_free(desc); - return mkTextFont(f, FALSE); // we hold the initial reference; no need to ref + pdesc = gtk_font_chooser_get_font_desc(b->fc); + uiprivFontDescriptorFromPangoFontDescription(pdesc, desc); + // pdesc is transfer-full and thus is a copy + pango_font_description_free(pdesc); } void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data) @@ -68,3 +67,9 @@ uiFontButton *uiNewFontButton(void) return b; } + +void uiFreeFontButtonFont(uiFontDescriptor *desc) +{ + // TODO ensure this is synchronized with fontmatch.c + uiFreeText((char *) (desc->Family)); +} diff --git a/unix/fontmatch.c b/unix/fontmatch.c new file mode 100644 index 00000000..95f4fdd7 --- /dev/null +++ b/unix/fontmatch.c @@ -0,0 +1,76 @@ +// 11 march 2018 +#include "uipriv_unix.h" +#include "attrstr.h" + +static const PangoStyle pangoItalics[] = { + [uiTextItalicNormal] = PANGO_STYLE_NORMAL, + [uiTextItalicOblique] = PANGO_STYLE_OBLIQUE, + [uiTextItalicItalic] = PANGO_STYLE_ITALIC, +}; + +static const PangoStretch pangoStretches[] = { + [uiTextStretchUltraCondensed] = PANGO_STRETCH_ULTRA_CONDENSED, + [uiTextStretchExtraCondensed] = PANGO_STRETCH_EXTRA_CONDENSED, + [uiTextStretchCondensed] = PANGO_STRETCH_CONDENSED, + [uiTextStretchSemiCondensed] = PANGO_STRETCH_SEMI_CONDENSED, + [uiTextStretchNormal] = PANGO_STRETCH_NORMAL, + [uiTextStretchSemiExpanded] = PANGO_STRETCH_SEMI_EXPANDED, + [uiTextStretchExpanded] = PANGO_STRETCH_EXPANDED, + [uiTextStretchExtraExpanded] = PANGO_STRETCH_EXTRA_EXPANDED, + [uiTextStretchUltraExpanded] = PANGO_STRETCH_ULTRA_EXPANDED, +}; + +// for the most part, pango weights correlate to ours +// the differences: +// - Book — libui: 350, Pango: 380 +// - Ultra Heavy — libui: 950, Pango: 1000 +// TODO figure out what to do about this misalignment +PangoWeight uiprivWeightToPangoWeight(uiTextWeight w) +{ + return (PangoWeight) w; +} + +PangoStyle uiprivItalicToPangoStyle(uiTextItalic i) +{ + return pangoItalics[i]; +} + +PangoStretch uiprivStretchToPangoStretch(uiTextStretch s) +{ + return pangoStretches[s]; +} + +PangoFontDescription *uiprivFontDescriptorToPangoFontDescription(const uiFontDescriptor *uidesc) +{ + PangoFontDescription *desc; + + desc = pango_font_description_new(); + pango_font_description_set_family(desc, uidesc->Family); + // see https://developer.gnome.org/pango/1.30/pango-Fonts.html#pango-font-description-set-size and https://developer.gnome.org/pango/1.30/pango-Glyph-Storage.html#pango-units-from-double + pango_font_description_set_size(desc, pango_units_from_double(uidesc->Size)); + pango_font_description_set_weight(desc, uiprivWeightToPangoWeight(uidesc->Weight)); + pango_font_description_set_style(desc, uiprivItalicToPangoStyle(uidesc->Italic)); + pango_font_description_set_stretch(desc, uiprivStretchToPangoStretch(uidesc->Stretch)); + return desc; +} + +void uiprivFontDescriptorFromPangoFontDescription(PangoFontDescription *pdesc, uiFontDescriptor *uidesc) +{ + PangoStyle pitalic; + PangoStretch pstretch; + + uidesc->Family = uiUnixStrdupText(pango_font_description_get_family(pdesc)); + pitalic = pango_font_description_get_style(pdesc); + // TODO reverse the above misalignment if it is corrected + uidesc->Weight = pango_font_description_get_weight(pdesc); + pstretch = pango_font_description_get_stretch(pdesc); + // absolute size does not matter because, as above, 1 device unit == 1 cairo point + uidesc->Size = pango_units_to_double(pango_font_description_get_size(pdesc)); + + for (uidesc->Italic = uiTextItalicNormal; uidesc->Italic < uiTextItalicItalic; uidesc->Italic++) + if (pangoItalics[uidesc->Italic] == pitalic) + break; + for (uidesc->Stretch = uiTextStretchUltraCondensed; uidesc->Stretch < uiTextStretchUltraExpanded; uidesc->Stretch++) + if (pangoStretches[uidesc->Stretch] == pstretch) + break; +} diff --git a/unix/future.c b/unix/future.c index 1f9f532b..68730ead 100644 --- a/unix/future.c +++ b/unix/future.c @@ -6,7 +6,9 @@ // in others, because parts of GTK+ being unstable until recently also sucks :/ // added in pango 1.38; we need 1.36 +static PangoAttribute *(*newFeaturesAttr)(const gchar *features) = NULL; static PangoAttribute *(*newFGAlphaAttr)(guint16 alpha) = NULL; +static PangoAttribute *(*newBGAlphaAttr)(guint16 alpha) = NULL; // added in GTK+ 3.20; we need 3.10 static void (*gwpIterSetObjectName)(GtkWidgetPath *path, gint pos, const char *name) = NULL; @@ -21,11 +23,20 @@ void loadFutures(void) if (handle == NULL) return; #define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn) + GET(newFeaturesAttr, pango_attr_font_features_new); GET(newFGAlphaAttr, pango_attr_foreground_alpha_new); + GET(newBGAlphaAttr, pango_attr_background_alpha_new); GET(gwpIterSetObjectName, gtk_widget_path_iter_set_object_name); dlclose(handle); } +PangoAttribute *FUTURE_pango_attr_font_features_new(const gchar *features) +{ + if (newFeaturesAttr == NULL) + return NULL; + return (*newFeaturesAttr)(features); +} + PangoAttribute *FUTURE_pango_attr_foreground_alpha_new(guint16 alpha) { if (newFGAlphaAttr == NULL) @@ -33,6 +44,13 @@ PangoAttribute *FUTURE_pango_attr_foreground_alpha_new(guint16 alpha) return (*newFGAlphaAttr)(alpha); } +PangoAttribute *FUTURE_pango_attr_background_alpha_new(guint16 alpha) +{ + if (newBGAlphaAttr == NULL) + return NULL; + return (*newBGAlphaAttr)(alpha); +} + gboolean FUTURE_gtk_widget_path_iter_set_object_name(GtkWidgetPath *path, gint pos, const char *name) { if (gwpIterSetObjectName == NULL) diff --git a/unix/graphemes.c b/unix/graphemes.c index a2c47b72..952f1ef8 100644 --- a/unix/graphemes.c +++ b/unix/graphemes.c @@ -1,24 +1,42 @@ // 25 may 2016 #include "uipriv_unix.h" +#include "attrstr.h" -ptrdiff_t *graphemes(const char *text, PangoContext *context) +int uiprivGraphemesTakesUTF16(void) { - size_t len, lenchars; - PangoLogAttr *logattrs; - ptrdiff_t *out; - ptrdiff_t *op; - size_t i; + return 0; +} - len = strlen(text); +uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len) +{ + uiprivGraphemes *g; + char *text = (char *) s; + size_t lenchars; + PangoLogAttr *logattrs; + size_t i; + size_t *op; + + g = uiprivNew(uiprivGraphemes); + + // TODO see if we can use the utf routines lenchars = g_utf8_strlen(text, -1); - logattrs = (PangoLogAttr *) uiAlloc((lenchars + 1) * sizeof (PangoLogAttr), "PangoLogAttr[]"); + logattrs = (PangoLogAttr *) uiprivAlloc((lenchars + 1) * sizeof (PangoLogAttr), "PangoLogAttr[] (graphemes)"); pango_get_log_attrs(text, len, -1, NULL, logattrs, lenchars + 1); - // should be more than enough - out = (ptrdiff_t *) uiAlloc((lenchars + 2) * sizeof (ptrdiff_t), "ptrdiff_t[]"); - op = out; + // first figure out how many graphemes there are + g->len = 0; + for (i = 0; i < lenchars; i++) + if (logattrs[i].is_cursor_position != 0) + g->len++; + + g->pointsToGraphemes = (size_t *) uiprivAlloc((len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + g->graphemesToPoints = (size_t *) uiprivAlloc((g->len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + + // compute the graphemesToPoints array + // TODO merge with the next for loop somehow? + op = g->graphemesToPoints; for (i = 0; i < lenchars; i++) if (logattrs[i].is_cursor_position != 0) // TODO optimize this @@ -26,6 +44,20 @@ ptrdiff_t *graphemes(const char *text, PangoContext *context) // and do the last one *op++ = len; - uiFree(logattrs); - return out; + // and finally build the pointsToGraphemes array + op = g->pointsToGraphemes; + for (i = 0; i < g->len; i++) { + size_t j; + size_t first, last; + + first = g->graphemesToPoints[i]; + last = g->graphemesToPoints[i + 1]; + for (j = first; j < last; j++) + *op++ = i; + } + // and do the last one + *op++ = i; + + uiprivFree(logattrs); + return g; } diff --git a/unix/image.c b/unix/image.c index a79e550f..1bdf0d64 100644 --- a/unix/image.c +++ b/unix/image.c @@ -14,14 +14,14 @@ static void freeImageRep(gpointer item) buf = cairo_image_surface_get_data(cs); cairo_surface_destroy(cs); - uiFree(buf); + uiprivFree(buf); } uiImage *uiNewImage(double width, double height) { uiImage *i; - i = uiNew(uiImage); + i = uiprivNew(uiImage); i->width = width; i->height = height; i->images = g_ptr_array_new_with_free_func(freeImageRep); @@ -31,7 +31,7 @@ uiImage *uiNewImage(double width, double height) void uiFreeImage(uiImage *i) { g_ptr_array_free(i->images, TRUE); - uiFree(i); + uiprivFree(i); } void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, int pixelStride) @@ -43,7 +43,7 @@ void uiImageAppend(uiImage *i, void *pixels, int pixelWidth, int pixelHeight, in int y; cstride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, pixelWidth); - buf = (unsigned char *) uiAlloc((cstride * pixelHeight * 4) * sizeof (unsigned char), "unsigned char[]"); + buf = (unsigned char *) uiprivAlloc((cstride * pixelHeight * 4) * sizeof (unsigned char), "unsigned char[]"); p = buf; for (y = 0; y < pixelStride * pixelHeight; y += pixelStride) { memmove(p, src + y, cstride); diff --git a/unix/main.c b/unix/main.c index 2998bf31..a0cd7835 100644 --- a/unix/main.c +++ b/unix/main.c @@ -1,14 +1,14 @@ // 6 april 2015 #include "uipriv_unix.h" -uiInitOptions options; +uiInitOptions uiprivOptions; const char *uiInit(uiInitOptions *o) { GError *err = NULL; const char *msg; - options = *o; + uiprivOptions = *o; if (gtk_init_with_args(NULL, NULL, NULL, NULL, NULL, &err) == FALSE) { msg = g_strdup(err->message); g_error_free(err); @@ -99,7 +99,7 @@ void uiQueueMain(void (*f)(void *data), void *data) { struct queued *q; - // we have to use g_new0()/g_free() because uiAlloc() is only safe to call on the main thread + // we have to use g_new0()/g_free() because uiprivAlloc() is only safe to call on the main thread // for some reason it didn't affect me, but it did affect krakjoe q = g_new0(struct queued, 1); q->f = f; diff --git a/unix/menu.c b/unix/menu.c index 5ccb4a51..17189c8e 100644 --- a/unix/menu.c +++ b/unix/menu.c @@ -81,7 +81,7 @@ static void defaultOnClicked(uiMenuItem *item, uiWindow *w, void *data) static void onQuitClicked(uiMenuItem *item, uiWindow *w, void *data) { - if (shouldQuit()) + if (uiprivShouldQuit()) uiQuit(); } @@ -109,7 +109,7 @@ void uiMenuItemDisable(uiMenuItem *item) void uiMenuItemOnClicked(uiMenuItem *item, void (*f)(uiMenuItem *, uiWindow *, void *), void *data) { if (item->type == typeQuit) - userbug("You cannot call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); + uiprivUserBug("You cannot call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); item->onClicked = f; item->onClickedData = data; } @@ -135,9 +135,9 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name) uiMenuItem *item; if (menusFinalized) - userbug("You cannot create a new menu item after menus have been finalized."); + uiprivUserBug("You cannot create a new menu item after menus have been finalized."); - item = uiNew(uiMenuItem); + item = uiprivNew(uiMenuItem); g_array_append_val(m->items, item); @@ -196,7 +196,7 @@ uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name) uiMenuItem *uiMenuAppendQuitItem(uiMenu *m) { if (hasQuit) - userbug("You cannot have multiple Quit menu items in the same program."); + uiprivUserBug("You cannot have multiple Quit menu items in the same program."); hasQuit = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typeQuit, NULL); @@ -205,7 +205,7 @@ uiMenuItem *uiMenuAppendQuitItem(uiMenu *m) uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m) { if (hasPreferences) - userbug("You cannot have multiple Preferences menu items in the same program."); + uiprivUserBug("You cannot have multiple Preferences menu items in the same program."); hasPreferences = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typePreferences, NULL); @@ -214,7 +214,7 @@ uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m) uiMenuItem *uiMenuAppendAboutItem(uiMenu *m) { if (hasAbout) - userbug("You cannot have multiple About menu items in the same program."); + uiprivUserBug("You cannot have multiple About menu items in the same program."); hasAbout = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typeAbout, NULL); @@ -230,11 +230,11 @@ uiMenu *uiNewMenu(const char *name) uiMenu *m; if (menusFinalized) - userbug("You cannot create a new menu after menus have been finalized."); + uiprivUserBug("You cannot create a new menu after menus have been finalized."); if (menus == NULL) menus = g_array_new(FALSE, TRUE, sizeof (uiMenu *)); - m = uiNew(uiMenu); + m = uiprivNew(uiMenu); g_array_append_val(menus, m); @@ -260,7 +260,7 @@ static void appendMenuItem(GtkMenuShell *submenu, uiMenuItem *item, uiWindow *w) singleSetChecked(GTK_CHECK_MENU_ITEM(menuitem), item->checked, signal); } gtk_menu_shell_append(submenu, menuitem); - ww = uiNew(struct menuItemWindow); + ww = uiprivNew(struct menuItemWindow); ww->w = w; ww->signal = signal; g_hash_table_insert(item->windows, menuitem, ww); @@ -308,8 +308,8 @@ static void freeMenuItem(GtkWidget *widget, gpointer data) item = g_array_index(fmi->items, uiMenuItem *, fmi->i); w = (struct menuItemWindow *) g_hash_table_lookup(item->windows, widget); if (g_hash_table_remove(item->windows, widget) == FALSE) - implbug("GtkMenuItem %p not in menu item's item/window map", widget); - uiFree(w); + uiprivImplBug("GtkMenuItem %p not in menu item's item/window map", widget); + uiprivFree(w); fmi->i++; } @@ -353,14 +353,14 @@ void uninitMenus(void) for (j = 0; j < m->items->len; j++) { item = g_array_index(m->items, uiMenuItem *, j); if (g_hash_table_size(item->windows) != 0) - // TODO is this really a userbug()? - implbug("menu item %p (%s) still has uiWindows attached; did you forget to destroy some windows?", item, item->name); + // TODO is this really a uiprivUserBug()? + uiprivImplBug("menu item %p (%s) still has uiWindows attached; did you forget to destroy some windows?", item, item->name); g_free(item->name); g_hash_table_destroy(item->windows); - uiFree(item); + uiprivFree(item); } g_array_free(m->items, TRUE); - uiFree(m); + uiprivFree(m); } g_array_free(menus, TRUE); } diff --git a/unix/multilineentry.c b/unix/multilineentry.c index 09ffd460..228dc80f 100644 --- a/unix/multilineentry.c +++ b/unix/multilineentry.c @@ -1,6 +1,8 @@ // 6 december 2015 #include "uipriv_unix.h" +// TODO GTK_WRAP_WORD_CHAR to avoid spurious resizes? + struct uiMultilineEntry { uiUnixControl c; GtkWidget *widget; diff --git a/unix/opentype.c b/unix/opentype.c new file mode 100644 index 00000000..281acda7 --- /dev/null +++ b/unix/opentype.c @@ -0,0 +1,26 @@ +// 11 may 2017 +#include "uipriv_unix.h" +#include "attrstr.h" + +// see https://developer.mozilla.org/en/docs/Web/CSS/font-feature-settings +static uiForEach toCSS(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data) +{ + GString *s = (GString *) data; + + // the last trailing comma is removed after foreach is done + g_string_append_printf(s, "\"%c%c%c%c\" %" PRIu32 ", ", + a, b, c, d, value); + return uiForEachContinue; +} + +GString *uiprivOpenTypeFeaturesToPangoCSSFeaturesString(const uiOpenTypeFeatures *otf) +{ + GString *s; + + s = g_string_new(""); + uiOpenTypeFeaturesForEach(otf, toCSS, s); + if (s->len != 0) + // and remove the last comma + g_string_truncate(s, s->len - 2); + return s; +} diff --git a/unix/progressbar.c b/unix/progressbar.c index 9b543b04..b3681a6f 100644 --- a/unix/progressbar.c +++ b/unix/progressbar.c @@ -53,7 +53,7 @@ void uiProgressBarSetValue(uiProgressBar *p, int value) } if (value < 0 || value > 100) - userbug("Value %d is out of range for a uiProgressBar.", value); + uiprivUserBug("Value %d is out of range for a uiProgressBar.", value); gtk_progress_bar_set_fraction(p->pbar, ((gdouble) value) / 100); } diff --git a/unix/text.c b/unix/text.c index ad92738d..9a2a9dc0 100644 --- a/unix/text.c +++ b/unix/text.c @@ -10,3 +10,8 @@ void uiFreeText(char *t) { g_free(t); } + +int uiprivStricmp(const char *a, const char *b) +{ + return strcasecmp(a, b); +} diff --git a/unix/uipriv_unix.h b/unix/uipriv_unix.h index d52a83c2..43ed144b 100644 --- a/unix/uipriv_unix.h +++ b/unix/uipriv_unix.h @@ -5,10 +5,11 @@ #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_10 #include #include -#include // see drawtext.c +#include // see future.c #include #include #include +#include #include "../ui.h" #include "../ui_unix.h" #include "../common/uipriv.h" @@ -42,17 +43,11 @@ extern GtkWidget *childBox(struct child *c); extern void childSetMargined(struct child *c, int margined); // draw.c -extern uiDrawContext *newContext(cairo_t *); +extern uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style); extern void freeContext(uiDrawContext *); -// drawtext.c -extern uiDrawTextFont *mkTextFont(PangoFont *f, gboolean add); -extern PangoFont *pangoDescToPangoFont(PangoFontDescription *pdesc); - -// graphemes.c -extern ptrdiff_t *graphemes(const char *text, PangoContext *context); - // image.c +/*TODO remove this*/typedef struct uiImage uiImage; extern cairo_surface_t *imageAppropriateSurface(uiImage *i, GtkWidget *w); // cellrendererbutton.c @@ -60,5 +55,7 @@ extern GtkCellRenderer *newCellRendererButton(void); // future.c extern void loadFutures(void); +extern PangoAttribute *FUTURE_pango_attr_font_features_new(const gchar *features); extern PangoAttribute *FUTURE_pango_attr_foreground_alpha_new(guint16 alpha); +extern PangoAttribute *FUTURE_pango_attr_background_alpha_new(guint16 alpha); extern gboolean FUTURE_gtk_widget_path_iter_set_object_name(GtkWidgetPath *path, gint pos, const char *name); diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 4695eb4f..eab9ca90 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND _LIBUI_SOURCES windows/areaevents.cpp windows/areascroll.cpp windows/areautil.cpp + windows/attrstr.cpp windows/box.cpp windows/button.cpp windows/checkbox.cpp @@ -28,6 +29,7 @@ list(APPEND _LIBUI_SOURCES windows/events.cpp windows/fontbutton.cpp windows/fontdialog.cpp + windows/fontmatch.cpp windows/form.cpp windows/graphemes.cpp windows/grid.cpp @@ -37,6 +39,7 @@ list(APPEND _LIBUI_SOURCES windows/main.cpp windows/menu.cpp windows/multilineentry.cpp + windows/opentype.cpp windows/parent.cpp windows/progressbar.cpp windows/radiobuttons.cpp @@ -76,10 +79,9 @@ macro(_handle_static) COMMENT "Copying libui.res") endmacro() -# notice that usp10 comes before gdi32 # TODO prune this list set(_LIBUI_LIBS - user32 kernel32 usp10 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid + user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid PARENT_SCOPE) if(NOT MSVC) diff --git a/windows/_uipriv_migrate.hpp b/windows/_uipriv_migrate.hpp index 13d3670e..96a67089 100644 --- a/windows/_uipriv_migrate.hpp +++ b/windows/_uipriv_migrate.hpp @@ -12,50 +12,3 @@ extern void uninitDraw(void); extern ID2D1HwndRenderTarget *makeHWNDRenderTarget(HWND hwnd); extern uiDrawContext *newContext(ID2D1RenderTarget *); extern void freeContext(uiDrawContext *); - -// dwrite.cpp -#ifdef __cplusplus -extern IDWriteFactory *dwfactory; -#endif -extern HRESULT initDrawText(void); -extern void uninitDrawText(void); -#ifdef __cplusplus -struct fontCollection { - IDWriteFontCollection *fonts; - WCHAR userLocale[LOCALE_NAME_MAX_LENGTH]; - int userLocaleSuccess; -}; -extern fontCollection *loadFontCollection(void); -extern WCHAR *fontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family); -extern void fontCollectionFree(fontCollection *fc); -extern WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names); -#endif - -// drawtext.cpp -#ifdef __cplusplus -extern uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size); -struct dwriteAttr { - uiDrawTextWeight weight; - uiDrawTextItalic italic; - uiDrawTextStretch stretch; - DWRITE_FONT_WEIGHT dweight; - DWRITE_FONT_STYLE ditalic; - DWRITE_FONT_STRETCH dstretch; -}; -extern void attrToDWriteAttr(struct dwriteAttr *attr); -extern void dwriteAttrToAttr(struct dwriteAttr *attr); -#endif - -// fontdialog.cpp -#ifdef __cplusplus -struct fontDialogParams { - IDWriteFont *font; - double size; - WCHAR *familyName; - WCHAR *styleName; -}; -extern BOOL showFontDialog(HWND parent, struct fontDialogParams *params); -extern void loadInitialFontDialogParams(struct fontDialogParams *params); -extern void destroyFontDialogParams(struct fontDialogParams *params); -extern WCHAR *fontDialogParamsToString(struct fontDialogParams *params); -#endif diff --git a/windows/alloc.cpp b/windows/alloc.cpp index eeee3ad4..321cca03 100644 --- a/windows/alloc.cpp +++ b/windows/alloc.cpp @@ -22,12 +22,12 @@ void uninitAlloc(void) // note the void * cast; otherwise it'll be treated as a string oss << (void *) (alloc.first) << " " << types[alloc.second] << "\n"; ossstr = oss.str(); - userbug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", ossstr.c_str()); + uiprivUserBug("Some data was leaked; either you left a uiControl lying around or there's a bug in libui itself. Leaked data:\n%s", ossstr.c_str()); } #define rawBytes(pa) (&((*pa)[0])) -void *uiAlloc(size_t size, const char *type) +void *uiprivAlloc(size_t size, const char *type) { byteArray *out; @@ -37,26 +37,27 @@ void *uiAlloc(size_t size, const char *type) return rawBytes(out); } -void *uiRealloc(void *_p, size_t size, const char *type) +void *uiprivRealloc(void *_p, size_t size, const char *type) { uint8_t *p = (uint8_t *) _p; byteArray *arr; if (p == NULL) - return uiAlloc(size, type); + return uiprivAlloc(size, type); arr = heap[p]; + // TODO does this fill in? arr->resize(size, 0); heap.erase(p); heap[rawBytes(arr)] = arr; return rawBytes(arr); } -void uiFree(void *_p) +void uiprivFree(void *_p) { uint8_t *p = (uint8_t *) _p; if (p == NULL) - implbug("attempt to uiFree(NULL)"); + uiprivImplBug("attempt to uiprivFree(NULL)"); types.erase(heap[p]); delete heap[p]; heap.erase(p); diff --git a/windows/area.cpp b/windows/area.cpp index ab69ff15..0042fccc 100644 --- a/windows/area.cpp +++ b/windows/area.cpp @@ -168,7 +168,7 @@ uiArea *uiNewArea(uiAreaHandler *ah) a->ah = ah; a->scrolling = FALSE; - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); // a->hwnd is assigned in areaWndProc() uiWindowsEnsureCreateControlHWND(0, @@ -190,7 +190,7 @@ uiArea *uiNewScrollingArea(uiAreaHandler *ah, int width, int height) a->scrolling = TRUE; a->scrollWidth = width; a->scrollHeight = height; - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); // a->hwnd is assigned in areaWndProc() uiWindowsEnsureCreateControlHWND(0, diff --git a/windows/area.hpp b/windows/area.hpp index 86a62de6..dfc2bc58 100644 --- a/windows/area.hpp +++ b/windows/area.hpp @@ -18,7 +18,7 @@ struct uiArea { int hwheelCarry; int vwheelCarry; - clickCounter cc; + uiprivClickCounter cc; BOOL capturing; BOOL inside; diff --git a/windows/areaevents.cpp b/windows/areaevents.cpp index 7d391b85..c7014ecb 100644 --- a/windows/areaevents.cpp +++ b/windows/areaevents.cpp @@ -2,6 +2,8 @@ #include "uipriv_windows.hpp" #include "area.hpp" +// TODO https://github.com/Microsoft/Windows-classic-samples/blob/master/Samples/Win7Samples/multimedia/DirectWrite/PadWrite/TextEditor.cpp notes on explicit RTL handling under MirrorXCoordinate(); also in areadraw.cpp too? + static uiModifiers getModifiers(void) { uiModifiers m = 0; @@ -90,11 +92,11 @@ static void areaMouseEvent(uiArea *a, int down, int up, WPARAM wParam, LPARAM l if (inClient && !a->inside) { a->inside = TRUE; (*(a->ah->MouseCrossed))(a->ah, a, 0); - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); } else if (!inClient && a->inside) { a->inside = FALSE; (*(a->ah->MouseCrossed))(a->ah, a, 1); - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); } } @@ -118,7 +120,7 @@ static void areaMouseEvent(uiArea *a, int down, int up, WPARAM wParam, LPARAM l // GetMessageTime() returns LONG and GetDoubleClckTime() returns UINT, which are int32 and uint32, respectively, but we don't need to worry about the signedness because for the same bit widths and two's complement arithmetic, s1-s2 == u1-u2 if bits(s1)==bits(s2) and bits(u1)==bits(u2) (and Windows requires two's complement: http://blogs.msdn.com/b/oldnewthing/archive/2005/05/27/422551.aspx) // signedness isn't much of an issue for these calls anyway because http://stackoverflow.com/questions/24022225/what-are-the-sign-extension-rules-for-calling-windows-api-functions-stdcall-t and that we're only using unsigned values (think back to how you (didn't) handle signedness in assembly language) AND because of the above AND because the statistics below (time interval and width/height) really don't make sense if negative // GetSystemMetrics() returns int, which is int32 - me.Count = clickCounterClick(&(a->cc), me.Down, + me.Count = uiprivClickCounterClick(&(a->cc), me.Down, me.X, me.Y, GetMessageTime(), GetDoubleClickTime(), GetSystemMetrics(SM_CXDOUBLECLK) / 2, @@ -162,7 +164,7 @@ static void onMouseEntered(uiArea *a) track(a, TRUE); (*(a->ah->MouseCrossed))(a->ah, a, 0); // TODO figure out why we did this to begin with; either we do it on both GTK+ and Windows or not at all - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); } // TODO genericize it so that it can be called above @@ -172,7 +174,7 @@ static void onMouseLeft(uiArea *a) a->inside = FALSE; (*(a->ah->MouseCrossed))(a->ah, a, 1); // TODO figure out why we did this to begin with; either we do it on both GTK+ and Windows or not at all - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); } // we use VK_SNAPSHOT as a sentinel because libui will never support the print screen key; that key belongs to the user @@ -298,7 +300,7 @@ static int areaKeyEvent(uiArea *a, int up, WPARAM wParam, LPARAM lParam) } // and finally everything else - if (fromScancode((lParam >> 16) & 0xFF, &ke)) + if (uiprivFromScancode((lParam >> 16) & 0xFF, &ke)) goto keyFound; // not a supported key, assume unhandled @@ -323,7 +325,7 @@ BOOL areaDoEvents(uiArea *a, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *l switch (uMsg) { case WM_ACTIVATE: // don't keep the double-click timer running if the user switched programs in between clicks - clickCounterReset(&(a->cc)); + uiprivClickCounterReset(&(a->cc)); *lResult = 0; return TRUE; case WM_MOUSEMOVE: diff --git a/windows/attrstr.cpp b/windows/attrstr.cpp new file mode 100644 index 00000000..740ac43e --- /dev/null +++ b/windows/attrstr.cpp @@ -0,0 +1,427 @@ +// 12 february 2017 +#include "uipriv_windows.hpp" +#include "attrstr.hpp" + +// TODO this whole file needs cleanup + +// yep, even when it supports C++11, it doesn't support C++11 +// we require MSVC 2013; this was added in MSVC 2015 (https://msdn.microsoft.com/en-us/library/wfa0edys.aspx) +#ifdef _MSC_VER +#if _MSC_VER < 1900 +#define noexcept +#endif +#endif + +// we need to collect all the background parameters and add them all at once +// TODO consider having background parameters in the drawing effects +// TODO contextual alternates override ligatures? +// TODO rename this struct to something that isn't exclusively foreach-ing? +struct foreachParams { + const uint16_t *s; + size_t len; + IDWriteTextLayout *layout; + std::vector *backgroundParams; +}; + +static std::hash doubleHash; + +// we need to combine color and underline style into one unit for IDWriteLayout::SetDrawingEffect() +// we also want to combine identical effects, which DirectWrite doesn't seem to provide a way to do +// we can at least try to goad it into doing so if we can deduplicate effects once they're all computed +// so what we do is use this class to store in-progress effects, much like uiprivCombinedFontAttr on the OS X code +// we then deduplicate them later while converting them into a form suitable for drawing with; see applyEffectsAttributes() below +class combinedEffectsAttr : public IUnknown { + ULONG refcount; + uiAttribute *colorAttr; + uiAttribute *underlineAttr; + uiAttribute *underlineColorAttr; + + void setAttribute(uiAttribute *a) + { + if (a == NULL) + return; + switch (uiAttributeGetType(a)) { + case uiAttributeTypeColor: + if (this->colorAttr != NULL) + uiprivAttributeRelease(this->colorAttr); + this->colorAttr = uiprivAttributeRetain(a); + break; + case uiAttributeTypeUnderline: + if (this->underlineAttr != NULL) + uiprivAttributeRelease(this->underlineAttr); + this->underlineAttr = uiprivAttributeRetain(a); + break; + case uiAttributeTypeUnderlineColor: + if (this->underlineAttr != NULL) + uiprivAttributeRelease(this->underlineAttr); + this->underlineColorAttr = uiprivAttributeRetain(a); + break; + } + } + + // this is needed by applyEffectsAttributes() below + // TODO doesn't uiprivAttributeEqual() already do this; if it doesn't, make it so; if (or when) it does, fix all platforms to avoid this extra check + static bool attrEqual(uiAttribute *a, uiAttribute *b) + { + if (a == NULL && b == NULL) + return true; + if (a == NULL || b == NULL) + return false; + return uiprivAttributeEqual(a, b); + } +public: + combinedEffectsAttr(uiAttribute *a) + { + this->refcount = 1; + this->colorAttr = NULL; + this->underlineAttr = NULL; + this->underlineColorAttr = NULL; + this->setAttribute(a); + } + + ~combinedEffectsAttr() + { + if (this->colorAttr != NULL) + uiprivAttributeRelease(this->colorAttr); + if (this->underlineAttr != NULL) + uiprivAttributeRelease(this->underlineAttr); + if (this->underlineColorAttr != NULL) + uiprivAttributeRelease(this->underlineColorAttr); + } + + // IUnknown + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) + { + if (ppvObject == NULL) + return E_POINTER; + if (riid == IID_IUnknown) { + this->AddRef(); + *ppvObject = this; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; + } + + virtual ULONG STDMETHODCALLTYPE AddRef(void) + { + this->refcount++; + return this->refcount; + } + + virtual ULONG STDMETHODCALLTYPE Release(void) + { + this->refcount--; + if (this->refcount == 0) { + delete this; + return 0; + } + return this->refcount; + } + + combinedEffectsAttr *cloneWith(uiAttribute *a) + { + combinedEffectsAttr *b; + + b = new combinedEffectsAttr(this->colorAttr); + b->setAttribute(this->underlineAttr); + b->setAttribute(this->underlineColorAttr); + b->setAttribute(a); + return b; + } + + // and these are also needed by applyEffectsAttributes() below + size_t hash(void) const noexcept + { + size_t ret = 0; + double r, g, b, a; + uiUnderlineColor colorType; + + if (this->colorAttr != NULL) { + uiAttributeColor(this->colorAttr, &r, &g, &b, &a); + ret ^= doubleHash(r); + ret ^= doubleHash(g); + ret ^= doubleHash(b); + ret ^= doubleHash(a); + } + if (this->underlineAttr != NULL) + ret ^= (size_t) uiAttributeUnderline(this->underlineAttr); + if (this->underlineColorAttr != NULL) { + uiAttributeUnderlineColor(this->underlineColorAttr, &colorType, &r, &g, &b, &a); + ret ^= (size_t) colorType; + ret ^= doubleHash(r); + ret ^= doubleHash(g); + ret ^= doubleHash(b); + ret ^= doubleHash(a); + } + return ret; + } + + bool equals(const combinedEffectsAttr *b) const + { + if (b == NULL) + return false; + return combinedEffectsAttr::attrEqual(this->colorAttr, b->colorAttr) && + combinedEffectsAttr::attrEqual(this->underlineAttr, b->underlineAttr) && + combinedEffectsAttr::attrEqual(this->underlineColorAttr, b->underlineColorAttr); + } + + drawingEffectsAttr *toDrawingEffectsAttr(void) + { + drawingEffectsAttr *dea; + double r, g, b, a; + uiUnderlineColor colorType; + + dea = new drawingEffectsAttr; + if (this->colorAttr != NULL) { + uiAttributeColor(this->colorAttr, &r, &g, &b, &a); + dea->setColor(r, g, b, a); + } + if (this->underlineAttr != NULL) + dea->setUnderline(uiAttributeUnderline(this->underlineAttr)); + if (this->underlineColorAttr != NULL) { + uiAttributeUnderlineColor(this->underlineColorAttr, &colorType, &r, &g, &b, &a); + // TODO see if Microsoft has any standard colors for these + switch (colorType) { + case uiUnderlineColorSpelling: + // TODO consider using the GtkTextView style property error-underline-color here if Microsoft has no preference + r = 1.0; + g = 0.0; + b = 0.0; + a = 1.0; + break; + case uiUnderlineColorGrammar: + r = 0.0; + g = 1.0; + b = 0.0; + a = 1.0; + break; + case uiUnderlineColorAuxiliary: + r = 0.0; + g = 0.0; + b = 1.0; + a = 1.0; + break; + } + dea->setUnderlineColor(r, g, b, a); + } + return dea; + } +}; + +// also needed by applyEffectsAttributes() below +// TODO provide all the fields of std::hash and std::equal_to? +class applyEffectsHash { +public: + typedef combinedEffectsAttr *ceaptr; + size_t operator()(applyEffectsHash::ceaptr const &cea) const noexcept + { + return cea->hash(); + } +}; + +class applyEffectsEqualTo { +public: + typedef combinedEffectsAttr *ceaptr; + bool operator()(const applyEffectsEqualTo::ceaptr &a, const applyEffectsEqualTo::ceaptr &b) const + { + return a->equals(b); + } +}; + +static HRESULT addEffectAttributeToRange(struct foreachParams *p, size_t start, size_t end, uiAttribute *attr) +{ + IUnknown *u; + combinedEffectsAttr *cea; + DWRITE_TEXT_RANGE range; + size_t diff; + HRESULT hr; + + while (start < end) { + hr = p->layout->GetDrawingEffect(start, &u, &range); + if (hr != S_OK) + return hr; + cea = (combinedEffectsAttr *) u; + if (cea == NULL) + cea = new combinedEffectsAttr(attr); + else + cea = cea->cloneWith(attr); + // clamp range within [start, end) + if (range.startPosition < start) { + diff = start - range.startPosition; + range.startPosition = start; + range.length -= diff; + } + if ((range.startPosition + range.length) > end) + range.length = end - range.startPosition; + hr = p->layout->SetDrawingEffect(cea, range); + // SetDrawingEffect will AddRef(), so Release() our copy + // (and we're abandoning early if that failed, so this will make sure things are cleaned up in that case) + cea->Release(); + if (hr != S_OK) + return hr; + start += range.length; + } + return S_OK; +} + +static void addBackgroundParams(struct foreachParams *p, size_t start, size_t end, const uiAttribute *attr) +{ + struct drawTextBackgroundParams *params; + + params = uiprivNew(struct drawTextBackgroundParams); + params->start = start; + params->end = end; + uiAttributeColor(attr, &(params->r), &(params->g), &(params->b), &(params->a)); + p->backgroundParams->push_back(params); +} + +static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute *attr, size_t start, size_t end, void *data) +{ + struct foreachParams *p = (struct foreachParams *) data; + DWRITE_TEXT_RANGE range; + WCHAR *wfamily; + BOOL hasUnderline; + IDWriteTypography *dt; + HRESULT hr; + + start = uiprivAttributedStringUTF8ToUTF16(s, start); + end = uiprivAttributedStringUTF8ToUTF16(s, end); + range.startPosition = start; + range.length = end - start; + switch (uiAttributeGetType(attr)) { + case uiAttributeTypeFamily: + wfamily = toUTF16(uiAttributeFamily(attr)); + hr = p->layout->SetFontFamilyName(wfamily, range); + if (hr != S_OK) + logHRESULT(L"error applying family name attribute", hr); + uiprivFree(wfamily); + break; + case uiAttributeTypeSize: + hr = p->layout->SetFontSize( +// TODO unify with fontmatch.cpp and/or attrstr.hpp +#define pointSizeToDWriteSize(size) (size * (96.0 / 72.0)) + pointSizeToDWriteSize(uiAttributeSize(attr)), + range); + if (hr != S_OK) + logHRESULT(L"error applying size attribute", hr); + break; + case uiAttributeTypeWeight: + hr = p->layout->SetFontWeight( + uiprivWeightToDWriteWeight(uiAttributeWeight(attr)), + range); + if (hr != S_OK) + logHRESULT(L"error applying weight attribute", hr); + break; + case uiAttributeTypeItalic: + hr = p->layout->SetFontStyle( + uiprivItalicToDWriteStyle(uiAttributeItalic(attr)), + range); + if (hr != S_OK) + logHRESULT(L"error applying italic attribute", hr); + break; + case uiAttributeTypeStretch: + hr = p->layout->SetFontStretch( + uiprivStretchToDWriteStretch(uiAttributeStretch(attr)), + range); + if (hr != S_OK) + logHRESULT(L"error applying stretch attribute", hr); + break; + case uiAttributeTypeUnderline: + // mark that we have an underline; otherwise, DirectWrite will never call our custom renderer's DrawUnderline() method + hasUnderline = FALSE; + if (uiAttributeUnderline(attr) != uiUnderlineNone) + hasUnderline = TRUE; + hr = p->layout->SetUnderline(hasUnderline, range); + if (hr != S_OK) + logHRESULT(L"error applying underline attribute", hr); + // and fall through to set the underline style through the drawing effect + case uiAttributeTypeColor: + case uiAttributeTypeUnderlineColor: + // TODO const-correct this properly + hr = addEffectAttributeToRange(p, start, end, (uiAttribute *) attr); + if (hr != S_OK) + logHRESULT(L"error applying effect (color, underline, or underline color) attribute", hr); + break; + case uiAttributeTypeBackground: + addBackgroundParams(p, start, end, attr); + break; + case uiAttributeTypeFeatures: + // only generate an attribute if not NULL + // TODO do we still need to do this or not... + if (uiAttributeFeatures(attr) == NULL) + break; + dt = uiprivOpenTypeFeaturesToIDWriteTypography(uiAttributeFeatures(attr)); + hr = p->layout->SetTypography(dt, range); + if (hr != S_OK) + logHRESULT(L"error applying features attribute", hr); + dt->Release(); + break; + } + return uiForEachContinue; +} + +static HRESULT applyEffectsAttributes(struct foreachParams *p) +{ + IUnknown *u; + combinedEffectsAttr *cea; + drawingEffectsAttr *dea; + DWRITE_TEXT_RANGE range; + // here's the magic: this std::unordered_map will deduplicate all of our combinedEffectsAttrs, mapping all identical ones to a single drawingEffectsAttr + // because drawingEffectsAttr is the *actual* drawing effect we want for rendering, we also replace the combinedEffectsAttrs with them in the IDWriteTextLayout at the same time + // note the use of our custom hash and equal_to implementations + std::unordered_map effects; + HRESULT hr; + + // go through, replacing every combinedEffectsAttr with the proper drawingEffectsAttr + range.startPosition = 0; + // and in case this while loop never runs, make hr valid to start with + hr = S_OK; + while (range.startPosition < p->len) { + hr = p->layout->GetDrawingEffect(range.startPosition, &u, &range); + if (hr != S_OK) + // note that we are breaking instead of returning; this allows us to clean up on failure + break; + cea = (combinedEffectsAttr *) u; + if (cea != NULL) { + auto diter = effects.find(cea); + if (diter != effects.end()) + dea = diter->second; + else { + dea = cea->toDrawingEffectsAttr(); + effects.insert({cea, dea}); + } + hr = p->layout->SetDrawingEffect(dea, range); + // don't release dea; we need the reference that's inside the map + // (we don't take extra references on lookup, so this will be fine) + if (hr != S_OK) + break; + } + range.startPosition += range.length; + } + + // and clean up, finally destroying the combinedEffectAttrs too + // we do this in the case of failure as well, to make sure everything is properly cleaned up + for (auto iter = effects.begin(); iter != effects.end(); iter++) { + iter->first->Release(); + iter->second->Release(); + } + return hr; +} + +void uiprivAttributedStringApplyAttributesToDWriteTextLayout(uiDrawTextLayoutParams *p, IDWriteTextLayout *layout, std::vector **backgroundParams) +{ + struct foreachParams fep; + HRESULT hr; + + fep.s = uiprivAttributedStringUTF16String(p->String); + fep.len = uiprivAttributedStringUTF16Len(p->String); + fep.layout = layout; + fep.backgroundParams = new std::vector; + uiAttributedStringForEachAttribute(p->String, processAttribute, &fep); + hr = applyEffectsAttributes(&fep); + if (hr != S_OK) + logHRESULT(L"error applying effects attributes", hr); + *backgroundParams = fep.backgroundParams; +} diff --git a/windows/attrstr.hpp b/windows/attrstr.hpp new file mode 100644 index 00000000..bd522ca1 --- /dev/null +++ b/windows/attrstr.hpp @@ -0,0 +1,85 @@ +// 11 march 2018 +#include "../common/attrstr.h" + +// dwrite.cpp +extern IDWriteFactory *dwfactory; +extern HRESULT uiprivInitDrawText(void); +extern void uiprivUninitDrawText(void); +struct fontCollection { + IDWriteFontCollection *fonts; + WCHAR userLocale[LOCALE_NAME_MAX_LENGTH]; + int userLocaleSuccess; +}; +extern fontCollection *uiprivLoadFontCollection(void); +extern WCHAR *uiprivFontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family); +extern void uiprivFontCollectionFree(fontCollection *fc); +extern WCHAR *uiprivFontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names); + +// opentype.cpp +extern IDWriteTypography *uiprivOpenTypeFeaturesToIDWriteTypography(const uiOpenTypeFeatures *otf); + +// fontmatch.cpp +extern DWRITE_FONT_WEIGHT uiprivWeightToDWriteWeight(uiTextWeight w); +extern DWRITE_FONT_STYLE uiprivItalicToDWriteStyle(uiTextItalic i); +extern DWRITE_FONT_STRETCH uiprivStretchToDWriteStretch(uiTextStretch s); +extern void uiprivFontDescriptorFromIDWriteFont(IDWriteFont *font, uiFontDescriptor *uidesc); + +// attrstr.cpp +// TODO +struct drawTextBackgroundParams; +extern void uiprivAttributedStringApplyAttributesToDWriteTextLayout(uiDrawTextLayoutParams *p, IDWriteTextLayout *layout, std::vector **backgroundFuncs); + +// drawtext.cpp +class drawingEffectsAttr : public IUnknown { + ULONG refcount; + + bool hasColor; + double r; + double g; + double b; + double a; + + bool hasUnderline; + uiUnderline u; + + bool hasUnderlineColor; + double ur; + double ug; + double ub; + double ua; +public: + drawingEffectsAttr(void); + + // IUnknown + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject); + virtual ULONG STDMETHODCALLTYPE AddRef(void); + virtual ULONG STDMETHODCALLTYPE Release(void); + + void setColor(double r, double g, double b, double a); + void setUnderline(uiUnderline u); + void setUnderlineColor(double r, double g, double b, double a); + HRESULT mkColorBrush(ID2D1RenderTarget *rt, ID2D1SolidColorBrush **b); + HRESULT underline(uiUnderline *u); + HRESULT mkUnderlineBrush(ID2D1RenderTarget *rt, ID2D1SolidColorBrush **b); +}; +// TODO figure out where this type should *really* go in all the headers... +struct drawTextBackgroundParams { + size_t start; + size_t end; + double r; + double g; + double b; + double a; +}; + +// fontdialog.cpp +struct fontDialogParams { + IDWriteFont *font; + double size; + WCHAR *familyName; + WCHAR *styleName; +}; +extern BOOL uiprivShowFontDialog(HWND parent, struct fontDialogParams *params); +extern void uiprivLoadInitialFontDialogParams(struct fontDialogParams *params); +extern void uiprivDestroyFontDialogParams(struct fontDialogParams *params); +extern WCHAR *uiprivFontDialogParamsToString(struct fontDialogParams *params); diff --git a/windows/button.cpp b/windows/button.cpp index 3b12e726..d8913ec7 100644 --- a/windows/button.cpp +++ b/windows/button.cpp @@ -95,7 +95,7 @@ uiButton *uiNewButton(const char *text) BS_PUSHBUTTON | WS_TABSTOP, hInstance, NULL, TRUE); - uiFree(wtext); + uiprivFree(wtext); uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b)); uiButtonOnClicked(b, defaultOnClicked, NULL); diff --git a/windows/checkbox.cpp b/windows/checkbox.cpp index be425c00..3d8c92e3 100644 --- a/windows/checkbox.cpp +++ b/windows/checkbox.cpp @@ -108,7 +108,7 @@ uiCheckbox *uiNewCheckbox(const char *text) BS_CHECKBOX | WS_TABSTOP, hInstance, NULL, TRUE); - uiFree(wtext); + uiprivFree(wtext); uiWindowsRegisterWM_COMMANDHandler(c->hwnd, onWM_COMMAND, uiControl(c)); uiCheckboxOnToggled(c, defaultOnToggled, NULL); diff --git a/windows/colordialog.cpp b/windows/colordialog.cpp index 2efe72c8..d3d9bde9 100644 --- a/windows/colordialog.cpp +++ b/windows/colordialog.cpp @@ -228,7 +228,7 @@ static void updateDouble(HWND hwnd, double d, HWND whichChanged) return; str = ftoutf16(d); setWindowText(hwnd, str); - uiFree(str); + uiprivFree(str); } static void updateDialog(struct colorDialog *c, HWND whichChanged) @@ -259,22 +259,22 @@ static void updateDialog(struct colorDialog *c, HWND whichChanged) if (whichChanged != c->editRInt) { str = itoutf16(rb); setWindowText(c->editRInt, str); - uiFree(str); + uiprivFree(str); } if (whichChanged != c->editGInt) { str = itoutf16(gb); setWindowText(c->editGInt, str); - uiFree(str); + uiprivFree(str); } if (whichChanged != c->editBInt) { str = itoutf16(bb); setWindowText(c->editBInt, str); - uiFree(str); + uiprivFree(str); } if (whichChanged != c->editAInt) { str = itoutf16(ab); setWindowText(c->editAInt, str); - uiFree(str); + uiprivFree(str); } if (whichChanged != c->editHex) { @@ -956,7 +956,7 @@ static struct colorDialog *beginColorDialog(HWND hwnd, LPARAM lParam) { struct colorDialog *c; - c = uiNew(struct colorDialog); + c = uiprivNew(struct colorDialog); c->hwnd = hwnd; c->out = (struct colorDialogRGBA *) lParam; // load initial values now @@ -995,7 +995,7 @@ static void endColorDialog(struct colorDialog *c, INT_PTR code) { if (EndDialog(c->hwnd, code) == 0) logLastError(L"error ending color dialog"); - uiFree(c); + uiprivFree(c); } // TODO make this void on the font dialog too @@ -1020,7 +1020,7 @@ static double editDouble(HWND hwnd) s = windowText(hwnd); d = _wtof(s); - uiFree(s); + uiprivFree(s); return d; } @@ -1111,7 +1111,7 @@ static int editInt(HWND hwnd) s = windowText(hwnd); i = _wtoi(s); - uiFree(s); + uiprivFree(s); return i; } @@ -1176,7 +1176,7 @@ static void hexChanged(struct colorDialog *c) buf = windowText(c->editHex); is = hex2RGBA(buf, &r, &g, &b, &a); - uiFree(buf); + uiprivFree(buf); if (!is) return; rgb2HSV(r, g, b, &(c->h), &(c->s), &(c->v)); diff --git a/windows/combobox.cpp b/windows/combobox.cpp index 87c999ea..50f49dd7 100644 --- a/windows/combobox.cpp +++ b/windows/combobox.cpp @@ -66,7 +66,7 @@ void uiComboboxAppend(uiCombobox *c, const char *text) logLastError(L"error appending item to uiCombobox"); else if (res == (LRESULT) CB_ERRSPACE) logLastError(L"memory exhausted appending item to uiCombobox"); - uiFree(wtext); + uiprivFree(wtext); } int uiComboboxSelected(uiCombobox *c) diff --git a/windows/datetimepicker.cpp b/windows/datetimepicker.cpp index e105c2fd..6784fec2 100644 --- a/windows/datetimepicker.cpp +++ b/windows/datetimepicker.cpp @@ -19,7 +19,7 @@ static WCHAR *expandYear(WCHAR *dts, int n) int ny = 0; // allocate more than we need to be safe - out = (WCHAR *) uiAlloc((n * 3) * sizeof (WCHAR), "WCHAR[]"); + out = (WCHAR *) uiprivAlloc((n * 3) * sizeof (WCHAR), "WCHAR[]"); q = out; for (p = dts; *p != L'\0'; p++) { // first, if the current character is a y, increment the number of consecutive ys @@ -44,7 +44,7 @@ static WCHAR *expandYear(WCHAR *dts, int n) if (*p == L'\'') break; if (*p == L'\0') - implbug("unterminated quote in system-provided locale date string in expandYear()"); + uiprivImplBug("unterminated quote in system-provided locale date string in expandYear()"); *q++ = *p; } // and fall through to copy the closing quote @@ -73,17 +73,17 @@ static void setDateTimeFormat(HWND hwnd) ndate = GLI(LOCALE_SSHORTDATE, NULL, 0); if (ndate == 0) logLastError(L"error getting date string length"); - date = (WCHAR *) uiAlloc(ndate * sizeof (WCHAR), "WCHAR[]"); + date = (WCHAR *) uiprivAlloc(ndate * sizeof (WCHAR), "WCHAR[]"); if (GLI(LOCALE_SSHORTDATE, date, ndate) == 0) logLastError(L"error geting date string"); unexpandedDate = date; // so we can free it date = expandYear(unexpandedDate, ndate); - uiFree(unexpandedDate); + uiprivFree(unexpandedDate); ntime = GLI(LOCALE_STIMEFORMAT, NULL, 0); if (ndate == 0) logLastError(L"error getting time string length"); - time = (WCHAR *) uiAlloc(ntime * sizeof (WCHAR), "WCHAR[]"); + time = (WCHAR *) uiprivAlloc(ntime * sizeof (WCHAR), "WCHAR[]"); if (GLI(LOCALE_STIMEFORMAT, time, ntime) == 0) logLastError(L"error geting time string"); @@ -91,9 +91,9 @@ static void setDateTimeFormat(HWND hwnd) if (SendMessageW(hwnd, DTM_SETFORMAT, 0, (LPARAM) datetime) == 0) logLastError(L"error applying format string to date/time picker"); - uiFree(datetime); - uiFree(time); - uiFree(date); + uiprivFree(datetime); + uiprivFree(time); + uiprivFree(date); } // control implementation diff --git a/windows/debug.cpp b/windows/debug.cpp index cfafffdc..bd512743 100644 --- a/windows/debug.cpp +++ b/windows/debug.cpp @@ -26,7 +26,7 @@ HRESULT _logLastError(debugargs, const WCHAR *s) if (useFormatted) LocalFree(formatted); // ignore error printDebug(msg); - uiFree(msg); + uiprivFree(msg); DebugBreak(); SetLastError(le); @@ -53,13 +53,13 @@ HRESULT _logHRESULT(debugargs, const WCHAR *s, HRESULT hr) if (useFormatted) LocalFree(formatted); // ignore error printDebug(msg); - uiFree(msg); + uiprivFree(msg); DebugBreak(); return hr; } -void realbug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) +void uiprivRealBug(const char *file, const char *line, const char *func, const char *prefix, const char *format, va_list ap) { va_list ap2; char *msg; @@ -71,14 +71,14 @@ void realbug(const char *file, const char *line, const char *func, const char *p va_end(ap2); n++; // terminating '\0' - msg = (char *) uiAlloc(n * sizeof (char), "char[]"); + msg = (char *) uiprivAlloc(n * sizeof (char), "char[]"); // includes terminating '\0' according to example in https://msdn.microsoft.com/en-us/library/xa1a1a6z.aspx vsprintf_s(msg, n, format, ap); final = strf(L"[libui] %hs:%hs:%hs() %hs%hs\n", file, line, func, prefix, msg); - uiFree(msg); + uiprivFree(msg); printDebug(final); - uiFree(final); + uiprivFree(final); DebugBreak(); } diff --git a/windows/draw.cpp b/windows/draw.cpp index 5f4d29f1..a5e5033a 100644 --- a/windows/draw.cpp +++ b/windows/draw.cpp @@ -107,7 +107,7 @@ uiDrawContext *newContext(ID2D1RenderTarget *rt) { uiDrawContext *c; - c = uiNew(uiDrawContext); + c = uiprivNew(uiDrawContext); c->rt = rt; c->states = new std::vector; resetTarget(c->rt); @@ -120,9 +120,9 @@ void freeContext(uiDrawContext *c) c->currentClip->Release(); if (c->states->size() != 0) // TODO do this on other platforms - userbug("You did not balance uiDrawSave() and uiDrawRestore() calls."); + uiprivUserBug("You did not balance uiDrawSave() and uiDrawRestore() calls."); delete c->states; - uiFree(c); + uiprivFree(c); } static ID2D1Brush *makeSolidBrush(uiDrawBrush *b, ID2D1RenderTarget *rt, D2D1_BRUSH_PROPERTIES *props) @@ -152,7 +152,7 @@ static ID2D1GradientStopCollection *mkstops(uiDrawBrush *b, ID2D1RenderTarget *r size_t i; HRESULT hr; - stops = (D2D1_GRADIENT_STOP *) uiAlloc(b->NumStops * sizeof (D2D1_GRADIENT_STOP), "D2D1_GRADIENT_STOP[]"); + stops = (D2D1_GRADIENT_STOP *) uiprivAlloc(b->NumStops * sizeof (D2D1_GRADIENT_STOP), "D2D1_GRADIENT_STOP[]"); for (i = 0; i < b->NumStops; i++) { stops[i].position = b->Stops[i].Pos; stops[i].color.r = b->Stops[i].R; @@ -170,7 +170,7 @@ static ID2D1GradientStopCollection *mkstops(uiDrawBrush *b, ID2D1RenderTarget *r if (hr != S_OK) logHRESULT(L"error creating stop collection", hr); - uiFree(stops); + uiprivFree(stops); return s; } @@ -253,7 +253,7 @@ static ID2D1Brush *makeBrush(uiDrawBrush *b, ID2D1RenderTarget *rt) } // TODO do this on all platforms - userbug("Invalid brush type %d given to drawing operation.", b->Type); + uiprivUserBug("Invalid brush type %d given to drawing operation.", b->Type); // TODO dummy brush? return NULL; // make compiler happy } @@ -365,7 +365,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *p, uiDrawBrush *b, uiDrawStrokeP // TODO be sure to formally document this if (sp->NumDashes != 0) { dsp.dashStyle = D2D1_DASH_STYLE_CUSTOM; - dashes = (FLOAT *) uiAlloc(sp->NumDashes * sizeof (FLOAT), "FLOAT[]"); + dashes = (FLOAT *) uiprivAlloc(sp->NumDashes * sizeof (FLOAT), "FLOAT[]"); for (i = 0; i < sp->NumDashes; i++) dashes[i] = sp->Dashes[i] / sp->Thickness; } @@ -378,7 +378,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *p, uiDrawBrush *b, uiDrawStrokeP if (hr != S_OK) logHRESULT(L"error creating stroke style", hr); if (sp->NumDashes != 0) - uiFree(dashes); + uiprivFree(dashes); cliplayer = applyClip(c); c->rt->DrawGeometry( diff --git a/windows/draw.hpp b/windows/draw.hpp index b015791f..c271e4db 100644 --- a/windows/draw.hpp +++ b/windows/draw.hpp @@ -1,5 +1,7 @@ // 5 may 2016 +// TODO resolve overlap between this and the other hpp files (some functions leaked into uipriv_windows.hpp) + // draw.cpp extern ID2D1Factory *d2dfactory; struct uiDrawContext { diff --git a/windows/drawmatrix.cpp b/windows/drawmatrix.cpp index 090972a5..4ddc5e9a 100644 --- a/windows/drawmatrix.cpp +++ b/windows/drawmatrix.cpp @@ -113,5 +113,5 @@ void uiDrawMatrixTransformPoint(uiDrawMatrix *m, double *x, double *y) void uiDrawMatrixTransformSize(uiDrawMatrix *m, double *x, double *y) { - fallbackTransformSize(m, x, y); + uiprivFallbackTransformSize(m, x, y); } diff --git a/windows/drawpath.cpp b/windows/drawpath.cpp index 49855be6..34b15466 100644 --- a/windows/drawpath.cpp +++ b/windows/drawpath.cpp @@ -17,7 +17,7 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode fillmode) uiDrawPath *p; HRESULT hr; - p = uiNew(uiDrawPath); + p = uiprivNew(uiDrawPath); hr = d2dfactory->CreatePathGeometry(&(p->path)); if (hr != S_OK) logHRESULT(L"error creating path", hr); @@ -43,7 +43,7 @@ void uiDrawFreePath(uiDrawPath *p) // TODO close sink first? p->sink->Release(); p->path->Release(); - uiFree(p); + uiprivFree(p); } void uiDrawPathNewFigure(uiDrawPath *p, double x, double y) @@ -66,6 +66,7 @@ void uiDrawPathNewFigure(uiDrawPath *p, double x, double y) // That is to say, it's NOT THE SWEEP. // The sweep is defined by the start and end points and whether the arc is "large". // As a result, this design does not allow for full circles or ellipses with a single arc; they have to be simulated with two. +// TODO https://github.com/Microsoft/WinObjC/blob/develop/Frameworks/CoreGraphics/CGPath.mm#L313 struct arc { double xCenter; @@ -241,6 +242,6 @@ void uiDrawPathEnd(uiDrawPath *p) ID2D1PathGeometry *pathGeometry(uiDrawPath *p) { if (p->sink != NULL) - userbug("You cannot draw with a uiDrawPath that was not ended. (path: %p)", p); + uiprivUserBug("You cannot draw with a uiDrawPath that was not ended. (path: %p)", p); return p->path; } diff --git a/windows/drawtext.cpp b/windows/drawtext.cpp index 05a24f67..ec2ae152 100644 --- a/windows/drawtext.cpp +++ b/windows/drawtext.cpp @@ -1,398 +1,115 @@ -// 22 december 2015 +// 17 january 2017 #include "uipriv_windows.hpp" #include "draw.hpp" -// TODO really migrate +#include "attrstr.hpp" -// notes: -// only available in windows 8 and newer: -// - character spacing -// - kerning control -// - justficiation (how could I possibly be making this up?!) -// - vertical text (SERIOUSLY?! WHAT THE ACTUAL FUCK, MICROSOFT?!?!?!? DID YOU NOT THINK ABOUT THIS THE FIRST TIME, TRYING TO IMPROVE THE INTERNATIONALIZATION OF WINDOWS 7?!?!?! bonus: some parts of MSDN even say 8.1 and up only!) - -struct uiDrawFontFamilies { - fontCollection *fc; -}; - -uiDrawFontFamilies *uiDrawListFontFamilies(void) -{ - struct uiDrawFontFamilies *ff; - - ff = uiNew(struct uiDrawFontFamilies); - ff->fc = loadFontCollection(); - return ff; -} - -int uiDrawFontFamiliesNumFamilies(uiDrawFontFamilies *ff) -{ - return ff->fc->fonts->GetFontFamilyCount(); -} - -char *uiDrawFontFamiliesFamily(uiDrawFontFamilies *ff, int n) -{ - IDWriteFontFamily *family; - WCHAR *wname; - char *name; - HRESULT hr; - - hr = ff->fc->fonts->GetFontFamily(n, &family); - if (hr != S_OK) - logHRESULT(L"error getting font out of collection", hr); - wname = fontCollectionFamilyName(ff->fc, family); - name = toUTF8(wname); - uiFree(wname); - family->Release(); - return name; -} - -void uiDrawFreeFontFamilies(uiDrawFontFamilies *ff) -{ - fontCollectionFree(ff->fc); - uiFree(ff); -} - -struct uiDrawTextFont { - IDWriteFont *f; - WCHAR *family; // save for convenience in uiDrawNewTextLayout() - double size; -}; - -uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size) -{ - uiDrawTextFont *font; - WCHAR *copy; - HRESULT hr; - - font = uiNew(uiDrawTextFont); - font->f = df; - if (addRef) - font->f->AddRef(); - if (copyFamily) { - copy = (WCHAR *) uiAlloc((wcslen(family) + 1) * sizeof (WCHAR), "WCHAR[]"); - wcscpy(copy, family); - font->family = copy; - } else - font->family = family; - font->size = size; - return font; -} - -// TODO consider moving these all to dwrite.cpp - -// TODO MinGW-w64 is missing this one -#define DWRITE_FONT_WEIGHT_SEMI_LIGHT (DWRITE_FONT_WEIGHT(350)) -static const struct { - bool lastOne; - uiDrawTextWeight uival; - DWRITE_FONT_WEIGHT dwval; -} dwriteWeights[] = { - { false, uiDrawTextWeightThin, DWRITE_FONT_WEIGHT_THIN }, - { false, uiDrawTextWeightUltraLight, DWRITE_FONT_WEIGHT_ULTRA_LIGHT }, - { false, uiDrawTextWeightLight, DWRITE_FONT_WEIGHT_LIGHT }, - { false, uiDrawTextWeightBook, DWRITE_FONT_WEIGHT_SEMI_LIGHT }, - { false, uiDrawTextWeightNormal, DWRITE_FONT_WEIGHT_NORMAL }, - { false, uiDrawTextWeightMedium, DWRITE_FONT_WEIGHT_MEDIUM }, - { false, uiDrawTextWeightSemiBold, DWRITE_FONT_WEIGHT_SEMI_BOLD }, - { false, uiDrawTextWeightBold, DWRITE_FONT_WEIGHT_BOLD }, - { false, uiDrawTextWeightUltraBold, DWRITE_FONT_WEIGHT_ULTRA_BOLD }, - { false, uiDrawTextWeightHeavy, DWRITE_FONT_WEIGHT_HEAVY }, - { true, uiDrawTextWeightUltraHeavy, DWRITE_FONT_WEIGHT_ULTRA_BLACK, }, -}; - -static const struct { - bool lastOne; - uiDrawTextItalic uival; - DWRITE_FONT_STYLE dwval; -} dwriteItalics[] = { - { false, uiDrawTextItalicNormal, DWRITE_FONT_STYLE_NORMAL }, - { false, uiDrawTextItalicOblique, DWRITE_FONT_STYLE_OBLIQUE }, - { true, uiDrawTextItalicItalic, DWRITE_FONT_STYLE_ITALIC }, -}; - -static const struct { - bool lastOne; - uiDrawTextStretch uival; - DWRITE_FONT_STRETCH dwval; -} dwriteStretches[] = { - { false, uiDrawTextStretchUltraCondensed, DWRITE_FONT_STRETCH_ULTRA_CONDENSED }, - { false, uiDrawTextStretchExtraCondensed, DWRITE_FONT_STRETCH_EXTRA_CONDENSED }, - { false, uiDrawTextStretchCondensed, DWRITE_FONT_STRETCH_CONDENSED }, - { false, uiDrawTextStretchSemiCondensed, DWRITE_FONT_STRETCH_SEMI_CONDENSED }, - { false, uiDrawTextStretchNormal, DWRITE_FONT_STRETCH_NORMAL }, - { false, uiDrawTextStretchSemiExpanded, DWRITE_FONT_STRETCH_SEMI_EXPANDED }, - { false, uiDrawTextStretchExpanded, DWRITE_FONT_STRETCH_EXPANDED }, - { false, uiDrawTextStretchExtraExpanded, DWRITE_FONT_STRETCH_EXTRA_EXPANDED }, - { true, uiDrawTextStretchUltraExpanded, DWRITE_FONT_STRETCH_ULTRA_EXPANDED }, -}; - -void attrToDWriteAttr(struct dwriteAttr *attr) -{ - bool found; - int i; - - found = false; - for (i = 0; ; i++) { - if (dwriteWeights[i].uival == attr->weight) { - attr->dweight = dwriteWeights[i].dwval; - found = true; - break; - } - if (dwriteWeights[i].lastOne) - break; - } - if (!found) - userbug("Invalid text weight %d passed to text function.", attr->weight); - - found = false; - for (i = 0; ; i++) { - if (dwriteItalics[i].uival == attr->italic) { - attr->ditalic = dwriteItalics[i].dwval; - found = true; - break; - } - if (dwriteItalics[i].lastOne) - break; - } - if (!found) - userbug("Invalid text italic %d passed to text function.", attr->italic); - - found = false; - for (i = 0; ; i++) { - if (dwriteStretches[i].uival == attr->stretch) { - attr->dstretch = dwriteStretches[i].dwval; - found = true; - break; - } - if (dwriteStretches[i].lastOne) - break; - } - if (!found) - // TODO on other platforms too - userbug("Invalid text stretch %d passed to text function.", attr->stretch); -} - -void dwriteAttrToAttr(struct dwriteAttr *attr) -{ - int weight, against, n; - int curdiff, curindex; - bool found; - int i; - - // weight is scaled; we need to test to see what's nearest - weight = (int) (attr->dweight); - against = (int) (dwriteWeights[0].dwval); - curdiff = abs(against - weight); - curindex = 0; - for (i = 1; ; i++) { - against = (int) (dwriteWeights[i].dwval); - n = abs(against - weight); - if (n < curdiff) { - curdiff = n; - curindex = i; - } - if (dwriteWeights[i].lastOne) - break; - } - attr->weight = dwriteWeights[i].uival; - - // italic and stretch are simple values; we can just do a matching search - found = false; - for (i = 0; ; i++) { - if (dwriteItalics[i].dwval == attr->ditalic) { - attr->italic = dwriteItalics[i].uival; - found = true; - break; - } - if (dwriteItalics[i].lastOne) - break; - } - if (!found) - // these are implbug()s because users shouldn't be able to get here directly; TODO? - implbug("invalid italic %d passed to dwriteAttrToAttr()", attr->ditalic); - - found = false; - for (i = 0; ; i++) { - if (dwriteStretches[i].dwval == attr->dstretch) { - attr->stretch = dwriteStretches[i].uival; - found = true; - break; - } - if (dwriteStretches[i].lastOne) - break; - } - if (!found) - implbug("invalid stretch %d passed to dwriteAttrToAttr()", attr->dstretch); -} - -uiDrawTextFont *uiDrawLoadClosestFont(const uiDrawTextFontDescriptor *desc) -{ - uiDrawTextFont *font; - IDWriteFontCollection *collection; - UINT32 index; - BOOL exists; - struct dwriteAttr attr; - IDWriteFontFamily *family; - WCHAR *wfamily; - IDWriteFont *match; - HRESULT hr; - - // always get the latest available font information - hr = dwfactory->GetSystemFontCollection(&collection, TRUE); - if (hr != S_OK) - logHRESULT(L"error getting system font collection", hr); - - wfamily = toUTF16(desc->Family); - hr = collection->FindFamilyName(wfamily, &index, &exists); - if (hr != S_OK) - logHRESULT(L"error finding font family", hr); - if (!exists) - implbug("LONGTERM family not found in uiDrawLoadClosestFont()", hr); - hr = collection->GetFontFamily(index, &family); - if (hr != S_OK) - logHRESULT(L"error loading font family", hr); - - attr.weight = desc->Weight; - attr.italic = desc->Italic; - attr.stretch = desc->Stretch; - attrToDWriteAttr(&attr); - hr = family->GetFirstMatchingFont( - attr.dweight, - attr.dstretch, - attr.ditalic, - &match); - if (hr != S_OK) - logHRESULT(L"error loading font", hr); - - font = mkTextFont(match, - FALSE, // we own the initial reference; no need to add another one - wfamily, FALSE, // will be freed with font - desc->Size); - - family->Release(); - collection->Release(); - - return font; -} - -void uiDrawFreeTextFont(uiDrawTextFont *font) -{ - font->f->Release(); - uiFree(font->family); - uiFree(font); -} - -uintptr_t uiDrawTextFontHandle(uiDrawTextFont *font) -{ - return (uintptr_t) (font->f); -} - -void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc) -{ - // TODO - - desc->Size = font->size; - - // TODO -} - -// text sizes are 1/72 of an inch -// points in Direct2D are 1/96 of an inch (https://msdn.microsoft.com/en-us/library/windows/desktop/ff684173%28v=vs.85%29.aspx, https://msdn.microsoft.com/en-us/library/windows/desktop/hh447022%28v=vs.85%29.aspx) -// As for the actual conversion from design units, see: -// - http://cboard.cprogramming.com/windows-programming/136733-directwrite-font-height-issues.html -// - https://sourceforge.net/p/vstgui/mailman/message/32483143/ -// - http://xboxforums.create.msdn.com/forums/t/109445.aspx -// - https://msdn.microsoft.com/en-us/library/dd183564%28v=vs.85%29.aspx -// - http://www.fontbureau.com/blog/the-em/ -// TODO make points here about how DIPs in DirectWrite == DIPs in Direct2D; if not, figure out what they really are? for the width and layout functions later -static double scaleUnits(double what, double designUnitsPerEm, double size) -{ - return (what / designUnitsPerEm) * (size * (96.0 / 72.0)); -} - -void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) -{ - DWRITE_FONT_METRICS dm; - - font->f->GetMetrics(&dm); - metrics->Ascent = scaleUnits(dm.ascent, dm.designUnitsPerEm, font->size); - metrics->Descent = scaleUnits(dm.descent, dm.designUnitsPerEm, font->size); - // TODO what happens if dm.xxx is negative? - // TODO remember what this was for - metrics->Leading = scaleUnits(dm.lineGap, dm.designUnitsPerEm, font->size); - metrics->UnderlinePos = scaleUnits(dm.underlinePosition, dm.designUnitsPerEm, font->size); - metrics->UnderlineThickness = scaleUnits(dm.underlineThickness, dm.designUnitsPerEm, font->size); -} - -// some attributes, such as foreground color, can't be applied until after we establish a Direct2D context :/ so we have to prepare all attributes in advance -// also since there's no way to clear the attributes from a layout en masse (apart from overwriting them all), we'll play it safe by creating a new layout each time -enum layoutAttrType { - layoutAttrColor, -}; - -struct layoutAttr { - enum layoutAttrType type; - int start; - int end; - double components[4]; -}; +// TODO verify our renderer is correct, especially with regards to snapping struct uiDrawTextLayout { - WCHAR *text; - size_t textlen; - size_t *graphemes; - double width; IDWriteTextFormat *format; - std::vector *attrs; + IDWriteTextLayout *layout; + std::vector *backgroundParams; + // for converting DirectWrite indices from/to byte offsets + size_t *u8tou16; + size_t nUTF8; + size_t *u16tou8; + size_t nUTF16; }; -uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width) +// TODO copy notes about DirectWrite DIPs being equal to Direct2D DIPs here + +// typographic points are 1/72 inch; this parameter is 1/96 inch +// fortunately Microsoft does this too, in https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554%28v=vs.85%29.aspx +#define pointSizeToDWriteSize(size) (size * (96.0 / 72.0)) + +// TODO move this and the layout creation stuff to attrstr.cpp like the other ports, or move the other ports into their drawtext.* files +// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before) +static std::map dwriteAligns = { + { uiDrawTextAlignLeft, DWRITE_TEXT_ALIGNMENT_LEADING }, + { uiDrawTextAlignCenter, DWRITE_TEXT_ALIGNMENT_CENTER }, + { uiDrawTextAlignRight, DWRITE_TEXT_ALIGNMENT_TRAILING }, +}; + +uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p) { - uiDrawTextLayout *layout; + uiDrawTextLayout *tl; + WCHAR *wDefaultFamily; + DWRITE_WORD_WRAPPING wrap; + FLOAT maxWidth; HRESULT hr; - layout = uiNew(uiDrawTextLayout); + tl = uiprivNew(uiDrawTextLayout); - hr = dwfactory->CreateTextFormat(defaultFont->family, - NULL, - defaultFont->f->GetWeight(), - defaultFont->f->GetStyle(), - defaultFont->f->GetStretch(), - // typographic points are 1/72 inch; this parameter is 1/96 inch - // fortunately Microsoft does this too, in https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554%28v=vs.85%29.aspx - defaultFont->size * (96.0 / 72.0), + wDefaultFamily = toUTF16(p->DefaultFont->Family); + hr = dwfactory->CreateTextFormat( + wDefaultFamily, NULL, + uiprivWeightToDWriteWeight(p->DefaultFont->Weight), + uiprivItalicToDWriteStyle(p->DefaultFont->Italic), + uiprivStretchToDWriteStretch(p->DefaultFont->Stretch), + pointSizeToDWriteSize(p->DefaultFont->Size), // see http://stackoverflow.com/questions/28397971/idwritefactorycreatetextformat-failing and https://msdn.microsoft.com/en-us/library/windows/desktop/dd368203.aspx - // TODO use the current locale again? + // TODO use the current locale? L"", - &(layout->format)); + &(tl->format)); + uiprivFree(wDefaultFamily); if (hr != S_OK) logHRESULT(L"error creating IDWriteTextFormat", hr); + hr = tl->format->SetTextAlignment(dwriteAligns[p->Align]); + if (hr != S_OK) + logHRESULT(L"error applying text layout alignment", hr); - layout->text = toUTF16(text); - layout->textlen = wcslen(layout->text); - layout->graphemes = graphemes(layout->text); + hr = dwfactory->CreateTextLayout( + (const WCHAR *) uiprivAttributedStringUTF16String(p->String), uiprivAttributedStringUTF16Len(p->String), + tl->format, + // FLOAT is float, not double, so this should work... TODO + FLT_MAX, FLT_MAX, + &(tl->layout)); + if (hr != S_OK) + logHRESULT(L"error creating IDWriteTextLayout", hr); - uiDrawTextLayoutSetWidth(layout, width); + // and set the width + // this is the only wrapping mode (apart from "no wrap") available prior to Windows 8.1 (TODO verify this fact) (TODO this should be the default anyway) + wrap = DWRITE_WORD_WRAPPING_WRAP; + maxWidth = (FLOAT) (p->Width); + if (p->Width < 0) { + // TODO is this wrapping juggling even necessary? + wrap = DWRITE_WORD_WRAPPING_NO_WRAP; + // setting the max width in this case technically isn't needed since the wrap mode will simply ignore the max width, but let's do it just to be safe + maxWidth = FLT_MAX; // see TODO above + } + hr = tl->layout->SetWordWrapping(wrap); + if (hr != S_OK) + logHRESULT(L"error setting IDWriteTextLayout word wrapping mode", hr); + hr = tl->layout->SetMaxWidth(maxWidth); + if (hr != S_OK) + logHRESULT(L"error setting IDWriteTextLayout max layout width", hr); - layout->attrs = new std::vector; + uiprivAttributedStringApplyAttributesToDWriteTextLayout(p, tl->layout, &(tl->backgroundParams)); - return layout; + // and finally copy the UTF-8/UTF-16 index conversion tables + tl->u8tou16 = uiprivAttributedStringCopyUTF8ToUTF16Table(p->String, &(tl->nUTF8)); + tl->u16tou8 = uiprivAttributedStringCopyUTF16ToUTF8Table(p->String, &(tl->nUTF16)); + + return tl; } -void uiDrawFreeTextLayout(uiDrawTextLayout *layout) +void uiDrawFreeTextLayout(uiDrawTextLayout *tl) { - delete layout->attrs; - layout->format->Release(); - uiFree(layout->graphemes); - uiFree(layout->text); - uiFree(layout); + uiprivFree(tl->u16tou8); + uiprivFree(tl->u8tou16); + for (auto p : *(tl->backgroundParams)) + uiprivFree(p); + delete tl->backgroundParams; + tl->layout->Release(); + tl->format->Release(); + uiprivFree(tl); } -static ID2D1SolidColorBrush *mkSolidBrush(ID2D1RenderTarget *rt, double r, double g, double b, double a) +// TODO make this shared code somehow +static HRESULT mkSolidBrush(ID2D1RenderTarget *rt, double r, double g, double b, double a, ID2D1SolidColorBrush **brush) { D2D1_BRUSH_PROPERTIES props; D2D1_COLOR_F color; - ID2D1SolidColorBrush *brush; - HRESULT hr; ZeroMemory(&props, sizeof (D2D1_BRUSH_PROPERTIES)); props.opacity = 1.0; @@ -403,129 +120,417 @@ static ID2D1SolidColorBrush *mkSolidBrush(ID2D1RenderTarget *rt, double r, doubl color.g = g; color.b = b; color.a = a; - hr = rt->CreateSolidColorBrush( + return rt->CreateSolidColorBrush( &color, &props, - &brush); + brush); +} + +static ID2D1SolidColorBrush *mustMakeSolidBrush(ID2D1RenderTarget *rt, double r, double g, double b, double a) +{ + ID2D1SolidColorBrush *brush; + HRESULT hr; + + hr = mkSolidBrush(rt, r, g, b, a, &brush); if (hr != S_OK) logHRESULT(L"error creating solid brush", hr); return brush; } -IDWriteTextLayout *prepareLayout(uiDrawTextLayout *layout, ID2D1RenderTarget *rt) +// some of the stuff we want to do isn't possible with what DirectWrite provides itself; we need to do it ourselves + +drawingEffectsAttr::drawingEffectsAttr(void) { - IDWriteTextLayout *dl; - DWRITE_TEXT_RANGE range; - IUnknown *unkBrush; - DWRITE_WORD_WRAPPING wrap; - FLOAT maxWidth; - HRESULT hr; + this->refcount = 1; + this->hasColor = false; + this->hasUnderline = false; + this->hasUnderlineColor = false; +} - hr = dwfactory->CreateTextLayout(layout->text, layout->textlen, - layout->format, - // FLOAT is float, not double, so this should work... TODO - FLT_MAX, FLT_MAX, - &dl); - if (hr != S_OK) - logHRESULT(L"error creating IDWriteTextLayout", hr); +HRESULT STDMETHODCALLTYPE drawingEffectsAttr::QueryInterface(REFIID riid, void **ppvObject) +{ + if (ppvObject == NULL) + return E_POINTER; + if (riid == IID_IUnknown) { + this->AddRef(); + *ppvObject = this; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; +} - for (const struct layoutAttr &attr : *(layout->attrs)) { - range.startPosition = layout->graphemes[attr.start]; - range.length = layout->graphemes[attr.end] - layout->graphemes[attr.start]; - switch (attr.type) { - case layoutAttrColor: - if (rt == NULL) // determining extents, not drawing - break; - unkBrush = mkSolidBrush(rt, - attr.components[0], - attr.components[1], - attr.components[2], - attr.components[3]); - hr = dl->SetDrawingEffect(unkBrush, range); - unkBrush->Release(); // associated with dl - break; - default: - hr = E_FAIL; - logHRESULT(L"invalid text attribute type", hr); +ULONG STDMETHODCALLTYPE drawingEffectsAttr::AddRef(void) +{ + this->refcount++; + return this->refcount; +} + +ULONG STDMETHODCALLTYPE drawingEffectsAttr::Release(void) +{ + this->refcount--; + if (this->refcount == 0) { + delete this; + return 0; + } + return this->refcount; +} + +void drawingEffectsAttr::setColor(double r, double g, double b, double a) +{ + this->hasColor = true; + this->r = r; + this->g = g; + this->b = b; + this->a = a; +} + +void drawingEffectsAttr::setUnderline(uiUnderline u) +{ + this->hasUnderline = true; + this->u = u; +} + +void drawingEffectsAttr::setUnderlineColor(double r, double g, double b, double a) +{ + this->hasUnderlineColor = true; + this->ur = r; + this->ug = g; + this->ub = b; + this->ua = a; +} + +HRESULT drawingEffectsAttr::mkColorBrush(ID2D1RenderTarget *rt, ID2D1SolidColorBrush **b) +{ + if (!this->hasColor) { + *b = NULL; + return S_OK; + } + return mkSolidBrush(rt, this->r, this->g, this->b, this->a, b); +} + +HRESULT drawingEffectsAttr::underline(uiUnderline *u) +{ + if (u == NULL) + return E_POINTER; + if (!this->hasUnderline) + return E_UNEXPECTED; + *u = this->u; + return S_OK; +} + +HRESULT drawingEffectsAttr::mkUnderlineBrush(ID2D1RenderTarget *rt, ID2D1SolidColorBrush **b) +{ + if (!this->hasUnderlineColor) { + *b = NULL; + return S_OK; + } + return mkSolidBrush(rt, this->ur, this->ug, this->ub, this->ua, b); +} + +// this is based on http://www.charlespetzold.com/blog/2014/01/Character-Formatting-Extensions-with-DirectWrite.html +class textRenderer : public IDWriteTextRenderer { + ULONG refcount; + ID2D1RenderTarget *rt; + BOOL snap; + ID2D1SolidColorBrush *black; +public: + textRenderer(ID2D1RenderTarget *rt, BOOL snap, ID2D1SolidColorBrush *black) + { + this->refcount = 1; + this->rt = rt; + this->snap = snap; + this->black = black; + } + + // IUnknown + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) + { + if (ppvObject == NULL) + return E_POINTER; + if (riid == IID_IUnknown || + riid == __uuidof (IDWritePixelSnapping) || + riid == __uuidof (IDWriteTextRenderer)) { + this->AddRef(); + *ppvObject = this; + return S_OK; } + *ppvObject = NULL; + return E_NOINTERFACE; + } + + virtual ULONG STDMETHODCALLTYPE AddRef(void) + { + this->refcount++; + return this->refcount; + } + + virtual ULONG STDMETHODCALLTYPE Release(void) + { + this->refcount--; + if (this->refcount == 0) { + delete this; + return 0; + } + return this->refcount; + } + + // IDWritePixelSnapping + virtual HRESULT STDMETHODCALLTYPE GetCurrentTransform(void *clientDrawingContext, DWRITE_MATRIX *transform) + { + D2D1_MATRIX_3X2_F d2dtf; + + if (transform == NULL) + return E_POINTER; + this->rt->GetTransform(&d2dtf); + transform->m11 = d2dtf._11; + transform->m12 = d2dtf._12; + transform->m21 = d2dtf._21; + transform->m22 = d2dtf._22; + transform->dx = d2dtf._31; + transform->dy = d2dtf._32; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetPixelsPerDip(void *clientDrawingContext, FLOAT *pixelsPerDip) + { + FLOAT dpix, dpiy; + + if (pixelsPerDip == NULL) + return E_POINTER; + this->rt->GetDpi(&dpix, &dpiy); + *pixelsPerDip = dpix / 96; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE IsPixelSnappingDisabled(void *clientDrawingContext, BOOL *isDisabled) + { + if (isDisabled == NULL) + return E_POINTER; + *isDisabled = !this->snap; + return S_OK; + } + + // IDWriteTextRenderer + virtual HRESULT STDMETHODCALLTYPE DrawGlyphRun(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuringMode, const DWRITE_GLYPH_RUN *glyphRun, const DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription, IUnknown *clientDrawingEffect) + { + D2D1_POINT_2F baseline; + drawingEffectsAttr *dea = (drawingEffectsAttr *) clientDrawingEffect; + ID2D1SolidColorBrush *brush; + + baseline.x = baselineOriginX; + baseline.y = baselineOriginY; + brush = NULL; + if (dea != NULL) { + HRESULT hr; + + hr = dea->mkColorBrush(this->rt, &brush); + if (hr != S_OK) + return hr; + } + if (brush == NULL) { + brush = this->black; + brush->AddRef(); + } + this->rt->DrawGlyphRun( + baseline, + glyphRun, + brush, + measuringMode); + brush->Release(); + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE DrawInlineObject(void *clientDrawingContext, FLOAT originX, FLOAT originY, IDWriteInlineObject *inlineObject, BOOL isSideways, BOOL isRightToLeft, IUnknown *clientDrawingEffect) + { + if (inlineObject == NULL) + return E_POINTER; + return inlineObject->Draw(clientDrawingContext, this, + originX, originY, + isSideways, isRightToLeft, + clientDrawingEffect); + } + + virtual HRESULT STDMETHODCALLTYPE DrawStrikethrough(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *clientDrawingEffect) + { + // we don't support strikethrough + return E_UNEXPECTED; + } + + // TODO clean this function up + virtual HRESULT STDMETHODCALLTYPE DrawUnderline(void *clientDrawingContext, FLOAT baselineOriginX, FLOAT baselineOriginY, const DWRITE_UNDERLINE *underline, IUnknown *clientDrawingEffect) + { + drawingEffectsAttr *dea = (drawingEffectsAttr *) clientDrawingEffect; + uiUnderline utype; + ID2D1SolidColorBrush *brush; + D2D1_RECT_F rect; + D2D1::Matrix3x2F pixeltf; + FLOAT dpix, dpiy; + D2D1_POINT_2F pt; + HRESULT hr; + + if (underline == NULL) + return E_POINTER; + if (dea == NULL) // we can only get here through an underline + return E_UNEXPECTED; + hr = dea->underline(&utype); + if (hr != S_OK) // we *should* only get here through an underline that's actually set... + return hr; + hr = dea->mkUnderlineBrush(this->rt, &brush); if (hr != S_OK) - logHRESULT(L"error adding attribute to text layout", hr); + return hr; + if (brush == NULL) { + // TODO document this rule if not already done + hr = dea->mkColorBrush(this->rt, &brush); + if (hr != S_OK) + return hr; + } + if (brush == NULL) { + brush = this->black; + brush->AddRef(); + } + rect.left = baselineOriginX; + rect.top = baselineOriginY + underline->offset; + rect.right = rect.left + underline->width; + rect.bottom = rect.top + underline->thickness; + switch (utype) { + case uiUnderlineSingle: + this->rt->FillRectangle(&rect, brush); + break; + case uiUnderlineDouble: + // TODO do any of the matrix methods return errors? + // TODO standardize double-underline shape across platforms? wavy underline shape? + this->rt->GetTransform(&pixeltf); + this->rt->GetDpi(&dpix, &dpiy); + pixeltf = pixeltf * D2D1::Matrix3x2F::Scale(dpix / 96, dpiy / 96); + pt.x = 0; + pt.y = rect.top; + pt = pixeltf.TransformPoint(pt); + rect.top = (FLOAT) ((int) (pt.y + 0.5)); + pixeltf.Invert(); + pt = pixeltf.TransformPoint(pt); + rect.top = pt.y; + // first line + rect.top -= underline->thickness; + // and it seems we need to recompute this + rect.bottom = rect.top + underline->thickness; + this->rt->FillRectangle(&rect, brush); + // second line + rect.top += 2 * underline->thickness; + rect.bottom = rect.top + underline->thickness; + this->rt->FillRectangle(&rect, brush); + break; + case uiUnderlineSuggestion: + { // TODO get rid of the extra block + // TODO properly clean resources on failure + // TODO use fully qualified C overloads for all methods + // TODO ensure all methods properly have errors handled + ID2D1PathGeometry *path; + ID2D1GeometrySink *sink; + double amplitude, period, xOffset, yOffset; + double t; + bool first = true; + HRESULT hr; + + hr = d2dfactory->CreatePathGeometry(&path); + if (hr != S_OK) + return hr; + hr = path->Open(&sink); + if (hr != S_OK) + return hr; + amplitude = underline->thickness; + period = 5 * underline->thickness; + xOffset = baselineOriginX; + yOffset = baselineOriginY + underline->offset; + for (t = 0; t < underline->width; t++) { + double x, angle, y; + D2D1_POINT_2F pt; + + x = t + xOffset; + angle = 2 * uiPi * fmod(x, period) / period; + y = amplitude * sin(angle) + yOffset; + pt.x = x; + pt.y = y; + if (first) { + sink->BeginFigure(pt, D2D1_FIGURE_BEGIN_HOLLOW); + first = false; + } else + sink->AddLine(pt); + } + sink->EndFigure(D2D1_FIGURE_END_OPEN); + hr = sink->Close(); + if (hr != S_OK) + return hr; + sink->Release(); + this->rt->DrawGeometry(path, brush, underline->thickness); + path->Release(); + } + break; + } + brush->Release(); + return S_OK; } +}; - // and set the width - // this is the only wrapping mode (apart from "no wrap") available prior to Windows 8.1 - wrap = DWRITE_WORD_WRAPPING_WRAP; - maxWidth = layout->width; - if (layout->width < 0) { - wrap = DWRITE_WORD_WRAPPING_NO_WRAP; - // setting the max width in this case technically isn't needed since the wrap mode will simply ignore the max width, but let's do it just to be safe - maxWidth = FLT_MAX; // see TODO above - } - hr = dl->SetWordWrapping(wrap); - if (hr != S_OK) - logHRESULT(L"error setting word wrapping mode", hr); - hr = dl->SetMaxWidth(maxWidth); - if (hr != S_OK) - logHRESULT(L"error setting max layout width", hr); - - return dl; -} - - -void uiDrawTextLayoutSetWidth(uiDrawTextLayout *layout, double width) +// TODO this ignores clipping? +void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y) { - layout->width = width; -} - -// TODO for a single line the height includes the leading; it should not -void uiDrawTextLayoutExtents(uiDrawTextLayout *layout, double *width, double *height) -{ - IDWriteTextLayout *dl; - DWRITE_TEXT_METRICS metrics; - HRESULT hr; - - dl = prepareLayout(layout, NULL); - hr = dl->GetMetrics(&metrics); - if (hr != S_OK) - logHRESULT(L"error getting layout metrics", hr); - *width = metrics.width; - // TODO make sure the behavior of this on empty strings is the same on all platforms - *height = metrics.height; - dl->Release(); -} - -void uiDrawText(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout) -{ - IDWriteTextLayout *dl; D2D1_POINT_2F pt; - ID2D1Brush *black; + ID2D1SolidColorBrush *black; + textRenderer *renderer; HRESULT hr; + for (auto p : *(tl->backgroundParams)) { + // TODO + } + // TODO document that fully opaque black is the default text color; figure out whether this is upheld in various scenarios on other platforms - black = mkSolidBrush(c->rt, 0.0, 0.0, 0.0, 1.0); + // TODO figure out if this needs to be cleaned out + black = mustMakeSolidBrush(c->rt, 0.0, 0.0, 0.0, 1.0); - dl = prepareLayout(layout, c->rt); +#define renderD2D 0 +#define renderOur 1 +#if renderD2D pt.x = x; pt.y = y; // TODO D2D1_DRAW_TEXT_OPTIONS_NO_SNAP? // TODO D2D1_DRAW_TEXT_OPTIONS_CLIP? - // TODO when setting 8.1 as minimum, D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT? - c->rt->DrawTextLayout(pt, dl, black, D2D1_DRAW_TEXT_OPTIONS_NONE); - dl->Release(); + // TODO LONGTERM when setting 8.1 as minimum (TODO verify), D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT? + // TODO what is our pixel snapping setting related to the OPTIONS enum values? + c->rt->DrawTextLayout(pt, tl->layout, black, D2D1_DRAW_TEXT_OPTIONS_NONE); +#endif +#if renderD2D && renderOur + // draw ours semitransparent so we can check + // TODO get the actual color Charles Petzold uses and use that + black->Release(); + black = mustMakeSolidBrush(c->rt, 1.0, 0.0, 0.0, 0.75); +#endif +#if renderOur + renderer = new textRenderer(c->rt, + TRUE, // TODO FALSE for no-snap? + black); + hr = tl->layout->Draw(NULL, + renderer, + x, y); + if (hr != S_OK) + logHRESULT(L"error drawing IDWriteTextLayout", hr); + renderer->Release(); +#endif black->Release(); } -void uiDrawTextLayoutSetColor(uiDrawTextLayout *layout, int startChar, int endChar, double r, double g, double b, double a) +// TODO for a single line the height includes the leading; should it? TextEdit on OS X always includes the leading and/or paragraph spacing, otherwise Klee won't work... +// TODO width does not include trailing whitespace +void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) { - struct layoutAttr attr; + DWRITE_TEXT_METRICS metrics; + HRESULT hr; - attr.type = layoutAttrColor; - attr.start = startChar; - attr.end = endChar; - attr.components[0] = r; - attr.components[1] = g; - attr.components[2] = b; - attr.components[3] = a; - layout->attrs->push_back(attr); + hr = tl->layout->GetMetrics(&metrics); + if (hr != S_OK) + logHRESULT(L"error getting IDWriteTextLayout layout metrics", hr); + *width = metrics.width; + // TODO make sure the behavior of this on empty strings is the same on all platforms (ideally should be 0-width, line height-height; TODO note this in the docs too) + *height = metrics.height; } diff --git a/windows/dwrite.cpp b/windows/dwrite.cpp index 9156f179..4d6b6741 100644 --- a/windows/dwrite.cpp +++ b/windows/dwrite.cpp @@ -1,10 +1,11 @@ // 14 april 2016 #include "uipriv_windows.hpp" -// TODO really migrate? +#include "attrstr.hpp" IDWriteFactory *dwfactory = NULL; -HRESULT initDrawText(void) +// TOOD rename to something else, maybe +HRESULT uiprivInitDrawText(void) { // TOOD use DWRITE_FACTORY_TYPE_ISOLATED instead? return DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, @@ -12,17 +13,17 @@ HRESULT initDrawText(void) (IUnknown **) (&dwfactory)); } -void uninitDrawText(void) +void uiprivUninitDrawText(void) { dwfactory->Release(); } -fontCollection *loadFontCollection(void) +fontCollection *uiprivLoadFontCollection(void) { fontCollection *fc; HRESULT hr; - fc = uiNew(fontCollection); + fc = uiprivNew(fontCollection); // always get the latest available font information hr = dwfactory->GetSystemFontCollection(&(fc->fonts), TRUE); if (hr != S_OK) @@ -31,7 +32,13 @@ fontCollection *loadFontCollection(void) return fc; } -WCHAR *fontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family) +void uiprivFontCollectionFree(fontCollection *fc) +{ + fc->fonts->Release(); + uiprivFree(fc); +} + +WCHAR *uiprivFontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family) { IDWriteLocalizedStrings *names; WCHAR *str; @@ -40,12 +47,12 @@ WCHAR *fontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family) hr = family->GetFamilyNames(&names); if (hr != S_OK) logHRESULT(L"error getting names of font out", hr); - str = fontCollectionCorrectString(fc, names); + str = uiprivFontCollectionCorrectString(fc, names); names->Release(); return str; } -WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names) +WCHAR *uiprivFontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names) { UINT32 index; BOOL exists; @@ -66,6 +73,7 @@ WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings * hr = names->FindLocaleName(fc->userLocale, &index, &exists); if (hr != S_OK || (hr == S_OK && !exists)) hr = names->FindLocaleName(L"en-us", &index, &exists); + // TODO check hr again here? or did I decide that would be redundant because COM requires output arguments to be filled regardless of return value? if (!exists) index = 0; @@ -73,16 +81,10 @@ WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings * if (hr != S_OK) logHRESULT(L"error getting length of font name", hr); // GetStringLength() does not include the null terminator, but GetString() does - wname = (WCHAR *) uiAlloc((length + 1) * sizeof (WCHAR), "WCHAR[]"); + wname = (WCHAR *) uiprivAlloc((length + 1) * sizeof (WCHAR), "WCHAR[]"); hr = names->GetString(index, wname, length + 1); if (hr != S_OK) logHRESULT(L"error getting font name", hr); return wname; } - -void fontCollectionFree(fontCollection *fc) -{ - fc->fonts->Release(); - uiFree(fc); -} diff --git a/windows/editablecombo.cpp b/windows/editablecombo.cpp index 9e1fdbfb..138618d7 100644 --- a/windows/editablecombo.cpp +++ b/windows/editablecombo.cpp @@ -76,7 +76,7 @@ void uiEditableComboboxAppend(uiEditableCombobox *c, const char *text) logLastError(L"error appending item to uiEditableCombobox"); else if (res == (LRESULT) CB_ERRSPACE) logLastError(L"memory exhausted appending item to uiEditableCombobox"); - uiFree(wtext); + uiprivFree(wtext); } char *uiEditableComboboxText(uiEditableCombobox *c) diff --git a/windows/events.cpp b/windows/events.cpp index 45e8d43d..c13d6d00 100644 --- a/windows/events.cpp +++ b/windows/events.cpp @@ -23,7 +23,7 @@ static std::map handlers; void uiWindowsRegisterWM_COMMANDHandler(HWND hwnd, BOOL (*handler)(uiControl *, HWND, WORD, LRESULT *), uiControl *c) { if (handlers[hwnd].commandHandler != NULL) - implbug("already registered a WM_COMMAND handler to window handle %p", hwnd); + uiprivImplBug("already registered a WM_COMMAND handler to window handle %p", hwnd); handlers[hwnd].commandHandler = handler; handlers[hwnd].c = c; } @@ -31,7 +31,7 @@ void uiWindowsRegisterWM_COMMANDHandler(HWND hwnd, BOOL (*handler)(uiControl *, void uiWindowsRegisterWM_NOTIFYHandler(HWND hwnd, BOOL (*handler)(uiControl *, HWND, NMHDR *, LRESULT *), uiControl *c) { if (handlers[hwnd].notifyHandler != NULL) - implbug("already registered a WM_NOTIFY handler to window handle %p", hwnd); + uiprivImplBug("already registered a WM_NOTIFY handler to window handle %p", hwnd); handlers[hwnd].notifyHandler = handler; handlers[hwnd].c = c; } @@ -39,7 +39,7 @@ void uiWindowsRegisterWM_NOTIFYHandler(HWND hwnd, BOOL (*handler)(uiControl *, H void uiWindowsRegisterWM_HSCROLLHandler(HWND hwnd, BOOL (*handler)(uiControl *, HWND, WORD, LRESULT *), uiControl *c) { if (handlers[hwnd].hscrollHandler != NULL) - implbug("already registered a WM_HSCROLL handler to window handle %p", hwnd); + uiprivImplBug("already registered a WM_HSCROLL handler to window handle %p", hwnd); handlers[hwnd].hscrollHandler = handler; handlers[hwnd].c = c; } @@ -47,21 +47,21 @@ void uiWindowsRegisterWM_HSCROLLHandler(HWND hwnd, BOOL (*handler)(uiControl *, void uiWindowsUnregisterWM_COMMANDHandler(HWND hwnd) { if (handlers[hwnd].commandHandler == NULL) - implbug("window handle %p not registered to receive WM_COMMAND events", hwnd); + uiprivImplBug("window handle %p not registered to receive WM_COMMAND events", hwnd); handlers[hwnd].commandHandler = NULL; } void uiWindowsUnregisterWM_NOTIFYHandler(HWND hwnd) { if (handlers[hwnd].notifyHandler == NULL) - implbug("window handle %p not registered to receive WM_NOTIFY events", hwnd); + uiprivImplBug("window handle %p not registered to receive WM_NOTIFY events", hwnd); handlers[hwnd].notifyHandler = NULL; } void uiWindowsUnregisterWM_HSCROLLHandler(HWND hwnd) { if (handlers[hwnd].hscrollHandler == NULL) - implbug("window handle %p not registered to receive WM_HSCROLL events", hwnd); + uiprivImplBug("window handle %p not registered to receive WM_HSCROLL events", hwnd); handlers[hwnd].hscrollHandler = NULL; } @@ -131,14 +131,14 @@ static std::map wininichanges; void uiWindowsRegisterReceiveWM_WININICHANGE(HWND hwnd) { if (wininichanges[hwnd]) - implbug("window handle %p already subscribed to receive WM_WINICHANGEs", hwnd); + uiprivImplBug("window handle %p already subscribed to receive WM_WINICHANGEs", hwnd); wininichanges[hwnd] = true; } void uiWindowsUnregisterReceiveWM_WININICHANGE(HWND hwnd) { if (!wininichanges[hwnd]) - implbug("window handle %p not registered to receive WM_WININICHANGEs", hwnd); + uiprivImplBug("window handle %p not registered to receive WM_WININICHANGEs", hwnd); wininichanges[hwnd] = false; } diff --git a/windows/fontbutton.cpp b/windows/fontbutton.cpp index d2d4dabf..d6e5e0d8 100644 --- a/windows/fontbutton.cpp +++ b/windows/fontbutton.cpp @@ -1,5 +1,6 @@ // 14 april 2016 #include "uipriv_windows.hpp" +#include "attrstr.hpp" struct uiFontButton { uiWindowsControl c; @@ -15,7 +16,7 @@ static void uiFontButtonDestroy(uiControl *c) uiFontButton *b = uiFontButton(c); uiWindowsUnregisterWM_COMMANDHandler(b->hwnd); - destroyFontDialogParams(&(b->params)); + uiprivDestroyFontDialogParams(&(b->params)); uiWindowsEnsureDestroyWindow(b->hwnd); uiFreeControl(uiControl(b)); } @@ -24,9 +25,9 @@ static void updateFontButtonLabel(uiFontButton *b) { WCHAR *text; - text = fontDialogParamsToString(&(b->params)); + text = uiprivFontDialogParamsToString(&(b->params)); setWindowText(b->hwnd, text); - uiFree(text); + uiprivFree(text); // changing the text might necessitate a change in the button's size uiWindowsControlMinimumSizeChanged(uiWindowsControl(b)); @@ -41,7 +42,7 @@ static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult) return FALSE; parent = parentToplevel(b->hwnd); - if (showFontDialog(parent, &(b->params))) { + if (uiprivShowFontDialog(parent, &(b->params))) { updateFontButtonLabel(b); (*(b->onChanged))(b, b->onChangedData); } @@ -86,11 +87,11 @@ static void defaultOnChanged(uiFontButton *b, void *data) // do nothing } -uiDrawTextFont *uiFontButtonFont(uiFontButton *b) +void uiFontButtonFont(uiFontButton *b, uiFontDescriptor *desc) { - // we don't own b->params.font; we have to add a reference - // we don't own b->params.familyName either; we have to copy it - return mkTextFont(b->params.font, TRUE, b->params.familyName, TRUE, b->params.size); + uiprivFontDescriptorFromIDWriteFont(b->params.font, desc); + desc->Family = toUTF8(b->params.familyName); + desc->Size = b->params.size; } void uiFontButtonOnChanged(uiFontButton *b, void (*f)(uiFontButton *, void *), void *data) @@ -111,7 +112,7 @@ uiFontButton *uiNewFontButton(void) hInstance, NULL, TRUE); - loadInitialFontDialogParams(&(b->params)); + uiprivLoadInitialFontDialogParams(&(b->params)); uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b)); uiFontButtonOnChanged(b, defaultOnChanged, NULL); @@ -120,3 +121,8 @@ uiFontButton *uiNewFontButton(void) return b; } + +void uiFreeFontButtonFont(uiFontDescriptor *desc) +{ + uiprivFree((char *) (desc->Family)); +} diff --git a/windows/fontdialog.cpp b/windows/fontdialog.cpp index 603a17db..ea02a416 100644 --- a/windows/fontdialog.cpp +++ b/windows/fontdialog.cpp @@ -1,11 +1,14 @@ // 14 april 2016 #include "uipriv_windows.hpp" +#include "attrstr.hpp" // TODOs // - quote the Choose Font sample here for reference // - the Choose Font sample defaults to Regular/Italic/Bold/Bold Italic in some case (no styles?); do we? find out what the case is // - do we set initial family and style topmost as well? // - this should probably just handle IDWriteFonts +// - localization? +// - the Sample window overlaps the groupbox in a weird way (compare to the real ChooseFont() dialog) struct fontDialog { HWND hwnd; @@ -15,7 +18,7 @@ struct fontDialog { struct fontDialogParams *params; - fontCollection *fc; + struct fontCollection *fc; RECT sampleRect; HWND sampleBox; @@ -118,7 +121,7 @@ static WCHAR *cbGetItemText(HWND cb, WPARAM item) len = SendMessageW(cb, CB_GETLBTEXTLEN, item, 0); if (len == (LRESULT) CB_ERR) logLastError(L"error getting item text length from combobox"); - text = (WCHAR *) uiAlloc((len + 1) * sizeof (WCHAR), "WCHAR[]"); + text = (WCHAR *) uiprivAlloc((len + 1) * sizeof (WCHAR), "WCHAR[]"); if (SendMessageW(cb, CB_GETLBTEXT, item, (LPARAM) text) != len) logLastError(L"error getting item text from combobox"); return text; @@ -135,7 +138,7 @@ static BOOL cbTypeToSelect(HWND cb, LRESULT *posOut, BOOL restoreAfter) text = windowText(cb); pos = SendMessageW(cb, CB_FINDSTRINGEXACT, (WPARAM) (-1), (LPARAM) text); if (pos == (LRESULT) CB_ERR) { - uiFree(text); + uiprivFree(text); return FALSE; } cbSetCurSel(cb, (WPARAM) pos); @@ -144,7 +147,7 @@ static BOOL cbTypeToSelect(HWND cb, LRESULT *posOut, BOOL restoreAfter) if (restoreAfter) if (SendMessageW(cb, WM_SETTEXT, 0, (LPARAM) text) != (LRESULT) TRUE) logLastError(L"error restoring old combobox text"); - uiFree(text); + uiprivFree(text); // and restore the selection like above // TODO isn't there a 32-bit version of this if (SendMessageW(cb, CB_SETEDITSEL, 0, MAKELPARAM(selStart, selEnd)) != (LRESULT) TRUE) @@ -166,7 +169,7 @@ static WCHAR *fontStyleName(struct fontCollection *fc, IDWriteFont *font) hr = font->GetFaceNames(&str); if (hr != S_OK) logHRESULT(L"error getting font style name for font dialog", hr); - wstr = fontCollectionCorrectString(fc, str); + wstr = uiprivFontCollectionCorrectString(fc, str); str->Release(); return wstr; } @@ -251,7 +254,7 @@ static void familyChanged(struct fontDialog *f) logHRESULT(L"error getting font for filling styles box", hr); label = fontStyleName(f->fc, font); pos = cbAddString(f->styleCombobox, label); - uiFree(label); + uiprivFree(label); cbSetItemData(f->styleCombobox, (WPARAM) pos, (LPARAM) font); if (font->GetWeight() == weight && font->GetStyle() == style && @@ -320,6 +323,7 @@ static void sizeEdited(struct fontDialog *f) wsize = windowText(f->sizeCombobox); // this is what the Choose Font dialog does; it swallows errors while the real ChooseFont() is not lenient (and only checks on OK) size = wcstod(wsize, NULL); + // TODO free wsize? I forget already if (size <= 0) // don't change on invalid size return; f->curSize = size; @@ -361,7 +365,7 @@ static void fontDialogDrawSampleText(struct fontDialog *f, ID2D1RenderTarget *rt if (hr != S_OK) exists = FALSE; if (exists) { - sample = fontCollectionCorrectString(f->fc, sampleStrings); + sample = uiprivFontCollectionCorrectString(f->fc, sampleStrings); sampleStrings->Release(); } else sample = L"The quick brown fox jumps over the lazy dog."; @@ -382,7 +386,7 @@ static void fontDialogDrawSampleText(struct fontDialog *f, ID2D1RenderTarget *rt &format); if (hr != S_OK) logHRESULT(L"error creating IDWriteTextFormat", hr); - uiFree(family); + uiprivFree(family); rect.left = 0; rect.top = 0; @@ -398,7 +402,7 @@ static void fontDialogDrawSampleText(struct fontDialog *f, ID2D1RenderTarget *rt format->Release(); if (exists) - uiFree(sample); + uiprivFree(sample); black->Release(); } @@ -462,7 +466,7 @@ static struct fontDialog *beginFontDialog(HWND hwnd, LPARAM lParam) HWND samplePlacement; HRESULT hr; - f = uiNew(struct fontDialog); + f = uiprivNew(struct fontDialog); f->hwnd = hwnd; f->params = (struct fontDialogParams *) lParam; @@ -470,15 +474,15 @@ static struct fontDialog *beginFontDialog(HWND hwnd, LPARAM lParam) f->styleCombobox = getDlgItem(f->hwnd, rcFontStyleCombobox); f->sizeCombobox = getDlgItem(f->hwnd, rcFontSizeCombobox); - f->fc = loadFontCollection(); + f->fc = uiprivLoadFontCollection(); nFamilies = f->fc->fonts->GetFontFamilyCount(); for (i = 0; i < nFamilies; i++) { hr = f->fc->fonts->GetFontFamily(i, &family); if (hr != S_OK) logHRESULT(L"error getting font family", hr); - wname = fontCollectionFamilyName(f->fc, family); + wname = uiprivFontCollectionFamilyName(f->fc, family); pos = cbAddString(f->familyCombobox, wname); - uiFree(wname); + uiprivFree(wname); cbSetItemData(f->familyCombobox, (WPARAM) pos, (LPARAM) family); } @@ -499,10 +503,10 @@ static void endFontDialog(struct fontDialog *f, INT_PTR code) { wipeStylesBox(f); cbWipeAndReleaseData(f->familyCombobox); - fontCollectionFree(f->fc); + uiprivFontCollectionFree(f->fc); if (EndDialog(f->hwnd, code) == 0) logLastError(L"error ending font dialog"); - uiFree(f); + uiprivFree(f); } static INT_PTR tryFinishDialog(struct fontDialog *f, WPARAM wParam) @@ -516,13 +520,13 @@ static INT_PTR tryFinishDialog(struct fontDialog *f, WPARAM wParam) } // OK - destroyFontDialogParams(f->params); + uiprivDestroyFontDialogParams(f->params); f->params->font = (IDWriteFont *) cbGetItemData(f->styleCombobox, f->curStyle); // we need to save font from being destroyed with the combobox f->params->font->AddRef(); f->params->size = f->curSize; family = (IDWriteFontFamily *) cbGetItemData(f->familyCombobox, f->curFamily); - f->params->familyName = fontCollectionFamilyName(f->fc, family); + f->params->familyName = uiprivFontCollectionFamilyName(f->fc, family); f->params->styleName = fontStyleName(f->fc, f->params->font); endFontDialog(f, 2); return TRUE; @@ -587,7 +591,7 @@ static INT_PTR CALLBACK fontDialogDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L return FALSE; } -BOOL showFontDialog(HWND parent, struct fontDialogParams *params) +BOOL uiprivShowFontDialog(HWND parent, struct fontDialogParams *params) { switch (DialogBoxParamW(hInstance, MAKEINTRESOURCE(rcFontDialog), parent, fontDialogDlgProc, (LPARAM) params)) { case 1: // cancel @@ -619,7 +623,7 @@ static IDWriteFontFamily *tryFindFamily(IDWriteFontCollection *fc, const WCHAR * return family; } -void loadInitialFontDialogParams(struct fontDialogParams *params) +void uiprivLoadInitialFontDialogParams(struct fontDialogParams *params) { struct fontCollection *fc; IDWriteFontFamily *family; @@ -632,7 +636,7 @@ void loadInitialFontDialogParams(struct fontDialogParams *params) // If Arial isn't found, we'll use Helvetica and then MS Sans Serif as fallbacks, and if not, we'll just grab the first font family in the collection. // We need the correct localized name for Regular (and possibly Arial too? let's say yes to be safe), so let's grab the strings from DirectWrite instead of hardcoding them. - fc = loadFontCollection(); + fc = uiprivLoadFontCollection(); family = tryFindFamily(fc->fonts, L"Arial"); if (family == NULL) { family = tryFindFamily(fc->fonts, L"Helvetica"); @@ -657,27 +661,27 @@ void loadInitialFontDialogParams(struct fontDialogParams *params) params->font = font; params->size = 10; - params->familyName = fontCollectionFamilyName(fc, family); + params->familyName = uiprivFontCollectionFamilyName(fc, family); params->styleName = fontStyleName(fc, font); // don't release font; we still need it family->Release(); - fontCollectionFree(fc); + uiprivFontCollectionFree(fc); } -void destroyFontDialogParams(struct fontDialogParams *params) +void uiprivDestroyFontDialogParams(struct fontDialogParams *params) { params->font->Release(); - uiFree(params->familyName); - uiFree(params->styleName); + uiprivFree(params->familyName); + uiprivFree(params->styleName); } -WCHAR *fontDialogParamsToString(struct fontDialogParams *params) +WCHAR *uiprivFontDialogParamsToString(struct fontDialogParams *params) { WCHAR *text; // TODO dynamically allocate - text = (WCHAR *) uiAlloc(512 * sizeof (WCHAR), "WCHAR[]"); + text = (WCHAR *) uiprivAlloc(512 * sizeof (WCHAR), "WCHAR[]"); _snwprintf(text, 512, L"%s %s %g", params->familyName, params->styleName, diff --git a/windows/fontmatch.cpp b/windows/fontmatch.cpp new file mode 100644 index 00000000..73f29543 --- /dev/null +++ b/windows/fontmatch.cpp @@ -0,0 +1,61 @@ +// 11 march 2018 +#include "uipriv_windows.hpp" +#include "attrstr.hpp" + +// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before) +static std::map dwriteItalics = { + { uiTextItalicNormal, DWRITE_FONT_STYLE_NORMAL }, + { uiTextItalicOblique, DWRITE_FONT_STYLE_OBLIQUE }, + { uiTextItalicItalic, DWRITE_FONT_STYLE_ITALIC }, +}; + +// TODO should be const but then I can't operator[] on it; the real solution is to find a way to do designated array initializers in C++11 but I do not know enough C++ voodoo to make it work (it is possible but no one else has actually done it before) +static std::map dwriteStretches = { + { uiTextStretchUltraCondensed, DWRITE_FONT_STRETCH_ULTRA_CONDENSED }, + { uiTextStretchExtraCondensed, DWRITE_FONT_STRETCH_EXTRA_CONDENSED }, + { uiTextStretchCondensed, DWRITE_FONT_STRETCH_CONDENSED }, + { uiTextStretchSemiCondensed, DWRITE_FONT_STRETCH_SEMI_CONDENSED }, + { uiTextStretchNormal, DWRITE_FONT_STRETCH_NORMAL }, + { uiTextStretchSemiExpanded, DWRITE_FONT_STRETCH_SEMI_EXPANDED }, + { uiTextStretchExpanded, DWRITE_FONT_STRETCH_EXPANDED }, + { uiTextStretchExtraExpanded, DWRITE_FONT_STRETCH_EXTRA_EXPANDED }, + { uiTextStretchUltraExpanded, DWRITE_FONT_STRETCH_ULTRA_EXPANDED }, +}; + +// for the most part, DirectWrite weights correlate to ours +// the differences: +// - Minimum — libui: 0, DirectWrite: 1 +// - Maximum — libui: 1000, DirectWrite: 999 +// TODO figure out what to do about this shorter range (the actual major values are the same (but with different names), so it's just a range issue) +DWRITE_FONT_WEIGHT uiprivWeightToDWriteWeight(uiTextWeight w) +{ + return (DWRITE_FONT_WEIGHT) w; +} + +DWRITE_FONT_STYLE uiprivItalicToDWriteStyle(uiTextItalic i) +{ + return dwriteItalics[i]; +} + +DWRITE_FONT_STRETCH uiprivStretchToDWriteStretch(uiTextStretch s) +{ + return dwriteStretches[s]; +} + +void uiprivFontDescriptorFromIDWriteFont(IDWriteFont *font, uiFontDescriptor *uidesc) +{ + DWRITE_FONT_STYLE dwitalic; + DWRITE_FONT_STRETCH dwstretch; + + dwitalic = font->GetStyle(); + // TODO reverse the above misalignment if it is corrected + uidesc->Weight = (uiTextWeight) (font->GetWeight()); + dwstretch = font->GetStretch(); + + for (uidesc->Italic = uiTextItalicNormal; uidesc->Italic < uiTextItalicItalic; uidesc->Italic++) + if (dwriteItalics[uidesc->Italic] == dwitalic) + break; + for (uidesc->Stretch = uiTextStretchUltraCondensed; uidesc->Stretch < uiTextStretchUltraExpanded; uidesc->Stretch++) + if (dwriteStretches[uidesc->Stretch] == dwstretch) + break; +} diff --git a/windows/form.cpp b/windows/form.cpp index febcc693..ed194671 100644 --- a/windows/form.cpp +++ b/windows/form.cpp @@ -266,7 +266,7 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy) SS_LEFT | SS_NOPREFIX, hInstance, NULL, TRUE); - uiFree(wlabel); + uiprivFree(wlabel); uiWindowsEnsureSetParentHWND(fc.label, f->hwnd); fc.stretchy = stretchy; uiControlSetParent(fc.c, uiControl(f)); diff --git a/windows/graphemes.cpp b/windows/graphemes.cpp index 355e4037..c11dd203 100644 --- a/windows/graphemes.cpp +++ b/windows/graphemes.cpp @@ -1,80 +1,60 @@ // 25 may 2016 #include "uipriv_windows.hpp" +#include "attrstr.hpp" -// We could use CharNext() to generate grapheme cluster boundaries, but it doesn't handle surrogate pairs properly (see http://archives.miloush.net/michkap/archive/2008/12/16/9223301.html). -// So let's use Uniscribe (see http://archives.miloush.net/michkap/archive/2005/01/14/352802.html) -// See also http://www.catch22.net/tuts/uniscribe-mysteries and http://www.catch22.net/tuts/keyboard-navigation for more details. +// We could use CharNextW() to generate grapheme cluster boundaries, but it doesn't handle surrogate pairs properly (see http://archives.miloush.net/michkap/archive/2008/12/16/9223301.html). +// We could also use Uniscribe (see http://archives.miloush.net/michkap/archive/2005/01/14/352802.html, http://www.catch22.net/tuts/uniscribe-mysteries, http://www.catch22.net/tuts/keyboard-navigation, and https://maxradi.us/documents/uniscribe/), but its rules for buffer sizes is convoluted. +// Let's just deal with the CharNextW() bug. -static HRESULT itemize(WCHAR *msg, size_t len, SCRIPT_ITEM **out, int *outn) +int uiprivGraphemesTakesUTF16(void) { - SCRIPT_CONTROL sc; - SCRIPT_STATE ss; - SCRIPT_ITEM *items; - size_t maxItems; - int n; - HRESULT hr; - - // make sure these are zero-initialized to avoid mangling the text - ZeroMemory(&sc, sizeof (SCRIPT_CONTROL)); - ZeroMemory(&ss, sizeof (SCRIPT_STATE)); - - maxItems = len + 2; - for (;;) { - items = new SCRIPT_ITEM[maxItems]; - hr = ScriptItemize(msg, len, - maxItems, - &sc, &ss, - items, &n); - if (hr == S_OK) - break; - // otherwise either an error or not enough room - delete[] items; - if (hr != E_OUTOFMEMORY) - return hr; - maxItems *= 2; // add some more and try again - } - - *out = items; - *outn = n; - return S_OK; + return 1; } -size_t *graphemes(WCHAR *msg) +uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len) { - size_t len; - SCRIPT_ITEM *items; - int i, n; - size_t *out; - size_t *op; - SCRIPT_LOGATTR *logattr; - int j, nn; - HRESULT hr; + uiprivGraphemes *g; + WCHAR *str; + size_t *pPTG, *pGTP; - len = wcslen(msg); - hr = itemize(msg, len, &items, &n); - if (hr != S_OK) - logHRESULT(L"error itemizing string for finding grapheme cluster boundaries", hr); + g = uiprivNew(uiprivGraphemes); - // should be enough; 2 more just to be safe - out = (size_t *) uiAlloc((len + 2) * sizeof (size_t), "size_t[]"); - op = out; + g->len = 0; + str = (WCHAR *) s; + while (*str != L'\0') { + g->len++; + str = CharNextW(str); + // no need to worry about surrogates if we're just counting + } - // note that there are actually n + 1 elements in items - for (i = 0; i < n; i++) { - nn = items[i + 1].iCharPos - items[i].iCharPos; - logattr = new SCRIPT_LOGATTR[nn]; - hr = ScriptBreak(msg + items[i].iCharPos, nn, - &(items[i].a), logattr); - if (hr != S_OK) - logHRESULT(L"error breaking string for finding grapheme cluster boundaries", hr); - for (j = 0; j < nn; j++) - if (logattr[j].fCharStop != 0) - *op++ = items[i].iCharPos + j; - delete[] logattr; + g->pointsToGraphemes = (size_t *) uiprivAlloc((len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + g->graphemesToPoints = (size_t *) uiprivAlloc((g->len + 1) * sizeof (size_t), "size_t[] (graphemes)"); + + pPTG = g->pointsToGraphemes; + pGTP = g->graphemesToPoints; + str = (WCHAR *) s; + while (*str != L'\0') { + WCHAR *next, *p; + ptrdiff_t nextoff; + + // as part of the bug, we need to make sure we only call CharNextW() on low halves, otherwise it'll return the same low half forever + nextoff = 0; + if (IS_HIGH_SURROGATE(*str)) + nextoff = 1; + next = CharNextW(str + nextoff); + if (IS_LOW_SURROGATE(*next)) + next--; + + *pGTP = pPTG - g->pointsToGraphemes; + for (p = str; p < next; p++) + *pPTG++ = pGTP - g->graphemesToPoints; + pGTP++; + + str = next; } // and handle the last item for the end of the string - *op++ = items[i].iCharPos; + *pGTP = pPTG - g->pointsToGraphemes; + *pPTG = pGTP - g->graphemesToPoints; - delete[] items; - return out; + return g; } diff --git a/windows/grid.cpp b/windows/grid.cpp index c63cd1e4..cac87aff 100644 --- a/windows/grid.cpp +++ b/windows/grid.cpp @@ -418,7 +418,7 @@ static void uiGridDestroy(uiControl *c) for (struct gridChild *gc : *(g->children)) { uiControlSetParent(gc->c, NULL); uiControlDestroy(gc->c); - uiFree(gc); + uiprivFree(gc); } delete g->indexof; delete g->children; @@ -562,10 +562,10 @@ static struct gridChild *toChild(uiControl *c, int xspan, int yspan, int hexpand struct gridChild *gc; if (xspan < 0) - userbug("You cannot have a negative xspan in a uiGrid cell."); + uiprivUserBug("You cannot have a negative xspan in a uiGrid cell."); if (yspan < 0) - userbug("You cannot have a negative yspan in a uiGrid cell."); - gc = uiNew(struct gridChild); + uiprivUserBug("You cannot have a negative yspan in a uiGrid cell."); + gc = uiprivNew(struct gridChild); gc->c = c; gc->xspan = xspan; gc->yspan = yspan; diff --git a/windows/group.cpp b/windows/group.cpp index 8824c5a4..1a2cc6ed 100644 --- a/windows/group.cpp +++ b/windows/group.cpp @@ -208,7 +208,7 @@ uiGroup *uiNewGroup(const char *text) BS_GROUPBOX, hInstance, NULL, TRUE); - uiFree(wtext); + uiprivFree(wtext); if (SetWindowSubclass(g->hwnd, groupSubProc, 0, (DWORD_PTR) g) == FALSE) logLastError(L"error subclassing groupbox to handle parent messages"); diff --git a/windows/init.cpp b/windows/init.cpp index 22874165..24831143 100644 --- a/windows/init.cpp +++ b/windows/init.cpp @@ -1,5 +1,6 @@ // 6 april 2015 #include "uipriv_windows.hpp" +#include "attrstr.hpp" HINSTANCE hInstance; int nCmdShow; @@ -27,19 +28,19 @@ static const char *initerr(const char *message, const WCHAR *label, DWORD value) wmessage, value, value, sysmsg); - uiFree(wmessage); + uiprivFree(wmessage); if (hassysmsg) LocalFree(sysmsg); // ignore error out = toUTF8(wout); - uiFree(wout); + uiprivFree(wout); return out + 1; } #define ieLastErr(msg) initerr("=" msg, L"GetLastError() ==", GetLastError()) #define ieHRESULT(msg, hr) initerr("=" msg, L"HRESULT", (DWORD) hr) -// LONGTERM make common -uiInitOptions options; +// LONGTERM put this declaration in a common file +uiInitOptions uiprivOptions; #define wantedICCClasses ( \ ICC_STANDARD_CLASSES | /* user32.dll controls */ \ @@ -61,7 +62,7 @@ const char *uiInit(uiInitOptions *o) INITCOMMONCONTROLSEX icc; HRESULT hr; - options = *o; + uiprivOptions = *o; initAlloc(); @@ -117,7 +118,7 @@ const char *uiInit(uiInitOptions *o) if (hr != S_OK) return ieHRESULT("initializing Direct2D", hr); - hr = initDrawText(); + hr = uiprivInitDrawText(); if (hr != S_OK) return ieHRESULT("initializing DirectWrite", hr); @@ -139,7 +140,7 @@ void uiUninit(void) unregisterD2DScratchClass(); unregisterMessageFilter(); unregisterArea(); - uninitDrawText(); + uiprivUninitDrawText(); uninitDraw(); CoUninitialize(); if (DeleteObject(hollowBrush) == 0) @@ -156,7 +157,7 @@ void uiUninit(void) void uiFreeInitError(const char *err) { if (*(err - 1) == '-') - uiFree((void *) (err - 1)); + uiprivFree((void *) (err - 1)); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/windows/label.cpp b/windows/label.cpp index d74b7d18..94a0d88e 100644 --- a/windows/label.cpp +++ b/windows/label.cpp @@ -51,7 +51,7 @@ uiLabel *uiNewLabel(const char *text) SS_LEFTNOWORDWRAP | SS_NOPREFIX, hInstance, NULL, TRUE); - uiFree(wtext); + uiprivFree(wtext); return l; } diff --git a/windows/menu.cpp b/windows/menu.cpp index 6112fc13..65791bfb 100644 --- a/windows/menu.cpp +++ b/windows/menu.cpp @@ -68,7 +68,7 @@ static void defaultOnClicked(uiMenuItem *item, uiWindow *w, void *data) static void onQuitClicked(uiMenuItem *item, uiWindow *w, void *data) { - if (shouldQuit()) + if (uiprivShouldQuit()) uiQuit(); } @@ -87,7 +87,7 @@ void uiMenuItemDisable(uiMenuItem *i) void uiMenuItemOnClicked(uiMenuItem *i, void (*f)(uiMenuItem *, uiWindow *, void *), void *data) { if (i->type == typeQuit) - userbug("You can not call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); + uiprivUserBug("You can not call uiMenuItemOnClicked() on a Quit item; use uiOnShouldQuit() instead."); i->onClicked = f; i->onClickedData = data; } @@ -111,14 +111,14 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name) uiMenuItem *item; if (menusFinalized) - userbug("You can not create a new menu item after menus have been finalized."); + uiprivUserBug("You can not create a new menu item after menus have been finalized."); if (m->len >= m->cap) { m->cap += grow; - m->items = (uiMenuItem **) uiRealloc(m->items, m->cap * sizeof (uiMenuItem *), "uiMenuitem *[]"); + m->items = (uiMenuItem **) uiprivRealloc(m->items, m->cap * sizeof (uiMenuItem *), "uiMenuitem *[]"); } - item = uiNew(uiMenuItem); + item = uiprivNew(uiMenuItem); m->items[m->len] = item; m->len++; @@ -169,7 +169,7 @@ uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name) uiMenuItem *uiMenuAppendQuitItem(uiMenu *m) { if (hasQuit) - userbug("You can not have multiple Quit menu items in a program."); + uiprivUserBug("You can not have multiple Quit menu items in a program."); hasQuit = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typeQuit, NULL); @@ -178,7 +178,7 @@ uiMenuItem *uiMenuAppendQuitItem(uiMenu *m) uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m) { if (hasPreferences) - userbug("You can not have multiple Preferences menu items in a program."); + uiprivUserBug("You can not have multiple Preferences menu items in a program."); hasPreferences = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typePreferences, NULL); @@ -187,8 +187,8 @@ uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m) uiMenuItem *uiMenuAppendAboutItem(uiMenu *m) { if (hasAbout) - // TODO place these userbug strings in a header - userbug("You can not have multiple About menu items in a program."); + // TODO place these uiprivImplBug() and uiprivUserBug() strings in a header + uiprivUserBug("You can not have multiple About menu items in a program."); hasAbout = TRUE; newItem(m, typeSeparator, NULL); return newItem(m, typeAbout, NULL); @@ -204,13 +204,13 @@ uiMenu *uiNewMenu(const char *name) uiMenu *m; if (menusFinalized) - userbug("You can not create a new menu after menus have been finalized."); + uiprivUserBug("You can not create a new menu after menus have been finalized."); if (len >= cap) { cap += grow; - menus = (uiMenu **) uiRealloc(menus, cap * sizeof (uiMenu *), "uiMenu *[]"); + menus = (uiMenu **) uiprivRealloc(menus, cap * sizeof (uiMenu *), "uiMenu *[]"); } - m = uiNew(uiMenu); + m = uiprivNew(uiMenu); menus[len] = m; len++; @@ -237,7 +237,7 @@ static void appendMenuItem(HMENU menu, uiMenuItem *item) if (item->len >= item->cap) { item->cap += grow; - item->hmenus = (HMENU *) uiRealloc(item->hmenus, item->cap * sizeof (HMENU), "HMENU[]"); + item->hmenus = (HMENU *) uiprivRealloc(item->hmenus, item->cap * sizeof (HMENU), "HMENU[]"); } item->hmenus[item->len] = menu; item->len++; @@ -293,7 +293,7 @@ void runMenuEvent(WORD id, uiWindow *w) } } // no match - implbug("unknown menu ID %hu in runMenuEvent()", id); + uiprivImplBug("unknown menu ID %hu in runMenuEvent()", id); found: // first toggle checkboxes, if any @@ -316,7 +316,7 @@ static void freeMenu(uiMenu *m, HMENU submenu) if (item->hmenus[j] == submenu) break; if (j >= item->len) - implbug("submenu handle %p not found in freeMenu()", submenu); + uiprivImplBug("submenu handle %p not found in freeMenu()", submenu); for (; j < item->len - 1; j++) item->hmenus[j] = item->hmenus[j + 1]; item->hmenus[j] = NULL; @@ -348,22 +348,22 @@ void uninitMenus(void) for (i = 0; i < len; i++) { m = menus[i]; - uiFree(m->name); + uiprivFree(m->name); for (j = 0; j < m->len; j++) { item = m->items[j]; if (item->len != 0) - // LONGTERM userbug()? - implbug("menu item %p (%ws) still has uiWindows attached; did you forget to destroy some windows?", item, item->name); + // LONGTERM uiprivUserBug()? + uiprivImplBug("menu item %p (%ws) still has uiWindows attached; did you forget to destroy some windows?", item, item->name); if (item->name != NULL) - uiFree(item->name); + uiprivFree(item->name); if (item->hmenus != NULL) - uiFree(item->hmenus); - uiFree(item); + uiprivFree(item->hmenus); + uiprivFree(item); } if (m->items != NULL) - uiFree(m->items); - uiFree(m); + uiprivFree(m->items); + uiprivFree(m); } if (menus != NULL) - uiFree(menus); + uiprivFree(menus); } diff --git a/windows/multilineentry.cpp b/windows/multilineentry.cpp index a32960cb..391f4855 100644 --- a/windows/multilineentry.cpp +++ b/windows/multilineentry.cpp @@ -76,7 +76,7 @@ void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text) e->inhibitChanged = TRUE; crlf = LFtoCRLF(text); uiWindowsSetWindowText(e->hwnd, text); - uiFree(crlf); + uiprivFree(crlf); e->inhibitChanged = FALSE; // don't queue the control for resize; entry sizes are independent of their contents } @@ -95,9 +95,9 @@ void uiMultilineEntryAppend(uiMultilineEntry *e, const char *text) SendMessageW(e->hwnd, EM_SETSEL, n, n); crlf = LFtoCRLF(text); wtext = toUTF16(crlf); - uiFree(crlf); + uiprivFree(crlf); SendMessageW(e->hwnd, EM_REPLACESEL, FALSE, (LPARAM) wtext); - uiFree(wtext); + uiprivFree(wtext); e->inhibitChanged = FALSE; } diff --git a/windows/opentype.cpp b/windows/opentype.cpp new file mode 100644 index 00000000..777f30d6 --- /dev/null +++ b/windows/opentype.cpp @@ -0,0 +1,33 @@ +// 11 may 2017 +#include "uipriv_windows.hpp" +#include "attrstr.hpp" + +// TODO pull out my decision for empty uiOpenTypeFeatures, assuming that it isn't in another file or that I even made one + +static uiForEach addToTypography(const uiOpenTypeFeatures *otf, char a, char b, char c, char d, uint32_t value, void *data) +{ + IDWriteTypography *dt = (IDWriteTypography *) data; + DWRITE_FONT_FEATURE dff; + HRESULT hr; + + ZeroMemory(&dff, sizeof (DWRITE_FONT_FEATURE)); + // yes, the cast here is necessary (the compiler will complain otherwise)... + dff.nameTag = (DWRITE_FONT_FEATURE_TAG) DWRITE_MAKE_OPENTYPE_TAG(a, b, c, d); + dff.parameter = (UINT32) value; + hr = dt->AddFontFeature(dff); + if (hr != S_OK) + logHRESULT(L"error adding OpenType feature to IDWriteTypography", hr); + return uiForEachContinue; +} + +IDWriteTypography *uiprivOpenTypeFeaturesToIDWriteTypography(const uiOpenTypeFeatures *otf) +{ + IDWriteTypography *dt; + HRESULT hr; + + hr = dwfactory->CreateTypography(&dt); + if (hr != S_OK) + logHRESULT(L"error creating IDWriteTypography", hr); + uiOpenTypeFeaturesForEach(otf, addToTypography, dt); + return dt; +} diff --git a/windows/progressbar.cpp b/windows/progressbar.cpp index 3750eb6a..c3a67dd3 100644 --- a/windows/progressbar.cpp +++ b/windows/progressbar.cpp @@ -54,7 +54,7 @@ void uiProgressBarSetValue(uiProgressBar *p, int value) } if (value < 0 || value > 100) - userbug("Value %d is out of range for uiProgressBars.", value); + uiprivUserBug("Value %d is out of range for uiProgressBars.", value); if (value == 100) { // because we can't 101 SendMessageW(p->hwnd, PBM_SETRANGE32, 0, 101); diff --git a/windows/radiobuttons.cpp b/windows/radiobuttons.cpp index 29cd2e66..0684a270 100644 --- a/windows/radiobuttons.cpp +++ b/windows/radiobuttons.cpp @@ -140,7 +140,7 @@ void uiRadioButtonsAppend(uiRadioButtons *r, const char *text) BS_RADIOBUTTON | groupTabStop, hInstance, NULL, TRUE); - uiFree(wtext); + uiprivFree(wtext); uiWindowsEnsureSetParentHWND(hwnd, r->hwnd); uiWindowsRegisterWM_COMMANDHandler(hwnd, onWM_COMMAND, uiControl(r)); r->hwnds->push_back(hwnd); diff --git a/windows/separator.cpp b/windows/separator.cpp index e123e275..28e77e83 100644 --- a/windows/separator.cpp +++ b/windows/separator.cpp @@ -1,6 +1,10 @@ // 20 may 2015 #include "uipriv_windows.hpp" +// TODO +// - font scaling issues? https://www.viksoe.dk/code/bevelline.htm +// - isn't something in vista app guidelines suggesting this too? or some other microsoft doc? and what about VS itself? + // references: // - http://stackoverflow.com/questions/2892703/how-do-i-draw-separators // - https://msdn.microsoft.com/en-us/library/windows/desktop/dn742405%28v=vs.85%29.aspx diff --git a/windows/sizing.cpp b/windows/sizing.cpp index a6d25d6e..33cc00b9 100644 --- a/windows/sizing.cpp +++ b/windows/sizing.cpp @@ -51,6 +51,7 @@ void uiWindowsSizingDlgUnitsToPixels(uiWindowsSizing *sizing, int *x, int *y) // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx // this X value is really only for buttons but I don't see a better one :/ #define winXPadding 4 +// TODO is this too much? #define winYPadding 4 void uiWindowsSizingStandardPadding(uiWindowsSizing *sizing, int *x, int *y) diff --git a/windows/spinbox.cpp b/windows/spinbox.cpp index 2b6af66d..57fb8d64 100644 --- a/windows/spinbox.cpp +++ b/windows/spinbox.cpp @@ -32,6 +32,7 @@ static int value(uiSpinbox *s) // control implementation +// TODO assign lResult static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult) { uiSpinbox *s = (uiSpinbox *) c; @@ -47,10 +48,10 @@ static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult) // This won't handle leading spaces, but spaces aren't allowed *anyway*. wtext = windowText(s->edit); if (wcscmp(wtext, L"-") == 0) { - uiFree(wtext); + uiprivFree(wtext); return TRUE; } - uiFree(wtext); + uiprivFree(wtext); // value() does the work for us value(s); (*(s->onChanged))(s, s->onChangedData); diff --git a/windows/stddialogs.cpp b/windows/stddialogs.cpp index 89d26bac..c6ac4557 100644 --- a/windows/stddialogs.cpp +++ b/windows/stddialogs.cpp @@ -114,8 +114,8 @@ static void msgbox(HWND parent, const char *title, const char *description, TASK if (hr != S_OK) logHRESULT(L"error showing task dialog", hr); - uiFree(wdescription); - uiFree(wtitle); + uiprivFree(wdescription); + uiprivFree(wtitle); } void uiMsgBox(uiWindow *parent, const char *title, const char *description) diff --git a/windows/tab.cpp b/windows/tab.cpp index 365f5a1f..e7239585 100644 --- a/windows/tab.cpp +++ b/windows/tab.cpp @@ -212,7 +212,7 @@ void uiTabInsertAt(uiTab *t, const char *name, int n, uiControl *child) item.pszText = wname; if (SendMessageW(t->tabHWND, TCM_INSERTITEM, (WPARAM) n, (LPARAM) (&item)) == (LRESULT) -1) logLastError(L"error adding tab to uiTab"); - uiFree(wname); + uiprivFree(wname); // we need to do this because adding the first tab doesn't send a TCN_SELCHANGE; it just shows the page show = curpage(t); diff --git a/windows/tabpage.cpp b/windows/tabpage.cpp index 5283ce79..dc98fb88 100644 --- a/windows/tabpage.cpp +++ b/windows/tabpage.cpp @@ -60,7 +60,7 @@ static INT_PTR CALLBACK dlgproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar if (uMsg == WM_WINDOWPOSCHANGED) { tp = (struct tabPage *) GetWindowLongPtrW(hwnd, DWLP_USER); tabPageRelayout(tp); - // pretend the dialog hasn't handled this just in case it needs to do something special + // pretend the dialog hasn't handled this just in case the system needs to do something special return FALSE; } @@ -83,7 +83,7 @@ struct tabPage *newTabPage(uiControl *child) struct tabPage *tp; HRESULT hr; - tp = uiNew(struct tabPage); + tp = uiprivNew(struct tabPage); // unfortunately this needs to be a proper dialog for EnableThemeDialogTexture() to work; CreateWindowExW() won't suffice if (CreateDialogParamW(hInstance, MAKEINTRESOURCE(rcTabPageDialog), @@ -114,7 +114,7 @@ void tabPageDestroy(struct tabPage *tp) uiWindowsControlSetParentHWND(uiWindowsControl(tp->child), NULL); // don't call EndDialog(); that's for the DialogBox() family of functions instead of CreateDialog() uiWindowsEnsureDestroyWindow(tp->hwnd); - uiFree(tp); + uiprivFree(tp); } void tabPageMinimumSize(struct tabPage *tp, int *width, int *height) diff --git a/windows/text.cpp b/windows/text.cpp index af79fb80..eafbe714 100644 --- a/windows/text.cpp +++ b/windows/text.cpp @@ -10,7 +10,7 @@ WCHAR *windowTextAndLen(HWND hwnd, LRESULT *len) if (len != NULL) *len = n; // WM_GETTEXTLENGTH does not include the null terminator - text = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); + text = (WCHAR *) uiprivAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); // note the comparison: the size includes the null terminator, but the return does not if (GetWindowTextW(hwnd, text, n + 1) != n) { logLastError(L"error getting window text"); @@ -35,7 +35,7 @@ void setWindowText(HWND hwnd, WCHAR *wtext) void uiFreeText(char *text) { - uiFree(text); + uiprivFree(text); } int uiWindowsWindowTextWidth(HWND hwnd) @@ -78,11 +78,11 @@ int uiWindowsWindowTextWidth(HWND hwnd) if (ReleaseDC(hwnd, dc) == 0) logLastError(L"error releasing DC"); - uiFree(text); + uiprivFree(text); return size.cx; noTextOrError: - uiFree(text); + uiprivFree(text); return 0; } @@ -93,7 +93,7 @@ char *uiWindowsWindowText(HWND hwnd) wtext = windowText(hwnd); text = toUTF8(wtext); - uiFree(wtext); + uiprivFree(wtext); return text; } @@ -103,5 +103,18 @@ void uiWindowsSetWindowText(HWND hwnd, const char *text) wtext = toUTF16(text); setWindowText(hwnd, wtext); - uiFree(wtext); + uiprivFree(wtext); +} + +int uiprivStricmp(const char *a, const char *b) +{ + WCHAR *wa, *wb; + int ret; + + wa = toUTF16(a); + wb = toUTF16(b); + ret = _wcsicmp(wa, wb); + uiprivFree(wb); + uiprivFree(wa); + return ret; } diff --git a/windows/uipriv_windows.hpp b/windows/uipriv_windows.hpp index 6ffe09f1..7fb00efa 100644 --- a/windows/uipriv_windows.hpp +++ b/windows/uipriv_windows.hpp @@ -7,6 +7,7 @@ #include "compilerver.hpp" // ui internal window messages +// TODO make these either not messages or WM_USER-based, so we can be sane about reserving WM_APP enum { // redirected WM_COMMAND and WM_NOTIFY msgCOMMAND = WM_APP + 0x40, // start offset just to be safe @@ -28,8 +29,8 @@ extern BOOL runWM_HSCROLL(WPARAM wParam, LPARAM lParam, LRESULT *lResult); extern void issueWM_WININICHANGE(WPARAM wParam, LPARAM lParam); // utf16.cpp -#define emptyUTF16() ((WCHAR *) uiAlloc(1 * sizeof (WCHAR), "WCHAR[]")) -#define emptyUTF8() ((char *) uiAlloc(1 * sizeof (char), "char[]")) +#define emptyUTF16() ((WCHAR *) uiprivAlloc(1 * sizeof (WCHAR), "WCHAR[]")) +#define emptyUTF8() ((char *) uiprivAlloc(1 * sizeof (char), "char[]")) extern WCHAR *toUTF16(const char *str); extern char *toUTF8(const WCHAR *wstr); extern WCHAR *utf16dup(const WCHAR *orig); @@ -148,15 +149,9 @@ extern BOOL showColorDialog(HWND parent, struct colorDialogRGBA *c); // sizing.cpp extern void getSizing(HWND hwnd, uiWindowsSizing *sizing, HFONT font); -// graphemes.cpp -extern size_t *graphemes(WCHAR *msg); - // TODO move into a dedicated file abibugs.cpp when we rewrite the drawing code extern D2D1_SIZE_F realGetSize(ID2D1RenderTarget *rt); - - - // TODO #include "_uipriv_migrate.hpp" diff --git a/windows/utf16.cpp b/windows/utf16.cpp index 98954d0a..131759e9 100644 --- a/windows/utf16.cpp +++ b/windows/utf16.cpp @@ -3,48 +3,42 @@ // see http://stackoverflow.com/a/29556509/3408572 -#define MBTWC(str, wstr, bufsiz) MultiByteToWideChar(CP_UTF8, 0, str, -1, wstr, bufsiz) - WCHAR *toUTF16(const char *str) { WCHAR *wstr; - int n; + WCHAR *wp; + size_t n; + uint32_t rune; if (*str == '\0') // empty string return emptyUTF16(); - n = MBTWC(str, NULL, 0); - if (n == 0) { - logLastError(L"error figuring out number of characters to convert to"); - return emptyUTF16(); - } - wstr = (WCHAR *) uiAlloc(n * sizeof (WCHAR), "WCHAR[]"); - if (MBTWC(str, wstr, n) != n) { - logLastError(L"error converting from UTF-8 to UTF-16"); - // and return an empty string - *wstr = L'\0'; + n = uiprivUTF8UTF16Count(str, 0); + wstr = (WCHAR *) uiprivAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]"); + wp = wstr; + while (*str) { + str = uiprivUTF8DecodeRune(str, 0, &rune); + n = uiprivUTF16EncodeRune(rune, wp); + wp += n; } return wstr; } -#define WCTMB(wstr, str, bufsiz) WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, bufsiz, NULL, NULL) - char *toUTF8(const WCHAR *wstr) { char *str; - int n; + char *sp; + size_t n; + uint32_t rune; if (*wstr == L'\0') // empty string return emptyUTF8(); - n = WCTMB(wstr, NULL, 0); - if (n == 0) { - logLastError(L"error figuring out number of characters to convert to"); - return emptyUTF8(); - } - str = (char *) uiAlloc(n * sizeof (char), "char[]"); - if (WCTMB(wstr, str, n) != n) { - logLastError(L"error converting from UTF-16 to UTF-8"); - // and return an empty string - *str = '\0'; + n = uiprivUTF16UTF8Count(wstr, 0); + str = (char *) uiprivAlloc((n + 1) * sizeof (char), "char[]"); + sp = str; + while (*wstr) { + wstr = uiprivUTF16DecodeRune(wstr, 0, &rune); + n = uiprivUTF8EncodeRune(rune, sp); + sp += n; } return str; } @@ -55,7 +49,7 @@ WCHAR *utf16dup(const WCHAR *orig) size_t len; len = wcslen(orig); - out = (WCHAR *) uiAlloc((len + 1) * sizeof (WCHAR), "WCHAR[]"); + out = (WCHAR *) uiprivAlloc((len + 1) * sizeof (WCHAR), "WCHAR[]"); wcscpy_s(out, len + 1, orig); return out; } @@ -85,13 +79,15 @@ WCHAR *vstrf(const WCHAR *format, va_list ap) va_end(ap2); n++; // terminating L'\0' - buf = (WCHAR *) uiAlloc(n * sizeof (WCHAR), "WCHAR[]"); + buf = (WCHAR *) uiprivAlloc(n * sizeof (WCHAR), "WCHAR[]"); // includes terminating L'\0' according to example in https://msdn.microsoft.com/en-us/library/xa1a1a6z.aspx vswprintf_s(buf, n, format, ap); return buf; } +// TODO merge the following two with the toUTF*()s? + // Let's shove these utility routines here too. // Prerequisite: lfonly is UTF-8. char *LFtoCRLF(const char *lfonly) @@ -101,7 +97,7 @@ char *LFtoCRLF(const char *lfonly) char *out; len = strlen(lfonly); - crlf = (char *) uiAlloc((len * 2 + 1) * sizeof (char), "char[]"); + crlf = (char *) uiprivAlloc((len * 2 + 1) * sizeof (char), "char[]"); out = crlf; for (i = 0; i < len; i++) { if (*lfonly == '\n') diff --git a/windows/utilwin.cpp b/windows/utilwin.cpp index 414ae83a..34b72ba8 100644 --- a/windows/utilwin.cpp +++ b/windows/utilwin.cpp @@ -5,9 +5,10 @@ // It is not a message-only window, and it is always hidden and disabled. // Its roles: // - It is the initial parent of all controls. When a control loses its parent, it also becomes that control's parent. -// - It handles WM_QUERYENDSESSION and console end session requests. +// - It handles WM_QUERYENDSESSION requests. // - It handles WM_WININICHANGE and forwards the message to any child windows that request it. // - It handles executing functions queued to run by uiQueueMain(). +// TODO explain why it isn't message-only #define utilWindowClass L"libui_utilWindowClass" @@ -22,8 +23,8 @@ static LRESULT CALLBACK utilWindowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, L return lResult; switch (uMsg) { case WM_QUERYENDSESSION: - // TODO block handler - if (shouldQuit()) { + // TODO block handler (TODO figure out if this meant the Vista-style block handler or not) + if (uiprivShouldQuit()) { uiQuit(); return TRUE; } diff --git a/windows/winapi.hpp b/windows/winapi.hpp index 86aba5d7..1b2ab000 100644 --- a/windows/winapi.hpp +++ b/windows/winapi.hpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -47,5 +46,7 @@ #include #include +#include #include +#include #endif diff --git a/windows/window.cpp b/windows/window.cpp index 9cf13a25..2ea5b7ce 100644 --- a/windows/window.cpp +++ b/windows/window.cpp @@ -87,7 +87,10 @@ static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA // not a menu if (lParam != 0) break; - if (HIWORD(wParam) != 0) + // IsDialogMessage() will also generate IDOK and IDCANCEL when pressing Enter and Escape (respectively) on some controls, like EDIT controls + // swallow those too; they'll cause runMenuEvent() to panic + // TODO fix the root cause somehow + if (HIWORD(wParam) != 0 || LOWORD(wParam) <= IDCANCEL) break; runMenuEvent(LOWORD(wParam), uiWindow(w)); return 0; @@ -477,7 +480,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) NULL, NULL, hInstance, w); if (w->hwnd == NULL) logLastError(L"error creating window"); - uiFree(wtitle); + uiprivFree(wtitle); if (hasMenubar) { w->menubar = makeMenubar();