Move code from GuiApplication::dispatch() to GuiView::dispatch().

[features.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a0f4824867ea69b346becf8ef374f8d7e1b187de..55c94f71d26133057331f0575f5e258dc1f4ee32 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3019,6 +3019,69 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
 #endif
 }
 
+void GuiView::dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr)
+{
+       BufferView * bv = currentBufferView();
+       LASSERT(bv, /**/);
+
+       // Avoid a screen redraw in the middle of a dispatch operation just
+       // because a warning or an error was displayed.
+       setBusy(true);
+
+       // Let the current BufferView dispatch its own actions.
+       bv->dispatch(cmd, dr);
+
+       // Try with the document BufferView dispatch if any.
+       BufferView * doc_bv = documentBufferView();
+       if (doc_bv && !dr.dispatched())
+                       doc_bv->dispatch(cmd, dr);
+
+       // OK, so try the current Buffer itself...
+       if (!dr.dispatched())
+               bv->buffer().dispatch(cmd, dr);
+
+       // and with the document Buffer.
+       if (doc_bv && !dr.dispatched())
+               doc_bv->buffer().dispatch(cmd, dr);
+
+       // Then let the current Cursor dispatch its own actions.
+       if (!dr.dispatched()) {
+               Cursor old = bv->cursor();
+               bv->cursor().dispatch(cmd);
+
+               // notify insets we just left
+               // FIXME: move this code to Cursor::dispatch
+               if (bv->cursor() != old) {
+                       old.beginUndoGroup();
+                       old.fixIfBroken();
+                       bool badcursor = notifyCursorLeavesOrEnters(old, bv->cursor());
+                       if (badcursor) {
+                               bv->cursor().fixIfBroken();
+                               bv->fixInlineCompletionPos();
+                       }
+                       old.endUndoGroup();
+               }
+
+               // update completion. We do it here and not in
+               // processKeySym to avoid another redraw just for a
+               // changed inline completion
+               if (cmd.origin() == FuncRequest::KEYBOARD) {
+                       if (cmd.action() == LFUN_SELF_INSERT
+                               || (cmd.action() == LFUN_ERT_INSERT && bv->cursor().inMathed()))
+                               updateCompletion(bv->cursor(), true, true);
+                       else if (cmd.action() == LFUN_CHAR_DELETE_BACKWARD)
+                               updateCompletion(bv->cursor(), false, true);
+                       else
+                               updateCompletion(bv->cursor(), false, false);
+               }
+
+               dr = bv->cursor().result();
+       }
+
+       setBusy(false);
+}
+
+
 void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 {
        BufferView * bv = currentBufferView();
@@ -3477,7 +3540,9 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        break;
                }
                default:
-                       dr.dispatched(false);
+                       // The LFUN must be for one of BufferView, Buffer or Cursor;
+                       // let's try that:
+                       dispatchToBufferView(cmd, dr);
                        break;
        }
 
@@ -3488,8 +3553,6 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                if (statusBar()->isVisible())
                        statusBar()->hide();
        }
-
-       return;
 }