]> git.lyx.org Git - lyx.git/blobdiff - src/lyx_cb.C
Applied Angus patch to compile on DEC C++ and to avoid name clashes
[lyx.git] / src / lyx_cb.C
index dce423214f4f7431c808650683c1d44b5a359462..90331ad00c3f2ff44887231f5a03b1fa3fa2f90b 100644 (file)
 
 #include <fstream>
 #include <algorithm>
+#include <utility> 
 #include <iostream>
 
 #include FORMS_H_LOCATION
 #include "lyx.h"
-#include "layout_forms.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
 #include "insets/insetlabel.h"
 #include "insets/figinset.h"
-#include "lyxfunc.h"
 #include "minibuffer.h"
-#include "combox.h"
 #include "bufferlist.h"
-#include "filedlg.h"
+#include "frontends/FileDialog.h"
 #include "lyx_gui_misc.h"
 #include "LyXView.h"
 #include "lastfiles.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 
+using std::vector;
 using std::ifstream;
 using std::copy;
-using std::back_inserter;
 using std::endl;
-using std::cout;
 using std::ios;
+using std::back_inserter;
 using std::istream_iterator;
 using std::pair;
-using std::vector;
-using std::sort;
-using std::equal;
+using std::make_pair;
 
-extern Combox * combo_language;
-extern Combox * combo_language2;
 extern BufferList bufferlist;
-extern void show_symbols_form();
-extern FD_form_title * fd_form_title;
-extern FD_form_character * fd_form_character;
-extern FD_form_preamble * fd_form_preamble;
 extern FD_form_figure * fd_form_figure;
 
 extern BufferView * current_view; // called too many times in this file...
 
-extern void DeleteSimpleCutBuffer(); /* for the cleanup when exiting */
-
-#if 0
-extern bool send_fax(string const & fname, string const & sendcmd);
-#endif
-
-extern void MenuSendto();
-
 // this should be static, but I need it in buffer.C
 bool quitting; // flag, that we are quitting the program
 extern bool finished; // all cleanup done just let it run through now.
 
