[Emacs-diffs] Changes to emacs/src/xterm.c

[Eli Zaretskii]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.722 emacs/src/xterm.c:1.723
*** emacs/src/xterm.c:1.722     Tue Apr 16 11:07:46 2002
--- emacs/src/xterm.c   Fri Apr 19 07:47:58 2002
***************
*** 469,475 ****
  static void XTframe_rehighlight P_ ((struct frame *));
  static void x_frame_rehighlight P_ ((struct x_display_info *));
  static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
! static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int));
  static int x_intersect_rectangles P_ ((XRectangle *, XRectangle *,
                                       XRectangle *));
  static void expose_frame P_ ((struct frame *, int, int, int, int));
--- 469,476 ----
  static void XTframe_rehighlight P_ ((struct frame *));
  static void x_frame_rehighlight P_ ((struct x_display_info *));
  static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
! static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int,
!                                  enum text_cursor_kinds));
  static int x_intersect_rectangles P_ ((XRectangle *, XRectangle *,
                                       XRectangle *));
  static void expose_frame P_ ((struct frame *, int, int, int, int));
***************
*** 11333,11342 ****
     --gerd.  */
  
  static void
! x_draw_bar_cursor (w, row, width)
       struct window *w;
       struct glyph_row *row;
       int width;
  {
    struct frame *f = XFRAME (w->frame);
    struct glyph *cursor_glyph;
--- 11334,11344 ----
     --gerd.  */
  
  static void
! x_draw_bar_cursor (w, row, width, kind)
       struct window *w;
       struct glyph_row *row;
       int width;
+      enum text_cursor_kinds kind;
  {
    struct frame *f = XFRAME (w->frame);
    struct glyph *cursor_glyph;
***************
*** 11390,11399 ****
        width = min (cursor_glyph->pixel_width, width);
    
        x_clip_to_row (w, row, gc, 0);
!       XFillRectangle (dpy, window, gc,
!                     WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
!                     WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
!                     width, row->height);
        XSetClipMask (dpy, gc, None);
      }
  }
--- 11392,11410 ----
        width = min (cursor_glyph->pixel_width, width);
    
        x_clip_to_row (w, row, gc, 0);
!       if (kind == BAR_CURSOR)
!         XFillRectangle (dpy, window, gc,
!                         WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
!                         WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
!                         width, row->height);
!       else
!         XFillRectangle (dpy, window, gc,
!                         WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
!                         WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y +
!                                                  row->height - width),
!                         cursor_glyph->pixel_width,
!                         width);
! 
        XSetClipMask (dpy, gc, None);
      }
  }
***************
*** 11714,11720 ****
          break;
  
        case BAR_CURSOR:
!         x_draw_bar_cursor (w, glyph_row, new_cursor_width);
          break;
  
        case NO_CURSOR:
--- 11725,11735 ----
          break;
  
        case BAR_CURSOR:
!         x_draw_bar_cursor (w, glyph_row, new_cursor_width, BAR_CURSOR);
!         break;
! 
!       case HBAR_CURSOR:
!           x_draw_bar_cursor (w, glyph_row, new_cursor_width, HBAR_CURSOR);
          break;
  
        case NO_CURSOR: