* 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 053ce225cb8e09b54824b1c83780a4b3272e9c32..c69e021b94e6241287e72fc9b412b9f00b62a310 100644 (file)
--- 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 8f643c1b3bd678509f0c8dc247d3641d4145e84d..9ddb311afdc7b84023437bffab2de22fcc7514d7 100644 (file)
--- 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;