Get rid of remaining deprecated GDK Key symbols

(bzr r11250)

1 files changed, 158 insertions, 59 deletions

diff --git a/src/text-context.cpp b/src/text-context.cpp
index 724c40aa8..c2a9b6a24 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -54,6 +54,105 @@
 #include "xml/repr.h"
 #include <gtk/gtk.h>
 
+#if !GTK_CHECK_VERSION(2,22,0)
+#define GDK_KEY_VoidSymbol 0xffffff
+#define GDK_KEY_Up 0xff52
+#define GDK_KEY_KP_Up 0xff97
+#define GDK_KEY_Down 0xff54
+#define GDK_KEY_KP_Down 0xff99
+#define GDK_KEY_Left 0xff51
+#define GDK_KEY_KP_Left 0xff96
+#define GDK_KEY_Right 0xff53
+#define GDK_KEY_KP_Right 0xff98
+#define GDK_KEY_Page_Up 0xff55
+#define GDK_KEY_KP_Page_Up 0xff9a
+#define GDK_KEY_Page_Down 0xff56
+#define GDK_KEY_KP_Page_Down 0xff9b
+#define GDK_KEY_Home 0xff50
+#define GDK_KEY_KP_Home 0xff95
+#define GDK_KEY_End 0xff57
+#define GDK_KEY_KP_End 0xff9c
+#define GDK_KEY_a 0x061
+#define GDK_KEY_A 0x041
+#define GDK_KEY_b 0x062
+#define GDK_KEY_B 0x042
+#define GDK_KEY_d 0x064
+#define GDK_KEY_D 0x044
+#define GDK_KEY_g 0x067
+#define GDK_KEY_G 0x047
+#define GDK_KEY_i 0x069
+#define GDK_KEY_I 0x049
+#define GDK_KEY_j 0x06a
+#define GDK_KEY_J 0x04a
+#define GDK_KEY_k 0x06b
+#define GDK_KEY_K 0x04b
+#define GDK_KEY_l 0x06c
+#define GDK_KEY_L 0x04c
+#define GDK_KEY_q 0x071
+#define GDK_KEY_Q 0x051
+#define GDK_KEY_r 0x072
+#define GDK_KEY_R 0x052
+#define GDK_KEY_s 0x073
+#define GDK_KEY_S 0x053
+#define GDK_KEY_u 0x075
+#define GDK_KEY_U 0x055
+#define GDK_KEY_w 0x077
+#define GDK_KEY_W 0x057
+#define GDK_KEY_x 0x078
+#define GDK_KEY_X 0x058
+#define GDK_KEY_z 0x07a
+#define GDK_KEY_Z 0x05a
+#define GDK_KEY_Escape 0xff1b
+#define GDK_KEY_Control_L 0xffe3
+#define GDK_KEY_Control_R 0xffe4
+#define GDK_KEY_Alt_L 0xffe9
+#define GDK_KEY_Alt_R 0xffea
+#define GDK_KEY_Shift_L 0xffe1
+#define GDK_KEY_Shift_R 0xffe2
+#define GDK_KEY_Meta_L 0xffe7
+#define GDK_KEY_Meta_R 0xffe8
+#define GDK_KEY_KP_0 0xffb0
+#define GDK_KEY_KP_1 0xffb1
+#define GDK_KEY_KP_2 0xffb2
+#define GDK_KEY_KP_3 0xffb3
+#define GDK_KEY_KP_4 0xffb4
+#define GDK_KEY_KP_5 0xffb5
+#define GDK_KEY_KP_6 0xffb6
+#define GDK_KEY_KP_7 0xffb7
+#define GDK_KEY_KP_8 0xffb8
+#define GDK_KEY_KP_9 0xffb9
+#define GDK_KEY_F1 0xffbe
+#define GDK_KEY_F2 0xffbf
+#define GDK_KEY_F3 0xffc0
+#define GDK_KEY_F4 0xffc1
+#define GDK_KEY_F5 0xffc2
+#define GDK_KEY_F6 0xffc3
+#define GDK_KEY_F7 0xffc4
+#define GDK_KEY_F8 0xffc5
+#define GDK_KEY_F9 0xffc6
+#define GDK_KEY_F10 0xffc7
+#define GDK_KEY_F11 0xffc8
+#define GDK_KEY_Insert 0xff63
+#define GDK_KEY_KP_Insert 0xff9e
+#define GDK_KEY_Delete 0xffff
+#define GDK_KEY_KP_Delete 0xff9f
+#define GDK_KEY_BackSpace 0xff08
+#define GDK_KEY_Return 0xff0d
+#define GDK_KEY_KP_Enter 0xff8d
+#define GDK_KEY_space 0x020
+#define GDK_KEY_KP_Space 0xff80
+#define GDK_KEY_Tab 0xff09
+#define GDK_KEY_ISO_Left_Tab 0xfe20
+#define GDK_KEY_bracketleft 0x05b
+#define GDK_KEY_bracketright 0x05d
+#define GDK_KEY_less 0x03c
+#define GDK_KEY_greater 0x03e
+#define GDK_KEY_comma 0x02c
+#define GDK_KEY_period 0x02e
+#define GDK_KEY_KP_Add 0xffab
+#define GDK_KEY_KP_Subtract 0xffad
+#endif
+
 using Inkscape::DocumentUndo;
 
 static void sp_text_context_class_init(SPTextContextClass *klass);
