Mercurial > hg > xemacs-beta

comparison src/redisplay-x.c @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents b2472a1930f2
children c42ec1d1cded
comparison
equal deleted inserted replaced
271:c7b7086b0a39 272:c5d627a313b1
656 656
657 x_output_shadows (f, x, y, width, height, top_shadow_gc, bottom_shadow_gc, 657 x_output_shadows (f, x, y, width, height, top_shadow_gc, bottom_shadow_gc,
658 background_gc, shadow_thickness); 658 background_gc, shadow_thickness);
659 } 659 }
660 660
661 void debug_print (Lisp_Object); /* kludge! */
662
663 /***************************************************************************** 661 /*****************************************************************************
664 x_get_gc 662 x_get_gc
665 663
666 Given a number of parameters return a GC with those properties. 664 Given a number of parameters return a GC with those properties.
667 ****************************************************************************/ 665 ****************************************************************************/
783 int cursor_start, int cursor_width, int cursor_height) 781 int cursor_start, int cursor_width, int cursor_height)
784 { 782 {
785 /* General variables */ 783 /* General variables */
786 struct frame *f = XFRAME (w->frame); 784 struct frame *f = XFRAME (w->frame);
787 struct device *d = XDEVICE (f->device); 785 struct device *d = XDEVICE (f->device);
788 Lisp_Object device = Qnil; 786 Lisp_Object device;
789 Lisp_Object window = Qnil; 787 Lisp_Object window;
790 Display *dpy = DEVICE_X_DISPLAY (d); 788 Display *dpy = DEVICE_X_DISPLAY (d);
791 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); 789 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
792 790
793 int clip_end; 791 int clip_end;
794 792
2089 if (NILP (w->text_cursor_visible_p)) 2087 if (NILP (w->text_cursor_visible_p))
2090 return; 2088 return;
2091 2089
2092 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); 2090 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil);
2093 2091
2094 { 2092 default_face_font_info (window, &defascent, 0, &defheight, 0, 0);
2095 Lisp_Object window = Qnil;
2096
2097 XSETWINDOW (window, w);
2098 default_face_font_info (window, &defascent, 0, &defheight, 0, 0);
2099 }
2100 2093
2101 /* make sure the cursor is entirely contained between y and y+height */ 2094 /* make sure the cursor is entirely contained between y and y+height */
2102 cursor_height = min (defheight, height); 2095 cursor_height = min (defheight, height);
2103 cursor_y = max (y, min (y + height - cursor_height, 2096 cursor_y = max (y, min (y + height - cursor_height,
2104 dl->ypos - defascent)); 2097 dl->ypos - defascent));