diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2004-09-09 21:34:48 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2004-09-09 21:34:48 +0000 |
| commit | e20773fa577154d9d5338cecf5f0912d1c9514cc (patch) | |
| tree | 978d03742b04d3a63ba4cf30156c655636ff3e30 /src/fl_rect.cxx | |
| parent | b90f593ae6c6769a1244b5efebbcad3f469027ae (diff) | |
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
Diffstat (limited to 'src/fl_rect.cxx')
| -rw-r--r-- | src/fl_rect.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index 2a19f8fa0..5353ea0ad 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_rect.cxx,v 1.10.2.4.2.17 2004/08/31 22:00:48 matthiaswm Exp $" +// "$Id: fl_rect.cxx,v 1.10.2.4.2.18 2004/09/09 21:34:47 matthiaswm Exp $" // // Rectangle drawing routines for the Fast Light Tool Kit (FLTK). // @@ -432,7 +432,9 @@ Fl_Region XRectangleRegion(int x, int y, int w, int h) { #ifdef __APPLE_QD__ extern Fl_Region fl_window_region; #elif defined(__APPLE_QUARTZ__) -#warning quartz +// warning: the Quartz implementation currently uses Quickdraw calls to achieve +// clipping. A future version should instead use 'CGContectClipToRect' +// and friends. extern Fl_Region fl_window_region; #endif @@ -464,7 +466,6 @@ void fl_restore_clip() { } # endif #elif defined(__APPLE_QUARTZ__) -#warning quartz if ( fl_window ) { GrafPtr port = GetWindowPort( fl_window ); @@ -511,7 +512,6 @@ void fl_push_clip(int x, int y, int w, int h) { #elif defined(__APPLE_QD__) SectRgn(r, current, r); #elif defined(__APPLE_QUARTZ__) -#warning quartz SectRgn(r, current, r); #else Fl_Region temp = XCreateRegion(); @@ -527,7 +527,6 @@ void fl_push_clip(int x, int y, int w, int h) { r = NewRgn(); SetEmptyRgn(r); #elif defined(__APPLE_QUARTZ__) -#warning quartz r = NewRgn(); SetEmptyRgn(r); #else @@ -569,7 +568,6 @@ int fl_not_clipped(int x, int y, int w, int h) { rect.left = x; rect.top = y; rect.right = x+w; rect.bottom = y+h; return RectInRgn(&rect, r); #elif defined(__APPLE_QUARTZ__) -#warning quartz if (!r) return 1; Rect rect; rect.left = x; rect.top = y; rect.right = x+w; rect.bottom = y+h; @@ -620,7 +618,6 @@ int fl_clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H){ if ( h==H && w==W ) return 0; return 0; #elif defined(__APPLE_QUARTZ__) -#warning quartz RgnHandle rr = NewRgn(); SetRectRgn( rr, x, y, x+w, y+h ); SectRgn( r, rr, rr ); @@ -656,5 +653,5 @@ int fl_clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H){ } // -// End of "$Id: fl_rect.cxx,v 1.10.2.4.2.17 2004/08/31 22:00:48 matthiaswm Exp $". +// End of "$Id: fl_rect.cxx,v 1.10.2.4.2.18 2004/09/09 21:34:47 matthiaswm Exp $". // |
