Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / XPainter.C

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index a40b7f2ad4639125ac56787367031cae04df8bc8..265ee41d099bb1ae15ee35b1f3d94aa245886b80 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -3,45 +3,36 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author unknown
- * \author John Levon 
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "XPainter.h"
-#include "LString.h"
-#include "debug.h"
-#include "XWorkArea.h"
-#include "xfont_metrics.h"
+
 #include "ColorHandler.h"
-#include "lyxrc.h"
+#include "xfont_metrics.h"
+#include "xformsImage.h"
+#include "XWorkArea.h"
+
+#include "font_metrics.h"
+
 #include "encoding.h"
 #include "language.h"
+#include "LColor.h"
+#include "lyxfont.h"
+#include "lyxrc.h"
 
-#ifdef USE_XFORMS_IMAGE_LOADER
-#include "xformsImage.h"
-#else
-#include "graphics/GraphicsImageXPM.h"
-#endif
-
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 
-#include <boost/scoped_array.hpp>
+using lyx::support::uppercase;
 
-#include <cmath>
+using std::string;
 
-using std::endl;
-using std::max;
 
- 
 XPainter::XPainter(XWorkArea & xwa)
        : Painter(), owner_(xwa)
 {
@@ -59,8 +50,8 @@ int XPainter::paperHeight() const
        return owner_.workHeight();
 }
 
- 
-Painter & XPainter::point(int x, int y, LColor::color c)
+
+Painter & XPainter::point(int x, int y, LColor_color c)
 {
        XDrawPoint(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(c), x, y);
@@ -68,22 +59,22 @@ Painter & XPainter::point(int x, int y, LColor::color c)
 }
 
 
-Painter & XPainter::line(int x1, int y1, 
+Painter & XPainter::line(int x1, int y1,
        int x2, int y2,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
-       XDrawLine(fl_get_display(), owner_.getPixmap(), 
+       XDrawLine(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCLinepars(ls, lw, col),
                x1, y1, x2, y2);
        return *this;
 }
 
 
-Painter & XPainter::lines(int const * xp, int const * yp, 
+Painter & XPainter::lines(int const * xp, int const * yp,
        int np,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -94,30 +85,30 @@ Painter & XPainter::lines(int const * xp, int const * yp,
                points[i].y = yp[i];
        }
 
-        XDrawLines(fl_get_display(), owner_.getPixmap(),
-               lyxColorHandler->getGCLinepars(ls, lw, col), 
+       XDrawLines(fl_get_display(), owner_.getPixmap(),
+               lyxColorHandler->getGCLinepars(ls, lw, col),
                points.get(), np, CoordModeOrigin);
 
        return *this;
-}      
+}
 
 
-Painter & XPainter::rectangle(int x, int y, 
+Painter & XPainter::rectangle(int x, int y,
        int w, int h,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
        XDrawRectangle(fl_get_display(), owner_.getPixmap(),
-               lyxColorHandler->getGCLinepars(ls, lw, col), 
+               lyxColorHandler->getGCLinepars(ls, lw, col),
                x, y, w, h);
        return *this;
 }
 
 
-Painter & XPainter::fillRectangle(int x, int y, 
+Painter & XPainter::fillRectangle(int x, int y,
        int w, int h,
-       LColor::color col)
+       LColor_color col)
 {
        XFillRectangle(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col), x, y, w, h);
@@ -125,8 +116,8 @@ Painter & XPainter::fillRectangle(int x, int y,
 }
 
 
-Painter & XPainter::fillPolygon(int const * xp, int const * yp, 
-       int np, LColor::color col)
+Painter & XPainter::fillPolygon(int const * xp, int const * yp,
+       int np, LColor_color col)
 {
        boost::scoped_array<XPoint> points(new XPoint[np]);
 
@@ -134,55 +125,52 @@ Painter & XPainter::fillPolygon(int const * xp, int const * yp,
                points[i].x = xp[i];
                points[i].y = yp[i];
        }
- 
+
        XFillPolygon(fl_get_display(), owner_.getPixmap(),
-               lyxColorHandler->getGCForeground(col), points.get(), 
+               lyxColorHandler->getGCForeground(col), points.get(),
                np, Nonconvex, CoordModeOrigin);
- 
+
        return *this;
 }
 
- 
+
 Painter & XPainter::arc(int x, int y,
        unsigned int w, unsigned int h,
-       int a1, int a2, LColor::color col)
+       int a1, int a2, LColor_color col)
 {
-        XDrawArc(fl_get_display(), owner_.getPixmap(),
+       XDrawArc(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col),
                x, y, w, h, a1, a2);
-        return *this;
+       return *this;
 }
 
- 
-Painter & XPainter::image(int x, int y, 
-       int w, int h,
-       grfx::Image const & i)
+
+Painter & XPainter::image(int x, int y,
+                         int w, int h,
+                         lyx::graphics::Image const & i)
 {
-#ifdef USE_XFORMS_IMAGE_LOADER
-       grfx::xformsImage const & image = static_cast<grfx::xformsImage const &>(i);
-#else
-       grfx::ImageXPM const & image = static_cast<grfx::ImageXPM const &>(i);
-#endif
-       
+       lyx::graphics::xformsImage const & image =
+               static_cast<lyx::graphics::xformsImage const &>(i);
+
        XGCValues val;
        val.function = GXcopy;
        GC gc = XCreateGC(fl_get_display(), owner_.getPixmap(),
                GCFunction, &val);
-       XCopyArea(fl_get_display(), image.getPixmap(), owner_.getPixmap(), 
+       XCopyArea(fl_get_display(), image.getPixmap(), owner_.getPixmap(),
                gc, 0, 0, w, h, x, y);
        XFreeGC(fl_get_display(), gc);
        return *this;
 }
 
 
-Painter & XPainter::text(int x, int y, 
+Painter & XPainter::text(int x, int y,
        string const & s, LyXFont const & f)
 {
        return text(x, y, s.data(), s.length(), f);
 }
 
 
-Painter & XPainter::text(int x, int y, 
+Painter & XPainter::text(int x, int y,
        char c, LyXFont const & f)
 {
        char s[2] = { c, '\0' };
@@ -190,7 +178,7 @@ Painter & XPainter::text(int x, int y,
 }
 
 
-Painter & XPainter::text(int x, int y, 
+Painter & XPainter::text(int x, int y,
        char const * s, size_t ls,
        LyXFont const & f)
 {
@@ -241,12 +229,12 @@ Painter & XPainter::text(int x, int y,
        if (f.underbar() == LyXFont::ON) {
                underline(f, x, y, font_metrics::width(s, ls, f));
        }
-       
+
        return *this;
 }
 
 
-Painter & XPainter::text(int x, int y, 
+Painter & XPainter::text(int x, int y,
        XChar2b const * s, size_t ls,
        LyXFont const & f)
 {
@@ -279,10 +267,10 @@ Painter & XPainter::text(int x, int y,
                        }
                }
        }
-       
+
        if (f.underbar() == LyXFont::ON) {
                underline(f, x, y, xfont_metrics::width(s, ls, f));
        }
-       
+
        return *this;
 }