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

Fix Alt+numberpad in pterm. For a start, there was a bug whereby if

Browse Source 
a pterm came up while Alt was down, then releasing it would cause a
^@ to be generated. Also, though, I've decided that Alt plus a
single numberpad key should not generate a low-numbered control
code, because that's too easy to do by mistake and the codes are too
powerful. Anyone who really _wants_ to create a ^C or ^D from the
numberpad can do Alt-03 or Alt-04 easily enough; two-digit codes and
more such as Alt-65 are unaffected.

[originally from svn r2153]
This commit is contained in:
Simon Tatham 2002-10-28 17:34:45 +00:00
parent ac545e0530
commit 963742fd4e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unix/pterm.c
View File

@ -50,6 +50,7 @@ struct gui_data {
guint term_paste_idle_id; guint term_paste_idle_id;
GdkAtom compound_text_atom; GdkAtom compound_text_atom;
int alt_keycode; int alt_keycode;
int alt_digits;
char wintitle[sizeof(((Config *)0)->wintitle)]; char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)]; char icontitle[sizeof(((Config *)0)->wintitle)];
int master_fd, master_func_id, exited; int master_fd, master_func_id, exited;
@ -354,11 +355,17 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/* /*
* If Alt is being released after typing an Alt+numberpad * If Alt is being released after typing an Alt+numberpad
* sequence, we should generate the code that was typed. * sequence, we should generate the code that was typed.
*
* Note that we only do this if more than one key was actually
* pressed - I don't think Alt+NumPad4 should be ^D or that
* Alt+NumPad3 should be ^C, for example. There's no serious
* inconvenience in having to type a zero before a single-digit
* character code.
*/ */
if (event->type == GDK_KEY_RELEASE && if (event->type == GDK_KEY_RELEASE &&
(event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || (event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) && event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) &&
inst->alt_keycode >= 0) { inst->alt_keycode >= 0 && inst->alt_digits > 1) {
#ifdef KEY_DEBUGGING #ifdef KEY_DEBUGGING
printf("Alt key up, keycode = %d\n", inst->alt_keycode); printf("Alt key up, keycode = %d\n", inst->alt_keycode);
#endif #endif
@ -391,6 +398,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) { event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) {
inst->alt_keycode = -1; inst->alt_keycode = -1;
inst->alt_digits = 0;
goto done; /* this generates nothing else */ goto done; /* this generates nothing else */
} }
@ -425,6 +433,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
inst->alt_keycode = digit; /* one-digit code */ inst->alt_keycode = digit; /* one-digit code */
else else
inst->alt_keycode = inst->alt_keycode * 10 + digit; inst->alt_keycode = inst->alt_keycode * 10 + digit;
inst->alt_digits++;
#ifdef KEY_DEBUGGING #ifdef KEY_DEBUGGING
printf(" gives new code %d\n", inst->alt_keycode); printf(" gives new code %d\n", inst->alt_keycode);
#endif #endif
@ -1895,6 +1904,7 @@ int main(int argc, char **argv)
*/ */
inst = smalloc(sizeof(*inst)); inst = smalloc(sizeof(*inst));
memset(inst, 0, sizeof(*inst)); memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
inst->fonts[0] = gdk_font_load(cfg.font); inst->fonts[0] = gdk_font_load(cfg.font);
if (!inst->fonts[0]) { if (!inst->fonts[0]) {