From 47935dd7f010f2f77768774ceb6f85667efe4264 Mon Sep 17 00:00:00 2001
From: Matthew Allum <breakfast@10.am>
Date: Mon, 6 Dec 2004 22:29:31 +0000
Subject: [PATCH] Xephyr on Xorg fix

---
 hw/kdrive/ephyr/hostx.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 6f13dd7f91..f3f961ec6c 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -596,6 +596,8 @@ hostx_paint_debug_rect(int x,     int y,
   EPHYR_DBG("msec: %li tv_sec %li, tv_msec %li", 
 	    HostX.damage_debug_msec, tspec.tv_sec, tspec.tv_nsec);
 
+  /* fprintf(stderr, "Xephyr updating: %i+%i %ix%i\n", x, y, width, height); */
+
   XFillRectangle(HostX.dpy, HostX.win, HostX.gc, x, y, width,height); 
   XSync(HostX.dpy, False);
 
@@ -608,6 +610,7 @@ hostx_load_keymap(void)
 {
   KeySym          *keymap;
   int              mapWidth, min_keycode, max_keycode;
+  int              i,j;
 
   XDisplayKeycodes(HostX.dpy, &min_keycode, &max_keycode);
 
@@ -618,8 +621,21 @@ hostx_load_keymap(void)
 			       max_keycode - min_keycode + 1,
 			       &mapWidth);
 
-  memcpy (kdKeymap, keymap, 
-	  (max_keycode - min_keycode + 1)*mapWidth*sizeof(KeySym));
+  /* Try and copy the hosts keymap into our keymap to avoid loads
+   * of messing around.
+   *
+   * kdrive cannot can have more than 4 keysyms per keycode
+   * so we only copy the first 4 ( xorg has 6 per keycode )
+   */
+
+  for (i=0; i<(max_keycode - min_keycode+1); i++)
+    for (j=0; j<4; j++)
+      kdKeymap[ (i*4)+j ] = keymap[ (i*mapWidth) + j ];
+
+  /* old way
+    memcpy (kdKeymap, keymap, 
+    (max_keycode - min_keycode + 1)*mapWidth*sizeof(KeySym));
+  */
 
   EPHYR_DBG("keymap width: %d", mapWidth);
   
@@ -629,7 +645,7 @@ hostx_load_keymap(void)
   kdMaxScanCode = max_keycode;
   kdMinKeyCode  = min_keycode;
   kdMaxKeyCode  = max_keycode;
-  kdKeymapWidth = mapWidth;
+  kdKeymapWidth = (mapWidth > 4) ? 4 : mapWidth;
 
   XFree(keymap);
 }