xemacs-beta: src/frame-x.c comparison

comparison src/frame-x.c @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9

author	cvs
date	Mon, 13 Aug 2007 09:44:42 +0200
parents	0132846995bd
children	15872534500d

comparison

equal deleted inserted replaced

-:4e0740e5aab2
+:5a88923fcbfe
 #include "console-x.h"
 #include "xintrinsicp.h"	/* CoreP.h needs this */
 #include <X11/CoreP.h>		/* Numerous places access the fields of
 				   a core widget directly.  We could
-				   use XtVaGetValues(), but ... */
+				   use XtGetValues(), but ... */
 #include <X11/Shell.h>
 #include <X11/ShellP.h>
 #include "xmu.h"
 #include "EmacsManager.h"
 #include "EmacsFrameP.h"
 #endif
 void
 x_wm_set_shell_iconic_p (Widget shell, int iconic_p)
 {
+Arg al [1];
 if (! XtIsWMShell (shell)) abort ();
 /* Because of questionable logic in Shell.c, this sequence can't work:
 w = XtCreatePopupShell (...);
-XtVaSetValues (w, XtNiconic, True, NULL);
+XtSetArg (al, XtNiconic, True);
+XtSetValues (w, al, 1);
 XtRealizeWidget (w);
 The iconic resource is only consulted at initialization time (when
 XtCreatePopupShell is called) instead of at realization time (just
 before the window gets created, which would be more sensible) or
 w->wm.wm_hints.initial_state until after the widget has been realized.
 Calls to XtSetValues are ignored in the window between creation and
 realization.  This is true of MIT X11R5 patch level 25, at least.
 (Apparently some other versions of Xt don't have this bug?)
 */
-XtVaSetValues (shell, XtNiconic, iconic_p, NULL);
+XtSetArg(al [0], XtNiconic, iconic_p);
+XtSetValues (shell, al, 1);
 EmacsShellSmashIconicHint (shell, iconic_p);
 }
 void
 x_wm_set_cell_size (Widget wmshell, int cw, int ch)
 {
+Arg al [2];
 if (!XtIsWMShell (wmshell))
 abort ();
 if (cw <= 0 || ch <= 0)
 abort ();
-XtVaSetValues (wmshell,
+XtSetArg (al [0], XtNwidthInc,  cw);
-		 XtNwidthInc, cw,
+XtSetArg (al [1], XtNheightInc, ch);
-		 XtNheightInc, ch,
+XtSetValues (wmshell, al, 2);
-		 NULL);
 }
 void
 x_wm_set_variable_size (Widget wmshell, int width, int height)
 {
+Arg al [2];
 if (!XtIsWMShell (wmshell))
 abort ();
 #ifdef DEBUG_GEOMETRY_MANAGEMENT
 /* See comment in EmacsShell.c */
 printf ("x_wm_set_variable_size: %d %d\n", width, height);
 fflush (stdout);
 #endif
-XtVaSetValues (wmshell,
-		 XtNwidthCells, width,
+XtSetArg (al [0], XtNwidthCells,  width);
-		 XtNheightCells, height,
+XtSetArg (al [1], XtNheightCells, height);
-		 NULL);
+XtSetValues (wmshell, al, 2);
 }
 /* If the WM_PROTOCOLS property does not already contain WM_TAKE_FOCUS
 and WM_DELETE_WINDOW, then add them.  (They may already be present
 because of the toolkit (Motif adds them, for example, but Xt doesn't).
 #ifdef HAVE_TOOLBARS
 || EQ (property, Qtop_toolbar_shadow_color)
 || EQ (property, Qbottom_toolbar_shadow_color)
 || EQ (property, Qbackground_toolbar_color)
 || EQ (property, Qtoolbar_shadow_thickness)
-#endif
+#endif /* HAVE_TOOLBARS */
 || EQ (property, Qinter_line_space)
 || EQ (property, Qwindow_id)
 || STRINGP (property);
 }
 			String Xt_resource_encoding_name)
 {
 Atom encoding = XA_STRING;
 String new_XtValue = (String) value;
 String old_XtValue = NULL;
-Arg av[2];
+Arg al[2];
 #ifdef MULE
 Bufbyte *ptr;
 /* Optimize for common ASCII case */
 for (ptr = value; *ptr; ptr++)
 break;
 }
 #endif /* MULE */
 /* ### Caching is device-independent - belongs in update_frame_title. */
