* Painter.h:

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 4dc9fb87e542a3f779fb35ba1a7364897dde437b..015a83f03fe2e8b394c6ac0988907a5493768b19 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -136,7 +136,7 @@ namespace {
        void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
        {
                recordUndo(cur);
-               string sel = to_utf8(cur.selectionAsString(false));
+               docstring sel = cur.selectionAsString(false);
                //lyxerr << "selection is: '" << sel << "'" << endl;
 
                // It may happen that sel is empty but there is a selection
@@ -162,11 +162,11 @@ namespace {
                        // create a macro if we see "\\newcommand"
                        // somewhere, and an ordinary formula
                        // otherwise
-                       istringstream is(sel);
-                       if (sel.find("\\newcommand") == string::npos
-                           && sel.find("\\def") == string::npos)
+                       if (sel.find(from_ascii("\\newcommand")) == string::npos
+                           && sel.find(from_ascii("\\def")) == string::npos)
                        {
                                InsetMathHull * formula = new InsetMathHull;
+                               istringstream is(to_utf8(sel));
                                LyXLex lex(0, 0);
                                lex.setStream(is);
                                formula->read(cur.buffer(), lex);
@@ -175,8 +175,9 @@ namespace {
                                        // delimiters are left out
                                        formula->mutate(hullSimple);
                                cur.insert(formula);
-                       } else
-                               cur.insert(new MathMacroTemplate(is));
+                       } else {
+                               cur.insert(new MathMacroTemplate(sel));
+                       }
                }
                cur.message(from_utf8(N_("Math editor mode")));
        }
@@ -283,14 +284,6 @@ bool doInsertInset(LCursor & cur, LyXText * text,
 }
 
 
-void update(LCursor & cur)
-{
-       //we don't call update(true, false) directly to save a metrics call
-       if (cur.bv().fitCursor())
-               cur.bv().update(Update::Force);
-}
-
-
 } // anon namespace
 
 
@@ -404,7 +397,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_BUFFER_BEGIN:
        case LFUN_BUFFER_BEGIN_SELECT:
-               cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
                if (cur.depth() == 1) {
                        needsUpdate |= cursorTop(cur);
                } else {
@@ -414,7 +407,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_BUFFER_END:
        case LFUN_BUFFER_END_SELECT:
-               cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
                if (cur.depth() == 1) {
                        needsUpdate |= cursorBottom(cur);
                } else {
@@ -426,7 +419,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_CHAR_FORWARD_SELECT:
                //lyxerr << BOOST_CURRENT_FUNCTION
                //       << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
-               cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
                if (isRTL(cur.paragraph()))
                        needsUpdate |= cursorLeft(cur);
                else
@@ -442,7 +435,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_CHAR_BACKWARD:
        case LFUN_CHAR_BACKWARD_SELECT:
                //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
-               cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
                if (isRTL(cur.paragraph()))
                        needsUpdate |= cursorRight(cur);
                else
@@ -457,11 +450,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_UP:
        case LFUN_UP_SELECT:
-               update(cur);
                //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
-               cur.selHandle(cmd.action == LFUN_UP_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_UP_SELECT);
 
                needsUpdate |= cursorUp(cur);
+
                if (!needsUpdate && oldTopSlice == cur.top()
                          && cur.boundary() == oldBoundary) {
                        cur.undispatched();
@@ -471,10 +464,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_DOWN:
        case LFUN_DOWN_SELECT:
-               update(cur);
                //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
-               cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
                needsUpdate |= cursorDown(cur);
+
                if (!needsUpdate && oldTopSlice == cur.top() &&
                    cur.boundary() == oldBoundary)
                {
@@ -485,20 +478,19 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_PARAGRAPH_UP:
        case LFUN_PARAGRAPH_UP_SELECT:
-               cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
                needsUpdate |= cursorUpParagraph(cur);
                break;
 
        case LFUN_PARAGRAPH_DOWN:
        case LFUN_PARAGRAPH_DOWN_SELECT:
-               cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
                needsUpdate |= cursorDownParagraph(cur);
                break;
 
        case LFUN_SCREEN_UP:
        case LFUN_SCREEN_UP_SELECT:
-               update(cur);
-               cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
                if (cur.pit() == 0 && cur.textRow().pos() == 0) {
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_UP);
@@ -509,8 +501,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_SCREEN_DOWN:
        case LFUN_SCREEN_DOWN_SELECT:
-               update(cur);
-               cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
                if (cur.pit() == cur.lastpit()
                          && cur.textRow().endpos() == cur.lastpos()) {
                        cur.undispatched();
@@ -522,21 +513,19 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_LINE_BEGIN:
        case LFUN_LINE_BEGIN_SELECT:
-               update(cur);
-               cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
                needsUpdate |= cursorHome(cur);
                break;
 
        case LFUN_LINE_END:
        case LFUN_LINE_END_SELECT:
-               update(cur);
-               cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
                needsUpdate |= cursorEnd(cur);
                break;
 
        case LFUN_WORD_FORWARD:
        case LFUN_WORD_FORWARD_SELECT:
-               cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
                if (isRTL(cur.paragraph()))
                        needsUpdate |= cursorLeftOneWord(cur);
                else
@@ -545,7 +534,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_WORD_BACKWARD:
        case LFUN_WORD_BACKWARD_SELECT:
-               cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+               needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
                if (isRTL(cur.paragraph()))
                        needsUpdate |= cursorRightOneWord(cur);
                else
@@ -904,6 +893,21 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                break;
        }
 
+       case LFUN_UNICODE_INSERT: {
+               if (cmd.argument().empty())
+                       break;
+               docstring hexstring = cmd.argument();
+               if (lyx::support::isHex(hexstring)) {
+                       char_type c = lyx::support::hexToInt(hexstring);
+                       if (c > 32 && c < 0x10ffff) {
+                               lyxerr << "Inserting c: " << c << endl;
+                               docstring s = docstring(1, c);
+                               lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, s));
+                       }
+               }
+               break;
+       }
+               
        case LFUN_QUOTE_INSERT: {
                cap::replaceSelection(cur);
                Paragraph & par = cur.paragraph();
@@ -1473,15 +1477,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                break;
        }
 
+       needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
        if (singleParUpdate)
                // Inserting characters does not change par height
                if (cur.bottom().paragraph().dim().height()
                    == olddim.height()) {
                        // if so, update _only_ this paragraph
-                       cur.bv().update(Update::SinglePar |
-                                       Update::FitCursor |
-                                       Update::MultiParSel);
-                       cur.noUpdate();
+                       cur.updateFlags(Update::SinglePar |
+                               Update::FitCursor |
+                               Update::MultiParSel);
                        return;
                } else
                        needsUpdate = true;
@@ -1492,7 +1496,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
            && !cur.selection())
                cur.noUpdate();
        else
-               cur.needsUpdate();
+               cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
 
@@ -1805,6 +1809,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
        case LFUN_BUFFER_BEGIN:
        case LFUN_BUFFER_BEGIN_SELECT:
        case LFUN_BUFFER_END_SELECT:
+       case LFUN_UNICODE_INSERT:
                // these are handled in our dispatch()
                enable = true;
                break;