nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00
Code Issues Projects Releases Wiki Activity

Fix handling of Return and keypad Enter.

Browse Source 
The recent rewriting in both the GTK and Windows keyboard handlers
left the keypad 'Enter' key in a bad state, when no override is
enabled that causes it to generate an escape sequence.

On Windows, a series of fallbacks was causing it to generate \r
regardless of configuration, whereas in Telnet mode it should default
to generating the special Telnet new-line sequence, and in response to
ESC[20h (enabling term->cr_lf_return) it should generate \r\n.

On GTK, it wasn't generating anything _at all_, and also, I can't see
any evidence that the GTK keyboard handler had ever remembered to
implement the cr_lf_return mode.

Now Keypad Enter in non-escape-sequence mode should behave just like
Return, on both platforms.
This commit is contained in:
Simon Tatham
2019-04-15 20:43:10 +01:00
parent 56198afb5c
commit 97a1021202
2 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
unix/gtkwin.c
View File

@ -993,6 +993,32 @@ char *dup_keyval_name(guint keyval)
static void change_font_size(GtkFrontend *inst, int increment);
static void key_pressed(GtkFrontend *inst);
/* Subroutine used in key_event */
static int return_key(GtkFrontend *inst, char *output, bool *special)
{
int end;
/* Ugly label so we can come here as a fallback from
* numeric keypad Enter handling */
if (inst->term->cr_lf_return) {
#ifdef KEY_EVENT_DIAGNOSTICS
debug(" - Return in cr_lf_return mode, translating as 0d 0a\n");
#endif
output[1] = '\015';
output[2] = '\012';
end = 3;
} else {
#ifdef KEY_EVENT_DIAGNOSTICS
debug(" - Return special case, translating as 0d + special\n");
#endif
output[1] = '\015';
end = 2;
*special = true;
}
return end;
}
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
GtkFrontend *inst = (GtkFrontend *)data;
@ -1688,13 +1714,8 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/* We handle Return ourselves, because it needs to be flagged as
* special to ldisc. */
if (event->keyval == GDK_KEY_Return) {
#ifdef KEY_EVENT_DIAGNOSTICS
debug(" - Return special case, translating as 0d + special\n");
#endif
output[1] = '\015';
use_ucsoutput = false;
end = 2;
special = true;
end = return_key(inst, output, &special);
use_ucsoutput = false;
}
/* Control-2, Control-Space and Control-@ are NUL */
@ -1870,6 +1891,15 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
#ifdef KEY_EVENT_DIAGNOSTICS
debug(" - numeric keypad key");
#endif
if (end == 1 && num_keypad_key == '\r') {
/* Keypad Enter, lacking any other translation,
* becomes the same special Return code as normal
* Return. */
end = return_key(inst, output, &special);
use_ucsoutput = false;
}
use_ucsoutput = false;
goto done;
}