Experiment: What if we would use the trans_chars array on all platforms, X11 too?

2 files changed, 9 insertions, 23 deletions

diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index a2fa293..6c2ba94 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -1749,20 +1749,6 @@ CleanUpTkEvent(
     XEvent *eventPtr)
 {
     switch (eventPtr->type) {
-    case KeyPress:
-    case KeyRelease: {
-
-#if !defined(_WIN32) && !defined(MAC_OSX_TK)
-	TkKeyEvent *kePtr = (TkKeyEvent *) eventPtr;
-	if (kePtr->charValuePtr != NULL) {
-	    ckfree(kePtr->charValuePtr);
-	    kePtr->charValuePtr = NULL;
-	    kePtr->charValueLen = 0;
-	}
-#endif
-	break;
-    }
-
     case VirtualEvent: {
 	XVirtualEvent *vePtr = (XVirtualEvent *) eventPtr;
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index d90cb0e..008b8c4 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -850,20 +850,20 @@ typedef struct TkWindow {
  * but have internally generated pieces added to them.
  */
 
+#ifndef XMaxTransChars
+#   if defined(_WIN32)
+#	define XMaxTransChars 15
+#   else
+#	define XMaxTransChars 27
+#   endif
+#endif
+
 typedef struct {
     XKeyEvent keyEvent;		/* The real event from X11. */
-#ifdef _WIN32
     char trans_chars[XMaxTransChars];
                             /* translated characters */
     unsigned char nbytes;
-#else
-    char *charValuePtr;		/* A pointer to a string that holds the key's
-				 * %A substitution text (before backslash
-				 * adding), or NULL if that has not been
-				 * computed yet. If non-NULL, this string was
-				 * allocated with ckalloc(). */
-    int charValueLen;		/* Length of string in charValuePtr when that
-				 * is non-NULL. */
+#if !defined(_WIN32)
     KeySym keysym;		/* Key symbol computed after input methods
 				 * have been invoked */
 #endif