MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-158422 Keymap: for non-QWERTY keyboard layouts Ctrl is processed as Ctrl+Alt (Windows) or Alt (Mac OS) when combined with symbols

Browse Source
This commit is contained in:
Denis Fokin
2016-07-21 13:03:54 +03:00
parent 55feba636f
commit fcc94ac9ee
2 changed files with 34 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/CharToVKeyMap.java
+1 -1
View File
@@ -29,7 +29,7 @@ class CharToVKeyMap {
new HashMap<Character, Integer>();
public static Integer get (Character ch) {
return charToVKeyMap.get(ch);
return charToVKeyMap.containsKey(ch) ? charToVKeyMap.get(ch) : KeyEvent.VK_UNDEFINED;
}
static {
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+33 -67
View File
@@ -439,83 +439,49 @@ public class IdeEventQueue extends EventQueue {
// Try to get it from editor
Component sourceComponent = WindowManagerEx.getInstanceEx().getMostRecentFocusedWindow();
if (ke.getID() == KeyEvent.KEY_PRESSED) {
switch (ke.getKeyCode()) {
case KeyEvent.VK_CONTROL:
if ((ke.getModifiersEx() & (InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)) != (InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)) {
ctrlIsPressedCount++;
}
break;
case KeyEvent.VK_ALT:
if (ke.getKeyLocation() == KeyEvent.KEY_LOCATION_LEFT) {
if ((ke.getModifiersEx() & (InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)) != (InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)) {
leftAltIsPressed = true;
}
}
break;
}
}
else if (ke.getID() == KeyEvent.KEY_RELEASED) {
switch (ke.getKeyCode()) {
case KeyEvent.VK_CONTROL:
ctrlIsPressedCount = 0;
break;
case KeyEvent.VK_ALT:
if (ke.getKeyLocation() == KeyEvent.KEY_LOCATION_LEFT) {
leftAltIsPressed = false;
}
break;
}
switch (ke.getID()) {
case KeyEvent.KEY_PRESSED:
break;
case KeyEvent.KEY_RELEASED:
break;
}
if (!leftAltIsPressed && KeyboardSettingsExternalizable.getInstance().isUkrainianKeyboard(sourceComponent)) {
if ('ґ' == ke.getKeyChar() || ke.getKeyCode() == KeyEvent.VK_U) {
ke = new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), 0,
KeyEvent.VK_UNDEFINED, 'ґ', ke.getKeyLocation());
ke.setKeyCode(KeyEvent.VK_U);
ke.setKeyChar('ґ');
return ke;
}
}
//if (!leftAltIsPressed && KeyboardSettingsExternalizable.getInstance().isUkrainianKeyboard(sourceComponent)) {
// if ('ґ' == ke.getKeyChar() || ke.getKeyCode() == KeyEvent.VK_U) {
// ke = new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), 0,
// KeyEvent.VK_UNDEFINED, 'ґ', ke.getKeyLocation());
// ke.setKeyCode(KeyEvent.VK_U);
// ke.setKeyChar('ґ');
// return ke;
// }
//}
// NB: Standard keyboard layout is an English keyboard layout. If such
// layout is active every KeyEvent that is received has
// a @{code KeyEvent.getKeyCode} key code corresponding to
// the @{code KeyEvent.getKeyChar} key char in the event.
// For example, VK_MINUS key code and '-' character
//
// We have a key char. On some non standard layouts it does not correspond to
// key code in the event.
Integer keyCodeFromChar = CharToVKeyMap.get(ke.getKeyChar());
// Now we have a correct key code as if we'd gotten a KeyEvent for
// standard English layout
if (keyCodeFromChar == ke.getKeyCode() || keyCodeFromChar == KeyEvent.VK_UNDEFINED) {
return e;
}
// Farther we handle a non standard layout
if (keyCodeFromChar != null) {
if (keyCodeFromChar != ke.getKeyCode()) {
// non-english layout
ke.setKeyCode(keyCodeFromChar);
}
//for (int i = 0; sourceComponent == null && i < WindowManagerEx.getInstanceEx().getAllProjectFrames().length; i++) {
// sourceComponent = WindowManagerEx.getInstanceEx().getAllProjectFrames()[i].getComponent();
//}
if (sourceComponent != null) {
if (KeyboardSettingsExternalizable.isSupportedKeyboardLayout(sourceComponent)) {
if ((ke.getModifiersEx() & (InputEvent.ALT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)) != 0 /*&& ke.getKeyLocation() == KeyEvent.KEY_LOCATION_RIGHT*/) {
// On German keyboard layout on Windows we are getting on key press
// ctrl + alt instead of AltGr
int modifiers = ke.getModifiers() ^ InputEvent.ALT_DOWN_MASK ^ InputEvent.CTRL_DOWN_MASK;
if (ctrlIsPressedCount > 1) {
modifiers |= InputEvent.CTRL_DOWN_MASK;
}
if (leftAltIsPressed) {
modifiers |= InputEvent.ALT_MASK;
}
int oldKeyCode = ke.getKeyCode();
//noinspection MagicConstant
ke = new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), modifiers,
KeyEvent.VK_UNDEFINED, ke.getKeyChar(), KeyEvent.KEY_LOCATION_UNKNOWN);
ke.setKeyCode(oldKeyCode);
}
}
}
}
return ke;
}