]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView_pimpl.C
various fixes
[lyx.git] / src / BufferView_pimpl.C
index 8469d5a227a69be2f1a87e4bd78625616b7a98c8..8eff02dd2c0f27e06b89f4ed3a589e32d47b81c5 100644 (file)
@@ -1,7 +1,9 @@
 #include <config.h>
 
+#include <ctime>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <locale.h>
 
 #ifdef __GNUG__
 #pragma implementation
 #include "LyXView.h"
 #include "commandtags.h"
 #include "lyxfunc.h"
-#include "minibuffer.h"
+#include "debug.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "TextCache.h"
 #include "bufferlist.h"
-#include "insets/insetbib.h"
 #include "lyx_gui_misc.h"
 #include "lyxrc.h"
 #include "intl.h"
 #include "support/LAssert.h"
+#include "support/lstrings.h"
 #include "frontends/Dialogs.h"
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::slot;
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
+/// added for Dispatch functions
+#include "lyx_cb.h"
+#include "frontends/FileDialog.h"
+#include "lyx_main.h"
+#include "FloatList.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h"
+#include "insets/inseturl.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insettoc.h"
+#include "insets/insetref.h"
+#include "insets/insetparent.h"
+#include "insets/insetindex.h"
+#include "insets/insetnote.h"
+#include "insets/insetinclude.h"
+#include "insets/insetcite.h"
+#include "insets/insetert.h"
+#include "insets/insetexternal.h"
+#include "insets/insetgraphics.h"
+#include "insets/insetfoot.h"
+#include "insets/insetmarginal.h"
+#include "insets/insetminipage.h"
+#include "insets/insetfloat.h"
+#include "insets/insettabular.h"
+#if 0
+#include "insets/insettheorem.h"
+#include "insets/insetlist.h"
 #endif
+#include "insets/insetcaption.h"
+#include "insets/insetfloatlist.h"
+#include "insets/insetspecialchar.h"
+#include "gettext.h"
+#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+#include "mathed/formulabase.h"
+
+extern LyXTextClass::size_type current_layout;
+extern int greek_kb_flag;
 
+using std::vector;
+using std::find_if;
+using std::find;
 using std::pair;
 using std::endl;
-using std::vector;
 using std::make_pair;
+using std::min;
+using SigC::slot;
 
 /* the selection possible is needed, that only motion events are 
  * used, where the bottom press event was on the drawing area too */
@@ -43,19 +85,22 @@ bool selection_possible = false;
 extern BufferList bufferlist;
 extern char ascii_type;
 
-extern "C" void TimerCB(FL_OBJECT *, long); 
-extern void sigchldhandler(pid_t pid, int * status);
+extern bool math_insert_greek(BufferView *, char);
+extern void sigchldchecker(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
 
-static inline
+namespace {
+
+const unsigned int saved_positions_num = 20;
+
+inline
 void waitForX()
 {
        XSync(fl_get_display(), 0);
 }
 
 
-static
 void SetXtermCursor(Window win)
 {
        static Cursor cursor;
@@ -69,48 +114,49 @@ void SetXtermCursor(Window win)
        XFlush(fl_get_display());
 }
 
+} // anon namespace
+
 
 BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
             int xpos, int ypos, int width, int height)
-       : bv_(b), owner_(o), cursor_timeout(400)
+       : bv_(b), owner_(o), buffer_(0),
+         current_scrollbar_value(0), cursor_timeout(400),
+         workarea_(xpos, ypos, width, height), using_xterm_cursor(false),
+         inset_slept(false)
 {
-       buffer_ = 0;
-       workarea_ = new WorkArea(bv_, xpos, ypos, width, height);
        // Setup the signals
-       workarea_->workAreaExpose
+       workarea_.scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
+       workarea_.workAreaExpose
                .connect(slot(this, &BufferView::Pimpl::workAreaExpose));
-       workarea_->workAreaEnter
+       workarea_.workAreaEnter
                .connect(slot(this, &BufferView::Pimpl::enterView));
-       workarea_->workAreaLeave
+       workarea_.workAreaLeave
                .connect(slot(this, &BufferView::Pimpl::leaveView));
-       workarea_->workAreaButtonPress
+       workarea_.workAreaButtonPress
                .connect(slot(this, &BufferView::Pimpl::workAreaButtonPress));
-       workarea_->workAreaButtonRelease
+       workarea_.workAreaButtonRelease
                .connect(slot(this,
                              &BufferView::Pimpl::workAreaButtonRelease));
-       workarea_->workAreaMotionNotify
+       workarea_.workAreaMotionNotify
                .connect(slot(this, &BufferView::Pimpl::workAreaMotionNotify));
-       workarea_->workAreaDoubleClick
+       workarea_.workAreaDoubleClick
                .connect(slot(this, &BufferView::Pimpl::doubleClick));
-       workarea_->workAreaTripleClick
+       workarea_.workAreaTripleClick
                .connect(slot(this, &BufferView::Pimpl::tripleClick));
-       workarea_->workAreaKeyPress
+       workarea_.workAreaKeyPress
                .connect(slot(this, &BufferView::Pimpl::workAreaKeyPress));
        
-       screen_ = 0;
-
        cursor_timeout.timeout.connect(slot(this,
                                            &BufferView::Pimpl::cursorToggle));
-       current_scrollbar_value = 0;
        cursor_timeout.start();
-       workarea_->setFocus();
-       using_xterm_cursor = false;
+       workarea_.setFocus();
+       saved_positions.resize(saved_positions_num);
 }
 
 
 Painter & BufferView::Pimpl::painter() 
 {
-       return workarea_->getPainter();
+       return workarea_.getPainter();
 }
 
 
@@ -119,14 +165,14 @@ void BufferView::Pimpl::buffer(Buffer * b)
        lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
                            << b << ")" << endl;
        if (buffer_) {
-               bv_->insetSleep();
+               insetSleep();
                buffer_->delUser(bv_);
 
                // Put the old text into the TextCache, but
                // only if the buffer is still loaded.
                // Also set the owner of the test to 0
                //              bv_->text->owner(0);
-               textcache.add(buffer_, workarea_->workWidth(), bv_->text);
+               textcache.add(buffer_, workarea_.workWidth(), bv_->text);
                if (lyxerr.debugging())
                        textcache.show(lyxerr, "BufferView::buffer");
                
@@ -140,8 +186,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
        
        // Nuke old image
        // screen is always deleted when the buffer is changed.
-       delete screen_;
-       screen_ = 0;
+       screen_.reset(0);
 
        // If we are closing the buffer, use the first buffer as current
        if (!buffer_) {
@@ -158,7 +203,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                        updateScreen();
                        updateScrollbar();
                }
-               bv_->text->first = screen_->TopCursorVisible(bv_->text);
+               bv_->text->first = screen_->topCursorVisible(bv_->text);
                owner_->updateMenubar();
                owner_->updateToolbar();
                // Similarly, buffer-dependent dialogs should be updated or
@@ -166,14 +211,14 @@ void BufferView::Pimpl::buffer(Buffer * b)
                // require bv_->text.
                owner_->getDialogs()->updateBufferDependent(true);
                redraw();
-               bv_->insetWakeup();
+               insetWakeup();
        } else {
                lyxerr[Debug::INFO] << "  No Buffer!" << endl;
                owner_->updateMenubar();
                owner_->updateToolbar();
                owner_->getDialogs()->hideBufferDependent();
                updateScrollbar();
-               workarea_->redraw();
+               workarea_.redraw();
 
                // Also remove all remaining text's from the testcache.
                // (there should not be any!) (if there is any it is a
@@ -184,22 +229,21 @@ void BufferView::Pimpl::buffer(Buffer * b)
        }
        // should update layoutchoice even if we don't have a buffer.
        owner_->updateLayoutChoice();
-       owner_->getMiniBuffer()->Init();
+
        owner_->updateWindowTitle();
 }
 
 
 void BufferView::Pimpl::resize(int xpos, int ypos, int width, int height)
 {
-       workarea_->resize(xpos, ypos, width, height);
-       update(SELECT);
+       workarea_.resize(xpos, ypos, width, height);
+       update(bv_->text, SELECT);
        redraw();
 }
 
 
 void BufferView::Pimpl::resize()
 {
-       // This will resize the buffer. (Asger)
        if (buffer_)
                resizeCurrentBuffer();
 }
@@ -208,15 +252,24 @@ void BufferView::Pimpl::resize()
 void BufferView::Pimpl::redraw()
 {
        lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
-       workarea_->redraw();
+       workarea_.redraw();
 }
 
 
 bool BufferView::Pimpl::fitCursor(LyXText * text)
 {
-       Assert(screen_); // it is a programming error to call fitCursor
-       // without a valid screen.
-       bool ret = screen_->FitCursor(text);
+       lyx::Assert(screen_.get());
+
+       bool ret;
+
+       if (bv_->theLockingInset()) {
+               bv_->theLockingInset()->fitInsetCursor(bv_);
+               ret = true;
+       } else {
+               ret = screen_->fitCursor(text, bv_);
+       }
+
+       bv_->owner()->getDialogs()->updateParagraph();
        if (ret)
            updateScrollbar();
        return ret;
@@ -237,38 +290,42 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 {
        lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
        
-       LyXParagraph * par = 0;
-       LyXParagraph * selstartpar = 0;
-       LyXParagraph * selendpar = 0;
-       int pos = 0;
-       int selstartpos = 0;
-       int selendpos = 0;
-       int selection = 0;
-       int mark_set = 0;
+       Paragraph * par = 0;
+       Paragraph * selstartpar = 0;
+       Paragraph * selendpar = 0;
+       UpdatableInset * the_locking_inset = 0;
+       
+       Paragraph::size_type pos = 0;
+       Paragraph::size_type selstartpos = 0;
+       Paragraph::size_type selendpos = 0;
+       bool selection = false;
+       bool mark_set  = false;
 
-       ProhibitInput(bv_);
+       owner_->prohibitInput();
 
-       owner_->getMiniBuffer()->Set(_("Formatting document..."));   
+       owner_->message(_("Formatting document..."));
 
        if (bv_->text) {
                par = bv_->text->cursor.par();
                pos = bv_->text->cursor.pos();
-               selstartpar = bv_->text->sel_start_cursor.par();
-               selstartpos = bv_->text->sel_start_cursor.pos();
-               selendpar = bv_->text->sel_end_cursor.par();
-               selendpos = bv_->text->sel_end_cursor.pos();
-               selection = bv_->text->selection;
-               mark_set = bv_->text->mark_set;
+               selstartpar = bv_->text->selection.start.par();
+               selstartpos = bv_->text->selection.start.pos();
+               selendpar = bv_->text->selection.end.par();
+               selendpos = bv_->text->selection.end.pos();
+               selection = bv_->text->selection.set();
+               mark_set = bv_->text->selection.mark();
+               the_locking_inset = bv_->theLockingInset();
                delete bv_->text;
                bv_->text = new LyXText(bv_);
+               bv_->text->init(bv_);
        } else {
                // See if we have a text in TextCache that fits
                // the new buffer_ with the correct width.
-               bv_->text = textcache.findFit(buffer_, workarea_->workWidth());
+               bv_->text = textcache.findFit(buffer_, workarea_.workWidth());
                if (bv_->text) {
                        if (lyxerr.debugging()) {
                                lyxerr << "Found a LyXText that fits:\n";
-                               textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_->workWidth(), bv_->text)));
+                               textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_.workWidth(), bv_->text)));
                        }
                        // Set the owner of the newly found text
                        //      bv_->text->owner(bv_);
