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

[Kim F. Storm]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.20 emacs/src/macfns.c:1.21
*** emacs/src/macfns.c:1.20     Wed Mar 12 07:12:26 2003
--- emacs/src/macfns.c  Fri Mar 21 08:49:48 2003
***************
*** 247,253 ****
  /* Functions in macterm.c.  */
  extern void x_set_offset (struct frame *, int, int, int);
  extern void x_wm_set_icon_position (struct frame *, int, int);
- extern void x_display_cursor (struct window *, int, int, int, int, int);
  extern void x_set_window_size (struct frame *, int, int, int);
  extern void x_make_frame_visible (struct frame *);
  extern struct mac_display_info *mac_term_init (Lisp_Object, char *, char *);
--- 247,252 ----
***************
*** 2162,2168 ****
       struct frame *f;
       Lisp_Object arg, oldval;
  {
!   Cursor cursor, nontext_cursor, mode_cursor, cross_cursor;
    int count;
    int mask_color;
  
--- 2161,2167 ----
       struct frame *f;
       Lisp_Object arg, oldval;
  {
!   Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
    int count;
    int mask_color;
  
***************
*** 2225,2236 ****
    if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
      {
        CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
!       cross_cursor
        = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                             XINT (Vx_sensitive_text_pointer_shape));
      }
    else
!     cross_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_crosshair);
  
    if (!NILP (Vx_window_horizontal_drag_shape))
      {
--- 2224,2235 ----
    if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
      {
        CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
!       hand_cursor
        = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                             XINT (Vx_sensitive_text_pointer_shape));
      }
    else
!     hand_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_crosshair);
  
    if (!NILP (Vx_window_horizontal_drag_shape))
      {
***************
*** 2266,2272 ****
                    &fore_color, &back_color);
      XRecolorCursor (FRAME_W32_DISPLAY (f), mode_cursor,
                    &fore_color, &back_color);
!     XRecolorCursor (FRAME_W32_DISPLAY (f), cross_cursor,
                      &fore_color, &back_color);
      XRecolorCursor (FRAME_W32_DISPLAY (f), hourglass_cursor,
                      &fore_color, &back_color);
--- 2265,2271 ----
                    &fore_color, &back_color);
      XRecolorCursor (FRAME_W32_DISPLAY (f), mode_cursor,
                    &fore_color, &back_color);
!     XRecolorCursor (FRAME_W32_DISPLAY (f), hand_cursor,
                      &fore_color, &back_color);
      XRecolorCursor (FRAME_W32_DISPLAY (f), hourglass_cursor,
                      &fore_color, &back_color);
***************
*** 2294,2303 ****
      XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->modeline_cursor);
    f->output_data.w32->modeline_cursor = mode_cursor;
  
!   if (cross_cursor != f->output_data.w32->cross_cursor
!       && f->output_data.w32->cross_cursor != 0)
!     XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->cross_cursor);
!   f->output_data.w32->cross_cursor = cross_cursor;
  
    XFlush (FRAME_W32_DISPLAY (f));
    UNBLOCK_INPUT;
--- 2293,2302 ----
      XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->modeline_cursor);
    f->output_data.w32->modeline_cursor = mode_cursor;
  
!   if (hand_cursor != f->output_data.w32->hand_cursor
!       && f->output_data.w32->hand_cursor != 0)
!     XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->hand_cursor);
!   f->output_data.w32->hand_cursor = hand_cursor;
  
    XFlush (FRAME_W32_DISPLAY (f));
    UNBLOCK_INPUT;
***************
*** 2334,2341 ****
      {
        if (FRAME_VISIBLE_P (f))
        {
!         x_display_cursor (f, 0);
!         x_display_cursor (f, 1);
        }
      }
  #endif
--- 2333,2342 ----
      {
        if (FRAME_VISIBLE_P (f))
        {
!         BLOCK_INPUT;
!         display_and_set_cursor (f, 0);
!         display_and_set_cursor (f, 1);
!         UNBLOCK_INPUT;
        }
      }
  #endif