Mercurial > hg > xemacs-beta

comparison src/redisplay-xlike-inc.c @ 5538:580ef98f2beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suppress a "shadowed global" warning. The warning is for j1 from <math.h> on Darwin.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 08 Aug 2011 13:57:18 +0900
parents f87be7ddd60d
children 56144c8593a8
comparison
equal deleted inserted replaced
5537:2df2d9171f20 5538:580ef98f2beb
1780 Lisp_Object tmp_pixel; 1780 Lisp_Object tmp_pixel;
1781 XLIKE_GCVALUES gcv; 1781 XLIKE_GCVALUES gcv;
1782 XLIKE_GC background_gc; 1782 XLIKE_GC background_gc;
1783 enum edge_style style; 1783 enum edge_style style;
1784 unsigned long mask; 1784 unsigned long mask;
1785 int x, y1, y2, width, shadow_thickness, spacing, line_width; 1785 int x, ytop, ybottom, width, shadow_thickness, spacing, line_width;
1786 face_index div_face = 1786 face_index div_face =
1787 get_builtin_face_cache_index (w, Vvertical_divider_face); 1787 get_builtin_face_cache_index (w, Vvertical_divider_face);
1788 1788
1789 width = window_divider_width (w); 1789 width = window_divider_width (w);
1790 shadow_thickness = XINT (w->vertical_divider_shadow_thickness); 1790 shadow_thickness = XINT (w->vertical_divider_shadow_thickness);
1791 spacing = XINT (w->vertical_divider_spacing); 1791 spacing = XINT (w->vertical_divider_spacing);
1792 line_width = XINT (w->vertical_divider_line_width); 1792 line_width = XINT (w->vertical_divider_line_width);
1793 x = WINDOW_RIGHT (w) - width; 1793 x = WINDOW_RIGHT (w) - width;
1794 y1 = WINDOW_TOP (w); 1794 ytop = WINDOW_TOP (w);
1795 y2 = WINDOW_BOTTOM (w); 1795 ybottom = WINDOW_BOTTOM (w);
1796 1796
1797 memset (&gcv, ~0, sizeof (gcv)); 1797 memset (&gcv, ~0, sizeof (gcv));
1798 1798
1799 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, div_face); 1799 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, div_face);
1800 1800
1808 1808
1809 /* Clear the divider area first. This needs to be done when a 1809 /* Clear the divider area first. This needs to be done when a
1810 window split occurs. */ 1810 window split occurs. */
1811 #ifdef THIS_IS_X 1811 #ifdef THIS_IS_X
1812 if (clear) 1812 if (clear)
1813 XClearArea (dpy, x_win, x, y1, width, y2 - y1, False); 1813 XClearArea (dpy, x_win, x, ytop, width, ybottom - ytop, False);
1814 #else /* THIS_IS_GTK */ 1814 #else /* THIS_IS_GTK */
1815 USED (dpy); 1815 USED (dpy);
1816 /* if (clear) */ 1816 /* if (clear) */
1817 gdk_draw_rectangle (GDK_DRAWABLE (x_win), background_gc, TRUE, 1817 gdk_draw_rectangle (GDK_DRAWABLE (x_win), background_gc, TRUE,
1818 x, y1, width, y2 - y1); 1818 x, ytop, width, ybottom - ytop);
1819 #endif /* THIS_IS_GTK */ 1819 #endif /* THIS_IS_GTK */
1820 1820
1821 #ifndef THIS_IS_GTK 1821 #ifndef THIS_IS_GTK
1822 /* #### FIXME Why not? Formerly '#if 0' in the GDK code */ 1822 /* #### FIXME Why not? Formerly '#if 0' in the GDK code */
1823 /* Draw the divider line. */ 1823 /* Draw the divider line. */
1824 XLIKE_FILL_RECTANGLE (dpy, x_win, background_gc, 1824 XLIKE_FILL_RECTANGLE (dpy, x_win, background_gc,
1825 x + spacing + shadow_thickness, y1, 1825 x + spacing + shadow_thickness, ytop,
1826 line_width, y2 - y1); 1826 line_width, ybottom - ytop);
1827 #endif /* not THIS_IS_GTK */ 1827 #endif /* not THIS_IS_GTK */
1828 1828
1829 if (shadow_thickness < 0) 1829 if (shadow_thickness < 0)
1830 { 1830 {
1831 shadow_thickness = -shadow_thickness; 1831 shadow_thickness = -shadow_thickness;
1835 { 1835 {
1836 style = EDGE_BEVEL_OUT; 1836 style = EDGE_BEVEL_OUT;
1837 } 1837 }
1838 1838
1839 /* Draw the shadows around the divider line */ 1839 /* Draw the shadows around the divider line */
1840 XLIKE_bevel_area (w, div_face, x + spacing, y1, 1840 XLIKE_bevel_area (w, div_face, x + spacing, ytop,
1841 width - 2 * spacing, y2 - y1, 1841 width - 2 * spacing, ybottom - ytop,
1842 shadow_thickness, EDGE_ALL, style); 1842 shadow_thickness, EDGE_ALL, style);
1843 } 1843 }
1844 1844
1845 /***************************************************************************** 1845 /*****************************************************************************
1846 XLIKE_output_blank 1846 XLIKE_output_blank