-XtSetArg (av[0], Xt_resource_name, &old_XtValue);
+XtSetArg (al[0], Xt_resource_name, &old_XtValue);
-XtGetValues (FRAME_X_SHELL_WIDGET (f), av, 1);
+XtGetValues (FRAME_X_SHELL_WIDGET (f), al, 1);
 if (!old_XtValue || strcmp (new_XtValue, old_XtValue))
 {
-XtSetArg (av[0], Xt_resource_name, new_XtValue);
+XtSetArg (al[0], Xt_resource_name, new_XtValue);
-XtSetArg (av[1], Xt_resource_encoding_name, encoding);
+XtSetArg (al[1], Xt_resource_encoding_name, encoding);
-XtSetValues (FRAME_X_SHELL_WIDGET (f), av, 2);
+XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 2);
 }
 }
 static void
 x_set_title_from_bufbyte (struct frame *f, Bufbyte *name)
 int xval, yval;
 char xsign, ysign;
 char uspos = !!(flags & (XValue | YValue));
 char ussize = !!(flags & (WidthValue | HeightValue));
 char *temp;
+Arg al [1];
 /* assign the correct size to the EmacsFrame widget ... */
 EmacsFrameSetCharSize (FRAME_X_TEXT_WIDGET (f), w, h);
 /* and also set the WMShell's geometry */
 strcpy (temp, shell_geom);
 FRAME_X_GEOM_FREE_ME_PLEASE (f) = temp;
 }
 else
 temp = NULL;
-XtVaSetValues (FRAME_X_SHELL_WIDGET (f), XtNgeometry, temp, NULL);
+XtSetArg (al [0], XtNgeometry, temp);
+XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 1);
 }
 /* Report to X that a frame property of frame S is being set or changed.
 If the property is not specially recognized, do nothing.
 */
 Bool x_position_specified_p = False;
 Bool y_position_specified_p = False;
 Bool internal_border_width_specified = False;
 Lisp_Object tail;
 Widget w = FRAME_X_TEXT_WIDGET (f);
+Arg al [10];
 for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
 {
 Lisp_Object prop = Fcar (tail);
 Lisp_Object val = Fcar (Fcdr (tail));
 	      Extbyte *extval;
 	      Extcount extvallen;
 	      GET_STRING_CTEXT_DATA_ALLOCA (val, extval, extvallen);
 	      XtVaSetValues (w, XtVaTypedArg, extprop,
-			     XtRString, extval, extvallen + 1, NULL);
+			     XtRString, extval, extvallen + 1,
+			     (XtArgVal) NULL);
 	    }
 	  else
-	    XtVaSetValues (w, XtVaTypedArg,
+	    XtVaSetValues (w, XtVaTypedArg, extprop, XtRInt,
-			   extprop, XtRInt, XINT (val),
+			   XINT (val), sizeof (int),
-			   sizeof (int),
+			   (XtArgVal) NULL);
-			   NULL);
 	}
 else if (SYMBOLP (prop))
 	{
 	  Lisp_Object str = Fget (prop, Qx_resource_name, Qnil);
 	  int int_p = !NILP (Fget (prop, Qintegerp, Qnil));
 	    }
 	  if (int_p)
 	    {
 	      CHECK_INT (val);
-	      XtVaSetValues (w, (char *) XSTRING_DATA (str),
+	      XtSetArg (al [0], (char *) XSTRING_DATA (str), XINT (val));
-			     XINT (val), NULL);
+	      XtSetValues (w, al, 1);
 	    }
 	  else if (EQ (val, Qt))
