Commit Graph

63 Commits

Author SHA1 Message Date
Albrecht Schlosser
e934dd5468 Fix compiler warnings (STR #2988).
gcc issued lots of warnings if compiled with -Wundef. This shows access
to undefined preprocessor macros, particularly for config tests.

This update is similar, but not identical to fltk-cpp-fixes.patch as
posted on STR #2988 (file #1). There have been changes in the configure
script and the  macros in configh.in and configh.cmake.in meanwhile.

This commit compiles with -Wundef w/o such warnings under Linux and
Windows (MinGW).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11094 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 02:49:56 +00:00
Lauri Kasanen
d9505e1b24 Mark a few symbols static. This is the bulk from STR #3111.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10232 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-21 12:13:47 +00:00
Manolo Gouy
95b8282edb Removed -Wuninitialized compilation warning.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10177 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-30 05:57:00 +00:00
Manolo Gouy
67f3c4cc82 Avoid crash when XftFontOpenPattern() returns NULL.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10175 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-29 13:28:55 +00:00
Albrecht Schlosser
56b7434dd0 Remove unused variable warning.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10047 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-07 01:28:43 +00:00
Greg Ercolano
4f4a8fc3c7 Modifications to all LGPL headers for STR #2685.
(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-07-19 04:49:30 +00:00
Manolo Gouy
199b32d921 Added virtual width(), height(), descent() and text_extents() functions to the Fl_Graphics_Driver
class to prepare for the future definition of graphics drivers that fully deal with text measurement.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8442 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-18 13:39:48 +00:00
Manolo Gouy
3adac027c4 Improved calculation of text width and height when using the PostScript graphics context
under X11 or Xft.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8437 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-16 13:47:03 +00:00
Manolo Gouy
f397c36c06 Fix STR #2565: initilization of the size field of Fl_Font_Descriptor's had been removed
by mistake when removing global variables.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8423 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-15 09:29:43 +00:00
Manolo Gouy
b667f4664f To fix the crash reported by Corvid in STR #2550: crash if fl_text_extent is called without a font.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8403 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-08 18:12:09 +00:00
Manolo Gouy
9f00704be8 Removed static global variables fl_font_ and fl_size_ to have separate font information
for each graphics driver.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8402 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-08 16:13:28 +00:00
Manolo Gouy
cb902eebe3 Replaced global variable fl_fontsize by fl_graphics_driver->font_descriptor().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-07 13:49:34 +00:00
Manolo Gouy
6a5feafe23 Replaced global variable fl_color_ by a private member of the Fl_Graphics_Driver class,
and a public getter to it: Fl_Graphics_Driver::color().

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8384 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-06 12:32:23 +00:00
Manolo Gouy
777ee1b822 Removed global variables fl_font_ and fl_size_ that are now distinct for each graphics device.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8374 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-05 13:54:56 +00:00
Albrecht Schlosser
8197ba8d9b STR #2505: Fixed double string conversion.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8211 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-07 13:28:42 +00:00
Manolo Gouy
5c4cfa8863 Fix STR #2505. This allows bad UTF-8 strings to be displayed under X11+Xft without crash.
Any string is converted to Unicode (to UTF-16 under Cygwin) by fl_utf8decode() within
the fl_draw() and fl_width() functions, and the converted data is drawn/measured.
fl_utf8decode() accepts any byte input, even bad UTF-8.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8208 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-07 09:15:02 +00:00
Manolo Gouy
b431c1e0e7 Use device abstraction for font and text drawing.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8126 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-28 12:02:23 +00:00
Greg Ercolano
4327734e69 More copyright 2010 mods.
Used: vi `grep -r 'Copyright .*Spitzak' . | grep -v 2010 | grep -v '/\.svn' | cut -d: -f1`


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-29 18:18:27 +00:00
Matthias Melcher
bc1928bbc0 Fixed handling of missing fonts in Xft (STR #2355)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7855 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-15 22:13:13 +00:00
Matthias Melcher
0af4b7367f Applied latest changes for STR 2215
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7840 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-15 13:10:14 +00:00
Matthias Melcher
e10019c64b Added alternative Xft font names (STR #2215)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7833 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-14 21:50:24 +00:00
Matthias Melcher
9b2d8347de Added alternative names for Xft. On all Linux distors I tested, it makes no difference. If there are Unixes that need other names, the ifdef should be changed accordingly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7773 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-10-30 16:32:04 +00:00
Matthias Melcher
291faee430 Fixed a bunch of warnings from gcc 4.4.5 . Most of these are parenthesis 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-28 18:02:20 +00:00
Manolo Gouy
449b99dd86 Fix STR 2339 by defining new member function rtl_draw of class Fl_Graphics_Driver
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7652 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-06-21 15:49:45 +00:00
Manolo Gouy
26049351e0 Better device hierarchy with surfaces and graphics drivers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7617 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-05-27 17:20:18 +00:00
Ian MacArthur
52470488ce After testing, I have applied ucko's latest patch for providing access
to "core" fonts when XFT is selected. This allows contexts that need
bitmapped fonts (e.g. GL) to access a bitmap core font, even though
XFT2 does not generally provide bitmap font access.

STR #2214 refers.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7474 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-09 16:46:45 +00:00
Albrecht Schlosser
998cc6df52 Merge of branch-1.3-Fl_Printer, with the following main changes:
(1) adding Fl_Device class (and more) for device abstraction
 (2) adding Fl_Pinter class (and more) for printing support.

Todo: Code cleanup, update dependencies, remove/replace test print window.
I'm looking into converting the test window popup in a global shortcut
that would pop up the print dialog now...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-03-14 18:07:24 +00:00
Matthias Melcher
dc5a320cc6 Setting a default font for Xft
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6862 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-09-13 10:15:42 +00:00
yuri
f13defde28 add fl_draw(int angle, const char* ... functions for rotated text drawing
STR#1840 closed, STR#207 not closed because non-xft functions not implemented 

drawing of N Utf8 characters need correction for rotated and not rotated fl_draw functions not solved!


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6779 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-04-24 09:28:30 +00:00
Greg Ercolano
a68ea3c069 Surrounded all #warning's with #if defined(__GNUC__)
to prevent compiling problems on non-gnu compilers.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6687 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-03-15 03:14:43 +00:00
Matthias Melcher
5251b64d57 Changed Copyright in 'src' directory
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6616 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-01-01 21:28:26 +00:00
Albrecht Schlosser
6ed54124bb Fixed typos and doxygen documentation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6582 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-12-13 18:31:54 +00:00
Albrecht Schlosser
eaf604b4ed Fixed typos and amended doxygen docs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-12-07 17:15:26 +00:00
Ian MacArthur
865f3d8e61 STR 2076: experimental fl_text_extents patch applied. Please feedback comments.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6529 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-11-19 20:34:27 +00:00
Fabien Costantini
e8478458bf Doxygen documentation: Fixed most important warnings for the Fl_Widget, 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-18 19:09:34 +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
Matthias Melcher
b6b746cd69 Replaced badly named type Fl_FontSize with Fl_Font_Descriptor. This type is only used in the core files and not available to the user.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6162 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-08-15 21:18:27 +00:00
Matthias Melcher
e63c50b2d1 Rename type Fl_Font_Size into Fl_Fontsize to comply with other naming in FLTK.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6161 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-08-15 21:11:21 +00:00
Matthias Melcher
7c8f5cc888 First attempt at consistently using Fl_Font as a type for the font index and Fl_Font_Size as a type to measure font height (or rather size).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-04-23 19:09:28 +00:00
Michael R Sweet
83a8cba9a7 Merge gl_font() changes for Xft+X11 (STR #1809)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5999 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2007-12-15 17:35:57 +00:00
Michael R Sweet
3ebd631cf0 Fl::x(), Fl::y(), Fl::w(), and Fl::h() did not report the desktop
work area on X11 (STR #1482)

Fix another "missing sentinel" warning in the Xft code.

FL/Fl.H:
    - Remove in-line x() and y() implementation for X11.

src/Fl_x.cxx:
    - Fl::x(), Fl::y(): Added.
    - fl_init_workarea(): Added to get _NET_WORKAREA property from the
      root window; if none, is available, the code falls back to 0, 0,
      DisplayWidth, and DisplayHeight.

src/fl_font_xft.cxx:
    - Missing sentinel needs cast to void *.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5535 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-10-30 14:16:08 +00:00
Matthias Melcher
44264e3c4e Additional fix for STR #1415 for Xft font selection.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5425 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-09-06 20:16:03 +00:00
Matthias Melcher
e6818b19a6 Fixed byte order in OS X cursor shape data. Added Xft font pointer fl_xftfont.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5262 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-07-18 11:23:20 +00:00
Matthias Melcher
cbbec03b5e fl_font(0, 0) as a first call in Xft would try to access a member in fl_fontsize, which was still set to NULL. This fix is untersted as I don't have a Unix machine here. Please verify this fix!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5035 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-04-27 13:54:08 +00:00
Michael R Sweet
1c399af444 Update source file headers with STR web page.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4288 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-04-16 00:13:17 +00:00
Michael R Sweet
add37faa25 Copyright updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4052 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 21:55:12 +00:00
Michael R Sweet
d0aebb9e46 STR #527: Returning value from void function...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3818 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-09-11 18:06:29 +00:00
Matthias Melcher
e20773fa57 Quartz port:
- removed all #warning statemnets and explained caveats with regular
  // warning lines
- made GL text rendering work again (may use wrong fonts since agl doesn't
  really support ATS)
- removed horizontal jittering in Fl_Input_ caused by fractional text
  positions. Unfortunatly, this does not work for Fl_Text_Display, which
  not only jitters, but also became horendously slow due to the complex
  font rendering in Quartz)

I will fix some of the speed issues in fl_measure this afternoon, and
also improve on the 'innards' for rgb data rendering. After that, I will
have to leave the Quartz port alone for a while due to lack of time.
I suggest we make another rc in the next days.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3812 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-09-09 21:34:48 +00:00
Michael R Sweet
a8b58dc223 Documentation updates (STR #505, STR #513)
The old source file "fl_set_gray.cxx" is not needed (STR #516)

Fl_Text_Display still called delete[] instead of free() in one
place (STR #503)

Fl_File_Chooser didn't correctly call isprint() and isspace()
when checking to see if the current file was text that can be
previewed (STR #517)

FLUID didn't compile with Borland C++ due to a compiler bug (STR
#496)

Fl_Positioner did not handle reversed min and max values (STR
#510)

fl_descent(), fl_height(), and fl_width() would crash a program
if you didn't call fl_font() first; they now return -1 if no
font is set (STR #500)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3805 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-09-07 20:59:18 +00:00
Michael R Sweet
a3d0905c9e Copyright updates and prep for 1.1.5rc1.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3391 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-04-11 04:39:01 +00:00