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

[Kim F. Storm]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.182 emacs/src/w32term.c:1.183
*** emacs/src/w32term.c:1.182   Fri Mar 21 08:51:43 2003
--- emacs/src/w32term.c Fri Mar 21 16:47:46 2003
***************
*** 5160,5172 ****
  /* RIF: Draw or clear cursor on window W.  */
  
  static void
! w32_draw_window_cursor (w, glyph_row, on, x, y, new_cursor_type, 
new_cursor_width)
       struct window *w;
       struct glyph_row *glyph_row;
!      int on, x, y;
!      int new_cursor_type, new_cursor_width;
  {
!   if (on)
      {
        /* If the user wants to use the system caret, make sure our own
         cursor remains invisible.  */
--- 5160,5173 ----
  /* RIF: Draw or clear cursor on window W.  */
  
  static void
! w32_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, 
active_p)
       struct window *w;
       struct glyph_row *glyph_row;
!      int x, y;
!      int cursor_type, cursor_width;
!      int on_p, active_p;
  {
!   if (on_p)
      {
        /* If the user wants to use the system caret, make sure our own
         cursor remains invisible.  */
***************
*** 5175,5186 ****
          if (w->phys_cursor_type != NO_CURSOR)
            erase_phys_cursor (w);
  
!         new_cursor_type = w->phys_cursor_type = NO_CURSOR;
          w->phys_cursor_width = -1;
        }
        else
        {
!         w->phys_cursor_type = new_cursor_type;
        }
  
        w->phys_cursor_on_p = 1;
--- 5176,5187 ----
          if (w->phys_cursor_type != NO_CURSOR)
            erase_phys_cursor (w);
  
!         cursor_type = w->phys_cursor_type = NO_CURSOR;
          w->phys_cursor_width = -1;
        }
        else
        {
!         w->phys_cursor_type = cursor_type;
        }
  
        w->phys_cursor_on_p = 1;
***************
*** 5188,5194 ****
        /* If this is the active cursor, we need to track it with the
         system caret, so third party software like screen magnifiers
         and speech synthesizers can follow the cursor.  */
!       if (active_cursor)
        {
          HWND hwnd = FRAME_W32_WINDOW (f);
  
--- 5189,5195 ----
        /* If this is the active cursor, we need to track it with the
         system caret, so third party software like screen magnifiers
         and speech synthesizers can follow the cursor.  */
!       if (active_p)
        {
          HWND hwnd = FRAME_W32_WINDOW (f);
  
***************
*** 5210,5216 ****
          PostMessage (hwnd, WM_EMACS_TRACK_CARET, 0, 0);
        }
  
!       switch (new_cursor_type)
        {
        case HOLLOW_BOX_CURSOR:
          x_draw_hollow_cursor (w, glyph_row);
--- 5211,5217 ----
          PostMessage (hwnd, WM_EMACS_TRACK_CARET, 0, 0);
        }
  
!       switch (cursor_type)
        {
        case HOLLOW_BOX_CURSOR:
          x_draw_hollow_cursor (w, glyph_row);
***************
*** 5221,5231 ****
          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:
--- 5222,5232 ----
          break;
  
        case BAR_CURSOR:
!         x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR);
          break;
  
        case HBAR_CURSOR:
!         x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR);
          break;
  
        case NO_CURSOR: