lovecraft/qmltermwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into unstable

Browse Source
This commit is contained in:
Filippo Scognamiglio
2018-10-16 00:18:25 +02:00
parent 9247f6a4a4 871d069b8b
commit c8e418a164
109 changed files with 6729 additions and 2380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/KeyboardTranslator.cpp
+110 -104
View File
@@ -60,7 +60,7 @@ KeyboardTranslatorManager::~KeyboardTranslatorManager()
}
QString KeyboardTranslatorManager::findTranslatorPath(const QString& name)
{
return QString(get_kb_layout_dir() + name + ".keytab");
return QString(get_kb_layout_dir() + name + QLatin1String(".keytab"));
//return KGlobal::dirs()->findResource("data","konsole/"+name+".keytab");
}
@@ -68,7 +68,7 @@ void KeyboardTranslatorManager::findTranslators()
{
QDir dir(get_kb_layout_dir());
QStringList filters;
filters << "*.keytab";
filters << QLatin1String("*.keytab");
dir.setNameFilters(filters);
QStringList list = dir.entryList(filters);
list = dir.entryList(filters);
@@ -85,8 +85,8 @@ void KeyboardTranslatorManager::findTranslators()
QString translatorPath = listIter.next();
QString name = QFileInfo(translatorPath).baseName();
if ( !_translators.contains(name) )
if ( !_translators.contains(name) )
_translators.insert(name,0);
}
@@ -124,7 +124,7 @@ Q_UNUSED(translator);
QFile destination(path);
if (!destination.open(QIODevice::WriteOnly | QIODevice::Text))
{
qDebug() << "Unable to save keyboard translation:"
qDebug() << "Unable to save keyboard translation:"
<< destination.errorString();
return false;
}
@@ -132,7 +132,7 @@ Q_UNUSED(translator);
{
KeyboardTranslatorWriter writer(&destination);
writer.writeHeader(translator->description());
QListIterator<KeyboardTranslator::Entry> iter(translator->entries());
while ( iter.hasNext() )
writer.writeEntry(iter.next());
@@ -147,7 +147,7 @@ KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(const QString& nam
{
const QString& path = findTranslatorPath(name);
QFile source(path);
QFile source(path);
if (name.isEmpty() || !source.open(QIODevice::ReadOnly | QIODevice::Text))
return 0;
@@ -158,13 +158,13 @@ const KeyboardTranslator* KeyboardTranslatorManager::defaultTranslator()
{
// Try to find the default.keytab file if it exists, otherwise
// fall back to the hard-coded one
const KeyboardTranslator* translator = findTranslator("default");
const KeyboardTranslator* translator = findTranslator(QLatin1String("default"));
if (!translator)
{
QBuffer textBuffer;
textBuffer.setData(defaultTranslatorText);
textBuffer.open(QIODevice::ReadOnly);
translator = loadTranslator(&textBuffer,"fallback");
translator = loadTranslator(&textBuffer,QLatin1String("fallback"));
}
return translator;
}
@@ -211,9 +211,9 @@ void KeyboardTranslatorWriter::writeEntry( const KeyboardTranslator::Entry& entr
if ( entry.command() != KeyboardTranslator::NoCommand )
result = entry.resultToString();
else
result = '\"' + entry.resultToString() + '\"';
result = QLatin1Char('\"') + entry.resultToString() + QLatin1Char('\"');
*_writer << "key " << entry.conditionToString() << " : " << result << '\n';
*_writer << QLatin1String("key ") << entry.conditionToString() << QLatin1String(" : ") << result << QLatin1Char('\n');
}
@@ -226,7 +226,7 @@ void KeyboardTranslatorWriter::writeEntry( const KeyboardTranslator::Entry& entr
// KeySequence begins with the name of the key ( taken from the Qt::Key enum )
// and is followed by the keyboard modifiers and state flags ( with + or - in front
// of each modifier or flag to indicate whether it is required ). All keyboard modifiers
// and flags are optional, if a particular modifier or state is not specified it is
// and flags are optional, if a particular modifier or state is not specified it is
// assumed not to be a part of the sequence. The key sequence may contain whitespace
//
// eg: "key Up+Shift : scrollLineUp"
@@ -243,19 +243,19 @@ KeyboardTranslatorReader::KeyboardTranslatorReader( QIODevice* source )
// read input until we find the description
while ( _description.isEmpty() && !source->atEnd() )
{
QList<Token> tokens = tokenize( QString(source->readLine()) );
QList<Token> tokens = tokenize( QString::fromUtf8(source->readLine()) );
if ( !tokens.isEmpty() && tokens.first().type == Token::TitleKeyword )
_description = tokens[1].text.toUtf8();
_description = tokens[1].text;
}
// read first entry (if any)
readNext();
}
void KeyboardTranslatorReader::readNext()
void KeyboardTranslatorReader::readNext()
{
// find next entry
while ( !_source->atEnd() )
{
const QList<Token>& tokens = tokenize( QString(_source->readLine()) );
const QList<Token>& tokens = tokenize( QString::fromUtf8(_source->readLine()) );
if ( !tokens.isEmpty() && tokens.first().type == Token::KeyKeyword )
{
KeyboardTranslator::States flags = KeyboardTranslator::NoState;
@@ -270,7 +270,7 @@ void KeyboardTranslatorReader::readNext()
modifiers,
modifierMask,
flags,
flagMask);
flagMask);
KeyboardTranslator::Command command = KeyboardTranslator::NoCommand;
QByteArray text;
@@ -302,25 +302,29 @@ void KeyboardTranslatorReader::readNext()
return;
}
}
}
_hasNext = false;
}
bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command)
bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command)
{
if ( text.compare("erase",Qt::CaseInsensitive) == 0 )
if ( text.compare(QLatin1String("erase"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::EraseCommand;
else if ( text.compare("scrollpageup",Qt::CaseInsensitive) == 0 )
else if ( text.compare(QLatin1String("scrollpageup"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollPageUpCommand;
else if ( text.compare("scrollpagedown",Qt::CaseInsensitive) == 0 )
else if ( text.compare(QLatin1String("scrollpagedown"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollPageDownCommand;
else if ( text.compare("scrolllineup",Qt::CaseInsensitive) == 0 )
else if ( text.compare(QLatin1String("scrolllineup"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLineUpCommand;
else if ( text.compare("scrolllinedown",Qt::CaseInsensitive) == 0 )
else if ( text.compare(QLatin1String("scrolllinedown"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLineDownCommand;
else if ( text.compare("scrolllock",Qt::CaseInsensitive) == 0 )
else if ( text.compare(QLatin1String("scrolllock"),Qt::CaseInsensitive) == 0 )
command = KeyboardTranslator::ScrollLockCommand;
else if ( text.compare(QLatin1String("scrolluptotop"),Qt::CaseInsensitive) == 0)
command = KeyboardTranslator::ScrollUpToTopCommand;
else if ( text.compare(QLatin1String("scrolldowntobottom"),Qt::CaseInsensitive) == 0)
command = KeyboardTranslator::ScrollDownToBottomCommand;
else
return false;
@@ -334,7 +338,7 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
KeyboardTranslator::States& flags,
KeyboardTranslator::States& flagMask)
{
bool isWanted = true;
bool isWanted = true;
bool endOfItem = false;
QString buffer;
@@ -386,13 +390,13 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
buffer.clear();
}
// check if this is a wanted / not-wanted flag and update the
// check if this is a wanted / not-wanted flag and update the
// state ready for the next item
if ( ch == '+' )
if ( ch == QLatin1Char('+') )
isWanted = true;
else if ( ch == '-' )
isWanted = false;
}
else if ( ch == QLatin1Char('-') )
isWanted = false;
}
modifiers = tempModifiers;
modifierMask = tempModifierMask;
@@ -404,15 +408,15 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text,
bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier)
{
if ( item == "shift" )
if ( item == QLatin1String("shift") )
modifier = Qt::ShiftModifier;
else if ( item == "ctrl" || item == "control" )
else if ( item == QLatin1String("ctrl") || item == QLatin1String("control") )
modifier = Qt::ControlModifier;
else if ( item == "alt" )
else if ( item == QLatin1String("alt") )
modifier = Qt::AltModifier;
else if ( item == "meta" )
else if ( item == QLatin1String("meta") )
modifier = Qt::MetaModifier;
else if ( item == "keypad" )
else if ( item == QLatin1String("keypad") )
modifier = Qt::KeypadModifier;
else
return false;
@@ -421,17 +425,17 @@ bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::Keyboar
}
bool KeyboardTranslatorReader::parseAsStateFlag(const QString& item , KeyboardTranslator::State& flag)
{
if ( item == "appcukeys" || item == "appcursorkeys" )
if ( item == QLatin1String("appcukeys") || item == QLatin1String("appcursorkeys") )
flag = KeyboardTranslator::CursorKeysState;
else if ( item == "ansi" )
else if ( item == QLatin1String("ansi") )
flag = KeyboardTranslator::AnsiState;
else if ( item == "newline" )
else if ( item == QLatin1String("newline") )
flag = KeyboardTranslator::NewLineState;
else if ( item == "appscreen" )
else if ( item == QLatin1String("appscreen") )
flag = KeyboardTranslator::AlternateScreenState;
else if ( item == "anymod" || item == "anymodifier" )
else if ( item == QLatin1String("anymod") || item == QLatin1String("anymodifier") )
flag = KeyboardTranslator::AnyModifierState;
else if ( item == "appkeypad" )
else if ( item == QLatin1String("appkeypad") )
flag = KeyboardTranslator::ApplicationKeypadState;
else
return false;
@@ -451,9 +455,9 @@ bool KeyboardTranslatorReader::parseAsKeyCode(const QString& item , int& keyCode
}
}
// additional cases implemented for backwards compatibility with KDE 3
else if ( item == "prior" )
else if ( item == QLatin1String("prior") )
keyCode = Qt::Key_PageUp;
else if ( item == "next" )
else if ( item == QLatin1String("next") )
keyCode = Qt::Key_PageDown;
else
return false;
@@ -469,12 +473,12 @@ bool KeyboardTranslatorReader::hasNextEntry()
{
return _hasNext;
}
KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition ,
KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition ,
const QString& result )
{
QString entryString("keyboard \"temporary\"\nkey ");
QString entryString = QString::fromLatin1("keyboard \"temporary\"\nkey ");
entryString.append(condition);
entryString.append(" : ");
entryString.append(QLatin1String(" : "));
// if 'result' is the name of a command then the entry result will be that command,
// otherwise the result will be treated as a string to echo when the key sequence
@@ -483,7 +487,7 @@ KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString&
if (parseAsCommand(result,command))
entryString.append(result);
else
entryString.append('\"' + result + '\"');
entryString.append(QLatin1Char('\"') + result + QLatin1Char('\"'));
QByteArray array = entryString.toUtf8();
QBuffer buffer(&array);
@@ -497,7 +501,7 @@ KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString&
return entry;
}
KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry()
KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry()
{
Q_ASSERT( _hasNext );
KeyboardTranslator::Entry entry = _nextEntry;
@@ -512,30 +516,30 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
{
QString text = line;
// remove comments
// remove comments
bool inQuotes = false;
int commentPos = -1;
for (int i=text.length()-1;i>=0;i--)
{
QChar ch = text[i];
if (ch == '\"')
if (ch == QLatin1Char('\"'))
inQuotes = !inQuotes;
else if (ch == '#' && !inQuotes)
else if (ch == QLatin1Char('#') && !inQuotes)
commentPos = i;
}
if (commentPos != -1)
text.remove(commentPos,text.length());
text = text.simplified();
// title line: keyboard "title"
static QRegExp title("keyboard\\s+\"(.*)\"");
static QRegExp title(QLatin1String("keyboard\\s+\"(.*)\""));
// key line: key KeySequence : "output"
// key line: key KeySequence : command
static QRegExp key("key\\s+([\\w\\+\\s\\-\\*\\.]+)\\s*:\\s*(\"(.*)\"|\\w+)");
static QRegExp key(QLatin1String("key\\s+([\\w\\+\\s\\-\\*\\.]+)\\s*:\\s*(\"(.*)\"|\\w+)"));
QList<Token> list;
if ( text.isEmpty() )
if ( text.isEmpty() )
{
return list;
}
@@ -543,29 +547,29 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
if ( title.exactMatch(text) )
{
Token titleToken = { Token::TitleKeyword , QString() };
Token textToken = { Token::TitleText , title.capturedTexts()[1] };
Token textToken = { Token::TitleText , title.capturedTexts().at(1) };
list << titleToken << textToken;
}
else if ( key.exactMatch(text) )
{
Token keyToken = { Token::KeyKeyword , QString() };
Token sequenceToken = { Token::KeySequence , key.capturedTexts()[1].remove(' ') };
Token sequenceToken = { Token::KeySequence , key.capturedTexts().value(1).remove(QLatin1Char(' ')) };
list << keyToken << sequenceToken;
if ( key.capturedTexts()[3].isEmpty() )
if ( key.capturedTexts().at(3).isEmpty() )
{
// capturedTexts()[2] is a command
Token commandToken = { Token::Command , key.capturedTexts()[2] };
list << commandToken;
}
Token commandToken = { Token::Command , key.capturedTexts().at(2) };
list << commandToken;
}
else
{
// capturedTexts()[3] is the output string
Token outputToken = { Token::OutputText , key.capturedTexts()[3] };
Token outputToken = { Token::OutputText , key.capturedTexts().at(3) };
list << outputToken;
}
}
}
else
{
@@ -575,7 +579,7 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
return list;
}
QList<QString> KeyboardTranslatorManager::allTranslators()
QList<QString> KeyboardTranslatorManager::allTranslators()
{
if ( !_haveLoadedAll )
{
@@ -606,14 +610,14 @@ bool KeyboardTranslator::Entry::operator==(const Entry& rhs) const
_text == rhs._text;
}
bool KeyboardTranslator::Entry::matches(int keyCode ,
bool KeyboardTranslator::Entry::matches(int keyCode ,
Qt::KeyboardModifiers modifiers,
States testState) const
{
if ( _keyCode != keyCode )
return false;
if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) )
if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) )
return false;
// if modifiers is non-zero, the 'any modifier' state is implicit
@@ -623,7 +627,7 @@ bool KeyboardTranslator::Entry::matches(int keyCode ,
if ( (testState & _stateMask) != (_state & _stateMask) )
return false;
// special handling for the 'Any Modifier' state, which checks for the presence of
// special handling for the 'Any Modifier' state, which checks for the presence of
// any or no modifiers. In this context, the 'keypad' modifier does not count.
bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier;
bool wantAnyModifier = _state & KeyboardTranslator::AnyModifierState;
@@ -632,7 +636,7 @@ bool KeyboardTranslator::Entry::matches(int keyCode ,
if ( wantAnyModifier != anyModifiersSet )
return false;
}
return true;
}
QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
@@ -655,13 +659,13 @@ QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,Qt::Keybo
default:
// any character which is not printable is replaced by an equivalent
// \xhh escape sequence (where 'hh' are the corresponding hex digits)
if ( !QChar(ch).isPrint() )
if ( !QChar(QLatin1Char(ch)).isPrint() )
replacement = 'x';
}
if ( replacement == 'x' )
{
result.replace(i,1,"\\x"+QByteArray(1,ch).toHex());
result.replace(i,1,"\\x"+QByteArray(1,ch).toHex());
} else if ( replacement != 0 )
{
result.remove(i,1);
@@ -709,7 +713,7 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
unsigned charValue = 0;
sscanf(hexDigits,"%x",&charValue);
replacement[0] = (char)charValue;
replacement[0] = (char)charValue;
charsToRemove = 2 + strlen(hexDigits);
}
break;
@@ -731,20 +735,20 @@ void KeyboardTranslator::Entry::insertModifier( QString& item , int modifier ) c
return;
if ( modifier & _modifiers )
item += '+';
item += QLatin1Char('+');
else
item += '-';
item += QLatin1Char('-');
if ( modifier == Qt::ShiftModifier )
item += "Shift";
item += QLatin1String("Shift");
else if ( modifier == Qt::ControlModifier )
item += "Ctrl";
item += QLatin1String("Ctrl");
else if ( modifier == Qt::AltModifier )
item += "Alt";
item += QLatin1String("Alt");
else if ( modifier == Qt::MetaModifier )
item += "Meta";
item += QLatin1String("Meta");
else if ( modifier == Qt::KeypadModifier )
item += "KeyPad";
item += QLatin1String("KeyPad");
}
void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
{
@@ -752,39 +756,43 @@ void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
return;
if ( state & _state )
item += '+' ;
item += QLatin1Char('+') ;
else
item += '-' ;
item += QLatin1Char('-') ;
if ( state == KeyboardTranslator::AlternateScreenState )
item += "AppScreen";
item += QLatin1String("AppScreen");
else if ( state == KeyboardTranslator::NewLineState )
item += "NewLine";
item += QLatin1String("NewLine");
else if ( state == KeyboardTranslator::AnsiState )
item += "Ansi";
item += QLatin1String("Ansi");
else if ( state == KeyboardTranslator::CursorKeysState )
item += "AppCursorKeys";
item += QLatin1String("AppCursorKeys");
else if ( state == KeyboardTranslator::AnyModifierState )
item += "AnyModifier";
item += QLatin1String("AnyModifier");
else if ( state == KeyboardTranslator::ApplicationKeypadState )
item += "AppKeypad";
item += QLatin1String("AppKeypad");
}
QString KeyboardTranslator::Entry::resultToString(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
{
if ( !_text.isEmpty() )
return escapedText(expandWildCards,modifiers);
return QString::fromLatin1(escapedText(expandWildCards,modifiers));
else if ( _command == EraseCommand )
return "Erase";
return QLatin1String("Erase");
else if ( _command == ScrollPageUpCommand )
return "ScrollPageUp";
return QLatin1String("ScrollPageUp");
else if ( _command == ScrollPageDownCommand )
return "ScrollPageDown";
return QLatin1String("ScrollPageDown");
else if ( _command == ScrollLineUpCommand )
return "ScrollLineUp";
return QLatin1String("ScrollLineUp");
else if ( _command == ScrollLineDownCommand )
return "ScrollLineDown";
return QLatin1String("ScrollLineDown");
else if ( _command == ScrollLockCommand )
return "ScrollLock";
return QLatin1String("ScrollLock");
else if (_command == ScrollUpToTopCommand)
return QLatin1String("ScrollUpToTop");
else if (_command == ScrollDownToBottomCommand)
return QLatin1String("ScrollDownToBottom");
return QString();
}
@@ -813,7 +821,7 @@ KeyboardTranslator::KeyboardTranslator(const QString& name)
{
}
void KeyboardTranslator::setDescription(const QString& description)
void KeyboardTranslator::setDescription(const QString& description)
{
_description = description;
}
@@ -852,10 +860,11 @@ void KeyboardTranslator::removeEntry(const Entry& entry)
}
KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const
{
foreach(const Entry& entry, _entries.values(keyCode))
for (auto it = _entries.cbegin(), end = _entries.cend(); it != end; ++it)
{
if ( entry.matches(keyCode,modifiers,state) )
return entry;
if (it.key() == keyCode)
if ( it.value().matches(keyCode,modifiers,state) )
return *it;
}
return Entry(); // entry not found
}
@@ -876,7 +885,7 @@ bool KeyboardTranslatorManager::deleteTranslator(const QString& name)
if ( QFile::remove(path) )
{
_translators.remove(name);
return true;
return true;
}
else
{
@@ -884,11 +893,8 @@ bool KeyboardTranslatorManager::deleteTranslator(const QString& name)
return false;
}
}
//K_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager )
KeyboardTranslatorManager* KeyboardTranslatorManager::theKeyboardTranslatorManager = 0;
Q_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager )
KeyboardTranslatorManager* KeyboardTranslatorManager::instance()
{
if (! theKeyboardTranslatorManager)
theKeyboardTranslatorManager = new KeyboardTranslatorManager();
return theKeyboardTranslatorManager;
}