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

comparison src/frame-x.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	b2472a1930f2
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 /* Default properties to use when creating frames.  */
 Lisp_Object Vdefault_x_frame_plist;
 Lisp_Object Qwindow_id;
-Lisp_Object Qpopup;
 Lisp_Object Qx_resource_name;
+EXFUN (Fx_window_id, 1);
 /************************************************************************/
 /*                          helper functions                            */
 /************************************************************************/
 #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 (...);
-XtSetArg (al, XtNiconic, True);
+Xt_SET_VALUE (w, 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?)
 */
-XtSetArg(al [0], XtNiconic, iconic_p);
+Xt_SET_VALUE (shell, XtNiconic, iconic_p);
-XtSetValues (shell, al, 1);
 EmacsShellSmashIconicHint (shell, iconic_p);
 }
 void
 x_wm_set_cell_size (Widget wmshell, int cw, int ch)
 {
 Widget shell = FRAME_X_SHELL_WIDGET (f);
 EmacsFrame w = (EmacsFrame) FRAME_X_TEXT_WIDGET (f);
 Widget gw = (Widget) w;
-#define FROB(propprop, value) 	\
+if (EQ (Qleft, property) || EQ (Qtop, property))
-do {				\
-if (EQ (property, propprop))	\
-return (value);		\
-} while (0)
-#if 0
-if (EQ (property, Qleft) || EQ (property, Qtop))
-x_smash_bastardly_shell_position (shell);
-#endif
-if (EQ (property, Qleft) || EQ (property, Qtop))
 {
 Position x, y;
 if (!XtWindow(shell))
 	return Qzero;
 x_get_top_level_position (XtDisplay (shell), XtWindow (shell), &x, &y);
-FROB (Qleft, make_int (x));
+if (EQ (Qleft, property)) return make_int (x);
-FROB (Qtop,  make_int (y));
+if (EQ (Qtop,  property)) return make_int (y);
 }
-#if 0
+if (EQ (Qborder_width, property))
-FROB (Qleft, make_int (shell->core.x));
+return make_int (w->core.border_width);
-FROB (Qtop, make_int (shell->core.y));
+if (EQ (Qinternal_border_width, property))
-#endif
+return make_int (w->emacs_frame.internal_border_width);
-FROB (Qborder_width, make_int (w->core.border_width));
+if (EQ (Qborder_color, property))
-FROB (Qinternal_border_width,
+return color_to_string (gw, w->core.border_pixel);
-	make_int (w->emacs_frame.internal_border_width));
-FROB (Qborder_color, color_to_string (gw, w->core.border_pixel));
 #ifdef HAVE_TOOLBARS
-FROB (Qtop_toolbar_shadow_color,
+if (EQ (Qtop_toolbar_shadow_color, property))
-	color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel));
+return color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel);
-FROB (Qbottom_toolbar_shadow_color,
+if (EQ (Qbottom_toolbar_shadow_color, property))
-	color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel));
+return color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel);
-FROB (Qbackground_toolbar_color,
+if (EQ (Qbackground_toolbar_color, property))
-	color_to_string (gw, w->emacs_frame.background_toolbar_pixel));
+return color_to_string (gw, w->emacs_frame.background_toolbar_pixel);
-FROB (Qtoolbar_shadow_thickness,
+if (EQ (Qtoolbar_shadow_thickness, property))
-	make_int (w->emacs_frame.toolbar_shadow_thickness));
+return make_int (w->emacs_frame.toolbar_shadow_thickness);
 #endif /* HAVE_TOOLBARS */
