mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-09 01:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2280: Fix regression. Mode compatible with old option.

Browse Source 
(cherry picked from commit a3e3c23cb1)
(cherry picked from commit 8c15ab819c)
This commit is contained in:
Denis Konoplev
2020-04-15 17:26:06 +03:00
committed by jbrbot
parent aff8a32b35
commit 6a8eeea8a7
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
View File

@@ -58,6 +58,7 @@ import sun.awt.PeerEvent;
import sun.awt.SunToolkit;
import sun.awt.X11ComponentPeer;
import sun.awt.X11GraphicsConfig;
import sun.awt.event.KeyEventProcessing;
import sun.awt.event.TouchEvent;
import sun.java2d.SunGraphics2D;
import sun.java2d.SurfaceData;
@@ -1313,7 +1314,14 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
);
}
int jkeyToReturn = XKeysym.getLegacyJavaKeycodeOnly(ev); // someway backward compatible
int jkeyToReturn;
if (KeyEventProcessing.useNationalLayouts) {
// if jkeyToReturn is VK_UNDEFINED then look for keycode in extended key code
jkeyToReturn = jkc.getJavaKeycode();
} else {
jkeyToReturn = XKeysym.getLegacyJavaKeycodeOnly(ev); // someway backward compatible
}
int jkeyExtended = jkc.getJavaKeycode() == java.awt.event.KeyEvent.VK_UNDEFINED ?
primaryUnicode2JavaKeycode( unicodeFromPrimaryKeysym ) :
jkc.getJavaKeycode();
@@ -1395,7 +1403,13 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
// is undefined, we still will have a guess of what was engraved on a keytop.
int unicodeFromPrimaryKeysym = keysymToUnicode( xkeycodeToPrimaryKeysym(ev) ,0);
int jkeyToReturn = XKeysym.getLegacyJavaKeycodeOnly(ev); // someway backward compatible
int jkeyToReturn;
if (KeyEventProcessing.useNationalLayouts) {
// if jkeyToReturn is VK_UNDEFINED then look for keycode in extended key code
jkeyToReturn = jkc.getJavaKeycode();
} else {
jkeyToReturn = XKeysym.getLegacyJavaKeycodeOnly(ev); // someway backward compatible
}
int jkeyExtended = jkc.getJavaKeycode() == java.awt.event.KeyEvent.VK_UNDEFINED ?
primaryUnicode2JavaKeycode( unicodeFromPrimaryKeysym ) :
jkc.getJavaKeycode();