Mercurial > emacs
changeset 42919:2a546583564f
(x_update_window_begin): Only hide caret if
w32_use_visible_system_caret is set.
(x_update_window_end): Only show caret if
w32_use_visible_system_caret is set.
(syms_of_w32term): Handle SystemParametersInfo call failing.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Wed, 23 Jan 2002 21:59:23 +0000 |
| parents | 9b06036a8c5e |
| children | 6e3dc2b37909 |
| files | src/w32term.c |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Wed Jan 23 21:52:41 2002 +0000 +++ b/src/w32term.c Wed Jan 23 21:59:23 2002 +0000 @@ -594,7 +594,8 @@ 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); + 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,7 +721,8 @@ /* 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); + if (w32_use_visible_system_caret) + SendMessage (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0); updated_window = NULL; } @@ -7857,7 +7859,7 @@ (LPARAM) bar); } -//#define ATTACH_THREADS +/*#define ATTACH_THREADS*/ BOOL my_show_window (FRAME_PTR f, HWND hwnd, int how) @@ -8111,7 +8113,7 @@ SetScrollRange (hwnd, SB_CTL, 0, VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE); my_show_window (f, hwnd, SW_NORMAL); - // InvalidateRect (w, NULL, FALSE); + /* InvalidateRect (w, NULL, FALSE); */ /* Remember new settings. */ XSETINT (bar->left, sb_left); @@ -11178,8 +11180,9 @@ /* 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); + 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.