nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

On Windows, show hidden mouse pointer on error.

Browse Source 
If a terminal window closed with a popup (due to a network error,
for instance) while the mouse pointer was hidden by 'Hide mouse
pointer when typing in window', the mouse pointer could remain hidden
while over the terminal window, making it hard to navigate to the
popup.
This commit is contained in:
Jacob Nevins 2020-04-14 20:36:46 +01:00
parent f9a46a9581
commit d9c4ce9fd8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/window.c
View File

@ -88,6 +88,7 @@
#endif #endif
static Mouse_Button translate_button(Mouse_Button button); static Mouse_Button translate_button(Mouse_Button button);
static void show_mouseptr(bool show);
static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
unsigned char *output); unsigned char *output);
@ -1183,6 +1184,7 @@ static void wintw_set_raw_mouse_mode(TermWin *tw, bool activate)
static void win_seat_connection_fatal(Seat *seat, const char *msg) static void win_seat_connection_fatal(Seat *seat, const char *msg)
{ {
char *title = dupprintf("%s Fatal Error", appname); char *title = dupprintf("%s Fatal Error", appname);
show_mouseptr(true);
MessageBox(wgs.term_hwnd, msg, title, MB_ICONERROR | MB_OK); MessageBox(wgs.term_hwnd, msg, title, MB_ICONERROR | MB_OK);
sfree(title); sfree(title);
@ -2116,9 +2118,11 @@ static void win_seat_notify_remote_exit(Seat *seat)
/* exitcode == INT_MAX indicates that the connection was closed /* exitcode == INT_MAX indicates that the connection was closed
* by a fatal error, so an error box will be coming our way and * by a fatal error, so an error box will be coming our way and
* we should not generate this informational one. */ * we should not generate this informational one. */
if (exitcode != INT_MAX) if (exitcode != INT_MAX) {
show_mouseptr(true);
MessageBox(wgs.term_hwnd, "Connection closed by remote host", MessageBox(wgs.term_hwnd, "Connection closed by remote host",
appname, MB_OK | MB_ICONINFORMATION); appname, MB_OK | MB_ICONINFORMATION);
}
} }
} }
} }
@ -5392,6 +5396,7 @@ void modalfatalbox(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
message = dupvprintf(fmt, ap); message = dupvprintf(fmt, ap);
va_end(ap); va_end(ap);
show_mouseptr(true);
title = dupprintf("%s Fatal Error", appname); title = dupprintf("%s Fatal Error", appname);
MessageBox(wgs.term_hwnd, message, title, MessageBox(wgs.term_hwnd, message, title,
MB_SYSTEMMODAL | MB_ICONERROR | MB_OK); MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
@ -5411,6 +5416,7 @@ void nonfatal(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
message = dupvprintf(fmt, ap); message = dupvprintf(fmt, ap);
va_end(ap); va_end(ap);
show_mouseptr(true);
title = dupprintf("%s Error", appname); title = dupprintf("%s Error", appname);
MessageBox(wgs.term_hwnd, message, title, MB_ICONERROR | MB_OK); MessageBox(wgs.term_hwnd, message, title, MB_ICONERROR | MB_OK);
sfree(message); sfree(message);
@ -5525,6 +5531,7 @@ static void wintw_bell(TermWin *tw, int mode)
if (!p_PlaySound || !p_PlaySound(bell_wavefile->path, NULL, if (!p_PlaySound || !p_PlaySound(bell_wavefile->path, NULL,
SND_ASYNC | SND_FILENAME)) { SND_ASYNC | SND_FILENAME)) {
char *buf, *otherbuf; char *buf, *otherbuf;
show_mouseptr(true);
buf = dupprintf( buf = dupprintf(
"Unable to play sound file\n%s\nUsing default sound instead", "Unable to play sound file\n%s\nUsing default sound instead",
bell_wavefile->path); bell_wavefile->path);