nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-09 13:42:09 -05:00
Code Issues Projects Releases Wiki Activity

Windows: cope if caret blinking is disabled.

Browse Source 
On Windows, when a blinking cursor is enabled, PuTTY uses the system
default blink time from GetCaretBlinkTime(), which can be configured in
Control Panel.

Control Panel allows caret blinking to be disabled entirely, in which
case GetCaretBlinkTime() returns INFINITE. PuTTY wasn't handling this
case; if cursor blinking was enabled in PuTTY but disabled at the system
level, the terminal window would hang, blinking the cursor madly.
This commit is contained in:
Simon Tatham 2025-04-24 11:30:52 +01:00
parent 429478f914
commit c71cc50e52
5 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/config.but
View File

@ -1091,7 +1091,9 @@ empty box when the window loses focus; an underline or a vertical
line becomes dotted. line becomes dotted.
The \q{\ii{Cursor blinks}} option makes the cursor blink on and off. This The \q{\ii{Cursor blinks}} option makes the cursor blink on and off. This
works in any of the cursor modes. works in any of the cursor modes. (On Windows, the blink rate matches
that configured in Control Panel; so this setting will have no effect
if cursor blinking has been disabled system-wide.)
\S{config-font} Controlling the \i{font} used in the terminal window \S{config-font} Controlling the \i{font} used in the terminal window

5
terminal/terminal.c
View File

@ -1381,9 +1381,10 @@ static void term_schedule_tblink(Terminal *term)
*/ */
static void term_schedule_cblink(Terminal *term) static void term_schedule_cblink(Terminal *term)
{ {
if (term->blink_cur && term->has_focus) { int delay = CBLINK_DELAY;
if (term->blink_cur && term->has_focus && delay > 0) {
if (!term->cblink_pending) if (!term->cblink_pending)
term->next_cblink = schedule_timer(CBLINK_DELAY, term_timer, term); term->next_cblink = schedule_timer(delay, term_timer, term);
term->cblink_pending = true; term->cblink_pending = true;
} else { } else {
term->cblinker = true; /* reset when not in use */ term->cblinker = true; /* reset when not in use */

1
windows/CMakeLists.txt
View File

@ -5,6 +5,7 @@ add_sources_from_current_dir(utils
utils/agent_named_pipe_name.c utils/agent_named_pipe_name.c
utils/arm_arch_queries.c utils/arm_arch_queries.c
utils/aux_match_opt.c utils/aux_match_opt.c
utils/blink_time.c
utils/centre_window.c utils/centre_window.c
utils/cmdline_arg.c utils/cmdline_arg.c
utils/cryptoapi.c utils/cryptoapi.c

4
windows/platform.h
View File

@ -203,8 +203,10 @@ void centre_window(HWND hwnd);
#define PUTTY_CHM_FILE "putty.chm" #define PUTTY_CHM_FILE "putty.chm"
int get_caret_blink_time(void);
#define GETTICKCOUNT GetTickCount #define GETTICKCOUNT GetTickCount
#define CURSORBLINK GetCaretBlinkTime() #define CURSORBLINK get_caret_blink_time()
#define TICKSPERSEC 1000 /* GetTickCount returns milliseconds */ #define TICKSPERSEC 1000 /* GetTickCount returns milliseconds */
#define DEFAULT_CODEPAGE CP_ACP #define DEFAULT_CODEPAGE CP_ACP

21
windows/utils/blink_time.c Normal file
View File

@ -0,0 +1,21 @@
/*
* Wrapper for GetCaretBlinkTime() which turns it into a signed integer,
* with 0 meaning "no blinking".
*/
#include "putty.h"
#include <winuser.h>
int get_caret_blink_time(void)
{
UINT blinktime = GetCaretBlinkTime();
if (blinktime == INFINITE)
/* Windows' registry representation for 'no caret blinking'
* is the string "-1", but we may as well use 0 as the sentinel
* value, as it'd be bad to attempt blinking with period 0
* in any case. */
return 0;
else
/* assume this won't be so big that casting is a problem */
return (int) blinktime;
}