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

GTK 3 prep: use GDK_KEY_<keyname> constants, not GDK_<keyname>.

Browse Source 
GTK 2 doesn't _documentedly_ provide a helpful compile option to let
us check this one in advance of GTK 3, but you can fake one anyway by
compiling with -D__GDK_KEYSYMS_COMPAT_H__, so that gdkkeysyms-compat.h
will believe that it's already been included :-) We now build cleanly
under GTK 2 with that predefine.
This commit is contained in:
Simon Tatham 2015-08-08 16:23:54 +01:00
parent 0a3e593959
commit a6ccb8e720
4 changed files with 238 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unix/gtkask.c
View File

@ -95,9 +95,11 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{ {
struct askpass_ctx *ctx = (struct askpass_ctx *)data; struct askpass_ctx *ctx = (struct askpass_ctx *)data;
if (event->keyval == GDK_Return && event->type == GDK_KEY_PRESS) { if (event->keyval == GDK_KEY_Return &&
event->type == GDK_KEY_PRESS) {
gtk_main_quit(); gtk_main_quit();
} else if (event->keyval == GDK_Escape && event->type == GDK_KEY_PRESS) { } else if (event->keyval == GDK_KEY_Escape &&
event->type == GDK_KEY_PRESS) {
smemclr(ctx->passphrase, ctx->passsize); smemclr(ctx->passphrase, ctx->passsize);
ctx->passphrase = NULL; ctx->passphrase = NULL;
gtk_main_quit(); gtk_main_quit();
@ -128,7 +130,7 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
break; break;
} }
visually_acknowledge_keypress(ctx); visually_acknowledge_keypress(ctx);
} else if (event->keyval == GDK_BackSpace) { } else if (event->keyval == GDK_KEY_BackSpace) {
/* Backspace. Delete one character. */ /* Backspace. Delete one character. */
if (ctx->passlen > 0) if (ctx->passlen > 0)
ctx->passlen -= last_char_len(ctx); ctx->passlen -= last_char_len(ctx);

70
unix/gtkcompat.h
View File

@ -60,5 +60,75 @@
#define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED(w) #define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED(w)
#define gtk_widget_get_state(w) GTK_WIDGET_STATE(w) #define gtk_widget_get_state(w) GTK_WIDGET_STATE(w)
#define GDK_KEY_Alt_L GDK_Alt_L
#define GDK_KEY_Alt_R GDK_Alt_R
#define GDK_KEY_BackSpace GDK_BackSpace
#define GDK_KEY_Begin GDK_Begin
#define GDK_KEY_Break GDK_Break
#define GDK_KEY_Delete GDK_Delete
#define GDK_KEY_Down GDK_Down
#define GDK_KEY_End GDK_End
#define GDK_KEY_Escape GDK_Escape
#define GDK_KEY_F10 GDK_F10
#define GDK_KEY_F11 GDK_F11
#define GDK_KEY_F12 GDK_F12
#define GDK_KEY_F13 GDK_F13
#define GDK_KEY_F14 GDK_F14
#define GDK_KEY_F15 GDK_F15
#define GDK_KEY_F16 GDK_F16
#define GDK_KEY_F17 GDK_F17
#define GDK_KEY_F18 GDK_F18
#define GDK_KEY_F19 GDK_F19
#define GDK_KEY_F1 GDK_F1
#define GDK_KEY_F20 GDK_F20
#define GDK_KEY_F2 GDK_F2
#define GDK_KEY_F3 GDK_F3
#define GDK_KEY_F4 GDK_F4
#define GDK_KEY_F5 GDK_F5
#define GDK_KEY_F6 GDK_F6
#define GDK_KEY_F7 GDK_F7
#define GDK_KEY_F8 GDK_F8
#define GDK_KEY_F9 GDK_F9
#define GDK_KEY_Home GDK_Home
#define GDK_KEY_Insert GDK_Insert
#define GDK_KEY_ISO_Left_Tab GDK_ISO_Left_Tab
#define GDK_KEY_KP_0 GDK_KP_0
#define GDK_KEY_KP_1 GDK_KP_1
#define GDK_KEY_KP_2 GDK_KP_2
#define GDK_KEY_KP_3 GDK_KP_3
#define GDK_KEY_KP_4 GDK_KP_4
#define GDK_KEY_KP_5 GDK_KP_5
#define GDK_KEY_KP_6 GDK_KP_6
#define GDK_KEY_KP_7 GDK_KP_7
#define GDK_KEY_KP_8 GDK_KP_8
#define GDK_KEY_KP_9 GDK_KP_9
#define GDK_KEY_KP_Add GDK_KP_Add
#define GDK_KEY_KP_Begin GDK_KP_Begin
#define GDK_KEY_KP_Decimal GDK_KP_Decimal
#define GDK_KEY_KP_Delete GDK_KP_Delete
#define GDK_KEY_KP_Divide GDK_KP_Divide
#define GDK_KEY_KP_Down GDK_KP_Down
#define GDK_KEY_KP_End GDK_KP_End
#define GDK_KEY_KP_Enter GDK_KP_Enter
#define GDK_KEY_KP_Home GDK_KP_Home
#define GDK_KEY_KP_Insert GDK_KP_Insert
#define GDK_KEY_KP_Left GDK_KP_Left
#define GDK_KEY_KP_Multiply GDK_KP_Multiply
#define GDK_KEY_KP_Page_Down GDK_KP_Page_Down
#define GDK_KEY_KP_Page_Up GDK_KP_Page_Up
#define GDK_KEY_KP_Right GDK_KP_Right
#define GDK_KEY_KP_Subtract GDK_KP_Subtract
#define GDK_KEY_KP_Up GDK_KP_Up
#define GDK_KEY_Left GDK_Left
#define GDK_KEY_Meta_L GDK_Meta_L
#define GDK_KEY_Meta_R GDK_Meta_R
#define GDK_KEY_Num_Lock GDK_Num_Lock
#define GDK_KEY_Page_Down GDK_Page_Down
#define GDK_KEY_Page_Up GDK_Page_Up
#define GDK_KEY_Return GDK_Return
#define GDK_KEY_Right GDK_Right
#define GDK_KEY_Tab GDK_Tab
#define GDK_KEY_Up GDK_Up
#endif #endif

4
unix/gtkdlg.c
View File

@ -1242,7 +1242,7 @@ static gboolean editbox_key(GtkWidget *widget, GdkEventKey *event,
* in the dialog just like it will everywhere else. * in the dialog just like it will everywhere else.
*/ */
GtkWidget *parent = gtk_widget_get_parent(widget); GtkWidget *parent = gtk_widget_get_parent(widget);
if (event->keyval == GDK_Return && parent != NULL) { if (event->keyval == GDK_KEY_Return && parent != NULL) {
gboolean return_val; gboolean return_val;
gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event"); gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
gtk_signal_emit_by_name(GTK_OBJECT(parent), "key_press_event", gtk_signal_emit_by_name(GTK_OBJECT(parent), "key_press_event",
@ -2487,7 +2487,7 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{ {
struct dlgparam *dp = (struct dlgparam *)data; struct dlgparam *dp = (struct dlgparam *)data;
if (event->keyval == GDK_Escape && dp->cancelbutton) { if (event->keyval == GDK_KEY_Escape && dp->cancelbutton) {
gtk_signal_emit_by_name(GTK_OBJECT(dp->cancelbutton), "clicked"); gtk_signal_emit_by_name(GTK_OBJECT(dp->cancelbutton), "clicked");
return TRUE; return TRUE;
} }

302
unix/gtkwin.c
View File

@ -563,8 +563,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* character code. * character code.
*/ */
if (event->type == GDK_KEY_RELEASE) { if (event->type == GDK_KEY_RELEASE) {
if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || if ((event->keyval == GDK_KEY_Meta_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) && event->keyval == GDK_KEY_Meta_R ||
event->keyval == GDK_KEY_Alt_L ||
event->keyval == GDK_KEY_Alt_R) &&
inst->alt_keycode >= 0 && inst->alt_digits > 1) { 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);
@ -605,8 +607,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* accumulating an Alt+numberpad code. We do this by * accumulating an Alt+numberpad code. We do this by
* setting alt_keycode to -1 (nothing yet but plausible). * setting alt_keycode to -1 (nothing yet but plausible).
*/ */
if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L || if ((event->keyval == GDK_KEY_Meta_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) { event->keyval == GDK_KEY_Meta_R ||
event->keyval == GDK_KEY_Alt_L ||
event->keyval == GDK_KEY_Alt_R)) {
inst->alt_keycode = -1; inst->alt_keycode = -1;
inst->alt_digits = 0; inst->alt_digits = 0;
goto done; /* this generates nothing else */ goto done; /* this generates nothing else */
@ -621,16 +625,16 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) { if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) {
int digit = -1; int digit = -1;
switch (event->keyval) { switch (event->keyval) {
case GDK_KP_0: case GDK_KP_Insert: digit = 0; break; case GDK_KEY_KP_0: case GDK_KEY_KP_Insert: digit = 0; break;
case GDK_KP_1: case GDK_KP_End: digit = 1; break; case GDK_KEY_KP_1: case GDK_KEY_KP_End: digit = 1; break;
case GDK_KP_2: case GDK_KP_Down: digit = 2; break; case GDK_KEY_KP_2: case GDK_KEY_KP_Down: digit = 2; break;
case GDK_KP_3: case GDK_KP_Page_Down: digit = 3; break; case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down: digit = 3; break;
case GDK_KP_4: case GDK_KP_Left: digit = 4; break; case GDK_KEY_KP_4: case GDK_KEY_KP_Left: digit = 4; break;
case GDK_KP_5: case GDK_KP_Begin: digit = 5; break; case GDK_KEY_KP_5: case GDK_KEY_KP_Begin: digit = 5; break;
case GDK_KP_6: case GDK_KP_Right: digit = 6; break; case GDK_KEY_KP_6: case GDK_KEY_KP_Right: digit = 6; break;
case GDK_KP_7: case GDK_KP_Home: digit = 7; break; case GDK_KEY_KP_7: case GDK_KEY_KP_Home: digit = 7; break;
case GDK_KP_8: case GDK_KP_Up: digit = 8; break; case GDK_KEY_KP_8: case GDK_KEY_KP_Up: digit = 8; break;
case GDK_KP_9: case GDK_KP_Page_Up: digit = 9; break; case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up: digit = 9; break;
} }
if (digit < 0) if (digit < 0)
inst->alt_keycode = -2; /* it's invalid */ inst->alt_keycode = -2; /* it's invalid */
@ -656,19 +660,23 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* Shift-PgUp and Shift-PgDn don't even generate keystrokes * Shift-PgUp and Shift-PgDn don't even generate keystrokes
* at all. * at all.
*/ */
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) { if (event->keyval == GDK_KEY_Page_Up &&
(event->state & GDK_SHIFT_MASK)) {
term_scroll(inst->term, 0, -inst->height/2); term_scroll(inst->term, 0, -inst->height/2);
return TRUE; return TRUE;
} }
if (event->keyval == GDK_Page_Up && (event->state & GDK_CONTROL_MASK)) { if (event->keyval == GDK_KEY_Page_Up &&
(event->state & GDK_CONTROL_MASK)) {
term_scroll(inst->term, 0, -1); term_scroll(inst->term, 0, -1);
return TRUE; return TRUE;
} }
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) { if (event->keyval == GDK_KEY_Page_Down &&
(event->state & GDK_SHIFT_MASK)) {
term_scroll(inst->term, 0, +inst->height/2); term_scroll(inst->term, 0, +inst->height/2);
return TRUE; return TRUE;
} }
if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) { if (event->keyval == GDK_KEY_Page_Down &&
(event->state & GDK_CONTROL_MASK)) {
term_scroll(inst->term, 0, +1); term_scroll(inst->term, 0, +1);
return TRUE; return TRUE;
} }
@ -676,7 +684,8 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/* /*
* Neither does Shift-Ins. * Neither does Shift-Ins.
*/ */
if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) { if (event->keyval == GDK_KEY_Insert &&
(event->state & GDK_SHIFT_MASK)) {
request_paste(inst); request_paste(inst);
return TRUE; return TRUE;
} }
@ -710,54 +719,54 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* it to. * it to.
*/ */
if (app_keypad_mode && if (app_keypad_mode &&
(event->keyval == GDK_Num_Lock || (event->keyval == GDK_KEY_Num_Lock ||
event->keyval == GDK_KP_Divide || event->keyval == GDK_KEY_KP_Divide ||
event->keyval == GDK_KP_Multiply || event->keyval == GDK_KEY_KP_Multiply ||
event->keyval == GDK_KP_Subtract || event->keyval == GDK_KEY_KP_Subtract ||
event->keyval == GDK_KP_Add || event->keyval == GDK_KEY_KP_Add ||
event->keyval == GDK_KP_Enter || event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KP_0 || event->keyval == GDK_KEY_KP_0 ||
event->keyval == GDK_KP_Insert || event->keyval == GDK_KEY_KP_Insert ||
event->keyval == GDK_KP_1 || event->keyval == GDK_KEY_KP_1 ||
event->keyval == GDK_KP_End || event->keyval == GDK_KEY_KP_End ||
event->keyval == GDK_KP_2 || event->keyval == GDK_KEY_KP_2 ||
event->keyval == GDK_KP_Down || event->keyval == GDK_KEY_KP_Down ||
event->keyval == GDK_KP_3 || event->keyval == GDK_KEY_KP_3 ||
event->keyval == GDK_KP_Page_Down || event->keyval == GDK_KEY_KP_Page_Down ||
event->keyval == GDK_KP_4 || event->keyval == GDK_KEY_KP_4 ||
event->keyval == GDK_KP_Left || event->keyval == GDK_KEY_KP_Left ||
event->keyval == GDK_KP_5 || event->keyval == GDK_KEY_KP_5 ||
event->keyval == GDK_KP_Begin || event->keyval == GDK_KEY_KP_Begin ||
event->keyval == GDK_KP_6 || event->keyval == GDK_KEY_KP_6 ||
event->keyval == GDK_KP_Right || event->keyval == GDK_KEY_KP_Right ||
event->keyval == GDK_KP_7 || event->keyval == GDK_KEY_KP_7 ||
event->keyval == GDK_KP_Home || event->keyval == GDK_KEY_KP_Home ||
event->keyval == GDK_KP_8 || event->keyval == GDK_KEY_KP_8 ||
event->keyval == GDK_KP_Up || event->keyval == GDK_KEY_KP_Up ||
event->keyval == GDK_KP_9 || event->keyval == GDK_KEY_KP_9 ||
event->keyval == GDK_KP_Page_Up || event->keyval == GDK_KEY_KP_Page_Up ||
event->keyval == GDK_KP_Decimal || event->keyval == GDK_KEY_KP_Decimal ||
event->keyval == GDK_KP_Delete)) { event->keyval == GDK_KEY_KP_Delete)) {
/* app keypad; do nothing */ /* app keypad; do nothing */
} else if (nethack_mode && } else if (nethack_mode &&
(event->keyval == GDK_KP_1 || (event->keyval == GDK_KEY_KP_1 ||
event->keyval == GDK_KP_End || event->keyval == GDK_KEY_KP_End ||
event->keyval == GDK_KP_2 || event->keyval == GDK_KEY_KP_2 ||
event->keyval == GDK_KP_Down || event->keyval == GDK_KEY_KP_Down ||
event->keyval == GDK_KP_3 || event->keyval == GDK_KEY_KP_3 ||
event->keyval == GDK_KP_Page_Down || event->keyval == GDK_KEY_KP_Page_Down ||
event->keyval == GDK_KP_4 || event->keyval == GDK_KEY_KP_4 ||
event->keyval == GDK_KP_Left || event->keyval == GDK_KEY_KP_Left ||
event->keyval == GDK_KP_5 || event->keyval == GDK_KEY_KP_5 ||
event->keyval == GDK_KP_Begin || event->keyval == GDK_KEY_KP_Begin ||
event->keyval == GDK_KP_6 || event->keyval == GDK_KEY_KP_6 ||
event->keyval == GDK_KP_Right || event->keyval == GDK_KEY_KP_Right ||
event->keyval == GDK_KP_7 || event->keyval == GDK_KEY_KP_7 ||
event->keyval == GDK_KP_Home || event->keyval == GDK_KEY_KP_Home ||
event->keyval == GDK_KP_8 || event->keyval == GDK_KEY_KP_8 ||
event->keyval == GDK_KP_Up || event->keyval == GDK_KEY_KP_Up ||
event->keyval == GDK_KP_9 || event->keyval == GDK_KEY_KP_9 ||
event->keyval == GDK_KP_Page_Up)) { event->keyval == GDK_KEY_KP_Page_Up)) {
/* nethack mode; do nothing */ /* nethack mode; do nothing */
} else { } else {
if (gtk_im_context_filter_keypress(inst->imc, event)) if (gtk_im_context_filter_keypress(inst->imc, event))
@ -819,7 +828,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
} }
/* Control-Break sends a Break special to the backend */ /* Control-Break sends a Break special to the backend */
if (event->keyval == GDK_Break && if (event->keyval == GDK_KEY_Break &&
(event->state & GDK_CONTROL_MASK)) { (event->state & GDK_CONTROL_MASK)) {
if (inst->back) if (inst->back)
inst->back->special(inst->backhandle, TS_BRK); inst->back->special(inst->backhandle, TS_BRK);
@ -828,7 +837,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/* We handle Return ourselves, because it needs to be flagged as /* We handle Return ourselves, because it needs to be flagged as
* special to ldisc. */ * special to ldisc. */
if (event->keyval == GDK_Return) { if (event->keyval == GDK_KEY_Return) {
output[1] = '\015'; output[1] = '\015';
use_ucsoutput = FALSE; use_ucsoutput = FALSE;
end = 2; end = 2;
@ -857,7 +866,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
} }
/* We don't let GTK tell us what Backspace is! We know better. */ /* We don't let GTK tell us what Backspace is! We know better. */
if (event->keyval == GDK_BackSpace && if (event->keyval == GDK_KEY_BackSpace &&
!(event->state & GDK_SHIFT_MASK)) { !(event->state & GDK_SHIFT_MASK)) {
output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ? output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
'\x7F' : '\x08'; '\x7F' : '\x08';
@ -866,7 +875,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
special = TRUE; special = TRUE;
} }
/* For Shift Backspace, do opposite of what is configured. */ /* For Shift Backspace, do opposite of what is configured. */
if (event->keyval == GDK_BackSpace && if (event->keyval == GDK_KEY_BackSpace &&
(event->state & GDK_SHIFT_MASK)) { (event->state & GDK_SHIFT_MASK)) {
output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ? output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
'\x08' : '\x7F'; '\x08' : '\x7F';
@ -876,15 +885,16 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
} }
/* Shift-Tab is ESC [ Z */ /* Shift-Tab is ESC [ Z */
if (event->keyval == GDK_ISO_Left_Tab || if (event->keyval == GDK_KEY_ISO_Left_Tab ||
(event->keyval == GDK_Tab && (event->state & GDK_SHIFT_MASK))) { (event->keyval == GDK_KEY_Tab &&
(event->state & GDK_SHIFT_MASK))) {
end = 1 + sprintf(output+1, "\033[Z"); end = 1 + sprintf(output+1, "\033[Z");
use_ucsoutput = FALSE; use_ucsoutput = FALSE;
} }
/* And normal Tab is Tab, if the keymap hasn't already told us. /* And normal Tab is Tab, if the keymap hasn't already told us.
* (Curiously, at least one version of the MacOS 10.5 X server * (Curiously, at least one version of the MacOS 10.5 X server
* doesn't translate Tab for us. */ * doesn't translate Tab for us. */
if (event->keyval == GDK_Tab && end <= 1) { if (event->keyval == GDK_KEY_Tab && end <= 1) {
output[1] = '\t'; output[1] = '\t';
end = 2; end = 2;
} }
@ -895,15 +905,24 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (nethack_mode) { if (nethack_mode) {
const char *keys = NULL; const char *keys = NULL;
switch (event->keyval) { switch (event->keyval) {
case GDK_KP_1: case GDK_KP_End: keys = "bB\002"; break; case GDK_KEY_KP_1: case GDK_KEY_KP_End:
case GDK_KP_2: case GDK_KP_Down: keys = "jJ\012"; break; keys = "bB\002"; break;
case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN\016"; break; case GDK_KEY_KP_2: case GDK_KEY_KP_Down:
case GDK_KP_4: case GDK_KP_Left: keys = "hH\010"; break; keys = "jJ\012"; break;
case GDK_KP_5: case GDK_KP_Begin: keys = "..."; break; case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down:
case GDK_KP_6: case GDK_KP_Right: keys = "lL\014"; break; keys = "nN\016"; break;
case GDK_KP_7: case GDK_KP_Home: keys = "yY\031"; break; case GDK_KEY_KP_4: case GDK_KEY_KP_Left:
case GDK_KP_8: case GDK_KP_Up: keys = "kK\013"; break; keys = "hH\010"; break;
case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU\025"; break; case GDK_KEY_KP_5: case GDK_KEY_KP_Begin:
keys = "..."; break;
case GDK_KEY_KP_6: case GDK_KEY_KP_Right:
keys = "lL\014"; break;
case GDK_KEY_KP_7: case GDK_KEY_KP_Home:
keys = "yY\031"; break;
case GDK_KEY_KP_8: case GDK_KEY_KP_Up:
keys = "kK\013"; break;
case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up:
keys = "uU\025"; break;
} }
if (keys) { if (keys) {
end = 2; end = 2;
@ -924,17 +943,17 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (app_keypad_mode) { if (app_keypad_mode) {
int xkey = 0; int xkey = 0;
switch (event->keyval) { switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break; case GDK_KEY_Num_Lock: xkey = 'P'; break;
case GDK_KP_Divide: xkey = 'Q'; break; case GDK_KEY_KP_Divide: xkey = 'Q'; break;
case GDK_KP_Multiply: xkey = 'R'; break; case GDK_KEY_KP_Multiply: xkey = 'R'; break;
case GDK_KP_Subtract: xkey = 'S'; break; case GDK_KEY_KP_Subtract: xkey = 'S'; break;
/* /*
* Keypad + is tricky. It covers a space that would * Keypad + is tricky. It covers a space that would
* be taken up on the VT100 by _two_ keys; so we * be taken up on the VT100 by _two_ keys; so we
* let Shift select between the two. Worse still, * let Shift select between the two. Worse still,
* in xterm function key mode we change which two... * in xterm function key mode we change which two...
*/ */
case GDK_KP_Add: case GDK_KEY_KP_Add:
if (conf_get_int(inst->conf, CONF_funky_type) == FUNKY_XTERM) { if (conf_get_int(inst->conf, CONF_funky_type) == FUNKY_XTERM) {
if (event->state & GDK_SHIFT_MASK) if (event->state & GDK_SHIFT_MASK)
xkey = 'l'; xkey = 'l';
@ -945,18 +964,19 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
else else
xkey = 'l'; xkey = 'l';
break; break;
case GDK_KP_Enter: xkey = 'M'; break; case GDK_KEY_KP_Enter: xkey = 'M'; break;
case GDK_KP_0: case GDK_KP_Insert: xkey = 'p'; break; case GDK_KEY_KP_0: case GDK_KEY_KP_Insert: xkey = 'p'; break;
case GDK_KP_1: case GDK_KP_End: xkey = 'q'; break; case GDK_KEY_KP_1: case GDK_KEY_KP_End: xkey = 'q'; break;
case GDK_KP_2: case GDK_KP_Down: xkey = 'r'; break; case GDK_KEY_KP_2: case GDK_KEY_KP_Down: xkey = 'r'; break;
case GDK_KP_3: case GDK_KP_Page_Down: xkey = 's'; break; case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down: xkey = 's'; break;
case GDK_KP_4: case GDK_KP_Left: xkey = 't'; break; case GDK_KEY_KP_4: case GDK_KEY_KP_Left: xkey = 't'; break;
case GDK_KP_5: case GDK_KP_Begin: xkey = 'u'; break; case GDK_KEY_KP_5: case GDK_KEY_KP_Begin: xkey = 'u'; break;
case GDK_KP_6: case GDK_KP_Right: xkey = 'v'; break; case GDK_KEY_KP_6: case GDK_KEY_KP_Right: xkey = 'v'; break;
case GDK_KP_7: case GDK_KP_Home: xkey = 'w'; break; case GDK_KEY_KP_7: case GDK_KEY_KP_Home: xkey = 'w'; break;
case GDK_KP_8: case GDK_KP_Up: xkey = 'x'; break; case GDK_KEY_KP_8: case GDK_KEY_KP_Up: xkey = 'x'; break;
case GDK_KP_9: case GDK_KP_Page_Up: xkey = 'y'; break; case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up: xkey = 'y'; break;
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break; case GDK_KEY_KP_Decimal: case GDK_KEY_KP_Delete:
xkey = 'n'; break;
} }
if (xkey) { if (xkey) {
if (inst->term->vt52_mode) { if (inst->term->vt52_mode) {
@ -984,84 +1004,84 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
int code = 0; int code = 0;
int funky_type = conf_get_int(inst->conf, CONF_funky_type); int funky_type = conf_get_int(inst->conf, CONF_funky_type);
switch (event->keyval) { switch (event->keyval) {
case GDK_F1: case GDK_KEY_F1:
code = (event->state & GDK_SHIFT_MASK ? 23 : 11); code = (event->state & GDK_SHIFT_MASK ? 23 : 11);
break; break;
case GDK_F2: case GDK_KEY_F2:
code = (event->state & GDK_SHIFT_MASK ? 24 : 12); code = (event->state & GDK_SHIFT_MASK ? 24 : 12);
break; break;
case GDK_F3: case GDK_KEY_F3:
code = (event->state & GDK_SHIFT_MASK ? 25 : 13); code = (event->state & GDK_SHIFT_MASK ? 25 : 13);
break; break;
case GDK_F4: case GDK_KEY_F4:
code = (event->state & GDK_SHIFT_MASK ? 26 : 14); code = (event->state & GDK_SHIFT_MASK ? 26 : 14);
break; break;
case GDK_F5: case GDK_KEY_F5:
code = (event->state & GDK_SHIFT_MASK ? 28 : 15); code = (event->state & GDK_SHIFT_MASK ? 28 : 15);
break; break;
case GDK_F6: case GDK_KEY_F6:
code = (event->state & GDK_SHIFT_MASK ? 29 : 17); code = (event->state & GDK_SHIFT_MASK ? 29 : 17);
break; break;
case GDK_F7: case GDK_KEY_F7:
code = (event->state & GDK_SHIFT_MASK ? 31 : 18); code = (event->state & GDK_SHIFT_MASK ? 31 : 18);
break; break;
case GDK_F8: case GDK_KEY_F8:
code = (event->state & GDK_SHIFT_MASK ? 32 : 19); code = (event->state & GDK_SHIFT_MASK ? 32 : 19);
break; break;
case GDK_F9: case GDK_KEY_F9:
code = (event->state & GDK_SHIFT_MASK ? 33 : 20); code = (event->state & GDK_SHIFT_MASK ? 33 : 20);
break; break;
case GDK_F10: case GDK_KEY_F10:
code = (event->state & GDK_SHIFT_MASK ? 34 : 21); code = (event->state & GDK_SHIFT_MASK ? 34 : 21);
break; break;
case GDK_F11: case GDK_KEY_F11:
code = 23; code = 23;
break; break;
case GDK_F12: case GDK_KEY_F12:
code = 24; code = 24;
break; break;
case GDK_F13: case GDK_KEY_F13:
code = 25; code = 25;
break; break;
case GDK_F14: case GDK_KEY_F14:
code = 26; code = 26;
break; break;
case GDK_F15: case GDK_KEY_F15:
code = 28; code = 28;
break; break;
case GDK_F16: case GDK_KEY_F16:
code = 29; code = 29;
break; break;
case GDK_F17: case GDK_KEY_F17:
code = 31; code = 31;
break; break;
case GDK_F18: case GDK_KEY_F18:
code = 32; code = 32;
break; break;
case GDK_F19: case GDK_KEY_F19:
code = 33; code = 33;
break; break;
case GDK_F20: case GDK_KEY_F20:
code = 34; code = 34;
break; break;
} }
if (!(event->state & GDK_CONTROL_MASK)) switch (event->keyval) { if (!(event->state & GDK_CONTROL_MASK)) switch (event->keyval) {
case GDK_Home: case GDK_KP_Home: case GDK_KEY_Home: case GDK_KEY_KP_Home:
code = 1; code = 1;
break; break;
case GDK_Insert: case GDK_KP_Insert: case GDK_KEY_Insert: case GDK_KEY_KP_Insert:
code = 2; code = 2;
break; break;
case GDK_Delete: case GDK_KP_Delete: case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
code = 3; code = 3;
break; break;
case GDK_End: case GDK_KP_End: case GDK_KEY_End: case GDK_KEY_KP_End:
code = 4; code = 4;
break; break;
case GDK_Page_Up: case GDK_KP_Page_Up: case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
code = 5; code = 5;
break; break;
case GDK_Page_Down: case GDK_KP_Page_Down: case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
code = 6; code = 6;
break; break;
} }
@ -1080,18 +1100,18 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{"; char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0; int index = 0;
switch (event->keyval) { switch (event->keyval) {
case GDK_F1: index = 0; break; case GDK_KEY_F1: index = 0; break;
case GDK_F2: index = 1; break; case GDK_KEY_F2: index = 1; break;
case GDK_F3: index = 2; break; case GDK_KEY_F3: index = 2; break;
case GDK_F4: index = 3; break; case GDK_KEY_F4: index = 3; break;
case GDK_F5: index = 4; break; case GDK_KEY_F5: index = 4; break;
case GDK_F6: index = 5; break; case GDK_KEY_F6: index = 5; break;
case GDK_F7: index = 6; break; case GDK_KEY_F7: index = 6; break;
case GDK_F8: index = 7; break; case GDK_KEY_F8: index = 7; break;
case GDK_F9: index = 8; break; case GDK_KEY_F9: index = 8; break;
case GDK_F10: index = 9; break; case GDK_KEY_F10: index = 9; break;
case GDK_F11: index = 10; break; case GDK_KEY_F11: index = 10; break;
case GDK_F12: index = 11; break; case GDK_KEY_F12: index = 11; break;
} }
if (event->state & GDK_SHIFT_MASK) index += 12; if (event->state & GDK_SHIFT_MASK) index += 12;
if (event->state & GDK_CONTROL_MASK) index += 24; if (event->state & GDK_CONTROL_MASK) index += 24;
@ -1163,11 +1183,11 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{ {
int xkey = 0; int xkey = 0;
switch (event->keyval) { switch (event->keyval) {
case GDK_Up: case GDK_KP_Up: xkey = 'A'; break; case GDK_KEY_Up: case GDK_KEY_KP_Up: xkey = 'A'; break;
case GDK_Down: case GDK_KP_Down: xkey = 'B'; break; case GDK_KEY_Down: case GDK_KEY_KP_Down: xkey = 'B'; break;
case GDK_Right: case GDK_KP_Right: xkey = 'C'; break; case GDK_KEY_Right: case GDK_KEY_KP_Right: xkey = 'C'; break;
case GDK_Left: case GDK_KP_Left: xkey = 'D'; break; case GDK_KEY_Left: case GDK_KEY_KP_Left: xkey = 'D'; break;
case GDK_Begin: case GDK_KP_Begin: xkey = 'G'; break; case GDK_KEY_Begin: case GDK_KEY_KP_Begin: xkey = 'G'; break;
} }
if (xkey) { if (xkey) {
end = 1 + format_arrow_key(output+1, inst->term, xkey, end = 1 + format_arrow_key(output+1, inst->term, xkey,