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

[Kim F. Storm]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.212 emacs/src/w32fns.c:1.213
*** emacs/src/w32fns.c:1.212    Sun Mar 16 17:12:25 2003
--- emacs/src/w32fns.c  Fri Mar 21 08:51:25 2003
***************
*** 2120,2126 ****
       struct frame *f;
       Lisp_Object arg, oldval;
  {
!   Cursor cursor, nontext_cursor, mode_cursor, cross_cursor;
    int count;
    int mask_color;
  
--- 2120,2126 ----
       struct frame *f;
       Lisp_Object arg, oldval;
  {
!   Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
    int count;
    int mask_color;
  
***************
*** 2183,2194 ****
    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))
      {
--- 2183,2194 ----
    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))
      {
***************
*** 2200,2206 ****
    else
      horizontal_drag_cursor
        = XCreateFontCursor (FRAME_X_DISPLAY (f), XC_sb_h_double_arrow);
-   /* TODO: hand_cursor */
  
    /* Check and report errors with the above calls.  */
    x_check_errors (FRAME_W32_DISPLAY (f), "can't set cursor shape: %s");
--- 2200,2205 ----
***************
*** 2225,2235 ****
                    &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);
-     /* TODO: hand_cursor */
    }
  
    if (FRAME_W32_WINDOW (f) != 0)
--- 2224,2233 ----
                    &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);
    }
  
    if (FRAME_W32_WINDOW (f) != 0)
***************
*** 2254,2264 ****
      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;
!     /* TODO: hand_cursor */
  
    XFlush (FRAME_W32_DISPLAY (f));
    UNBLOCK_INPUT;
--- 2252,2261 ----
      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;
***************
*** 2268,2275 ****
  }
  
  /* Defined in w32term.c. */
- void x_update_cursor (struct frame *f, int on_p);
- 
  void
  x_set_cursor_color (f, arg, oldval)
       struct frame *f;
--- 2265,2270 ----
***************
*** 5692,5701 ****
    f->output_data.w32->text_cursor = w32_load_cursor (IDC_IBEAM);
    f->output_data.w32->nontext_cursor = w32_load_cursor (IDC_ARROW);
    f->output_data.w32->modeline_cursor = w32_load_cursor (IDC_ARROW);
!   f->output_data.w32->cross_cursor = w32_load_cursor (IDC_CROSS);
    f->output_data.w32->hourglass_cursor = w32_load_cursor (IDC_WAIT);
    f->output_data.w32->horizontal_drag_cursor = w32_load_cursor (IDC_SIZEWE);
-   f->output_data.w32->hand_cursor = w32_load_cursor (IDC_HAND);
  
    /* Add the tool-bar height to the initial frame height so that the
       user gets a text display area of the size he specified with -g or
--- 5687,5695 ----
    f->output_data.w32->text_cursor = w32_load_cursor (IDC_IBEAM);
    f->output_data.w32->nontext_cursor = w32_load_cursor (IDC_ARROW);
    f->output_data.w32->modeline_cursor = w32_load_cursor (IDC_ARROW);
!   f->output_data.w32->hand_cursor = w32_load_cursor (IDC_HAND);
    f->output_data.w32->hourglass_cursor = w32_load_cursor (IDC_WAIT);
    f->output_data.w32->horizontal_drag_cursor = w32_load_cursor (IDC_SIZEWE);
  
    /* Add the tool-bar height to the initial frame height so that the
       user gets a text display area of the size he specified with -g or