feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fakevim: add Shift-{Left,Right} as aliases for b and e

Browse Source
This commit is contained in:
hjk
2010-03-29 12:43:52 +02:00
parent 48d195969d
commit 67eb9c0802
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -286,12 +286,15 @@ inline QString msgE20MarkNotSet(const QString &text)
class Input class Input
{ {
public: public:
Input() : key(0), unmodified(0) {} Input() : key(0), unmodified(0), modifiers(0) {}
Input(char x) : key(x), unmodified(0), text(1, QLatin1Char(x)) {} Input(char x) : key(x), unmodified(0), modifiers(0), text(1, QLatin1Char(x)) {}
Input(int k, int u, QString t) : key(k), unmodified(u), text(t) {} Input(int k, int u, int m, QString t)
: key(k), unmodified(u), modifiers(m), text(t)
{}
int key; int key;
int unmodified; int unmodified;
int modifiers;
QString text; QString text;
}; };
@@ -792,7 +795,7 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev)
!(m_mode != InsertMode && m_tc.atBlockEnd() && m_tc.block().length() > 1), !(m_mode != InsertMode && m_tc.atBlockEnd() && m_tc.block().length() > 1),
qDebug() << "Cursor at EOL before key handler"); qDebug() << "Cursor at EOL before key handler");
EventResult result = handleKey(Input(key, um, ev->text())); EventResult result = handleKey(Input(key, um, mods, ev->text()));
// the command might have destroyed the editor // the command might have destroyed the editor
if (m_textedit || m_plaintextedit) { if (m_textedit || m_plaintextedit) {
@@ -1657,7 +1660,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
updateMiniBuffer(); updateMiniBuffer();
} else if (key == control('a')) { } else if (key == control('a')) {
// FIXME: eat it to prevent the global "select all" shortcut to trigger // FIXME: eat it to prevent the global "select all" shortcut to trigger
} else if (key == 'b') { } else if (key == 'b'
|| (key == Key_Left && input.modifiers == Qt::ShiftModifier)) {
m_movetype = MoveExclusive; m_movetype = MoveExclusive;
moveToWordBoundary(false, false); moveToWordBoundary(false, false);
finishMovement(); finishMovement();
@@ -1753,7 +1757,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
handleStartOfLine(); handleStartOfLine();
scrollToLineInDocument(cursorLineInDocument() - sline); scrollToLineInDocument(cursorLineInDocument() - sline);
finishMovement(); finishMovement();
} else if (key == 'e') { // tested } else if (key == 'e' // tested
|| (key == Key_Right && input.modifiers == Qt::ShiftModifier)) {
m_movetype = MoveInclusive; m_movetype = MoveInclusive;
moveToWordBoundary(false, true); moveToWordBoundary(false, true);
finishMovement("%1e", count()); finishMovement("%1e", count());
@@ -3868,7 +3873,7 @@ void FakeVimHandler::Private::replay(const QString &command, int n)
for (int i = n; --i >= 0; ) { for (int i = n; --i >= 0; ) {
foreach (QChar c, command) { foreach (QChar c, command) {
//qDebug() << " REPLAY: " << QString(c); //qDebug() << " REPLAY: " << QString(c);
handleKey(Input(c.unicode(), c.unicode(), QString(c))); handleKey(Input(c.unicode(), c.unicode(), 0, QString(c)));
} }
} }
m_inReplay = false; m_inReplay = false;