From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 9 Oct 2002 19:38:52 +0000 (+0000)
Subject: * xterm.c (XTread_socket):  Pass ReparentNotify to Xt.
X-Git-Tag: emacs-pretest-21.2.92~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=914b2573e7bc3fe3cb97b206c643a77d72d9c52a;p=emacs.git

* xterm.c (XTread_socket):  Pass ReparentNotify to Xt.
The shell widget interprets ConfigureNotify differently depending
on if it has been reparented or not.  This fixes the bug
that Motif-menus are misplaced under some windowmanagers
(CDE an WindowMaker at least).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 053ce225cb8..c69e021b94e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-09  Jan D.  <jan.h.d@swipnet.se>
+
+	* xterm.c (XTread_socket):  Pass ReparentNotify to Xt.
+	The shell widget interprets ConfigureNotify differently depending
+	on if it has been reparented or not.  This fixes the bug
+	that Motif-menus are misplaced under some windowmanagers
+	(CDE an WindowMaker at least).
+
 2002-10-08  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (code_convert_region): When we need more GAP for
diff --git a/src/xterm.c b/src/xterm.c
index 8f643c1b3bd..9ddb311afdc 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10210,6 +10210,7 @@ XTread_socket (sd, bufp, numchars, expected)
 		  x_real_positions (f, &x, &y);
 		  f->output_data.x->left_pos = x;
 		  f->output_data.x->top_pos = y;
+                  goto OTHER;
 		}
 	      break;
 
@@ -10853,16 +10854,6 @@ XTread_socket (sd, bufp, numchars, expected)
 		      f->output_data.x->win_gravity = NorthWestGravity;
 		      x_wm_set_size_hint (f, (long) 0, 0);
 		    }
-#ifdef USE_MOTIF
-		  /* Some window managers pass (0,0) as the location of
-		     the window, and the Motif event handler stores it
-		     in the emacs widget, which messes up Motif menus.  */
-		  if (event.xconfigure.x == 0 && event.xconfigure.y == 0)
-		    {
-		      event.xconfigure.x = f->output_data.x->widget->core.x;
-		      event.xconfigure.y = f->output_data.x->widget->core.y;
-		    }
-#endif /* USE_MOTIF */
 		}
 	      goto OTHER;