Cleanup mouse/selection/context-menu interactions.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4d763e7c319f3947d30820b25975f276471f7c99..9b3ae322bb3a3eec65c958a8035c6e3506ccfa89 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -55,6 +55,8 @@
 
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCommand.h" // ChangeRefs
+#include "insets/InsetExternal.h"
+#include "insets/InsetGraphics.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetText.h"
 
@@ -846,6 +848,8 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
        case LFUN_FONT_STATE:
        case LFUN_LABEL_INSERT:
        case LFUN_INFO_INSERT:
+       case LFUN_EXTERNAL_EDIT:
+       case LFUN_GRAPHICS_EDIT:
        case LFUN_PARAGRAPH_GOTO:
        case LFUN_NOTE_NEXT:
        case LFUN_REFERENCE_NEXT:
@@ -858,10 +862,51 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
        case LFUN_BIBTEX_DATABASE_ADD:
        case LFUN_BIBTEX_DATABASE_DEL:
        case LFUN_STATISTICS:
-       case LFUN_NEXT_INSET_TOGGLE:
                flag.enabled(true);
                break;
 
+       case LFUN_NEXT_INSET_TOGGLE: {
+               // this is the real function we want to invoke
+               FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.argument());
+               // if there is an inset at cursor, see whether it
+               // can be modified.
+               Inset * inset = cur.nextInset();
+               if (inset) {
+                       inset->getStatus(cur, tmpcmd, flag);
+                       return flag;
+                       break;
+               }
+               // if it did not work, try the underlying inset.
+               if (!inset || !cur.result().dispatched())
+                       getStatus(tmpcmd);
+
+               if (!cur.result().dispatched())
+                       // else disable
+                       flag.enabled(false);
+               break;
+       }
+
+       case LFUN_NEXT_INSET_MODIFY: {
+               // this is the real function we want to invoke
+               FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+               // if there is an inset at cursor, see whether it
+               // can be modified.
+               Inset * inset = cur.nextInset();
+               if (inset) {
+                       inset->getStatus(cur, tmpcmd, flag);
+                       return flag;
+                       break;
+               }
+               // if it did not work, try the underlying inset.
+               if (!inset || !cur.result().dispatched())
+                       getStatus(tmpcmd);
+
+               if (!cur.result().dispatched())
+                       // else disable
+                       flag.enabled(false);
+               break;
+       }
+
        case LFUN_LABEL_GOTO: {
                flag.enabled(!cmd.argument().empty()
                    || getInsetByCode<InsetRef>(cur, REF_CODE));
@@ -921,31 +966,20 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 
        case LFUN_INSET_SETTINGS: {
                InsetCode code = cur.inset().lyxCode();
+               if (cur.nextInset())
+                       code = cur.nextInset()->lyxCode();
                bool enable = false;
                switch (code) {
                        case TABULAR_CODE:
-                               enable = cmd.argument() == "tabular";
-                               break;
                        case ERT_CODE:
-                               enable = cmd.argument() == "ert";
-                               break;
                        case FLOAT_CODE:
-                               enable = cmd.argument() == "float";
-                               break;
                        case WRAP_CODE:
-                               enable = cmd.argument() == "wrap";
-                               break;
                        case NOTE_CODE:
-                               enable = cmd.argument() == "note";
-                               break;
                        case BRANCH_CODE:
-                               enable = cmd.argument() == "branch";
-                               break;
                        case BOX_CODE:
-                               enable = cmd.argument() == "box";
-                               break;
                        case LISTINGS_CODE:
-                               enable = cmd.argument() == "listings";
+                               enable = (cmd.argument().empty() ||
+                                         cmd.getArg(0) == insetName(code));
                                break;
                        default:
                                break;
@@ -1030,6 +1064,25 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        gotoLabel(label);
                break;
        }
+       
+       case LFUN_EXTERNAL_EDIT: {
+               FuncRequest fr(cmd);
+               InsetExternal * inset = getInsetByCode<InsetExternal>(d->cursor_,
+                       EXTERNAL_CODE);
+               if (inset)
+                       inset->dispatch(d->cursor_, fr);
+               break;
+       }
+
+
+       case LFUN_GRAPHICS_EDIT: {
+               FuncRequest fr(cmd);
+               InsetGraphics * inset = getInsetByCode<InsetGraphics>(d->cursor_,
+                       GRAPHICS_CODE);
+               if (inset)
+                       inset->dispatch(d->cursor_, fr);
+               break;
+       }
 
        case LFUN_PARAGRAPH_GOTO: {
                int const id = convert<int>(to_utf8(cmd.argument()));
@@ -1278,7 +1331,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        }
                }
                // if it did not work, try the underlying inset.
-               if (!cur.result().dispatched())
+               if (!inset || !cur.result().dispatched())
                        cur.dispatch(tmpcmd);
 
                if (!cur.result().dispatched())
@@ -1289,6 +1342,26 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
+       case LFUN_NEXT_INSET_MODIFY: {
+               // this is the real function we want to invoke
+               FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+               // if there is an inset at cursor, see whether it
+               // can be modified.
+               Inset * inset = cur.nextInset();
+               if (inset)
+                       inset->dispatch(cur, tmpcmd);
+               // if it did not work, try the underlying inset.
+               if (!inset || !cur.result().dispatched())
+                       cur.dispatch(tmpcmd);
+
+               if (!cur.result().dispatched())
+                       // It did not work too; no action needed.
+                       break;
+               cur.clearSelection();
+               processUpdateFlags(Update::Force | Update::FitCursor);
+               break;
+       }
+
        case LFUN_SCREEN_UP:
        case LFUN_SCREEN_DOWN: {
                Point p = getPos(cur, cur.boundary());
@@ -1497,7 +1570,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
        // Now dispatch to the temporary cursor. If the real cursor should
        // be modified, the inset's dispatch has to do so explicitly.
-       if (!cur.result().dispatched())
+       if (!inset || !cur.result().dispatched())
                cur.dispatch(cmd);
 
        // Notify left insets