Commit Graph

26 Commits

Author SHA1 Message Date
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
Michael R Sweet
1251b42130 Fix Xft2 usage (still need to do a final fix that loads the proper X
font...)

Fix Fl_Window/Fl_Double_Window in FLUID.

Fix background tile coloring for plastic scheme.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2003-07-12 04:20:48 +00:00
Michael R Sweet
e2baef33cd gl_font() didn't work properly for X11 when Xft was used (STR #12)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2976 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2003-05-04 21:58:59 +00:00
Michael R Sweet
00cb676e11 Copyright update for 1.1.3 release (not quite yet, but soon...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2936 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2003-01-30 21:46:07 +00:00
Michael R Sweet
46d894851e Xft2 fix from Stephen Davies...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2835 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-11-12 20:35:17 +00:00
Michael R Sweet
bf9a09d387 Patch from Steve Davies for Xft 2.x.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2833 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-11-09 22:59:06 +00:00
Michael R Sweet
be16fa3027 Make sure fl_size_, fl_font_, and fl_xfont are initialized and used.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2297 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-06-08 13:07:19 +00:00
Michael R Sweet
af1ec00483 More color fixes for Xft (fl_color_ wasn't always set)
Fix plastic boxtype (1 pixel too high)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2234 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-05-16 02:16:17 +00:00
Michael R Sweet
edb2118098 Fixed drawing of antialiased text - uchar color value * 0x0101 was
getting truncated to a uchar, so we cast r, g, and b to int first...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-05-15 23:20:51 +00:00
Michael R Sweet
e5ceaa48e4 Use ascent/descent for Xft fonts.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2152 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-05-01 01:06:04 +00:00
Michael R Sweet
c75938c4eb Don't use the returned font sizes, as they yield too much space...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2099 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-04-18 21:07:53 +00:00
Bill Spitzak
1a8da69ca3 Same change as for fltk2.0 to fix warning messages from Xft.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1996 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-03-09 21:33:54 +00:00
Michael R Sweet
e52b682a99 Add Xft support to 1.1.x.
TODO: Fl::set_fonts() should add all of the fonts returned by Xft;
right now it is a no-op.

BUG: Getting X messages like "XRequest.155: 202 0x260002b" for some
reason on my system.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1987 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-03-06 18:11:01 +00:00
No Author
5dd2625d03 This commit was manufactured by cvs2svn to create branch 'branch-1.1'.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1974 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2002-02-25 09:00:23 +00:00