X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/05041ba0f89f952debdd3c3f09b842401f917b7d..6c6b79ff1330567a072a5474c1971da85780dfd1:/lwlib/lwlib-Xaw.c

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 90aa782be8..f2feb32746 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -15,7 +15,12 @@ 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.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 
@@ -35,7 +40,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <X11/Xatom.h>
 
-static void xaw_generic_callback (Widget, XtPointer, XtPointer);
+static void xaw_generic_callback (/*Widget, XtPointer, XtPointer*/);
 
 
 Boolean
@@ -118,11 +123,13 @@ xaw_update_one_widget (instance, widget, val, deep_p)
      widget_value *val;
      Boolean deep_p;
 {
+#if 0
   if (XtIsSubclass (widget, scrollbarWidgetClass))
     {
       xaw_update_scrollbar (instance, widget, val);
     }
-  else if (XtIsSubclass (widget, dialogWidgetClass))
+#endif
+  if (XtIsSubclass (widget, dialogWidgetClass))
     {
       Arg al[1];
       int ac = 0;
@@ -132,6 +139,8 @@ xaw_update_one_widget (instance, widget, val, deep_p)
   else if (XtIsSubclass (widget, commandWidgetClass))
     {
       Dimension bw = 0;
+      Arg al[3];
+
       XtVaGetValues (widget, XtNborderWidth, &bw, 0);
       if (bw == 0)
 	/* Don't let buttons end up with 0 borderwidth, that's ugly...
@@ -140,15 +149,16 @@ xaw_update_one_widget (instance, widget, val, deep_p)
 	   that I don't feel like opening right now.  Making Athena widgets
 	   not look like shit is just entirely too much work.
 	 */
-	XtVaSetValues (widget, XtNborderWidth, 1, 0);
-
-      XtVaSetValues (widget,
-		     XtNlabel, val->value,
-		     XtNsensitive, val->enabled,
-		     /* Force centered button text.  Se above. */
-		     XtNjustify, XtJustifyCenter,
-		     0);
+	{
+	  XtSetArg (al[0], XtNborderWidth, 1);
+	  XtSetValues (widget, al, 1);
+	}
 
+      XtSetArg (al[0], XtNlabel, val->value);
+      XtSetArg (al[1], XtNsensitive, val->enabled);
+      /* Force centered button text.  Se above. */
+      XtSetArg (al[2], XtNjustify, XtJustifyCenter);
+      XtSetValues (widget, al, 3);
       XtRemoveAllCallbacks (widget, XtNcallback);
       XtAddCallback (widget, XtNcallback, xaw_generic_callback, instance);
     }
@@ -215,8 +225,10 @@ xaw_pop_instance (instance, up)
 	     life easier?
 	   */
 	  {
-	    int x, y, w, h;
+	    unsigned int x, y, w, h;
 	    Widget topmost = instance->parent;
+	    Arg args[2];
+
 	    w = shell->core.width;
 	    h = shell->core.height;
 	    while (topmost->core.parent && XtIsRealized (topmost->core.parent))
@@ -225,7 +237,12 @@ xaw_pop_instance (instance, up)
 	    else x = topmost->core.x + ((topmost->core.width - w) / 2);
 	    if (topmost->core.height < h) y = topmost->core.y;
 	    else y = topmost->core.y + ((topmost->core.height - h) / 2);
-	    XtMoveWidget (shell, x, y);
+	    /* Using XtMoveWidget caused the widget to come
+	       out in the wrong place with vtwm.
+	       Question of virtual vs real coords, perhaps.  */
+	    XtSetArg (args[0], XtNx, x);
+	    XtSetArg (args[1], XtNy, y);
+	    XtSetValues (shell, args, 2);
 	  }
 
 	  /* Finally, pop it up. */
@@ -294,6 +311,10 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, ra
   ac = 0;
   XtSetArg (av[ac], XtNtitle, shell_title); ac++;
   XtSetArg (av[ac], XtNallowShellResize, True); ac++;
+
+  /* Don't allow any geometry request from the user.  */
+  XtSetArg (av[ac], XtNgeometry, 0); ac++;
+
   shell = XtCreatePopupShell ("dialog", transientShellWidgetClass,
 			      parent, av, ac);
   XtOverrideTranslations (shell, override);
@@ -484,16 +505,22 @@ wm_delete_window (shell, closure, call_data)
      XtPointer call_data;
 {
   LWLIB_ID id;
+  Cardinal nkids;
+  int i;
   Widget *kids = 0;
   Widget widget;
   if (! XtIsSubclass (shell, shellWidgetClass))
     abort ();
+  XtVaGetValues (shell, XtNnumChildren, &nkids, 0);
   XtVaGetValues (shell, XtNchildren, &kids, 0);
   if (!kids || !*kids)
     abort ();
-  widget = kids [0];
-  if (! XtIsSubclass (widget, dialogWidgetClass))
-    abort ();
+  for (i = 0; i < nkids; i++)
+    {
+      widget = kids[i];
+      if (XtIsSubclass (widget, dialogWidgetClass))
+	break;
+    }
   id = lw_get_widget_id (widget);
   if (! id) abort ();
 
@@ -608,9 +635,24 @@ xaw_create_scrollbar (instance)
 #endif
 }
 
+static Widget
+xaw_create_main (instance)
+     widget_instance *instance;
+{
+  Arg al[1];
+  int ac;
+
+  /* Create a vertical Paned to hold menubar */
+  ac = 0;
+  XtSetArg (al[ac], XtNborderWidth, 0); ac++;
+  return XtCreateWidget (instance->info->name, panedWidgetClass,
+			 instance->parent, al, ac);
+}
+
 widget_creation_entry
 xaw_creation_table [] =
 {
   {"scrollbar",			xaw_create_scrollbar},
+  {"main",			xaw_create_main},
   {NULL, NULL}
 };