comparison src/toolbar.c @ 438:84b14dcb0985 r21-2-27

Import from CVS: tag r21-2-27
author cvs
date Mon, 13 Aug 2007 11:32:25 +0200
parents 3ecd8885ac67
children abe6d1db359e
comparison
equal deleted inserted replaced
437:e2a4e8b94b82 438:84b14dcb0985
1432 Vdefault_toolbar = Fmake_specifier (Qtoolbar); 1432 Vdefault_toolbar = Fmake_specifier (Qtoolbar);
1433 /* #### It would be even nicer if the specifier caching 1433 /* #### It would be even nicer if the specifier caching
1434 automatically knew about specifier fallbacks, so we didn't 1434 automatically knew about specifier fallbacks, so we didn't
1435 have to do it ourselves. */ 1435 have to do it ourselves. */
1436 set_specifier_caching (Vdefault_toolbar, 1436 set_specifier_caching (Vdefault_toolbar,
1437 slot_offset (struct window, 1437 offsetof (struct window, default_toolbar),
1438 default_toolbar),
1439 default_toolbar_specs_changed, 1438 default_toolbar_specs_changed,
1440 0, 0); 1439 0, 0);
1441 1440
1442 DEFVAR_SPECIFIER ("top-toolbar", 1441 DEFVAR_SPECIFIER ("top-toolbar",
1443 &Vtoolbar[TOP_TOOLBAR] /* 1442 &Vtoolbar[TOP_TOOLBAR] /*
1445 Use `set-specifier' to change this. 1444 Use `set-specifier' to change this.
1446 See `default-toolbar' for a description of a valid toolbar instantiator. 1445 See `default-toolbar' for a description of a valid toolbar instantiator.
1447 */ ); 1446 */ );
1448 Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar); 1447 Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar);
1449 set_specifier_caching (Vtoolbar[TOP_TOOLBAR], 1448 set_specifier_caching (Vtoolbar[TOP_TOOLBAR],
1450 slot_offset (struct window, 1449 offsetof (struct window, toolbar[TOP_TOOLBAR]),
1451 toolbar[TOP_TOOLBAR]),
1452 toolbar_specs_changed, 1450 toolbar_specs_changed,
1453 0, 0); 1451 0, 0);
1454 1452
1455 DEFVAR_SPECIFIER ("bottom-toolbar", 1453 DEFVAR_SPECIFIER ("bottom-toolbar",
1456 &Vtoolbar[BOTTOM_TOOLBAR] /* 1454 &Vtoolbar[BOTTOM_TOOLBAR] /*
1463 `bottom-toolbar-height') is 0; thus, a bottom toolbar will not be 1461 `bottom-toolbar-height') is 0; thus, a bottom toolbar will not be
1464 displayed even if you provide a value for `bottom-toolbar'. 1462 displayed even if you provide a value for `bottom-toolbar'.
1465 */ ); 1463 */ );
1466 Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar); 1464 Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar);
1467 set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR], 1465 set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
1468 slot_offset (struct window, 1466 offsetof (struct window, toolbar[BOTTOM_TOOLBAR]),
1469 toolbar[BOTTOM_TOOLBAR]),
1470 toolbar_specs_changed, 1467 toolbar_specs_changed,
1471 0, 0); 1468 0, 0);
1472 1469
1473 DEFVAR_SPECIFIER ("left-toolbar", 1470 DEFVAR_SPECIFIER ("left-toolbar",
1474 &Vtoolbar[LEFT_TOOLBAR] /* 1471 &Vtoolbar[LEFT_TOOLBAR] /*
1481 `left-toolbar-width') is 0; thus, a left toolbar will not be 1478 `left-toolbar-width') is 0; thus, a left toolbar will not be
1482 displayed even if you provide a value for `left-toolbar'. 1479 displayed even if you provide a value for `left-toolbar'.
1483 */ ); 1480 */ );
1484 Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar); 1481 Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar);
1485 set_specifier_caching (Vtoolbar[LEFT_TOOLBAR], 1482 set_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
1486 slot_offset (struct window, 1483 offsetof (struct window, toolbar[LEFT_TOOLBAR]),
1487 toolbar[LEFT_TOOLBAR]),
1488 toolbar_specs_changed, 1484 toolbar_specs_changed,
1489 0, 0); 1485 0, 0);
1490 1486
1491 DEFVAR_SPECIFIER ("right-toolbar", 1487 DEFVAR_SPECIFIER ("right-toolbar",
1492 &Vtoolbar[RIGHT_TOOLBAR] /* 1488 &Vtoolbar[RIGHT_TOOLBAR] /*
1499 `right-toolbar-width') is 0; thus, a right toolbar will not be 1495 `right-toolbar-width') is 0; thus, a right toolbar will not be
1500 displayed even if you provide a value for `right-toolbar'. 1496 displayed even if you provide a value for `right-toolbar'.
1501 */ ); 1497 */ );
1502 Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar); 1498 Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar);
1503 set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR], 1499 set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
1504 slot_offset (struct window, 1500 offsetof (struct window, toolbar[RIGHT_TOOLBAR]),
1505 toolbar[RIGHT_TOOLBAR]),
1506 toolbar_specs_changed, 1501 toolbar_specs_changed,
1507 0, 0); 1502 0, 0);
1508 1503
1509 /* initially, top inherits from default; this can be 1504 /* initially, top inherits from default; this can be
1510 changed with `set-default-toolbar-position'. */ 1505 changed with `set-default-toolbar-position'. */
1554 left toolbar but the selected window specifies that the left toolbar 1549 left toolbar but the selected window specifies that the left toolbar
1555 is not visible, so it is expanded to take up the slack. 1550 is not visible, so it is expanded to take up the slack.
1556 */ ); 1551 */ );
1557 Vdefault_toolbar_height = Fmake_specifier (Qnatnum); 1552 Vdefault_toolbar_height = Fmake_specifier (Qnatnum);
1558 set_specifier_caching (Vdefault_toolbar_height, 1553 set_specifier_caching (Vdefault_toolbar_height,
1559 slot_offset (struct window, 1554 offsetof (struct window, default_toolbar_height),
1560 default_toolbar_height),
1561 default_toolbar_size_changed_in_window, 1555 default_toolbar_size_changed_in_window,
1562 slot_offset (struct frame, 1556 offsetof (struct frame, default_toolbar_height),
1563 default_toolbar_height),
1564 default_toolbar_size_changed_in_frame); 1557 default_toolbar_size_changed_in_frame);
1565 1558
1566 DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /* 1559 DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /*
1567 *Width of the default toolbar, if it's oriented vertically. 1560 *Width of the default toolbar, if it's oriented vertically.
1568 This is a specifier; use `set-specifier' to change it. 1561 This is a specifier; use `set-specifier' to change it.
1569 1562
1570 See `default-toolbar-height' for more information. 1563 See `default-toolbar-height' for more information.
1571 */ ); 1564 */ );
1572 Vdefault_toolbar_width = Fmake_specifier (Qnatnum); 1565 Vdefault_toolbar_width = Fmake_specifier (Qnatnum);
1573 set_specifier_caching (Vdefault_toolbar_width, 1566 set_specifier_caching (Vdefault_toolbar_width,
1574 slot_offset (struct window, 1567 offsetof (struct window, default_toolbar_width),
1575 default_toolbar_width),
1576 default_toolbar_size_changed_in_window, 1568 default_toolbar_size_changed_in_window,
1577 slot_offset (struct frame, 1569 offsetof (struct frame, default_toolbar_width),
1578 default_toolbar_width),
1579 default_toolbar_size_changed_in_frame); 1570 default_toolbar_size_changed_in_frame);
1580 1571
1581 DEFVAR_SPECIFIER ("top-toolbar-height", 1572 DEFVAR_SPECIFIER ("top-toolbar-height",
1582 &Vtoolbar_size[TOP_TOOLBAR] /* 1573 &Vtoolbar_size[TOP_TOOLBAR] /*
1583 *Height of the top toolbar. 1574 *Height of the top toolbar.
1585 1576
1586 See `default-toolbar-height' for more information. 1577 See `default-toolbar-height' for more information.
1587 */ ); 1578 */ );
1588 Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum); 1579 Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
1589 set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR], 1580 set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR],
1590 slot_offset (struct window, 1581 offsetof (struct window, toolbar_size[TOP_TOOLBAR]),
1591 toolbar_size[TOP_TOOLBAR]),
1592 toolbar_geometry_changed_in_window, 1582 toolbar_geometry_changed_in_window,
1593 slot_offset (struct frame, 1583 offsetof (struct frame, toolbar_size[TOP_TOOLBAR]),
1594 toolbar_size[TOP_TOOLBAR]),
1595 frame_size_slipped); 1584 frame_size_slipped);
1596 1585
1597 DEFVAR_SPECIFIER ("bottom-toolbar-height", 1586 DEFVAR_SPECIFIER ("bottom-toolbar-height",
1598 &Vtoolbar_size[BOTTOM_TOOLBAR] /* 1587 &Vtoolbar_size[BOTTOM_TOOLBAR] /*
1599 *Height of the bottom toolbar. 1588 *Height of the bottom toolbar.
1601 1590
1602 See `default-toolbar-height' for more information. 1591 See `default-toolbar-height' for more information.
1603 */ ); 1592 */ );
1604 Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum); 1593 Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
1605 set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR], 1594 set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR],
1606 slot_offset (struct window, 1595 offsetof (struct window, toolbar_size[BOTTOM_TOOLBAR]),
1607 toolbar_size[BOTTOM_TOOLBAR]),
1608 toolbar_geometry_changed_in_window, 1596 toolbar_geometry_changed_in_window,
1609 slot_offset (struct frame, 1597 offsetof (struct frame, toolbar_size[BOTTOM_TOOLBAR]),
1610 toolbar_size[BOTTOM_TOOLBAR]),
1611 frame_size_slipped); 1598 frame_size_slipped);
1612 1599
1613 DEFVAR_SPECIFIER ("left-toolbar-width", 1600 DEFVAR_SPECIFIER ("left-toolbar-width",
1614 &Vtoolbar_size[LEFT_TOOLBAR] /* 1601 &Vtoolbar_size[LEFT_TOOLBAR] /*
1615 *Width of left toolbar. 1602 *Width of left toolbar.
1617 1604
1618 See `default-toolbar-height' for more information. 1605 See `default-toolbar-height' for more information.
1619 */ ); 1606 */ );
1620 Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum); 1607 Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
1621 set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR], 1608 set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR],
1622 slot_offset (struct window, 1609 offsetof (struct window, toolbar_size[LEFT_TOOLBAR]),
1623 toolbar_size[LEFT_TOOLBAR]),
1624 toolbar_geometry_changed_in_window, 1610 toolbar_geometry_changed_in_window,
1625 slot_offset (struct frame, 1611 offsetof (struct frame, toolbar_size[LEFT_TOOLBAR]),
1626 toolbar_size[LEFT_TOOLBAR]),
1627 frame_size_slipped); 1612 frame_size_slipped);
1628 1613
1629 DEFVAR_SPECIFIER ("right-toolbar-width", 1614 DEFVAR_SPECIFIER ("right-toolbar-width",
1630 &Vtoolbar_size[RIGHT_TOOLBAR] /* 1615 &Vtoolbar_size[RIGHT_TOOLBAR] /*
1631 *Width of right toolbar. 1616 *Width of right toolbar.
1633 1618
1634 See `default-toolbar-height' for more information. 1619 See `default-toolbar-height' for more information.
1635 */ ); 1620 */ );
1636 Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum); 1621 Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
1637 set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR], 1622 set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR],
1638 slot_offset (struct window, 1623 offsetof (struct window, toolbar_size[RIGHT_TOOLBAR]),
1639 toolbar_size[RIGHT_TOOLBAR]),
1640 toolbar_geometry_changed_in_window, 1624 toolbar_geometry_changed_in_window,
1641 slot_offset (struct frame, 1625 offsetof (struct frame, toolbar_size[RIGHT_TOOLBAR]),
1642 toolbar_size[RIGHT_TOOLBAR]),
1643 frame_size_slipped); 1626 frame_size_slipped);
1644 1627
1645 fb = Qnil; 1628 fb = Qnil;
1646 #ifdef HAVE_TTY 1629 #ifdef HAVE_TTY
1647 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1630 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1698 domain will result in a size change in the frame itself, while changing 1681 domain will result in a size change in the frame itself, while changing
1699 the value in a window domain will not. 1682 the value in a window domain will not.
1700 */ ); 1683 */ );
1701 Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum); 1684 Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum);
1702 set_specifier_caching (Vdefault_toolbar_border_width, 1685 set_specifier_caching (Vdefault_toolbar_border_width,
1703 slot_offset (struct window, 1686 offsetof (struct window, default_toolbar_border_width),
1704 default_toolbar_border_width),
1705 default_toolbar_border_width_changed_in_window, 1687 default_toolbar_border_width_changed_in_window,
1706 slot_offset (struct frame, 1688 offsetof (struct frame, default_toolbar_border_width),
1707 default_toolbar_border_width),
1708 default_toolbar_border_width_changed_in_frame); 1689 default_toolbar_border_width_changed_in_frame);
1709 1690
1710 DEFVAR_SPECIFIER ("top-toolbar-border-width", 1691 DEFVAR_SPECIFIER ("top-toolbar-border-width",
1711 &Vtoolbar_border_width[TOP_TOOLBAR] /* 1692 &Vtoolbar_border_width[TOP_TOOLBAR] /*
1712 *Border width of the top toolbar. 1693 *Border width of the top toolbar.
1714 1695
1715 See `default-toolbar-height' for more information. 1696 See `default-toolbar-height' for more information.
1716 */ ); 1697 */ );
1717 Vtoolbar_border_width[TOP_TOOLBAR] = Fmake_specifier (Qnatnum); 1698 Vtoolbar_border_width[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
1718 set_specifier_caching (Vtoolbar_border_width[TOP_TOOLBAR], 1699 set_specifier_caching (Vtoolbar_border_width[TOP_TOOLBAR],
1719 slot_offset (struct window, 1700 offsetof (struct window,
1720 toolbar_border_width[TOP_TOOLBAR]), 1701 toolbar_border_width[TOP_TOOLBAR]),
1721 toolbar_geometry_changed_in_window, 1702 toolbar_geometry_changed_in_window,
1722 slot_offset (struct frame, 1703 offsetof (struct frame,
1723 toolbar_border_width[TOP_TOOLBAR]), 1704 toolbar_border_width[TOP_TOOLBAR]),
1724 frame_size_slipped); 1705 frame_size_slipped);
1725 1706
1726 DEFVAR_SPECIFIER ("bottom-toolbar-border-width", 1707 DEFVAR_SPECIFIER ("bottom-toolbar-border-width",
1727 &Vtoolbar_border_width[BOTTOM_TOOLBAR] /* 1708 &Vtoolbar_border_width[BOTTOM_TOOLBAR] /*
1728 *Border width of the bottom toolbar. 1709 *Border width of the bottom toolbar.
1730 1711
1731 See `default-toolbar-height' for more information. 1712 See `default-toolbar-height' for more information.
1732 */ ); 1713 */ );
1733 Vtoolbar_border_width[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum); 1714 Vtoolbar_border_width[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
1734 set_specifier_caching (Vtoolbar_border_width[BOTTOM_TOOLBAR], 1715 set_specifier_caching (Vtoolbar_border_width[BOTTOM_TOOLBAR],
1735 slot_offset (struct window, 1716 offsetof (struct window,
1736 toolbar_border_width[BOTTOM_TOOLBAR]), 1717 toolbar_border_width[BOTTOM_TOOLBAR]),
1737 toolbar_geometry_changed_in_window, 1718 toolbar_geometry_changed_in_window,
1738 slot_offset (struct frame, 1719 offsetof (struct frame,
1739 toolbar_border_width[BOTTOM_TOOLBAR]), 1720 toolbar_border_width[BOTTOM_TOOLBAR]),
1740 frame_size_slipped); 1721 frame_size_slipped);
1741 1722
1742 DEFVAR_SPECIFIER ("left-toolbar-border-width", 1723 DEFVAR_SPECIFIER ("left-toolbar-border-width",
1743 &Vtoolbar_border_width[LEFT_TOOLBAR] /* 1724 &Vtoolbar_border_width[LEFT_TOOLBAR] /*
1744 *Border width of left toolbar. 1725 *Border width of left toolbar.
1746 1727
1747 See `default-toolbar-height' for more information. 1728 See `default-toolbar-height' for more information.
1748 */ ); 1729 */ );
1749 Vtoolbar_border_width[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum); 1730 Vtoolbar_border_width[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
1750 set_specifier_caching (Vtoolbar_border_width[LEFT_TOOLBAR], 1731 set_specifier_caching (Vtoolbar_border_width[LEFT_TOOLBAR],
1751 slot_offset (struct window, 1732 offsetof (struct window,
1752 toolbar_border_width[LEFT_TOOLBAR]), 1733 toolbar_border_width[LEFT_TOOLBAR]),
1753 toolbar_geometry_changed_in_window, 1734 toolbar_geometry_changed_in_window,
1754 slot_offset (struct frame, 1735 offsetof (struct frame,
1755 toolbar_border_width[LEFT_TOOLBAR]), 1736 toolbar_border_width[LEFT_TOOLBAR]),
1756 frame_size_slipped); 1737 frame_size_slipped);
1757 1738
1758 DEFVAR_SPECIFIER ("right-toolbar-border-width", 1739 DEFVAR_SPECIFIER ("right-toolbar-border-width",
1759 &Vtoolbar_border_width[RIGHT_TOOLBAR] /* 1740 &Vtoolbar_border_width[RIGHT_TOOLBAR] /*
1760 *Border width of right toolbar. 1741 *Border width of right toolbar.
1762 1743
1763 See `default-toolbar-height' for more information. 1744 See `default-toolbar-height' for more information.
1764 */ ); 1745 */ );
1765 Vtoolbar_border_width[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum); 1746 Vtoolbar_border_width[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
1766 set_specifier_caching (Vtoolbar_border_width[RIGHT_TOOLBAR], 1747 set_specifier_caching (Vtoolbar_border_width[RIGHT_TOOLBAR],
1767 slot_offset (struct window, 1748 offsetof (struct window,
1768 toolbar_border_width[RIGHT_TOOLBAR]), 1749 toolbar_border_width[RIGHT_TOOLBAR]),
1769 toolbar_geometry_changed_in_window, 1750 toolbar_geometry_changed_in_window,
1770 slot_offset (struct frame, 1751 offsetof (struct frame,
1771 toolbar_border_width[RIGHT_TOOLBAR]), 1752 toolbar_border_width[RIGHT_TOOLBAR]),
1772 frame_size_slipped); 1753 frame_size_slipped);
1773 1754
1774 fb = Qnil; 1755 fb = Qnil;
1775 #ifdef HAVE_TTY 1756 #ifdef HAVE_TTY
1776 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1757 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1810 `default-toolbar-visible-p' and all of the position-specific toolbar 1791 `default-toolbar-visible-p' and all of the position-specific toolbar
1811 visibility specifiers have a fallback value of true. 1792 visibility specifiers have a fallback value of true.
1812 */ ); 1793 */ );
1813 Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean); 1794 Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean);
1814 set_specifier_caching (Vdefault_toolbar_visible_p, 1795 set_specifier_caching (Vdefault_toolbar_visible_p,
1815 slot_offset (struct window, 1796 offsetof (struct window, default_toolbar_visible_p),
1816 default_toolbar_visible_p),
1817 default_toolbar_visible_p_changed_in_window, 1797 default_toolbar_visible_p_changed_in_window,
1818 slot_offset (struct frame, 1798 offsetof (struct frame, default_toolbar_visible_p),
1819 default_toolbar_visible_p),
1820 default_toolbar_visible_p_changed_in_frame); 1799 default_toolbar_visible_p_changed_in_frame);
1821 1800
1822 DEFVAR_SPECIFIER ("top-toolbar-visible-p", 1801 DEFVAR_SPECIFIER ("top-toolbar-visible-p",
1823 &Vtoolbar_visible_p[TOP_TOOLBAR] /* 1802 &Vtoolbar_visible_p[TOP_TOOLBAR] /*
1824 *Whether the top toolbar is visible. 1803 *Whether the top toolbar is visible.
1826 1805
1827 See `default-toolbar-visible-p' for more information. 1806 See `default-toolbar-visible-p' for more information.
1828 */ ); 1807 */ );
1829 Vtoolbar_visible_p[TOP_TOOLBAR] = Fmake_specifier (Qboolean); 1808 Vtoolbar_visible_p[TOP_TOOLBAR] = Fmake_specifier (Qboolean);
1830 set_specifier_caching (Vtoolbar_visible_p[TOP_TOOLBAR], 1809 set_specifier_caching (Vtoolbar_visible_p[TOP_TOOLBAR],
1831 slot_offset (struct window, 1810 offsetof (struct window,
1832 toolbar_visible_p[TOP_TOOLBAR]), 1811 toolbar_visible_p[TOP_TOOLBAR]),
1833 toolbar_geometry_changed_in_window, 1812 toolbar_geometry_changed_in_window,
1834 slot_offset (struct frame, 1813 offsetof (struct frame,
1835 toolbar_visible_p[TOP_TOOLBAR]), 1814 toolbar_visible_p[TOP_TOOLBAR]),
1836 frame_size_slipped); 1815 frame_size_slipped);
1837 1816
1838 DEFVAR_SPECIFIER ("bottom-toolbar-visible-p", 1817 DEFVAR_SPECIFIER ("bottom-toolbar-visible-p",
1839 &Vtoolbar_visible_p[BOTTOM_TOOLBAR] /* 1818 &Vtoolbar_visible_p[BOTTOM_TOOLBAR] /*
1840 *Whether the bottom toolbar is visible. 1819 *Whether the bottom toolbar is visible.
1842 1821
1843 See `default-toolbar-visible-p' for more information. 1822 See `default-toolbar-visible-p' for more information.
1844 */ ); 1823 */ );
1845 Vtoolbar_visible_p[BOTTOM_TOOLBAR] = Fmake_specifier (Qboolean); 1824 Vtoolbar_visible_p[BOTTOM_TOOLBAR] = Fmake_specifier (Qboolean);
1846 set_specifier_caching (Vtoolbar_visible_p[BOTTOM_TOOLBAR], 1825 set_specifier_caching (Vtoolbar_visible_p[BOTTOM_TOOLBAR],
1847 slot_offset (struct window, 1826 offsetof (struct window,
1848 toolbar_visible_p[BOTTOM_TOOLBAR]), 1827 toolbar_visible_p[BOTTOM_TOOLBAR]),
1849 toolbar_geometry_changed_in_window, 1828 toolbar_geometry_changed_in_window,
1850 slot_offset (struct frame, 1829 offsetof (struct frame,
1851 toolbar_visible_p[BOTTOM_TOOLBAR]), 1830 toolbar_visible_p[BOTTOM_TOOLBAR]),
1852 frame_size_slipped); 1831 frame_size_slipped);
1853 1832
1854 DEFVAR_SPECIFIER ("left-toolbar-visible-p", 1833 DEFVAR_SPECIFIER ("left-toolbar-visible-p",
1855 &Vtoolbar_visible_p[LEFT_TOOLBAR] /* 1834 &Vtoolbar_visible_p[LEFT_TOOLBAR] /*
1856 *Whether the left toolbar is visible. 1835 *Whether the left toolbar is visible.
1858 1837
1859 See `default-toolbar-visible-p' for more information. 1838 See `default-toolbar-visible-p' for more information.
1860 */ ); 1839 */ );
1861 Vtoolbar_visible_p[LEFT_TOOLBAR] = Fmake_specifier (Qboolean); 1840 Vtoolbar_visible_p[LEFT_TOOLBAR] = Fmake_specifier (Qboolean);
1862 set_specifier_caching (Vtoolbar_visible_p[LEFT_TOOLBAR], 1841 set_specifier_caching (Vtoolbar_visible_p[LEFT_TOOLBAR],
1863 slot_offset (struct window, 1842 offsetof (struct window,
1864 toolbar_visible_p[LEFT_TOOLBAR]), 1843 toolbar_visible_p[LEFT_TOOLBAR]),
1865 toolbar_geometry_changed_in_window, 1844 toolbar_geometry_changed_in_window,
1866 slot_offset (struct frame, 1845 offsetof (struct frame,
1867 toolbar_visible_p[LEFT_TOOLBAR]), 1846 toolbar_visible_p[LEFT_TOOLBAR]),
1868 frame_size_slipped); 1847 frame_size_slipped);
1869 1848
1870 DEFVAR_SPECIFIER ("right-toolbar-visible-p", 1849 DEFVAR_SPECIFIER ("right-toolbar-visible-p",
1871 &Vtoolbar_visible_p[RIGHT_TOOLBAR] /* 1850 &Vtoolbar_visible_p[RIGHT_TOOLBAR] /*
1872 *Whether the right toolbar is visible. 1851 *Whether the right toolbar is visible.
1874 1853
1875 See `default-toolbar-visible-p' for more information. 1854 See `default-toolbar-visible-p' for more information.
1876 */ ); 1855 */ );
1877 Vtoolbar_visible_p[RIGHT_TOOLBAR] = Fmake_specifier (Qboolean); 1856 Vtoolbar_visible_p[RIGHT_TOOLBAR] = Fmake_specifier (Qboolean);
1878 set_specifier_caching (Vtoolbar_visible_p[RIGHT_TOOLBAR], 1857 set_specifier_caching (Vtoolbar_visible_p[RIGHT_TOOLBAR],
1879 slot_offset (struct window, 1858 offsetof (struct window,
1880 toolbar_visible_p[RIGHT_TOOLBAR]), 1859 toolbar_visible_p[RIGHT_TOOLBAR]),
1881 toolbar_geometry_changed_in_window, 1860 toolbar_geometry_changed_in_window,
1882 slot_offset (struct frame, 1861 offsetof (struct frame,
1883 toolbar_visible_p[RIGHT_TOOLBAR]), 1862 toolbar_visible_p[RIGHT_TOOLBAR]),
1884 frame_size_slipped); 1863 frame_size_slipped);
1885 1864
1886 /* initially, top inherits from default; this can be 1865 /* initially, top inherits from default; this can be
1887 changed with `set-default-toolbar-position'. */ 1866 changed with `set-default-toolbar-position'. */
1888 fb = list1 (Fcons (Qnil, Qt)); 1867 fb = list1 (Fcons (Qnil, Qt));
1900 captioned versions specified. 1879 captioned versions specified.
1901 This is a specifier; use `set-specifier' to change it. 1880 This is a specifier; use `set-specifier' to change it.
1902 */ ); 1881 */ );
1903 Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean); 1882 Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean);
1904 set_specifier_caching (Vtoolbar_buttons_captioned_p, 1883 set_specifier_caching (Vtoolbar_buttons_captioned_p,
1905 slot_offset (struct window, 1884 offsetof (struct window, toolbar_buttons_captioned_p),
1906 toolbar_buttons_captioned_p),
1907 toolbar_buttons_captioned_p_changed, 1885 toolbar_buttons_captioned_p_changed,
1908 0, 0); 1886 0, 0);
1909 set_specifier_fallback (Vtoolbar_buttons_captioned_p, 1887 set_specifier_fallback (Vtoolbar_buttons_captioned_p,
1910 list1 (Fcons (Qnil, Qt))); 1888 list1 (Fcons (Qnil, Qt)));
1911 } 1889 }