X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=5b41de1b1e806d0e0f6edd6d98c72e69c91aad2a;hb=27290f151b160dd4763a41976af3451755cd03cf;hp=74dd4ca64847bde7a345ca41b43d46cba09c5614;hpb=b9288969ec06caa3d7b1e9d4eb7937c1e029b44f;p=lyx.git diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 74dd4ca648..5b41de1b1e 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -87,7 +87,7 @@ using SigC::slot; using lyx::pos_type; using lyx::textclass_type; -/* the selection possible is needed, that only motion events are +/* the selection possible is needed, that only motion events are * used, where the bottom press event was on the drawing area too */ bool selection_possible = false; @@ -153,10 +153,10 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o, workarea_.workAreaKeyPress .connect(slot(this, &BufferView::Pimpl::workAreaKeyPress)); workarea_.selectionRequested - .connect(slot(this, &BufferView::Pimpl::selectionRequested)); + .connect(slot(this, &BufferView::Pimpl::selectionRequested)); workarea_.selectionLost .connect(slot(this, &BufferView::Pimpl::selectionLost)); - + cursor_timeout.timeout.connect(slot(this, &BufferView::Pimpl::cursorToggle)); cursor_timeout.start(); @@ -165,7 +165,7 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o, } -Painter & BufferView::Pimpl::painter() +Painter & BufferView::Pimpl::painter() { return workarea_.getPainter(); } @@ -176,7 +176,9 @@ void BufferView::Pimpl::buffer(Buffer * b) lyxerr[Debug::INFO] << "Setting buffer in BufferView (" << b << ")" << endl; if (buffer_) { +#if 0 insetSleep(); +#endif buffer_->delUser(bv_); // Put the old text into the TextCache, but @@ -186,7 +188,7 @@ void BufferView::Pimpl::buffer(Buffer * b) textcache.add(buffer_, workarea_.workWidth(), bv_->text); if (lyxerr.debugging()) textcache.show(lyxerr, "BufferView::buffer"); - + bv_->text = 0; } @@ -194,7 +196,7 @@ void BufferView::Pimpl::buffer(Buffer * b) buffer_ = b; if (bufferlist.getState() == BufferList::CLOSING) return; - + // Nuke old image // screen is always deleted when the buffer is changed. screen_.reset(0); @@ -222,7 +224,9 @@ void BufferView::Pimpl::buffer(Buffer * b) // require bv_->text. owner_->getDialogs()->updateBufferDependent(true); redraw(); +#if 0 insetWakeup(); +#endif } else { lyxerr[Debug::INFO] << " No Buffer!" << endl; owner_->updateMenubar(); @@ -300,12 +304,12 @@ void BufferView::Pimpl::redoCurrentBuffer() int BufferView::Pimpl::resizeCurrentBuffer() { lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl; - + Paragraph * par = 0; Paragraph * selstartpar = 0; Paragraph * selendpar = 0; UpdatableInset * the_locking_inset = 0; - + pos_type pos = 0; pos_type selstartpos = 0; pos_type selendpos = 0; @@ -326,6 +330,9 @@ int BufferView::Pimpl::resizeCurrentBuffer() selection = bv_->text->selection.set(); mark_set = bv_->text->selection.mark(); the_locking_inset = bv_->theLockingInset(); + buffer_->resizeInsets(bv_); + // I don't think the delete and new are necessary here we just could + // call only init! (Jug 20020419) delete bv_->text; bv_->text = new LyXText(bv_); bv_->text->init(bv_); @@ -345,14 +352,16 @@ int BufferView::Pimpl::resizeCurrentBuffer() } else { bv_->text = new LyXText(bv_); bv_->text->init(bv_); + //buffer_->resizeInsets(bv_); } } + updateScreen(); if (par) { bv_->text->selection.set(true); - /* at this point just to avoid the Delete-Empty-Paragraph - * Mechanism when setting the cursor */ + // At this point just to avoid the Delete-Empty-Paragraph- + // Mechanism when setting the cursor. bv_->text->selection.mark(mark_set); if (selection) { bv_->text->setCursor(bv_, selstartpar, selstartpos); @@ -368,10 +377,9 @@ int BufferView::Pimpl::resizeCurrentBuffer() // remake the inset locking bv_->theLockingInset(the_locking_inset); } + bv_->text->first_y = screen_->topCursorVisible(bv_->text); -#if 0 - buffer_->resizeInsets(bv_); -#endif + // this will scroll the screen such that the cursor becomes visible updateScrollbar(); redraw(); @@ -379,7 +387,7 @@ int BufferView::Pimpl::resizeCurrentBuffer() setState(); owner_->allowInput(); - /// clear the "Formatting Document" message + /// clear the "Formatting Document" message owner_->message(""); return 0; @@ -395,10 +403,8 @@ void BufferView::Pimpl::updateScreen() void BufferView::Pimpl::updateScrollbar() { - /* If the text is smaller than the working area, the scrollbar - * maximum must be the working area height. No scrolling will - * be possible */ if (!bv_->text) { + lyxerr[Debug::GUI] << "no text in updateScrollbar" << endl; workarea_.setScrollbar(0, 1.0); return; } @@ -406,49 +412,43 @@ void BufferView::Pimpl::updateScrollbar() long const text_height = bv_->text->height; long const work_height = workarea_.height(); + double const lineh = bv_->text->defaultHeight(); + double const slider_size = + (text_height == 0) ? 1.0 : 1.0 / double(text_height); + + lyxerr[Debug::GUI] << "text_height now " << text_height << endl; + lyxerr[Debug::GUI] << "work_height " << work_height << endl; + + /* If the text is smaller than the working area, the scrollbar + * maximum must be the working area height. No scrolling will + * be possible */ if (text_height <= work_height) { + lyxerr[Debug::GUI] << "doc smaller than workarea !" << endl; workarea_.setScrollbarBounds(0.0, 0.0); current_scrollbar_value = bv_->text->first_y; workarea_.setScrollbar(current_scrollbar_value, 1.0); return; } - - double const lineh = bv_->text->defaultHeight(); - double const slider_size = - (text_height == 0) ? 1.0 : 1.0 / double(text_height); - - static long old_text_height; - static double old_lineh; - static double old_slider_size; - - if (text_height != old_text_height) { - workarea_.setScrollbarBounds(0.0, - text_height - work_height); - old_text_height = text_height; - } - if (lineh != old_lineh) { - workarea_.setScrollbarIncrements(lineh); - old_lineh = lineh; - } - if (current_scrollbar_value != bv_->text->first_y - || slider_size != old_slider_size) { - current_scrollbar_value = bv_->text->first_y; - workarea_.setScrollbar(current_scrollbar_value, slider_size); - old_slider_size = slider_size; - } + + workarea_.setScrollbarBounds(0.0, text_height - work_height); + workarea_.setScrollbarIncrements(lineh); + current_scrollbar_value = bv_->text->first_y; + workarea_.setScrollbar(current_scrollbar_value, slider_size); } // Callback for scrollbar slider void BufferView::Pimpl::scrollCB(double value) { + lyxerr[Debug::GUI] << "scrollCB of " << value << endl; + if (!buffer_) return; current_scrollbar_value = long(value); if (current_scrollbar_value < 0) current_scrollbar_value = 0; - + if (!screen_.get()) return; @@ -458,9 +458,9 @@ void BufferView::Pimpl::scrollCB(double value) waitForX(); return; } - + LyXText * vbt = bv_->text; - + int const height = vbt->defaultHeight(); int const first = static_cast((bv_->text->first_y + height)); int const last = static_cast((bv_->text->first_y + workarea_.height() - height)); @@ -476,58 +476,68 @@ void BufferView::Pimpl::scrollCB(double value) int BufferView::Pimpl::scrollUp(long time) { - if (!buffer_) return 0; - if (!screen_.get()) return 0; - + if (!buffer_ || !screen_.get()) + return 0; + double value = workarea_.getScrollbarValue(); - - if (value == 0) return 0; + if (value == 0) + return 0; + +#if 1 float add_value = (bv_->text->defaultHeight() + float(time) * float(time) * 0.125); - + if (add_value > workarea_.height()) add_value = float(workarea_.height() - bv_->text->defaultHeight()); - +#else + float add_value = float(workarea_.height()) * float(time) / 100; +#endif + value -= add_value; if (value < 0) value = 0; - + workarea_.setScrollbarValue(value); - - scrollCB(value); + + scrollCB(value); return 0; } int BufferView::Pimpl::scrollDown(long time) { - if (!buffer_) return 0; - if (!screen_.get()) return 0; - + if (!buffer_ || !screen_.get()) + return 0; + double value = workarea_.getScrollbarValue(); pair p = workarea_.getScrollbarBounds(); double const max = p.second; - - if (value == max) return 0; + if (value == max) + return 0; + +#if 1 float add_value = (bv_->text->defaultHeight() + float(time) * float(time) * 0.125); - + if (add_value > workarea_.height()) add_value = float(workarea_.height() - bv_->text->defaultHeight()); - +#else + float add_value = float(workarea_.height()) * float(time) / 100; +#endif + value += add_value; - + if (value > max) value = max; workarea_.setScrollbarValue(value); - - scrollCB(value); + + scrollCB(value); return 0; } @@ -553,29 +563,48 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state) cursor.par(), cursor.pos()); int width = bv_->theLockingInset()->width(bv_, font); int inset_x = font.isVisibleRightToLeft() - ? cursor.x() - width : cursor.x(); + ? cursor.ix() - width : cursor.ix(); int start_x = inset_x + bv_->theLockingInset()->scroll(); bv_->theLockingInset()-> insetMotionNotify(bv_, x - start_x, - y - cursor.y() + bv_->text->first_y, + y - cursor.iy() + bv_->text->first_y, state); return; } - + /* The test for not selection possible is needed, that only motion events are used, where the bottom press event was on the drawing area too */ if (!selection_possible) return; - - screen_->hideCursor(); + screen_->hideCursor(); +#if 0 + int y_before = bv_->text->cursor.y(); +#endif + Row * cursorrow = bv_->text->cursor.row(); bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first_y); - +#if 0 + // sorry for this but I have a strange error that the y value jumps at + // a certain point. This seems like an error in my xforms library or + // in some other local environment, but I would like to leave this here + // for the moment until I can remove this (Jug 20020418) + if (y_before < bv_->text->cursor.y()) + lyxerr << y_before << ":" << bv_->text->cursor.y() << endl; +#endif + // This is to allow jumping over large insets + if (cursorrow == bv_->text->cursor.row()) { + if (y >= int(workarea_.height())) { + bv_->text->cursorDown(bv_, false); + } else if (y < 0) { + bv_->text->cursorUp(bv_, false); + } + } + if (!bv_->text->selection.set()) update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted - + bv_->text->setSelection(bv_); screen_->toggleToggle(bv_->text, bv_); fitCursor(); @@ -585,13 +614,13 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state) // Single-click on work area void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, - unsigned int button) + unsigned int button) { - if (!buffer_ || !screen_.get()) return; - - Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos); + if (!buffer_ || !screen_.get()) + return; // ok ok, this is a hack. + // Why??? (Jug20020424) if (button == 4 || button == 5) { switch (button) { case 4: @@ -601,11 +630,29 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, scrollDown(lyxrc.wheel_jump); break; } + // We shouldn't go further down as we really should only do the + // scrolling and be done with this. Otherwise we may open some + // dialogs (Jug 20020424). + return; } - + + Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos); + + // Middle button press pastes if we have a selection + // We do this here as if the selection was inside an inset + // it could get cleared on the unlocking of the inset so + // we have to check this first + bool paste_internally = false; + if (button == 2 && bv_->getLyXText()->selection.set()) { + owner_->getLyXFunc()->dispatch(LFUN_COPY); + paste_internally = true; + } + + int const screen_first = bv_->text->first_y; + if (bv_->theLockingInset()) { // We are in inset locking mode - + /* Check whether the inset was hit. If not reset mode, otherwise give the event to the inset */ if (inset_hit == bv_->theLockingInset()) { @@ -616,28 +663,18 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, bv_->unlockInset(bv_->theLockingInset()); } } - + if (!inset_hit) selection_possible = true; screen_->hideCursor(); - int const screen_first = bv_->text->first_y; - - // Middle button press pastes if we have a selection - bool paste_internally = false; - if (button == 2 - && bv_->text->selection.set()) { - owner_->getLyXFunc()->dispatch(LFUN_COPY); - paste_internally = true; - } - // Clear the selection screen_->toggleSelection(bv_->text, bv_); bv_->text->clearSelection(); bv_->text->fullRebreak(bv_); update(); updateScrollbar(); - + // Single left click in math inset? if (isHighlyEditableInset(inset_hit)) { // Highly editable inset, like math @@ -645,30 +682,34 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, selection_possible = false; owner_->updateLayoutChoice(); owner_->message(inset->editMessage()); - // IMO the inset has to be first in edit-mode and then we send the - // button press. (Jug 20020222) - inset->edit(bv_); //, xpos, ypos, button); + //inset->edit(bv_, xpos, ypos, button); + // We just have to lock the inset before calling a PressEvent on it! + // we don't need the edit() call here! (Jug20020329) + if (!bv_->lockInset(inset)) { + lyxerr[Debug::INSETS] << "Cannot lock inset" << endl; + } inset->insetButtonPress(bv_, xpos, ypos, button); return; - } - + } + // I'm not sure we should continue here if we hit an inset (Jug20020403) + // Right click on a footnote flag opens float menu - if (button == 3) { + if (button == 3) { selection_possible = false; return; } - + if (!inset_hit) // otherwise it was already set in checkInsetHit(...) bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first); finishUndo(); bv_->text->selection.cursor = bv_->text->cursor; bv_->text->cursor.x_fix(bv_->text->cursor.x()); - + owner_->updateLayoutChoice(); if (fitCursor()) { selection_possible = false; } - + // Insert primary selection with middle mouse // if there is a local selection in the current buffer, // insert this @@ -684,7 +725,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, } -void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) +void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) { // select a word if (!buffer_) @@ -743,26 +784,42 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button) void BufferView::Pimpl::selectionRequested() { + static string sel; + if (!available()) return; - - string const sel(bv_->getLyXText()->selectionAsString(bv_->buffer(), - false)); + + LyXText * text = bv_->getLyXText(); + + if (text->selection.set() && + (!bv_->text->xsel_cache.set() || + text->selection.start != bv_->text->xsel_cache.start || + text->selection.end != bv_->text->xsel_cache.end)) + { + bv_->text->xsel_cache = text->selection; + sel = text->selectionAsString(bv_->buffer(), false); + } else if (!text->selection.set()) { + sel = string(); + bv_->text->xsel_cache.set(false); + } if (!sel.empty()) { workarea_.putClipboard(sel); } } - + void BufferView::Pimpl::selectionLost() { - hideCursor(); - toggleSelection(); - bv_->getLyXText()->clearSelection(); - showCursor(); + if (active() && available()) { + hideCursor(); + toggleSelection(); + bv_->getLyXText()->clearSelection(); + showCursor(); + bv_->text->xsel_cache.set(false); + } } - + void BufferView::Pimpl::enterView() { if (active() && available()) { @@ -784,7 +841,9 @@ void BufferView::Pimpl::leaveView() void BufferView::Pimpl::workAreaButtonRelease(int x, int y, unsigned int button) { - if (!buffer_ || !screen_.get()) return; + // do nothing if we used the mouse wheel + if (!buffer_ || !screen_.get() || button == 4 || button == 5) + return; // If we hit an inset, we have the inset coordinates in these // and inset_hit points to the inset. If we do not hit an @@ -795,15 +854,15 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, // We are in inset locking mode. /* LyX does a kind of work-area grabbing for insets. - Only a ButtonPress Event outside the inset will + Only a ButtonPress Event outside the inset will force a insetUnlock. */ bv_->theLockingInset()-> insetButtonRelease(bv_, x, y, button); return; } - + selection_possible = false; - + if (button == 2) return; @@ -811,7 +870,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, if (button == 1) { workarea_.haveSelection(bv_->getLyXText()->selection.set()); } - + setState(); owner_->showState(); owner_->updateMenubar(); @@ -824,7 +883,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, // if we reach this point with a selection, it // must mean we are currently selecting. // But we don't want to open the inset - // because that is annoying for the user. + // because that is annoying for the user. // So just pretend we didn't hit it. // this is OK because a "kosher" ButtonRelease // will follow a ButtonPress that clears @@ -833,7 +892,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, // problems if we end up opening an inset if (bv_->getLyXText()->selection.set()) return; - + // CHECK fix this proper in 0.13 // well, maybe 13.0 !!!!!!!!! @@ -862,13 +921,17 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, inset->insetButtonRelease(bv_, x, y, button); } else { inset_hit->insetButtonRelease(bv_, x, y, button); + // IMO this is a grosshack! Inset's should be changed so that + // they call the actions they have to do with the insetButtonRel. + // function and not in the edit(). This should be changed + // (Jug 20020329) inset_hit->edit(bv_, x, y, button); } return; } // Maybe we want to edit a bibitem ale970302 - if (bv_->text->cursor.par()->bibkey && x < 20 + + if (bv_->text->cursor.par()->bibkey && x < 20 + bibitemMaxWidth(bv_, textclasslist[buffer_->params.textclass].defaultfont())) { bv_->text->cursor.par()->bibkey->edit(bv_, 0, 0, 0); } @@ -884,23 +947,23 @@ Box BufferView::Pimpl::insetDimensions(LyXText const & text, pos_type const pos = cursor.pos(); lyx::Assert(par.getInset(pos)); - + Inset const & inset(*par.getInset(pos)); LyXFont const & font = text.getFont(buffer_, &par, pos); - + int const width = inset.width(bv_, font); int const inset_x = font.isVisibleRightToLeft() - ? (cursor.x() - width) : cursor.x(); - + ? (cursor.ix() - width) : cursor.ix(); + return Box( inset_x + inset.scroll(), inset_x + width, - cursor.y() - inset.ascent(bv_, font), - cursor.y() + inset.descent(bv_, font)); + cursor.iy() - inset.ascent(bv_, font), + cursor.iy() + inset.descent(bv_, font)); } - - + + Inset * BufferView::Pimpl::checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const @@ -913,7 +976,7 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text, } Inset /*const*/ * inset = par.getInset(pos); - + if (!isEditableInset(inset)) { return 0; } @@ -921,40 +984,40 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text, Box b(insetDimensions(text, cursor)); if (!b.contained(x, y)) { - lyxerr[Debug::GUI] << "Missed inset at x,y " << x << "," << y + lyxerr[Debug::GUI] << "Missed inset at x,y " << x << "," << y << " box " << b << endl; return 0; } - + text.setCursor(bv_, &par, pos, true); - + x -= b.x1; // The origin of an inset is on the baseline - y -= (text.cursor.y()); - + y -= text.cursor.iy(); + return inset; } - + Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y) { if (!screen_.get()) return 0; - + int y_tmp = y + text->first_y; - + LyXCursor cursor; text->setCursorFromCoordinates(bv_, cursor, x, y_tmp); - + Inset * inset(checkInset(*text, cursor, x, y_tmp)); if (inset) { y = y_tmp; return inset; } - + // look at previous position - + if (cursor.pos() == 0) { return 0; } @@ -995,6 +1058,7 @@ void BufferView::Pimpl::workAreaExpose() if (lyxerr.debugging()) textcache.show(lyxerr, "Expose delete all"); textcache.clear(); + buffer_->resizeInsets(bv_); } else if (heightChange) { // Rebuild image of current screen updateScreen(); @@ -1028,12 +1092,19 @@ void BufferView::Pimpl::update() screen_->update(bv_->text, bv_); bool fitc = false; while (bv_->text->status() == LyXText::CHANGED_IN_DRAW) { - if (bv_->text->fullRebreak(bv_)) { - st = LyXText::NEED_MORE_REFRESH; - bv_->text->setCursor(bv_, bv_->text->cursor.par(), - bv_->text->cursor.pos()); - fitc = true; + bv_->text->fullRebreak(bv_); + st = LyXText::NEED_MORE_REFRESH; + bv_->text->setCursor(bv_, bv_->text->cursor.par(), + bv_->text->cursor.pos()); + if (bv_->text->selection.set()) { + bv_->text->setCursor(bv_, bv_->text->selection.start, + bv_->text->selection.start.par(), + bv_->text->selection.start.pos()); + bv_->text->setCursor(bv_, bv_->text->selection.end, + bv_->text->selection.end.par(), + bv_->text->selection.end.pos()); } + fitc = true; bv_->text->status(bv_, st); screen_->update(bv_->text, bv_); } @@ -1049,7 +1120,7 @@ void BufferView::Pimpl::update() // -3 - update // -2 - update, move sel_cursor if selection, fitcursor // -1 - update, move sel_cursor if selection, fitcursor, mark dirty -// 0 - update, move sel_cursor if selection, fitcursor +// 0 - update, move sel_cursor if selection, fitcursor // 1 - update, move sel_cursor if selection, fitcursor, mark dirty // 3 - update, move sel_cursor if selection // @@ -1069,7 +1140,7 @@ void BufferView::Pimpl::update() // UPDATE = 0, // SELECT = 1, // FITCUR = 2, -// CHANGE = 4 +// CHANGE = 4 // }; // // UPDATE_ONLY = UPDATE; @@ -1099,7 +1170,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f) } else { update(); } - + if ((f & FITCUR)) { fitCursor(); } @@ -1117,7 +1188,7 @@ void BufferView::Pimpl::cursorToggle() cursor_timeout.restart(); return; } - + if (!screen_.get()) { cursor_timeout.restart(); return; @@ -1126,71 +1197,126 @@ void BufferView::Pimpl::cursorToggle() /* FIXME */ extern void reapSpellchecker(void); reapSpellchecker(); - + if (!bv_->theLockingInset()) { screen_->cursorToggle(bv_); } else { bv_->theLockingInset()->toggleInsetCursor(bv_); } - + cursor_timeout.restart(); } void BufferView::Pimpl::cursorPrevious(LyXText * text) { - if (!text->cursor.row()->previous()) + if (!text->cursor.row()->previous()) { + if (text->first_y > 0) { + int new_y = bv_->text->first_y - workarea_.height(); + screen_->draw(bv_->text, bv_, new_y < 0 ? 0 : new_y); + updateScrollbar(); + } return; - + } + int y = text->first_y; - if (text->inset_owner) - y += bv_->text->first_y; Row * cursorrow = text->cursor.row(); - text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y); + + text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); finishUndo(); - // This is to allow jumping over large insets - if ((cursorrow == text->cursor.row())) - text->cursorUp(bv_); - - if (text->inset_owner || - text->cursor.row()->height() < workarea_.height()) - screen_->draw(bv_->text, bv_, - text->cursor.y() - - text->cursor.row()->baseline() - + text->cursor.row()->height() - - workarea_.height() + 1); + + int new_y; + if (cursorrow == bv_->text->cursor.row()) { + // we have a row which is higher than the workarea so we leave the + // cursor on the start of the row and move only the draw up as soon + // as we move the cursor or do something while inside the row (it may + // span several workarea-heights) we'll move to the top again, but this + // is better than just jump down and only display part of the row. + new_y = bv_->text->first_y - workarea_.height(); + } else { + if (text->inset_owner) { + new_y = bv_->text->cursor.iy() + + bv_->theLockingInset()->insetInInsetY() + y + + text->cursor.row()->height() + - workarea_.height() + 1; + } else { + new_y = text->cursor.y() + - text->cursor.row()->baseline() + + text->cursor.row()->height() + - workarea_.height() + 1; + } + } + screen_->draw(bv_->text, bv_, new_y < 0 ? 0 : new_y); + if (text->cursor.row()->previous()) { + LyXCursor cur; + text->setCursor(bv_, cur, text->cursor.row()->previous()->par(), + text->cursor.row()->previous()->pos(), false); + if (cur.y() > text->first_y) { + text->cursorUp(bv_, true); + } + } updateScrollbar(); } void BufferView::Pimpl::cursorNext(LyXText * text) { - if (!text->cursor.row()->next()) + if (!text->cursor.row()->next()) { + int y = text->cursor.y() - text->cursor.row()->baseline() + + text->cursor.row()->height(); + if (y > int(text->first_y + workarea_.height())) { + screen_->draw(bv_->text, bv_, + bv_->text->first_y + workarea_.height()); + updateScrollbar(); + } return; - + } + int y = text->first_y + workarea_.height(); -// if (text->inset_owner) -// y += bv_->text->first; + if (text->inset_owner && !text->first_y) { + y -= (bv_->text->cursor.iy() + - bv_->text->first_y + + bv_->theLockingInset()->insetInInsetY()); + } text->getRowNearY(y); - + Row * cursorrow = text->cursor.row(); text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height()); finishUndo(); - // This is to allow jumping over large insets - if ((cursorrow == bv_->text->cursor.row())) - text->cursorDown(bv_); - - if (text->inset_owner || - text->cursor.row()->height() < workarea_.height()) - screen_->draw(bv_->text, bv_, text->cursor.y() - - text->cursor.row()->baseline()); + int new_y; + if (cursorrow == bv_->text->cursor.row()) { + // we have a row which is higher than the workarea so we leave the + // cursor on the start of the row and move only the draw down as soon + // as we move the cursor or do something while inside the row (it may + // span several workarea-heights) we'll move to the top again, but this + // is better than just jump down and only display part of the row. + new_y = bv_->text->first_y + workarea_.height(); + } else { + if (text->inset_owner) { + new_y = bv_->text->cursor.iy() + + bv_->theLockingInset()->insetInInsetY() + + y - text->cursor.row()->baseline(); + } else { + new_y = text->cursor.y() - text->cursor.row()->baseline(); + } + } + screen_->draw(bv_->text, bv_, new_y); + if (text->cursor.row()->next()) { + LyXCursor cur; + text->setCursor(bv_, cur, text->cursor.row()->next()->par(), + text->cursor.row()->next()->pos(), false); + if (cur.y() < int(text->first_y + workarea_.height())) { + text->cursorDown(bv_, true); + } + } updateScrollbar(); } bool BufferView::Pimpl::available() const { - if (buffer_ && bv_->text) return true; + if (buffer_ && bv_->text) + return true; return false; } @@ -1228,7 +1354,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i) if (fname != buffer_->fileName()) { Buffer * b = bufferlist.exists(fname) ? - bufferlist.getBuffer(fname) : + bufferlist.getBuffer(fname) : bufferlist.loadLyXFile(fname); // don't ask, just load it if (b != 0) buffer(b); } @@ -1274,6 +1400,7 @@ void BufferView::Pimpl::setState() } +#if 0 void BufferView::Pimpl::insetSleep() { if (bv_->theLockingInset() && !inset_slept) { @@ -1291,6 +1418,7 @@ void BufferView::Pimpl::insetWakeup() inset_slept = false; } } +#endif void BufferView::Pimpl::insetUnlock() @@ -1323,7 +1451,7 @@ bool BufferView::Pimpl::active() const } -bool BufferView::Pimpl::belowMouse() const +bool BufferView::Pimpl::belowMouse() const { return workarea_.belowMouse(); } @@ -1368,7 +1496,7 @@ void BufferView::Pimpl::toggleToggle() } -void BufferView::Pimpl::center() +void BufferView::Pimpl::center() { beforeChange(bv_->text); if (bv_->text->cursor.y() > static_cast((workarea_.height() / 2))) { @@ -1381,16 +1509,18 @@ void BufferView::Pimpl::center() } -void BufferView::Pimpl::pasteClipboard(bool asPara) +void BufferView::Pimpl::pasteClipboard(bool asPara) { - if (!buffer_) return; + if (!buffer_) + return; screen_->hideCursor(); beforeChange(bv_->text); - + string const clip(workarea_.getClipboard()); - - if (clip.empty()) return; + + if (clip.empty()) + return; if (asPara) { bv_->getLyXText()->insertStringAsParagraphs(bv_, clip); @@ -1414,18 +1544,28 @@ void BufferView::Pimpl::stuffClipboard(string const & stuff) const inline -void BufferView::Pimpl::moveCursorUpdate(bool selecting) +void BufferView::Pimpl::moveCursorUpdate(bool selecting, bool fitcur) { LyXText * lt = bv_->getLyXText(); - + if (selecting || lt->selection.mark()) { lt->setSelection(bv_); if (lt->bv_owner) toggleToggle(); + else + updateInset(lt->inset_owner, false); } - update(lt, BufferView::SELECT|BufferView::FITCUR); - showCursor(); - + if (lt->bv_owner) { + if (fitcur) + update(lt, BufferView::SELECT|BufferView::FITCUR); + else + update(lt, BufferView::SELECT); + showCursor(); + } + + if (!lt->selection.set()) + workarea_.haveSelection(false); + /* ---> Everytime the cursor is moved, show the current font state. */ // should this too me moved out of this func? //owner->showState(); @@ -1471,7 +1611,7 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen) FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx| LyX Documents (*.lyx)")); - + if (result.first == FileDialog::Later) return; @@ -1489,7 +1629,7 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen) filename = FileSearch(string(), filename, "lyx"); string const disp_fn(MakeDisplayPath(filename)); - + ostringstream s1; s1 << _("Inserting document") << ' ' << disp_fn << " ..."; @@ -1513,7 +1653,9 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) { lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch: action[" << action <<"] arg[" << argument << "]" << endl; - + + LyXTextClass const & tclass = textclasslist[buffer_->params.textclass]; + switch (action) { // --- Misc ------------------------------------------- case LFUN_APPENDIX: @@ -1534,11 +1676,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) InsetCommandParams p; p.setCmdName("tableofcontents"); Inset * inset = new InsetTOC(p); - if (!insertInset(inset, "Standard")) + if (!insertInset(inset, tclass.defaultLayoutName())) delete inset; break; } - + case LFUN_SCROLL_INSET: // this is not handled here as this funktion is only aktive // if we have a locking_inset and that one is (or contains) @@ -1557,42 +1699,42 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) } break; } - + case LFUN_PASTE: bv_->paste(); setState(); break; - + case LFUN_PASTESELECTION: { - bool asPara = false; + bool asPara = false; if (argument == "paragraph") asPara = true; pasteClipboard(asPara); } break; - + case LFUN_CUT: bv_->cut(); break; - + case LFUN_COPY: bv_->copy(); break; - + case LFUN_LAYOUT_COPY: bv_->copyEnvironment(); break; - + case LFUN_LAYOUT_PASTE: bv_->pasteEnvironment(); setState(); break; - + case LFUN_GOTOERROR: gotoInset(Inset::ERROR_CODE, false); break; - + case LFUN_GOTONOTE: gotoInset(Inset::IGNORE_CODE, false); break; @@ -1609,15 +1751,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_HYPHENATION: specialChar(InsetSpecialChar::HYPHENATION); break; - + case LFUN_LIGATURE_BREAK: specialChar(InsetSpecialChar::LIGATURE_BREAK); break; - + case LFUN_LDOTS: specialChar(InsetSpecialChar::LDOTS); break; - + case LFUN_END_OF_SENTENCE: specialChar(InsetSpecialChar::END_OF_SENTENCE); break; @@ -1625,23 +1767,19 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_MENU_SEPARATOR: specialChar(InsetSpecialChar::MENU_SEPARATOR); break; - + case LFUN_HFILL: hfill(); break; - - case LFUN_DEPTH: - changeDepth(bv_, bv_->getLyXText(), 0); - break; - + case LFUN_DEPTH_MIN: changeDepth(bv_, bv_->getLyXText(), -1); break; - + case LFUN_DEPTH_PLUS: changeDepth(bv_, bv_->getLyXText(), 1); break; - + case LFUN_FREE: owner_->getDialogs()->setUserFreeFont(); break; @@ -1649,7 +1787,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_FILE_INSERT: MenuInsertLyXFile(argument); break; - + case LFUN_FILE_INSERT_ASCII_PARA: InsertAsciiFile(bv_, argument, true); break; @@ -1657,24 +1795,21 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_FILE_INSERT_ASCII: InsertAsciiFile(bv_, argument, false); break; - + case LFUN_LAYOUT: { lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) " << argument << endl; - + // Derive layout number from given argument (string) - // and current buffer's textclass (number). */ - textclass_type tclass = buffer_->params.textclass; - bool hasLayout = - textclasslist[tclass].hasLayout(argument); + // and current buffer's textclass (number). */ + bool hasLayout = tclass.hasLayout(argument); string layout = argument; // If the entry is obsolete, use the new one instead. if (hasLayout) { - string const & obs = textclasslist[tclass][layout] - .obsoleted_by(); - if (!obs.empty()) + string const & obs = tclass[layout].obsoleted_by(); + if (!obs.empty()) layout = obs; } @@ -1685,8 +1820,21 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) break; } - if (current_layout != layout) { - LyXText * lt = bv_->getLyXText(); + bool change_layout = (current_layout != layout); + LyXText * lt = bv_->getLyXText(); + if (!change_layout && lt->selection.set() && + lt->selection.start.par() != lt->selection.end.par()) + { + Paragraph * spar = lt->selection.start.par(); + Paragraph * epar = lt->selection.end.par()->next(); + while(spar != epar) { + if (spar->layout() != current_layout) { + change_layout = true; + break; + } + } + } + if (change_layout) { hideCursor(); current_layout = layout; update(lt, @@ -1718,50 +1866,50 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) bold(bv_); owner_->showState(); break; - + case LFUN_NOUN: noun(bv_); owner_->showState(); break; - + case LFUN_CODE: code(bv_); owner_->showState(); break; - + case LFUN_SANS: sans(bv_); owner_->showState(); break; - + case LFUN_ROMAN: roman(bv_); owner_->showState(); break; - + case LFUN_DEFAULT: styleReset(bv_); owner_->showState(); break; - + case LFUN_UNDERLINE: underline(bv_); owner_->showState(); break; - + case LFUN_FONT_SIZE: fontSize(bv_, argument); owner_->showState(); break; - + case LFUN_FONT_STATE: owner_->getLyXFunc()->setMessage(currentState(bv_)); break; - + case LFUN_UPCASE_WORD: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT | BufferView::FITCUR); @@ -1774,11 +1922,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::CHANGE); } break; - + case LFUN_LOWCASE_WORD: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->changeCase(bv_, LyXText::text_lowercase); if (lt->inset_owner) @@ -1789,11 +1937,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::CHANGE); } break; - + case LFUN_CAPITALIZE_WORD: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->changeCase(bv_, LyXText::text_capitalization); if (lt->inset_owner) @@ -1808,7 +1956,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_TRANSPOSE_CHARS: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->transposeChars(*bv_); if (lt->inset_owner) @@ -1819,8 +1967,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::CHANGE); } break; - - + + case LFUN_INSERT_LABEL: MenuInsertLabel(bv_, argument); break; @@ -1853,29 +2001,29 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) { string label(argument); if (label.empty()) { - InsetRef * inset = + InsetRef * inset = static_cast(getInsetByCode(Inset::REF_CODE)); if (inset) { - label = inset->getContents(); + label = inset->getContents(); savePosition(0); } } - + if (!label.empty()) { //bv_->savePosition(0); if (!bv_->gotoLabel(label)) - Alert::alert(_("Error"), - _("Couldn't find this label"), + Alert::alert(_("Error"), + _("Couldn't find this label"), _("in current document.")); } } break; - + // --- Cursor Movements ----------------------------- case LFUN_RIGHT: { LyXText * lt = bv_->getLyXText(); - + bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params); if (!lt->selection.mark()) beforeChange(lt); @@ -1900,7 +2048,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_LEFT: { // This is soooo ugly. Isn`t it possible to make @@ -1933,11 +2081,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_UP: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); @@ -1947,11 +2095,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_DOWN: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); @@ -1965,7 +2113,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_UP_PARAGRAPH: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); @@ -1975,11 +2123,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_DOWN_PARAGRAPH: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); @@ -1989,39 +2137,39 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_PRIOR: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); cursorPrevious(lt); finishUndo(); - moveCursorUpdate(false); + moveCursorUpdate(false, false); owner_->showState(); } break; - + case LFUN_NEXT: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::UPDATE); cursorNext(lt); finishUndo(); - moveCursorUpdate(false); + moveCursorUpdate(false, false); owner_->showState(); } break; - + case LFUN_HOME: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::SELECT|BufferView::FITCUR); @@ -2031,11 +2179,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_END: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, @@ -2046,12 +2194,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_SHIFT_TAB: case LFUN_TAB: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, @@ -2062,11 +2210,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_WORDRIGHT: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::SELECT|BufferView::FITCUR); @@ -2079,11 +2227,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_WORDLEFT: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, BufferView::SELECT|BufferView::FITCUR); @@ -2096,11 +2244,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_BEGINNINGBUF: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, @@ -2111,11 +2259,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_ENDBUF: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.mark()) beforeChange(lt); update(lt, @@ -2126,12 +2274,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + /* cursor selection ---------------------------- */ case LFUN_RIGHTSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); if (lt->cursor.par()->isRightToLeftPar(buffer_->params)) @@ -2143,11 +2291,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_LEFTSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); if (lt->cursor.par()->isRightToLeftPar(buffer_->params)) @@ -2159,27 +2307,27 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_UPSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); - lt->cursorUp(bv_); + lt->cursorUp(bv_, true); finishUndo(); moveCursorUpdate(true); owner_->showState(); } break; - + case LFUN_DOWNSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); - lt->cursorDown(bv_); + lt->cursorDown(bv_, true); finishUndo(); moveCursorUpdate(true); owner_->showState(); @@ -2189,7 +2337,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_UP_PARAGRAPHSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->cursorUpParagraph(bv_); @@ -2198,11 +2346,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_DOWN_PARAGRAPHSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->cursorDownParagraph(bv_); @@ -2211,11 +2359,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_PRIORSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); cursorPrevious(lt); finishUndo(); @@ -2223,11 +2371,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_NEXTSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); cursorNext(lt); finishUndo(); @@ -2235,11 +2383,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_HOMESEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->cursorHome(bv_); finishUndo(); @@ -2247,11 +2395,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_ENDSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->cursorEnd(bv_); finishUndo(); @@ -2259,11 +2407,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_WORDRIGHTSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); if (lt->cursor.par()->isRightToLeftPar(buffer_->params)) lt->cursorLeftOneWord(bv_); @@ -2274,11 +2422,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_WORDLEFTSEL: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); if (lt->cursor.par()->isRightToLeftPar(buffer_->params)) lt->cursorRightOneWord(bv_); @@ -2289,11 +2437,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_BEGINNINGBUFSEL: { LyXText * lt = bv_->getLyXText(); - + if (lt->inset_owner) break; update(lt, BufferView::SELECT|BufferView::FITCUR); @@ -2303,11 +2451,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + case LFUN_ENDBUFSEL: { LyXText * lt = bv_->getLyXText(); - + if (lt->inset_owner) break; update(lt, @@ -2333,12 +2481,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) moveCursorUpdate(false); } break; - + case LFUN_PROTECTEDSPACE: { LyXText * lt = bv_->getLyXText(); - LyXLayout const & style = textclasslist[buffer_->params.textclass][lt->cursor.par()->layout()]; + LyXLayout const & style = tclass[lt->cursor.par()->layout()]; if (style.free_spacing) { lt->insertChar(bv_, ' '); @@ -2347,12 +2495,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::FITCUR | BufferView::CHANGE); } else { - protectedBlank(lt); + specialChar(InsetSpecialChar::PROTECTED_SEPARATOR); } moveCursorUpdate(false); } break; - + case LFUN_SETMARK: { LyXText * lt = bv_->getLyXText(); @@ -2374,7 +2522,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) lt->selection.cursor = lt->cursor; } break; - + case LFUN_DELETE: { LyXText * lt = bv_->getLyXText(); @@ -2403,7 +2551,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) LyXText * lt = bv_->getLyXText(); // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP. - + LyXCursor cursor = lt->cursor; if (!lt->selection.set()) { @@ -2417,15 +2565,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) (bv_, cursor.par()->params().lineTop(), cursor.par()->params().lineBottom(), - cursor.par()->params().pagebreakTop(), + cursor.par()->params().pagebreakTop(), cursor.par()->params().pagebreakBottom(), - VSpace(VSpace::NONE), + VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(), - cursor.par()->params().spacing(), - cursor.par()->params().align(), + cursor.par()->params().spacing(), + cursor.par()->params().align(), cursor.par()->params().labelWidthString(), 0); lt->cursorLeft(bv_); - update(lt, + update(lt, BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE); @@ -2465,7 +2613,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_DELETE_WORD_BACKWARD: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->deleteWordBackward(bv_); update(lt, @@ -2476,12 +2624,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); } break; - + /* -------> Kill to end of line. */ case LFUN_DELETE_LINE_FORWARD: { LyXText * lt = bv_->getLyXText(); - + update(lt, BufferView::SELECT|BufferView::FITCUR); lt->deleteLineForward(bv_); update(lt, @@ -2491,12 +2639,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) moveCursorUpdate(false); } break; - + /* -------> Set mark off. */ case LFUN_MARK_OFF: { LyXText * lt = bv_->getLyXText(); - + beforeChange(lt); update(lt, BufferView::SELECT|BufferView::FITCUR); lt->selection.cursor = lt->cursor; @@ -2508,7 +2656,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_MARK_ON: { LyXText * lt = bv_->getLyXText(); - + beforeChange(lt); lt->selection.mark(true); update(lt, BufferView::SELECT|BufferView::FITCUR); @@ -2516,11 +2664,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->getLyXFunc()->setMessage(N_("Mark on")); } break; - + case LFUN_BACKSPACE: { LyXText * lt = bv_->getLyXText(); - + if (!lt->selection.set()) { if (owner_->getIntl()->getTrans().backspace()) { lt->backspace(bv_); @@ -2545,22 +2693,22 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) { // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP. LyXText * lt = bv_->getLyXText(); - + LyXCursor cursor = lt->cursor; - + if (!lt->selection.set()) { - if (cursor.pos() == 0 - && !(cursor.par()->params().spaceTop() + if (cursor.pos() == 0 + && !(cursor.par()->params().spaceTop() == VSpace (VSpace::NONE))) { - lt->setParagraph + lt->setParagraph (bv_, - cursor.par()->params().lineTop(), + cursor.par()->params().lineTop(), cursor.par()->params().lineBottom(), - cursor.par()->params().pagebreakTop(), + cursor.par()->params().pagebreakTop(), cursor.par()->params().pagebreakBottom(), VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(), - cursor.par()->params().spacing(), - cursor.par()->params().align(), + cursor.par()->params().spacing(), + cursor.par()->params().align(), cursor.par()->params().labelWidthString(), 0); update(lt, BufferView::SELECT @@ -2582,7 +2730,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_BREAKPARAGRAPH: { LyXText * lt = bv_->getLyXText(); - + beforeChange(lt); lt->breakParagraph(bv_, 0); update(lt, @@ -2598,7 +2746,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_BREAKPARAGRAPHKEEPLAYOUT: { LyXText * lt = bv_->getLyXText(); - + beforeChange(lt); lt->breakParagraph(bv_, 1); update(lt, @@ -2610,16 +2758,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->showState(); break; } - + case LFUN_BREAKPARAGRAPH_SKIP: { // When at the beginning of a paragraph, remove // indentation and add a "defskip" at the top. // Otherwise, do the same as LFUN_BREAKPARAGRAPH. LyXText * lt = bv_->getLyXText(); - + LyXCursor cursor = lt->cursor; - + beforeChange(lt); if (cursor.pos() == 0) { if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) { @@ -2634,7 +2782,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) cursor.par()->params().align(), cursor.par()->params().labelWidthString(), 1); //update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - } + } } else { lt->breakParagraph(bv_, 0); @@ -2654,14 +2802,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_PARAGRAPH_SPACING: { LyXText * lt = bv_->getLyXText(); - + Paragraph * par = lt->cursor.par(); Spacing::Space cur_spacing = par->params().spacing().getSpace(); float cur_value = 1.0; if (cur_spacing == Spacing::Other) { cur_value = par->params().spacing().getValue(); } - + istringstream istr(argument.c_str()); string tmp; @@ -2700,7 +2848,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) } } break; - + case LFUN_INSET_TOGGLE: { LyXText * lt = bv_->getLyXText(); @@ -2710,7 +2858,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) lt->toggleInset(bv_); update(lt, BufferView::SELECT|BufferView::FITCUR); setState(); - } + } break; case LFUN_QUOTE: @@ -2728,7 +2876,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->getDialogs()->createUrl(p.getAsString()); } break; - + case LFUN_INSERT_URL: { InsetCommandParams p; @@ -2741,19 +2889,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) updateInset(inset, true); } break; - - case LFUN_INSET_TEXT: - insertAndEditInset(new InsetText(buffer_->params)); - break; - + case LFUN_INSET_ERT: insertAndEditInset(new InsetERT(buffer_->params)); break; - + case LFUN_INSET_EXTERNAL: insertAndEditInset(new InsetExternal); break; - + case LFUN_INSET_FOOTNOTE: insertAndEditInset(new InsetFoot(buffer_->params)); break; @@ -2782,23 +2926,17 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) break; case LFUN_INSET_WIDE_FLOAT: - { // check if the float type exist if (floatList.typeExist(argument)) { InsetFloat * new_inset = new InsetFloat(buffer_->params, argument); new_inset->wide(true); - if (insertInset(new_inset)) - new_inset->edit(bv_); - else - delete new_inset; + insertAndEditInset(new_inset); } else { lyxerr << "Non-existent float type: " << argument << endl; } - - } - break; + break; #if 0 case LFUN_INSET_LIST: @@ -2809,7 +2947,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) insertAndEditInset(new InsetTheorem); break; #endif - + case LFUN_INSET_CAPTION: { // Do we have a locking inset... @@ -2829,7 +2967,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) } } break; - + case LFUN_INSET_TABULAR: { int r = 2; @@ -2857,13 +2995,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->getLyXFunc()->setMessage("EOF"); } break; - + case LFUN_GETXY: owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.x()) + ' ' + tostr(bv_->getLyXText()->cursor.y())); break; - + case LFUN_SETXY: { int x = 0; @@ -2875,26 +3013,26 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) bv_->getLyXText()->setCursorFromCoordinates(bv_, x, y); } break; - + case LFUN_GETLAYOUT: owner_->getLyXFunc()->setMessage(tostr(bv_->getLyXText()->cursor.par()->layout())); break; - + case LFUN_GETFONT: { LyXFont & font = bv_->getLyXText()->current_font; - if (font.shape() == LyXFont::ITALIC_SHAPE) + if (font.shape() == LyXFont::ITALIC_SHAPE) owner_->getLyXFunc()->setMessage("E"); - else if (font.shape() == LyXFont::SMALLCAPS_SHAPE) + else if (font.shape() == LyXFont::SMALLCAPS_SHAPE) owner_->getLyXFunc()->setMessage("N"); - else + else owner_->getLyXFunc()->setMessage("0"); } break; // --- accented characters --------------------------- - + case LFUN_UMLAUT: case LFUN_CIRCUMFLEX: case LFUN_GRAVE: @@ -2925,12 +3063,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::CHANGE); } break; - + case LFUN_MATH_MACRO: mathDispatchMathMacro(bv_, argument); break; - case LFUN_MATH_DELIM: + case LFUN_MATH_DELIM: mathDispatchMathDelim(bv_, argument); break; @@ -2950,14 +3088,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) mathDispatchMathDisplay(bv_, argument); break; - case LFUN_MATH_MODE: // Open or create an inlined math inset + case LFUN_MATH_MODE: // Open or create an inlined math inset mathDispatchMathMode(bv_, argument); break; - + case LFUN_GREEK: // Insert a single greek letter mathDispatchGreek(bv_, argument); break; - + case LFUN_CITATION_INSERT: { InsetCommandParams p; @@ -2970,18 +3108,18 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) updateInset(inset, true); } break; - + case LFUN_INSERT_BIBTEX: - { + { // ale970405+lasgoutt970425 - // The argument can be up to two tokens separated + // The argument can be up to two tokens separated // by a space. The first one is the bibstyle. string const db = token(argument, ' ', 0); string const bibstyle = token(argument, ' ', 1); InsetCommandParams p("BibTeX", db, bibstyle); InsetBibtex * inset = new InsetBibtex(p); - + if (insertInset(inset)) { if (argument.empty()) inset->edit(bv_); @@ -2989,38 +3127,38 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) delete inset; } break; - + // BibTeX data bases case LFUN_BIBDB_ADD: { - InsetBibtex * inset = + InsetBibtex * inset = static_cast(getInsetByCode(Inset::BIBTEX_CODE)); if (inset) { inset->addDatabase(argument); } } break; - + case LFUN_BIBDB_DEL: { - InsetBibtex * inset = + InsetBibtex * inset = static_cast(getInsetByCode(Inset::BIBTEX_CODE)); if (inset) { inset->delDatabase(argument); } } break; - + case LFUN_BIBTEX_STYLE: { - InsetBibtex * inset = + InsetBibtex * inset = static_cast(getInsetByCode(Inset::BIBTEX_CODE)); if (inset) { inset->setOptions(argument); } } break; - + case LFUN_INDEX_CREATE: { InsetCommandParams p("index"); @@ -3034,7 +3172,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) owner_->getDialogs()->createIndex(p.getAsString()); } break; - + case LFUN_INDEX_INSERT: { InsetCommandParams p; @@ -3047,7 +3185,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) updateInset(inset, true); } break; - + case LFUN_INDEX_INSERT_LAST: { string const idxstring(bv_->getLyXText()->getStringToIndex(bv_)); @@ -3056,7 +3194,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) + idxstring + _(("' indexed."))); InsetCommandParams p("index", idxstring); InsetIndex * inset = new InsetIndex(p); - + if (!insertInset(inset)) delete inset; else @@ -3069,20 +3207,19 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) { InsetCommandParams p("printindex"); Inset * inset = new InsetPrintIndex(p); - if (!insertInset(inset, "Standard")) + if (!insertInset(inset, tclass.defaultLayoutName())) delete inset; } break; case LFUN_PARENTINSERT: { - lyxerr << "arg " << argument << endl; InsetCommandParams p("lyxparent", argument); Inset * inset = new InsetParent(p, *buffer_); - if (!insertInset(inset, "Standard")) + if (!insertInset(inset, tclass.defaultLayoutName())) delete inset; } - + break; case LFUN_CHILD_INSERT: @@ -3099,17 +3236,19 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) bv_->owner()->getDialogs()->showInclude(inset); } } - break; + break; case LFUN_FLOAT_LIST: - { - // We should check the argument for validity. (Lgb) - Inset * inset = new InsetFloatList(argument); - if (!insertInset(inset, "Standard")) - delete inset; - } - break; - + if (floatList.typeExist(argument)) { + Inset * inset = new InsetFloatList(argument); + if (!insertInset(inset, tclass.defaultLayoutName())) + delete inset; + } else { + lyxerr << "Non-existent float type: " + << argument << endl; + } + break; + case LFUN_THESAURUS_ENTRY: { string arg = argument; @@ -3117,7 +3256,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) if (arg.empty()) { arg = bv_->getLyXText()->selectionAsString(buffer_, false); - + // FIXME if (arg.size() > 100 || arg.empty()) { // Get word or selection @@ -3130,11 +3269,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) bv_->owner()->getDialogs()->showThesaurus(arg); } break; - + case LFUN_SELFINSERT: { if (argument.empty()) break; - + /* Automatically delete the currently selected * text and replace it with what is being * typed in now. Depends on lyxrc settings @@ -3142,7 +3281,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) * true (on). */ LyXText * lt = bv_->getLyXText(); - + if (lyxrc.auto_region_delete) { if (lt->selection.set()) { lt->cutSelection(bv_, false, false); @@ -3151,25 +3290,26 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) | BufferView::FITCUR | BufferView::CHANGE); } + workarea_.haveSelection(false); } - + beforeChange(lt); LyXFont const old_font(lt->real_current_font); - + string::const_iterator cit = argument.begin(); string::const_iterator end = argument.end(); for (; cit != end; ++cit) { owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt); } - + bv_->update(lt, BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE); - + lt->selection.cursor = lt->cursor; moveCursorUpdate(false); - + // real_current_font.number can change so we need to // update the minibuffer if (old_font != lt->real_current_font) @@ -3186,14 +3326,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) string arg; if (!argument.empty()) arg = argument; - else + else arg = lyxrc.date_insert_format; char datetmp[32]; int const datetmp_len = ::strftime(datetmp, 32, arg.c_str(), now_tm); LyXText * lt = bv_->getLyXText(); - + for (int i = 0; i < datetmp_len; i++) { lt->insertChar(bv_, datetmp[i]); update(lt, @@ -3210,7 +3350,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_UNKNOWN_ACTION: owner_->getLyXFunc()->setErrorMessage(N_("Unknown function!")); break; - + default: return false; } // end of switch @@ -3253,38 +3393,19 @@ void BufferView::Pimpl::hfill() } -void BufferView::Pimpl::protectedBlank(LyXText * lt) -{ - if (available()) { - hideCursor(); - update(lt, BufferView::SELECT|BufferView::FITCUR); - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); -#ifdef WITH_WARNINGS -#warning Why is this code different from specialChar() below? (JMarc) -// the code in specialChar is a generic version of what used to exist -// for other special chars. I did not merge this case because of the -// call to updateInset(), but what does it do? -#endif - if (!insertInset(new_inset)) - delete new_inset; - else - updateInset(new_inset, true); - } -} - - void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind) { if (available()) { LyXText * lt = bv_->getLyXText(); - + hideCursor(); update(lt, BufferView::SELECT|BufferView::FITCUR); - InsetSpecialChar * new_inset = + InsetSpecialChar * new_inset = new InsetSpecialChar(kind); if (!insertInset(new_inset)) delete new_inset; + else + updateInset(new_inset, true); } } @@ -3302,13 +3423,13 @@ void BufferView::Pimpl::smartQuote() c = ' '; else c = par->getChar(pos - 1); - + hideCursor(); LyXLayout const & style = textclasslist[bv_->buffer()->params.textclass][par->layout()]; - + if (style.pass_thru || (!insertInset(new InsetQuotes(c, bv_->buffer()->params)))) bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\""); @@ -3323,12 +3444,12 @@ void BufferView::Pimpl::insertAndEditInset(Inset * inset) delete inset; } - + // Open and lock an updatable inset bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind) { LyXText * lt = bv_->getLyXText(); - + beforeChange(lt); finishUndo(); if (!insertInset(new_inset)) { @@ -3353,7 +3474,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout) // not quite sure if we want this... setCursorParUndo(bv_); freezeUndo(); - + beforeChange(bv_->text); if (!lout.empty()) { update(bv_->text, BufferView::SELECT|BufferView::FITCUR); @@ -3362,7 +3483,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout) if (bv_->text->cursor.par()->size()) { bv_->text->cursorLeft(bv_); - + bv_->text->breakParagraph(bv_); update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } @@ -3382,17 +3503,17 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout) } bv_->text->setLayout(bv_, lay); - + bv_->text->setParagraph(bv_, 0, 0, 0, 0, VSpace(VSpace::NONE), VSpace(VSpace::NONE), Spacing(), - LYX_ALIGN_LAYOUT, + LYX_ALIGN_LAYOUT, string(), 0); update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } - + bv_->text->insertInset(bv_, inset); update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); @@ -3403,7 +3524,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout) void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty) { - if (!inset) + if (!inset || !available()) return; // first check for locking insets @@ -3428,10 +3549,15 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty) } } } - - // then check the current buffer - if (available()) { - hideCursor(); + + // then check if the inset is a top_level inset (has no owner) + // if yes do the update as always otherwise we have to update the + // toplevel inset where this inset is inside + Inset * tl_inset = inset; + while(tl_inset->owner()) + tl_inset = tl_inset->owner(); + hideCursor(); + if (tl_inset == inset) { update(bv_->text, BufferView::UPDATE); if (bv_->text->updateInset(bv_, inset)) { if (mark_dirty) { @@ -3444,6 +3570,13 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty) } return; } + } else if (static_cast(tl_inset) + ->updateInsetInInset(bv_, inset)) + { + if (bv_->text->updateInset(bv_, tl_inset)) { + update(); + updateScrollbar(); + } } } @@ -3452,13 +3585,13 @@ void BufferView::Pimpl::gotoInset(vector const & codes, bool same_content) { if (!available()) return; - + hideCursor(); beforeChange(bv_->text); update(bv_->text, BufferView::SELECT|BufferView::FITCUR); - + LyXCursor const & cursor = bv_->text->cursor; - + string contents; if (same_content && cursor.par()->isInset(cursor.pos())) { @@ -3468,10 +3601,10 @@ void BufferView::Pimpl::gotoInset(vector const & codes, contents = static_cast(inset)->getContents(); } - - + + if (!bv_->text->gotoNextInset(bv_, codes, contents)) { - if (bv_->text->cursor.pos() + if (bv_->text->cursor.pos() || bv_->text->cursor.par() != bv_->text->ownerParagraph()) { LyXCursor tmp = bv_->text->cursor; bv_->text->cursor.par(bv_->text->ownerParagraph());