merge trunk

3 files changed, 17 insertions, 18 deletions

diff --git a/unix/install-sh b/unix/install-sh
index 5975819..7c34c3f 100644
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -120,7 +120,7 @@ Options:
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
   -s            $stripprog installed files.
-  -S $stripprog installed files.
+  -S            $stripprog installed files.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
@@ -156,8 +156,8 @@ while test $# -ne 0; do
 
     -s) stripcmd=$stripprog;;
 
--S) stripcmd="$stripprog $2" 
-         shift;; 
+    -S) stripcmd="$stripprog $2"
+	shift;;
 
     -t) dst_arg=$2
 	shift;;
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 7461d75..f132e59 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -11,6 +11,7 @@
  */
 
 #include "tkInt.h"
+#include <X11/XKBlib.h>
 
 /*
  * Prototypes for local functions defined in this file:
@@ -210,8 +211,8 @@ TkpGetString(
 
 /*
  * When mapping from a keysym to a keycode, need information about the
- * modifier state that should be used so that when they call XKeycodeToKeysym
- * taking into account the xkey.state, they will get back the original keysym.
+ * modifier state to be used so that when they call XkbKeycodeToKeysym taking
+ * into account the xkey.state, they will get back the original keysym.
  */
 
 void
@@ -230,7 +231,7 @@ TkpSetKeycodeAndState(
 	keycode = XKeysymToKeycode(display, keySym);
 	if (keycode != 0) {
 	    for (state = 0; state < 4; state++) {
-		if (XKeycodeToKeysym(display, keycode, state) == keySym) {
+		if (XkbKeycodeToKeysym(display, keycode, 0, state) == keySym){
 		    if (state & 1) {
 			eventPtr->xkey.state |= ShiftMask;
 		    }
@@ -320,7 +321,8 @@ TkpGetKeySym(
 	    && (eventPtr->xkey.state & LockMask))) {
 	index += 1;
     }
-    sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode, index);
+    sym = XkbKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode, 0,
+	    index);
 
     /*
      * Special handling: if the key was shifted because of Lock, but lock is
@@ -334,8 +336,8 @@ TkpGetKeySym(
 		|| ((sym >= XK_Agrave) && (sym <= XK_Odiaeresis))
 		|| ((sym >= XK_Ooblique) && (sym <= XK_Thorn)))) {
 	    index &= ~1;
-	    sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
-		    index);
+	    sym = XkbKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
+		    0, index);
 	}
     }
 
@@ -345,8 +347,8 @@ TkpGetKeySym(
      */
 
     if ((index & 1) && (sym == NoSymbol)) {
-	sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
-		index & ~1);
+	sym = XkbKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
+		0, index & ~1);
     }
     return sym;
 }
@@ -395,7 +397,7 @@ TkpInitKeymapInfo(
 	if (*codePtr == 0) {
 	    continue;
 	}
-	keysym = XKeycodeToKeysym(dispPtr->display, *codePtr, 0);
+	keysym = XkbKeycodeToKeysym(dispPtr->display, *codePtr, 0, 0);
 	if (keysym == XK_Shift_Lock) {
 	    dispPtr->lockUsage = LU_SHIFT;
 	    break;
@@ -421,7 +423,7 @@ TkpInitKeymapInfo(
 	if (*codePtr == 0) {
 	    continue;
 	}
-	keysym = XKeycodeToKeysym(dispPtr->display, *codePtr, 0);
+	keysym = XkbKeycodeToKeysym(dispPtr->display, *codePtr, 0, 0);
 	if (keysym == XK_Mode_switch) {
 	    dispPtr->modeModMask |= ShiftMask << (i/modMapPtr->max_keypermod);
 	}
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index be53ec6..13f2f04 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -1349,11 +1349,8 @@ SendInit(
      * for it.
      */
 
-    dispPtr->commTkwin = Tk_CreateWindow(interp, (Tk_Window) NULL,
-	    "_comm", DisplayString(dispPtr->display));
-    if (dispPtr->commTkwin == NULL) {
-	Tcl_Panic("Tk_CreateWindow failed in SendInit!");
-    }
+    dispPtr->commTkwin = (Tk_Window) TkAllocWindow(dispPtr,
+    	DefaultScreen(dispPtr->display), NULL);
     Tcl_Preserve(dispPtr->commTkwin);
     atts.override_redirect = True;
     Tk_ChangeWindowAttributes(dispPtr->commTkwin,