Mercurial > hg > xemacs-beta

comparison src/redisplay-x.c @ 420:41dbb7a9d5f2 r21-2-18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-18
author cvs
date Mon, 13 Aug 2007 11:24:09 +0200
parents e804706bfb8c
children 95016f13131a
comparison
equal deleted inserted replaced
419:66615b78f1a5 420:41dbb7a9d5f2
838 may cause the cache to resize and any pointers to it to 838 may cause the cache to resize and any pointers to it to
839 become invalid. */ 839 become invalid. */
840 cachel = WINDOW_FACE_CACHEL (w, findex); 840 cachel = WINDOW_FACE_CACHEL (w, findex);
841 } 841 }
842 842
843 #ifdef HAVE_XIM 843 #if defined(HAVE_XIM) && defined(XIM_XLIB)
844 if (cursor && focus && (cursor_start == clip_start) && cursor_height) 844 if (cursor && focus && (cursor_start == clip_start) && cursor_height)
845 XIM_SetSpotLocation (f, xpos - 2, dl->ypos + dl->descent - 2); 845 if (FRAME_X_XIC(f))
846 #endif /* HAVE_XIM */ 846 XIM_SetSpotLocation (f, xpos - 2, dl->ypos + dl->descent - 2);
847 #endif /* HAVE_XIM && XIM_XLIB */
847 848
848 bg_pmap = cachel->background_pixmap; 849 bg_pmap = cachel->background_pixmap;
849 if (!IMAGE_INSTANCEP (bg_pmap) 850 if (!IMAGE_INSTANCEP (bg_pmap)
850 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) 851 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap)))
851 bg_pmap = Qnil; 852 bg_pmap = Qnil;
2066 cursor_y = max (y, min (y + height - cursor_height, 2067 cursor_y = max (y, min (y + height - cursor_height,
2067 dl->ypos - defascent)); 2068 dl->ypos - defascent));
2068 2069
2069 if (focus) 2070 if (focus)
2070 { 2071 {
2071 #ifdef HAVE_XIM 2072 #if defined(HAVE_XIM) && defined(XIM_XLIB)
2072 XIM_SetSpotLocation (f, x - 2 , cursor_y + cursor_height - 2); 2073 if (FRAME_X_XIC(f))
2074 XIM_SetSpotLocation (f, x - 2 , cursor_y + cursor_height - 2);
2073 #endif /* HAVE_XIM */ 2075 #endif /* HAVE_XIM */
2074 2076
2075 if (NILP (bar_cursor_value)) 2077 if (NILP (bar_cursor_value))
2076 { 2078 {
2077 XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height); 2079 XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height);