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

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.138 emacs/src/w32term.c:1.139
*** emacs/src/w32term.c:1.138   Sun Jan 20 18:11:52 2002
--- emacs/src/w32term.c Wed Jan 23 16:59:23 2002
***************
*** 594,600 ****
    struct w32_display_info *display_info = FRAME_W32_DISPLAY_INFO (f);
  
    /* Hide the system caret during an update.  */
!   SendMessage (w32_system_caret_hwnd, WM_EMACS_HIDE_CARET, 0, 0);
  
    updated_window = w;
    set_output_cursor (&w->cursor);
--- 594,601 ----
    struct w32_display_info *display_info = FRAME_W32_DISPLAY_INFO (f);
  
    /* Hide the system caret during an update.  */
!   if (w32_use_visible_system_caret)
!     SendMessage (w32_system_caret_hwnd, WM_EMACS_HIDE_CARET, 0, 0);
  
    updated_window = w;
    set_output_cursor (&w->cursor);
***************
*** 720,726 ****
    /* Unhide the caret.  This won't actually show the cursor, unless it
       was visible before the corresponding call to HideCaret in
       x_update_window_begin.  */
!   SendMessage (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0);
  
    updated_window = NULL;
  }
--- 721,728 ----
    /* Unhide the caret.  This won't actually show the cursor, unless it
       was visible before the corresponding call to HideCaret in
       x_update_window_begin.  */
!   if (w32_use_visible_system_caret)
!     SendMessage (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0);
  
    updated_window = NULL;
  }
***************
*** 7857,7863 ****
                             (LPARAM) bar);
  }
  
! //#define ATTACH_THREADS
  
  BOOL
  my_show_window (FRAME_PTR f, HWND hwnd, int how)
--- 7859,7865 ----
                             (LPARAM) bar);
  }
  
! /*#define ATTACH_THREADS*/
  
  BOOL
  my_show_window (FRAME_PTR f, HWND hwnd, int how)
***************
*** 8111,8117 ****
              SetScrollRange (hwnd, SB_CTL, 0,
                              VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE);
            my_show_window (f, hwnd, SW_NORMAL);
!           //  InvalidateRect (w, NULL, FALSE);
  
            /* Remember new settings.  */
            XSETINT (bar->left, sb_left);
--- 8113,8119 ----
              SetScrollRange (hwnd, SB_CTL, 0,
                              VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE);
            my_show_window (f, hwnd, SW_NORMAL);
!           /* InvalidateRect (w, NULL, FALSE);  */
  
            /* Remember new settings.  */
            XSETINT (bar->left, sb_left);
***************
*** 11178,11185 ****
  
    /* Initialize w32_use_visible_system_caret based on whether a screen
       reader is in use.  */
!   SystemParametersInfo (SPI_GETSCREENREADER, 0,
!                       &w32_use_visible_system_caret, 0);
  
    DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
               doc: /* *Non-nil means draw block cursor as wide as the glyph 
under it.
--- 11180,11188 ----
  
    /* Initialize w32_use_visible_system_caret based on whether a screen
       reader is in use.  */
!   if (!SystemParametersInfo (SPI_GETSCREENREADER, 0,
!                            &w32_use_visible_system_caret, 0))
!     w32_use_visible_system_caret = 0;
  
    DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
               doc: /* *Non-nil means draw block cursor as wide as the glyph 
under it.