]> code.delx.au - gnu-emacs/blobdiff - lwlib/lwlib-Xm.c
(preserve_other_columns, preserve_my_columns): Use new
[gnu-emacs] / lwlib / lwlib-Xm.c
index 7444d3634dcae85fa834dace512cb06c1334b226..2050c2957550e1ed9ef3d894f34f18798f19f5ea 100644 (file)
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,6 +34,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <Xm/BulletinB.h>
 #include <Xm/CascadeB.h>
+#include <Xm/CascadeBG.h>
 #include <Xm/DrawingA.h>
 #include <Xm/FileSB.h>
 #include <Xm/Label.h>
@@ -55,16 +57,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <Xm/DialogS.h>
 #include <Xm/Form.h>
 
-static void xm_pull_down_callback (Widget, XtPointer, XtPointer);
-static void xm_internal_update_other_instances (Widget, XtPointer,
-                                               XtPointer);
-static void xm_generic_callback (Widget, XtPointer, XtPointer);
-static void xm_nosel_callback (Widget, XtPointer, XtPointer);
-static void xm_pop_down_callback (Widget, XtPointer, XtPointer);
+static void xm_pull_down_callback (/* Widget, XtPointer, XtPointer */);
+static void xm_internal_update_other_instances (/* Widget, XtPointer,
+                                                     XtPointer */);
+static void xm_generic_callback (/* Widget, XtPointer, XtPointer */);
+static void xm_nosel_callback (/* Widget, XtPointer, XtPointer */);
+static void xm_pop_down_callback (/* Widget, XtPointer, XtPointer */);
+
+static void xm_update_menu (/* widget_instance*, Widget, widget_value*,
+                                 Boolean) */);
 
-static void
-xm_update_menu (widget_instance* instance, Widget widget, widget_value* val,
-               Boolean deep_p);
 
 \f/* Structures to keep destroyed instances */
 typedef struct _destroyed_instance 
@@ -81,8 +83,12 @@ static destroyed_instance*
 all_destroyed_instances = NULL;
 
 static destroyed_instance*
