diff src/EmacsFrame.c @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 3d6bfa290dbd
children 0e522484dd2a
line wrap: on
line diff
--- a/src/EmacsFrame.c	Mon Aug 13 10:06:48 2007 +0200
+++ b/src/EmacsFrame.c	Mon Aug 13 10:07:35 2007 +0200
@@ -102,6 +102,18 @@
      offset (left_toolbar_width), XtRImmediate, (XtPointer)-1},
   {XtNrightToolBarWidth, XtCRightToolBarWidth, XtRInt, sizeof (int),
      offset (right_toolbar_width), XtRImmediate, (XtPointer)-1},
+  {XtNtopToolBarBorderWidth, XtCTopToolBarBorderWidth, XtRInt,
+     sizeof (int),
+     offset (top_toolbar_border_width), XtRImmediate, (XtPointer)-1},
+  {XtNbottomToolBarBorderWidth, XtCBottomToolBarBorderWidth, XtRInt,
+     sizeof (int),
+     offset (bottom_toolbar_border_width), XtRImmediate, (XtPointer)-1},
+  {XtNleftToolBarBorderWidth, XtCLeftToolBarBorderWidth, XtRInt,
+     sizeof (int),
+     offset (left_toolbar_border_width), XtRImmediate, (XtPointer)-1},
+  {XtNrightToolBarBorderWidth, XtCRightToolBarBorderWidth, XtRInt,
+     sizeof (int),
+     offset (right_toolbar_border_width), XtRImmediate, (XtPointer)-1},
   {XtNtopToolBarShadowColor, XtCTopToolBarShadowColor, XtRPixel, sizeof(Pixel),
      offset(top_toolbar_shadow_pixel), XtRString, "#000000"},
   {XtNbottomToolBarShadowColor, XtCBottomToolBarShadowColor, XtRPixel,
@@ -130,6 +142,8 @@
   },
   {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
      offset(foreground_pixel), XtRString, "XtDefaultForeground"},
+  {XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
+     offset(background_pixel), XtRImmediate, (XtPointer)-1},
   {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
      offset(cursor_color), XtRString, "XtDefaultForeground"},
   {XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean),
@@ -425,6 +439,30 @@
 	  (Vtoolbar_size[RIGHT_TOOLBAR],
 	   make_int (new->emacs_frame.right_toolbar_width),
 	   frame, Qnil, Qnil);
+      if (cur->emacs_frame.top_toolbar_border_width !=
+	  new->emacs_frame.top_toolbar_border_width)
+	Fadd_spec_to_specifier
+	  (Vtoolbar_border_width[TOP_TOOLBAR],
+	   make_int (new->emacs_frame.top_toolbar_border_width),
+	   frame, Qnil, Qnil);
+      if (cur->emacs_frame.bottom_toolbar_border_width !=
+	  new->emacs_frame.bottom_toolbar_border_width)
+	Fadd_spec_to_specifier
+	  (Vtoolbar_border_width[BOTTOM_TOOLBAR],
+	   make_int (new->emacs_frame.bottom_toolbar_border_width),
+	   frame, Qnil, Qnil);
+      if (cur->emacs_frame.left_toolbar_border_width !=
+	  new->emacs_frame.left_toolbar_border_width)
+	Fadd_spec_to_specifier
+	  (Vtoolbar_border_width[LEFT_TOOLBAR],
+	   make_int (new->emacs_frame.left_toolbar_border_width),
+	   frame, Qnil, Qnil);
+      if (cur->emacs_frame.right_toolbar_border_width !=
+	  new->emacs_frame.right_toolbar_border_width)
+	Fadd_spec_to_specifier
+	  (Vtoolbar_border_width[RIGHT_TOOLBAR],
+	   make_int (new->emacs_frame.right_toolbar_border_width),
+	   frame, Qnil, Qnil);
 #endif /* HAVE_TOOLBARS */
     }
   in_resource_setting--;