diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-23 21:54:30 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-23 21:54:30 +0000 |
| commit | be66d89defefff92dbf683558f9a29f0dfd5c05f (patch) | |
| tree | cb859539a52b2d26b761daccb3d6d08eb5eae567 /src | |
| parent | 031bc363a02b46274987ed00a742916ac80345a8 (diff) | |
Added OpenGL support for dotted lines. Active widget now renders focus rectangle correctly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11039 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Device_Plugin.cxx | 2 | ||||
| -rw-r--r-- | src/cfg_gfx/gdi.H | 2 | ||||
| -rw-r--r-- | src/cfg_gfx/gdi_line_style.cxx | 65 | ||||
| -rw-r--r-- | src/cfg_gfx/opengl.H | 10 | ||||
| -rw-r--r-- | src/cfg_gfx/opengl_line_style.cxx | 70 | ||||
| -rw-r--r-- | src/cfg_gfx/quartz.H | 2 | ||||
| -rw-r--r-- | src/cfg_gfx/quartz_line_style.cxx | 98 | ||||
| -rw-r--r-- | src/cfg_gfx/xlib.H | 2 | ||||
| -rw-r--r-- | src/cfg_gfx/xlib_line_style.cxx | 71 | ||||
| -rw-r--r-- | src/fl_line_style.cxx | 153 |
10 files changed, 342 insertions, 133 deletions
diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index 89a802343..3066a70db 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -56,7 +56,7 @@ const char *Fl_OpenGL_Display_Device::class_id = "Fl_OpenGL_Display_Device"; #include "cfg_gfx/opengl_rect.cxx" #include "cfg_gfx/opengl_vertex.cxx" #include "cfg_gfx/opengl_arci.cxx" - +#include "cfg_gfx/opengl_line_style.cxx" #if defined(__APPLE__) diff --git a/src/cfg_gfx/gdi.H b/src/cfg_gfx/gdi.H index 9fe5ab0bc..5fe4ca89b 100644 --- a/src/cfg_gfx/gdi.H +++ b/src/cfg_gfx/gdi.H @@ -99,6 +99,8 @@ protected: // --- implementation is in src/fl_arci.cxx which includes src/cfg_gfx/xxx_arci.cxx void arc(int x, int y, int w, int h, double a1, double a2); void pie(int x, int y, int w, int h, double a1, double a2); + // --- implementation is in src/fl_line_style.cxx which includes src/cfg_gfx/xxx_line_style.cxx + void line_style(int style, int width=0, char* dashes=0); }; diff --git a/src/cfg_gfx/gdi_line_style.cxx b/src/cfg_gfx/gdi_line_style.cxx new file mode 100644 index 000000000..a3ba0a71a --- /dev/null +++ b/src/cfg_gfx/gdi_line_style.cxx @@ -0,0 +1,65 @@ +// +// "$Id$" +// +// Line style code for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2016 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +#ifndef FL_CFG_GFX_GDI_LINE_STYLE_CXX +#define FL_CFG_GFX_GDI_LINE_STYLE_CXX + +/** + \file gdi_line_style.cxx + \brief Line style drawing utility hiding different platforms. +*/ + +#include "gdi.H" + +void Fl_GDI_Graphics_Driver::line_style(int style, int width, char* dashes) { + + // save line width in global variable for X11 clipping + if (width == 0) fl_line_width_ = 1; + else fl_line_width_ = width>0 ? width : -width; + + // According to Bill, the "default" cap and join should be the + // "fastest" mode supported for the platform. I don't know why + // they should be different (same graphics cards, etc., right?) MRS + static DWORD Cap[4]= {PS_ENDCAP_FLAT, PS_ENDCAP_FLAT, PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE}; + static DWORD Join[4]={PS_JOIN_ROUND, PS_JOIN_MITER, PS_JOIN_ROUND, PS_JOIN_BEVEL}; + int s1 = PS_GEOMETRIC | Cap[(style>>8)&3] | Join[(style>>12)&3]; + DWORD a[16]; int n = 0; + if (dashes && dashes[0]) { + s1 |= PS_USERSTYLE; + for (n = 0; n < 16 && *dashes; n++) a[n] = *dashes++; + } else { + s1 |= style & 0xff; // allow them to pass any low 8 bits for style + } + if ((style || n) && !width) width = 1; // fix cards that do nothing for 0? + LOGBRUSH penbrush = {BS_SOLID,fl_RGB(),0}; // can this be fl_brush()? + HPEN newpen = ExtCreatePen(s1, width, &penbrush, n, n ? a : 0); + if (!newpen) { + Fl::error("fl_line_style(): Could not create GDI pen object."); + return; + } + HPEN oldpen = (HPEN)SelectObject(fl_gc, newpen); + DeleteObject(oldpen); + DeleteObject(fl_current_xmap->pen); + fl_current_xmap->pen = newpen; +} + +#endif // FL_CFG_GFX_GDI_LINE_STYLE_CXX + +// +// End of "$Id$". +// diff --git a/src/cfg_gfx/opengl.H b/src/cfg_gfx/opengl.H index a741416f7..b8dd2bb86 100644 --- a/src/cfg_gfx/opengl.H +++ b/src/cfg_gfx/opengl.H @@ -62,14 +62,6 @@ public: void pop_clip(); void restore_clip(); // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx - // void push_matrix(); - // void pop_matrix(); - // void mult_matrix(double a, double b, double c, double d, double x, double y); - // void rotate(double d); - // double transform_x(double x, double y); - // double transform_y(double x, double y); - // double transform_dx(double x, double y); - // double transform_dy(double x, double y); void transformed_vertex0(COORD_T x, COORD_T y); void transformed_vertex(double xf, double yf); void vertex(double x, double y); @@ -91,6 +83,8 @@ public: // --- implementation is in src/fl_arci.cxx which includes src/cfg_gfx/xxx_arci.cxx void arc(int x, int y, int w, int h, double a1, double a2); void pie(int x, int y, int w, int h, double a1, double a2); + // --- implementation is in src/fl_line_style.cxx which includes src/cfg_gfx/xxx_line_style.cxx + void line_style(int style, int width=0, char* dashes=0); }; diff --git a/src/cfg_gfx/opengl_line_style.cxx b/src/cfg_gfx/opengl_line_style.cxx new file mode 100644 index 000000000..798e6af88 --- /dev/null +++ b/src/cfg_gfx/opengl_line_style.cxx @@ -0,0 +1,70 @@ +// +// "$Id$" +// +// Line style code for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2016 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +#ifndef FL_CFG_GFX_OPENGL_LINE_STYLE_CXX +#define FL_CFG_GFX_OPENGL_LINE_STYLE_CXX + +/** + \file opengl_line_style.cxx + \brief Line style drawing utility hiding different platforms. +*/ + +#include "opengl.H" +#include <FL/gl.H> + +extern int fl_line_width_; + +// OpenGL implementation does not support custom patterns +// OpenGL implementation does not support cap and join types + +void Fl_OpenGL_Graphics_Driver::line_style(int style, int width, char* dashes) { + + // save line width in global variable for X11 clipping + // FIXME: what does this code do? + if (width == 0) fl_line_width_ = 1; + else fl_line_width_ = width>0 ? width : -width; + + if (width<1) width = 1; + + if (style==FL_SOLID) { + glLineStipple(1, 0xFFFF); + glDisable(GL_LINE_STIPPLE); + } else { + switch (style) { + case FL_DASH: + glLineStipple(width, 0x0F0F); // ....****....**** + break; + case FL_DOT: + glLineStipple(width, 0x5555); // .*.*.*.*.*.*.*.* + break; + case FL_DASHDOT: + glLineStipple(width, 0x2727); // ..*..***..*..*** + break; + case FL_DASHDOTDOT: + glLineStipple(width, 0x5757); // .*.*.***.*.*.*** + break; + } + glEnable(GL_LINE_STIPPLE); + } +} + +#endif // FL_CFG_GFX_OPENGL_LINE_STYLE_CXX + +// +// End of "$Id$". +// diff --git a/src/cfg_gfx/quartz.H b/src/cfg_gfx/quartz.H index 584016488..33ef68086 100644 --- a/src/cfg_gfx/quartz.H +++ b/src/cfg_gfx/quartz.H @@ -109,6 +109,8 @@ protected: // --- implementation is in src/fl_arci.cxx which includes src/cfg_gfx/xxx_arci.cxx void arc(int x, int y, int w, int h, double a1, double a2); void pie(int x, int y, int w, int h, double a1, double a2); + // --- implementation is in src/fl_line_style.cxx which includes src/cfg_gfx/xxx_line_style.cxx + void line_style(int style, int width=0, char* dashes=0); }; diff --git a/src/cfg_gfx/quartz_line_style.cxx b/src/cfg_gfx/quartz_line_style.cxx new file mode 100644 index 000000000..8a43180e9 --- /dev/null +++ b/src/cfg_gfx/quartz_line_style.cxx @@ -0,0 +1,98 @@ +// +// "$Id$" +// +// Line style code for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2016 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +#ifndef FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX +#define FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX + +/** + \file quartz_line_style.cxx + \brief Line style drawing utility hiding different platforms. +*/ + +#include "quartz.H" + +float fl_quartz_line_width_ = 1.0f; +static /*enum*/ CGLineCap fl_quartz_line_cap_ = kCGLineCapButt; +static /*enum*/ CGLineJoin fl_quartz_line_join_ = kCGLineJoinMiter; +static CGFloat *fl_quartz_line_pattern = 0; +static int fl_quartz_line_pattern_size = 0; + +void fl_quartz_restore_line_style_() { + CGContextSetLineWidth(fl_gc, fl_quartz_line_width_); + CGContextSetLineCap(fl_gc, fl_quartz_line_cap_); + CGContextSetLineJoin(fl_gc, fl_quartz_line_join_); + CGContextSetLineDash(fl_gc, 0, fl_quartz_line_pattern, fl_quartz_line_pattern_size); +} + +void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) { + + // save line width in global variable for X11 clipping + if (width == 0) fl_line_width_ = 1; + else fl_line_width_ = width>0 ? width : -width; + + static /*enum*/ CGLineCap Cap[4] = { kCGLineCapButt, kCGLineCapButt, + kCGLineCapRound, kCGLineCapSquare }; + static /*enum*/ CGLineJoin Join[4] = { kCGLineJoinMiter, kCGLineJoinMiter, + kCGLineJoinRound, kCGLineJoinBevel }; + if (width<1) width = 1; + fl_quartz_line_width_ = (float)width; + fl_quartz_line_cap_ = Cap[(style>>8)&3]; + // when printing kCGLineCapSquare seems better for solid lines + if ( Fl_Surface_Device::surface() != Fl_Display_Device::display_device() && style == FL_SOLID && dashes == NULL ) { + fl_quartz_line_cap_ = kCGLineCapSquare; + } + fl_quartz_line_join_ = Join[(style>>12)&3]; + char *d = dashes; + static CGFloat pattern[16]; + if (d && *d) { + CGFloat *p = pattern; + while (*d) { *p++ = (float)*d++; } + fl_quartz_line_pattern = pattern; + fl_quartz_line_pattern_size = d-dashes; + } else if (style & 0xff) { + char dash, dot, gap; + // adjust lengths to account for cap: + if (style & 0x200) { + dash = char(2*width); + dot = 1; + gap = char(2*width-1); + } else { + dash = char(3*width); + dot = gap = char(width); + } + CGFloat *p = pattern; + switch (style & 0xff) { + case FL_DASH: *p++ = dash; *p++ = gap; break; + case FL_DOT: *p++ = dot; *p++ = gap; break; + case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break; + case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break; + } + fl_quartz_line_pattern_size = p-pattern; + fl_quartz_line_pattern = pattern; + } else { + fl_quartz_line_pattern = 0; + fl_quartz_line_pattern_size = 0; + } + fl_quartz_restore_line_style_(); +} + +#endif // FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX + +// +// End of "$Id$". +// diff --git a/src/cfg_gfx/xlib.H b/src/cfg_gfx/xlib.H index d184d617c..460e02e10 100644 --- a/src/cfg_gfx/xlib.H +++ b/src/cfg_gfx/xlib.H @@ -98,6 +98,8 @@ protected: // --- implementation is in src/fl_arci.cxx which includes src/cfg_gfx/xxx_arci.cxx void arc(int x, int y, int w, int h, double a1, double a2); void pie(int x, int y, int w, int h, double a1, double a2); + // --- implementation is in src/fl_line_style.cxx which includes src/cfg_gfx/xxx_line_style.cxx + void line_style(int style, int width=0, char* dashes=0); }; diff --git a/src/cfg_gfx/xlib_line_style.cxx b/src/cfg_gfx/xlib_line_style.cxx new file mode 100644 index 000000000..55e759a61 --- /dev/null +++ b/src/cfg_gfx/xlib_line_style.cxx @@ -0,0 +1,71 @@ +// +// "$Id$" +// +// Line style code for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2016 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +#ifndef FL_CFG_GFX_XLIB_LINE_STYLE_CXX +#define FL_CFG_GFX_XLIB_LINE_STYLE_CXX + +/** + \file xlib_line_style.cxx + \brief Line style drawing utility hiding different platforms. +*/ + +#include "xlib.H" + +void Fl_Xlib_Graphics_Driver::line_style(int style, int width, char* dashes) { + + // save line width in global variable for X11 clipping + if (width == 0) fl_line_width_ = 1; + else fl_line_width_ = width>0 ? width : -width; + + int ndashes = dashes ? strlen(dashes) : 0; + // emulate the WIN32 dash patterns on X + char buf[7]; + if (!ndashes && (style&0xff)) { + int w = width ? width : 1; + char dash, dot, gap; + // adjust lengths to account for cap: + if (style & 0x200) { + dash = char(2*w); + dot = 1; // unfortunately 0 does not work + gap = char(2*w-1); + } else { + dash = char(3*w); + dot = gap = char(w); + } + char* p = dashes = buf; + switch (style & 0xff) { + case FL_DASH: *p++ = dash; *p++ = gap; break; + case FL_DOT: *p++ = dot; *p++ = gap; break; + case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break; + case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break; + } + ndashes = p-buf; + } + static int Cap[4] = {CapButt, CapButt, CapRound, CapProjecting}; + static int Join[4] = {JoinMiter, JoinMiter, JoinRound, JoinBevel}; + XSetLineAttributes(fl_display, fl_gc, width, + ndashes ? LineOnOffDash : LineSolid, + Cap[(style>>8)&3], Join[(style>>12)&3]); + if (ndashes) XSetDashes(fl_display, fl_gc, 0, dashes, ndashes); +} + +#endif // FL_CFG_GFX_XLIB_LINE_STYLE_CXX + +// +// End of "$Id$". +// diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx index aae740e4f..e07add50b 100644 --- a/src/fl_line_style.cxx +++ b/src/fl_line_style.cxx @@ -21,6 +21,7 @@ \brief Line style drawing utility hiding different platforms. */ +#include "config_lib.h" #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/x.H> @@ -33,135 +34,39 @@ // FIXME: this would probably better be in class Fl:: int fl_line_width_ = 0; -#ifdef __APPLE_QUARTZ__ -float fl_quartz_line_width_ = 1.0f; -static /*enum*/ CGLineCap fl_quartz_line_cap_ = kCGLineCapButt; -static /*enum*/ CGLineJoin fl_quartz_line_join_ = kCGLineJoinMiter; -static CGFloat *fl_quartz_line_pattern = 0; -static int fl_quartz_line_pattern_size = 0; -void fl_quartz_restore_line_style_() { - CGContextSetLineWidth(fl_gc, fl_quartz_line_width_); - CGContextSetLineCap(fl_gc, fl_quartz_line_cap_); - CGContextSetLineJoin(fl_gc, fl_quartz_line_join_); - CGContextSetLineDash(fl_gc, 0, fl_quartz_line_pattern, fl_quartz_line_pattern_size); -} + +// ----------------------------------------------------------------------------- + + +#ifdef FL_CFG_GFX_QUARTZ + +# include "cfg_gfx/quartz_line_style.cxx" + +#endif + + +// ----------------------------------------------------------------------------- + + +#ifdef FL_CFG_GFX_GDI + +# include "cfg_gfx/gdi_line_style.cxx" + #endif -void Fl_Graphics_Driver::line_style(int style, int width, char* dashes) { - - // save line width in global variable for X11 clipping - if (width == 0) fl_line_width_ = 1; - else fl_line_width_ = width>0 ? width : -width; - -#if defined(USE_X11) - int ndashes = dashes ? strlen(dashes) : 0; - // emulate the WIN32 dash patterns on X - char buf[7]; - if (!ndashes && (style&0xff)) { - int w = width ? width : 1; - char dash, dot, gap; - // adjust lengths to account for cap: - if (style & 0x200) { - dash = char(2*w); - dot = 1; // unfortunately 0 does not work - gap = char(2*w-1); - } else { - dash = char(3*w); - dot = gap = char(w); - } - char* p = dashes = buf; - switch (style & 0xff) { - case FL_DASH: *p++ = dash; *p++ = gap; break; - case FL_DOT: *p++ = dot; *p++ = gap; break; - case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break; - case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break; - } - ndashes = p-buf; - } - static int Cap[4] = {CapButt, CapButt, CapRound, CapProjecting}; - static int Join[4] = {JoinMiter, JoinMiter, JoinRound, JoinBevel}; - XSetLineAttributes(fl_display, fl_gc, width, - ndashes ? LineOnOffDash : LineSolid, - Cap[(style>>8)&3], Join[(style>>12)&3]); - if (ndashes) XSetDashes(fl_display, fl_gc, 0, dashes, ndashes); -#elif defined(WIN32) - // According to Bill, the "default" cap and join should be the - // "fastest" mode supported for the platform. I don't know why - // they should be different (same graphics cards, etc., right?) MRS - static DWORD Cap[4]= {PS_ENDCAP_FLAT, PS_ENDCAP_FLAT, PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE}; - static DWORD Join[4]={PS_JOIN_ROUND, PS_JOIN_MITER, PS_JOIN_ROUND, PS_JOIN_BEVEL}; - int s1 = PS_GEOMETRIC | Cap[(style>>8)&3] | Join[(style>>12)&3]; - DWORD a[16]; int n = 0; - if (dashes && dashes[0]) { - s1 |= PS_USERSTYLE; - for (n = 0; n < 16 && *dashes; n++) a[n] = *dashes++; - } else { - s1 |= style & 0xff; // allow them to pass any low 8 bits for style - } - if ((style || n) && !width) width = 1; // fix cards that do nothing for 0? - LOGBRUSH penbrush = {BS_SOLID,fl_RGB(),0}; // can this be fl_brush()? - HPEN newpen = ExtCreatePen(s1, width, &penbrush, n, n ? a : 0); - if (!newpen) { - Fl::error("fl_line_style(): Could not create GDI pen object."); - return; - } - HPEN oldpen = (HPEN)SelectObject(fl_gc, newpen); - DeleteObject(oldpen); - DeleteObject(fl_current_xmap->pen); - fl_current_xmap->pen = newpen; -#elif defined(__APPLE_QUARTZ__) - static /*enum*/ CGLineCap Cap[4] = { kCGLineCapButt, kCGLineCapButt, - kCGLineCapRound, kCGLineCapSquare }; - static /*enum*/ CGLineJoin Join[4] = { kCGLineJoinMiter, kCGLineJoinMiter, - kCGLineJoinRound, kCGLineJoinBevel }; - if (width<1) width = 1; - fl_quartz_line_width_ = (float)width; - fl_quartz_line_cap_ = Cap[(style>>8)&3]; - // when printing kCGLineCapSquare seems better for solid lines - if ( Fl_Surface_Device::surface() != Fl_Display_Device::display_device() && style == FL_SOLID && dashes == NULL ) { - fl_quartz_line_cap_ = kCGLineCapSquare; - } - fl_quartz_line_join_ = Join[(style>>12)&3]; - char *d = dashes; - static CGFloat pattern[16]; - if (d && *d) { - CGFloat *p = pattern; - while (*d) { *p++ = (float)*d++; } - fl_quartz_line_pattern = pattern; - fl_quartz_line_pattern_size = d-dashes; - } else if (style & 0xff) { - char dash, dot, gap; - // adjust lengths to account for cap: - if (style & 0x200) { - dash = char(2*width); - dot = 1; - gap = char(2*width-1); - } else { - dash = char(3*width); - dot = gap = char(width); - } - CGFloat *p = pattern; - switch (style & 0xff) { - case FL_DASH: *p++ = dash; *p++ = gap; break; - case FL_DOT: *p++ = dot; *p++ = gap; break; - case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break; - case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break; - } - fl_quartz_line_pattern_size = p-pattern; - fl_quartz_line_pattern = pattern; - } else { - fl_quartz_line_pattern = 0; - fl_quartz_line_pattern_size = 0; - } - fl_quartz_restore_line_style_(); -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: implement line styles here" -#else -# error unsupported platform + +// ----------------------------------------------------------------------------- + + +#ifdef FL_CFG_GFX_XLIB + +# include "cfg_gfx/xlib_line_style.cxx" + #endif -} +// ----------------------------------------------------------------------------- + // // End of "$Id$". // |