-FROB (Qinter_line_space, make_int (w->emacs_frame.interline));
+if (EQ (Qinter_line_space, property))
-FROB (Qwindow_id, Fx_window_id (make_frame (f)));
+return make_int (w->emacs_frame.interline);
+if (EQ (Qwindow_id, property))
-#undef FROB
+return Fx_window_id (make_frame (f));
 return Qunbound;
 }
 static int
 }
 static Lisp_Object
 x_frame_properties (struct frame *f)
 {
-Lisp_Object result = Qnil;
+Lisp_Object props = Qnil;
 Widget shell = FRAME_X_SHELL_WIDGET (f);
 EmacsFrame w = (EmacsFrame) FRAME_X_TEXT_WIDGET (f);
 Widget gw = (Widget) w;
 Position x, y;
-#define FROB(propprop, value)				\
+props = cons3 (Qwindow_id, Fx_window_id (make_frame (f)), props);
-do {							\
+props = cons3 (Qinter_line_space, make_int (w->emacs_frame.interline), props);
-Lisp_Object temtem = (value);				\
-if (!NILP (temtem))					\
+#ifdef HAVE_TOOLBARS
-/* backwards order; we reverse it below */		\
+props = cons3 (Qtoolbar_shadow_thickness,
-result = Fcons (temtem, Fcons (propprop, result));	\
+		 make_int (w->emacs_frame.toolbar_shadow_thickness),
-} while (0)
+		 props);
+props = cons3 (Qbackground_toolbar_color,
-#if 0
+		 color_to_string (gw, w->emacs_frame.background_toolbar_pixel),
-x_smash_bastardly_shell_position (shell);
+		 props);
-FROB (Qleft, make_int (shell->core.x));
+props = cons3 (Qbottom_toolbar_shadow_color,
-FROB (Qtop, make_int (shell->core.y));
+		 color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel),
-#endif
+		 props);
+props = cons3 (Qtop_toolbar_shadow_color,
+		 color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel),
+		 props);
+#endif /* HAVE_TOOLBARS */
+props = cons3 (Qborder_color,
+		 color_to_string (gw, w->core.border_pixel), props);
+props = cons3 (Qinternal_border_width,
+		 make_int (w->emacs_frame.internal_border_width), props);
+props = cons3 (Qborder_width, make_int (w->core.border_width), props);
 if (!XtWindow(shell))
 x = y = 0;
 else
 x_get_top_level_position (XtDisplay (shell), XtWindow (shell), &x, &y);
-FROB (Qleft, make_int (x));
+props = cons3 (Qtop,  make_int (y), props);
-FROB (Qtop,  make_int (y));
+props = cons3 (Qleft, make_int (x), props);
-FROB (Qborder_width, make_int (w->core.border_width));
+return props;
-FROB (Qinternal_border_width,
-	make_int (w->emacs_frame.internal_border_width));
-FROB (Qborder_color, color_to_string (gw, w->core.border_pixel));
-#ifdef HAVE_TOOLBARS
-FROB (Qtop_toolbar_shadow_color,
-	color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel));
-FROB (Qbottom_toolbar_shadow_color,
-	color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel));
-FROB (Qbackground_toolbar_color,
-	color_to_string (gw, w->emacs_frame.background_toolbar_pixel));
-FROB (Qtoolbar_shadow_thickness,
-	make_int (w->emacs_frame.toolbar_shadow_thickness));
-#endif /* HAVE_TOOLBARS */
-FROB (Qinter_line_space, make_int (w->emacs_frame.interline));
-FROB (Qwindow_id, Fx_window_id (make_frame (f)));
-#undef FROB
-return result;
 }
 /* Functions called only from `x_set_frame_properties' to set
 individual properties. */
 			String Xt_resource_encoding_name)
 {
 Atom encoding = XA_STRING;
 String new_XtValue = (String) value;
 String old_XtValue = NULL;
-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 (al[0], Xt_resource_name, &old_XtValue);
+Xt_GET_VALUE (FRAME_X_SHELL_WIDGET (f), Xt_resource_name, &old_XtValue);
-XtGetValues (FRAME_X_SHELL_WIDGET (f), al, 1);
 if (!old_XtValue || strcmp (new_XtValue, old_XtValue))
 {
+Arg al[2];
 XtSetArg (al[0], Xt_resource_name, new_XtValue);
 XtSetArg (al[1], Xt_resource_encoding_name, encoding);
 XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 2);
 }
 }
 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 */
 FRAME_X_GEOM_FREE_ME_PLEASE (f) = temp;
 }
 else
 temp = NULL;