@@ -741,8 +840,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
         case GDK_KEY_PRESS: {
             guint const group0_keyval = get_group0_keyval(&event->key);
 
-            if (group0_keyval == GDK_KP_Add ||
-                group0_keyval == GDK_KP_Subtract) {
+            if (group0_keyval == GDK_KEY_KP_Add ||
+                group0_keyval == GDK_KEY_KP_Subtract) {
                 if (!(event->key.state & GDK_MOD2_MASK)) // mod2 is NumLock; if on, type +/- keys
                     break; // otherwise pass on keypad +/- so they can zoom
             }
@@ -765,8 +864,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                keyboard shortcuts), but differs from the ISO 14755
                                recommendation. */
                             switch (group0_keyval) {
-                                case GDK_space:
-                                case GDK_KP_Space: {
+                                case GDK_KEY_space:
+                                case GDK_KEY_KP_Space: {
                                     if (tc->unipos) {
                                         insert_uni_char(tc);
                                     }
@@ -775,7 +874,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
 
-                                case GDK_BackSpace: {
+                                case GDK_KEY_BackSpace: {
                                     g_return_val_if_fail(tc->unipos < sizeof(tc->uni), TRUE);
                                     if (tc->unipos) {
                                         tc->uni[--tc->unipos] = '\0';
@@ -784,8 +883,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
 
-                                case GDK_Return:
-                                case GDK_KP_Enter: {
+                                case GDK_KEY_Return:
+                                case GDK_KEY_KP_Enter: {
                                     if (tc->unipos) {
                                         insert_uni_char(tc);
                                     }
@@ -795,7 +894,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
 
-                                case GDK_Escape: {
+                                case GDK_KEY_Escape: {
                                     // Cancel unimode.
                                     tc->unimode = false;
                                     gtk_im_context_reset(tc->imc);
@@ -803,8 +902,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
 
-                                case GDK_Shift_L:
-                                case GDK_Shift_R:
+                                case GDK_KEY_Shift_L:
+                                case GDK_KEY_Shift_R:
                                     break;
 
                                 default: {
@@ -850,14 +949,14 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
 
                         /* Neither unimode nor IM consumed key; process text tool shortcuts */
                         switch (group0_keyval) {
-                            case GDK_x:
-                            case GDK_X:
+                            case GDK_KEY_x:
+                            case GDK_KEY_X:
                                 if (MOD__ALT_ONLY) {
                                     desktop->setToolboxFocusTo ("altx-text");
                                     return TRUE;
                                 }
                                 break;
-                            case GDK_space:
+                            case GDK_KEY_space:
                                 if (MOD__CTRL_ONLY) {
                                     /* No-break space */
                                     if (!tc->text) { // printable key; create text if none (i.e. if nascent_object)
@@ -873,8 +972,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
                                 break;
-                            case GDK_U:
-                            case GDK_u:
+                            case GDK_KEY_U:
+                            case GDK_KEY_u:
                                 if (MOD__CTRL_ONLY || (MOD__CTRL && MOD__SHIFT)) {
                                     if (tc->unimode) {
                                         tc->unimode = false;
@@ -890,8 +989,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
                                 break;
-                            case GDK_B:
-                            case GDK_b:
+                            case GDK_KEY_B:
+                            case GDK_KEY_b:
                                 if (MOD__CTRL_ONLY && tc->text) {
                                     SPStyle const *style = sp_te_style_at_position(tc->text, std::min(tc->text_sel_start, tc->text_sel_end));
                                     SPCSSAttr *css = sp_repr_css_attr_new();
@@ -912,8 +1011,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     return TRUE;
                                 }
                                 break;
-                            case GDK_I:
-                            case GDK_i:
+                            case GDK_KEY_I:
+                            case GDK_KEY_i:
                                 if (MOD__CTRL_ONLY && tc->text) {
                                     SPStyle const *style = sp_te_style_at_position(tc->text, std::min(tc->text_sel_start, tc->text_sel_end));
                                     SPCSSAttr *css = sp_repr_css_attr_new();
@@ -931,8 +1030,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                 }
                                 break;
 
-                            case GDK_A:
-                            case GDK_a:
+                            case GDK_KEY_A:
+                            case GDK_KEY_a:
                                 if (MOD__CTRL_ONLY && tc->text) {
                                     Inkscape::Text::Layout const *layout = te_get_layout(tc->text);
                                     if (layout) {
@@ -945,8 +1044,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                 }
                                 break;
 
-                            case GDK_Return:
-                            case GDK_KP_Enter:
+                            case GDK_KEY_Return:
+                            case GDK_KEY_KP_Enter:
                             {
                                 if (!tc->text) { // printable key; create text if none (i.e. if nascent_object)
                                     sp_text_context_setup_text(tc);
@@ -966,7 +1065,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
 						   _("New line"));
                                 return TRUE;
                             }
-                            case GDK_BackSpace:
+                            case GDK_KEY_BackSpace:
                                 if (tc->text) { // if nascent_object, do nothing, but return TRUE; same for all other delete and move keys
 
                                     bool noSelection = false;
@@ -1000,8 +1099,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
 						       _("Backspace"));
                                 }
                                 return TRUE;
-                            case GDK_Delete:
-                            case GDK_KP_Delete:
+                            case GDK_KEY_Delete:
+                            case GDK_KEY_KP_Delete:
                                 if (tc->text) {
                                     bool noSelection = false;
 
@@ -1031,9 +1130,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
 						       _("Delete"));
                                 }
                                 return TRUE;
-                            case GDK_Left:
-                            case GDK_KP_Left:
-                            case GDK_KP_4:
+                            case GDK_KEY_Left:
+                            case GDK_KEY_KP_Left:
+                            case GDK_KEY_KP_4:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         gint mul = 1 + gobble_key_events(
@@ -1056,9 +1155,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 return TRUE;
-                            case GDK_Right:
-                            case GDK_KP_Right:
-                            case GDK_KP_6:
+                            case GDK_KEY_Right:
+                            case GDK_KEY_KP_Right:
+                            case GDK_KEY_KP_6:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         gint mul = 1 + gobble_key_events(
@@ -1081,9 +1180,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 return TRUE;
-                            case GDK_Up:
-                            case GDK_KP_Up:
-                            case GDK_KP_8:
+                            case GDK_KEY_Up:
+                            case GDK_KEY_KP_Up:
+                            case GDK_KEY_KP_8:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         gint mul = 1 + gobble_key_events(
@@ -1106,9 +1205,9 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 return TRUE;
-                            case GDK_Down:
-                            case GDK_KP_Down:
-                            case GDK_KP_2:
+                            case GDK_KEY_Down:
+                            case GDK_KEY_KP_Down:
+                            case GDK_KEY_KP_2:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         gint mul = 1 + gobble_key_events(
@@ -1131,8 +1230,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 return TRUE;
-                            case GDK_Home:
-                            case GDK_KP_Home:
+                            case GDK_KEY_Home:
+                            case GDK_KEY_KP_Home:
                                 if (tc->text) {
                                     if (MOD__CTRL)
                                         tc->text_sel_end.thisStartOfShape();
@@ -1142,8 +1241,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     break;
                                 }
                                 return TRUE;
-                            case GDK_End:
-                            case GDK_KP_End:
+                            case GDK_KEY_End:
+                            case GDK_KEY_KP_End:
                                 if (tc->text) {
                                     if (MOD__CTRL)
                                         tc->text_sel_end.nextStartOfShape();
@@ -1153,23 +1252,23 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     break;
                                 }
                                 return TRUE;
-                            case GDK_Page_Down:
-                            case GDK_KP_Page_Down:
+                            case GDK_KEY_Page_Down:
+                            case GDK_KEY_KP_Page_Down:
                                 if (tc->text) {
                                     tc->text_sel_end.cursorDown(screenlines);
                                     cursor_moved = true;
                                     break;
                                 }
                                 return TRUE;
-                            case GDK_Page_Up:
-                            case GDK_KP_Page_Up:
+                            case GDK_KEY_Page_Up:
+                            case GDK_KEY_KP_Page_Up:
                                 if (tc->text) {
                                     tc->text_sel_end.cursorUp(screenlines);
                                     cursor_moved = true;
                                     break;
                                 }
                                 return TRUE;
-                            case GDK_Escape:
+                            case GDK_KEY_Escape:
                                 if (tc->creating) {
                                     tc->creating = 0;
                                     if (tc->grabbed) {
@@ -1182,7 +1281,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                 }
                                 tc->nascent_object = FALSE;
                                 return TRUE;
-                            case GDK_bracketleft:
+                            case GDK_KEY_bracketleft:
                                 if (tc->text) {
                                     if (MOD__ALT || MOD__CTRL) {
                                         if (MOD__ALT) {
@@ -1203,7 +1302,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 break;
-                            case GDK_bracketright:
+                            case GDK_KEY_bracketright:
                                 if (tc->text) {
                                     if (MOD__ALT || MOD__CTRL) {
                                         if (MOD__ALT) {
@@ -1224,8 +1323,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 break;
-                            case GDK_less:
-                            case GDK_comma:
+                            case GDK_KEY_less:
+                            case GDK_KEY_comma:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         if (MOD__CTRL) {
@@ -1249,8 +1348,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                                     }
                                 }
                                 break;
-                            case GDK_greater:
-                            case GDK_period:
+                            case GDK_KEY_greater:
+                            case GDK_KEY_period:
                                 if (tc->text) {
                                     if (MOD__ALT) {
                                         if (MOD__CTRL) {
@@ -1291,13 +1390,13 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                 } else return TRUE; // return the "I took care of it" value if it was consumed by the IM
             } else { // do nothing if there's no object to type in - the key will be sent to parent context,
                 // except up/down that are swallowed to prevent the zoom field from activation
-                if ((group0_keyval == GDK_Up    ||
-                     group0_keyval == GDK_Down  ||
-                     group0_keyval == GDK_KP_Up ||
-                     group0_keyval == GDK_KP_Down )
+                if ((group0_keyval == GDK_KEY_Up    ||
+                     group0_keyval == GDK_KEY_Down  ||
+                     group0_keyval == GDK_KEY_KP_Up ||
+                     group0_keyval == GDK_KEY_KP_Down )
                     && !MOD__CTRL_ONLY) {
                     return TRUE;
-                } else if (group0_keyval == GDK_Escape) { // cancel rubberband
+                } else if (group0_keyval == GDK_KEY_Escape) { // cancel rubberband
                     if (tc->creating) {
                         tc->creating = 0;
                         if (tc->grabbed) {
@@ -1306,7 +1405,7 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd
                         }
                         Inkscape::Rubberband::get(desktop)->stop();
                     }
-                } else if ((group0_keyval == GDK_x || group0_keyval == GDK_X) && MOD__ALT_ONLY) {
+                } else if ((group0_keyval == GDK_KEY_x || group0_keyval == GDK_KEY_X) && MOD__ALT_ONLY) {
                     desktop->setToolboxFocusTo ("altx-text");
                     return TRUE;
                 }