comparison 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
comparison
equal deleted inserted replaced
214:c5d88c05e1e9 215:1f0dabaa0855
100 offset (bottom_toolbar_height), XtRImmediate, (XtPointer)-1}, 100 offset (bottom_toolbar_height), XtRImmediate, (XtPointer)-1},
101 {XtNleftToolBarWidth, XtCLeftToolBarWidth, XtRInt, sizeof (int), 101 {XtNleftToolBarWidth, XtCLeftToolBarWidth, XtRInt, sizeof (int),
102 offset (left_toolbar_width), XtRImmediate, (XtPointer)-1}, 102 offset (left_toolbar_width), XtRImmediate, (XtPointer)-1},
103 {XtNrightToolBarWidth, XtCRightToolBarWidth, XtRInt, sizeof (int), 103 {XtNrightToolBarWidth, XtCRightToolBarWidth, XtRInt, sizeof (int),
104 offset (right_toolbar_width), XtRImmediate, (XtPointer)-1}, 104 offset (right_toolbar_width), XtRImmediate, (XtPointer)-1},
105 {XtNtopToolBarBorderWidth, XtCTopToolBarBorderWidth, XtRInt,
106 sizeof (int),
107 offset (top_toolbar_border_width), XtRImmediate, (XtPointer)-1},
108 {XtNbottomToolBarBorderWidth, XtCBottomToolBarBorderWidth, XtRInt,
109 sizeof (int),
110 offset (bottom_toolbar_border_width), XtRImmediate, (XtPointer)-1},
111 {XtNleftToolBarBorderWidth, XtCLeftToolBarBorderWidth, XtRInt,
112 sizeof (int),
113 offset (left_toolbar_border_width), XtRImmediate, (XtPointer)-1},
114 {XtNrightToolBarBorderWidth, XtCRightToolBarBorderWidth, XtRInt,
115 sizeof (int),
116 offset (right_toolbar_border_width), XtRImmediate, (XtPointer)-1},
105 {XtNtopToolBarShadowColor, XtCTopToolBarShadowColor, XtRPixel, sizeof(Pixel), 117 {XtNtopToolBarShadowColor, XtCTopToolBarShadowColor, XtRPixel, sizeof(Pixel),
106 offset(top_toolbar_shadow_pixel), XtRString, "#000000"}, 118 offset(top_toolbar_shadow_pixel), XtRString, "#000000"},
107 {XtNbottomToolBarShadowColor, XtCBottomToolBarShadowColor, XtRPixel, 119 {XtNbottomToolBarShadowColor, XtCBottomToolBarShadowColor, XtRPixel,
108 sizeof(Pixel), offset(bottom_toolbar_shadow_pixel), XtRString, "#000000"}, 120 sizeof(Pixel), offset(bottom_toolbar_shadow_pixel), XtRString, "#000000"},
109 {XtNbackgroundToolBarColor, XtCBackgroundToolBarColor, XtRPixel, 121 {XtNbackgroundToolBarColor, XtCBackgroundToolBarColor, XtRPixel,
128 #endif 140 #endif
129 offset(font), XtRImmediate, (XtPointer)0 141 offset(font), XtRImmediate, (XtPointer)0
130 }, 142 },
131 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), 143 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
132 offset(foreground_pixel), XtRString, "XtDefaultForeground"}, 144 offset(foreground_pixel), XtRString, "XtDefaultForeground"},
145 {XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
146 offset(background_pixel), XtRImmediate, (XtPointer)-1},
133 {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel), 147 {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
134 offset(cursor_color), XtRString, "XtDefaultForeground"}, 148 offset(cursor_color), XtRString, "XtDefaultForeground"},
135 {XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean), 149 {XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean),
136 offset (bar_cursor), XtRImmediate, (XtPointer)0}, 150 offset (bar_cursor), XtRImmediate, (XtPointer)0},
137 {XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof (Boolean), 151 {XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof (Boolean),
423 new->emacs_frame.right_toolbar_width) 437 new->emacs_frame.right_toolbar_width)
424 Fadd_spec_to_specifier 438 Fadd_spec_to_specifier
425 (Vtoolbar_size[RIGHT_TOOLBAR], 439 (Vtoolbar_size[RIGHT_TOOLBAR],
426 make_int (new->emacs_frame.right_toolbar_width), 440 make_int (new->emacs_frame.right_toolbar_width),
427 frame, Qnil, Qnil); 441 frame, Qnil, Qnil);
442 if (cur->emacs_frame.top_toolbar_border_width !=
443 new->emacs_frame.top_toolbar_border_width)
444 Fadd_spec_to_specifier
445 (Vtoolbar_border_width[TOP_TOOLBAR],
446 make_int (new->emacs_frame.top_toolbar_border_width),
447 frame, Qnil, Qnil);
448 if (cur->emacs_frame.bottom_toolbar_border_width !=
449 new->emacs_frame.bottom_toolbar_border_width)
450 Fadd_spec_to_specifier
451 (Vtoolbar_border_width[BOTTOM_TOOLBAR],
452 make_int (new->emacs_frame.bottom_toolbar_border_width),
453 frame, Qnil, Qnil);
454 if (cur->emacs_frame.left_toolbar_border_width !=
455 new->emacs_frame.left_toolbar_border_width)
456 Fadd_spec_to_specifier
457 (Vtoolbar_border_width[LEFT_TOOLBAR],
458 make_int (new->emacs_frame.left_toolbar_border_width),
459 frame, Qnil, Qnil);
460 if (cur->emacs_frame.right_toolbar_border_width !=
461 new->emacs_frame.right_toolbar_border_width)
462 Fadd_spec_to_specifier
463 (Vtoolbar_border_width[RIGHT_TOOLBAR],
464 make_int (new->emacs_frame.right_toolbar_border_width),
465 frame, Qnil, Qnil);
428 #endif /* HAVE_TOOLBARS */ 466 #endif /* HAVE_TOOLBARS */
429 } 467 }
430 in_resource_setting--; 468 in_resource_setting--;
431 469
432 return False; 470 return False;