-char ascii_type; /* for selection notify callbacks */
-
-bool scrolling = false;
-
-// This is used to make the dreaded font toggle problem hopefully go
-// away. Definitely not the best solution, but I think it sorta works.
-bool toggleall = true;
-
 /* 
    This is the inset locking stuff needed for mathed --------------------
 
@@ -160,103 +134,107 @@ void ShowMessage(Buffer const * buf,
 //
 // File menu
 //
-
 // should be moved to lyxfunc.C
 bool MenuWrite(BufferView * bv, Buffer * buffer)
 {
+       // FIXME: needed ?
        XFlush(fl_get_display());
        if (!buffer->save()) {
                string const fname = buffer->fileName();
                string const s = MakeAbsPath(fname);
                if (AskQuestion(_("Save failed. Rename and try again?"),
                                MakeDisplayPath(s, 50),
                                _("(If not, document is not saved.)"))) {
-                       return MenuWriteAs(bv, buffer);
+                       return WriteAs(bv, buffer);
                }
                return false;
-       } else {
+       } else
                lastfiles->newFile(buffer->fileName());
-       }
        return true;
 }
 
 
+
 // should be moved to BufferView.C
 // Half of this func should be in LyXView, the rest in BufferView.
-bool MenuWriteAs(BufferView * bv, Buffer * buffer)
+bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 {
-       // Why do we require BufferView::text to be able to write a
-       // document? I see no point in that. (Lgb)
-       //if (!bv->text) return;
-
        string fname = buffer->fileName();
        string oldname = fname;
-       LyXFileDlg fileDlg;
 
-       ProhibitInput(bv);
-       fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-       fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
+       if (filename.empty()) {
 
-       if (!IsLyXFilename(fname))
-               fname += ".lyx";
+               FileDialog fileDlg(bv->owner(),
+                                  _("Choose a filename to save document as"),
+                       LFUN_WRITEAS,
+                       make_pair(string(_("Documents")),
+                                 string(lyxrc.document_path)),
+                       make_pair(string(_("Templates")),
+                                 string(lyxrc.template_path)));
 
-       fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
-                              OnlyPath(fname),
-                              "*.lyx", 
-                              OnlyFilename(fname));
+               if (!IsLyXFilename(fname))
+                       fname += ".lyx";
 
-       AllowInput(bv);
+               FileDialog::Result result =
+                       fileDlg.Select(OnlyPath(fname),
+                                      _("*.lyx|LyX Documents (*.lyx)"),
+                                      OnlyFilename(fname));
 
-       if (fname.empty())
-               return false;
+               if (result.first == FileDialog::Later)
+                       return false;
+
+               fname = result.second;
 
-       // Make sure the absolute filename ends with appropriate suffix
-       string s = MakeAbsPath(fname);
-       if (!IsLyXFilename(s))
-               s += ".lyx";
+               if (fname.empty())
+                       return false;
+
+               // Make sure the absolute filename ends with appropriate suffix
+               fname = MakeAbsPath(fname);
+               if (!IsLyXFilename(fname))
+                       fname += ".lyx";
+       } else
+               fname = filename;
 
        // Same name as we have already?
-       if (!buffer->isUnnamed() && s == oldname) {
+       if (!buffer->isUnnamed() && fname == oldname) {
                if (!AskQuestion(_("Same name as document already has:"),
-                                MakeDisplayPath(s, 50),
+                                MakeDisplayPath(fname, 50),
                                 _("Save anyway?")))
                        return false;
                // Falls through to name change and save
        } 
        // No, but do we have another file with this name open?
-       else if (!buffer->isUnnamed() && bufferlist.exists(s)) {
+       else if (!buffer->isUnnamed() && bufferlist.exists(fname)) {
                if (AskQuestion(_("Another document with same name open!"),
-                               MakeDisplayPath(s, 50),
+                               MakeDisplayPath(fname, 50),
                                _("Replace with current document?")))
                        {
-                               bufferlist.close(bufferlist.getBuffer(s));
+                               bufferlist.close(bufferlist.getBuffer(fname));
 
                                // Ok, change the name of the buffer, but don't save!
-                               buffer->setFileName(s);
+                               buffer->setFileName(fname);
                                buffer->markDirty();
 
                                ShowMessage(buffer, _("Document renamed to '"),
-                                               MakeDisplayPath(s), _("', but not saved..."));
-                       }
+                                               MakeDisplayPath(fname), _("', but not saved..."));
+               }
                return false;
        } // Check whether the file exists
        else {
-               FileInfo const myfile(s);
+               FileInfo const myfile(fname);
                if (myfile.isOK() && !AskQuestion(_("Document already exists:"), 
-                                                 MakeDisplayPath(s, 50),
+                                                 MakeDisplayPath(fname, 50),
                                                  _("Replace file?")))
                        return false;
        }
 
        // Ok, change the name of the buffer
-       buffer->setFileName(s);
+       buffer->setFileName(fname);
        buffer->markDirty();
        bool unnamed = buffer->isUnnamed();
        buffer->setUnnamed(false);
-       // And save
-       // Small bug: If the save fails, we have irreversible changed the name
-       // of the document.
-       // Hope this is fixed this way! (Jug)
+
        if (!MenuWrite(bv, buffer)) {
            buffer->setFileName(oldname);
            buffer->setUnnamed(unnamed);
@@ -301,40 +279,16 @@ int MenuRunChktex(Buffer * buffer)
 }
 
 
-#if 0
-void MenuFax(Buffer * buffer)
-{
-       // Generate postscript file
-       if (!Exporter::Export(buffer, "ps", true))
-               return;
-
-       // Send fax
-       string const ps = OnlyFilename(ChangeExtension(buffer->fileName(), 
-                                                      ".ps"));
-
-       string path = OnlyPath (buffer->fileName());
-       if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
-               path = buffer->tmppath;
-       }
-       Path p(path);
-       if (!lyxrc.fax_program.empty()) {
-                string help2 = subst(lyxrc.fax_program, "$$FName", ps);
-                help2 += " &";
-                Systemcalls one(Systemcalls::System, help2);
-       } else
-               send_fax(ps, lyxrc.fax_command);
-}
-#endif
-
-
 void QuitLyX()
 {
        lyxerr.debug() << "Running QuitLyX." << endl;
 
-       if (!bufferlist.QwriteAll())
-               return;
+       if (lyxrc.use_gui) {
+               if (!bufferlist.QwriteAll())
+                       return;
 
-       lastfiles->writeFile(lyxrc.lastfiles);
+               lastfiles->writeFile(lyxrc.lastfiles);
+       }
 
        // Set a flag that we do quitting from the program,
        // so no refreshes are necessary.
@@ -385,11 +339,11 @@ void AutoSave(BufferView * bv)
                // anyway.
                bool failed = false;
                
-               string const tmp_ret = lyx::tempName();
+               string const tmp_ret = lyx::tempName(string(), "lyxauto");
                if (!tmp_ret.empty()) {
                        bv->buffer()->writeFile(tmp_ret, 1);
                        // assume successful write of tmp_ret
-                       if (lyx::rename(tmp_ret, fname)) {
+                       if (!lyx::rename(tmp_ret, fname)) {
                                failed = true;
                                // most likely couldn't move between filesystems
                                // unless write of tmp_ret failed
@@ -456,17 +410,23 @@ Buffer * NewLyxFile(string const & filename)
 void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
        string fname = f;
-       LyXFileDlg fileDlg;
-       if (!bv->available()) return;
+
+       if (!bv->available()) 
+               return;
      
        if (fname.empty()) {
-               ProhibitInput(bv);
-               fname = fileDlg.Select(_("File to Insert"), 
-                                      bv->owner()->buffer()->filepath,
-                                      "*");
-               AllowInput(bv);
-               if (fname.empty()) return;
+               FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+                       (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
+               FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filepath);
+
+               if (result.first == FileDialog::Later)
+                       return;
+
+               fname = result.second;
+
+               if (fname.empty()) 
+                       return;
        }
 
        FileInfo fi(fname);
@@ -504,12 +464,12 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
        bv->hideCursor();
        
        // clear the selection
-       bv->beforeChange();
+       bv->beforeChange(bv->text);
        if (!asParagraph)
                bv->text->InsertStringA(bv, tmpstr);
        else
                bv->text->InsertStringB(bv, tmpstr);
-       bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 
 
@@ -518,8 +478,71 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
        string label(arg);
        ProhibitInput(bv);
        if (label.empty()) {
-               pair<bool, string>
-                       result = askForText(_("Enter new label to insert:"));
+#ifndef NEW_INSETS
+               LyXParagraph * par =
+                       bv->text->cursor.par()->FirstPhysicalPar();
+#else
+               LyXParagraph * par = bv->text->cursor.par();
+#endif
+               LyXLayout const * layout =
+                       &textclasslist.Style(bv->buffer()->params.textclass,
+                                            par->GetLayout());
+
+#ifndef NEW_INSETS
+               if (layout->latextype == LATEX_PARAGRAPH && par->previous_) {
+                       LyXParagraph * par2 = par->previous_->FirstPhysicalPar();
+#else
+               if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
+                       LyXParagraph * par2 = par->previous();
+#endif
+                       LyXLayout const * layout2 =
+                               &textclasslist.Style(bv->buffer()->params.textclass,
+                                                    par2->GetLayout());
+                       if (layout2->latextype != LATEX_PARAGRAPH) {
+                               par = par2;
+                               layout = layout2;
+                       }
+               }
+               string text = layout->latexname().substr(0, 3);
+               if (layout->latexname() == "theorem")
+                       text = "thm"; // Create a correct prefix for prettyref
+#ifndef NEW_INSETS
+               if (par->footnoteflag==LyXParagraph::OPEN_FOOTNOTE)
+                       switch (par->footnotekind) {
+                       case LyXParagraph::FIG:
+                       case LyXParagraph::WIDE_FIG:
+                               text = "fig";
+                               break;
+                       case LyXParagraph::TAB:
+                       case LyXParagraph::WIDE_TAB:
+                               text = "tab";
+                               break;
+                       case LyXParagraph::ALGORITHM:
+                               text = "alg";
+                               break;
+                       case LyXParagraph::FOOTNOTE:    
+                       case LyXParagraph::MARGIN:
+                               break;
+                       }
+#endif
+               text += ":";
+               if (layout->latextype == LATEX_PARAGRAPH ||
+                   lyxrc.label_init_length < 0)
+                       text.erase();
+               string par_text = par->String(bv->buffer(), false);
+               for (int i = 0; i < lyxrc.label_init_length; ++i) {
+                       if (par_text.empty())
+                               break;
+                       string head;
+                       par_text = split(par_text, head, ' ');
+                       if (i > 0)
+                               text += '-'; // Is it legal to use spaces in
+                                            // labels ?
+                       text += head;
+               }
+
+               pair<bool, string> result =
+                       askForText(_("Enter new label to insert:"), text);
                if (result.first) {
                        label = frontStrip(strip(result.second));
                }
@@ -533,88 +556,6 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
 }
 
 
-// This is _only_ used in Toolbar_pimpl.C, move it there and get rid of
-// current_view. (Lgb)
-void LayoutsCB(int sel, void *, Combox *)
-{
-       string const tmp = tostr(sel);
-       current_view->owner()->getLyXFunc()->Dispatch(LFUN_LAYOUTNO,
-                                                     tmp);
-}
-
-
-void MenuLayoutCharacter()
-{
-       static int ow = -1, oh;
-
-       if (fd_form_character->form_character->visible) {
-               fl_raise_form(fd_form_character->form_character);
-       } else {
-               fl_show_form(fd_form_character->form_character,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
-                            _("Character Style"));
-               if (ow < 0) {
-                       ow = fd_form_character->form_character->w;
-                       oh = fd_form_character->form_character->h;
-               }
-               fl_set_form_minsize(fd_form_character->form_character, ow, oh);
-       }
-}
-
-
-bool UpdateLayoutPreamble(BufferView * bv)
-{
-       bool update = true;
-       if (!bv->available())
-               update = false;
-
-       if (update) {
-               fl_set_input(fd_form_preamble->input_preamble,
-                            bv->buffer()->params.preamble.c_str());
-
-               if (bv->buffer()->isReadonly()) {
-                       fl_deactivate_object(fd_form_preamble->input_preamble);
-                       fl_deactivate_object(fd_form_preamble->button_ok);
-                       fl_deactivate_object(fd_form_preamble->button_apply);
-                       fl_set_object_lcol(fd_form_preamble->button_ok, FL_INACTIVE);
-                       fl_set_object_lcol(fd_form_preamble->button_apply, FL_INACTIVE);
-               } else {
-                       fl_activate_object(fd_form_preamble->input_preamble);
-                       fl_activate_object(fd_form_preamble->button_ok);
-                       fl_activate_object(fd_form_preamble->button_apply);
-                       fl_set_object_lcol(fd_form_preamble->button_ok, FL_BLACK);
-                       fl_set_object_lcol(fd_form_preamble->button_apply, FL_BLACK);
-               }
-       } else if (fd_form_preamble->form_preamble->visible) {
-               fl_hide_form(fd_form_preamble->form_preamble);
-       }
-       return update;
-}
-
-
-void MenuLayoutPreamble()
-{
-       static int ow = -1, oh;
-
-       if (UpdateLayoutPreamble(current_view)) {
-               if (fd_form_preamble->form_preamble->visible) {
-                       fl_raise_form(fd_form_preamble->form_preamble);
-               } else {
-                       fl_show_form(fd_form_preamble->form_preamble,
-                                    FL_PLACE_MOUSE | FL_FREE_SIZE,
-                                    FL_TRANSIENT,
-                                    _("LaTeX Preamble"));
-                       if (ow < 0) {
-                               ow = fd_form_preamble->form_preamble->w;
-                               oh = fd_form_preamble->form_preamble->h;
-                       }
-                       fl_set_form_minsize(fd_form_preamble->form_preamble,
-                                           ow, oh);
-               }
-       }
-}
-
-
 void MenuLayoutSave(BufferView * bv)
 {
        if (!bv->available())
@@ -627,178 +568,6 @@ void MenuLayoutSave(BufferView * bv)
 }
 
 
-// This is both GUI and LyXFont dependent. Don't know where to put it. (Asger)
-// Well, it's mostly GUI dependent, so I guess it will stay here. (Asger)
-LyXFont const UserFreeFont(BufferParams const & params)
-{
-       LyXFont font(LyXFont::ALL_IGNORE);
-
-       int pos = fl_get_choice(fd_form_character->choice_family);
-       switch (pos) {
-       case 1: font.setFamily(LyXFont::IGNORE_FAMILY); break;
-       case 2: font.setFamily(LyXFont::ROMAN_FAMILY); break;
-       case 3: font.setFamily(LyXFont::SANS_FAMILY); break;
-       case 4: font.setFamily(LyXFont::TYPEWRITER_FAMILY); break;
-       case 5: font.setFamily(LyXFont::INHERIT_FAMILY); break;
-       }
-
-       pos = fl_get_choice(fd_form_character->choice_series);
-       switch (pos) {
-       case 1: font.setSeries(LyXFont::IGNORE_SERIES); break;
-       case 2: font.setSeries(LyXFont::MEDIUM_SERIES); break;
-       case 3: font.setSeries(LyXFont::BOLD_SERIES); break;
-       case 4: font.setSeries(LyXFont::INHERIT_SERIES); break;
-       }
-
-       pos = fl_get_choice(fd_form_character->choice_shape);
-       switch (pos) {
-       case 1: font.setShape(LyXFont::IGNORE_SHAPE); break;
-       case 2: font.setShape(LyXFont::UP_SHAPE); break;
-       case 3: font.setShape(LyXFont::ITALIC_SHAPE); break;
-       case 4: font.setShape(LyXFont::SLANTED_SHAPE); break;
-       case 5: font.setShape(LyXFont::SMALLCAPS_SHAPE); break;
-       case 6: font.setShape(LyXFont::INHERIT_SHAPE); break;
-       }
-
-       pos = fl_get_choice(fd_form_character->choice_size);
-       switch (pos) {
-       case 1: font.setSize(LyXFont::IGNORE_SIZE); break;
-       case 2: font.setSize(LyXFont::SIZE_TINY); break;
-       case 3: font.setSize(LyXFont::SIZE_SCRIPT); break;
-       case 4: font.setSize(LyXFont::SIZE_FOOTNOTE); break;
-       case 5: font.setSize(LyXFont::SIZE_SMALL); break;
-       case 6: font.setSize(LyXFont::SIZE_NORMAL); break;
-       case 7: font.setSize(LyXFont::SIZE_LARGE); break;
-       case 8: font.setSize(LyXFont::SIZE_LARGER); break;
-       case 9: font.setSize(LyXFont::SIZE_LARGEST); break;
-       case 10: font.setSize(LyXFont::SIZE_HUGE); break;
-       case 11: font.setSize(LyXFont::SIZE_HUGER); break;
-       case 12: font.setSize(LyXFont::INCREASE_SIZE); break;
-       case 13: font.setSize(LyXFont::DECREASE_SIZE); break;
-       case 14: font.setSize(LyXFont::INHERIT_SIZE); break;
-       }
-
-       pos = fl_get_choice(fd_form_character->choice_bar);
-       switch (pos) {
-       case 1: font.setEmph(LyXFont::IGNORE);
-               font.setUnderbar(LyXFont::IGNORE);
-               font.setNoun(LyXFont::IGNORE);
-               font.setLatex(LyXFont::IGNORE);
-               break;
-       case 2: font.setEmph(LyXFont::TOGGLE); break;
-       case 3: font.setUnderbar(LyXFont::TOGGLE); break;
-       case 4: font.setNoun(LyXFont::TOGGLE); break;
-       case 5: font.setLatex(LyXFont::TOGGLE); break;
-       case 6: font.setEmph(LyXFont::INHERIT);
-               font.setUnderbar(LyXFont::INHERIT);
-               font.setNoun(LyXFont::INHERIT);
-               font.setLatex(LyXFont::INHERIT);
-               break;
-       }
-
-       pos = fl_get_choice(fd_form_character->choice_color);
-       switch (pos) {
-       case 1: font.setColor(LColor::ignore); break;
-       case 2: font.setColor(LColor::none); break;
-       case 3: font.setColor(LColor::black); break;
-       case 4: font.setColor(LColor::white); break;
-       case 5: font.setColor(LColor::red); break;
-       case 6: font.setColor(LColor::green); break;
-       case 7: font.setColor(LColor::blue); break;
-       case 8: font.setColor(LColor::cyan); break;
-       case 9: font.setColor(LColor::magenta); break;
-       case 10: font.setColor(LColor::yellow); break;
-       case 11: font.setColor(LColor::inherit); break;
-       }
-
-       int const choice = combo_language2->get();
-       if (choice == 1)
-               font.setLanguage(ignore_language);
-       else if (choice == 2)
-               font.setLanguage(params.language);
-       else
-               font.setLanguage(languages.getLanguage(combo_language2->getline()));
-
-       return font; 
-}
-
-
-/* callbacks for form form_title */
-extern "C"
-void TimerCB(FL_OBJECT *, long)
-{
-       // only if the form still exists
-       if (lyxrc.show_banner
-           && fd_form_title
-           && fd_form_title->form_title) {
-               if (fd_form_title->form_title->visible) {
-                       fl_hide_form(fd_form_title->form_title);
-               }
-               fl_free_form(fd_form_title->form_title);
-               fd_form_title->form_title = 0;
-       }
-}
-
-
-/* callbacks for form form_character */
-
-extern "C"
-void CharacterApplyCB(FL_OBJECT *, long)
-{
-       // we set toggleall locally here, since it should be true for
-       // all other uses of ToggleAndShow() (JMarc)
-       toggleall = fl_get_button(fd_form_character->check_toggle_all);
-       ToggleAndShow(current_view, UserFreeFont(current_view->buffer()->params));
-       current_view->setState();
-       toggleall = true;
-}
-
-
-extern "C"
-void CharacterCloseCB(FL_OBJECT *, long)
-{
-       fl_hide_form(fd_form_character->form_character);
-}
-
-
-extern "C"
-void CharacterOKCB(FL_OBJECT * ob, long data)
-{
-       CharacterApplyCB(ob, data);
-       CharacterCloseCB(ob, data);
-}
-
-
-/* callbacks for form form_preamble */
-
-extern "C"
-void PreambleCancelCB(FL_OBJECT *, long)
-{
-       fl_hide_form(fd_form_preamble->form_preamble);
-}
-
-
-extern "C"
-void PreambleApplyCB(FL_OBJECT *, long)
-{
-       if (!current_view->available())
-               return;
-       
-       current_view->buffer()->params.preamble = 
-               fl_get_input(fd_form_preamble->input_preamble);
-       current_view->buffer()->markDirty();
-       current_view->owner()->getMiniBuffer()->Set(_("LaTeX preamble set"));
-}
-
-   
-extern "C"
-void PreambleOKCB(FL_OBJECT * ob, long data)
-{
-       PreambleApplyCB(ob, data);
-       PreambleCancelCB(ob, data);
-}
-
-
 void Figure()
 {
        if (fd_form_figure->form_figure->visible) {
@@ -832,20 +601,24 @@ void FigureApplyCB(FL_OBJECT *, long)
        }
        
        current_view->hideCursor();
-       current_view->update(BufferView::SELECT|BufferView::FITCUR);
-       current_view->beforeChange();
+       current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
+       current_view->beforeChange(current_view->text);
       
        current_view->text->SetCursorParUndo(current_view->buffer()); 
        current_view->text->FreezeUndo();
 
        current_view->text->BreakParagraph(current_view);
-       current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-      
+       current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+#ifndef NEW_INSETS
        if (current_view->text->cursor.par()->Last()) {
+#else
+       if (current_view->text->cursor.par()->size()) {
+#endif
                current_view->text->CursorLeft(current_view);
         
                current_view->text->BreakParagraph(current_view);
-               current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
        }
 
        // The standard layout should always be numer 0;
@@ -876,25 +649,27 @@ void FigureApplyCB(FL_OBJECT *, long)
        }
 #endif
        
-       current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
       
        Inset * new_inset = new InsetFig(100, 100, *buffer);
        current_view->insertInset(new_inset);
        new_inset->Edit(current_view, 0, 0, 0);
-       current_view->update(BufferView::SELECT|BufferView::FITCUR);
+       current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
        current_view->owner()->getMiniBuffer()->Set(_("Figure inserted"));
        current_view->text->UnFreezeUndo();
        current_view->setState();
 }
 
 
-extern "C" void FigureCancelCB(FL_OBJECT *, long)
+extern "C"
+void FigureCancelCB(FL_OBJECT *, long)
 {
        fl_hide_form(fd_form_figure->form_figure);
 }
 
 
-extern "C" void FigureOKCB(FL_OBJECT * ob, long data)
+extern "C"
+void FigureOKCB(FL_OBJECT * ob, long data)
 {
        FigureApplyCB(ob, data);
        FigureCancelCB(ob, data);