mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-04 12:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle the 'Any Modifier' state flag in keytab files.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=676123
This commit is contained in:
Robert Knight
2007-06-16 04:44:39 +00:00
parent df184a19ae
commit 1f8e6395f2
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/KeyboardTranslator.cpp
View File

@@ -312,6 +312,8 @@ bool KeyboardTranslatorReader::parseAsStateFlag(const QString& item , int& flag)
flag = KeyboardTranslator::NewLineState;
else if ( item == "appscreen" )
flag = KeyboardTranslator::AlternateScreenState;
else if ( item == "anymod" )
flag = KeyboardTranslator::AnyModifierState;
else
return false;
@@ -536,12 +538,25 @@ bool KeyboardTranslator::Entry::matches(int keyCode , Qt::KeyboardModifier modif
if ( _keyCode != keyCode )
return false;
if ( modifiers != ( _modifiers & _modifierMask ) )
if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) )
return false;
if ( state != ( _state & _stateMask ) )
if ( (state & _stateMask) != (_state & _stateMask) )
return false;
// special handling for the 'Any Modifier' state, which checks for the presence of
// any or no modifiers
if ( _stateMask & KeyboardTranslator::AnyModifierState )
{
// test fails if any modifier is required but none are set
if ( (_state & KeyboardTranslator::AnyModifierState) && modifiers == 0 )
return false;
// test fails if no modifier is allowed but one or more are set
if ( !(_state & KeyboardTranslator::AnyModifierState) && modifiers != 0 )
return false;
}
return true;
}
void KeyboardTranslator::Entry::insertModifier( QString& item , int modifier ) const
@@ -581,7 +596,8 @@ void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
item += "ansi";
else if ( state == KeyboardTranslator::CursorKeysState )
item += "AppCuKeys";
else if ( state == KeyboardTranslator::AnyModifierState )
item += "AnyMod";
}
QString KeyboardTranslator::Entry::conditionToString() const
{
@@ -598,6 +614,7 @@ QString KeyboardTranslator::Entry::conditionToString() const
insertState( result , KeyboardTranslator::NewLineState );
insertState( result , KeyboardTranslator::AnsiState );
insertState( result , KeyboardTranslator::CursorKeysState );
insertState( result , KeyboardTranslator::AnyModifierState );
return result;
}