summaryrefslogtreecommitdiff
path: root/src/Fl_compose.cxx
AgeCommit message (Collapse)Author
2022-07-05Documentation: add missing mentions of the Wayland platform.ManoloFLTK
2022-03-03Fix whitespace, update dependencies and fluid filesAlbrecht Schlosser
2022-01-07Re-organize cross-platform support for text input methods.ManoloFLTK
FLTK 1.3 supports complex text input methods (TIMs) for the 3 platforms (X11, Windows, macOS). This support has an interface with FLTK that is common for X11 and Windows, via (undocumented) functions fl_set_spot(), fl_set_status() and fl_reset_spot(). In contrast, and because it's been developed independently, the interface between the macOS TIM and FLTK 1.3 is completely different : static functions FL::insertion_point_location() and Fl::reset_marked_text(). The present change implements a single TIM/FLTK interface used by all platforms based on functions fl_set_spot() and fl_reset_spot(). The previous macOS-specific functions FL::insertion_point_location() and Fl::reset_marked_text() are maintained only for compatibility with 1.3 and deprecated.
2020-07-06Remove $Id$ tags, update URL's, and moreAlbrecht Schlosser
- remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers.
2018-06-26Move Fl_Screen_Driver.H from FL/ to src/Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-05-24Add documentation for Fl::reset_marked_text() and ↵Manolo Gouy
Fl::insertion_point_location(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12930 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-31Move dnd and character-composition related functions from Fl_System_Driver ↵Manolo Gouy
to Fl_Screen_Driver git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11489 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-28Rewrite Fl_compose.cxx under the driver model.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11454 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-13Details on PORTME items. Move fl_parse_color() to screen drivers.Matthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11163 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-11Mark places that need to be refactored with // PORTME:Matthias Melcher
Searching for __APPLE, WIN32 or X11 did give me many false results. I instead marked most ifdef's that I would like to get rid of with the text // PORTME:, so they can be easily found by a global search. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11155 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-04Created pseudo code for all FL_PORTED section so that FLTK compiles and ↵Matthias Melcher
links (Xcode, hello, other C flags: -D FL_PORTING -U __APPLE__ -U __APPLE_QUARTZ__) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-03Updated platform specific #if's to report unimplemented code when compiling ↵Matthias Melcher
with FL_PORTING defined and WIN32 and __APPLE__ undefined> git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-09-06Fixed typo in Doxygen doc of Fl::compose(int&)Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9966 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-02-08Mac OS text input: removed the Fl::marked_text_length() function that's not ↵Manolo Gouy
necessary. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9816 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-01-13Mac OS: added support for the text input feature introduced in OS 10.7 ↵Manolo Gouy
"Lion" where pressing and holding some key opens a window with possible accented characters. This feature is used by the Fl_Input_ and Fl_Text_Editor widgets. User-defined text input widgets can optionally use this feature, but the default behavior is to not use it. Fl_Secret_Input turns it off, for example. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9792 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-24Mac OS text input: defined a small API that user-defined text editing ↵Manolo Gouy
widgets can use to signal marked text. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9774 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-18Mac OS text input support: use primary selection for marked text in ↵Manolo Gouy
Fl_Text_Display + some reformatting. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9763 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-17Mac OS: improved text input support with visible display of marked text in ↵Manolo Gouy
text widgets. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9761 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-16Mac OS text input: handle modifier keys after dead key.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9758 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-14MacOS: towards implementing the NSTextInput protocol to support the text ↵Manolo Gouy
input management system (cont'd). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9753 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-14MacOS: towards implementing the NSTextInput protocol to support the text ↵Manolo Gouy
input management system. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9752 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-07-19Modifications to all LGPL headers for STR #2685.Greg Ercolano
(to clarify static exception LGPL by changing license references) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-04-27Reorganized keyboard input-handling code.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8626 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-04-22Fix STR #2608: the bug had been introduced by r.8552 to solve STR #2598.Manolo Gouy
The new code makes the STR #2598 changes unix-specific so it does not interact with the WIN32 platform. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8618 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-04-01Fix STR #2598 with OP patch.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8552 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-03-21Fix STR #2587: under Xlib, the X input method must be reset by the ↵Manolo Gouy
Fl::compose_reset() function. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-03Mac OS X: removed all uses of Carbon (except for older OS versions) and ↵Manolo Gouy
re-organized text input around the NSTextInput protocol. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-28Fixed Copyright to 2010.Matthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7903 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-28Removed FLTK own character composition rules --> left to OSs. Closes STR #2421.Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7901 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-24Should improve character composition under X11 (see STR #2421).Manolo Gouy
The string compose_pairs was for CP1252 but should be for unicode. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7891 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-20Fixed weird indentsGreg Ercolano
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7879 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-20To fix STR #2452Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7878 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-19To fix STR #2451Manolo Gouy
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7877 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-18Removed FLTK compose system for MSWindows. This should leave keyboard ↵Matthias Melcher
control to the OS instead of having something FLTK specific on top. I can't fully test this because I have merely a U.S. keyboard, but dad keys still seem to work... . git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7876 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-10-28Fixed a bunch of warnings from gcc 4.4.5 . Most of these are parenthesis ↵Matthias Melcher
missing to make the precedence of && over || obvious. Ah well, why not... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-10-26Use Mac OS-defined character composition method. It allows to handle ↵Manolo Gouy
composed characters of many more languages than before (e.g., Polish, Greek). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-29OS X: removed all Carbon and Quickdraw references. Starting with 1.3, we ↵Matthias Melcher
only support Cocoa and Quartz. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7351 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-12-06Moved OS X code base to the more moder Cocoa toolkit thanks to the awesome ↵Matthias Melcher
work of Manolo Gouy (STR #2221). This is a big one! I tested all test applications under 32-bit autoconf and Xcode, and a few apps under 64bit intel. No PPC testing was done. Please verify this patch if you have the machine! git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6951 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-01-01Changed Copyright in 'src' directoryMatthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6616 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-18Doxygen documentation: Fixed most important warnings for the Fl_Widget, ↵Fabien Costantini
Fl_Window, Fl_Valuator classes that should be now a 100% documented. For the rest I drastically reduced the undocumented APIs, but many others (less important) remains. It looks and feels pretty good now :-) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6299 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-16Doxygen documentation : took the opportunity to update copyright info as we ↵Fabien Costantini
modified already in batch almost all sources, added also a fil doxygen command to class headers to harmonize with original matt Fl_Widget dox. format. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6265 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-13WP1 merged from my branch, WP2 reserved, todo list updated.Fabien Costantini
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-10Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and ↵Matthias Melcher
additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-06-19Fixed key compose sequences for shifted keys (STR #1194)Matthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5211 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-05-05Some minor improvements for the Mac keyboard mapping: accent-space would ↵Matthias Melcher
under some cicumstances add an extra space; tilde-space would add a 'funny' tilde from far up un the MacRoman font, not the ASCII tilde as expected. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5084 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-04-19Fixed forgotten line from previouos commitMatthias Melcher
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4997 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-04-19STR #1195: It was not possible to enter a whole range of characters on Mac ↵Matthias Melcher
OS X, including umlauts, etc. . The changes in this patch should not only allow the FLTK way of composing characters, but also support the Mac way of composing including the dead-key preview. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4984 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-04-18THIS FIX CONTAINS TWO MORE FILES THAT MUST BE COMPILED. I wouldMatthias Melcher
like to ask the maintainers of the build environments to please add these files to the setup: src/fl_encoding_latin1.cxx src/fl_encoding_mac_roman.cxx I ADDED SOME DOCUMENTATION THAT NEEDS TO BE FIXED. Beeing not a native English speaker, I have a hard time writing documentation. Would someone please update my babbeling in documentation/drawing.html? Thanks. This commit fixes some very basic problems with OS X's code page in preparation for the compose-character keyboard fix. It also fixes issues with MS Windows and X11 not rendering the characters in the Western (Latin-1) set between 0x80 and 0x9F. In the original ISO font, they were unused, but are now assigned to international characters like the Euro currency sign. This patch also tries to fix one basic flaw with FLTK 1 and font encoding. I will not put much more work into this because FLTK 1.2 and FLTK 2 fix the problem entirely by using UTF-8 instead of 8-bit "C"-style strings. All these changes are only meaningful for foreign language users or users of special characters like the Euro, the Degree or the Permille symbol. A short explanation follows. Max OS X uses a different code page than X11 and Win32. This means that all characters above 0x7f have an entirely different meaning. If your source code contains international characters, your text will appear different if you change to another OS. This patch provides two functions that convert text with international characters from the character set of the source code into the local character set. Two more functions are provided to convert them back. The functions are fl_latin1_to_local (source is in Win32 or X11), fl_mac_roman_to_local (source was written on OS X) and the corresponding fl_local_to_latin1 and fl_local_to_mac_roman, which are very useful if yoou want to store strings with intl. characters that will be moved between systems. All this is assuming a "Western" code page as it is common in the Americas and most of Europe. User of other languages will have to use FLTK 2. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-04-16Update source file headers with STR web page.Michael R Sweet
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4288 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24Copyright updates.Michael R Sweet
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4052 ea41ed52-d2ee-0310-a9c1-e6b18d33e121