Point fix, earlier forgotten

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 63e7aa4a9b24f43dad330ea68bbb9d49efe1d943..2699d8156d53ec4972fc5199c9a311ed760310de 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1,18 +1,23 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyx_cb.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- *         Copyright 1995 Matthias Ettrich,
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
 #include "debug.h"
@@ -34,6 +39,7 @@
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/path.h"
+#include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
@@ -42,6 +48,8 @@
 #include <utility>
 #include <cerrno>
 
+using namespace lyx::support;
+
 using std::vector;
 using std::ifstream;
 using std::copy;
@@ -57,25 +65,11 @@ extern BufferList bufferlist;
 bool quitting; // flag, that we are quitting the program
 
 
-void ShowMessage(Buffer const * buf,
-                string const & msg1,
-                string const & msg2,
-                string const & msg3)
-{
-       if (lyx_gui::use_gui
-           && buf && buf->getUser() && buf->getUser()->owner()) {
-                       string const str = msg1 + ' ' + msg2 + ' ' + msg3;
-                       buf->getUser()->owner()->message(str);
-       } else
-               lyxerr << msg1 << msg2 << msg3 << endl;
-}
-
-
 //
 // Menu callbacks
 //
 
-bool MenuWrite(BufferView * bv, Buffer * buffer)
+bool MenuWrite(Buffer * buffer)
 {
        if (buffer->save()) {
                lastfiles->newFile(buffer->fileName());
@@ -92,13 +86,13 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
                text, 0, 1, _("&Rename"), _("&Cancel"));
 
        if (ret == 0)
-               return WriteAs(bv, buffer);
+               return WriteAs(buffer);
        return false;
 }
 
 
 
-bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
+bool WriteAs(Buffer * buffer, string const & filename)
 {
        string fname = buffer->fileName();
        string const oldname = fname;
@@ -153,7 +147,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
        bool unnamed = buffer->isUnnamed();
        buffer->setUnnamed(false);
 
-       if (!MenuWrite(bv, buffer)) {
+       if (!MenuWrite(buffer)) {
                buffer->setFileName(oldname);
                buffer->setUnnamed(unnamed);
                return false;
@@ -183,11 +177,11 @@ void QuitLyX()
        bufferlist.closeAll();
 
        // do any other cleanup procedures now
-       lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
+       lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl;
 
-       if (destroyDir(system_tempdir) != 0) {
+       if (destroyDir(os::getTmpDir()) != 0) {
                string msg = bformat(_("Could not remove the temporary directory %1$s"),
-                       system_tempdir);
+                       os::getTmpDir());
                Alert::warning(_("Could not remove temporary directory"), msg);
        }
 
@@ -237,16 +231,16 @@ int AutoSaveBuffer::generateChild()
                // anyway.
                bool failed = false;
 
-               string const tmp_ret = lyx::tempName(string(), "lyxauto");
+               string const tmp_ret = tempName(string(), "lyxauto");
                if (!tmp_ret.empty()) {
                        bv_.buffer()->writeFile(tmp_ret);
                        // assume successful write of tmp_ret
-                       if (!lyx::rename(tmp_ret, fname_)) {
+                       if (!rename(tmp_ret, fname_)) {
                                failed = true;
                                // most likely couldn't move between filesystems
                                // unless write of tmp_ret failed
                                // so remove tmp file (if it exists)
-                               lyx::unlink(tmp_ret);
+                               unlink(tmp_ret);
                        }
                } else {
                        failed = true;
@@ -307,7 +301,7 @@ void AutoSave(BufferView * bv)
 // create new file with template
 // SERVERCMD !
 //
-Buffer * NewFile(string const & filename)
+void NewFile(BufferView * bv, string const & filename)
 {
        // Split argument by :
        string name;
@@ -325,11 +319,7 @@ Buffer * NewFile(string const & filename)
                            << "\nName is " << name
                            << "\nTemplate is " << tmpname << endl;
 
-       // find a free buffer
-       Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
-       if (tmpbuf)
-               lastfiles->newFile(tmpbuf->fileName());
-       return tmpbuf;
+       bv->newFile(name, tmpname);
 }
 
 
@@ -351,8 +341,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
                bv->getLyXText()->insertStringAsLines(tmpstr);
        else
                bv->getLyXText()->insertStringAsParagraphs(tmpstr);
-       if (flag)
-               bv->update(BufferView::SELECT);
+       bv->update();
 }
 
 
@@ -420,15 +409,18 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 string const getPossibleLabel(BufferView const & bv)
 {
-       Paragraph * par = &*bv.getLyXText()->cursor.par();
-       LyXLayout_ptr layout = par->layout();
-       if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
-               Paragraph * par2 = par->previous();
+       ParagraphList::iterator pit = bv.getLyXText()->cursor.par();
+       ParagraphList & plist = bv.getLyXText()->ownerParagraphs();
+
+       LyXLayout_ptr layout = pit->layout();
+
+       if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) {
+               ParagraphList::iterator pit2 = boost::prior(pit);
 
-               LyXLayout_ptr const & layout2 = par2->layout();
+               LyXLayout_ptr const & layout2 = pit2->layout();
 
                if (layout2->latextype != LATEX_PARAGRAPH) {
-                       par = par2;
+                       pit = pit2;
                        layout = layout2;
                }
        }
@@ -442,7 +434,7 @@ string const getPossibleLabel(BufferView const & bv)
            lyxrc.label_init_length < 0)
                text.erase();
 
-       string par_text = par->asString(bv.buffer(), false);
+       string par_text = pit->asString(*bv.buffer(), false);
        for (int i = 0; i < lyxrc.label_init_length; ++i) {
                if (par_text.empty())
                        break;
@@ -465,10 +457,10 @@ void Reconfigure(BufferView * bv)
        bv->owner()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
-       Path p(user_lyxdir);
+       Path p(user_lyxdir());
        Systemcall one;
        one.startscript(Systemcall::Wait,
-                       AddName(system_lyxdir, "configure"));
+                       AddName(system_lyxdir(), "configure"));
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));