-	    XtVaSetValues (w,
+	    {
-			   /* XtN... */
+	      XtSetArg (al [0], (char *) XSTRING_DATA (str), True); /* XtN...*/
-			   (char *) XSTRING_DATA (str),
+	      XtSetValues (w, al, 1);
-			   True,
+	    }
-			   NULL);
 	  else if (EQ (val, Qnil))
-	    XtVaSetValues (w,
+	    {
-			   /* XtN... */
+	      XtSetArg (al [0], (char *) XSTRING_DATA (str), False); /* XtN...*/
-			   (char *) XSTRING_DATA (str),
+	      XtSetValues (w, al, 1);
-			   False,
+	    }
-			   NULL);
 	  else
 	    {
 	      CHECK_STRING (val);
 	      XtVaSetValues (w, XtVaTypedArg,
 			     /* XtN... */
 			     (char *) XSTRING_DATA (str),
 			     XtRString,
 			     XSTRING_DATA (val),
 			     XSTRING_LENGTH (val) + 1,
-			     NULL);
+			     (XtArgVal) NULL);
 	    }
 #ifdef HAVE_SCROLLBARS
 	  if (!strcmp ((char *) XSTRING_DATA (str), "scrollBarWidth")
 	      || !strcmp ((char *) XSTRING_DATA (str),
 unsigned int h = 40;
 int flags = 0;
 char *geom = 0, *ew_geom = 0;
 Boolean iconic_p = False, ew_iconic_p = False;
+Arg al [2];
 Widget wmshell = FRAME_X_SHELL_WIDGET (f);
 /* #### This may not be an ApplicationShell any more, with the 'popup
 frame property. */
 Widget app_shell = XtParent (wmshell);
 is. (Assume it is smart and pays attention to our values.)
 */
 if (!FRAME_X_TOP_LEVEL_FRAME_P (f))
 {
-XtVaGetValues (ew, XtNgeometry, &ew_geom, NULL);
+XtSetArg (al [0], XtNgeometry, &ew_geom);
+XtGetValues (ew, al, 1);
 if (ew_geom)
-	frame_flags = XParseGeometry (ew_geom, &frame_x, &frame_y,
+	frame_flags = XParseGeometry (ew_geom,
-				       &frame_w, &frame_h);
+				      &frame_x, &frame_y,
+				      &frame_w, &frame_h);
 if (! (frame_flags & (WidthValue | HeightValue)))
 	{
-	  XtVaGetValues (ew, XtNwidth, &frame_w,
+	  XtSetArg (al [0], XtNwidth,  &frame_w);
-			 XtNheight, &frame_h, NULL);
+	  XtSetArg (al [1], XtNheight, &frame_h);
+	  XtGetValues (ew, al, 2);
 	  if (!frame_w && !frame_h)
 	    {
 	      frame_w = 64;
 	      frame_h = 12;
 	      frame_flags |= WidthValue | HeightValue;
 	}
 if (frame_flags & (WidthValue | HeightValue))
 	EmacsFrameSetCharSize (ew, frame_w, frame_h);
 if (frame_flags & (XValue | YValue))
 	{
-	  XtVaGetValues (ew, XtNwidth, &frame_w,
+	  XtSetArg (al [0], XtNwidth,  &frame_w);
-			 XtNheight, &frame_h, NULL);
+	  XtSetArg (al [1], XtNheight, &frame_h);
+	  XtGetValues (ew, al, 2);
 	  if (frame_flags & XNegative)
 	    frame_x += frame_w;
 	  if (frame_flags & YNegative)
 	    frame_y += frame_h;
-	  XtVaSetValues (ew, XtNx, frame_x, XtNy, frame_y, NULL);
+	  XtSetArg (al [0], XtNx, frame_x);
+	  XtSetArg (al [1], XtNy, frame_y);
+	  XtSetValues (ew, al, 2);
 	}
 return;
 }
 #endif
 if (!XtIsWMShell (wmshell))
 abort ();
 /* If the EmacsFrame doesn't have a geometry but the shell does,
-treat that as the geometry of the frame.  (Is this bogus?
+treat that as the geometry of the frame.
-I'm not sure.) */
+(Is this bogus? I'm not sure.) */
-XtVaGetValues (ew, XtNgeometry, &ew_geom, NULL);
+XtSetArg (al [0], XtNgeometry, &ew_geom);
+XtGetValues (ew, al, 1);
 if (!ew_geom)
 {
-XtVaGetValues (wmshell, XtNgeometry, &geom, NULL);
+XtSetArg (al [0], XtNgeometry, &geom);
+XtGetValues (wmshell, al, 1);
 if (geom)
 	{
 	  ew_geom = geom;
-	  XtVaSetValues (ew, XtNgeometry, ew_geom, NULL);
+	  XtSetArg (al [0], XtNgeometry, ew_geom);
+	  XtSetValues (ew, al, 1);
 	}
 }
-/* If the Shell is iconic, then the EmacsFrame is iconic.  (Is
+/* If the Shell is iconic, then the EmacsFrame is iconic.
-this bogus? I'm not sure.) */
+(Is this bogus? I'm not sure.) */
-XtVaGetValues (ew, XtNiconic, &ew_iconic_p, NULL);
+XtSetArg (al [0], XtNiconic, &ew_iconic_p);
+XtGetValues (ew, al, 1);
 if (!ew_iconic_p)
 {
-XtVaGetValues (wmshell, XtNiconic, &iconic_p, NULL);
+XtSetArg (al [0], XtNiconic, &iconic_p);
+XtGetValues (wmshell, al, 1);
 if (iconic_p)
 	{
 	  ew_iconic_p = iconic_p;
-	  XtVaSetValues (ew, XtNiconic, iconic_p, NULL);
+	  XtSetArg (al [0], XtNiconic, iconic_p);
+	  XtSetValues (ew, al, 1);
 	}
 }
-XtVaGetValues (app_shell, XtNgeometry, &geom, NULL);
+XtSetArg (al [0], XtNgeometry, &geom);
+XtGetValues (app_shell, al, 1);
 if (geom)
 app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h);
 if (ew_geom)
-frame_flags = XParseGeometry (ew_geom, &frame_x, &frame_y,
+frame_flags = XParseGeometry (ew_geom,
-				   &frame_w, &frame_h);
+				  &frame_x, &frame_y,
+				  &frame_w, &frame_h);
 if (first_x_frame_p (f))
 {
 /* If this is the first frame created:
 ====================================
 	}
 /* If the AppShell is iconic, then the EmacsFrame is iconic. */
 if (!ew_iconic_p)
 	{
-	  XtVaGetValues (app_shell, XtNiconic, &iconic_p, NULL);
+	  XtSetArg (al [0], XtNiconic, &iconic_p);
+	  XtGetValues (app_shell, al, 1);
 	  if (iconic_p)
 	    {
 	      ew_iconic_p = iconic_p;
-	      XtVaSetValues (ew, XtNiconic, iconic_p, NULL);
+	      XtSetArg (al [0], XtNiconic, iconic_p);
+	      XtSetValues (ew, al, 1);
 	    }
 	}
 }
 else
 {
 #ifdef HAVE_SCROLLBARS
 {
 /* The scrollbar positioning is completely handled by redisplay.  We
 just need to know which sides they are supposed to go on. */
 unsigned char scrollbar_placement;
-XtVaGetValues (text, XtNscrollBarPlacement, &scrollbar_placement, NULL);
+Arg al [1];
+XtSetArg (al [0], XtNscrollBarPlacement, &scrollbar_placement);
+XtGetValues (text, al, 1);
 f->scrollbar_on_left = (scrollbar_placement == XtTOP_LEFT ||
 scrollbar_placement == XtBOTTOM_LEFT);
 f->scrollbar_on_top  = (scrollbar_placement == XtTOP_LEFT ||
 scrollbar_placement == XtTOP_RIGHT);
 f->scrollbar_y_offset = topbreadth + textbord;
 struct device *d = XDEVICE (f->device);
 #ifdef EXTERNAL_WIDGET
 Window window_id = 0;
 #endif
 CONST char *name;
-Arg av [25];
+Arg al [25];
 int ac = 0;
 Widget text, container, shell;
 Widget parentwid = 0;
 #ifdef HAVE_MENUBARS
 int menubar_visible;
 } else
 #endif /* EXTERNAL_WIDGET */
 FRAME_X_TOP_LEVEL_FRAME_P (f) = 1;
 ac = 0;
-XtSetArg (av[ac], XtNallowShellResize, True); ac++;
+XtSetArg (al[ac], XtNallowShellResize, True); ac++;
 #ifdef LWLIB_USES_MOTIF
 /* Motif sucks beans.  Without this in here, it will delete the window
 out from under us when it receives a WM_DESTROY_WINDOW message
 from the WM. */
-XtSetArg (av[ac], XmNdeleteResponse, XmDO_NOTHING); ac++;
+XtSetArg (al[ac], XmNdeleteResponse, XmDO_NOTHING); ac++;
 #endif
 #ifdef EXTERNAL_WIDGET
 if (window_id)
 {
-XtSetArg (av[ac], XtNwindow, window_id); ac++;
+XtSetArg (al[ac], XtNwindow, window_id); ac++;
 }
 else
 #endif /* EXTERNAL_WIDGET */
 {
-XtSetArg (av[ac], XtNinput, True); ac++;
+XtSetArg (al[ac], XtNinput, True);       ac++;
-XtSetArg (av[ac], (String) XtNminWidthCells, 10); ac++;
+XtSetArg (al[ac], XtNminWidthCells, 10); ac++;
-XtSetArg (av[ac], (String) XtNminHeightCells, 1); ac++;
+XtSetArg (al[ac], XtNminHeightCells, 1); ac++;
 }
 if (!NILP (parent))
 {
 parentwid = FRAME_X_SHELL_WIDGET (XFRAME (parent));
-XtSetArg (av[ac], XtNtransientFor, parentwid); ac++;
+XtSetArg (al[ac], XtNtransientFor, parentwid); ac++;
 }
 shell = XtCreatePopupShell ("shell",
 			      (
 #ifdef EXTERNAL_WIDGET
 			       parentwid ? transientEmacsShellWidgetClass :
 			       topLevelEmacsShellWidgetClass
 			       ),
 			      parentwid ? parentwid :
 			      DEVICE_XT_APP_SHELL (d),
-			      av, ac);
+			      al, ac);
 FRAME_X_SHELL_WIDGET (f) = shell;
 maybe_set_frame_title_format (shell);
 /* Create the manager widget */
-container = XtVaCreateWidget ("container",
+container = XtCreateWidget ("container",
-				emacsManagerWidgetClass,
+			      emacsManagerWidgetClass, shell, NULL, 0);
-				shell, NULL);
 FRAME_X_CONTAINER_WIDGET (f) = container;
 XtAddCallback (container, XtNresizeCallback, x_layout_widgets,
 		 (XtPointer) f);
 XtAddCallback (container, XtNqueryGeometryCallback, x_do_query_geometry,
 		 (XtPointer) f);
 /* Create the text area */
-ac = 0;
+XtSetArg (al [0], XtNborderWidth, 0); /* should this be settable? */
-XtSetArg (av[ac], XtNborderWidth, 0); ac++;	/* should this be settable? */
+XtSetArg (al [1], XtNemacsFrame,  f);
-XtSetArg (av[ac], (String) XtNemacsFrame, f); ac++;
+text = XtCreateWidget (name, emacsFrameClass, container, al, 2);
-text = XtCreateWidget (name,
-			 emacsFrameClass,
-			 container, av, ac);
 FRAME_X_TEXT_WIDGET (f) = text;
 #ifdef HAVE_MENUBARS
 /* Create the initial menubar widget. */
 menubar_visible = x_initialize_frame_menubar (f);
 static void
 xemacs_XtPopup (Widget widget)
 {
 ShellWidget shell_widget = (ShellWidget) widget;
 XtGrabKind call_data = XtGrabNone;
+Arg al [1];
 XtCallCallbacks (widget, XtNpopupCallback, (XtPointer)&call_data);
 shell_widget->shell.popped_up = TRUE;
 shell_widget->shell.grab_kind = XtGrabNone;
 shell_widget->shell.spring_loaded = False;
 if (shell_widget->shell.create_popup_child_proc != NULL)
 (*(shell_widget->shell.create_popup_child_proc))(widget);
-/* The XtVaSetValues below are not in XtPopup menu.  We just want to
+/* The XtSetValues below are not in XtPopup menu.  We just want to
 make absolutely sure... */
-XtVaSetValues (widget, XtNmappedWhenManaged, False, NULL);
+XtSetArg (al [0], XtNmappedWhenManaged, False);
+XtSetValues (widget, al, 1);
 XtRealizeWidget (widget);
-XtVaSetValues (widget, XtNmappedWhenManaged, True, NULL);
+XtSetArg (al [0], XtNmappedWhenManaged, True);
+XtSetValues (widget, al, 1);
 }
 #ifdef HAVE_CDE
 /* Does this have to be non-automatic? */
 /* hack frame to respond to dnd messages */
 x_mask = 0;
 }
 /* Store the X data into the widget. */
 {
-Arg av [10];
+Arg al [2];
-int ac = 0;
+XtSetArg (al [0], XtNiconPixmap, x_pixmap);
-XtSetArg (av [ac], XtNiconPixmap, x_pixmap); ac++;
+XtSetArg (al [1], XtNiconMask,   x_mask);
-XtSetArg (av [ac], XtNiconMask, x_mask); ac++;
+XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 2);
-XtSetValues (FRAME_X_SHELL_WIDGET (f), av, ac);
 }
 }
 static void
 x_set_frame_pointer (struct frame *f)
 static Lisp_Object
 x_get_frame_parent (struct frame *f)
 {
 Widget parentwid = 0;
-Arg av[1];
+Arg al[1];
-XtSetArg (av[0], XtNtransientFor, &parentwid);
+XtSetArg (al[0], XtNtransientFor, &parentwid);
-XtGetValues (FRAME_X_SHELL_WIDGET (f), av, 1);
+XtGetValues (FRAME_X_SHELL_WIDGET (f), al, 1);
 /* find the frame whose wid is parentwid */
 if (parentwid)
 {
 Lisp_Object frmcons;
 DEVICE_FRAME_LOOP (frmcons, XDEVICE (FRAME_DEVICE (f)))
 Display *dpy = XtDisplay (w);
 Dimension frame_w = DisplayWidth  (dpy, DefaultScreen (dpy));
 Dimension frame_h = DisplayHeight (dpy, DefaultScreen (dpy));
 Dimension shell_w, shell_h, shell_bord;
 int win_gravity;
+Arg al [3];
-XtVaGetValues (w,
-		 XtNwidth,       &shell_w,
+XtSetArg (al [0], XtNwidth,       &shell_w);
-		 XtNheight,      &shell_h,
+XtSetArg (al [1], XtNheight,      &shell_h);
-		 XtNborderWidth, &shell_bord,
+XtSetArg (al [2], XtNborderWidth, &shell_bord);
-		 NULL);
+XtGetValues (w, al, 3);
 win_gravity =
 xoff >= 0 && yoff >= 0 ? NorthWestGravity :
 xoff >= 0 ? SouthWestGravity :
 yoff >= 0 ? NorthEastGravity :
 /* Update the hints so that, if this window is currently iconified, it will
 come back at the right place.  We can't look at s->visible to determine
 whether it is iconified because it might not be up-to-date yet (the queue
 might not be processed). */
-XtVaSetValues (w,
+XtSetArg (al [0], XtNwinGravity, win_gravity);
-		 XtNwinGravity, win_gravity,
+XtSetArg (al [1], XtNx, xoff);
-		 XtNx, xoff,
+XtSetArg (al [2], XtNy, yoff);
-		 XtNy, yoff,
+XtSetValues (w, al, 3);
-		 NULL);
 /* Sometimes you will find that
 (set-frame-position (selected-frame) -50 -50)

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 165:5a88923fcbfe r20-3b9