src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -84,11 +84,10 @@
 jfieldID graphicsConfigID;
 
 extern jobject currentX11InputMethodInstance;
 extern Boolean awt_x11inputmethod_lookupString(XKeyPressedEvent *, KeySym *);
 Boolean awt_UseType4Patch = False;
-/* how about HEADLESS */
 Boolean awt_ServerDetected = False;
 Boolean awt_XKBDetected = False;
 Boolean awt_IsXsun = False;
 Boolean awt_UseXKB = False;
 

@@ -904,11 +903,11 @@
 static void
 handleKeyEventWithNumLockMask(XEvent *event, KeySym *keysym)
 {
     KeySym originalKeysym = *keysym;
 
-#if !defined(__linux__) && !defined(MACOSX)
+#if !defined(__linux__)
     /* The following code on Linux will cause the keypad keys
      * not to echo on JTextField when the NumLock is on. The
      * keysyms will be 0, because the last parameter 2 is not defined.
      * See Xlib Programming Manual, O'Reilly & Associates, Section
      * 9.1.5 "Other Keyboard-handling Routines", "The meaning of