comparison src/redisplay-gtk.c @ 778:2923009caf47

[xemacs-hg @ 2002-03-16 10:38:59 by ben] cm.c, file-coding.c: fix warnings. .cvsignore: Those pesky *.tmp files. mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over all charset definitions from FSF 21.1, convert them to our format, and stick them in the relevant files. Eventually we will actually be able to dump these files (though they may not quite work). autoload.el: Support defun*, defmacro*. mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for nonexistent composition funs/vars. mule/viet-chars.el, dumped-lisp.el: Account for these changes. font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings.
author ben
date Sat, 16 Mar 2002 10:39:19 +0000
parents 02339d4ebed4
children e38acbeb1cae
comparison
equal deleted inserted replaced
777:e65d9cf16707 778:2923009caf47
855 /* Cannot get at font properties in Gtk, so we resort to 855 /* Cannot get at font properties in Gtk, so we resort to
856 guessing */ 856 guessing */
857 upos = dl->descent / 2; 857 upos = dl->descent / 2;
858 uthick = 1; 858 uthick = 1;
859 859
860 if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip) 860 if ((dl->ypos + upos) < (dl->ypos + dl->descent - dl->clip))
861 { 861 {
862 if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip) 862 if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip)
863 uthick = dl->descent - dl->clip - upos; 863 uthick = dl->descent - dl->clip - upos;
864 864
865 if (uthick == 1) 865 if (uthick == 1)
1783 gc, TRUE, w->pixel_left, w->pixel_top, 1783 gc, TRUE, w->pixel_left, w->pixel_top,
1784 w->pixel_width, w->pixel_height); 1784 w->pixel_width, w->pixel_height);
1785 1785
1786 gdk_flush (); 1786 gdk_flush ();
1787 1787
1788 #ifdef HAVE_POLL
1789 poll (0, 0, 100);
1790 #else /* !HAVE_POLL */
1791 #ifdef HAVE_SELECT 1788 #ifdef HAVE_SELECT
1792 { 1789 {
1793 int usecs = 100000; 1790 int usecs = 100000;
1794 struct timeval tv; 1791 struct timeval tv;
1795 tv.tv_sec = usecs / 1000000L; 1792 tv.tv_sec = usecs / 1000000L;
1796 tv.tv_usec = usecs % 1000000L; 1793 tv.tv_usec = usecs % 1000000L;
1797 /* I'm sure someone is going to complain about this... */ 1794 /* I'm sure someone is going to complain about this... */
1798 select (0, 0, 0, 0, &tv); 1795 select (0, 0, 0, 0, &tv);
1799 } 1796 }
1800 #else 1797 #else
1798 #ifdef HAVE_POLL
1799 poll (0, 0, 100);
1800 #else
1801 bite me 1801 bite me
1802 #endif /* HAVE_POLL */ 1802 #endif
1803 #endif /* HAVE_SELECT */ 1803 #endif
1804 1804
1805 gdk_draw_rectangle (GDK_DRAWABLE (GET_GTK_WIDGET_WINDOW (FRAME_GTK_SHELL_WIDGET (f))), 1805 gdk_draw_rectangle (GDK_DRAWABLE (GET_GTK_WIDGET_WINDOW (FRAME_GTK_SHELL_WIDGET (f))),
1806 gc, TRUE, w->pixel_left, w->pixel_top, 1806 gc, TRUE, w->pixel_left, w->pixel_top,
1807 w->pixel_width, w->pixel_height); 1807 w->pixel_width, w->pixel_height);
1808 1808
1815 gtk_bevel_area (struct window *w, face_index findex, 1815 gtk_bevel_area (struct window *w, face_index findex,
1816 int x, int y, int width, int height, 1816 int x, int y, int width, int height,
1817 int shadow_thickness, int edges, enum edge_style style) 1817 int shadow_thickness, int edges, enum edge_style style)
1818 { 1818 {
1819 struct frame *f = XFRAME (w->frame); 1819 struct frame *f = XFRAME (w->frame);
1820 struct device *d = XDEVICE (f->device);
1821 1820
1822 gtk_output_shadows (f, x, y, width, height, shadow_thickness); 1821 gtk_output_shadows (f, x, y, width, height, shadow_thickness);
1823 } 1822 }
1824 1823
1825 1824