@@ -276,80 +333,53 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                                textcache.show(lyxerr, "resizeCurrentBuffer");
                } else {
                        bv_->text = new LyXText(bv_);
+                       bv_->text->init(bv_);
                }
        }
        updateScreen();
 
        if (par) {
-               bv_->text->selection = true;
+               bv_->text->selection.set(true);
                /* at this point just to avoid the Delete-Empty-Paragraph
                 * Mechanism when setting the cursor */
-               bv_->text->mark_set = mark_set;
+               bv_->text->selection.mark(mark_set);
                if (selection) {
-                       bv_->text->SetCursor(bv_, selstartpar, selstartpos);
-                       bv_->text->sel_cursor = bv_->text->cursor;
-                       bv_->text->SetCursor(bv_, selendpar, selendpos);
-                       bv_->text->SetSelection();
-                       bv_->text->SetCursor(bv_, par, pos);
+                       bv_->text->setCursor(bv_, selstartpar, selstartpos);
+                       bv_->text->selection.cursor = bv_->text->cursor;
+                       bv_->text->setCursor(bv_, selendpar, selendpos);
+                       bv_->text->setSelection(bv_);
+                       bv_->text->setCursor(bv_, par, pos);
                } else {
-                       bv_->text->SetCursor(bv_, par, pos);
-                       bv_->text->sel_cursor = bv_->text->cursor;
-                       bv_->text->selection = false;
+                       bv_->text->setCursor(bv_, par, pos);
+                       bv_->text->selection.cursor = bv_->text->cursor;
+                       bv_->text->selection.set(false);
                }
+               // remake the inset locking
+               bv_->theLockingInset(the_locking_inset);
        }
-       bv_->text->first = screen_->TopCursorVisible(bv_->text);
+       bv_->text->first = screen_->topCursorVisible(bv_->text);
        buffer_->resizeInsets(bv_);
        // this will scroll the screen such that the cursor becomes visible
        updateScrollbar();
        redraw();
-       owner_->getMiniBuffer()->Init();
-       bv_->setState();
-       AllowInput(bv_);
 
-       // Now if the title form still exist kill it
-       TimerCB(0, 0);
+       setState();
+       owner_->allowInput();
 
+       /// clear the "Formatting Document" message 
+       owner_->message("");
+       /// get rid of the splash screen if it's not gone already
+       owner_->getDialogs()->destroySplash();
        return 0;
 }
 
 
-void BufferView::Pimpl::gotoError()
-{
-       if (!screen_)
-               return;
-   
-       screen_->HideCursor();
-       bv_->beforeChange();
-       update(BufferView::SELECT|BufferView::FITCUR);
-       LyXCursor tmp;
-
-       if (!bv_->text->GotoNextError(bv_)) {
-               if (bv_->text->cursor.pos() 
-                   || bv_->text->cursor.par() != bv_->text->FirstParagraph()) {
-                       tmp = bv_->text->cursor;
-                       bv_->text->cursor.par(bv_->text->FirstParagraph());
-                       bv_->text->cursor.pos(0);
-                       if (!bv_->text->GotoNextError(bv_)) {
-                               bv_->text->cursor = tmp;
-                               owner_->getMiniBuffer()
-                                       ->Set(_("No more errors"));
-                               LyXBell();
-                       }
-               } else {
-                       owner_->getMiniBuffer()->Set(_("No more errors"));
-                       LyXBell();
-               }
-       }
-       update(BufferView::SELECT|BufferView::FITCUR);
-       bv_->text->sel_cursor = bv_->text->cursor;
-}
-
-
 void BufferView::Pimpl::updateScreen()
 {
        // Regenerate the screen.
-       delete screen_;
-       screen_ = new LyXScreen(*workarea_);
+       screen_.reset(new LyXScreen(workarea_));
 }
 
 
