LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / rowpainter.C

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 779f5a6ee1af4d27cb92add43854060519353bb4..7be384bfdff366361a7330603aaf53a59fcab058 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -25,7 +25,6 @@
 #include "LColor.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
-#include "lyxrow_funcs.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
@@ -33,7 +32,6 @@
 #include "vspace.h"
 
 #include "frontends/FontMetrics.h"
-#include "frontends/nullpainter.h"
 #include "frontends/Painter.h"
 
 #include "insets/insettext.h"
@@ -42,15 +40,11 @@
 
 #include <boost/crc.hpp>
 
-using lyx::docstring;
-using lyx::frontend::Painter;
-using lyx::frontend::NullPainter;
-using lyx::frontend::FontMetrics;
 
-using lyx::char_type;
-using lyx::pit_type;
-using lyx::pos_type;
-using lyx::Point;
+namespace lyx {
+
+using frontend::Painter;
+using frontend::FontMetrics;
 
 using std::endl;
 using std::max;
@@ -83,13 +77,13 @@ public:
 
 private:
        void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
-       void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font);
-       void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font);
-       void paintChars(lyx::pos_type & vpos, LyXFont font,
+       void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
+       void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
+       void paintChars(pos_type & vpos, LyXFont font,
                        bool hebrew, bool arabic);
        int paintAppendixStart(int y);
-       void paintFromPos(lyx::pos_type & vpos);
-       void paintInset(lyx::pos_type const pos, LyXFont const & font);
+       void paintFromPos(pos_type & vpos);
+       void paintInset(pos_type const pos, LyXFont const & font);
 
        /// return left margin
        int leftMargin() const;
@@ -273,6 +267,7 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
        str += par_.getChar(pos);
 #else
        std::vector<char_type> str;
+       str.reserve(100);
        str.push_back(par_.getChar(pos));
 #endif
        if (arabic) {
@@ -413,12 +408,12 @@ void RowPainter::paintAppendix()
 
 void RowPainter::paintDepthBar()
 {
-       Paragraph::depth_type const depth = par_.getDepth();
+       depth_type const depth = par_.getDepth();
 
        if (depth <= 0)
                return;
 
-       Paragraph::depth_type prev_depth = 0;
+       depth_type prev_depth = 0;
        if (!text_.isFirstRow(pit_, row_)) {
                pit_type pit2 = pit_;
                if (row_.pos() == 0)
@@ -426,7 +421,7 @@ void RowPainter::paintDepthBar()
                prev_depth = pars_[pit2].getDepth();
        }
 
-       Paragraph::depth_type next_depth = 0;
+       depth_type next_depth = 0;
        if (!text_.isLastRow(pit_, row_)) {
                pit_type pit2 = pit_;
                if (row_.endpos() >= pars_[pit2].size())
@@ -434,7 +429,7 @@ void RowPainter::paintDepthBar()
                next_depth = pars_[pit2].getDepth();
        }
 
-       for (Paragraph::depth_type i = 1; i <= depth; ++i) {
+       for (depth_type i = 1; i <= depth; ++i) {
                int const w = nestMargin() / 5;
                int x = int(xo_) + w * i;
                // only consider the changebar space if we're drawing outermost text
@@ -550,7 +545,7 @@ void RowPainter::paintFirst()
                                pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
                        } else {
                                // FIXME UNICODE
-                               docstring lab = lyx::from_utf8(layout->labelsep);
+                               docstring lab = from_utf8(layout->labelsep);
                                if (is_rtl) {
                                        x = width_ - leftMargin()
                                                + fm.width(lab);
@@ -714,7 +709,7 @@ void RowPainter::paintText()
                if (body_pos > 0 && pos == body_pos - 1) {
                        // FIXME UNICODE
                        int const lwidth = theFontMetrics(getLabelFont())
-                               .width(lyx::from_utf8(layout->labelsep));
+                               .width(from_utf8(layout->labelsep));
 
                        x_ += label_hfill_ + lwidth - width_pos;
                }
@@ -727,7 +722,7 @@ void RowPainter::paintText()
 
                        pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
 
-                       if (hfillExpansion(par_, row_, pos)) {
+                       if (par_.hfillExpansion(row_, pos)) {
                                int const y2 = (y0 + y1) / 2;
 
                                if (pos >= body_pos) {
@@ -768,15 +763,15 @@ void RowPainter::paintText()
 }
 
 
-lyx::size_type calculateRowSignature(Row const & row, Paragraph const & par,
+size_type calculateRowSignature(Row const & row, Paragraph const & par,
        int x, int y)
 {
        boost::crc_32_type crc;
-       for (lyx::pos_type i = row.pos(); i < row.endpos(); ++i) {
-               const unsigned char b[] = { par.getChar(i) };
+       for (pos_type i = row.pos(); i < row.endpos(); ++i) {
+               char_type const b[] = { par.getChar(i) };
                crc.process_bytes(b, 1);
        }
-       const unsigned char b[] = { x, y, row.width() };
+       char_type const b[] = { x, y, row.width() };
        crc.process_bytes(b, 3);
        return crc.checksum();
 }
@@ -787,7 +782,7 @@ bool CursorOnRow(PainterInfo & pi, pit_type const pit,
 {
        // Is there a cursor on this row (or inside inset on row)
        LCursor & cur = pi.base.bv->cursor();
-       for (lyx::size_type d = 0; d < cur.depth(); d++) {
+       for (size_type d = 0; d < cur.depth(); ++d) {
                CursorSlice const & sl = cur[d];
                if (sl.text() == &text
                    && sl.pit() == pit
@@ -807,7 +802,7 @@ bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
        LCursor & cur = pi.base.bv->cursor();
        if (rit->pos() + 1 != rit->endpos())
                return false;
-       for (lyx::size_type d = 0; d < cur.depth(); d++) {
+       for (size_type d = 0; d < cur.depth(); d++) {
                CursorSlice const & sl = cur[d];
                if (sl.text() == &text
                    && sl.pit() == pit
@@ -823,8 +818,6 @@ void paintPar
         bool repaintAll)
 {
 //     lyxerr << "  paintPar: pit: " << pit << " at y: " << y << endl;
-       static NullPainter nop;
-       static PainterInfo nullpi(pi.base.bv, nop);
        int const ww = pi.base.bv->workHeight();
 
        pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
@@ -837,7 +830,7 @@ void paintPar
        RowList::const_iterator const re = par.rows().end();
 
        y -= rb->ascent();
-       lyx::size_type rowno(0);
+       size_type rowno = 0;
        for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
                y += rit->ascent();
                // Allow setting of refreshInside for nested insets in
@@ -845,7 +838,7 @@ void paintPar
                bool tmp = refreshInside;
 
                // Row signature; has row changed since last paint?
-               lyx::size_type const row_sig = calculateRowSignature(*rit, par, x, y);
+               size_type const row_sig = calculateRowSignature(*rit, par, x, y);
                bool row_has_changed = par.rowSignature()[rowno] != row_sig;
 
                bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
@@ -871,7 +864,7 @@ void paintPar
 
                        bool const inside = (y + rit->descent() >= 0
                                       && y - rit->ascent() < ww);
-                       RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
+                       RowPainter rp(pi, text, pit, *rit, x, y);
                        // Clear background of this row
                        // (if paragraph background was not cleared)
                        if (!repaintAll &&
@@ -951,7 +944,7 @@ void paintText(BufferView & bv, ViewMetricsInfo const & vi,
                        Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
        }
 
-       if (vi.p2 < lyx::pit_type(text.paragraphs().size()) - 1) {
+       if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
                text.redoParagraph(vi.p2 + 1);
                bv.coordCache().parPos()[&text][vi.p2 + 1] =
                        Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
@@ -982,3 +975,6 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
                y += text.getPar(pit).descent();
        }
 }
+
+
+} // namespace lyx