#include "BufferView.h"
+#include "BranchList.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferList.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "DispatchResult.h"
-#include "EmbeddedFiles.h"
#include "ErrorList.h"
#include "factory.h"
#include "FloatList.h"
{
Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
- inlineCompletionUniqueChars(0)
- last_inset_(0), gui_(0),
+ inlineCompletionUniqueChars_(0),
+ last_inset_(0), gui_(0)
{}
///
case LFUN_FONT_STATE:
case LFUN_LABEL_INSERT:
case LFUN_INFO_INSERT:
- case LFUN_EXTERNAL_EDIT:
- case LFUN_GRAPHICS_EDIT:
+ case LFUN_INSET_EDIT:
case LFUN_PARAGRAPH_GOTO:
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
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_TOGGLE:
case LFUN_NEXT_INSET_MODIFY: {
// this is the real function we want to invoke
- FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+ FuncRequest tmpcmd = cmd;
+ tmpcmd.action = (cmd.action == LFUN_NEXT_INSET_TOGGLE)
+ ? LFUN_INSET_TOGGLE : LFUN_INSET_MODIFY;
// if there is an inset at cursor, see whether it
- // can be modified.
+ // handles the lfun, other start from scratch
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);
+ if (!inset || !inset->getStatus(cur, tmpcmd, flag))
+ flag = lyx::getStatus(tmpcmd);
break;
}
break;
}
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- flag.setOnOff(buffer_.params().embedded);
- break;
- }
-
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
case LFUN_SCROLL:
case LFUN_INSET_SETTINGS: {
InsetCode code = cur.inset().lyxCode();
- if (cur.nextInset())
- code = cur.nextInset()->lyxCode();
+ if (cmd.getArg(0) == insetName(code)) {
+ flag.enabled(true);
+ break;
+ }
bool enable = false;
- switch (code) {
+ InsetCode next_code = cur.nextInset()
+ ? cur.nextInset()->lyxCode() : NO_CODE;
+ switch (next_code) {
case TABULAR_CODE:
case ERT_CODE:
case FLOAT_CODE:
case BOX_CODE:
case LISTINGS_CODE:
enable = (cmd.argument().empty() ||
- cmd.getArg(0) == insetName(code));
+ cmd.getArg(0) == insetName(next_code));
break;
default:
break;
}
break;
+ case LFUN_BRANCH_ACTIVATE:
+ case LFUN_BRANCH_DEACTIVATE: {
+ bool enable = false;
+ docstring const branchName = cmd.argument();
+ if (!branchName.empty())
+ enable = buffer_.params().branchlist().find(branchName);
+ flag.enabled(enable);
+ break;
+ }
+
default:
flag.enabled(false);
}
break;
}
- case LFUN_EXTERNAL_EDIT: {
+ case LFUN_INSET_EDIT: {
FuncRequest fr(cmd);
- InsetExternal * inset = getInsetByCode<InsetExternal>(d->cursor_,
- EXTERNAL_CODE);
+ // if there is an inset at cursor, see whether it
+ // can be modified.
+ Inset * inset = cur.nextInset();
if (inset)
- inset->dispatch(d->cursor_, fr);
- break;
- }
-
+ inset->dispatch(cur, fr);
+ // if it did not work, try the underlying inset.
+ if (!inset || !cur.result().dispatched())
+ cur.dispatch(cmd);
- case LFUN_GRAPHICS_EDIT: {
- FuncRequest fr(cmd);
- InsetGraphics * inset = getInsetByCode<InsetGraphics>(d->cursor_,
- GRAPHICS_CODE);
- if (inset)
- inset->dispatch(d->cursor_, fr);
- break;
+ if (!cur.result().dispatched())
+ // It did not work too; no action needed.
+ break;
}
case LFUN_PARAGRAPH_GOTO: {
- int const id = convert<int>(to_utf8(cmd.argument()));
+ int const id = convert<int>(cmd.getArg(0));
+ int const pos = convert<int>(cmd.getArg(1));
int i = 0;
for (Buffer * b = &buffer_; i == 0 || b != &buffer_;
b = theBufferList().next(b)) {
if (b == &buffer_) {
// Set the cursor
+ dit.pos() = pos;
setCursor(dit);
processUpdateFlags(Update::Force | Update::FitCursor);
} else {
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- // turn embedding on/off
- try {
- buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_, true);
- } catch (ExceptionMessage const & message) {
- Alert::error(message.title_, message.details_);
- }
- break;
- }
-
case LFUN_NEXT_INSET_TOGGLE: {
- // this is the real function we want to invoke
- FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.origin);
+ // create the the real function we want to invoke
+ FuncRequest tmpcmd = cmd;
+ tmpcmd.action = LFUN_INSET_TOGGLE;
// if there is an inset at cursor, see whether it
// wants to toggle.
Inset * inset = cur.nextInset();
Cursor tmpcur = cur;
tmpcur.pushBackward(*inset);
inset->dispatch(tmpcur, tmpcmd);
- if (tmpcur.result().dispatched()) {
+ if (tmpcur.result().dispatched())
cur.dispatched();
- }
- } else if (inset->editable() == Inset::IS_EDITABLE) {
- inset->edit(cur, true);
- }
+ } else
+ inset->dispatch(cur, tmpcmd);
}
// if it did not work, try the underlying inset.
if (!inset || !cur.result().dispatched())
}
case LFUN_NEXT_INSET_MODIFY: {
- // this is the real function we want to invoke
- FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+ // create the the real function we want to invoke
+ FuncRequest tmpcmd = cmd;
+ tmpcmd.action = LFUN_INSET_MODIFY;
// if there is an inset at cursor, see whether it
// can be modified.
Inset * inset = cur.nextInset();
break;
}
+ case LFUN_BRANCH_ACTIVATE:
+ case LFUN_BRANCH_DEACTIVATE:
+ buffer_.dispatch(cmd);
+ processUpdateFlags(Update::Force);
+ break;
+
default:
return false;
}
projects / lyx.git / blobdiff