@@ -358,151 +388,126 @@ 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 (!buffer_) {
-               workarea_->setScrollbar(0, 1.0);
+       if (!bv_->text) {
+               workarea_.setScrollbar(0, 1.0);
                return;
        }
-       
-       static unsigned long max2 = 0;
-       static unsigned long height2 = 0;
 
-       unsigned long cbth = 0;
-       long cbsf = 0;
+       long const text_height = bv_->text->height;
 
-       if (bv_->text) {
-               cbth = bv_->text->height;
-               cbsf = bv_->text->first;
-       }
+       double const lineh = bv_->text->defaultHeight();
+       double const slider_size =
+               (text_height == 0) ? 1.0 : 1.0 / double(text_height);
 
-       // check if anything has changed.
-       if (max2 == cbth &&
-           height2 == workarea_->height() &&
-           current_scrollbar_value == cbsf)
-               return; // no
-       max2 = cbth;
-       height2 = workarea_->height();
-       current_scrollbar_value = cbsf;
+       static long old_text_height = 0;
+       static double old_lineh = 0;
+       static double old_slider_size = 0;
 
-       if (cbth <= height2) { // text is smaller than screen
-               workarea_->setScrollbar(0, 1.0); // right?
-               return;
+       if (text_height != old_text_height) {
+               workarea_.setScrollbarBounds(0, text_height - workarea_.height());
+               old_text_height = text_height;
+       }
+       if (lineh != old_lineh) {
+               workarea_.setScrollbarIncrements(lineh);
+               old_lineh = lineh;
+       }
+       if (current_scrollbar_value != bv_->text->first
+           || slider_size != old_slider_size) {
+               current_scrollbar_value = bv_->text->first;
+               workarea_.setScrollbar(current_scrollbar_value, slider_size);
+               old_slider_size = slider_size;
        }
-
-       long maximum_height = workarea_->height() * 3 / 4 + cbth;
-       long value = cbsf;
-
-       // set the scrollbar
-       double hfloat = workarea_->height();
-       double maxfloat = maximum_height;
-
-       float slider_size = 0.0;
-       int slider_value = value;
-
-       workarea_->setScrollbarBounds(0, bv_->text->height - workarea_->height());
-       double lineh = bv_->text->DefaultHeight();
-       workarea_->setScrollbarIncrements(lineh);
-       if (maxfloat > 0.0) {
-               if ((hfloat / maxfloat) * float(height2) < 3)
-                       slider_size = 3.0/float(height2);
-               else
-                       slider_size = hfloat / maxfloat;
-       } else
-               slider_size = hfloat;
-
-       workarea_->setScrollbar(slider_value, slider_size / workarea_->height());
 }
 
 
 // Callback for scrollbar slider
 void BufferView::Pimpl::scrollCB(double value)
 {
-       if (buffer_ == 0) return;
+       if (!buffer_) return;
 
        current_scrollbar_value = long(value);
        if (current_scrollbar_value < 0)
                current_scrollbar_value = 0;
    
-       if (!screen_)
+       if (!screen_.get())
                return;
 
-       screen_->Draw(bv_->text, current_scrollbar_value);
+       screen_->draw(bv_->text, bv_, current_scrollbar_value);
 
-       if (lyxrc.cursor_follows_scrollbar) {
-               LyXText * vbt = bv_->text;
-               int height = vbt->DefaultHeight();
-               
-               if (vbt->cursor.y() < (int)(bv_->text->first + height)) {
-                       vbt->SetCursorFromCoordinates(bv_, 0,
-                                                     bv_->text->first +
-                                                     height);
-               } else if (vbt->cursor.y() >
-                          (int)(bv_->text->first+workarea_->height()-height))
-               {
-                       vbt->SetCursorFromCoordinates(bv_, 0,
-                                                     bv_->text->first +
-                                                     workarea_->height()  -
-                                                     height);
-               }
+       if (!lyxrc.cursor_follows_scrollbar) {
+               waitForX();
+               return;
        }
+       LyXText * vbt = bv_->text;
+       int const height = vbt->defaultHeight();
+       int const first = static_cast<int>((bv_->text->first + height));
+       int const last = static_cast<int>((bv_->text->first + workarea_.height() - height));
+
+       if (vbt->cursor.y() < first)
+               vbt->setCursorFromCoordinates(bv_, 0, first);
+       else if (vbt->cursor.y() > last)
+               vbt->setCursorFromCoordinates(bv_, 0, last);
+
        waitForX();
 }
 
 
 int BufferView::Pimpl::scrollUp(long time)
 {
-       if (buffer_ == 0) return 0;
-       if (!screen_) return 0;
+       if (!buffer_) return 0;
+       if (!screen_.get()) return 0;
    
-       double value = workarea_->getScrollbarValue();
+       double value = workarea_.getScrollbarValue();
    
        if (value == 0) return 0;
 
-       float add_value =  (bv_->text->DefaultHeight()
+       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());
+       if (add_value > workarea_.height())
+               add_value = float(workarea_.height() -
+                                 bv_->text->defaultHeight());
    
        value -= add_value;
 
        if (value < 0)
                value = 0;
    
-       workarea_->setScrollbarValue(value);
+       workarea_.setScrollbarValue(value);
    
-       bv_->scrollCB(value); 
+       scrollCB(value); 
        return 0;
 }
 
 
 int BufferView::Pimpl::scrollDown(long time)
 {
-       if (buffer_ == 0) return 0;
-       if (!screen_) return 0;
+       if (!buffer_) return 0;
+       if (!screen_.get()) return 0;
    
-       double value= workarea_->getScrollbarValue();
-       pair<float, float> p = workarea_->getScrollbarBounds();
-       double max = p.second;
+       double value = workarea_.getScrollbarValue();
+       pair<float, float> p = workarea_.getScrollbarBounds();
+       double const max = p.second;
        
        if (value == max) return 0;
 
-       float add_value =  (bv_->text->DefaultHeight()
+       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());
+       if (add_value > workarea_.height())
+               add_value = float(workarea_.height() -
+                                 bv_->text->defaultHeight());
    
        value += add_value;
    
        if (value > max)
                value = max;
 
-       workarea_->setScrollbarValue(value);
+       workarea_.setScrollbarValue(value);
        
-       bv_->scrollCB(value); 
+       scrollCB(value); 
        return 0;
 }
 
@@ -519,36 +524,42 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
        if (!(state & Button1MotionMask))
                return;
 
-       if (buffer_ == 0 || !screen_) return;
+       if (!buffer_ || !screen_.get()) return;
 
        // Check for inset locking
        if (bv_->theLockingInset()) {
                LyXCursor cursor = bv_->text->cursor;
+               LyXFont font = bv_->text->getFont(buffer_,
+                                                 cursor.par(), cursor.pos());
+               int width = bv_->theLockingInset()->width(bv_, font);
+               int inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() - width : cursor.x();
+               int start_x = inset_x + bv_->theLockingInset()->scroll();
                bv_->theLockingInset()->
-                       InsetMotionNotify(bv_,
-                                         x - cursor.x() -
-                                         bv_->theLockingInset()->scroll(),
+                       insetMotionNotify(bv_,
+                                         x - start_x,
                                          y - cursor.y() + bv_->text->first,
                                          state);
                return;
        }
    
-       /* The selection possible is needed, that only motion events are 
-        * used, where the bottom press event was on the drawing area too */
-       if (selection_possible) {
-               screen_->HideCursor();
+       /* 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();
 
-               bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first);
+       bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first);
       
-               if (!bv_->text->selection)
-                       update(BufferView::UPDATE); // Maybe an empty line was deleted
+       if (!bv_->text->selection.set())
+               update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
       
-               bv_->text->SetSelection();
-               screen_->ToggleToggle(bv_->text);
-               fitCursor(bv_->text);
-               screen_->ShowCursor(bv_->text);
-       }
-       return;
+       bv_->text->setSelection(bv_);
+       screen_->toggleToggle(bv_->text, bv_);
+       fitCursor(bv_->text);
+       screen_->showCursor(bv_->text, bv_);
 }
 
 
@@ -556,10 +567,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
                                            unsigned int button)
 {
-       last_click_x = -1;
-       last_click_y = -1;
-
-       if (buffer_ == 0 || !screen_) return;
+       if (!buffer_ || !screen_.get()) return;
 
        Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
 
@@ -582,7 +590,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
                   otherwise give the event to the inset */
                if (inset_hit == bv_->theLockingInset()) {
                        bv_->theLockingInset()->
-                               InsetButtonPress(bv_,
+                               insetButtonPress(bv_,
                                                 xpos, ypos,
                                                 button);
                        return;
@@ -593,35 +601,35 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        
        if (!inset_hit)
                selection_possible = true;
-       screen_->HideCursor();
+       screen_->hideCursor();
 
        int const screen_first = bv_->text->first;
        
        // Middle button press pastes if we have a selection
        bool paste_internally = false;
        if (button == 2
-           && bv_->text->selection) {
-               owner_->getLyXFunc()->Dispatch(LFUN_COPY);
+           && bv_->text->selection.set()) {
+               owner_->getLyXFunc()->dispatch(LFUN_COPY);
                paste_internally = true;
        }
        
        // Clear the selection
-       screen_->ToggleSelection(bv_->text);
-       bv_->text->ClearSelection();
-       bv_->text->FullRebreak(bv_);
-       screen_->Update(bv_->text);
+       screen_->toggleSelection(bv_->text, bv_);
+       bv_->text->clearSelection(bv_);
+       bv_->text->fullRebreak(bv_);
+       screen_->update(bv_->text, bv_);
        updateScrollbar();
        
        // Single left click in math inset?
        if ((inset_hit != 0) &&
-           (inset_hit->Editable()==Inset::HIGHLY_EDITABLE)) {
+           (inset_hit->editable()==Inset::HIGHLY_EDITABLE)) {
                // Highly editable inset, like math
                UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
                selection_possible = false;
                owner_->updateLayoutChoice();
-               owner_->getMiniBuffer()->Set(inset->EditMessage());
-               inset->InsetButtonPress(bv_, xpos, ypos, button);
-               inset->Edit(bv_, xpos, ypos, button);
+               owner_->message(inset->editMessage());
+               inset->insetButtonPress(bv_, xpos, ypos, button);
+               inset->edit(bv_, xpos, ypos, button);
                return;
        } 
        
@@ -632,9 +640,9 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        }
        
        if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
-               bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_first);
-       bv_->text->FinishUndo();
-       bv_->text->sel_cursor = bv_->text->cursor;
+               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();
@@ -647,9 +655,9 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        // insert this
        if (button == 2) {
                if (paste_internally)
-                       owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+                       owner_->getLyXFunc()->dispatch(LFUN_PASTE);
                else
-                       owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+                       owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
                                                       "paragraph");
                selection_possible = false;
                return;
@@ -660,34 +668,52 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) 
 {
        // select a word
-       if (buffer_ && !bv_->theLockingInset()) {
-               if (screen_ && button == 1) {
-                       screen_->HideCursor();
-                       screen_->ToggleSelection(bv_->text);
-                       bv_->text->SelectWord(bv_);
-                       screen_->ToggleSelection(bv_->text, false);
-                       /* This will fit the cursor on the screen
-                        * if necessary */
-                       update(BufferView::SELECT|BufferView::FITCUR);
-               }
-       }   
+       if (!buffer_)
+           return;
+
+       LyXText * text = bv_->getLyXText();
+
+       if (text->bv_owner && bv_->theLockingInset())
+           return;
+
+       if (screen_.get() && button == 1) {
+           if (text->bv_owner) {
+               screen_->hideCursor();
+               screen_->toggleSelection(text, bv_);
+               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+               screen_->toggleSelection(text, bv_, false);
+           } else {
+               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+           }
+           /* This will fit the cursor on the screen
+            * if necessary */
+           update(text, BufferView::SELECT|BufferView::FITCUR);
+       }
 }
 
 
 void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 {
        // select a line
-       if (buffer_ && screen_ && !bv_->theLockingInset() && (button == 1)) {
-               screen_->HideCursor();
-               screen_->ToggleSelection(bv_->text);
-               bv_->text->CursorHome(bv_);
-               bv_->text->sel_cursor = bv_->text->cursor;
-               bv_->text->CursorEnd(bv_);
-               bv_->text->SetSelection();
-               screen_->ToggleSelection(bv_->text, false);
+       if (buffer_)
+               return;
+
+       LyXText * text = bv_->getLyXText();
+
+       if (text->bv_owner && bv_->theLockingInset())
+           return;
+
+       if (screen_.get() && (button == 1)) {
+               screen_->hideCursor();
+               screen_->toggleSelection(text, bv_);
+               text->cursorHome(bv_);
+               text->selection.cursor = text->cursor;
+               text->cursorEnd(bv_);
+               text->setSelection(bv_);
+               screen_->toggleSelection(text, bv_, false);
                /* This will fit the cursor on the screen
                 * if necessary */
-               update(BufferView::SELECT|BufferView::FITCUR);
+               update(text, BufferView::SELECT|BufferView::FITCUR);
        }
 }
 
@@ -695,7 +721,7 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 void BufferView::Pimpl::enterView()
 {
        if (active() && available()) {
-               SetXtermCursor(workarea_->getWin());
+               SetXtermCursor(workarea_.getWin());
                using_xterm_cursor = true;
        }
 }
@@ -704,7 +730,7 @@ void BufferView::Pimpl::enterView()
 void BufferView::Pimpl::leaveView()
 {
        if (using_xterm_cursor) {
-               XUndefineCursor(fl_get_display(), workarea_->getWin());
+               XUndefineCursor(fl_get_display(), workarea_.getWin());
                using_xterm_cursor = false;
        }
 }
@@ -713,7 +739,7 @@ void BufferView::Pimpl::leaveView()
 void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                                              unsigned int button)
 {
-       if (buffer_ == 0 || screen_ == 0) return;
+       if (!buffer_ || !screen_.get()) 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
@@ -725,21 +751,22 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 
                /* LyX does a kind of work-area grabbing for insets.
                   Only a ButtonPress Event outside the inset will 
-                  force a InsetUnlock. */
+                  force a insetUnlock. */
                bv_->theLockingInset()->
-                       InsetButtonRelease(bv_, x, y, button);
+                       insetButtonRelease(bv_, x, y, button);
                return;
        }
        
        selection_possible = false;
        
-       if (button >= 2) return;
+       if (button == 2)
+               return;
 
-       bv_->setState();
+       setState();
        owner_->showState();
 
        // Did we hit an editable inset?
-       if (inset_hit != 0) {
+       if (inset_hit) {
                // Inset like error, notes and figures
                selection_possible = false;
 
@@ -758,18 +785,19 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                // (Joacim)
                // ...or maybe the SetCursorParUndo()
                // below isn't necessary at all anylonger?
-               if (inset_hit->LyxCode() == Inset::REF_CODE) {
-                       bv_->text->SetCursorParUndo(bv_->buffer());
+               if (inset_hit->lyxCode() == Inset::REF_CODE) {
+                       setCursorParUndo(bv_);
                }
 
-               owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
-               if (inset_hit->Editable()==Inset::HIGHLY_EDITABLE) {
+               owner_->message(inset_hit->editMessage());
+
+               if (inset_hit->editable()==Inset::HIGHLY_EDITABLE) {
                        // Highly editable inset, like math
                        UpdatableInset *inset = (UpdatableInset *)inset_hit;
-                       inset->InsetButtonRelease(bv_, x, y, button);
+                       inset->insetButtonRelease(bv_, x, y, button);
                } else {
-                       inset_hit->InsetButtonRelease(bv_, x, y, button);
-                       inset_hit->Edit(bv_, x, y, button);
+                       inset_hit->insetButtonRelease(bv_, x, y, button);
+                       inset_hit->edit(bv_, x, y, button);
                }
                return;
        }
@@ -779,81 +807,26 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                bool hit = false;
                char c = ' ';
                if (bv_->text->cursor.pos() <
-                   bv_->text->cursor.par()->Last()) {
+                   bv_->text->cursor.par()->size()) {
                        c = bv_->text->cursor.par()->
-                               GetChar(bv_->text->cursor.pos());
+                               getChar(bv_->text->cursor.pos());
                }
-#ifndef NEW_INSETS
-               if (c == LyXParagraph::META_FOOTNOTE
-                   || c == LyXParagraph::META_MARGIN
-                   || c == LyXParagraph::META_FIG
-                   || c == LyXParagraph::META_TAB
-                   || c == LyXParagraph::META_WIDE_FIG
-                   || c == LyXParagraph::META_WIDE_TAB
-                    || c == LyXParagraph::META_ALGORITHM){
-                       hit = true;
-               } else
-#endif
                        if (bv_->text->cursor.pos() - 1 >= 0) {
                        c = bv_->text->cursor.par()->
-                               GetChar(bv_->text->cursor.pos() - 1);
-#ifndef NEW_INSETS
-                       if (c == LyXParagraph::META_FOOTNOTE
-                           || c == LyXParagraph::META_MARGIN
-                           || c == LyXParagraph::META_FIG
-                           || c == LyXParagraph::META_TAB
-                           || c == LyXParagraph::META_WIDE_FIG 
-                           || c == LyXParagraph::META_WIDE_TAB
-                           || c == LyXParagraph::META_ALGORITHM){
-                               // We are one step too far to the right
-                               bv_->text->CursorLeft(bv_);
-                               hit = true;
-                       }
-#endif
+                               getChar(bv_->text->cursor.pos() - 1);
                }
                if (hit == true) {
-#ifndef NEW_INSETS
-                       bv_->toggleFloat();
-#endif
-                       selection_possible = false;
-                       return;
-               }
-       }
-
-#ifndef NEW_INSETS
-       // Do we want to close a float? (click on the float-label)
-       if (bv_->text->cursor.row()->par()->footnoteflag == 
-           LyXParagraph::OPEN_FOOTNOTE
-           && bv_->text->cursor.row()->previous() &&
-           bv_->text->cursor.row()->previous()->par()->
-           footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
-               LyXFont font(LyXFont::ALL_SANE);
-               font.setSize(LyXFont::SIZE_FOOTNOTE);
-
-               int box_x = 20; // LYX_PAPER_MARGIN;
-               box_x += lyxfont::width(" wide-tab ", font);
-
-               unsigned int screen_first = bv_->text->first;
-
-               if (x < box_x
-                   && y + screen_first > bv_->text->cursor.y() -
-                   bv_->text->cursor.row()->baseline()
-                   && y + screen_first < bv_->text->cursor.y() -
-                   bv_->text->cursor.row()->baseline()
-                   + lyxfont::maxAscent(font) * 1.2 + lyxfont::maxDescent(font) * 1.2) {
-                       bv_->toggleFloat();
                        selection_possible = false;
                        return;
                }
        }
-#endif
 
        // Maybe we want to edit a bibitem ale970302
        if (bv_->text->cursor.par()->bibkey && x < 20 + 
            bibitemMaxWidth(bv_, textclasslist.
                            TextClass(buffer_->
                                      params.textclass).defaultfont())) {
-               bv_->text->cursor.par()->bibkey->Edit(bv_, 0, 0, 0);
+               bv_->text->cursor.par()->bibkey->edit(bv_, 0, 0, 0);
        }
 
        return;
@@ -868,39 +841,35 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                                         unsigned int /* button */)
 {
-       if (!screen_)
+       if (!screen_.get())
                return 0;
   
        int y_tmp = y + text->first;
   
        LyXCursor cursor;
-       text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
+       text->setCursorFromCoordinates(bv_, cursor, x, y_tmp);
+       text->setCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
+
 
-       if (cursor.pos() < cursor.par()->Last()
-           && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
-           && cursor.par()->GetInset(cursor.pos())
-           && cursor.par()->GetInset(cursor.pos())->Editable()) {
+       if (cursor.pos() < cursor.par()->size()
+           && cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET
+           && cursor.par()->getInset(cursor.pos())
+           && cursor.par()->getInset(cursor.pos())->editable()) {
 
                // Check whether the inset really was hit
-               Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
-               LyXFont font = text->GetFont(bv_->buffer(),
+               Inset * tmpinset = cursor.par()->getInset(cursor.pos());
+               LyXFont font = text->getFont(buffer_,
                                                  cursor.par(), cursor.pos());
-               bool is_rtl = font.isVisibleRightToLeft();
-               int start_x;
-               int end_x;
-
-               if (is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font) + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->scroll();
-               } else {
-                       start_x = cursor.x() + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->width(bv_, font) + tmpinset->scroll();
-               }
+               int const width = tmpinset->width(bv_, font);
+               int const inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() - width : cursor.x();
+               int const start_x = inset_x + tmpinset->scroll();
+               int const end_x = inset_x + width;
 
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
                    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
-                       text->SetCursor(bv_, cursor.par(),cursor.pos(),true);
+                       text->setCursor(bv_, cursor.par(),cursor.pos(), true);
                        x = x - start_x;
                        // The origin of an inset is on the baseline
                        y = y_tmp - (text->cursor.y()); 
@@ -909,32 +878,26 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
        }
 
        if ((cursor.pos() - 1 >= 0) &&
-           (cursor.par()->GetChar(cursor.pos()-1) == LyXParagraph::META_INSET) &&
-           (cursor.par()->GetInset(cursor.pos() - 1)) &&
-           (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) {
-               Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
-               LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
+           (cursor.par()->getChar(cursor.pos()-1) == Paragraph::META_INSET) &&
+           (cursor.par()->getInset(cursor.pos() - 1)) &&
+           (cursor.par()->getInset(cursor.pos() - 1)->editable())) {
+               Inset * tmpinset = cursor.par()->getInset(cursor.pos()-1);
+               LyXFont font = text->getFont(buffer_, cursor.par(),
                                                  cursor.pos()-1);
-               bool is_rtl = font.isVisibleRightToLeft();
-               int start_x;
-               int end_x;
-
-               if (!is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font) +
-                           tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->scroll();
-               } else {
-                       start_x = cursor.x() + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->width(bv_, font) +
-                           tmpinset->scroll();
-               }
+               int const width = tmpinset->width(bv_, font);
+               int const inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() : cursor.x() - width;
+               int const start_x = inset_x + tmpinset->scroll();
+               int const end_x = inset_x + width;
+
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
                    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
 #if 0
                        if (move_cursor && (tmpinset != bv_->theLockingInset()))
 #endif
-                               text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true);
+                               text->setCursor(bv_, cursor.par(),
+                                               cursor.pos() - 1, true);
                        x = x - start_x;
                        // The origin of an inset is on the baseline
                        y = y_tmp - (text->cursor.y()); 
@@ -947,25 +910,19 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 
 void BufferView::Pimpl::workAreaExpose()
 {
-       // this is a hack to ensure that we only call this through
-       // BufferView::redraw().
-       //if (!lgb_hack) {
-       //      redraw();
-       //}
-       
-       static int work_area_width = 0;
-       static unsigned int work_area_height = 0;
+       static int work_area_width;
+       static unsigned int work_area_height;
 
-       bool widthChange = workarea_->workWidth() != work_area_width;
-       bool heightChange = workarea_->height() != work_area_height;
+       bool const widthChange = workarea_.workWidth() != work_area_width;
+       bool const heightChange = workarea_.height() != work_area_height;
 
        // update from work area
-       work_area_width = workarea_->workWidth();
-       work_area_height = workarea_->height();
+       work_area_width = workarea_.workWidth();
+       work_area_height = workarea_.height();
        if (buffer_ != 0) {
                if (widthChange) {
-                       // All buffers need a resize
-                       bufferlist.resize();
+                       // The visible LyXView need a resize
+                       owner_->resize();
 
                        // Remove all texts from the textcache
                        // This is not _really_ what we want to do. What
@@ -986,13 +943,11 @@ void BufferView::Pimpl::workAreaExpose()
 
                        // The main window size has changed, repaint most stuff
                        redraw();
-                       // ...including the minibuffer
-                       owner_->getMiniBuffer()->Init();
-
-               } else if (screen_) screen_->Redraw(bv_->text);
+               } else if (screen_.get())
+                   screen_->redraw(bv_->text, bv_);
        } else {
                // Grey box when we don't have a buffer
-               workarea_->greyOut();
+               workarea_.greyOut();
        }
 
        // always make sure that the scrollbar is sane.
@@ -1004,7 +959,11 @@ void BufferView::Pimpl::workAreaExpose()
 
 void BufferView::Pimpl::update()
 {
-       if (screen_) screen_->Update(bv_->text);
+       if (screen_.get() &&
+               (!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
+       {
+               screen_->update(bv_->text, bv_);
+       }
 }
 
 // Values used when calling update:
@@ -1045,29 +1004,29 @@ void BufferView::Pimpl::update()
 // update(1)  -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE)
 // update(3)  -> update(1)         -> update(1) -> update(SELECT)
 
-void BufferView::Pimpl::update(BufferView::UpdateCodes f)
+void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 {
        owner_->updateLayoutChoice();
 
-       if (!bv_->text->selection && (f & SELECT)) {
-               bv_->text->sel_cursor = bv_->text->cursor;
+       if (!text->selection.set() && (f & SELECT)) {
+               text->selection.cursor = text->cursor;
        }
 
-       bv_->text->FullRebreak(bv_);
-
-       update();
+       text->fullRebreak(bv_);
 
+       if (text->inset_owner) {
+               text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+           updateInset(text->inset_owner, true);
+       } else {
+           update();
+       }
+               
        if ((f & FITCUR)) {
-               fitCursor(bv_->text);
-       }
+               fitCursor(text);
+       }
 
        if ((f & CHANGE)) {
-               if (buffer_->isLyxClean()) {
-                       buffer_->markDirty();
-                       owner_->getMiniBuffer()->setTimer(4);
-               } else {
-                       buffer_->markDirty();
-               }
+               buffer_->markDirty();
        }
 }
 
@@ -1078,61 +1037,31 @@ void BufferView::Pimpl::cursorToggle()
        // Quite a nice place for asyncron Inset updating, isn't it?
        // Actually no! This is run even if no buffer exist... so (Lgb)
        if (!buffer_) {
-               goto set_timer_and_return;
-       }
-
-       // NOTE:
-       // On my quest to solve the gs render hangups I am now
-       // disabling the SIGHUP completely, and will do a wait
-       // now and then instead. If the guess that xforms somehow
-       // destroys something is true, this is likely (hopefully)
-       // to solve the problem...at least I hope so. Lgb
-
-       // ...Ok this seems to work...at least it does not make things
-       // worse so far. However I still see gs processes that hangs.
-       // I would really like to know _why_ they are hanging. Anyway
-       // the solution without the SIGCHLD handler seems to be easier
-       // to debug.
-
-       // When attaching gdb to a a running gs that hangs it shows
-       // that it is waiting for input(?) Is it possible for us to
-       // provide that input somehow? Or figure what it is expecing
-       // to read?
-
-       // One solution is to, after some time, look if there are some
-       // old gs processes still running and if there are: kill them
-       // and re render.
-
-       // Another solution is to provide the user an option to rerender
-       // a picture. This would, for the picture in question, check if
-       // there is a gs running for it, if so kill it, and start a new
-       // rendering process.
-
-       // these comments posted to lyx@via
-       {
-               int status = 1;
-               int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
-               if (pid == -1) // error find out what is wrong
-                       ; // ignore it for now.
-               else if (pid > 0)
-                       sigchldhandler(pid, &status);
+               cursor_timeout.restart();
+               return;
        }
+       int status = 1;
+       int const pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
+       if (pid == -1) // error find out what is wrong
+               ; // ignore it for now.
+       else if (pid > 0)
+               sigchldchecker(pid, &status);
 
        updatelist.update(bv_);
        
-       if (!screen_) {
-               goto set_timer_and_return;
+       if (!screen_.get()) {
+               cursor_timeout.restart();
+               return;
        }
 
        if (!bv_->theLockingInset()) {
-               screen_->CursorToggle(bv_->text);
+               screen_->cursorToggle(bv_->text, bv_);
        } else {
-               bv_->theLockingInset()->ToggleInsetCursor(bv_);
+               bv_->theLockingInset()->toggleInsetCursor(bv_);
        }
        
-  set_timer_and_return:
        cursor_timeout.restart();
-       return;
 }
 
 
@@ -1145,19 +1074,19 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text)
        if (text->inset_owner)
                y += bv_->text->first;
        Row * cursorrow = text->cursor.row();
-       text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
-       bv_->text->FinishUndo();
+       text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
+       finishUndo();
        // This is to allow jumping over large insets
        if ((cursorrow == text->cursor.row()))
-               text->CursorUp(bv_);
+               text->cursorUp(bv_);
        
        if (text->inset_owner ||
-           text->cursor.row()->height() < workarea_->height())
-               screen_->Draw(bv_->text,
+           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 );
+                             - workarea_.height() + 1 );
        updateScrollbar();
 }
 
@@ -1167,21 +1096,21 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
        if (!text->cursor.row()->next())
                return;
        
-       int y = text->first;
+       int y = text->first + workarea_.height();
 //     if (text->inset_owner)
 //             y += bv_->text->first;
-       text->GetRowNearY(y);
+       text->getRowNearY(y);
+    
        Row * cursorrow = text->cursor.row();
-       text->SetCursorFromCoordinates(bv_, text->cursor.x_fix(), y
-                                      + workarea_->height());
-       bv_->text->FinishUndo();
+       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_);
+               text->cursorDown(bv_);
        
        if (text->inset_owner ||
-           text->cursor.row()->height() < workarea_->height())
-               screen_->Draw(bv_->text, text->cursor.y() -
+           text->cursor.row()->height() < workarea_.height())
+               screen_->draw(bv_->text, bv_, text->cursor.y() -
                              text->cursor.row()->baseline());
        updateScrollbar();
 }
@@ -1194,48 +1123,66 @@ bool BufferView::Pimpl::available() const
 }
 
 
-void BufferView::Pimpl::beforeChange()
+void BufferView::Pimpl::beforeChange(LyXText * text)
 {
        toggleSelection();
-       bv_->text->ClearSelection();
-
-       // CHECK
-       //owner_->update_timeout.stop();
+       text->clearSelection(bv_);
 }
 
 
-void BufferView::Pimpl::savePosition()
+void BufferView::Pimpl::savePosition(unsigned int i)
 {
-       backstack.push(buffer_->fileName(),
-                      bv_->text->cursor.x(),
-                      bv_->text->cursor.y());
+       if (i >= saved_positions_num)
+               return;
+       saved_positions[i] = Position(buffer_->fileName(),
+                                     bv_->text->cursor.par()->id(),
+                                     bv_->text->cursor.pos());
+       if (i > 0) {
+               ostringstream str;
+               str << _("Saved bookmark") << ' ' << i;
+               owner_->message(str.str().c_str());
+       }
 }
 
 
-void BufferView::Pimpl::restorePosition()
+void BufferView::Pimpl::restorePosition(unsigned int i)
 {
-       if (backstack.empty()) return;
-       
-       int  x, y;
-       string fname = backstack.pop(&x, &y);
+       if (i >= saved_positions_num)
+               return;
 
-       beforeChange();
+       string const fname = saved_positions[i].filename;
 
-       if( fname != buffer_->fileName() ) {
+       beforeChange(bv_->text);
+
+       if (fname != buffer_->fileName()) {
                Buffer * b = bufferlist.exists(fname) ?
                        bufferlist.getBuffer(fname) :
                        bufferlist.loadLyXFile(fname); // don't ask, just load it
-               ifb != 0 ) buffer(b);
+               if (b != 0 ) buffer(b);
        }
 
-       bv_->text->SetCursorFromCoordinates(bv_, x, y);
-       update(BufferView::SELECT|BufferView::FITCUR);
+       Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
+       if (!par)
+               return;
+
+       bv_->text->setCursor(bv_, par,
+                            min(par->size(), saved_positions[i].par_pos));
+
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+       if (i > 0) {
+               ostringstream str;
+               str << _("Moved to bookmark") << ' ' << i;
+               owner_->message(str.str().c_str());
+       }
 }
 
 
-bool BufferView::Pimpl::NoSavedPositions()
+bool BufferView::Pimpl::isSavedPosition(unsigned int i)
 {
-       return backstack.empty();
+       if (i >= saved_positions_num)
+               return false;
+
+       return !saved_positions[i].filename.empty();
 }
 
 
@@ -1244,12 +1191,17 @@ void BufferView::Pimpl::setState()
        if (!lyxrc.rtl_support)
                return;
 
-       if (bv_->text->real_current_font.isRightToLeft() &&
-           bv_->text->real_current_font.latex() != LyXFont::ON) {
-               if (owner_->getIntl()->primarykeymap)
+       LyXText * text = bv_->getLyXText();
+       if (text->real_current_font.isRightToLeft()
+#ifndef NO_LATEX
+           &&
+           text->real_current_font.latex() != LyXFont::ON
+#endif
+               ) {
+               if (owner_->getIntl()->keymap == Intl::PRIMARY)
                        owner_->getIntl()->KeyMapSec();
        } else {
-               if (!owner_->getIntl()->primarykeymap)
+               if (owner_->getIntl()->keymap == Intl::SECONDARY)
                        owner_->getIntl()->KeyMapPrim();
        }
 }
@@ -1257,19 +1209,19 @@ void BufferView::Pimpl::setState()
 
 void BufferView::Pimpl::insetSleep()
 {
-       if (bv_->theLockingInset() && !bv_->inset_slept) {
-               bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly);
-               bv_->theLockingInset()->InsetUnlock(bv_);
-               bv_->inset_slept = true;
+       if (bv_->theLockingInset() && !inset_slept) {
+               bv_->theLockingInset()->getCursorPos(bv_, bv_->slx, bv_->sly);
+               bv_->theLockingInset()->insetUnlock(bv_);
+               inset_slept = true;
        }
 }
 
 
 void BufferView::Pimpl::insetWakeup()
 {
-       if (bv_->theLockingInset() && bv_->inset_slept) {
-               bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0);
-               bv_->inset_slept = false;
+       if (bv_->theLockingInset() && inset_slept) {
+               bv_->theLockingInset()->edit(bv_, bv_->slx, bv_->sly, 0);
+               inset_slept = false;
        }
 }
 
@@ -1277,101 +1229,2219 @@ void BufferView::Pimpl::insetWakeup()
 void BufferView::Pimpl::insetUnlock()
 {
        if (bv_->theLockingInset()) {
-               if (!bv_->inset_slept)
-                       bv_->theLockingInset()->InsetUnlock(bv_);
+               if (!inset_slept)
+                       bv_->theLockingInset()->insetUnlock(bv_);
                bv_->theLockingInset(0);
-               bv_->text->FinishUndo();
-               bv_->inset_slept = false;
+               finishUndo();
+               inset_slept = false;
        }
 }
 
 
 bool BufferView::Pimpl::focus() const
 {
-       return workarea_->hasFocus();
+       return workarea_.hasFocus();
 }
 
 
 void BufferView::Pimpl::focus(bool f)
 {
-       if (f) workarea_->setFocus();
+       if (f) workarea_.setFocus();
 }
 
 
 bool BufferView::Pimpl::active() const
 {
-       return workarea_->active();
+       return workarea_.active();
 }
 
 
 bool BufferView::Pimpl::belowMouse() const 
 {
-       return workarea_->belowMouse();
+       return workarea_.belowMouse();
 }
 
 
 void BufferView::Pimpl::showCursor()
 {
-       if (screen_)
-               screen_->ShowCursor(bv_->text);
+       if (screen_.get()) {
+               if (bv_->theLockingInset())
+                       bv_->theLockingInset()->showInsetCursor(bv_);
+               else
+                       screen_->showCursor(bv_->text, bv_);
+       }
 }
 
 
 void BufferView::Pimpl::hideCursor()
 {
-       if (screen_)
-               screen_->HideCursor();
+       if (screen_.get()) {
+               if (!bv_->theLockingInset())
+//                     bv_->theLockingInset()->hideInsetCursor(bv_);
+//             else
+                       screen_->hideCursor();
+       }
 }
 
 
 void BufferView::Pimpl::toggleSelection(bool b)
 {
-       if (screen_)
-               screen_->ToggleSelection(bv_->text, b);
+       if (screen_.get()) {
+               if (bv_->theLockingInset())
+                       bv_->theLockingInset()->toggleSelection(bv_, b);
+               screen_->toggleSelection(bv_->text, bv_, b);
+       }
 }
 
 
 void BufferView::Pimpl::toggleToggle()
 {
-       if (screen_)
-               screen_->ToggleToggle(bv_->text);
+       if (screen_.get())
+               screen_->toggleToggle(bv_->text, bv_);
 }
 
 
 void BufferView::Pimpl::center() 
 {
-       beforeChange();
-       if (bv_->text->cursor.y() > (int)(workarea_->height() / 2)) {
-               screen_->Draw(bv_->text, bv_->text->cursor.y() - workarea_->height() / 2);
+       beforeChange(bv_->text);
+       if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
+               screen_->draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
        } else {
-               screen_->Draw(bv_->text, 0);
+               screen_->draw(bv_->text, bv_, 0);
        }
-       update(BufferView::SELECT|BufferView::FITCUR);
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
        redraw();
 }
 
 
 void BufferView::Pimpl::pasteClipboard(bool asPara) 
 {
-       if (buffer_ == 0) return;
+       if (!buffer_) return;
 
-       screen_->HideCursor();
-       bv_->beforeChange();
+       screen_->hideCursor();
+       beforeChange(bv_->text);
        
-       string clip(workarea_->getClipboard());
+       string const clip(workarea_.getClipboard());
        
        if (clip.empty()) return;
 
        if (asPara) {
-               bv_->text->InsertStringB(bv_, clip);
+               bv_->text->insertStringAsParagraphs(bv_, clip);
        } else {
-               bv_->text->InsertStringA(bv_, clip);
+               bv_->text->insertStringAsLines(bv_, clip);
        }
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 
 
 void BufferView::Pimpl::stuffClipboard(string const & stuff) const
 {
-       workarea_->putClipboard(stuff);
+       workarea_.putClipboard(stuff);
+}
+
+
+/*
+ * Dispatch functions for actions which can be valid for BufferView->text
+ * and/or InsetText->text!!!
+ */
+
+
+inline
+void BufferView::Pimpl::moveCursorUpdate(bool selecting)
+{
+       LyXText * lt = bv_->getLyXText();
+       
+       if (selecting || lt->selection.mark()) {
+               lt->setSelection(bv_);
+               if (lt->bv_owner)
+                       toggleToggle();
+       }
+       update(lt, BufferView::SELECT|BufferView::FITCUR);
+       showCursor();
+       
+       /* ---> Everytime the cursor is moved, show the current font state. */
+       // should this too me moved out of this func?
+       //owner->showState();
+       setState();
+}
+
+
+Inset * BufferView::Pimpl::getInsetByCode(Inset::Code code)
+{
+       LyXCursor cursor = bv_->getLyXText()->cursor;
+       Buffer::inset_iterator it =
+               find_if(Buffer::inset_iterator(
+                       cursor.par(), cursor.pos()),
+                       buffer_->inset_iterator_end(),
+                       lyx::compare_memfun(&Inset::lyxCode, code));
+       return it != buffer_->inset_iterator_end() ? (*it) : 0;
+}
+
+
+void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
+{
+       string filename = filen;
+
+       if (filename.empty()) {
+               // Launch a file browser
+               string initpath = lyxrc.document_path;
+
+               if (available()) {
+                       string const trypath = owner_->buffer()->filepath;
+                       // If directory is writeable, use this as default.
+                       if (IsDirWriteable(trypath) == 1)
+                               initpath = trypath;
+               }
+
+               FileDialog fileDlg(bv_->owner(),
+                                  _("Select LyX document to insert"),
+                       LFUN_FILE_INSERT,
+                       make_pair(string(_("Documents")),
+                                 string(lyxrc.document_path)),
+                       make_pair(string(_("Examples")),
+                                 string(AddPath(system_lyxdir, "examples"))));
+
+               FileDialog::Result result =
+                       fileDlg.Select(initpath,
+                                      _("*.lyx| LyX Documents (*.lyx)"));
+               if (result.first == FileDialog::Later)
+                       return;
+
+               filename = result.second;
+
+               // check selected filename
+               if (filename.empty()) {
+                       owner_->message(_("Canceled."));
+                       return;
+               }
+       }
+
+       // get absolute path of file and add ".lyx" to the filename if
+       // necessary
+       filename = FileSearch(string(), filename, "lyx");
+
+       string const disp_fn(MakeDisplayPath(filename));
+       
+       ostringstream s1;
+       s1 << _("Inserting document") << ' '
+          << disp_fn << " ...";
+       owner_->message(s1.str().c_str());
+       bool const res = bv_->insertLyXFile(filename);
+       if (res) {
+               ostringstream str;
+               str << _("Document") << ' ' << disp_fn
+                   << ' ' << _("inserted.");
+               owner_->message(str.str().c_str());
+       } else {
+               ostringstream str;
+               str << _("Could not insert document") << ' '
+                   << disp_fn;
+               owner_->message(str.str().c_str());
+       }
+}
+
+
+bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
+{
+       lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch: action["
+                             << action <<"] arg[" << argument << "]" << endl;
+       
+       switch (action) {
+               // --- Misc -------------------------------------------
+       case LFUN_APPENDIX:
+       {
+               if (available()) {
+                       LyXText * lt = bv_->getLyXText();
+                       lt->toggleAppendix(bv_);
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+               }
+       }
+       break;
+
+       case LFUN_TOC_INSERT:
+       {
+               InsetCommandParams p;
+               p.setCmdName("tableofcontents");
+               Inset * inset = new InsetTOC(p);
+               if (!insertInset(inset, "Standard"))
+                       delete inset;
+               break;
+       }
+               
+       case LFUN_TABULAR_FEATURE:
+       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)
+               // a tabular-inset
+               break;
+
+       case LFUN_INSET_GRAPHICS:
+       {
+               Inset * new_inset = new InsetGraphics;
+               if (!insertInset(new_inset)) {
+                       delete new_inset;
+               } else {
+                       // this is need because you don't use a inset->Edit()
+                       updateInset(new_inset, true);
+                       new_inset->edit(bv_);
+               }
+               break;
+       }
+               
+       case LFUN_PASTE:
+               bv_->paste();
+               setState();
+               break;
+               
+       case LFUN_PASTESELECTION:
+       {
+               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;
+
+       case LFUN_REFERENCE_GOTO:
+       {
+               vector<Inset::Code> tmp;
+               tmp.push_back(Inset::LABEL_CODE);
+               tmp.push_back(Inset::REF_CODE);
+               gotoInset(tmp, true);
+               break;
+       }
+
+       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;
+
+       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;
+
+#ifndef NO_LATEX
+       case LFUN_TEX:
+               Tex(bv_);
+               setState();
+               owner_->showState();
+               break;
+#endif
+               
+       case LFUN_FILE_INSERT:
+       {
+               MenuInsertLyXFile(argument);
+       }
+       break;
+       
+       case LFUN_FILE_INSERT_ASCII_PARA:
+               InsertAsciiFile(bv_, argument, true);
+               break;
+
+       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). */    
+               LyXTextClassList::ClassList::size_type tclass =
+                       buffer_->params.textclass;
+               pair <bool, LyXTextClass::size_type> layout = 
+                       textclasslist.NumberOfLayout(tclass, argument);
+
+               // If the entry is obsolete, use the new one instead.
+               if (layout.first) {
+                       string obs = textclasslist.Style(tclass,layout.second)
+                               .obsoleted_by();
+                       if (!obs.empty()) 
+                               layout = 
+                                       textclasslist.NumberOfLayout(tclass, obs);
+               }
+
+               // see if we found the layout number:
+               if (!layout.first) {
+                       owner_->getLyXFunc()->setErrorMessage(
+                               string(N_("Layout ")) + argument +
+                               N_(" not known"));
+                       break;
+               }
+
+               if (current_layout != layout.second) {
+                       LyXText * lt = bv_->getLyXText();
+                       hideCursor();
+                       current_layout = layout.second;
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR);
+                       lt->setLayout(bv_, layout.second);
+                       owner_->setLayout(layout.second);
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+                       setState();
+               }
+       }
+       break;
+
+       case LFUN_LANGUAGE:
+               Lang(bv_, argument);
+               setState();
+               owner_->showState();
+               break;
+
+       case LFUN_EMPH:
+               Emph(bv_);
+               owner_->showState();
+               break;
+
+       case LFUN_BOLD:
+               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);
+               lt->changeCase(bv_, LyXText::text_uppercase);
+               if (lt->inset_owner)
+                       updateInset(lt->inset_owner, true);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | 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)
+                       updateInset(lt->inset_owner, true);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | 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)
+                       updateInset(lt->inset_owner, true);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+       }
+       break;
+
+       case LFUN_TRANSPOSE_CHARS:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->transposeChars(*bv_);
+               if (lt->inset_owner)
+                       updateInset(lt->inset_owner, true);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+       }
+       break;
+               
+                                         
+       case LFUN_INSERT_LABEL:
+               MenuInsertLabel(bv_, argument);
+               break;
+               
+       case LFUN_REF_INSERT:
+               if (argument.empty()) {
+                       InsetCommandParams p("ref");
+                       owner_->getDialogs()->createRef(p.getAsString());
+               } else {
+                       InsetCommandParams p;
+                       p.setFromString(argument);
+
+                       InsetRef * inset = new InsetRef(p, *buffer_);
+                       if (!insertInset(inset))
+                               delete inset;
+                       else
+                               updateInset(inset, true);
+               }
+               break;
+
+       case LFUN_BOOKMARK_SAVE:
+               savePosition(strToUnsignedInt(argument));
+               break;
+
+       case LFUN_BOOKMARK_GOTO:
+               restorePosition(strToUnsignedInt(argument));
+               break;
+
+       case LFUN_REF_GOTO:
+       {
+               string label(argument);
+               if (label.empty()) {
+                       InsetRef * inset = 
+                               static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
+                       if (inset) {
+                                label = inset->getContents();
+                               savePosition(0);
+                       }
+               }
+               
+               if (!label.empty()) {
+                       //bv_->savePosition(0);
+                       if (!bv_->gotoLabel(label))
+                               WriteAlert(_("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);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               if (is_rtl)
+                       lt->cursorLeft(bv_, false);
+               if (lt->cursor.pos() < lt->cursor.par()->size()
+                   && lt->cursor.par()->getChar(lt->cursor.pos())
+                   == Paragraph::META_INSET
+                   && lt->cursor.par()->getInset(lt->cursor.pos())
+                   && lt->cursor.par()->getInset(lt->cursor.pos())->editable() == Inset::HIGHLY_EDITABLE){
+                       Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
+                       owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
+                       if (is_rtl)
+                               tmpinset->edit(bv_, false);
+                       else
+                               tmpinset->edit(bv_);
+                       break;
+               }
+               if (!is_rtl)
+                       lt->cursorRight(bv_, false);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_LEFT:
+       {
+               // This is soooo ugly. Isn`t it possible to make
+               // it simpler? (Lgb)
+               LyXText * lt = bv_->getLyXText();
+               bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               LyXCursor const cur = lt->cursor;
+               if (!is_rtl)
+                       lt->cursorLeft(bv_, false);
+               if ((is_rtl || cur != lt->cursor) && // only if really moved!
+                   lt->cursor.pos() < lt->cursor.par()->size() &&
+                   (lt->cursor.par()->getChar(lt->cursor.pos()) ==
+                    Paragraph::META_INSET) &&
+                   lt->cursor.par()->getInset(lt->cursor.pos()) &&
+                   (lt->cursor.par()->getInset(lt->cursor.pos())->editable()
+                    == Inset::HIGHLY_EDITABLE))
+               {
+                       Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
+                       owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
+                       if (is_rtl)
+                               tmpinset->edit(bv_);
+                       else
+                               tmpinset->edit(bv_, false);
+                       break;
+               }
+               if  (is_rtl)
+                       lt->cursorRight(bv_, false);
+
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_UP:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::UPDATE);
+               lt->cursorUp(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_DOWN:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::UPDATE);
+               lt->cursorDown(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+
+       case LFUN_UP_PARAGRAPH:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::UPDATE);
+               lt->cursorUpParagraph(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_DOWN_PARAGRAPH:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::UPDATE);
+               lt->cursorDownParagraph(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               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);
+               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);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_HOME:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorHome(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_END:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorEnd(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_SHIFT_TAB:
+       case LFUN_TAB:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorTab(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_WORDRIGHT:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+                       lt->cursorLeftOneWord(bv_);
+               else
+                       lt->cursorRightOneWord(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_WORDLEFT:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+                       lt->cursorRightOneWord(bv_);
+               else
+                       lt->cursorLeftOneWord(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_BEGINNINGBUF:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorTop(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_ENDBUF:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (!lt->selection.mark())
+                       beforeChange(lt);
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorBottom(bv_);
+               finishUndo();
+               moveCursorUpdate(false);
+               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))
+                       lt->cursorLeft(bv_);
+               else
+                       lt->cursorRight(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_LEFTSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
+                       lt->cursorRight(bv_);
+               else
+                       lt->cursorLeft(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_UPSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorUp(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_DOWNSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorDown(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+
+       case LFUN_UP_PARAGRAPHSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorUpParagraph(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_DOWN_PARAGRAPHSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorDownParagraph(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_PRIORSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               cursorPrevious(lt);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_NEXTSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               cursorNext(lt);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_HOMESEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorHome(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_ENDSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorEnd(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               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_);
+               else
+                       lt->cursorRightOneWord(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               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_);
+               else
+                       lt->cursorLeftOneWord(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_BEGINNINGBUFSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (lt->inset_owner)
+                       break;
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorTop(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+               
+       case LFUN_ENDBUFSEL:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               if (lt->inset_owner)
+                       break;
+               update(lt,
+                      BufferView::SELECT|BufferView::FITCUR);
+               lt->cursorBottom(bv_);
+               finishUndo();
+               moveCursorUpdate(true);
+               owner_->showState();
+       }
+       break;
+
+               // --- text changing commands ------------------------
+       case LFUN_BREAKLINE:
+       {
+               LyXText * lt = bv_->getLyXText();
+
+               beforeChange(lt);
+               lt->insertChar(bv_, Paragraph::META_NEWLINE);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               moveCursorUpdate(false);
+       }
+       break;
+               
+       case LFUN_PROTECTEDSPACE:
+       {
+               LyXText * lt = bv_->getLyXText();
+
+               LyXLayout const & style = textclasslist
+                       .Style(buffer_->params.textclass,
+                              lt->cursor.par()->getLayout());
+
+               if (style.free_spacing) {
+                       lt->insertChar(bv_, ' ');
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+               } else {
+                       protectedBlank(lt);
+               }
+               moveCursorUpdate(false);
+       }
+       break;
+               
+       case LFUN_SETMARK:
+       {
+               LyXText * lt = bv_->getLyXText();
+
+               if (lt->selection.mark()) {
+                       beforeChange(lt);
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR);
+                       owner_->getLyXFunc()->setMessage(N_("Mark removed"));
+               } else {
+                       beforeChange(lt);
+                       lt->selection.mark(true);
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR);
+                       owner_->getLyXFunc()->setMessage(N_("Mark set"));
+               }
+               lt->selection.cursor = lt->cursor;
+       }
+       break;
+               
+       case LFUN_DELETE:
+       {
+               LyXText * lt = bv_->getLyXText();
+
+               if (!lt->selection.set()) {
+                       lt->Delete(bv_);
+                       lt->selection.cursor = lt->cursor;
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+                       // It is possible to make it a lot faster still
+                       // just comment out the line below...
+                       showCursor();
+               } else {
+                       bv_->cut();
+               }
+               moveCursorUpdate(false);
+               owner_->showState();
+               setState();
+       }
+       break;
+
+       case LFUN_DELETE_SKIP:
+       {
+               LyXText * lt = bv_->getLyXText();
+
+               // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+               
+               LyXCursor cursor = lt->cursor;
+
+               if (!lt->selection.set()) {
+                       if (cursor.pos() == cursor.par()->size()) {
+                               lt->cursorRight(bv_);
+                               cursor = lt->cursor;
+                               if (cursor.pos() == 0
+                                   && !(cursor.par()->params().spaceTop()
+                                        == VSpace (VSpace::NONE))) {
+                                       lt->setParagraph
+                                               (bv_,
+                                                cursor.par()->params().lineTop(),
+                                                cursor.par()->params().lineBottom(),
+                                                cursor.par()->params().pagebreakTop(), 
+                                                cursor.par()->params().pagebreakBottom(),
+                                                VSpace(VSpace::NONE), 
+                                                cursor.par()->params().spaceBottom(),
+                                                cursor.par()->params().align(), 
+                                                cursor.par()->params().labelWidthString(), 0);
+                                       lt->cursorLeft(bv_);
+                                       update(lt, 
+                                              BufferView::SELECT
+                                              | BufferView::FITCUR
+                                              | BufferView::CHANGE);
+                               } else {
+                                       lt->cursorLeft(bv_);
+                                       lt->Delete(bv_);
+                                       lt->selection.cursor = lt->cursor;
+                                       update(lt,
+                                              BufferView::SELECT
+                                              | BufferView::FITCUR
+                                              | BufferView::CHANGE);
+                               }
+                       } else {
+                               lt->Delete(bv_);
+                               lt->selection.cursor = lt->cursor;
+                               update(lt,
+                                      BufferView::SELECT
+                                      | BufferView::FITCUR
+                                      | BufferView::CHANGE);
+                       }
+               } else {
+                       bv_->cut();
+               }
+       }
+       break;
+
+       /* -------> Delete word forward. */
+       case LFUN_DELETE_WORD_FORWARD:
+               update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
+               bv_->getLyXText()->deleteWordForward(bv_);
+               update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               moveCursorUpdate(false);
+               owner_->showState();
+               break;
+
+               /* -------> Delete word backward. */
+       case LFUN_DELETE_WORD_BACKWARD:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->deleteWordBackward(bv_);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               moveCursorUpdate(false);
+               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,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               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;
+               owner_->getLyXFunc()->setMessage(N_("Mark off"));
+       }
+       break;
+
+               /* -------> Set mark on. */
+       case LFUN_MARK_ON:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               beforeChange(lt);
+               lt->selection.mark(true);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->selection.cursor = lt->cursor;
+               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_);
+                               lt->selection.cursor = lt->cursor;
+                               update(lt,
+                                      BufferView::SELECT
+                                      | BufferView::FITCUR
+                                      | BufferView::CHANGE);
+                               // It is possible to make it a lot faster still
+                               // just comment out the line below...
+                               showCursor();
+                       }
+               } else {
+                       bv_->cut();
+               }
+               owner_->showState();
+               setState();
+       }
+       break;
+
+       case LFUN_BACKSPACE_SKIP:
+       {
+               // 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() 
+                                == VSpace (VSpace::NONE))) {
+                               lt->setParagraph 
+                                       (bv_,
+                                        cursor.par()->params().lineTop(),      
+                                        cursor.par()->params().lineBottom(),
+                                        cursor.par()->params().pagebreakTop(), 
+                                        cursor.par()->params().pagebreakBottom(),
+                                        VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(),
+                                        cursor.par()->params().align(), 
+                                        cursor.par()->params().labelWidthString(), 0);
+                               update(lt,
+                                      BufferView::SELECT
+                                      | BufferView::FITCUR
+                                      | BufferView::CHANGE);
+                       } else {
+                               lt->backspace(bv_);
+                               lt->selection.cursor = cursor;
+                               update(lt,
+                                      BufferView::SELECT
+                                      | BufferView::FITCUR
+                                      | BufferView::CHANGE);
+                       }
+               } else
+                       bv_->cut();
+       }
+       break;
+
+       case LFUN_BREAKPARAGRAPH:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               beforeChange(lt);
+               lt->breakParagraph(bv_, 0);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               lt->selection.cursor = lt->cursor;
+               setState();
+               owner_->showState();
+               break;
+       }
+
+       case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+       {
+               LyXText * lt = bv_->getLyXText();
+               
+               beforeChange(lt);
+               lt->breakParagraph(bv_, 1);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               lt->selection.cursor = lt->cursor;
+               setState();
+               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)) {
+                               lt->setParagraph
+                                       (bv_,
+                                        cursor.par()->params().lineTop(),      
+                                        cursor.par()->params().lineBottom(),
+                                        cursor.par()->params().pagebreakTop(), 
+                                        cursor.par()->params().pagebreakBottom(),
+                                        VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
+                                        cursor.par()->params().align(), 
+                                        cursor.par()->params().labelWidthString(), 1);
+                               //update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       } 
+               }
+               else {
+                       lt->breakParagraph(bv_, 0);
+                       //update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               }
+
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+               lt->selection.cursor = cursor;
+               setState();
+               owner_->showState();
+       }
+       break;
+
+       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;
+               istr >> tmp;
+               Spacing::Space new_spacing = cur_spacing;
+               float new_value = cur_value;
+               if (tmp.empty()) {
+                       lyxerr << "Missing argument to `paragraph-spacing'"
+                              << endl;
+               } else if (tmp == "single") {
+                       new_spacing = Spacing::Single;
+               } else if (tmp == "onehalf") {
+                       new_spacing = Spacing::Onehalf;
+               } else if (tmp == "double") {
+                       new_spacing = Spacing::Double;
+               } else if (tmp == "other") {
+                       new_spacing = Spacing::Other;
+                       float tmpval = 0.0;
+                       istr >> tmpval;
+                       lyxerr << "new_value = " << tmpval << endl;
+                       if (tmpval != 0.0)
+                               new_value = tmpval;
+               } else if (tmp == "default") {
+                       new_spacing = Spacing::Default;
+               } else {
+                       lyxerr << _("Unknown spacing argument: ")
+                              << argument << endl;
+               }
+               if (cur_spacing != new_spacing || cur_value != new_value) {
+                       par->params().spacing(Spacing(new_spacing, new_value));
+                       lt->redoParagraph(bv_);
+                       update(lt,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+               }
+       }
+       break;
+       
+       case LFUN_INSET_TOGGLE:
+       {
+               LyXText * lt = bv_->getLyXText();
+               hideCursor();
+               beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->toggleInset(bv_);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               setState();
+       }       
+               break;
+
+       case LFUN_QUOTE:
+               smartQuote();
+               break;
+
+       case LFUN_HTMLURL:
+       case LFUN_URL:
+       {
+               InsetCommandParams p;
+               if (action == LFUN_HTMLURL)
+                       p.setCmdName("htmlurl");
+               else
+                       p.setCmdName("url");
+               owner_->getDialogs()->createUrl(p.getAsString());
+       }
+       break;
+       
+       case LFUN_INSERT_URL:
+       {
+               InsetCommandParams p;
+               p.setFromString(argument);
+
+               InsetUrl * inset = new InsetUrl(p);
+               if (!insertInset(inset))
+                       delete inset;
+               else
+                       updateInset(inset, true);
+       }
+       break;
+       
+       case LFUN_INSET_TEXT:
+               insertAndEditInset(new InsetText);
+               break;
+       
+       case LFUN_INSET_ERT:
+               insertAndEditInset(new InsetERT);
+               break;
+       
+       case LFUN_INSET_EXTERNAL:
+               insertAndEditInset(new InsetExternal);
+               break;
+       
+       case LFUN_INSET_FOOTNOTE:
+               insertAndEditInset(new InsetFoot);
+               break;
+
+       case LFUN_INSET_MARGINAL:
+               insertAndEditInset(new InsetMarginal);
+               break;
+
+       case LFUN_INSET_MINIPAGE:
+               insertAndEditInset(new InsetMinipage);
+               break;
+
+       case LFUN_INSERT_NOTE:
+               insertAndEditInset(new InsetNote);
+               break;
+
+       case LFUN_INSET_FLOAT:
+               // check if the float type exist
+               if (floatList.typeExist(argument)) {
+                       insertAndEditInset(new InsetFloat(argument));
+               } else {
+                       lyxerr << "Non-existant float type: "
+                              << argument << endl;
+               }
+               break;
+
+       case LFUN_INSET_WIDE_FLOAT:
+       {
+               // check if the float type exist
+               if (floatList.typeExist(argument)) {
+                       InsetFloat * new_inset = new InsetFloat(argument);
+                       new_inset->wide(true);
+                       if (insertInset(new_inset))
+                               new_inset->edit(bv_);
+                       else
+                               delete new_inset;
+               } else {
+                       lyxerr << "Non-existant float type: "
+                              << argument << endl;
+               }
+               
+       }
+       break;
+
+#if 0
+       case LFUN_INSET_LIST:
+               insertAndEditInset(new InsetList);
+               break;
+
+       case LFUN_INSET_THEOREM:
+               insertAndEditInset(new InsetTheorem);
+               break;
+#endif
+               
+       case LFUN_INSET_CAPTION:
+       {
+               // Do we have a locking inset...
+               if (bv_->theLockingInset()) {
+                       lyxerr << "Locking inset code: "
+                              << static_cast<int>(bv_->theLockingInset()->lyxCode());
+                       InsetCaption * new_inset = new InsetCaption;
+                       new_inset->setOwner(bv_->theLockingInset());
+                       new_inset->setAutoBreakRows(true);
+                       new_inset->setDrawFrame(0, InsetText::LOCKED);
+                       new_inset->setFrameColor(0, LColor::captionframe);
+                       if (insertInset(new_inset))
+                               new_inset->edit(bv_);
+                       else
+                               delete new_inset;
+               }
+       }
+       break;
+       
+       case LFUN_INSET_TABULAR:
+       {
+               int r = 2;
+               int c = 2;
+               if (!argument.empty())
+                       ::sscanf(argument.c_str(),"%d%d", &r, &c);
+               InsetTabular * new_inset =
+                       new InsetTabular(*buffer_, r, c);
+               bool const rtl =
+                       bv_->getLyXText()->real_current_font.isRightToLeft();
+               if (!open_new_inset(new_inset, rtl))
+                       delete new_inset;
+       }
+       break;
+
+       // --- lyxserver commands ----------------------------
+
+       case LFUN_CHARATCURSOR:
+       {
+               Paragraph::size_type pos = bv_->getLyXText()->cursor.pos();
+               if (pos < bv_->getLyXText()->cursor.par()->size())
+                       owner_->getLyXFunc()->setMessage(
+                               tostr(bv_->getLyXText()->cursor.par()->getChar(pos)));
+               else
+                       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;
+               int y = 0;
+               if (::sscanf(argument.c_str(), " %d %d", &x, &y) != 2) {
+                       lyxerr << "SETXY: Could not parse coordinates in '"
+                              << argument << std::endl;
+               }
+               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)
+                       owner_->getLyXFunc()->setMessage("E");
+                else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
+                       owner_->getLyXFunc()->setMessage("N");
+                else
+                       owner_->getLyXFunc()->setMessage("0");
+
+       }
+       break;
+
+       case LFUN_GETLATEX:
+       {
+#ifndef NO_LATEX
+               LyXFont & font = bv_->getLyXText()->current_font;
+                if (font.latex() == LyXFont::ON)
+                       owner_->getLyXFunc()->setMessage("L");
+                else
+#endif
+                       owner_->getLyXFunc()->setMessage("0");
+       }
+       break;
+
+       // --- accented characters ---------------------------
+               
+       case LFUN_UMLAUT:
+       case LFUN_CIRCUMFLEX:
+       case LFUN_GRAVE:
+       case LFUN_ACUTE:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_MACRON:
+       case LFUN_DOT:
+       case LFUN_UNDERDOT:
+       case LFUN_UNDERBAR:
+       case LFUN_CARON:
+       case LFUN_SPECIAL_CARON:
+       case LFUN_BREVE:
+       case LFUN_TIE:
+       case LFUN_HUNG_UMLAUT:
+       case LFUN_CIRCLE:
+       case LFUN_OGONEK:
+               if (argument.empty()) {
+                       // As always...
+                       owner_->getLyXFunc()->handleKeyFunc(action);
+               } else {
+                       owner_->getLyXFunc()->handleKeyFunc(action);
+                       owner_->getIntl()->getTrans()
+                               .TranslateAndInsert(argument[0], bv_->getLyXText());
+                       update(bv_->getLyXText(),
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+               }
+               break;
+       
+       case LFUN_MATH_MACRO:
+               mathDispatchMathMacro(bv_, argument);
+               break;
+
+       case LFUN_MATH_DELIM:     
+               mathDispatchMathDelim(bv_, argument);
+               break;
+
+       case LFUN_INSERT_MATRIX:
+               mathDispatchInsertMatrix(bv_, argument);
+               break;
+
+       case LFUN_INSERT_MATH:
+               mathDispatchInsertMath(bv_, argument);
+               break;
+
+       case LFUN_MATH_IMPORT_SELECTION: // Imports LaTeX from the X selection
+               mathDispatchMathImportSelection(bv_, argument);
+               break;
+
+       case LFUN_MATH_DISPLAY:          // Open or create a displayed math inset
+               mathDispatchMathDisplay(bv_, argument);
+               break;
+
+       case LFUN_MATH_MODE:             // Open or create an inlined math inset 
+               mathDispatchMathMode(bv_, argument);
+               break;
+               
+       case LFUN_CITATION_INSERT:
+       {
+               InsetCommandParams p;
+               p.setFromString( argument );
+
+               InsetCitation * inset = new InsetCitation( p );
+               if (!insertInset(inset))
+                       delete inset;
+               else
+                       updateInset( inset, true );
+       }
+       break;
+                   
+       case LFUN_INSERT_BIBTEX:
+       {   
+               // ale970405+lasgoutt970425
+               // 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 bibstyle = token(argument, ' ', 1);
+               if (bibstyle.empty())
+                       bibstyle = "plain";
+
+               InsetCommandParams p( "BibTeX", db, bibstyle );
+               InsetBibtex * inset = new InsetBibtex(p);
+               
+               if (insertInset(inset)) {
+                       if (argument.empty())
+                               inset->edit(bv_);
+               } else
+                       delete inset;
+       }
+       break;
+               
+       // BibTeX data bases
+       case LFUN_BIBDB_ADD:
+       {
+               InsetBibtex * inset = 
+                       static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
+               if (inset) {
+                       inset->addDatabase(argument);
+               }
+       }
+       break;
+                   
+       case LFUN_BIBDB_DEL:
+       {
+               InsetBibtex * inset = 
+                       static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
+               if (inset) {
+                       inset->delDatabase(argument);
+               }
+       }
+       break;
+       
+       case LFUN_BIBTEX_STYLE:
+       {
+               InsetBibtex * inset = 
+                       static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
+               if (inset) {
+                       inset->setOptions(argument);
+               }
+       }
+       break;
+               
+       case LFUN_INDEX_CREATE:
+       {
+               InsetCommandParams p("index");
+               LyXText * lt = bv_->getLyXText();
+               
+               if (argument.empty()) {
+                       string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+                       if (!idxstring.empty()) 
+                               p.setContents(idxstring);
+                       else
+                               break;
+               } else {
+                       p.setContents(argument);
+               }
+
+               owner_->getDialogs()->createIndex(p.getAsString());
+       }
+       break;
+                   
+       case LFUN_INDEX_INSERT:
+       {
+               InsetCommandParams p;
+               p.setFromString(argument);
+               InsetIndex * inset = new InsetIndex(p);
+
+               if (!insertInset(inset))
+                       delete inset;
+               else
+                       updateInset(inset, true);
+       }
+       break;
+                   
+       case LFUN_INDEX_INSERT_LAST:
+       {
+               string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+               if (!idxstring.empty()) {
+                       owner_->message(_("Word `")
+                                       + idxstring + _(("' indexed.")));
+                       InsetCommandParams p("index", idxstring);
+                       InsetIndex * inset = new InsetIndex(p);
+                       
+                       if (!insertInset(inset))
+                               delete inset;
+                       else
+                               updateInset(inset, true);
+               }
+       }
+       break;
+
+       case LFUN_INDEX_PRINT:
+       {
+               InsetCommandParams p("printindex");
+               Inset * inset = new InsetPrintIndex(p);
+               if (!insertInset(inset, "Standard"))
+                       delete inset;
+       }
+       break;
+
+       case LFUN_PARENTINSERT:
+       {
+               lyxerr << "arg " << argument << endl;
+               InsetCommandParams p( "lyxparent", argument );
+               Inset * inset = new InsetParent(p, *buffer_);
+               if (!insertInset(inset, "Standard"))
+                       delete inset;
+       }
+                
+       break;
+
+       case LFUN_CHILD_INSERT:
+       {
+               InsetInclude::Params p;
+               p.cparams.setFromString(argument);
+               p.masterFilename_ = buffer_->fileName();
+
+               InsetInclude * inset = new InsetInclude(p);
+               if (!insertInset(inset))
+                       delete inset;
+               else {
+                       updateInset(inset, true);
+                       bv_->owner()->getDialogs()->showInclude(inset);
+               }
+       }
+       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;
+       
+       case LFUN_THESAURUS_ENTRY:
+       {
+               string arg = argument;
+
+               if (arg.empty()) {
+                       arg = bv_->getLyXText()->selectionAsString(buffer_);
+                       // FIXME
+                       if (arg.size() > 100 || arg.empty()) {
+                               // Get word or selection
+                               bv_->getLyXText()->selectWordWhenUnderCursor(bv_, LyXText::WHOLE_WORD);
+                               arg = bv_->getLyXText()->selectionAsString(buffer_);
+                               // FIXME: where is getLyXText()->unselect(bv_) ?
+                       }
+               }
+
+               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
+                * "auto_region_delete", which defaults to
+                * true (on). */
+
+               LyXText * lt = bv_->getLyXText();
+               
+               if (lyxrc.auto_region_delete) {
+                       if (lt->selection.set()) {
+                               lt->cutSelection(bv_, false);
+                               bv_->update(lt,
+                                           BufferView::SELECT
+                                           | BufferView::FITCUR
+                                           | BufferView::CHANGE);
+                       }
+               }
+               
+               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) {
+                       if (greek_kb_flag) {
+                               if (!math_insert_greek(bv_, *cit))
+                                       owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+                       } else
+                               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)
+                       owner_->showState();
+               //return string();
+       }
+       break;
+
+       case LFUN_DATE_INSERT:  // jdblair: date-insert cmd
+       {
+               time_t now_time_t = time(NULL);
+               struct tm * now_tm = localtime(&now_time_t);
+               setlocale(LC_TIME, "");
+               string arg;
+               if (!argument.empty())
+                       arg = argument;
+               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,
+                              BufferView::SELECT
+                              | BufferView::FITCUR
+                              | BufferView::CHANGE);
+               }
+
+               lt->selection.cursor = lt->cursor;
+               moveCursorUpdate(false);
+       }
+       break;
+
+       case LFUN_UNKNOWN_ACTION:
+               owner_->getLyXFunc()->setErrorMessage(N_("Unknown function!"));
+               break;
+       
+       default:
+               return false;
+       } // end of switch
+
+       return true;
+}
+
+
+void BufferView::Pimpl::newline()
+{
+       if (available()) {
+               LyXText * lt = bv_->getLyXText();
+               hideCursor();
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR);
+               lt->insertChar(bv_, Paragraph::META_NEWLINE);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+       }
+}
+
+
+void BufferView::Pimpl::hfill()
+{
+       if (available()) {
+               LyXText * lt = bv_->getLyXText();
+               hideCursor();
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR);
+               lt->insertChar(bv_, Paragraph::META_HFILL);
+               update(lt,
+                      BufferView::SELECT
+                      | BufferView::FITCUR
+                      | BufferView::CHANGE);
+       }
+}
+
+
+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 = 
+                       new InsetSpecialChar(kind);
+               insertInset(new_inset);
+       }
+}
+
+
+void BufferView::Pimpl::smartQuote()
+{
+       char c;
+       LyXText * lt = bv_->getLyXText();
+
+       if (lt->cursor.pos())
+               c = lt->cursor.par()->getChar(lt->cursor.pos() - 1);
+       else 
+               c = ' ';
+
+       hideCursor();
+       if (!insertInset(new InsetQuotes(c, bv_->buffer()->params)))
+               Dispatch(LFUN_SELFINSERT, "\"");
+}
+
+
+void BufferView::Pimpl::insertAndEditInset(Inset * inset)
+{
+       if (insertInset(inset))
+               inset->edit(bv_);
+       else
+               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)) {
+               delete new_inset;
+               return false;
+       }
+       new_inset->edit(bv_, !behind);
+       return true;
+}
+
+
+bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
+{
+       // if we are in a locking inset we should try to insert the
+       // inset there otherwise this is a illegal function now
+       if (bv_->theLockingInset()) {
+               if (bv_->theLockingInset()->insetAllowed(inset))
+                   return bv_->theLockingInset()->insertInset(bv_, inset);
+               return false;
+       }
+
+       // not quite sure if we want this...
+       setCursorParUndo(bv_);
+       freezeUndo();
+       
+       beforeChange(bv_->text);
+       if (!lout.empty()) {
+               update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+               bv_->text->breakParagraph(bv_);
+               update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+               if (bv_->text->cursor.par()->size()) {
+                       bv_->text->cursorLeft(bv_);
+                       
+                       bv_->text->breakParagraph(bv_);
+                       update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               }
+
+               pair<bool, LyXTextClass::size_type> lres =
+                       textclasslist.NumberOfLayout(buffer_->params
+                                                    .textclass, lout);
+               LyXTextClass::size_type lay;
+               if (lres.first != false) {
+                       // layout found
+                       lay = lres.second;
+               } else {
+                       // layout not fount using default "Standard" (0)
+                       lay = 0;
+               }
+                
+               bv_->text->setLayout(bv_, lay);
+               
+               bv_->text->setParagraph(bv_, 0, 0,
+                                  0, 0,
+                                  VSpace(VSpace::NONE), VSpace(VSpace::NONE),
+                                  LYX_ALIGN_LAYOUT, 
+                                  string(),
+                                  0);
+               update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+#ifndef NO_LATEX
+               bv_->text->current_font.setLatex(LyXFont::OFF);
+#endif
+       }
+       
+       bv_->text->insertInset(bv_, inset);
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+       unFreezeUndo();
+       return true;
+}
+
+
+void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
+{
+       if (!inset)
+               return;
+
+       // first check for locking insets
+       if (bv_->theLockingInset()) {
+               if (bv_->theLockingInset() == inset) {
+                       if (bv_->text->updateInset(bv_, inset)) {
+                               update();
+                               if (mark_dirty) {
+                                       buffer_->markDirty();
+                               }
+                               updateScrollbar();
+                               return;
+                       }
+               } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
+                       if (bv_->text->updateInset(bv_,
+                                                  bv_->theLockingInset())) {
+                               update();
+                               if (mark_dirty){
+                                       buffer_->markDirty();
+                               }
+                               updateScrollbar();
+                               return;
+                       }
+               }
+       }
+  
+       // then check the current buffer
+       if (available()) {
+               hideCursor();
+               update(bv_->text, BufferView::UPDATE);
+               if (bv_->text->updateInset(bv_, inset)) {
+                       if (mark_dirty) {
+                               update(bv_->text,
+                                      BufferView::SELECT
+                                      | BufferView::FITCUR
+                                      | BufferView::CHANGE);
+                       } else {
+                               update(bv_->text, SELECT);
+                       }
+                       return;
+               }
+       }
+}
+
+
+void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
+                                 bool same_content)
+{
+       if (!available()) return;
+       
+       hideCursor();
+       beforeChange(bv_->text);
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+       
+       string contents;
+       if (same_content &&
+           bv_->text->cursor.par()->getChar(bv_->text->cursor.pos()) == Paragraph::META_INSET) {
+               Inset const * inset = bv_->text->cursor.par()->getInset(bv_->text->cursor.pos());
+               if (find(codes.begin(), codes.end(), inset->lyxCode())
+                   != codes.end())
+                       contents =
+                               static_cast<InsetCommand const *>(inset)->getContents();
+       }
+       
+       if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+               if (bv_->text->cursor.pos() 
+                   || bv_->text->cursor.par() != bv_->text->firstParagraph()) {
+                       LyXCursor tmp = bv_->text->cursor;
+                       bv_->text->cursor.par(bv_->text->firstParagraph());
+                       bv_->text->cursor.pos(0);
+                       if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+                               bv_->text->cursor = tmp;
+                               bv_->owner()->message(_("No more insets"));
+                       }
+               } else {
+                       bv_->owner()->message(_("No more insets"));
+               }
+       }
+       update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+       bv_->text->selection.cursor = bv_->text->cursor;
+}
+
+
+void BufferView::Pimpl::gotoInset(Inset::Code code, bool same_content)
+{
+       gotoInset(vector<Inset::Code>(1, code), same_content);
 }