anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36726 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-12-04 22:48:08 +00:00
parent 723160f7c0
commit 6a500079e5
3 changed files with 74 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/frontends/qt4/GuiApplication.cpp
View File

@ -1604,83 +1604,13 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
default:
// Everything below is only for active window
if (current_view_ == 0)
break;
// Let the current GuiView dispatch its own actions.
current_view_->dispatch(cmd, dr);
if (dr.dispatched())
break;
BufferView * bv = current_view_->currentBufferView();
LASSERT(bv, /**/);
// Avoid a screen redraw in the middle of a dispatch operation just
// because a warning or an error was displayed.
current_view_->setBusy(true);
// Let the current BufferView dispatch its own actions.
bv->dispatch(cmd, dr);
if (dr.dispatched())
break;
BufferView * doc_bv = current_view_->documentBufferView();
// Try with the document BufferView dispatch if any.
if (doc_bv) {
doc_bv->dispatch(cmd, dr);
if (dr.dispatched())
break;
}
// OK, so try the current Buffer itself...
bv->buffer().dispatch(cmd, dr);
if (dr.dispatched())
break;
// and with the document Buffer.
if (doc_bv) {
doc_bv->buffer().dispatch(cmd, dr);
if (dr.dispatched())
break;
}
// Let the current Cursor dispatch its own actions.
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()))
current_view_->updateCompletion(bv->cursor(), true, true);
else if (cmd.action() == LFUN_CHAR_DELETE_BACKWARD)
current_view_->updateCompletion(bv->cursor(), false, true);
else
current_view_->updateCompletion(bv->cursor(), false, false);
}
dr = bv->cursor().result();
current_view_->setBusy(false);
// The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
// let's try that:
if (current_view_)
current_view_->dispatch(cmd, dr);
break;
}
// if we executed a mutating lfun, mark the buffer as dirty
Buffer * doc_buffer = (current_view_ && current_view_->documentBufferView())
? &(current_view_->documentBufferView()->buffer()) : 0;

69
src/frontends/qt4/GuiView.cpp
View File

@ -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;
}

2
src/frontends/qt4/GuiView.h
View File

@ -413,6 +413,8 @@ private:
///
void dispatchVC(FuncRequest const & cmd, DispatchResult & dr);
///
void dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr);
///
void showMessage();
/// This view ID.