(free_frame_menubar) [USE_MOTIF]: If the shell widget's

x/y position is (0, 0) after destroying the menu bar, restore
its original position.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8f71a81c79a3206598cfcf00fb87cb973810d702..dd955df30cfafbb0cb2af3e9002052081f1596bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-03-27  Gerd Moellmann  <gerd@gnu.org>
 
+       * xmenu.c (free_frame_menubar) [USE_MOTIF]: If the shell widget's
+       x/y position is (0, 0) after destroying the menu bar, restore
+       its original position.
+
        * xdisp.c (in_ellipses_for_invisible_text_p): New function.
        (init_from_display_pos): Use it.
        (try_window_reusing_current_matrix): Don't use cursor_row_p.

diff --git a/src/xmenu.c b/src/xmenu.c
index 6c212da7ffa4acef70af73868a272dc0db7e557a..99f5c46a9594eae1adfb5639f0fb32dac2cf67ea 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1854,6 +1854,7 @@ initialize_frame_menubar (f)
   set_frame_menubar (f, 1, 1);
 }
 
+
 /* Get rid of the menu bar of frame F, and free its storage.
    This is used when deleting a frame, and when turning off the menu bar.  */
 
@@ -1869,9 +1870,33 @@ free_frame_menubar (f)
   
   if (menubar_widget)
     {
+#ifdef USE_MOTIF
+      /* Removing the menu bar magically changes the shell widget's x
+        and y position of (0, 0) which, when the menu bar is turned
+        on again, leads to pull-down menuss appearing in strange
+        positions near the upper-left corner of the display.  This
+        happens only with some window managers like twm and ctwm,
+        but not with other like Motif's mwm or kwm, because the
+        latter generate ConfigureNotify events when the menu bar
+        is switched off, which fixes the shell position.  */
+      Position x0, y0, x1, y1;
+#endif
+      
       BLOCK_INPUT;
+
+#ifdef USE_MOTIF
+      XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
+#endif
+      
       lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
       f->output_data.x->menubar_widget = NULL;
+
+#ifdef USE_MOTIF
+      XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
+      if (x1 == 0 && y1 == 0)
+       XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
+#endif
+      
       UNBLOCK_INPUT;
     }
 }