summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrey Mozzhuhin <amozzhuhin@yandex.ru>2017-10-05 21:46:14 +0000
committerAndrey Mozzhuhin <amozzhuhin@yandex.ru>2017-10-05 21:46:14 +0000
commit525c6c0c7ea39c6bdb0013c546d08b6e94e51e61 (patch)
tree2d9ba73efbc0d92bf72a41211d502c6c198a9037 /src
parentFix bug #1226962 - Keyboard shortcuts (hotkeys) not functional in some (diff)
downloadinkscape-525c6c0c7ea39c6bdb0013c546d08b6e94e51e61.tar.gz
inkscape-525c6c0c7ea39c6bdb0013c546d08b6e94e51e61.zip
Rename get_group0_keyval to get_latin_keyval
Diffstat (limited to 'src')
-rw-r--r--src/desktop-events.cpp4
-rw-r--r--src/knot.cpp2
-rw-r--r--src/main.cpp6
-rw-r--r--src/seltrans.cpp2
-rw-r--r--src/shortcuts.cpp4
-rw-r--r--src/ui/dialog-events.cpp2
-rw-r--r--src/ui/dialog/dialog.cpp2
-rw-r--r--src/ui/dialog/knot-properties.cpp2
-rw-r--r--src/ui/dialog/layer-properties.cpp2
-rw-r--r--src/ui/dialog/layers.cpp2
-rw-r--r--src/ui/dialog/lpe-powerstroke-properties.cpp2
-rw-r--r--src/ui/dialog/objects.cpp2
-rw-r--r--src/ui/dialog/tags.cpp2
-rw-r--r--src/ui/dialog/xml-tree.cpp2
-rw-r--r--src/ui/tool/control-point.cpp2
-rw-r--r--src/ui/tools/arc-tool.cpp2
-rw-r--r--src/ui/tools/box3d-tool.cpp2
-rw-r--r--src/ui/tools/calligraphic-tool.cpp4
-rw-r--r--src/ui/tools/connector-tool.cpp2
-rw-r--r--src/ui/tools/dropper-tool.cpp2
-rw-r--r--src/ui/tools/eraser-tool.cpp4
-rw-r--r--src/ui/tools/flood-tool.cpp2
-rw-r--r--src/ui/tools/freehand-base.cpp2
-rw-r--r--src/ui/tools/gradient-tool.cpp12
-rw-r--r--src/ui/tools/lpe-tool.cpp4
-rw-r--r--src/ui/tools/mesh-tool.cpp12
-rw-r--r--src/ui/tools/node-tool.cpp2
-rw-r--r--src/ui/tools/pen-tool.cpp2
-rw-r--r--src/ui/tools/pencil-tool.cpp4
-rw-r--r--src/ui/tools/rect-tool.cpp4
-rw-r--r--src/ui/tools/select-tool.cpp24
-rw-r--r--src/ui/tools/spiral-tool.cpp4
-rw-r--r--src/ui/tools/spray-tool.cpp4
-rw-r--r--src/ui/tools/star-tool.cpp4
-rw-r--r--src/ui/tools/text-tool.cpp10
-rw-r--r--src/ui/tools/tool-base.cpp16
-rw-r--r--src/ui/tools/tool-base.h2
-rw-r--r--src/ui/tools/tweak-tool.cpp4
-rw-r--r--src/ui/tools/zoom-tool.cpp4
-rw-r--r--src/ui/widget/spinbutton.cpp2
-rw-r--r--src/widgets/spinbutton-events.cpp2
41 files changed, 87 insertions, 87 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 40b3272b8..758c3e939 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -559,7 +559,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
desktop->guidesMessageContext()->clear();
break;
case GDK_KEY_PRESS:
- switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (&event->key)) {
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
@@ -588,7 +588,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
}
break;
case GDK_KEY_RELEASE:
- switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (&event->key)) {
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
{
diff --git a/src/knot.cpp b/src/knot.cpp
index ff21f534a..8296891f4 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -326,7 +326,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
consumed = TRUE;
break;
case GDK_KEY_PRESS: // keybindings for knot
- switch (Inkscape::UI::Tools::get_group0_keyval(&event->key)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(&event->key)) {
case GDK_KEY_Escape:
knot->setFlag(SP_KNOT_GRABBED, FALSE);
diff --git a/src/main.cpp b/src/main.cpp
index 3402bcc72..9f204851b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -902,7 +902,7 @@ namespace Inkscape {
namespace UI {
namespace Tools {
-guint get_group0_keyval(GdkEventKey const* event, guint *consumed_modifiers = NULL);
+guint get_latin_keyval(GdkEventKey const* event, guint *consumed_modifiers = NULL);
}
}
@@ -960,7 +960,7 @@ snooper(GdkEvent *event, gpointer /*data*/) {
alt_pressed = TRUE && (event->button.state & GDK_MOD1_MASK);
break;
case GDK_KEY_PRESS:
- keyval = Inkscape::UI::Tools::get_group0_keyval(&event->key);
+ keyval = Inkscape::UI::Tools::get_latin_keyval(&event->key);
if (keyval == GDK_KEY_Alt_L) altL_pressed = TRUE;
if (keyval == GDK_KEY_Alt_R) altR_pressed = TRUE;
alt_pressed = alt_pressed || altL_pressed || altR_pressed;
@@ -971,7 +971,7 @@ snooper(GdkEvent *event, gpointer /*data*/) {
event->key.state &= ~GDK_MOD1_MASK;
break;
case GDK_KEY_RELEASE:
- keyval = Inkscape::UI::Tools::get_group0_keyval(&event->key);
+ keyval = Inkscape::UI::Tools::get_latin_keyval(&event->key);
if (keyval == GDK_KEY_Alt_L) altL_pressed = FALSE;
if (keyval == GDK_KEY_Alt_R) altR_pressed = FALSE;
if (!altL_pressed && !altR_pressed)
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 7355f6a07..141720371 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -63,7 +63,7 @@ static gboolean sp_sel_trans_handle_event(SPKnot *knot, GdkEvent *event, SPSelTr
case GDK_MOTION_NOTIFY:
break;
case GDK_KEY_PRESS:
- if (Inkscape::UI::Tools::get_group0_keyval (&event->key) == GDK_KEY_space) {
+ if (Inkscape::UI::Tools::get_latin_keyval (&event->key) == GDK_KEY_space) {
/* stamping mode: both mode(show content and outline) operation with knot */
if (!SP_KNOT_IS_GRABBED(knot)) {
return FALSE;
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index c1677ca51..0a1e0c4a9 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -153,7 +153,7 @@ guint sp_shortcut_translate_event(GdkEventKey const *event, guint *effective_mod
guint remaining_modifiers = 0;
guint resulting_modifiers = 0; // remaining modifiers encoded in high-bit mask
- keyval = Inkscape::UI::Tools::get_group0_keyval(event, &consumed_modifiers);
+ keyval = Inkscape::UI::Tools::get_latin_keyval(event, &consumed_modifiers);
remaining_modifiers = initial_modifiers & ~consumed_modifiers;
resulting_modifiers = ( remaining_modifiers & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) |
@@ -485,7 +485,7 @@ void sp_shortcut_file_export_do(char const *exportname) {
* Shortcut file consists of pairs of bind elements :
* Element (a) is used for shortcut display in menus (display="True") and contains the gdk_keyval_name of the shortcut key
* Element (b) is used in shortcut lookup and contains an uppercase version of the gdk_keyval_name,
- * or a gdk_keyval_name name and the "Shift" modifier for Shift altered hardware code keys (see get_group0_keyval() for explanation)
+ * or a gdk_keyval_name name and the "Shift" modifier for Shift altered hardware code keys (see get_latin_keyval() for explanation)
*/
void sp_shortcut_delete_from_file(char const * /*action*/, unsigned int const shortcut) {
diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp
index d7d56fa50..cf11490f3 100644
--- a/src/ui/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -100,7 +100,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
case GDK_KEY_PRESS:
- switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (&event->key)) {
case GDK_KEY_Escape:
sp_dialog_defocus (win);
ret = TRUE;
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 9037e8377..e50824c7b 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -257,7 +257,7 @@ bool Dialog::_onEvent(GdkEvent *event)
switch (event->type) {
case GDK_KEY_PRESS: {
- switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (&event->key)) {
case GDK_KEY_Escape: {
_defocus();
ret = true;
diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp
index b094dc0e7..29e1cb2bb 100644
--- a/src/ui/dialog/knot-properties.cpp
+++ b/src/ui/dialog/knot-properties.cpp
@@ -151,7 +151,7 @@ KnotPropertiesDialog::_close()
bool KnotPropertiesDialog::_handleKeyEvent(GdkEventKey * /*event*/)
{
- /*switch (get_group0_keyval(event)) {
+ /*switch (get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter: {
_apply();
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index 562484022..4ab6e130e 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -290,7 +290,7 @@ SPObject* LayerPropertiesDialog::_selectedLayer()
bool LayerPropertiesDialog::_handleKeyEvent(GdkEventKey *event)
{
- switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter: {
_strategy->perform(*this);
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 4a381a565..6223bd627 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -542,7 +542,7 @@ void LayersPanel::_toggled( Glib::ustring const& str, int targetCol )
bool LayersPanel::_handleKeyEvent(GdkEventKey *event)
{
- switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
case GDK_KEY_F2: {
diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp
index 9bd98c7c0..e66229dcd 100644
--- a/src/ui/dialog/lpe-powerstroke-properties.cpp
+++ b/src/ui/dialog/lpe-powerstroke-properties.cpp
@@ -146,7 +146,7 @@ PowerstrokePropertiesDialog::_close()
bool PowerstrokePropertiesDialog::_handleKeyEvent(GdkEventKey * /*event*/)
{
- /*switch (get_group0_keyval(event)) {
+ /*switch (get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter: {
_apply();
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 1e0ab9604..49ffa38f5 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -735,7 +735,7 @@ bool ObjectsPanel::_handleKeyEvent(GdkEventKey *event)
// handle events for the treeview
bool empty = _desktop->selection->isEmpty();
- switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
{
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 5a5417eb5..d804e1f68 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -522,7 +522,7 @@ void TagsPanel::_checkTreeSelection()
bool TagsPanel::_handleKeyEvent(GdkEventKey *event)
{
- switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
case GDK_KEY_F2: {
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 83c0de45b..c245890bc 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -856,7 +856,7 @@ void XmlTree::on_document_uri_set(gchar const * /*uri*/, SPDocument * /*document
gboolean XmlTree::quit_on_esc (GtkWidget *w, GdkEventKey *event, GObject */*tbl*/)
{
- switch (Inkscape::UI::Tools::get_group0_keyval (event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (event)) {
case GDK_KEY_Escape: // defocus
gtk_widget_destroy(w);
return TRUE;
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index d9374c790..8ab9fcbd7 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -380,7 +380,7 @@ bool ControlPoint::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, G
// update tips on modifier state change
// TODO add ESC keybinding as drag cancel
case GDK_KEY_PRESS:
- switch (Inkscape::UI::Tools::get_group0_keyval(&event->key))
+ switch (Inkscape::UI::Tools::get_latin_keyval(&event->key))
{
case GDK_KEY_Escape: {
// ignore Escape if this is not a drag
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index a670f577e..33f323eb3 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -227,7 +227,7 @@ bool ArcTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 69555d6c9..09ee2cda9 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -335,7 +335,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Up:
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index ca94ac75f..2a29b25b0 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -777,7 +777,7 @@ bool CalligraphicTool::root_handler(GdkEvent* event) {
}
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
if (!MOD__CTRL_ONLY(event)) {
@@ -858,7 +858,7 @@ bool CalligraphicTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
this->message_context->clear();
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 59d670d74..b9d36706f 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -434,7 +434,7 @@ bool ConnectorTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- ret = this->_handleKeyPress(get_group0_keyval (&event->key));
+ ret = this->_handleKeyPress(get_latin_keyval (&event->key));
break;
default:
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 53a99e481..7bde1b698 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -345,7 +345,7 @@ bool DropperTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Up:
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 83039be18..7892e865b 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -492,7 +492,7 @@ bool EraserTool::root_handler(GdkEvent* event) {
}
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
// case GDK_KEY_Up:
// case GDK_KEY_KP_Up:
// if (!MOD__CTRL_ONLY(event)) {
@@ -596,7 +596,7 @@ bool EraserTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
this->message_context->clear();
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index daeff228c..401b50c1c 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -1189,7 +1189,7 @@ bool FloodTool::root_handler(GdkEvent* event) {
}
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Up:
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index a85c89400..328dc0220 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -168,7 +168,7 @@ bool FreehandBase::root_handler(GdkEvent* event) {
switch (event->type) {
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Up:
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 966183b1a..1735a78df 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -665,7 +665,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
@@ -719,7 +719,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_4:
if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
drag->selected_move_screen(mul*-10, 0); // shift
@@ -742,7 +742,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_8:
if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
drag->selected_move_screen(0, mul*10); // shift
@@ -766,7 +766,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_6:
if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -791,7 +791,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_2:
if (!MOD__CTRL(event)) { // not ctrl
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -848,7 +848,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index 35e6d14a0..ad3964f4a 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -225,14 +225,14 @@ bool LpeTool::root_handler(GdkEvent* event) {
case GDK_KEY_PRESS:
/**
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
}
break;
**/
case GDK_KEY_RELEASE:
/**
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_Control_L:
case GDK_Control_R:
dc->_message_context->clear();
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 1ded5e146..fdfae84df 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -825,7 +825,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
#endif
// FIXME: tip
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
@@ -864,7 +864,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_Left:
case GDK_KEY_KP_4:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -888,7 +888,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_Up:
case GDK_KEY_KP_8:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -912,7 +912,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_Right:
case GDK_KEY_KP_6:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -936,7 +936,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
case GDK_KEY_KP_Down:
case GDK_KEY_KP_2:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -1034,7 +1034,7 @@ bool MeshTool::root_handler(GdkEvent* event) {
#ifdef DEBUG_MESH
std::cout << "sp_mesh_context_root_handler: GDK_KEY_RELEASE" << std::endl;
#endif
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index e7825e302..2b3de5203 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -550,7 +550,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
// otherwise some features cease to work
case GDK_KEY_PRESS:
- switch (get_group0_keyval(&event->key))
+ switch (get_latin_keyval(&event->key))
{
case GDK_KEY_Escape: // deselect everything
if (this->_selected_nodes->empty()) {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index f8dfd7a10..04e2ca7c2 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1062,7 +1062,7 @@ bool PenTool::_handleKeyPress(GdkEvent *event) {
}
}
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Left: // move last point left
case GDK_KEY_KP_Left:
if (!MOD__CTRL(event)) { // not ctrl
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 61799b306..f25c1d673 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -455,7 +455,7 @@ void PencilTool::_cancel() {
bool PencilTool::_handleKeyPress(GdkEventKey const &event) {
bool ret = false;
- switch (get_group0_keyval(&event)) {
+ switch (get_latin_keyval(&event)) {
case GDK_KEY_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Up:
@@ -508,7 +508,7 @@ bool PencilTool::_handleKeyPress(GdkEventKey const &event) {
bool PencilTool::_handleKeyRelease(GdkEventKey const &event) {
bool ret = false;
- switch (get_group0_keyval(&event)) {
+ switch (get_latin_keyval(&event)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Meta_L:
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 91725a00b..655650ef4 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -258,7 +258,7 @@ bool RectTool::root_handler(GdkEvent* event) {
}
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
@@ -326,7 +326,7 @@ bool RectTool::root_handler(GdkEvent* event) {
}
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index fca2173ca..3dfb764bb 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -344,18 +344,18 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- if (get_group0_keyval (&event->key) == GDK_KEY_space) {
+ if (get_latin_keyval (&event->key) == GDK_KEY_space) {
if (this->dragging && this->grabbed) {
/* stamping mode: show content mode moving */
_seltrans->stamp();
ret = TRUE;
}
- } else if (get_group0_keyval (&event->key) == GDK_KEY_Tab) {
+ } else if (get_latin_keyval (&event->key) == GDK_KEY_Tab) {
if (this->dragging && this->grabbed) {
_seltrans->getNextClosestPoint(false);
ret = TRUE;
}
- } else if (get_group0_keyval (&event->key) == GDK_KEY_ISO_Left_Tab) {
+ } else if (get_latin_keyval (&event->key) == GDK_KEY_ISO_Left_Tab) {
if (this->dragging && this->grabbed) {
_seltrans->getNextClosestPoint(true);
ret = TRUE;
@@ -854,7 +854,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_PRESS: // keybindings for select context
{
{
- guint keyval = get_group0_keyval(&event->key);
+ guint keyval = get_latin_keyval(&event->key);
bool alt = ( MOD__ALT(event)
|| (keyval == GDK_KEY_Alt_L)
@@ -896,11 +896,11 @@ bool SelectTool::root_handler(GdkEvent* event) {
gdouble const offset = prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000, "px");
int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Left: // move selection left
case GDK_KEY_KP_Left:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events( get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events( get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -923,7 +923,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_Up: // move selection up
case GDK_KEY_KP_Up:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -946,7 +946,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_Right: // move selection right
case GDK_KEY_KP_Right:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -969,7 +969,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_Down: // move selection down
case GDK_KEY_KP_Down:
if (!MOD__CTRL(event)) { // not ctrl
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
if (MOD__ALT(event)) { // alt
if (MOD__SHIFT(event)) {
@@ -1024,7 +1024,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_bracketleft:
if (MOD__ALT(event)) {
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
selection->rotateScreen(mul*1);
} else if (MOD__CTRL(event)) {
selection->rotate(90);
@@ -1037,7 +1037,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
case GDK_KEY_bracketright:
if (MOD__ALT(event)) {
- gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
+ gint mul = 1 + gobble_key_events(get_latin_keyval(&event->key), 0); // with any mask
selection->rotateScreen(-1*mul);
} else if (MOD__CTRL(event)) {
selection->rotate(-90);
@@ -1097,7 +1097,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
break;
}
case GDK_KEY_RELEASE: {
- guint keyval = get_group0_keyval(&event->key);
+ guint keyval = get_latin_keyval(&event->key);
if (key_is_a_modifier (keyval)) {
this->defaultMessageContext()->clear();
}
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 9240df760..bb8ce6356 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -232,7 +232,7 @@ bool SpiralTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
@@ -291,7 +291,7 @@ bool SpiralTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index eec7babc4..5593ceb34 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -1375,7 +1375,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
}
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_j:
case GDK_KEY_J:
if (MOD__SHIFT_ONLY(event)) {
@@ -1487,7 +1487,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
case GDK_KEY_RELEASE: {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
this->update_cursor(false);
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index cda3389f9..ed25503c4 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -246,7 +246,7 @@ bool StarTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_PRESS:
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
case GDK_KEY_Control_R:
@@ -306,7 +306,7 @@ bool StarTool::root_handler(GdkEvent* event) {
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Alt_L:
case GDK_KEY_Alt_R:
case GDK_KEY_Control_L:
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 91d94cc22..692b65c44 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -653,7 +653,7 @@ bool TextTool::root_handler(GdkEvent* event) {
}
break;
case GDK_KEY_PRESS: {
- guint const group0_keyval = get_group0_keyval(&event->key);
+ guint const group0_keyval = get_latin_keyval(&event->key);
if (group0_keyval == GDK_KEY_KP_Add ||
group0_keyval == GDK_KEY_KP_Subtract) {
@@ -961,7 +961,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->text) {
if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(this->text, this->text_sel_start, this->text_sel_end, desktop, Geom::Point(mul*-10, 0));
else
@@ -985,7 +985,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->text) {
if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(this->text, this->text_sel_start, this->text_sel_end, desktop, Geom::Point(mul*10, 0));
else
@@ -1009,7 +1009,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->text) {
if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(this->text, this->text_sel_start, this->text_sel_end, desktop, Geom::Point(0, mul*-10));
else
@@ -1033,7 +1033,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->text) {
if (MOD__ALT(event)) {
gint mul = 1 + gobble_key_events(
- get_group0_keyval(&event->key), 0); // with any mask
+ get_latin_keyval(&event->key), 0); // with any mask
if (MOD__SHIFT(event))
sp_te_adjust_kerning_screen(this->text, this->text_sel_start, this->text_sel_end, desktop, Geom::Point(0, mul*10));
else
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 58e4b32a9..7b4f67da9 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -602,7 +602,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
int const key_scroll = prefs->getIntLimited("/options/keyscroll/value",
10, 0, 1000);
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
// GDK insists on stealing these keys (F1 for no idea what, tab for cycling widgets
// in the editing window). So we resteal them back and run our regular shortcut
// invoker on them.
@@ -642,7 +642,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, desktop->getCanvas()));
- gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+ gobble_key_events(get_latin_keyval(&event->key), GDK_CONTROL_MASK);
this->desktop->scroll_relative(Geom::Point(i, 0));
ret = TRUE;
} else {
@@ -657,7 +657,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, desktop->getCanvas()));
- gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+ gobble_key_events(get_latin_keyval(&event->key), GDK_CONTROL_MASK);
this->desktop->scroll_relative(Geom::Point(0, i));
ret = TRUE;
} else {
@@ -672,7 +672,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, desktop->getCanvas()));
- gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+ gobble_key_events(get_latin_keyval(&event->key), GDK_CONTROL_MASK);
this->desktop->scroll_relative(Geom::Point(-i, 0));
ret = TRUE;
} else {
@@ -687,7 +687,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
int i = (int) floor(key_scroll * accelerate_scroll(event,
acceleration, desktop->getCanvas()));
- gobble_key_events(get_group0_keyval(&event->key), GDK_CONTROL_MASK);
+ gobble_key_events(get_latin_keyval(&event->key), GDK_CONTROL_MASK);
this->desktop->scroll_relative(Geom::Point(0, -i));
ret = TRUE;
} else {
@@ -756,7 +756,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
gdk_window_set_cursor(gtk_widget_get_window (w), this->cursor);
}
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_space:
if (within_tolerance) {
// Space was pressed, but not panned
@@ -1142,7 +1142,7 @@ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
void sp_event_show_modifier_tip(Inkscape::MessageContext *message_context,
GdkEvent *event, gchar const *ctrl_tip, gchar const *shift_tip,
gchar const *alt_tip) {
- guint keyval = get_group0_keyval(&event->key);
+ guint keyval = get_latin_keyval(&event->key);
bool ctrl = ctrl_tip && (MOD__CTRL(event) || (keyval == GDK_KEY_Control_L) || (keyval
== GDK_KEY_Control_R));
@@ -1197,7 +1197,7 @@ void init_latin_keys_group() {
* Use this instead of simply event->keyval, so that your keyboard shortcuts
* work regardless of layouts (e.g., in Cyrillic).
*/
-guint get_group0_keyval(GdkEventKey const *event, guint *consumed_modifiers /*= NULL*/) {
+guint get_latin_keyval(GdkEventKey const *event, guint *consumed_modifiers /*= NULL*/) {
guint keyval = 0;
GdkModifierType modifiers;
gint group = latin_keys_group_valid ? latin_keys_group : event->group;
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index 1a049abb3..7185b787e 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -252,7 +252,7 @@ void sp_event_show_modifier_tip(Inkscape::MessageContext *message_context, GdkEv
gchar const *ctrl_tip, gchar const *shift_tip, gchar const *alt_tip);
void init_latin_keys_group();
-guint get_group0_keyval(GdkEventKey const *event, guint *consumed_modifiers = NULL);
+guint get_latin_keyval(GdkEventKey const *event, guint *consumed_modifiers = NULL);
SPItem *sp_event_context_find_item (SPDesktop *desktop, Geom::Point const &p, bool select_under, bool into_groups);
SPItem *sp_event_context_over_item (SPDesktop *desktop, SPItem *item, Geom::Point const &p);
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index fca96a483..9348ef842 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -1284,7 +1284,7 @@ bool TweakTool::root_handler(GdkEvent* event) {
}
case GDK_KEY_PRESS:
{
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_m:
case GDK_KEY_M:
case GDK_KEY_0:
@@ -1479,7 +1479,7 @@ bool TweakTool::root_handler(GdkEvent* event) {
}
case GDK_KEY_RELEASE: {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- switch (get_group0_keyval(&event->key)) {
+ switch (get_latin_keyval(&event->key)) {
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
this->update_cursor(false);
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 8ba0c17b3..6f7fca242 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -168,7 +168,7 @@ bool ZoomTool::root_handler(GdkEvent* event) {
break;
}
case GDK_KEY_PRESS:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Escape:
if (!Inkscape::Rubberband::get(desktop)->is_started()) {
Inkscape::SelectionHelper::selectNone(desktop);
@@ -206,7 +206,7 @@ bool ZoomTool::root_handler(GdkEvent* event) {
}
break;
case GDK_KEY_RELEASE:
- switch (get_group0_keyval (&event->key)) {
+ switch (get_latin_keyval (&event->key)) {
case GDK_KEY_Shift_L:
case GDK_KEY_Shift_R:
this->cursor_shape = cursor_zoom_xpm;
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index d1776e630..0c082d3ce 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -71,7 +71,7 @@ bool SpinButton::on_my_focus_in_event(GdkEventFocus* /*event*/)
bool SpinButton::on_my_key_press_event(GdkEventKey* event)
{
- switch (Inkscape::UI::Tools::get_group0_keyval (event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval (event)) {
case GDK_KEY_Escape:
undo();
return true; // I consumed the event
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index fdf88ec85..9666fc636 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -66,7 +66,7 @@ gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer /*data*/
{
gboolean result = FALSE; // I didn't consume the event
- switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
+ switch (Inkscape::UI::Tools::get_latin_keyval(event)) {
case GDK_KEY_Escape: // defocus
spinbutton_undo(w);
spinbutton_defocus(w);