Commit Graph

25 Commits

Author SHA1 Message Date
Ian MacArthur
e2653ead78 Correct a few minor typos in xutf8/utf8Wrap.c and add comments to (attempt to) better explain what I have added...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8401 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-08 10:06:19 +00:00
Ian MacArthur
40fab4c769 Set properties on xutf8/utf8Wrap.c
It doesn't look as if the props are set on any of the xutf8 files, actually.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8400 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-08 09:53:51 +00:00
Ian MacArthur
33af4e4ba5 Attempt to fix STR #2550 to make fl_text_extents work in Xlib-only
(i.e. non-XFT) X11 builds.

This appears to be working now, though I can not test it fully, so we
need more feedback.
In particular the setting of the dx param is certainly wrong, but 
works fine in general cases. I think.
Also, I suspect it may behave badly in the face of RtoL text rendering
but I think we have other problems in that area anyway...



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8399 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-07 22:22:16 +00:00
Greg Ercolano
9510d1d52b Fixes to help build on SGI.
Mainly: problem with C++ style comments that were in C code and headers.
SGI C compiler / pre processor no grok C++ comments.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8347 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-01 01:06:27 +00:00
Albrecht Schlosser
129ae3ecd0 Deleted unused files in src/xutf8
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8270 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-12 10:28:53 +00:00
Albrecht Schlosser
b4c15eb8ae Fixed a few GNU compiler warnings (-pedantic): C++ comments in C files,
extraneous ';' and ',' and an invalid cast.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-11 20:52:38 +00:00
Manolo Gouy
6e3bb7b24d Fix STR # 2481: removed compilation warnings.
Files utf8Input.c and utf8Wrap.c (via ucs2fontmap.c that's included)
need a different half of each of these input files. What is in the other
half is unused and thus triggers a compilation warning.
This has been fixed by adding #define NEED_TOWC in utf8Input.c
and #define NEED_TOMB in ucs2fontmap.c and by bracketting the first half
of these include files by #ifdef NEED_TOWC/#endif and the second half
by #ifdef NEED_TOMB/#endif.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8038 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-15 14:07:43 +00:00
Albrecht Schlosser
80677ac290 Changed all #include "config.h" to #include <config.h>.
This is necessary for out-of-source builds (e.g. CMake) to work correctly.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8033 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-15 12:11:16 +00:00
Matthias Melcher
cc4e22eabb Fixed argument type in X11 calls (STR 2432)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7921 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-30 11:05:38 +00:00
Matthias Melcher
7fc05e3505 Fixed more Copyright to 2010.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7904 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-28 21:12:59 +00:00
Manolo Gouy
f4fc4241b7 STR #2155: fixed using sparkaround's patch conditional to use of configure --enable-cp936
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7902 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-28 18:55:50 +00:00
Matthias Melcher
983a0d8ce4 Fixed ARM Unicode cross compilation issue (STR #2432)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7873 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-18 18:43:41 +00:00
Greg Ercolano
4fd11eba88 Changed references to fltk-bugs@fltk.org -> STR form.
Todo: LGPL license file references (COPYING, license.dox, etc)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-28 03:15:47 +00:00
engelsman
d50ca53788 tweaked fl_wcwidth.c and mk_wcwidth.c to remove system wchar_t
commented out, or replaced, wchar_t with unsigned int.
commented out unused functions from mk_wcwidth.c.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-19 21:15:30 +00:00
engelsman
a7a81061be tweaked fl_wcwidth.c and mk_wcwidth.c to supercede system wchar_t
fl_wcwidth.c has a typedef unsigned int wchar_t; and
mk_wcwidth.c has an #if 0 to stop #include <wchar.h>



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7530 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-18 18:38:13 +00:00
engelsman
4f928ef3d6 vanilla version of Markus Kuhn's wcwidth.c plus wrapper code
wcwidth() function required to give column widths for UTF-8
and is required from solving remaining parts of STR-2158



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7529 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-18 15:13:03 +00:00
Greg Ercolano
6cbde8909b xutf8 files code conformance:
o C files containing C++ "//" comments -> C style "/* */" comments
    o Converted unintended doxygen style comments to regular C comments
    o FLTK brace/indent coding standard conformance
    o Tested linux + sgi
    o Avoided mods to xutf8/lcUniConv [libiconv/FSF code]
      to avoid unwanted diffs with future updates of that lib
      as per Fabien's fltk.dev request 03/14/09.
      (Those files already compliant anyway)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6698 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-18 04:47:01 +00:00
Albrecht Schlosser
df19ff61b7 deleted obsolete src/xutf8/makedepend.bak from repository.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6681 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-14 10:18:34 +00:00
Greg Ercolano
50a92455fe Fixes for SGI builds (STR#2174)
1) C++ style comments in C files converted to /* */
   2) #warning's had to be #ifdef'ed out (#if !defined(sgi)..)
With these mods, 1.3.x compiles on IRIX 6.5 with no failures.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6680 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-14 02:11:31 +00:00
Greg Ercolano
5e6a41ba29 More LGPL headers and svn footers compliance (STR#2085 contd).
Think I got all of 'em this time.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6677 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-13 23:26:00 +00:00
Greg Ercolano
70531631bb LGPL headers and svn footers compliance (STR#2085)
todo: FLTK style indent + code compliance.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6675 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-13 22:43:43 +00:00
Fabien Costantini
60335167b2 + Fixed non standard fltk utf8 files headers.
Kept original author and copyright.
  Added standard fltk LGPL header notice

+ Added missing comment to fl_width() related to latest utf8 STR#2086 related fix in r6539 and r6540.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6542 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-12-04 20:20:30 +00:00
Fabien Costantini
7a5e64a4f3 Fixed mingw was broken because src/XUtf8 Makefile didn't point to proper ../../lib and ../../makeinclude paths.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6461 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-10-19 01:27:26 +00:00
Fabien Costantini
ffad932289 + Cairo branch merged after successful testing on Mac OS X 10.5.4, Linux Ubuntu 8.04,Windows XPSP2.
This integration is minimum as discussed, in particular it does not feature any fltk cairo drawing substitution
  as in fltk2.
  Still it provides all the fundations to go further even in next 1.4 ... 
  By default *no* cairo features are implemented nor linked, it can only be activated by --enable-cairo
  whose default is false.
  Please visit the README.cairo for complete description.

+ fixed UTF8 compilation pb on linux ubuntu

+ minor comments fixes on the fly



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-09-25 18:26:33 +00:00
Matthias Melcher
b6bde2e456 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
2008-09-10 23:56:49 +00:00