Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch …
…and 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
- Loading branch information
Matthias Melcher
committed
Sep 10, 2008
1 parent
dfb50e8
commit b6bde2e
Showing
238 changed files
with
36,562 additions
and
932 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
NOTES: | ||
------ | ||
This is a cut down snapshot of fltk-1.1.x-r6041 merged in a somewhat | ||
haphazard manner with the OksiD UTF-8 patch (for fltk-1.1.6) | ||
Then some of the UTF functions from FLTK2 were back-ported into the | ||
mix. | ||
|
||
This code has also been modified to implement the XFT support on X | ||
that was missing from the fltk-1.1.6 variant. | ||
|
||
I have also introduced a number of extra test programs into the "demo" | ||
directory - to test DnD operation, and to verify the behaviour Fl::add_fd() | ||
on various platforms (this test also verifies some aspects of UDP multicast | ||
operation that was causing issues on win32 with winsock-1.1.) | ||
These two examples are accessed from the Demo program in the Events submenu. | ||
|
||
There is also an extended font-chooser/unicode font display test, derived | ||
from the utf8 test that OksiD had added to fltk-1.1.6-utf8. | ||
This is accessed in the Demo program under the Other Tests/Font Tests | ||
submenu. | ||
|
||
|
||
This code has been tested on linux (FC7), WinXP with mingw | ||
and OSX 10.4.11. | ||
The OSX port MUST HAVE the QUARTZ mode enabled in configure to | ||
work (the older fltk QD code will not work.) | ||
|
||
|
||
Linux | ||
----- | ||
This code has been built with the following configure options | ||
on the linux platform: | ||
|
||
./configure --enable-threads --enable-xft | ||
|
||
At present the code also works without XFT enabled (as the original OksiD | ||
code did) but I can't count on that state of affairs being permanent! | ||
|
||
./configure --enable-threads | ||
|
||
|
||
WIN32 | ||
----- | ||
On WinXP, the code was built with mingw in an Msys shell with the | ||
following configure options: | ||
|
||
./configure --enable-threads | ||
|
||
Was used an a box that already has image libs installed. | ||
|
||
./configure --enable-threads --enable-localjpeg --enable-localzlib --enable-localpng | ||
|
||
Was used an a box that does not have image libs installed. | ||
|
||
Both cases function as expected. | ||
|
||
I do not have access to the MS compler tools here, so the code is untested with | ||
their compilers. I do not think I have introduced any incompatabilities but... | ||
Feedback welcome. | ||
|
||
NOTE: The "standard" FLTK-1.1 build uses the (deprecated) winsock-1.1 libs. | ||
This revised code uses the (allegedly) better winsock-2 libs instead. | ||
This means you will probably have to change the link options in any existing | ||
projects to incorporate this change - the libs are *NOT* reliably inter-changeable! | ||
(fltk-utf8-config will return the correct libs for use.) | ||
|
||
|
||
OSX | ||
--- | ||
The OSX build was configured with: | ||
|
||
./configure --enable-threads --enable-quartz | ||
|
||
|
||
Issues | ||
------ | ||
At time of writing, the code seems to "work", but there are issues: | ||
|
||
- The build is "noisy". | ||
|
||
- The gl font handling is not ideal under XFT (but it always was | ||
anyway. We need a glXUseXftFont method really, but that doesn't seem | ||
to exist...I could try and write one, but time...) | ||
|
||
- The xim stuff is still needing work - I'm pretty sure I have broken this | ||
|
||
- Input methods under win32? I don't know. | ||
|
||
- Input Methods under OSX? No idea. | ||
|
||
- The code is now badly formatted in places from all my random | ||
cut'n'paste... | ||
|
||
-- | ||
IMM: 24th Feb 2008 |
Oops, something went wrong.