Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 444:576fb035e263 r21-2-37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-37
author cvs
date Mon, 13 Aug 2007 11:36:19 +0200
parents abe6d1db359e
children 0784d089fdc9
comparison
equal deleted inserted replaced
443:a8296e22da4e 444:576fb035e263
988 DEFUN ("check-toolbar-button-syntax", Fcheck_toolbar_button_syntax, 1, 2, 0, /* 988 DEFUN ("check-toolbar-button-syntax", Fcheck_toolbar_button_syntax, 1, 2, 0, /*
989 Verify the syntax of entry BUTTON in a toolbar description list. 989 Verify the syntax of entry BUTTON in a toolbar description list.
990 If you want to verify the syntax of a toolbar description list as a 990 If you want to verify the syntax of a toolbar description list as a
991 whole, use `check-valid-instantiator' with a specifier type of 'toolbar. 991 whole, use `check-valid-instantiator' with a specifier type of 'toolbar.
992 */ 992 */
993 (button, no_error)) 993 (button, noerror))
994 { 994 {
995 Lisp_Object *elt, glyphs, value; 995 Lisp_Object *elt, glyphs, value;
996 int len; 996 int len;
997 Error_behavior errb = decode_error_behavior_flag (no_error); 997 Error_behavior errb = decode_error_behavior_flag (noerror);
998 998
999 if (!VECTORP (button)) 999 if (!VECTORP (button))
1000 CTB_ERROR ("toolbar button descriptors must be vectors"); 1000 CTB_ERROR ("toolbar button descriptors must be vectors");
1001 elt = XVECTOR_DATA (button); 1001 elt = XVECTOR_DATA (button);
1002 1002
1415 automatically knew about specifier fallbacks, so we didn't 1415 automatically knew about specifier fallbacks, so we didn't
1416 have to do it ourselves. */ 1416 have to do it ourselves. */
1417 set_specifier_caching (Vdefault_toolbar, 1417 set_specifier_caching (Vdefault_toolbar,
1418 offsetof (struct window, default_toolbar), 1418 offsetof (struct window, default_toolbar),
1419 default_toolbar_specs_changed, 1419 default_toolbar_specs_changed,
1420 0, 0); 1420 0, 0, 0);
1421 1421
1422 DEFVAR_SPECIFIER ("top-toolbar", 1422 DEFVAR_SPECIFIER ("top-toolbar",
1423 &Vtoolbar[TOP_TOOLBAR] /* 1423 &Vtoolbar[TOP_TOOLBAR] /*
1424 Specifier for the toolbar at the top of the frame. 1424 Specifier for the toolbar at the top of the frame.
1425 Use `set-specifier' to change this. 1425 Use `set-specifier' to change this.
1427 */ ); 1427 */ );
1428 Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar); 1428 Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar);
1429 set_specifier_caching (Vtoolbar[TOP_TOOLBAR], 1429 set_specifier_caching (Vtoolbar[TOP_TOOLBAR],
1430 offsetof (struct window, toolbar[TOP_TOOLBAR]), 1430 offsetof (struct window, toolbar[TOP_TOOLBAR]),
1431 toolbar_specs_changed, 1431 toolbar_specs_changed,
1432 0, 0); 1432 0, 0, 0);
1433 1433
1434 DEFVAR_SPECIFIER ("bottom-toolbar", 1434 DEFVAR_SPECIFIER ("bottom-toolbar",
1435 &Vtoolbar[BOTTOM_TOOLBAR] /* 1435 &Vtoolbar[BOTTOM_TOOLBAR] /*
1436 Specifier for the toolbar at the bottom of the frame. 1436 Specifier for the toolbar at the bottom of the frame.
1437 Use `set-specifier' to change this. 1437 Use `set-specifier' to change this.
1444 */ ); 1444 */ );
1445 Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar); 1445 Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar);
1446 set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR], 1446 set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
1447 offsetof (struct window, toolbar[BOTTOM_TOOLBAR]), 1447 offsetof (struct window, toolbar[BOTTOM_TOOLBAR]),
1448 toolbar_specs_changed, 1448 toolbar_specs_changed,
1449 0, 0); 1449 0, 0, 0);
1450 1450
1451 DEFVAR_SPECIFIER ("left-toolbar", 1451 DEFVAR_SPECIFIER ("left-toolbar",
1452 &Vtoolbar[LEFT_TOOLBAR] /* 1452 &Vtoolbar[LEFT_TOOLBAR] /*
1453 Specifier for the toolbar at the left edge of the frame. 1453 Specifier for the toolbar at the left edge of the frame.
1454 Use `set-specifier' to change this. 1454 Use `set-specifier' to change this.
1461 */ ); 1461 */ );
1462 Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar); 1462 Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar);
1463 set_specifier_caching (Vtoolbar[LEFT_TOOLBAR], 1463 set_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
1464 offsetof (struct window, toolbar[LEFT_TOOLBAR]), 1464 offsetof (struct window, toolbar[LEFT_TOOLBAR]),
1465 toolbar_specs_changed, 1465 toolbar_specs_changed,
1466 0, 0); 1466 0, 0, 0);
1467 1467
1468 DEFVAR_SPECIFIER ("right-toolbar", 1468 DEFVAR_SPECIFIER ("right-toolbar",
1469 &Vtoolbar[RIGHT_TOOLBAR] /* 1469 &Vtoolbar[RIGHT_TOOLBAR] /*
1470 Specifier for the toolbar at the right edge of the frame. 1470 Specifier for the toolbar at the right edge of the frame.
1471 Use `set-specifier' to change this. 1471 Use `set-specifier' to change this.
1478 */ ); 1478 */ );
1479 Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar); 1479 Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar);
1480 set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR], 1480 set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
1481 offsetof (struct window, toolbar[RIGHT_TOOLBAR]), 1481 offsetof (struct window, toolbar[RIGHT_TOOLBAR]),
1482 toolbar_specs_changed, 1482 toolbar_specs_changed,
1483 0, 0); 1483 0, 0, 0);
1484 1484
1485 /* initially, top inherits from default; this can be 1485 /* initially, top inherits from default; this can be
1486 changed with `set-default-toolbar-position'. */ 1486 changed with `set-default-toolbar-position'. */
1487 fb = list1 (Fcons (Qnil, Qnil)); 1487 fb = list1 (Fcons (Qnil, Qnil));
1488 set_specifier_fallback (Vdefault_toolbar, fb); 1488 set_specifier_fallback (Vdefault_toolbar, fb);
1533 Vdefault_toolbar_height = Fmake_specifier (Qnatnum); 1533 Vdefault_toolbar_height = Fmake_specifier (Qnatnum);
1534 set_specifier_caching (Vdefault_toolbar_height, 1534 set_specifier_caching (Vdefault_toolbar_height,
1535 offsetof (struct window, default_toolbar_height), 1535 offsetof (struct window, default_toolbar_height),
1536 default_toolbar_size_changed_in_window, 1536 default_toolbar_size_changed_in_window,
1537 offsetof (struct frame, default_toolbar_height), 1537 offsetof (struct frame, default_toolbar_height),
1538 default_toolbar_size_changed_in_frame); 1538 default_toolbar_size_changed_in_frame, 0);
1539 1539
1540 DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /* 1540 DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /*
1541 *Width of the default toolbar, if it's oriented vertically. 1541 *Width of the default toolbar, if it's oriented vertically.
1542 This is a specifier; use `set-specifier' to change it. 1542 This is a specifier; use `set-specifier' to change it.
1543 1543
1546 Vdefault_toolbar_width = Fmake_specifier (Qnatnum); 1546 Vdefault_toolbar_width = Fmake_specifier (Qnatnum);
1547 set_specifier_caching (Vdefault_toolbar_width, 1547 set_specifier_caching (Vdefault_toolbar_width,
1548 offsetof (struct window, default_toolbar_width), 1548 offsetof (struct window, default_toolbar_width),
1549 default_toolbar_size_changed_in_window, 1549 default_toolbar_size_changed_in_window,
1550 offsetof (struct frame, default_toolbar_width), 1550 offsetof (struct frame, default_toolbar_width),
1551 default_toolbar_size_changed_in_frame); 1551 default_toolbar_size_changed_in_frame, 0);
1552 1552
1553 DEFVAR_SPECIFIER ("top-toolbar-height", 1553 DEFVAR_SPECIFIER ("top-toolbar-height",
1554 &Vtoolbar_size[TOP_TOOLBAR] /* 1554 &Vtoolbar_size[TOP_TOOLBAR] /*
1555 *Height of the top toolbar. 1555 *Height of the top toolbar.
1556 This is a specifier; use `set-specifier' to change it. 1556 This is a specifier; use `set-specifier' to change it.
1560 Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum); 1560 Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
1561 set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR], 1561 set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR],
1562 offsetof (struct window, toolbar_size[TOP_TOOLBAR]), 1562 offsetof (struct window, toolbar_size[TOP_TOOLBAR]),
1563 toolbar_geometry_changed_in_window, 1563 toolbar_geometry_changed_in_window,
1564 offsetof (struct frame, toolbar_size[TOP_TOOLBAR]), 1564 offsetof (struct frame, toolbar_size[TOP_TOOLBAR]),
1565 frame_size_slipped); 1565 frame_size_slipped, 0);
1566 1566
1567 DEFVAR_SPECIFIER ("bottom-toolbar-height", 1567 DEFVAR_SPECIFIER ("bottom-toolbar-height",
1568 &Vtoolbar_size[BOTTOM_TOOLBAR] /* 1568 &Vtoolbar_size[BOTTOM_TOOLBAR] /*
1569 *Height of the bottom toolbar. 1569 *Height of the bottom toolbar.
1570 This is a specifier; use `set-specifier' to change it. 1570 This is a specifier; use `set-specifier' to change it.
1574 Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum); 1574 Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
1575 set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR], 1575 set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR],
1576 offsetof (struct window, toolbar_size[BOTTOM_TOOLBAR]), 1576 offsetof (struct window, toolbar_size[BOTTOM_TOOLBAR]),
1577 toolbar_geometry_changed_in_window, 1577 toolbar_geometry_changed_in_window,
1578 offsetof (struct frame, toolbar_size[BOTTOM_TOOLBAR]), 1578 offsetof (struct frame, toolbar_size[BOTTOM_TOOLBAR]),
1579 frame_size_slipped); 1579 frame_size_slipped, 0);
1580 1580
1581 DEFVAR_SPECIFIER ("left-toolbar-width", 1581 DEFVAR_SPECIFIER ("left-toolbar-width",
1582 &Vtoolbar_size[LEFT_TOOLBAR] /* 1582 &Vtoolbar_size[LEFT_TOOLBAR] /*
1583 *Width of left toolbar. 1583 *Width of left toolbar.
1584 This is a specifier; use `set-specifier' to change it. 1584 This is a specifier; use `set-specifier' to change it.
1588 Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum); 1588 Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
1589 set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR], 1589 set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR],
1590 offsetof (struct window, toolbar_size[LEFT_TOOLBAR]), 1590 offsetof (struct window, toolbar_size[LEFT_TOOLBAR]),
1591 toolbar_geometry_changed_in_window, 1591 toolbar_geometry_changed_in_window,
1592 offsetof (struct frame, toolbar_size[LEFT_TOOLBAR]), 1592 offsetof (struct frame, toolbar_size[LEFT_TOOLBAR]),
1593 frame_size_slipped); 1593 frame_size_slipped, 0);
1594 1594
1595 DEFVAR_SPECIFIER ("right-toolbar-width", 1595 DEFVAR_SPECIFIER ("right-toolbar-width",
1596 &Vtoolbar_size[RIGHT_TOOLBAR] /* 1596 &Vtoolbar_size[RIGHT_TOOLBAR] /*
1597 *Width of right toolbar. 1597 *Width of right toolbar.
1598 This is a specifier; use `set-specifier' to change it. 1598 This is a specifier; use `set-specifier' to change it.
1602 Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum); 1602 Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
1603 set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR], 1603 set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR],
1604 offsetof (struct window, toolbar_size[RIGHT_TOOLBAR]), 1604 offsetof (struct window, toolbar_size[RIGHT_TOOLBAR]),
1605 toolbar_geometry_changed_in_window, 1605 toolbar_geometry_changed_in_window,
1606 offsetof (struct frame, toolbar_size[RIGHT_TOOLBAR]), 1606 offsetof (struct frame, toolbar_size[RIGHT_TOOLBAR]),
1607 frame_size_slipped); 1607 frame_size_slipped, 0);
1608 1608
1609 fb = Qnil; 1609 fb = Qnil;
1610 #ifdef HAVE_TTY 1610 #ifdef HAVE_TTY
1611 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1611 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1612 #endif 1612 #endif
1665 Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum); 1665 Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum);
1666 set_specifier_caching (Vdefault_toolbar_border_width, 1666 set_specifier_caching (Vdefault_toolbar_border_width,
1667 offsetof (struct window, default_toolbar_border_width), 1667 offsetof (struct window, default_toolbar_border_width),
1668 default_toolbar_border_width_changed_in_window, 1668 default_toolbar_border_width_changed_in_window,
1669 offsetof (struct frame, default_toolbar_border_width), 1669 offsetof (struct frame, default_toolbar_border_width),
1670 default_toolbar_border_width_changed_in_frame); 1670 default_toolbar_border_width_changed_in_frame, 0);
1671 1671
1672 DEFVAR_SPECIFIER ("top-toolbar-border-width", 1672 DEFVAR_SPECIFIER ("top-toolbar-border-width",
1673 &Vtoolbar_border_width[TOP_TOOLBAR] /* 1673 &Vtoolbar_border_width[TOP_TOOLBAR] /*
1674 *Border width of the top toolbar. 1674 *Border width of the top toolbar.
1675 This is a specifier; use `set-specifier' to change it. 1675 This is a specifier; use `set-specifier' to change it.
1681 offsetof (struct window, 1681 offsetof (struct window,
1682 toolbar_border_width[TOP_TOOLBAR]), 1682 toolbar_border_width[TOP_TOOLBAR]),
1683 toolbar_geometry_changed_in_window, 1683 toolbar_geometry_changed_in_window,
1684 offsetof (struct frame, 1684 offsetof (struct frame,
1685 toolbar_border_width[TOP_TOOLBAR]), 1685 toolbar_border_width[TOP_TOOLBAR]),
1686 frame_size_slipped); 1686 frame_size_slipped, 0);
1687 1687
1688 DEFVAR_SPECIFIER ("bottom-toolbar-border-width", 1688 DEFVAR_SPECIFIER ("bottom-toolbar-border-width",
1689 &Vtoolbar_border_width[BOTTOM_TOOLBAR] /* 1689 &Vtoolbar_border_width[BOTTOM_TOOLBAR] /*
1690 *Border width of the bottom toolbar. 1690 *Border width of the bottom toolbar.
1691 This is a specifier; use `set-specifier' to change it. 1691 This is a specifier; use `set-specifier' to change it.
1697 offsetof (struct window, 1697 offsetof (struct window,
1698 toolbar_border_width[BOTTOM_TOOLBAR]), 1698 toolbar_border_width[BOTTOM_TOOLBAR]),
1699 toolbar_geometry_changed_in_window, 1699 toolbar_geometry_changed_in_window,
1700 offsetof (struct frame, 1700 offsetof (struct frame,
1701 toolbar_border_width[BOTTOM_TOOLBAR]), 1701 toolbar_border_width[BOTTOM_TOOLBAR]),
1702 frame_size_slipped); 1702 frame_size_slipped, 0);
1703 1703
1704 DEFVAR_SPECIFIER ("left-toolbar-border-width", 1704 DEFVAR_SPECIFIER ("left-toolbar-border-width",
1705 &Vtoolbar_border_width[LEFT_TOOLBAR] /* 1705 &Vtoolbar_border_width[LEFT_TOOLBAR] /*
1706 *Border width of left toolbar. 1706 *Border width of left toolbar.
1707 This is a specifier; use `set-specifier' to change it. 1707 This is a specifier; use `set-specifier' to change it.
1713 offsetof (struct window, 1713 offsetof (struct window,
1714 toolbar_border_width[LEFT_TOOLBAR]), 1714 toolbar_border_width[LEFT_TOOLBAR]),
1715 toolbar_geometry_changed_in_window, 1715 toolbar_geometry_changed_in_window,
1716 offsetof (struct frame, 1716 offsetof (struct frame,
1717 toolbar_border_width[LEFT_TOOLBAR]), 1717 toolbar_border_width[LEFT_TOOLBAR]),
1718 frame_size_slipped); 1718 frame_size_slipped, 0);
1719 1719
1720 DEFVAR_SPECIFIER ("right-toolbar-border-width", 1720 DEFVAR_SPECIFIER ("right-toolbar-border-width",
1721 &Vtoolbar_border_width[RIGHT_TOOLBAR] /* 1721 &Vtoolbar_border_width[RIGHT_TOOLBAR] /*
1722 *Border width of right toolbar. 1722 *Border width of right toolbar.
1723 This is a specifier; use `set-specifier' to change it. 1723 This is a specifier; use `set-specifier' to change it.
1729 offsetof (struct window, 1729 offsetof (struct window,
1730 toolbar_border_width[RIGHT_TOOLBAR]), 1730 toolbar_border_width[RIGHT_TOOLBAR]),
1731 toolbar_geometry_changed_in_window, 1731 toolbar_geometry_changed_in_window,
1732 offsetof (struct frame, 1732 offsetof (struct frame,
1733 toolbar_border_width[RIGHT_TOOLBAR]), 1733 toolbar_border_width[RIGHT_TOOLBAR]),
1734 frame_size_slipped); 1734 frame_size_slipped, 0);
1735 1735
1736 fb = Qnil; 1736 fb = Qnil;
1737 #ifdef HAVE_TTY 1737 #ifdef HAVE_TTY
1738 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1738 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1739 #endif 1739 #endif
1775 Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean); 1775 Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean);
1776 set_specifier_caching (Vdefault_toolbar_visible_p, 1776 set_specifier_caching (Vdefault_toolbar_visible_p,
1777 offsetof (struct window, default_toolbar_visible_p), 1777 offsetof (struct window, default_toolbar_visible_p),
1778 default_toolbar_visible_p_changed_in_window, 1778 default_toolbar_visible_p_changed_in_window,
1779 offsetof (struct frame, default_toolbar_visible_p), 1779 offsetof (struct frame, default_toolbar_visible_p),
1780 default_toolbar_visible_p_changed_in_frame); 1780 default_toolbar_visible_p_changed_in_frame, 0);
1781 1781
1782 DEFVAR_SPECIFIER ("top-toolbar-visible-p", 1782 DEFVAR_SPECIFIER ("top-toolbar-visible-p",
1783 &Vtoolbar_visible_p[TOP_TOOLBAR] /* 1783 &Vtoolbar_visible_p[TOP_TOOLBAR] /*
1784 *Whether the top toolbar is visible. 1784 *Whether the top toolbar is visible.
1785 This is a specifier; use `set-specifier' to change it. 1785 This is a specifier; use `set-specifier' to change it.
1791 offsetof (struct window, 1791 offsetof (struct window,
1792 toolbar_visible_p[TOP_TOOLBAR]), 1792 toolbar_visible_p[TOP_TOOLBAR]),
1793 toolbar_geometry_changed_in_window, 1793 toolbar_geometry_changed_in_window,
1794 offsetof (struct frame, 1794 offsetof (struct frame,
1795 toolbar_visible_p[TOP_TOOLBAR]), 1795 toolbar_visible_p[TOP_TOOLBAR]),
1796 frame_size_slipped); 1796 frame_size_slipped, 0);
1797 1797
1798 DEFVAR_SPECIFIER ("bottom-toolbar-visible-p", 1798 DEFVAR_SPECIFIER ("bottom-toolbar-visible-p",
1799 &Vtoolbar_visible_p[BOTTOM_TOOLBAR] /* 1799 &Vtoolbar_visible_p[BOTTOM_TOOLBAR] /*
1800 *Whether the bottom toolbar is visible. 1800 *Whether the bottom toolbar is visible.
1801 This is a specifier; use `set-specifier' to change it. 1801 This is a specifier; use `set-specifier' to change it.
1807 offsetof (struct window, 1807 offsetof (struct window,
1808 toolbar_visible_p[BOTTOM_TOOLBAR]), 1808 toolbar_visible_p[BOTTOM_TOOLBAR]),
1809 toolbar_geometry_changed_in_window, 1809 toolbar_geometry_changed_in_window,
1810 offsetof (struct frame, 1810 offsetof (struct frame,
1811 toolbar_visible_p[BOTTOM_TOOLBAR]), 1811 toolbar_visible_p[BOTTOM_TOOLBAR]),
1812 frame_size_slipped); 1812 frame_size_slipped, 0);
1813 1813
1814 DEFVAR_SPECIFIER ("left-toolbar-visible-p", 1814 DEFVAR_SPECIFIER ("left-toolbar-visible-p",
1815 &Vtoolbar_visible_p[LEFT_TOOLBAR] /* 1815 &Vtoolbar_visible_p[LEFT_TOOLBAR] /*
1816 *Whether the left toolbar is visible. 1816 *Whether the left toolbar is visible.
1817 This is a specifier; use `set-specifier' to change it. 1817 This is a specifier; use `set-specifier' to change it.
1823 offsetof (struct window, 1823 offsetof (struct window,
1824 toolbar_visible_p[LEFT_TOOLBAR]), 1824 toolbar_visible_p[LEFT_TOOLBAR]),
1825 toolbar_geometry_changed_in_window, 1825 toolbar_geometry_changed_in_window,
1826 offsetof (struct frame, 1826 offsetof (struct frame,
1827 toolbar_visible_p[LEFT_TOOLBAR]), 1827 toolbar_visible_p[LEFT_TOOLBAR]),
1828 frame_size_slipped); 1828 frame_size_slipped, 0);
1829 1829
1830 DEFVAR_SPECIFIER ("right-toolbar-visible-p", 1830 DEFVAR_SPECIFIER ("right-toolbar-visible-p",
1831 &Vtoolbar_visible_p[RIGHT_TOOLBAR] /* 1831 &Vtoolbar_visible_p[RIGHT_TOOLBAR] /*
1832 *Whether the right toolbar is visible. 1832 *Whether the right toolbar is visible.
1833 This is a specifier; use `set-specifier' to change it. 1833 This is a specifier; use `set-specifier' to change it.
1839 offsetof (struct window, 1839 offsetof (struct window,
1840 toolbar_visible_p[RIGHT_TOOLBAR]), 1840 toolbar_visible_p[RIGHT_TOOLBAR]),
1841 toolbar_geometry_changed_in_window, 1841 toolbar_geometry_changed_in_window,
1842 offsetof (struct frame, 1842 offsetof (struct frame,
1843 toolbar_visible_p[RIGHT_TOOLBAR]), 1843 toolbar_visible_p[RIGHT_TOOLBAR]),
1844 frame_size_slipped); 1844 frame_size_slipped, 0);
1845 1845
1846 /* initially, top inherits from default; this can be 1846 /* initially, top inherits from default; this can be
1847 changed with `set-default-toolbar-position'. */ 1847 changed with `set-default-toolbar-position'. */
1848 fb = list1 (Fcons (Qnil, Qt)); 1848 fb = list1 (Fcons (Qnil, Qt));
1849 set_specifier_fallback (Vdefault_toolbar_visible_p, fb); 1849 set_specifier_fallback (Vdefault_toolbar_visible_p, fb);
1862 */ ); 1862 */ );
1863 Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean); 1863 Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean);
1864 set_specifier_caching (Vtoolbar_buttons_captioned_p, 1864 set_specifier_caching (Vtoolbar_buttons_captioned_p,
1865 offsetof (struct window, toolbar_buttons_captioned_p), 1865 offsetof (struct window, toolbar_buttons_captioned_p),
1866 toolbar_buttons_captioned_p_changed, 1866 toolbar_buttons_captioned_p_changed,
1867 0, 0); 1867 0, 0, 0);
1868 set_specifier_fallback (Vtoolbar_buttons_captioned_p, 1868 set_specifier_fallback (Vtoolbar_buttons_captioned_p,
1869 list1 (Fcons (Qnil, Qt))); 1869 list1 (Fcons (Qnil, Qt)));
1870 } 1870 }