Juergen's compiler warning fixes

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2b268bc98bc0a7a42eeeb1ddd25c653fc8d69fe1..b5c3ad161bf90a3a99a692beb678cb354d1738b3 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -87,9 +87,10 @@
 #include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 #include "support/os.h"
 
+#include <sstream>
+
 using bv_funcs::freefont2string;
 
 using lyx::support::AddName;
@@ -271,9 +272,19 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 {
        //lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
        FuncStatus flag;
-       Buffer * buf = owner->buffer();
        LCursor & cur = view()->cursor();
 
+       /* In LyX/Mac, when a dialog is open, the menus of the
+          application can still be accessed without giving focus to
+          the main window. In this case, we want to disable the menu
+          entries that are buffer-related.
+       */
+       Buffer * buf;
+       if (cmd.origin == FuncRequest::UI && !owner->hasFocus())
+               buf = 0;
+       else
+               buf = owner->buffer();
+
        if (cmd.action == LFUN_NOACTION) {
                setStatusMessage(N_("Nothing to do"));
                flag.enabled(false);
@@ -299,7 +310,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 
        // the default error message if we disable the command
        setStatusMessage(N_("Command disabled"));
-       if (!flag.enabled()) 
+       if (!flag.enabled())
                return flag;
 
        // Check whether we need a buffer
@@ -446,7 +457,9 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_SEQUENCE: {
                // argument contains ';'-terminated commands
                string const firstcmd = token(cmd.argument, ';', 0);
-               flag = getStatus(lyxaction.lookupFunc(firstcmd));
+               FuncRequest func(lyxaction.lookupFunc(firstcmd));
+               func.origin = cmd.origin;
+               flag = getStatus(func);
        }
 
        case LFUN_MENUNEW:
@@ -502,6 +515,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_SAVE_AS_DEFAULT:
        case LFUN_BUFFERPARAMS_APPLY:
        case LFUN_LYXRC_APPLY:
+       case LFUN_NEXTBUFFER:
+       case LFUN_PREVIOUSBUFFER:
                // these are handled in our dispatch()
                break;
 
@@ -585,7 +600,7 @@ void loadTextclass(string const & name)
 } //namespace anon
 
 
-void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
+void LyXFunc::dispatch(FuncRequest const & cmd)
 {
        string const argument = cmd.argument;
        kb_action const action = cmd.action;
@@ -957,6 +972,14 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                        view()->setBuffer(bufferlist.getBuffer(argument));
                        break;
 
+               case LFUN_NEXTBUFFER:
+                       view()->setBuffer(bufferlist.next(view()->buffer()));
+                       break;
+
+               case LFUN_PREVIOUSBUFFER:
+                       view()->setBuffer(bufferlist.previous(view()->buffer()));
+                       break;
+
                case LFUN_FILE_NEW:
                        NewFile(view(), argument);
                        break;
@@ -1208,7 +1231,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                        while (!arg.empty()) {
                                string first;
                                arg = split(arg, first, ';');
-                               dispatch(lyxaction.lookupFunc(first));
+                               FuncRequest func(lyxaction.lookupFunc(first));
+                               func.origin = cmd.origin;
+                               dispatch(func);
                        }
                        break;
                }
@@ -1316,6 +1341,32 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                        break;
                }
 
+               case LFUN_SAVE_AS_DEFAULT: {
+                       string const fname =
+                               AddName(AddPath(user_lyxdir(), "templates/"),
+                                       "defaults.lyx");
+                       Buffer defaults(fname);
+
+                       istringstream ss(argument);
+                       LyXLex lex(0,0);
+                       lex.setStream(ss);
+                       int const unknown_tokens = defaults.readHeader(lex);
+
+                       if (unknown_tokens != 0) {
+                               lyxerr << "Warning in LFUN_SAVE_AS_DEFAULT!\n"
+                                      << unknown_tokens << " unknown token"
+                                      << (unknown_tokens == 1 ? "" : "s")
+                                      << endl;
+                       }
+
+                       if (defaults.writeFile(defaults.fileName()))
+                               setMessage(_("Document defaults saved in ")
+                                          + MakeDisplayPath(fname));
+                       else
+                               setErrorMessage(_("Unable to save document defaults"));
+                       break;
+               }
+
                case LFUN_BUFFERPARAMS_APPLY: {
                        biblio::CiteEngine const engine =
                                owner->buffer()->params().cite_engine;
@@ -1395,9 +1446,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
 
                default: {
                        update = false;
-                       DispatchResult res = view()->cursor().dispatch(cmd);
-                       if (res.dispatched())
-                               update |= res.update();
+                       view()->cursor().dispatch(cmd);
+                       if (view()->cursor().result().dispatched())
+                               update |= view()->cursor().result().update();
                        else
                                update |= view()->dispatch(cmd);
 
@@ -1406,7 +1457,16 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                }
 
                if (view()->available()) {
-                       if (view()->fitCursor() || update)
+                       // Redraw screen unless explicitly told otherwise.
+                       // This also initializes the position cache for all insets
+                       // in (at least partially) visible top-level paragraphs.
+                       if (update)
+                               view()->update();
+
+                       // fitCursor() needs valid inset position. The previous call to
+                       // update() makes sure we have such even for freshly created
+                       // insets.
+                       if (view()->fitCursor())
                                view()->update();
                        // if we executed a mutating lfun, mark the buffer as dirty
                        if (getStatus(cmd).enabled()
@@ -1417,18 +1477,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
 
                if (view()->cursor().inTexted()) {
                        view()->owner()->updateLayoutChoice();
-                       sendDispatchMessage(getMessage(), cmd, verbose);
+                       sendDispatchMessage(getMessage(), cmd);
                }
        }
 }
 
 
-void LyXFunc::sendDispatchMessage(string const & msg,
-                                 FuncRequest const & cmd, bool verbose)
+void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & cmd)
 {
        owner->updateMenubar();
        owner->updateToolbars();
 
+       const bool verbose = (cmd.origin == FuncRequest::UI
+                             || cmd.origin == FuncRequest::COMMANDBUFFER);
+
        if (cmd.action == LFUN_SELFINSERT || !verbose) {
                lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl;
                if (!msg.empty())