-XtSetArg (al [0], XtNgeometry, temp);
+Xt_SET_VALUE (FRAME_X_SHELL_WIDGET (f), 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));
 	    continue;
 	  GET_C_STRING_CTEXT_DATA_ALLOCA (prop, extprop);
 	  if (STRINGP (val))
 	    {
-	      Extbyte *extval;
+	      CONST Extbyte *extval;
 	      Extcount extvallen;
 	      GET_STRING_CTEXT_DATA_ALLOCA (val, extval, extvallen);
 	      XtVaSetValues (w, XtVaTypedArg, extprop,
 			     XtRString, extval, extvallen + 1,
 	    }
 	  if (int_p)
 	    {
 	      CHECK_INT (val);
-	      XtSetArg (al [0], (char *) XSTRING_DATA (str), XINT (val));
+	      Xt_SET_VALUE (w, (char *) XSTRING_DATA (str), XINT (val));
-	      XtSetValues (w, al, 1);
 	    }
 	  else if (EQ (val, Qt))
 	    {
-	      XtSetArg (al [0], (char *) XSTRING_DATA (str), True); /* XtN...*/
+	      Xt_SET_VALUE (w, (char *) XSTRING_DATA (str), True); /* XtN...*/
-	      XtSetValues (w, al, 1);
 	    }
 	  else if (EQ (val, Qnil))
 	    {
-	      XtSetArg (al [0], (char *) XSTRING_DATA (str), False); /* XtN...*/
+	      Xt_SET_VALUE (w, (char *) XSTRING_DATA (str), False); /* XtN...*/
-	      XtSetValues (w, al, 1);
 	    }
 	  else
 	    {
 	      CHECK_STRING (val);
 	      XtVaSetValues (w, XtVaTypedArg,
 		{
 		  xfree (dnd_data);
 		  return Qnil;
 		}
 	      len = XSTRING_LENGTH (XCAR (run)) + 1;
-	      dnd_data = xrealloc (dnd_data, dnd_len + len);
+	      dnd_data = (char *) xrealloc (dnd_data, dnd_len + len);
 	      strcpy (dnd_data + dnd_len - 1, (CONST char *)XSTRING_DATA (XCAR (run)));
 	      dnd_len += len;
 	      run = XCDR (run);
 	    }
 	  dnd_data[dnd_len - 1] = 0; /* the list-ending zero */
 	  dnd_dealloc = 1;
 	}
 else
 Lisp_Object rest = DEVICE_FRAME_LIST (XDEVICE (f->device));
 while (!NILP (rest) &&
 	 (f == XFRAME (XCAR (rest)) ||
 	  !FRAME_X_P (XFRAME (XCAR (rest)))))
 rest = XCDR (rest);
-return (NILP (rest));
+return NILP (rest);
 }
 /* Figure out what size the EmacsFrame widget should initially be,
 and set it.  Should be called after the default font has been
 determined but before the widget has been realized. */
 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))
 {
-XtSetArg (al [0], XtNgeometry, &ew_geom);
+Xt_GET_VALUE (ew, XtNgeometry, &ew_geom);
-XtGetValues (ew, al, 1);
 if (ew_geom)
 	frame_flags = XParseGeometry (ew_geom,
 				      &frame_x, &frame_y,
 				      &frame_w, &frame_h);
 if (! (frame_flags & (WidthValue | HeightValue)))
 	{
+Arg al[2];
 	  XtSetArg (al [0], XtNwidth,  &frame_w);
 	  XtSetArg (al [1], XtNheight, &frame_h);
 	  XtGetValues (ew, al, 2);
 	  if (!frame_w && !frame_h)
 	    {
 	}
 if (frame_flags & (WidthValue | HeightValue))
 	EmacsFrameSetCharSize (ew, frame_w, frame_h);
 if (frame_flags & (XValue | YValue))
 	{
+Arg al[2];
 	  XtSetArg (al [0], XtNwidth,  &frame_w);
 	  XtSetArg (al [1], XtNheight, &frame_h);
 	  XtGetValues (ew, al, 2);
 	  if (frame_flags & XNegative)
 /* If the EmacsFrame doesn't have a geometry but the shell does,
 treat that as the geometry of the frame.
 (Is this bogus? I'm not sure.) */
-XtSetArg (al [0], XtNgeometry, &ew_geom);
+Xt_GET_VALUE (ew, XtNgeometry, &ew_geom);
-XtGetValues (ew, al, 1);
 if (!ew_geom)
 {
-XtSetArg (al [0], XtNgeometry, &geom);
+Xt_GET_VALUE (wmshell, XtNgeometry, &geom);
-XtGetValues (wmshell, al, 1);
 if (geom)
 	{
 	  ew_geom = geom;
-	  XtSetArg (al [0], XtNgeometry, ew_geom);
+	  Xt_SET_VALUE (ew, XtNgeometry, ew_geom);
-	  XtSetValues (ew, al, 1);
 	}
 }
 /* If the Shell is iconic, then the EmacsFrame is iconic.
 (Is this bogus? I'm not sure.) */
-XtSetArg (al [0], XtNiconic, &ew_iconic_p);
+Xt_GET_VALUE (ew, XtNiconic, &ew_iconic_p);
-XtGetValues (ew, al, 1);
 if (!ew_iconic_p)
 {
-XtSetArg (al [0], XtNiconic, &iconic_p);
+Xt_GET_VALUE (wmshell, XtNiconic, &iconic_p);
-XtGetValues (wmshell, al, 1);
 if (iconic_p)
 	{
 	  ew_iconic_p = iconic_p;
-	  XtSetArg (al [0], XtNiconic, iconic_p);
+	  Xt_SET_VALUE (ew, XtNiconic, iconic_p);
-	  XtSetValues (ew, al, 1);
 	}
 }
-XtSetArg (al [0], XtNgeometry, &geom);
+Xt_GET_VALUE (app_shell, 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,
 	}
 /* If the AppShell is iconic, then the EmacsFrame is iconic. */
 if (!ew_iconic_p)
 	{
-	  XtSetArg (al [0], XtNiconic, &iconic_p);
+Xt_GET_VALUE (app_shell, XtNiconic, &iconic_p);
-	  XtGetValues (app_shell, al, 1);
 	  if (iconic_p)
 	    {
 	      ew_iconic_p = iconic_p;
-	      XtSetArg (al [0], XtNiconic, iconic_p);
+	      Xt_SET_VALUE (ew, 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;
-Arg al [1];
+Xt_GET_VALUE (text, XtNscrollBarPlacement, &scrollbar_placement);
-XtSetArg (al [0], XtNscrollBarPlacement, &scrollbar_placement);
+switch (scrollbar_placement)
-XtGetValues (text, al, 1);
+{
-f->scrollbar_on_left = (scrollbar_placement == XtTOP_LEFT ||
+case XtTOP_LEFT:
-scrollbar_placement == XtBOTTOM_LEFT);
+	f->scrollbar_on_left = 1, f->scrollbar_on_top = 1; break;
-f->scrollbar_on_top  = (scrollbar_placement == XtTOP_LEFT ||
+case XtBOTTOM_LEFT:
-scrollbar_placement == XtTOP_RIGHT);
+	f->scrollbar_on_left = 1, f->scrollbar_on_top = 0; break;
+case XtTOP_RIGHT:
+	f->scrollbar_on_left = 0, f->scrollbar_on_top = 1; break;
+case XtBOTTOM_RIGHT:
+	f->scrollbar_on_left = 0, f->scrollbar_on_top = 0; break;
+}
 f->scrollbar_y_offset = topbreadth + textbord;
 }
 #endif /* HAVE_SCROLLBARS */
 /* finally the text area */
 /* Create the manager widget */
 ac = 0;
 XtSetArg (al[ac], XtNvisual, visual); ac++;
 XtSetArg (al[ac], XtNdepth, depth); ac++;
 XtSetArg (al[ac], XtNcolormap, cmap); ac++;
 container = XtCreateWidget ("container",
 			      emacsManagerWidgetClass, shell, al, ac);
 FRAME_X_CONTAINER_WIDGET (f) = container;
 XtAddCallback (container, XtNresizeCallback, x_layout_widgets,
 		 (XtPointer) 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;
 if (shell_widget->shell.create_popup_child_proc != NULL)
 (*(shell_widget->shell.create_popup_child_proc))(widget);
 /* The XtSetValues below are not in XtPopup menu.  We just want to
 make absolutely sure... */
-XtSetArg (al [0], XtNmappedWhenManaged, False);
+Xt_SET_VALUE (widget, XtNmappedWhenManaged, False);
-XtSetValues (widget, al, 1);
 XtRealizeWidget (widget);
-XtSetArg (al [0], XtNmappedWhenManaged, True);
+Xt_SET_VALUE (widget, XtNmappedWhenManaged, True);
-XtSetValues (widget, al, 1);
 }
 #ifdef HAVE_CDE
 /* Does this have to be non-automatic? */
 /* hack frame to respond to dnd messages */
 static Lisp_Object
 x_get_frame_parent (struct frame *f)
 {
 Widget parentwid = 0;
-Arg al[1];
+Xt_GET_VALUE (FRAME_X_SHELL_WIDGET (f), XtNtransientFor, &parentwid);
-XtSetArg (al[0], XtNtransientFor, &parentwid);
-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)))
 /* Destroy the X window of frame S.  */
 static void
 x_delete_frame (struct frame *f)
 {
 Widget w = FRAME_X_SHELL_WIDGET (f);
-Lisp_Object frame;
 #ifndef HAVE_SESSION
 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
 x_wm_maybe_move_wm_command (f);
 #endif /* HAVE_SESSION */
-XSETFRAME (frame, f);
 #ifdef EXTERNAL_WIDGET
 {
 Display *dpy = XtDisplay (w);
 expect_x_error (dpy);
 void
 syms_of_frame_x (void)
 {
 defsymbol (&Qwindow_id, "window-id");
-defsymbol (&Qpopup, "popup");
 defsymbol (&Qx_resource_name, "x-resource-name");
 DEFSUBR (Fx_window_id);
 #ifdef HAVE_CDE
 DEFSUBR (Fcde_start_drag_internal);

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 272:c5d627a313b1 r21-0b34