From a96254234fc9410944406f6ae878815cd3cfcee3 Mon Sep 17 00:00:00 2001
From: Matthew Allum <breakfast@10.am>
Date: Wed, 24 Nov 2004 17:08:06 +0000
Subject: [PATCH] XEphyr -parent switch fixes

---
 hw/kdrive/ephyr/ephyr.c |  2 +-
 hw/kdrive/ephyr/hostx.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 5e87a2816..2663728ae 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -339,7 +339,7 @@ ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
 	{ 1400, 1050 },
 	{ 1280, 960  },
 	{ 1280, 1024 },
-	{ 1152, 768 },
+	{ 1152, 864 },
 	{ 1024, 768 },
 	{ 832, 624 },
 	{ 800, 600 },
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 7535a27fb..c90ca7136 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -229,7 +229,10 @@ hostx_init(void)
 
       hostx_errors_trap();
 
-      result = XGetWindowAttributes(HostX.dpy, HostX.win, &prewin_attr);
+      result = XGetWindowAttributes(HostX.dpy, 
+				    HostX.win_pre_existing, 
+				    &prewin_attr);
+
 
       if (hostx_errors_untrap() || !result)
 	{
@@ -240,7 +243,15 @@ hostx_init(void)
       HostX.win_width  = prewin_attr.width;
       HostX.win_height = prewin_attr.height;
 
-      XSelectInput(HostX.dpy, HostX.win, attr.event_mask);
+      HostX.win = XCreateWindow(HostX.dpy,
+				HostX.win_pre_existing,
+				0,0,HostX.win_width,HostX.win_height,
+				0,
+				CopyFromParent,
+				CopyFromParent,
+				CopyFromParent,
+				CWEventMask,
+				&attr);
     }
   else
     {