Mercurial > hg > xemacs-beta
comparison src/redisplay-x.c @ 16:0293115a14e9 r19-15b91
Import from CVS: tag r19-15b91
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:49:20 +0200 |
parents | 9ee227acff29 |
children | d620409f5eb8 |
comparison
equal
deleted
inserted
replaced
15:ad457d5f7d04 | 16:0293115a14e9 |
---|---|
44 #include "sysdep.h" | 44 #include "sysdep.h" |
45 #include "window.h" | 45 #include "window.h" |
46 #include <X11/bitmaps/gray> | 46 #include <X11/bitmaps/gray> |
47 | 47 |
48 #include "sysproc.h" /* for select() */ | 48 #include "sysproc.h" /* for select() */ |
49 | |
49 | 50 |
50 /* X_DIVIDER_LINE_WIDTH is the width of the line drawn in the gutter. | 51 /* X_DIVIDER_LINE_WIDTH is the width of the line drawn in the gutter. |
51 X_DIVIDER_SPACING is the amount of blank space on each side of the line. | 52 X_DIVIDER_SPACING is the amount of blank space on each side of the line. |
52 X_DIVIDER_WIDTH = X_DIVIDER_LINE_WIDTH + 2*X_DIVIDER_SPACING | 53 X_DIVIDER_WIDTH = X_DIVIDER_LINE_WIDTH + 2*X_DIVIDER_SPACING |
53 */ | 54 */ |
823 /* We have to reset this since any call to WINDOW_FACE_CACHEL | 824 /* We have to reset this since any call to WINDOW_FACE_CACHEL |
824 may cause the cache to resize and any pointers to it to | 825 may cause the cache to resize and any pointers to it to |
825 become invalid. */ | 826 become invalid. */ |
826 cachel = WINDOW_FACE_CACHEL (w, findex); | 827 cachel = WINDOW_FACE_CACHEL (w, findex); |
827 } | 828 } |
829 | |
828 | 830 |
829 bg_pmap = cachel->background_pixmap; | 831 bg_pmap = cachel->background_pixmap; |
830 if (!IMAGE_INSTANCEP (bg_pmap) | 832 if (!IMAGE_INSTANCEP (bg_pmap) |
831 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) | 833 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) |
832 bg_pmap = Qnil; | 834 bg_pmap = Qnil; |
2054 if (cursor_y + cursor_height > y + height) | 2056 if (cursor_y + cursor_height > y + height) |
2055 cursor_height = y + height - cursor_y; | 2057 cursor_height = y + height - cursor_y; |
2056 | 2058 |
2057 if (focus) | 2059 if (focus) |
2058 { | 2060 { |
2061 | |
2059 if (NILP (bar_cursor_value)) | 2062 if (NILP (bar_cursor_value)) |
2060 { | 2063 { |
2061 XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height); | 2064 XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height); |
2062 } | 2065 } |
2063 else | 2066 else |