-make_destroyed_instance (char* name, char* type, Widget widget, Widget parent,
-                        Boolean pop_up_p)
+make_destroyed_instance (name, type, widget, parent, pop_up_p)
+     char* name;
+     char* type;
+     Widget widget;
+     Widget parent;
+     Boolean pop_up_p;
 {
   destroyed_instance* instance =
     (destroyed_instance*)malloc (sizeof (destroyed_instance));
@@ -96,7 +102,8 @@ make_destroyed_instance (char* name, char* type, Widget widget, Widget parent,
 }
                         
 static void
-free_destroyed_instance (destroyed_instance* instance)
+free_destroyed_instance (instance)
+     destroyed_instance* instance;
 {
   free (instance->name);
   free (instance->type);
@@ -105,13 +112,15 @@ free_destroyed_instance (destroyed_instance* instance)
 
 \f/* motif utility functions */
 Widget
-first_child (Widget widget)
+first_child (widget)
+     Widget widget;
 {
   return ((CompositeWidget)widget)->composite.children [0];
 }
 
 Boolean
-lw_motif_widget_p (Widget widget)
+lw_motif_widget_p (widget)
+     Widget widget;
 {
   return 
     XtClass (widget) == xmDialogShellWidgetClass
@@ -119,7 +128,9 @@ lw_motif_widget_p (Widget widget)
 }
 
 static XmString
-resource_motif_string (Widget widget, char* name)
+resource_motif_string (widget, name)
+     Widget widget;
+     char* name;
 {
   XtResource resource;
   XmString result = 0;
@@ -137,8 +148,13 @@ resource_motif_string (Widget widget, char* name)
   return result;
 }
 
+/* Destroy all of the children of WIDGET
+   starting with number FIRST_CHILD_TO_DESTROY.  */
+
 static void
-destroy_all_children (Widget widget)
+destroy_all_children (widget, first_child_to_destroy)
+     Widget widget;
+     int first_child_to_destroy;
 {
   Widget* children;
   unsigned int number;
@@ -147,24 +163,37 @@ destroy_all_children (Widget widget)
   children = XtCompositeChildren (widget, &number);
   if (children)
     {
+      XtUnmanageChildren (children + first_child_to_destroy,
+                         number - first_child_to_destroy);
+
       /* Unmanage all children and destroy them.  They will only be 
-       * really destroyed when we get out of DispatchEvent. */
-      for (i = 0; i < number; i++)
+        really destroyed when we get out of DispatchEvent.  */
+      for (i = first_child_to_destroy; i < number; i++)
        {
-         Widget child = children [i];
-         if (!child->core.being_destroyed)
-           {
-             XtUnmanageChild (child);
-             XtDestroyWidget (child);
-           }
+         Arg al[2];
+         Widget submenu = 0;
+         /* Cascade buttons have submenus,and these submenus
+            need to be freed.  But they are not included in
+            XtCompositeChildren.  So get it out of the cascade button
+            and free it.  If this child is not a cascade button,
+            then submenu should remain unchanged.  */
+         XtSetArg (al[0], XmNsubMenuId, &submenu); 
+         XtGetValues (children[i], al, 1);
+         if (submenu)
+           XtDestroyWidget (submenu);
+         XtDestroyWidget (children[i]);
        }
+
       XtFree ((char *) children);
     }
 }
 
 \f/* update the label of anything subclass of a label */
 static void
-xm_update_label (widget_instance* instance, Widget widget, widget_value* val)
+xm_update_label (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   XmString res_string = 0;
   XmString built_string = 0;
@@ -209,7 +238,10 @@ xm_update_label (widget_instance* instance, Widget widget, widget_value* val)
 
 \f/* update of list */
 static void
-xm_update_list (widget_instance* instance, Widget widget, widget_value* val)
+xm_update_list (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   widget_value* cur;
   int i;
@@ -230,8 +262,10 @@ xm_update_list (widget_instance* instance, Widget widget, widget_value* val)
 
 \f/* update of buttons */
 static void
-xm_update_pushbutton (widget_instance* instance, Widget widget,
-                     widget_value* val)
+xm_update_pushbutton (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   XtVaSetValues (widget, XmNalignment, XmALIGNMENT_CENTER, 0);
   XtRemoveAllCallbacks (widget, XmNactivateCallback);
@@ -239,8 +273,10 @@ xm_update_pushbutton (widget_instance* instance, Widget widget,
 }
 
 static void
-xm_update_cascadebutton (widget_instance* instance, Widget widget,
-                        widget_value* val)
+xm_update_cascadebutton (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   /* Should also rebuild the menu by calling ...update_menu... */
   XtRemoveAllCallbacks (widget, XmNcascadingCallback);
@@ -250,7 +286,10 @@ xm_update_cascadebutton (widget_instance* instance, Widget widget,
 
 \f/* update toggle and radiobox */
 static void
-xm_update_toggle (widget_instance* instance, Widget widget, widget_value* val)
+xm_update_toggle (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   XtRemoveAllCallbacks (widget, XmNvalueChangedCallback);
   XtAddCallback (widget, XmNvalueChangedCallback,
@@ -260,8 +299,11 @@ xm_update_toggle (widget_instance* instance, Widget widget, widget_value* val)
 }
 
 static void
-xm_update_radiobox (widget_instance* instance, Widget widget,
-                   widget_value* val)
+xm_update_radiobox (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
+
 {
   Widget toggle;
   widget_value* cur;
@@ -300,7 +342,8 @@ xm_update_radiobox (widget_instance* instance, Widget widget,
 
 \f/* update a popup menu, pulldown menu or a menubar */
 static Boolean
-all_dashes_p (char* s)
+all_dashes_p (s)
+     char* s;
 {
   char* t;
   for (t = s; *t; t++)
@@ -309,9 +352,14 @@ all_dashes_p (char* s)
   return True;
 }
 
+/* KEEP_FIRST_CHILDREN gives the number of initial children to keep.  */
+
 static void
-make_menu_in_widget (widget_instance* instance, Widget widget,
-                    widget_value* val)
+make_menu_in_widget (instance, widget, val, keep_first_children)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
+     int keep_first_children;
 {
   Widget* children = 0;
   int num_children;
@@ -323,6 +371,11 @@ make_menu_in_widget (widget_instance* instance, Widget widget,
   int ac;
   Boolean menubar_p;
 
+  Widget* old_children;
+  unsigned int old_num_children;
+
+  old_children = XtCompositeChildren (widget, &old_num_children);
+
   /* Allocate the children array */
   for (num_children = 0, cur = val; cur; num_children++, cur = cur->next);
   children = (Widget*)XtMalloc (num_children * sizeof (Widget));
@@ -338,14 +391,26 @@ make_menu_in_widget (widget_instance* instance, Widget widget,
     XtAddCallback (XtParent (widget), XmNpopdownCallback,
                   xm_pop_down_callback, (XtPointer)instance);
 
-  for (child_index = 0, cur = val; cur; child_index++, cur = cur->next)
+  /* Preserve the first KEEP_FIRST_CHILDREN old children.  */
+  for (child_index = 0, cur = val; child_index < keep_first_children;
+       child_index++, cur = cur->next)
+    children[child_index] = old_children[child_index];
+
+  /* Check that those are all we have
+     (the caller should have deleted the rest).  */
+  if (old_num_children != keep_first_children)
+    abort ();
+
+  /* Create the rest.  */
+  for (child_index = keep_first_children; cur; child_index++, cur = cur->next)
     {    
       ac = 0;
       XtSetArg (al [ac], XmNsensitive, cur->enabled); ac++;
       XtSetArg (al [ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++;
       XtSetArg (al [ac], XmNuserData, cur->call_data); ac++;
       
-      if (instance->pop_up_p && !cur->contents && !cur->call_data)
+      if (instance->pop_up_p && !cur->contents && !cur->call_data
+         && !all_dashes_p (cur->name))
        {
          ac = 0;
          XtSetArg (al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++;
@@ -373,10 +438,13 @@ make_menu_in_widget (widget_instance* instance, Widget widget,
        }
       else
        {
-         menu = XmCreatePulldownMenu (widget, "pulldown", NULL, 0);
-         make_menu_in_widget (instance, menu, cur->contents);
-         XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
-         button = XmCreateCascadeButton (widget, cur->name, al, ac);
+         menu = XmCreatePulldownMenu (widget, cur->name, NULL, 0);
+         make_menu_in_widget (instance, menu, cur->contents, 0);
+          XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+          /* non-zero values don't work reliably in
+             conjunction with Emacs' event loop */
+          XtSetArg (al [ac], XmNmappingDelay, 0); ac++;
+         button = XmCreateCascadeButtonGadget (widget, cur->name, al, ac);
 
          xm_update_label (instance, button, cur);
 
@@ -399,18 +467,23 @@ make_menu_in_widget (widget_instance* instance, Widget widget,
     }
 
   XtFree ((char *) children);
+  if (old_children)
+    XtFree ((char *) old_children);
 }
 
 static void
-update_one_menu_entry (widget_instance* instance, Widget widget,
-                      widget_value* val, Boolean deep_p)
+update_one_menu_entry (instance, widget, val, deep_p)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
+     Boolean deep_p;
 {
   Arg al [256];
   int ac;
   Widget menu;
   widget_value* contents;
 
-  if (val->change == NO_CHANGE)
+  if (val->this_one_change == NO_CHANGE)
     return;
 
   /* update the sensitivity and userdata */
@@ -421,7 +494,7 @@ update_one_menu_entry (widget_instance* instance, Widget widget,
                 0);
 
   /* update the menu button as a label. */
-  if (val->change >= VISIBLE_CHANGE)
+  if (val->this_one_change >= VISIBLE_CHANGE)
     xm_update_label (instance, widget, val);
 
   /* update the pulldown/pullaside as needed */
@@ -436,11 +509,50 @@ update_one_menu_entry (widget_instance* instance, Widget widget,
     {
       if (contents)
        {
-         menu = XmCreatePulldownMenu (widget, "pulldown", NULL, 0);
-         make_menu_in_widget (instance, menu, contents);
-         ac = 0;
-         XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
-         XtSetValues (widget, al, ac);
+         unsigned int old_num_children, i;
+         Widget parent;
+         Widget *widget_list;
+
+         parent = XtParent (widget);
+         widget_list = XtCompositeChildren (parent, &old_num_children);
+
+         /* Find the widget position within the parent's widget list.  */
+         for (i = 0; i < old_num_children; i++)
+           if (strcmp (XtName (widget_list[i]), XtName (widget)) == 0)
+             break;
+         if (i == old_num_children)
+           abort ();
+         if (XmIsCascadeButton (widget_list[i]))
+           {
+             menu = XmCreatePulldownMenu (parent, XtName(widget), NULL, 0);
+             make_menu_in_widget (instance, menu, contents, 0);
+             ac = 0;
+             XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+             XtSetValues (widget, al, ac);
+           }
+         else
+           {
+             Widget button;
+             
+             /* The current menuitem is a XmPushButtonGadget, it 
+                needs to be replaced by a CascadeButtonGadget */
+             XtDestroyWidget (widget_list[i]);
+             menu = XmCreatePulldownMenu (parent, val->name, NULL, 0);
+             make_menu_in_widget (instance, menu, contents, 0);
+             ac = 0;
+             XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+             /* Non-zero values don't work reliably in
+                conjunction with Emacs' event loop */
+             XtSetArg (al [ac], XmNmappingDelay, 0); ac++;
+             /* Tell Motif to put it in the right place */
+             XtSetArg (al [ac], XmNpositionIndex, i); ac++;
+             button = XmCreateCascadeButtonGadget (parent, val->name, al, ac);
+             xm_update_label (instance, button, val);
+             
+             XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback,
+                            (XtPointer)instance);
+             XtManageChild (button);
+           }
        }
     }
   else if (!contents)
@@ -455,49 +567,85 @@ update_one_menu_entry (widget_instance* instance, Widget widget,
 }
 
 static void
-xm_update_menu (widget_instance* instance, Widget widget, widget_value* val,
-               Boolean deep_p)
+xm_update_menu (instance, widget, val, deep_p)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
+     Boolean deep_p;
 {
+  Widget* children;
+  unsigned int num_children;
+  int num_children_to_keep = 0;
+  int i;
+  widget_value* cur;
+
+  children = XtCompositeChildren (widget, &num_children);
+
   /* Widget is a RowColumn widget whose contents have to be updated
    * to reflect the list of items in val->contents */
-  if (val->contents->change == STRUCTURAL_CHANGE)
+
+  /* See how many buttons we can keep, and how many we
+     must completely replace.  */
+  if (val->contents == 0)
+    num_children_to_keep = 0;
+  else if (val->contents->change == STRUCTURAL_CHANGE)
     {
-      destroy_all_children (widget);
-      make_menu_in_widget (instance, widget, val->contents);
+      if (children)
+       {
+         for (i = 0, cur = val->contents; 
+               (i < num_children
+               && cur); /* how else to ditch unwanted children ?? - mgd */
+              i++, cur = cur->next)
+           {
+             if (cur->this_one_change == STRUCTURAL_CHANGE)
+               break;
+           }
+
+         num_children_to_keep = i;
+       }
     }
   else
-    {
-      /* Update all the buttons of the RowColumn in order. */
-      Widget* children;
-      unsigned int num_children;
-      int i;
-      widget_value* cur;
+    num_children_to_keep = num_children;
 
-      children = XtCompositeChildren (widget, &num_children);
-      if (children)
+  /* Update all the buttons of the RowColumn, in order,
+     except for those we are going to replace entirely.  */
+  if (children)
+    {
+      for (i = 0, cur = val->contents; i < num_children_to_keep; i++)
        {
-         for (i = 0, cur = val->contents; i < num_children; i++)
+         if (!cur)
            {
-             if (!cur)
-               abort ();
-             if (children [i]->core.being_destroyed
-                 || strcmp (XtName (children [i]), cur->name))
-               continue;
-             update_one_menu_entry (instance, children [i], cur, deep_p);
-             cur = cur->next;
+             num_children_to_keep = i;
+             break;
            }
-         XtFree ((char *) children);
+         if (children [i]->core.being_destroyed
+             || strcmp (XtName (children [i]), cur->name))
+           continue;
+         update_one_menu_entry (instance, children [i], cur, deep_p);
+         cur = cur->next;
        }
-      if (cur)
-       abort ();
     }
+
+  /* Now replace from scratch all the buttons after the last
+     place that the top-level structure changed.  */
+  if (val->contents->change == STRUCTURAL_CHANGE)
+    {
+      destroy_all_children (widget, num_children_to_keep);
+      make_menu_in_widget (instance, widget, val->contents,
+                          num_children_to_keep);
+    }
+
+  XtFree ((char *) children);
 }
 
 \f
 /* update text widgets */
 
 static void
-xm_update_text (widget_instance* instance, Widget widget, widget_value* val)
+xm_update_text (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   XmTextSetString (widget, val->value ? val->value : "");
   XtRemoveAllCallbacks (widget, XmNactivateCallback);
@@ -508,8 +656,10 @@ xm_update_text (widget_instance* instance, Widget widget, widget_value* val)
 }
 
 static void
-xm_update_text_field (widget_instance* instance, Widget widget,
-                     widget_value* val)
+xm_update_text_field (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   XmTextFieldSetString (widget, val->value ? val->value : "");
   XtRemoveAllCallbacks (widget, XmNactivateCallback);
@@ -523,8 +673,11 @@ xm_update_text_field (widget_instance* instance, Widget widget,
 /* update a motif widget */
 
 void
-xm_update_one_widget (widget_instance* instance, Widget widget,
-                     widget_value* val, Boolean deep_p)
+xm_update_one_widget (instance, widget, val, deep_p)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
+     Boolean deep_p;
 {
   WidgetClass class;
   
@@ -587,8 +740,10 @@ xm_update_one_widget (widget_instance* instance, Widget widget,
 
 \f/* getting the value back */
 void
-xm_update_one_value (widget_instance* instance, Widget widget,
-                    widget_value* val)
+xm_update_one_value (instance, widget, val)
+     widget_instance* instance;
+     Widget widget;
+     widget_value* val;
 {
   WidgetClass class = XtClass (widget);
   widget_value *old_wv;
@@ -680,11 +835,14 @@ xm_update_one_value (widget_instance* instance, Widget widget,
 /* This function is for activating a button from a program.  It's wrong because
    we pass a NULL argument in the call_data which is not Motif compatible.
    This is used from the XmNdefaultAction callback of the List widgets to
-   have a dble-click put down a dialog box like the button woudl do. 
+   have a double-click put down a dialog box like the button would do. 
    I could not find a way to do that with accelerators.
  */
 static void
-activate_button (Widget widget, XtPointer closure, XtPointer call_data)
+activate_button (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   Widget button = (Widget)closure;
   XtCallCallbacks (button, XmNactivateCallback, NULL);
@@ -694,10 +852,18 @@ activate_button (Widget widget, XtPointer closure, XtPointer call_data)
 
 /* dialogs */
 static Widget
-make_dialog (char* name, Widget parent, Boolean pop_up_p,
-            char* shell_title, char* icon_name, Boolean text_input_slot,
-            Boolean radio_box, Boolean list,
-            int left_buttons, int right_buttons)
+make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot,
+            radio_box, list, left_buttons, right_buttons)
+     char* name;
+     Widget parent;
+     Boolean pop_up_p;
+     char* shell_title;
+     char* icon_name;
+     Boolean text_input_slot;
+     Boolean radio_box;
+     Boolean list;
+     int left_buttons;
+     int right_buttons;
 {
   Widget result;
   Widget form;
@@ -784,7 +950,7 @@ make_dialog (char* name, Widget parent, Boolean pop_up_p,
       n_children++;
     }
 
-  /* invisible seperator button */
+  /* invisible separator button */
   ac = 0;
   XtSetArg (al[ac], XmNmappedWhenManaged, FALSE); ac++;
   children [n_children] = XmCreateLabel (row, "separator_button", al, ac);
@@ -945,7 +1111,8 @@ make_dialog (char* name, Widget parent, Boolean pop_up_p,
 }
 
 static destroyed_instance*
-find_matching_instance (widget_instance* instance)
+find_matching_instance (instance)
+     widget_instance* instance;
 {
   destroyed_instance*  cur;
   destroyed_instance*  prev;
@@ -982,15 +1149,18 @@ find_matching_instance (widget_instance* instance)
 }
 
 static void
-mark_dead_instance_destroyed (Widget widget, XtPointer closure,
-                             XtPointer call_data)
+mark_dead_instance_destroyed (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   destroyed_instance* instance = (destroyed_instance*)closure;
   instance->widget = NULL;
 }
 
 static void
-recenter_widget (Widget widget)
+recenter_widget (widget)
+     Widget widget;
 {
   Widget parent = XtParent (widget);
   Screen* screen = XtScreen (widget);
@@ -1026,7 +1196,8 @@ recenter_widget (Widget widget)
 }
 
 static Widget
-recycle_instance (destroyed_instance* instance)
+recycle_instance (instance)
+     destroyed_instance* instance;
 {
   Widget widget = instance->widget;
 
@@ -1062,7 +1233,8 @@ recycle_instance (destroyed_instance* instance)
 }
 
 Widget
-xm_create_dialog (widget_instance* instance)
+xm_create_dialog (instance)
+     widget_instance* instance;
 {
   char*        name = instance->info->type;
   Widget       parent = instance->parent;
@@ -1137,21 +1309,34 @@ xm_create_dialog (widget_instance* instance)
   return widget;
 }
 
+/* Create a menu bar.  We turn off the f10 key
+   because we have not yet managed to make it work right in Motif.  */
+
 static Widget
-make_menubar (widget_instance* instance)
+make_menubar (instance)
+     widget_instance* instance;
 {
-  return XmCreateMenuBar (instance->parent, instance->info->name, NULL, 0);
+  Arg al[1];
+  int ac;
+
+  ac = 0;
+  XtSetArg(al[0], XmNmenuAccelerator, 0);
+  return XmCreateMenuBar (instance->parent, instance->info->name, al, 1);
 }
 
 static void
-remove_grabs (Widget shell, XtPointer closure, XtPointer call_data)
+remove_grabs (shell, closure, call_data)
+     Widget shell;
+     XtPointer closure;
+     XtPointer call_data;
 {
-  XmRowColumnWidget menu = (XmRowColumnWidget) closure;
-  XmRemoveFromPostFromList (menu, XtParent (XtParent ((Widget) menu)));
+  Widget menu = (Widget) closure;
+  XmRemoveFromPostFromList (menu, XtParent (XtParent (menu)));
 }
 
 static Widget
-make_popup_menu (widget_instance* instance)
+make_popup_menu (instance)
+     widget_instance* instance;
 {
   Widget parent = instance->parent;
   Window parent_window = parent->core.window;
@@ -1166,7 +1351,8 @@ make_popup_menu (widget_instance* instance)
   return result;
 }
 static Widget
-make_main (widget_instance* instance)
+make_main (instance)
+     widget_instance* instance;
 {
   Widget parent = instance->parent;
   Widget result;
@@ -1305,7 +1491,8 @@ xm_creation_table [] =
 
 \f/* Destruction of instances */
 void
-xm_destroy_instance (widget_instance* instance)
+xm_destroy_instance (instance)
+     widget_instance* instance;
 {
   Widget widget = instance->widget;
   /* recycle the dialog boxes */
@@ -1339,22 +1526,26 @@ xm_destroy_instance (widget_instance* instance)
 
 \f/* popup utility */
 void
-xm_popup_menu (Widget widget)
+xm_popup_menu (widget, event)
+     Widget widget;
+     XEvent *event;
 {
   XButtonPressedEvent dummy;
-  XEvent* event;
-
-  dummy.type = ButtonPress;
-  dummy.serial = 0;
-  dummy.send_event = 0;
-  dummy.display = XtDisplay (widget);
-  dummy.window = XtWindow (XtParent (widget));
-  dummy.time = 0;
-  dummy.button = 0;
-  XQueryPointer (dummy.display, dummy.window, &dummy.root,
-                &dummy.subwindow, &dummy.x_root, &dummy.y_root,
-                &dummy.x, &dummy.y, &dummy.state);
-  event = (XEvent *) &dummy;
+
+  if (event == 0)
+    {
+      dummy.type = ButtonPress;
+      dummy.serial = 0;
+      dummy.send_event = 0;
+      dummy.display = XtDisplay (widget);
+      dummy.window = XtWindow (XtParent (widget));
+      dummy.time = 0;
+      dummy.button = 0;
+      XQueryPointer (dummy.display, dummy.window, &dummy.root,
+                    &dummy.subwindow, &dummy.x_root, &dummy.y_root,
+                    &dummy.x, &dummy.y, &dummy.state);
+      event = (XEvent *) &dummy;
+    }
 
   if (event->type == ButtonPress || event->type == ButtonRelease)
     {
@@ -1375,7 +1566,8 @@ xm_popup_menu (Widget widget)
 }
 
 static void
-set_min_dialog_size (Widget w)
+set_min_dialog_size (w)
+     Widget w;
 {
   short width;
   short height;
@@ -1384,7 +1576,9 @@ set_min_dialog_size (Widget w)
 }
 
 void
-xm_pop_instance (widget_instance* instance, Boolean up)
+xm_pop_instance (instance, up)
+     widget_instance* instance;
+     Boolean up;
 {
   Widget widget = instance->widget;
 
@@ -1415,7 +1609,10 @@ xm_pop_instance (widget_instance* instance, Boolean up)
 enum do_call_type { pre_activate, selection, no_selection, post_activate };
 
 static void
-do_call (Widget widget, XtPointer closure, enum do_call_type type)
+do_call (widget, closure, type)
+     Widget widget;
+     XtPointer closure;
+     enum do_call_type type;
 {
   Arg al [256];
   int ac;
@@ -1467,8 +1664,10 @@ do_call (Widget widget, XtPointer closure, enum do_call_type type)
    if the widget was ``destroyed'' by caching it in the all_destroyed_instances
    list */
 static void
-xm_internal_update_other_instances (Widget widget, XtPointer closure,
-                                   XtPointer call_data)
+xm_internal_update_other_instances (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   Widget parent;
   for (parent = widget; parent; parent = XtParent (parent))
@@ -1480,14 +1679,20 @@ xm_internal_update_other_instances (Widget widget, XtPointer closure,
 }
 
 static void
-xm_generic_callback (Widget widget, XtPointer closure, XtPointer call_data)
+xm_generic_callback (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   lw_internal_update_other_instances (widget, closure, call_data);
   do_call (widget, closure, selection);
 }
 
 static void
-xm_nosel_callback (Widget widget, XtPointer closure, XtPointer call_data)
+xm_nosel_callback (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   /* This callback is only called when a dialog box is dismissed with the wm's
      destroy button (WM_DELETE_WINDOW.)  We want the dialog box to be destroyed
@@ -1502,21 +1707,33 @@ xm_nosel_callback (Widget widget, XtPointer closure, XtPointer call_data)
 }
 
 static void
-xm_pull_down_callback (Widget widget, XtPointer closure, XtPointer call_data)
+xm_pull_down_callback (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
   do_call (widget, closure, pre_activate);
 }
 
 static void
-xm_pop_down_callback (Widget widget, XtPointer closure, XtPointer call_data)
+xm_pop_down_callback (widget, closure, call_data)
+     Widget widget;
+     XtPointer closure;
+     XtPointer call_data;
 {
-  do_call (widget, closure, post_activate);
+  widget_instance *instance = (widget_instance *) closure;
+
+  if ((!instance->pop_up_p && (XtParent (widget) == instance->widget))
+      || (XtParent (widget) == instance->parent))
+    do_call (widget, closure, post_activate);
 }
 
 \f
 /* set the keyboard focus */
 void
-xm_set_keyboard_focus (Widget parent, Widget w)
+xm_set_keyboard_focus (parent, w)
+     Widget parent;
+     Widget w;
 {
   XmProcessTraversal (w, 0);
   XtSetKeyboardFocus (parent, w);