s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move level change logic from key-pressed to key-released handler.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-07 14:39:35 +09:00
parent dd86b132ce
commit d57ae91995
2 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
eek/eek-keyboard.c
View File

@ -332,18 +332,10 @@ eek_keyboard_real_key_pressed (EekKeyboard *self,
return;
modifier = eek_symbol_get_modifier_mask (symbol);
switch (priv->modifier_behavior) {
case EEK_MODIFIER_BEHAVIOR_NONE:
if (priv->modifier_behavior == EEK_MODIFIER_BEHAVIOR_NONE) {
priv->modifiers |= modifier;
break;
case EEK_MODIFIER_BEHAVIOR_LOCK:
priv->modifiers ^= modifier;
break;
case EEK_MODIFIER_BEHAVIOR_LATCH:
priv->modifiers = (priv->modifiers ^ modifier) & modifier;
break;
set_level_from_modifiers (self);
}
set_level_from_modifiers (self);
}
static void
@ -359,9 +351,16 @@ eek_keyboard_real_key_released (EekKeyboard *self,
return;
modifier = eek_symbol_get_modifier_mask (symbol);
if (modifier != 0) {
if (priv->modifier_behavior == EEK_MODIFIER_BEHAVIOR_NONE)
priv->modifiers &= ~modifier;
switch (priv->modifier_behavior) {
case EEK_MODIFIER_BEHAVIOR_NONE:
priv->modifiers &= ~modifier;
break;
case EEK_MODIFIER_BEHAVIOR_LOCK:
priv->modifiers ^= modifier;
break;
case EEK_MODIFIER_BEHAVIOR_LATCH:
priv->modifiers = (priv->modifiers ^ modifier) & modifier;
break;
}
set_level_from_modifiers (self);
}