xemacs-beta: src/toolbar.c comparison

comparison src/toolbar.c @ 173:8eaf7971accc r20-3b13

Import from CVS: tag r20-3b13

author	cvs
date	Mon, 13 Aug 2007 09:49:09 +0200
parents	cca96a509cfe
children	3d6bfa290dbd

comparison

equal deleted inserted replaced

-:a38aed19690b
+:8eaf7971accc
 static Lisp_Object
 mark_toolbar_data (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct toolbar_data *data = (struct toolbar_data *) XPNTR (obj);
 ((markobj) (data->last_toolbar_buffer));
-return (data->toolbar_buttons);
+return data->toolbar_buttons;
 }
 DEFINE_LRECORD_IMPLEMENTATION ("toolbar-data", toolbar_data,
 			       mark_toolbar_data, internal_object_printer,
 			       0, 0, 0, struct toolbar_data);
 ((markobj) (data->cap_up_glyph));
 ((markobj) (data->cap_down_glyph));
 ((markobj) (data->cap_disabled_glyph));
 ((markobj) (data->callback));
 ((markobj) (data->enabled_p));
-return (data->help_string);
+return data->help_string;
 }
 static void
 print_toolbar_button (Lisp_Object obj, Lisp_Object printcharfun,
 		      int escapeflag)
 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
 Return non-nil if OBJECT is a toolbar button.
 */
 (object))
 {
-return (TOOLBAR_BUTTONP (object) ? Qt : Qnil);
+return TOOLBAR_BUTTONP (object) ? Qt : Qnil;
 }
 /* Only query functions are provided for toolbar buttons.  They are
 generated and updated from a toolbar description list.  Any
 directly made changes would be wiped out the first time the toolbar
 */
 (button))
 {
 CHECK_TOOLBAR_BUTTON (button);
-return (XTOOLBAR_BUTTON (button)->callback);
+return XTOOLBAR_BUTTON (button)->callback;
 }
 DEFUN ("toolbar-button-help-string", Ftoolbar_button_help_string, 1, 1, 0, /*
 Return the help string function associated with the toolbar BUTTON.
 */
 (button))
 {
 CHECK_TOOLBAR_BUTTON (button);
-return (XTOOLBAR_BUTTON (button)->help_string);
+return XTOOLBAR_BUTTON (button)->help_string;
 }
 DEFUN ("toolbar-button-enabled-p", Ftoolbar_button_enabled_p, 1, 1, 0, /*
 Return t if BUTTON is active.
 */
 (button))
 {
 CHECK_TOOLBAR_BUTTON (button);
-return (XTOOLBAR_BUTTON (button)->enabled ? Qt : Qnil);
+return XTOOLBAR_BUTTON (button)->enabled ? Qt : Qnil;
 }
 DEFUN ("set-toolbar-button-down-flag", Fset_toolbar_button_down_flag, 2, 2, 0, /*
 Don't touch.
 */
 	    }
 	}
 }
 return Qnil;
 }
 Lisp_Object
 get_toolbar_button_glyph (struct window *w, struct toolbar_button *tb)
 {
 Lisp_Object glyph = Qnil;
 {
 if (tb->enabled && tb->down)
 	glyph = tb->cap_down_glyph;
 else if (!tb->enabled)
 	glyph = tb->cap_disabled_glyph;
 if (NILP (glyph))
 	glyph = tb->cap_up_glyph;
 }
 if (NILP (glyph))
 if (EQ (position, Qtop))    return TOP_TOOLBAR;
 if (EQ (position, Qbottom)) return BOTTOM_TOOLBAR;
 if (EQ (position, Qleft))   return LEFT_TOOLBAR;
 if (EQ (position, Qright))  return RIGHT_TOOLBAR;
 signal_simple_error ("Invalid toolbar position", position);
 return TOP_TOOLBAR; /* not reached */
 }
 DEFUN ("set-default-toolbar-position", Fset_default_toolbar_position, 1, 1, 0, /*
 Set the position that the `default-toolbar' will be displayed at.
 		       Lisp_Object desc, int pushright)
 {
 Lisp_Object *elt, glyphs, retval, buffer;
 struct gcpro gcpro1, gcpro2;
-elt = vector_data (XVECTOR (desc));
+elt = XVECTOR_DATA (desc);
 buffer = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;
 if (!tb)
 {
 tb = alloc_lcrecord (sizeof (struct toolbar_button),
 if (KEYWORDP (glyphs))
 {
 int pos;
 int style_seen = 0;
 int size_seen = 0;
+int len = XVECTOR_LENGTH (desc);
 if (!tb->blank)
 	{
 	  tb->blank = 1;
 	  tb->dirty = 1;
 	}
-for (pos = 0; pos < vector_length (XVECTOR (desc)); pos += 2)
+for (pos = 0; pos < len; pos += 2)
 	{
 	  Lisp_Object key = elt[pos];
 	  Lisp_Object val = elt[pos + 1];
 	  if (EQ (key, Q_style))
 buttons = Qnil;
 FRAME_TOOLBAR_DATA (f, pos)->last_toolbar_buffer = buffer;
 FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons = buttons;
-return (visible);
+return visible;
 }
 #define COMPUTE_TOOLBAR_DATA(position)					 \
 do									 \
 {									 \
 {									\
 get_toolbar_coords (f, pos, &x, &y, &width, &height, &vert, 0);	\
 if ((x_coord >= x) && (x_coord < (x + width)))			\
 	{								\
 	  if ((y_coord >= y) && (y_coord < (y + height)))		\
-	    {								\
+	    return FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons;	\
-	      return (FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons);	\
-	    }								\
 	}								\
 } while (0)
 static Lisp_Object
 toolbar_buttons_at_pixpos (struct frame *f, int x_coord, int y_coord)
 int len;
 Error_behavior errb = decode_error_behavior_flag (no_error);
 if (!VECTORP (button))
 CTB_ERROR ("toolbar button descriptors must be vectors");
-elt = vector_data (XVECTOR (button));
+elt = XVECTOR_DATA (button);
-if (vector_length (XVECTOR (button)) == 2)
+if (XVECTOR_LENGTH (button) == 2)
 {
 if (!EQ (Q_style, check_toolbar_button_keywords (button, elt[0],
 						       elt[1], errb)))
 	CTB_ERROR ("must specify toolbar blank style");
 return Qt;
 }
-if (vector_length (XVECTOR (button)) != 4)
+if (XVECTOR_LENGTH (button) != 4)
 CTB_ERROR ("toolbar button descriptors must be 2 or 4 long");
 /* The first element must be a list of glyphs of length 1-6.  The
 first entry is the pixmap for the up state, the second for the
 down state, the third for the disabled state, the fourth for the
 value = elt[0];
 len = XINT (Flength (value));
 if (len < 1)
 CTB_ERROR ("toolbar button glyph list must have at least 1 entry");
 if (len > 6)
 CTB_ERROR ("toolbar button glyph list can have at most 6 entries");
 glyphs = value;
 while (!NILP (glyphs))
 and are lists of vectors.  See `default-toolbar' for a description
 of the exact format.
 */
 (object))
 {
-return (TOOLBAR_SPECIFIERP (object) ? Qt : Qnil);
+return TOOLBAR_SPECIFIERP (object) ? Qt : Qnil;
 }
 static void
 toolbar_specs_changed (Lisp_Object specifier, struct window *w,
 void
 specifier_vars_of_toolbar (void)
 {
 Lisp_Object elt;
 DEFVAR_SPECIFIER ("default-toolbar", &Vdefault_toolbar /*
 Specifier for a fallback toolbar.
 Use `set-specifier' to change this.
 The position of this toolbar is specified in the function

Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 173:8eaf7971accc r20-3b13