AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GDK: Prefix key names with KEY_

Browse Source 
The keysyms create a lot of potential namespace conflicts for
C, and are especially problematic for introspection, where we take
constants into the namespace, so GDK_Display conflicts with GdkDisplay.

For C application compatiblity, add gdkkeysyms-compat.h which uses
the old names.

Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is
the gtkimcontextsimple.c, since porting that requires porting more
custom Perl code.
This commit is contained in:
Colin Walters 2010-09-08 13:35:51 -04:00
parent 03c19e37af
commit 913cdf3be7
62 changed files with 5503 additions and 3255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gtk-demo/hypertext.c
View File

@ -113,8 +113,8 @@ key_press_event (GtkWidget *text_view,
switch (event->keyval)
{
case GDK_Return:
case GDK_KP_Enter:
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
gtk_text_buffer_get_iter_at_mark (buffer, &iter,
gtk_text_buffer_get_insert (buffer));

2
docs/tools/widgets.c
View File

@ -270,7 +270,7 @@ create_accel_label (void)
info = new_widget_info ("accel-label", box, SMALL);
gtk_widget_add_accelerator (button, "activate", accel_group, GDK_Q, GDK_CONTROL_MASK,
gtk_widget_add_accelerator (button, "activate", accel_group, GDK_KEY_Q, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
return info;

3
gdk/Makefile.am
View File

@ -84,6 +84,7 @@ gdk_public_h_sources = \
gdkinput.h \
gdkkeys.h \
gdkkeysyms.h \
gdkkeysyms-compat.h \
gdkpango.h \
gdkpixbuf.h \
gdkpixmap.h \
@ -171,7 +172,7 @@ libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
if HAVE_INTROSPECTION
introspection_files = \
$(gdk_public_h_sources) \
$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \
$(gdk_c_sources) \
gdkenumtypes.c \
gdkenumtypes.h

2208
gdk/gdkkeysyms-compat.h Normal file
View File

File diff suppressed because it is too large Load Diff

50
gdk/gdkkeysyms-update.pl
View File

@ -63,7 +63,10 @@ die "Could not open file keysymdef.h: $!\n" unless open(IN_KEYSYMDEF, "<:utf8",
# Output: gtk+/gdk/gdkkeysyms.h
die "Could not open file gdkkeysyms.h: $!\n" unless open(OUT_GDKKEYSYMS, ">:utf8", "gdkkeysyms.h");
print OUT_GDKKEYSYMS<<EOF;
# Output: gtk+/gdk/gdkkeysyms-compat.h
die "Could not open file gdkkeysyms-compat.h: $!\n" unless open(OUT_GDKKEYSYMS_COMPAT, ">:utf8", "gdkkeysyms-compat.h");
my $LICENSE_HEADER= <<EOF;
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* Copyright (C) 2005, 2006, 2007, 2009 GNOME Foundation
@ -84,6 +87,13 @@ print OUT_GDKKEYSYMS<<EOF;
* Boston, MA 02111-1307, USA.
*/
EOF
print OUT_GDKKEYSYMS $LICENSE_HEADER;
print OUT_GDKKEYSYMS_COMPAT $LICENSE_HEADER;
print OUT_GDKKEYSYMS<<EOF;
/*
* File auto-generated from script http://git.gnome.org/cgit/gtk+/tree/gdk/gdkkeysyms-update.pl
* using the input file
@ -105,6 +115,19 @@ print OUT_GDKKEYSYMS<<EOF;
EOF
print OUT_GDKKEYSYMS_COMPAT<<EOF;
/*
* Compatibility version of gdkkeysyms.h.
*
* In GTK3, keysyms changed to have a KEY_ prefix. This is a compatibility header
* your application can include to gain access to the old names as well. Consider
* porting to the new names instead.
*/
#ifndef __GDK_KEYSYMS_COMPAT_H__
#define __GDK_KEYSYMS_COMPAT_H__
EOF
while (<IN_KEYSYMDEF>)
{
@ -119,9 +142,14 @@ while (<IN_KEYSYMDEF>)
$_ = $keysymelements[2];
die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ );
$keysymelements[1] =~ s/^XK_/GDK_/g;
my $element = $keysymelements[1];
my $binding = $element;
$binding =~ s/^XK_/GDK_KEY_/g;
my $compat_binding = $element;
$compat_binding =~ s/^XK_/GDK_/g;
printf OUT_GDKKEYSYMS "#define %s 0x%03x\n", $keysymelements[1], hex($keysymelements[2]);
printf OUT_GDKKEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
printf OUT_GDKKEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
}
close IN_KEYSYMDEF;
@ -162,9 +190,14 @@ while (<IN_XF86KEYSYM>)
$_ = $keysymelements[2];
die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ );
$keysymelements[1] =~ s/^XF86XK_/GDK_/g;
my $element = $keysymelements[1];
my $binding = $element;
$binding =~ s/^XF86XK_/GDK_KEY_/g;
my $compat_binding = $element;
$compat_binding =~ s/^XF86XK_/GDK_/g;
printf OUT_GDKKEYSYMS "#define %s 0x%03x\n", $keysymelements[1], hex($keysymelements[2]);
printf OUT_GDKKEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
printf OUT_GDKKEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
}
close IN_XF86KEYSYM;
@ -175,4 +208,9 @@ print OUT_GDKKEYSYMS<<EOF;
#endif /* __GDK_KEYSYMS_H__ */
EOF
printf "We just finished converting keysymdef.h to gdkkeysyms.h\nThank you\n";
print OUT_GDKKEYSYMS_COMPAT<<EOF;
#endif /* __GDK_KEYSYMS_COMPAT_H__ */
EOF
printf "We just finished converting keysymdef.h to gdkkeysyms.h and gdkkeysyms-compat.h\nThank you\n";

4351
gdk/gdkkeysyms.h
View File

File diff suppressed because it is too large Load Diff

10
gdk/x11/gdkdevicemanager-core.c
View File

@ -155,7 +155,7 @@ translate_key_event (GdkDisplay *display,
event->key.group = _gdk_x11_get_group_for_state (display, xevent->xkey.state);
event->key.hardware_keycode = xevent->xkey.keycode;
event->key.keyval = GDK_VoidSymbol;
event->key.keyval = GDK_KEY_VoidSymbol;
gdk_keymap_translate_keyboard_state (keymap,
event->key.hardware_keycode,
@ -175,7 +175,7 @@ translate_key_event (GdkDisplay *display,
*/
event->key.string = NULL;
if (event->key.keyval != GDK_VoidSymbol)
if (event->key.keyval != GDK_KEY_VoidSymbol)
c = gdk_keyval_to_unicode (event->key.keyval);
if (c)
@ -209,13 +209,13 @@ translate_key_event (GdkDisplay *display,
if (event->key.string)
event->key.length = bytes_written;
}
else if (event->key.keyval == GDK_Escape)
else if (event->key.keyval == GDK_KEY_Escape)
{
event->key.length = 1;
event->key.string = g_strdup ("\033");
}
else if (event->key.keyval == GDK_Return ||
event->key.keyval == GDK_KP_Enter)
else if (event->key.keyval == GDK_KEY_Return ||
event->key.keyval == GDK_KEY_KP_Enter)
{
event->key.length = 1;
event->key.string = g_strdup ("\r");

10
gdk/x11/gdkdevicemanager-xi2.c
View File

@ -577,7 +577,7 @@ translate_keyboard_string (GdkEventKey *event)
*/
event->string = NULL;
if (event->keyval != GDK_VoidSymbol)
if (event->keyval != GDK_KEY_VoidSymbol)
c = gdk_keyval_to_unicode (event->keyval);
if (c)
@ -611,13 +611,13 @@ translate_keyboard_string (GdkEventKey *event)
if (event->string)
event->length = bytes_written;
}
else if (event->keyval == GDK_Escape)
else if (event->keyval == GDK_KEY_Escape)
{
event->length = 1;
event->string = g_strdup ("\033");
}
else if (event->keyval == GDK_Return ||
event->keyval == GDK_KP_Enter)
else if (event->keyval == GDK_KEY_Return ||
event->keyval == GDK_KEY_KP_Enter)
{
event->length = 1;
event->string = g_strdup ("\r");
@ -924,7 +924,7 @@ gdk_device_manager_xi2_translate_event (GdkEventTranslator *translator,
GUINT_TO_POINTER (xev->deviceid));
gdk_event_set_device (event, device);
event->key.keyval = GDK_VoidSymbol;
event->key.keyval = GDK_KEY_VoidSymbol;
gdk_keymap_translate_keyboard_state (keymap,
event->key.hardware_keycode,

46
gdk/x11/gdkkeys-x11.c
View File

@ -163,7 +163,7 @@ gdk_keymap_x11_init (GdkKeymapX11 *keymap)
keymap->num_lock_mask = 0;
keymap->sun_keypad = FALSE;
keymap->group_switch_mask = 0;
keymap->lock_keysym = GDK_Caps_Lock;
keymap->lock_keysym = GDK_KEY_Caps_Lock;
keymap->have_direction = FALSE;
keymap->current_serial = 0;
@ -396,8 +396,8 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
/* Check both groups */
for (i = 0 ; i < 2 ; i++)
{
if (get_symbol (syms, keymap_x11, i, 0) == GDK_Tab)
set_symbol (syms, keymap_x11, i, 1, GDK_ISO_Left_Tab);
if (get_symbol (syms, keymap_x11, i, 0) == GDK_KEY_Tab)
set_symbol (syms, keymap_x11, i, 1, GDK_KEY_ISO_Left_Tab);
}
/*
@ -423,7 +423,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
keymap_x11->mod_keymap = XGetModifierMapping (xdisplay);
keymap_x11->lock_keysym = GDK_VoidSymbol;
keymap_x11->lock_keysym = GDK_KEY_VoidSymbol;
keymap_x11->group_switch_mask = 0;
keymap_x11->num_lock_mask = 0;
@ -452,14 +452,14 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
mask = 0;
for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
{
if (syms[j] == GDK_Meta_L ||
syms[j] == GDK_Meta_R)
if (syms[j] == GDK_KEY_Meta_L ||
syms[j] == GDK_KEY_Meta_R)
mask |= GDK_META_MASK;
else if (syms[j] == GDK_Hyper_L ||
syms[j] == GDK_Hyper_R)
else if (syms[j] == GDK_KEY_Hyper_L ||
syms[j] == GDK_KEY_Hyper_R)
mask |= GDK_HYPER_MASK;
else if (syms[j] == GDK_Super_L ||
syms[j] == GDK_Super_R)
else if (syms[j] == GDK_KEY_Super_L ||
syms[j] == GDK_KEY_Super_R)
mask |= GDK_SUPER_MASK;
}
@ -481,11 +481,11 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
*/
for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
{
if (syms[j] == GDK_Caps_Lock)
keymap_x11->lock_keysym = GDK_Caps_Lock;
else if (syms[j] == GDK_Shift_Lock &&
keymap_x11->lock_keysym == GDK_VoidSymbol)
keymap_x11->lock_keysym = GDK_Shift_Lock;
if (syms[j] == GDK_KEY_Caps_Lock)
keymap_x11->lock_keysym = GDK_KEY_Caps_Lock;
else if (syms[j] == GDK_KEY_Shift_Lock &&
keymap_x11->lock_keysym == GDK_KEY_VoidSymbol)
keymap_x11->lock_keysym = GDK_KEY_Shift_Lock;
}
break;
@ -502,12 +502,12 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
/* Find the Mode_Switch and Num_Lock modifiers. */
for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
{
if (syms[j] == GDK_Mode_switch)
if (syms[j] == GDK_KEY_Mode_switch)
{
/* This modifier swaps groups */
keymap_x11->group_switch_mask |= mask;
}
else if (syms[j] == GDK_Num_Lock)
else if (syms[j] == GDK_KEY_Num_Lock)
{
/* This modifier is used for Num_Lock */
keymap_x11->num_lock_mask |= mask;
@ -1366,7 +1366,7 @@ translate_keysym (GdkKeymapX11 *keymap_x11,
gint num_lock_index;
shift_modifiers = GDK_SHIFT_MASK;
if (keymap_x11->lock_keysym == GDK_Shift_Lock)
if (keymap_x11->lock_keysym == GDK_KEY_Shift_Lock)
shift_modifiers |= GDK_LOCK_MASK;
/* Fall back to the first group if the passed in group is empty
@ -1416,7 +1416,7 @@ translate_keysym (GdkKeymapX11 *keymap_x11,
tmp_keyval = SYM (keymap_x11, group, shift_level);
if (keymap_x11->lock_keysym == GDK_Caps_Lock && (state & GDK_LOCK_MASK) != 0)
if (keymap_x11->lock_keysym == GDK_KEY_Caps_Lock && (state & GDK_LOCK_MASK) != 0)
{
guint upper = gdk_keyval_to_upper (tmp_keyval);
if (upper != tmp_keyval)
@ -1614,13 +1614,13 @@ gdk_keyval_name (guint keyval)
{
switch (keyval)
{
case GDK_Page_Up:
case GDK_KEY_Page_Up:
return "Page_Up";
case GDK_Page_Down:
case GDK_KEY_Page_Down:
return "Page_Down";
case GDK_KP_Page_Up:
case GDK_KEY_KP_Page_Up:
return "KP_Page_Up";
case GDK_KP_Page_Down:
case GDK_KEY_KP_Page_Down:
return "KP_Page_Down";
}

6
gtk/gtkaboutdialog.c
View File

@ -1878,9 +1878,9 @@ text_view_key_press_event (GtkWidget *text_view,
switch (event->keyval)
{
case GDK_Return:
case GDK_ISO_Enter:
case GDK_KP_Enter:
case GDK_KEY_Return:
case GDK_KEY_ISO_Enter:
case GDK_KEY_KP_Enter:
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
gtk_text_buffer_get_iter_at_mark (buffer, &iter,
gtk_text_buffer_get_insert (buffer));

26
gtk/gtkaccelgroup.c
View File

@ -963,22 +963,22 @@ gtk_accelerator_valid (guint keyval,
GdkModifierType modifiers)
{
static const guint invalid_accelerator_vals[] = {
GDK_Shift_L, GDK_Shift_R, GDK_Shift_Lock, GDK_Caps_Lock, GDK_ISO_Lock,
GDK_Control_L, GDK_Control_R, GDK_Meta_L, GDK_Meta_R,
GDK_Alt_L, GDK_Alt_R, GDK_Super_L, GDK_Super_R, GDK_Hyper_L, GDK_Hyper_R,
GDK_ISO_Level3_Shift, GDK_ISO_Next_Group, GDK_ISO_Prev_Group,
GDK_ISO_First_Group, GDK_ISO_Last_Group,
GDK_Mode_switch, GDK_Num_Lock, GDK_Multi_key,
GDK_Scroll_Lock, GDK_Sys_Req,
GDK_Tab, GDK_ISO_Left_Tab, GDK_KP_Tab,
GDK_First_Virtual_Screen, GDK_Prev_Virtual_Screen,
GDK_Next_Virtual_Screen, GDK_Last_Virtual_Screen,
GDK_Terminate_Server, GDK_AudibleBell_Enable,
GDK_KEY_Shift_L, GDK_KEY_Shift_R, GDK_KEY_Shift_Lock, GDK_KEY_Caps_Lock, GDK_KEY_ISO_Lock,
GDK_KEY_Control_L, GDK_KEY_Control_R, GDK_KEY_Meta_L, GDK_KEY_Meta_R,
GDK_KEY_Alt_L, GDK_KEY_Alt_R, GDK_KEY_Super_L, GDK_KEY_Super_R, GDK_KEY_Hyper_L, GDK_KEY_Hyper_R,
GDK_KEY_ISO_Level3_Shift, GDK_KEY_ISO_Next_Group, GDK_KEY_ISO_Prev_Group,
GDK_KEY_ISO_First_Group, GDK_KEY_ISO_Last_Group,
GDK_KEY_Mode_switch, GDK_KEY_Num_Lock, GDK_KEY_Multi_key,
GDK_KEY_Scroll_Lock, GDK_KEY_Sys_Req,
GDK_KEY_Tab, GDK_KEY_ISO_Left_Tab, GDK_KEY_KP_Tab,
GDK_KEY_First_Virtual_Screen, GDK_KEY_Prev_Virtual_Screen,
GDK_KEY_Next_Virtual_Screen, GDK_KEY_Last_Virtual_Screen,
GDK_KEY_Terminate_Server, GDK_KEY_AudibleBell_Enable,
0
};
static const guint invalid_unmodified_vals[] = {
GDK_Up, GDK_Down, GDK_Left, GDK_Right,
GDK_KP_Up, GDK_KP_Down, GDK_KP_Left, GDK_KP_Right,
GDK_KEY_Up, GDK_KEY_Down, GDK_KEY_Left, GDK_KEY_Right,
GDK_KEY_KP_Up, GDK_KEY_KP_Down, GDK_KEY_KP_Left, GDK_KEY_KP_Right,
0
};
const guint *ac_val;

4
gtk/gtkbindings.c
View File

@ -131,8 +131,8 @@ binding_key_hash_insert_entry (GtkKeyHash *key_hash,
*/
if (entry->modifiers & GDK_SHIFT_MASK)
{
if (keyval == GDK_Tab)
keyval = GDK_ISO_Left_Tab;
if (keyval == GDK_KEY_Tab)
keyval = GDK_KEY_ISO_Left_Tab;
else
keyval = gdk_keyval_to_upper (keyval);
}

20
gtk/gtkcalendar.c
View File

@ -3367,8 +3367,8 @@ gtk_calendar_key_press (GtkWidget *widget,
switch (event->keyval)
{
case GDK_KP_Left:
case GDK_Left:
case GDK_KEY_KP_Left:
case GDK_KEY_Left:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_month_prev (calendar);
@ -3380,8 +3380,8 @@ gtk_calendar_key_press (GtkWidget *widget,
priv->focus_col);
}
break;
case GDK_KP_Right:
case GDK_Right:
case GDK_KEY_KP_Right:
case GDK_KEY_Right:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_month_next (calendar);
@ -3393,8 +3393,8 @@ gtk_calendar_key_press (GtkWidget *widget,
priv->focus_col);
}
break;
case GDK_KP_Up:
case GDK_Up:
case GDK_KEY_KP_Up:
case GDK_KEY_Up:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_year_prev (calendar);
@ -3411,8 +3411,8 @@ gtk_calendar_key_press (GtkWidget *widget,
priv->focus_col);
}
break;
case GDK_KP_Down:
case GDK_Down:
case GDK_KEY_KP_Down:
case GDK_KEY_Down:
return_val = TRUE;
if (event->state & GDK_CONTROL_MASK)
calendar_set_year_next (calendar);
@ -3427,8 +3427,8 @@ gtk_calendar_key_press (GtkWidget *widget,
priv->focus_col);
}
break;
case GDK_KP_Space:
case GDK_space:
case GDK_KEY_KP_Space:
case GDK_KEY_space:
row = priv->focus_row;
col = priv->focus_col;

8
gtk/gtkcellrendereraccel.c
View File

@ -454,8 +454,8 @@ grab_key_callback (GtkWidget *widget,
NULL, NULL, NULL, &consumed_modifiers);
accel_key = gdk_keyval_to_lower (event->keyval);
if (accel_key == GDK_ISO_Left_Tab)
accel_key = GDK_Tab;
if (accel_key == GDK_KEY_ISO_Left_Tab)
accel_key = GDK_KEY_Tab;
accel_mods = event->state & gtk_accelerator_get_default_mod_mask ();
@ -473,9 +473,9 @@ grab_key_callback (GtkWidget *widget,
{
switch (event->keyval)
{
case GDK_Escape:
case GDK_KEY_Escape:
goto out; /* cancel */
case GDK_BackSpace:
case GDK_KEY_BackSpace:
/* clear the accelerator on Backspace */
cleared = TRUE;
goto out;

4
gtk/gtkcellrendererspin.c
View File

@ -259,12 +259,12 @@ gtk_cell_renderer_spin_key_press_event (GtkWidget *widget,
{
if (event->state == 0)
{
if (event->keyval == GDK_Up)
if (event->keyval == GDK_KEY_Up)
{
gtk_spin_button_spin (GTK_SPIN_BUTTON (widget), GTK_SPIN_STEP_FORWARD, 1);
return TRUE;
}
else if (event->keyval == GDK_Down)
else if (event->keyval == GDK_KEY_Down)
{
gtk_spin_button_spin (GTK_SPIN_BUTTON (widget), GTK_SPIN_STEP_BACKWARD, 1);
return TRUE;

38
gtk/gtkcolorsel.c
View File

@ -1527,11 +1527,11 @@ palette_activate (GtkWidget *widget,
gpointer data)
{
/* should have a drawing area subclass with an activate signal */
if ((event->keyval == GDK_space) ||
(event->keyval == GDK_Return) ||
(event->keyval == GDK_ISO_Enter) ||
(event->keyval == GDK_KP_Enter) ||
(event->keyval == GDK_KP_Space))
if ((event->keyval == GDK_KEY_space) ||
(event->keyval == GDK_KEY_Return) ||
(event->keyval == GDK_KEY_ISO_Enter) ||
(event->keyval == GDK_KEY_KP_Enter) ||
(event->keyval == GDK_KEY_KP_Space))
{
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "color_set")) != 0)
{
@ -1811,15 +1811,15 @@ key_press (GtkWidget *invisible,
switch (event->keyval)
{
case GDK_space:
case GDK_Return:
case GDK_ISO_Enter:
case GDK_KP_Enter:
case GDK_KP_Space:
case GDK_KEY_space:
case GDK_KEY_Return:
case GDK_KEY_ISO_Enter:
case GDK_KEY_KP_Enter:
case GDK_KEY_KP_Space:
grab_color_at_pointer (screen, pointer_device, x, y, data);
/* fall through */
case GDK_Escape:
case GDK_KEY_Escape:
shutdown_eyedropper (data);
g_signal_handlers_disconnect_by_func (invisible,
@ -1832,23 +1832,23 @@ key_press (GtkWidget *invisible,
return TRUE;
#if defined GDK_WINDOWING_X11 || defined GDK_WINDOWING_WIN32
case GDK_Up:
case GDK_KP_Up:
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
dy = state == GDK_MOD1_MASK ? -BIG_STEP : -1;
break;
case GDK_Down:
case GDK_KP_Down:
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
dy = state == GDK_MOD1_MASK ? BIG_STEP : 1;
break;
case GDK_Left:
case GDK_KP_Left:
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
dx = state == GDK_MOD1_MASK ? -BIG_STEP : -1;
break;
case GDK_Right:
case GDK_KP_Right:
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
dx = state == GDK_MOD1_MASK ? BIG_STEP : 1;
break;
#endif

46
gtk/gtkcombobox.c
View File

@ -617,53 +617,53 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
/* key bindings */
binding_set = gtk_binding_set_by_class (widget_class);
gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_MOD1_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_MOD1_MASK,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_MOD1_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, GDK_MOD1_MASK,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_MOD1_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_MOD1_MASK,
"popdown", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_MOD1_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, GDK_MOD1_MASK,
"popdown", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"popdown", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP);
gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_START);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_START);
gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_END);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_END);
@ -3986,8 +3986,8 @@ gtk_combo_box_list_key_press (GtkWidget *widget,
GtkComboBox *combo_box = GTK_COMBO_BOX (data);
GtkTreeIter iter;
if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter || event->keyval == GDK_KP_Enter ||
event->keyval == GDK_space || event->keyval == GDK_KP_Space)
if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_ISO_Enter || event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KEY_space || event->keyval == GDK_KEY_KP_Space)
{
GtkTreeModel *model = NULL;
@ -5503,7 +5503,7 @@ gtk_cell_editable_key_press (GtkWidget *widget,
{
GtkComboBox *combo_box = GTK_COMBO_BOX (data);
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
{
g_object_set (combo_box,
"editing-canceled", TRUE,
@ -5513,9 +5513,9 @@ gtk_cell_editable_key_press (GtkWidget *widget,
return TRUE;
}
else if (event->keyval == GDK_Return ||
event->keyval == GDK_ISO_Enter ||
event->keyval == GDK_KP_Enter)
else if (event->keyval == GDK_KEY_Return ||
event->keyval == GDK_KEY_ISO_Enter ||
event->keyval == GDK_KEY_KP_Enter)
{
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (combo_box));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (combo_box));

2
gtk/gtkdialog.c
View File

@ -206,7 +206,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0);
}
static void

28
gtk/gtkdnd.c
View File

@ -4219,36 +4219,36 @@ gtk_drag_key_cb (GtkWidget *widget,
{
switch (event->keyval)
{
case GDK_Escape:
case GDK_KEY_Escape:
gtk_drag_cancel (info, GTK_DRAG_RESULT_USER_CANCELLED, event->time);
return TRUE;
case GDK_space:
case GDK_Return:
case GDK_ISO_Enter:
case GDK_KP_Enter:
case GDK_KP_Space:
case GDK_KEY_space:
case GDK_KEY_Return:
case GDK_KEY_ISO_Enter:
case GDK_KEY_KP_Enter:
case GDK_KEY_KP_Space:
gtk_drag_end (info, event->time);
gtk_drag_drop (info, event->time);
return TRUE;
case GDK_Up:
case GDK_KP_Up:
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
dy = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
break;
case GDK_Down:
case GDK_KP_Down:
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
dy = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
break;
case GDK_Left:
case GDK_KP_Left:
case GDK_KEY_Left:
case GDK_KEY_KP_Left:
dx = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
break;
case GDK_Right:
case GDK_KP_Right:
case GDK_KEY_Right:
case GDK_KEY_KP_Right:
dx = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
break;
}

140
gtk/gtkentry.c
View File

@ -1581,85 +1581,85 @@ gtk_entry_class_init (GtkEntryClass *class)
binding_set = gtk_binding_set_by_class (class);
/* Moving the insertion point */
add_move_binding (binding_set, GDK_Right, 0,
add_move_binding (binding_set, GDK_KEY_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_Left, 0,
add_move_binding (binding_set, GDK_KEY_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_KP_Right, 0,
add_move_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_KP_Left, 0,
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_Home, 0,
add_move_binding (binding_set, GDK_KEY_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_End, 0,
add_move_binding (binding_set, GDK_KEY_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_KP_Home, 0,
add_move_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_KP_End, 0,
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
/* Select all
*/
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* Unselect all
*/
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 0,
@ -1667,66 +1667,66 @@ gtk_entry_class_init (GtkEntryClass *class)
/* Activate
*/
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"activate", 0);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"activate", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"activate", 0);
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
"backspace", 0);
/* Make this do the same as Backspace, to help with mis-typing */
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
"backspace", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, 0,
"toggle-overwrite", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0,
"toggle-overwrite", 0);
/**
@ -4104,10 +4104,10 @@ gtk_entry_key_press (GtkWidget *widget,
}
}
if (event->keyval == GDK_Return ||
event->keyval == GDK_KP_Enter ||
event->keyval == GDK_ISO_Enter ||
event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Return ||
event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KEY_ISO_Enter ||
event->keyval == GDK_KEY_Escape)
{
GtkEntryCompletion *completion = gtk_entry_get_completion (entry);
@ -4513,7 +4513,7 @@ gtk_cell_editable_key_press_event (GtkEntry *entry,
GdkEventKey *key_event,
gpointer data)
{
if (key_event->keyval == GDK_Escape)
if (key_event->keyval == GDK_KEY_Escape)
{
entry->editing_canceled = TRUE;
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
@ -4523,7 +4523,7 @@ gtk_cell_editable_key_press_event (GtkEntry *entry,
}
/* override focus */
if (key_event->keyval == GDK_Up || key_event->keyval == GDK_Down)
if (key_event->keyval == GDK_KEY_Up || key_event->keyval == GDK_KEY_Down)
{
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
@ -9215,16 +9215,16 @@ gtk_entry_completion_timeout (gpointer data)
static inline gboolean
keyval_is_cursor_move (guint keyval)
{
if (keyval == GDK_Up || keyval == GDK_KP_Up)
if (keyval == GDK_KEY_Up || keyval == GDK_KEY_KP_Up)
return TRUE;
if (keyval == GDK_Down || keyval == GDK_KP_Down)
if (keyval == GDK_KEY_Down || keyval == GDK_KEY_KP_Down)
return TRUE;
if (keyval == GDK_Page_Up)
if (keyval == GDK_KEY_Page_Up)
return TRUE;
if (keyval == GDK_Page_Down)
if (keyval == GDK_KEY_Page_Down)
return TRUE;
return FALSE;
@ -9250,21 +9250,21 @@ gtk_entry_completion_key_press (GtkWidget *widget,
{
GtkTreePath *path = NULL;
if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up)
{
if (completion->priv->current_selected < 0)
completion->priv->current_selected = matches + actions - 1;
else
completion->priv->current_selected--;
}
else if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
else if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down)
{
if (completion->priv->current_selected < matches + actions - 1)
completion->priv->current_selected++;
else
completion->priv->current_selected = -1;
}
else if (event->keyval == GDK_Page_Up)
else if (event->keyval == GDK_KEY_Page_Up)
{
if (completion->priv->current_selected < 0)
completion->priv->current_selected = matches + actions - 1;
@ -9283,7 +9283,7 @@ gtk_entry_completion_key_press (GtkWidget *widget,
completion->priv->current_selected = matches - 1;
}
}
else if (event->keyval == GDK_Page_Down)
else if (event->keyval == GDK_KEY_Page_Down)
{
if (completion->priv->current_selected < 0)
completion->priv->current_selected = 0;
@ -9370,11 +9370,11 @@ gtk_entry_completion_key_press (GtkWidget *widget,
return TRUE;
}
else if (event->keyval == GDK_Escape ||
event->keyval == GDK_Left ||
event->keyval == GDK_KP_Left ||
event->keyval == GDK_Right ||
event->keyval == GDK_KP_Right)
else if (event->keyval == GDK_KEY_Escape ||
event->keyval == GDK_KEY_Left ||
event->keyval == GDK_KEY_KP_Left ||
event->keyval == GDK_KEY_Right ||
event->keyval == GDK_KEY_KP_Right)
{
gboolean retval = TRUE;
@ -9389,7 +9389,7 @@ gtk_entry_completion_key_press (GtkWidget *widget,
else if (completion->priv->inline_selection)
{
/* Escape rejects the tentative completion */
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
{
if (completion->priv->completion_prefix)
gtk_entry_set_text (GTK_ENTRY (completion->priv->entry),
@ -9400,9 +9400,9 @@ gtk_entry_completion_key_press (GtkWidget *widget,
/* Move the cursor to the end for Right/Esc, to the
beginning for Left */
if (event->keyval == GDK_Right ||
event->keyval == GDK_KP_Right ||
event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Right ||
event->keyval == GDK_KEY_KP_Right ||
event->keyval == GDK_KEY_Escape)
gtk_editable_set_position (GTK_EDITABLE (widget), -1);
else
gtk_editable_set_position (GTK_EDITABLE (widget), 0);
@ -9417,11 +9417,11 @@ keypress_completion_out:
return retval;
}
else if (event->keyval == GDK_Tab ||
event->keyval == GDK_KP_Tab ||
event->keyval == GDK_ISO_Left_Tab)
else if (event->keyval == GDK_KEY_Tab ||
event->keyval == GDK_KEY_KP_Tab ||
event->keyval == GDK_KEY_ISO_Left_Tab)
{
GtkDirectionType dir = event->keyval == GDK_ISO_Left_Tab ?
GtkDirectionType dir = event->keyval == GDK_KEY_ISO_Left_Tab ?
GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD;
_gtk_entry_reset_im_context (GTK_ENTRY (widget));
@ -9434,9 +9434,9 @@ keypress_completion_out:
return TRUE;
}
else if (event->keyval == GDK_ISO_Enter ||
event->keyval == GDK_KP_Enter ||
event->keyval == GDK_Return)
else if (event->keyval == GDK_KEY_ISO_Enter ||
event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KEY_Return)
{
GtkTreeIter iter;
GtkTreeModel *model = NULL;

72
gtk/gtkfilechooserdefault.c
View File

@ -459,7 +459,7 @@ static void
_gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
{
static const guint quick_bookmark_keyvals[10] = {
GDK_1, GDK_2, GDK_3, GDK_4, GDK_5, GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
GDK_KEY_1, GDK_KEY_2, GDK_KEY_3, GDK_KEY_4, GDK_KEY_5, GDK_KEY_6, GDK_KEY_7, GDK_KEY_8, GDK_KEY_9, GDK_KEY_0
};
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
@ -583,74 +583,74 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
GDK_l, GDK_CONTROL_MASK,
GDK_KEY_l, GDK_CONTROL_MASK,
"location-toggle-popup",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_slash, 0,
GDK_KEY_slash, 0,
"location-popup",
1, G_TYPE_STRING, "/");
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Divide, 0,
GDK_KEY_KP_Divide, 0,
"location-popup",
1, G_TYPE_STRING, "/");
#ifdef G_OS_UNIX
gtk_binding_entry_add_signal (binding_set,
GDK_asciitilde, 0,
GDK_KEY_asciitilde, 0,
"location-popup",
1, G_TYPE_STRING, "~");
#endif
gtk_binding_entry_add_signal (binding_set,
GDK_v, GDK_CONTROL_MASK,
GDK_KEY_v, GDK_CONTROL_MASK,
"location-popup-on-paste",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_Up, GDK_MOD1_MASK,
GDK_KEY_Up, GDK_MOD1_MASK,
"up-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_BackSpace, 0,
GDK_KEY_BackSpace, 0,
"up-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Up, GDK_MOD1_MASK,
GDK_KEY_KP_Up, GDK_MOD1_MASK,
"up-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_Down, GDK_MOD1_MASK,
GDK_KEY_Down, GDK_MOD1_MASK,
"down-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Down, GDK_MOD1_MASK,
GDK_KEY_KP_Down, GDK_MOD1_MASK,
"down-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_Home, GDK_MOD1_MASK,
GDK_KEY_Home, GDK_MOD1_MASK,
"home-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Home, GDK_MOD1_MASK,
GDK_KEY_KP_Home, GDK_MOD1_MASK,
"home-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_d, GDK_MOD1_MASK,
GDK_KEY_d, GDK_MOD1_MASK,
"desktop-folder",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_h, GDK_CONTROL_MASK,
GDK_KEY_h, GDK_CONTROL_MASK,
"show-hidden",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_s, GDK_MOD1_MASK,
GDK_KEY_s, GDK_MOD1_MASK,
"search-shortcut",
0);
gtk_binding_entry_add_signal (binding_set,
GDK_r, GDK_MOD1_MASK,
GDK_KEY_r, GDK_MOD1_MASK,
"recent-shortcut",
0);
@ -3327,9 +3327,9 @@ shortcuts_key_press_event_after_cb (GtkWidget *tree_view,
GtkWidget *entry;
/* don't screw up focus switching with Tab */
if (event->keyval == GDK_Tab
|| event->keyval == GDK_KP_Tab
|| event->keyval == GDK_ISO_Left_Tab
if (event->keyval == GDK_KEY_Tab
|| event->keyval == GDK_KEY_KP_Tab
|| event->keyval == GDK_KEY_ISO_Left_Tab
|| event->length < 1)
return FALSE;
@ -3732,10 +3732,10 @@ key_is_left_or_right (GdkEventKey *event)
modifiers = gtk_accelerator_get_default_mod_mask ();
return ((event->keyval == GDK_Right
|| event->keyval == GDK_KP_Right
|| event->keyval == GDK_Left
|| event->keyval == GDK_KP_Left)
return ((event->keyval == GDK_KEY_Right
|| event->keyval == GDK_KEY_KP_Right
|| event->keyval == GDK_KEY_Left
|| event->keyval == GDK_KEY_KP_Left)
&& (event->state & modifiers) == 0);
}
@ -3755,10 +3755,10 @@ browse_files_key_press_event_cb (GtkWidget *widget,
modifiers = gtk_accelerator_get_default_mod_mask ();
if ((event->keyval == GDK_slash
|| event->keyval == GDK_KP_Divide
if ((event->keyval == GDK_KEY_slash
|| event->keyval == GDK_KEY_KP_Divide
#ifdef G_OS_UNIX
|| event->keyval == GDK_asciitilde
|| event->keyval == GDK_KEY_asciitilde
#endif
) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
{
@ -3772,11 +3772,11 @@ browse_files_key_press_event_cb (GtkWidget *widget,
return TRUE;
}
if ((event->keyval == GDK_Return
|| event->keyval == GDK_ISO_Enter
|| event->keyval == GDK_KP_Enter
|| event->keyval == GDK_space
|| event->keyval == GDK_KP_Space)
if ((event->keyval == GDK_KEY_Return
|| event->keyval == GDK_KEY_ISO_Enter
|| event->keyval == GDK_KEY_KP_Enter
|| event->keyval == GDK_KEY_space
|| event->keyval == GDK_KEY_KP_Space)
&& ((event->state & modifiers) == 0)
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
@ -9693,16 +9693,16 @@ shortcuts_key_press_event_cb (GtkWidget *widget,
return TRUE;
}
if ((event->keyval == GDK_BackSpace
|| event->keyval == GDK_Delete
|| event->keyval == GDK_KP_Delete)
if ((event->keyval == GDK_KEY_BackSpace
|| event->keyval == GDK_KEY_Delete
|| event->keyval == GDK_KEY_KP_Delete)
&& (event->state & modifiers) == 0)
{
remove_selected_bookmarks (impl);
return TRUE;
}
if ((event->keyval == GDK_F2)
if ((event->keyval == GDK_KEY_F2)
&& (event->state & modifiers) == 0)
{
rename_selected_bookmark (impl);

2
gtk/gtkfilechooserentry.c
View File

@ -1248,7 +1248,7 @@ gtk_file_chooser_entry_key_press_event (GtkWidget *widget,
/* This is a bit evil -- it makes Tab never leave the entry. It basically
* makes it 'safe' for people to hit. */
if (event->keyval == GDK_Tab && !control_pressed)
if (event->keyval == GDK_KEY_Tab && !control_pressed)
{
if (chooser_entry->has_completion)
gtk_editable_set_position (editable, gtk_entry_get_text_length (entry));

16
gtk/gtkhsv.c
View File

@ -166,32 +166,32 @@ gtk_hsv_class_init (GtkHSVClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_UP);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_UP);
gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_RIGHT);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_RIGHT);
gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_LEFT);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0,
"move", 1,
G_TYPE_ENUM, GTK_DIR_LEFT);

56
gtk/gtkiconview.c
View File

@ -1010,70 +1010,70 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
G_TYPE_INT);
/* Key bindings */
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
"unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
"toggle-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
"toggle-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
"activate-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
"activate-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"activate-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"activate-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"activate-cursor-item", 0);
gtk_icon_view_add_move_binding (binding_set, GDK_Up, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Up, 0,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Up, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Up, 0,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_Down, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Down, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_p, GDK_CONTROL_MASK,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_Home, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Home, 0,
GTK_MOVEMENT_BUFFER_ENDS, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Home, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_MOVEMENT_BUFFER_ENDS, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_End, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_End, 0,
GTK_MOVEMENT_BUFFER_ENDS, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_End, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_BUFFER_ENDS, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_Page_Up, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Page_Up, 0,
GTK_MOVEMENT_PAGES, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Page_Up, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Page_Up, 0,
GTK_MOVEMENT_PAGES, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_Page_Down, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Page_Down, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_Right, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_Left, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Right, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_KP_Left, 0,
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
}
@ -2303,7 +2303,7 @@ gtk_icon_view_key_press (GtkWidget *widget,
if (icon_view->priv->doing_rubberband)
{
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
gtk_icon_view_stop_rubberbanding (icon_view);
return TRUE;

2
gtk/gtkimcontextsimple.c
View File

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkkeysyms-compat.h>
#include "gtkprivate.h"
#include "gtkaccelgroup.h"
#include "gtkimcontextsimple.h"

2
gtk/gtkinfobar.c
View File

@ -488,7 +488,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0);
g_type_class_add_private (object_class, sizeof (GtkInfoBarPrivate));
}

80
gtk/gtklabel.c
View File

@ -628,7 +628,7 @@ gtk_label_class_init (GtkLabelClass *class)
P_("The mnemonic accelerator key for this label"),
0,
G_MAXUINT,
GDK_VoidSymbol,
GDK_KEY_VoidSymbol,
GTK_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_MNEMONIC_WIDGET,
@ -791,113 +791,113 @@ gtk_label_class_init (GtkLabelClass *class)
binding_set = gtk_binding_set_by_class (class);
/* Moving the insertion point */
add_move_binding (binding_set, GDK_Right, 0,
add_move_binding (binding_set, GDK_KEY_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_Left, 0,
add_move_binding (binding_set, GDK_KEY_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_KP_Right, 0,
add_move_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_KP_Left, 0,
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_f, GDK_CONTROL_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_b, GDK_CONTROL_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
/* select all */
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* unselect all */
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
add_move_binding (binding_set, GDK_KEY_f, GDK_MOD1_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
add_move_binding (binding_set, GDK_KEY_b, GDK_MOD1_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_Home, 0,
add_move_binding (binding_set, GDK_KEY_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_End, 0,
add_move_binding (binding_set, GDK_KEY_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_KP_Home, 0,
add_move_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_KP_End, 0,
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
/* copy */
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"activate-current-link", 0);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"activate-current-link", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"activate-current-link", 0);
gtk_settings_install_property (g_param_spec_boolean ("gtk-label-select-on-focus",
@ -1085,7 +1085,7 @@ gtk_label_init (GtkLabel *label)
priv->pattern_set = FALSE;
priv->track_links = TRUE;
priv->mnemonic_keyval = GDK_VoidSymbol;
priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
priv->layout = NULL;
priv->text = NULL;
priv->attrs = NULL;
@ -1527,7 +1527,7 @@ gtk_label_setup_mnemonic (GtkLabel *label,
mnemonic_menu = g_object_get_data (G_OBJECT (label), "gtk-mnemonic-menu");
if (last_key != GDK_VoidSymbol)
if (last_key != GDK_KEY_VoidSymbol)
{
if (priv->mnemonic_window)
{
@ -1545,7 +1545,7 @@ gtk_label_setup_mnemonic (GtkLabel *label,
}
}
if (priv->mnemonic_keyval == GDK_VoidSymbol)
if (priv->mnemonic_keyval == GDK_KEY_VoidSymbol)
goto done;
connect_mnemonics_visible_notify (GTK_LABEL (widget));
@ -1806,7 +1806,7 @@ gtk_label_get_mnemonic_widget (GtkLabel *label)
guint
gtk_label_get_mnemonic_keyval (GtkLabel *label)
{
g_return_val_if_fail (GTK_IS_LABEL (label), GDK_VoidSymbol);
g_return_val_if_fail (GTK_IS_LABEL (label), GDK_KEY_VoidSymbol);
return label->priv->mnemonic_keyval;
}
@ -1945,7 +1945,7 @@ gtk_label_recalculate (GtkLabel *label)
gtk_label_compose_effective_attrs (label);
if (!priv->use_underline)
priv->mnemonic_keyval = GDK_VoidSymbol;
priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
if (keyval != priv->mnemonic_keyval)
{
@ -2452,7 +2452,7 @@ gtk_label_set_markup_internal (GtkLabel *label,
if (accel_char != 0)
priv->mnemonic_keyval = gdk_keyval_to_lower (gdk_unicode_to_keyval (accel_char));
else
priv->mnemonic_keyval = GDK_VoidSymbol;
priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
}
/**
@ -4232,7 +4232,7 @@ separate_uline_pattern (const gchar *str,
gchar *dest;
gchar *pattern_dest;
*accel_key = GDK_VoidSymbol;
*accel_key = GDK_KEY_VoidSymbol;
*new_str = g_new (gchar, strlen (str) + 1);
*pattern = g_new (gchar, g_utf8_strlen (str, -1) + 1);
@ -4265,7 +4265,7 @@ separate_uline_pattern (const gchar *str,
else
{
*pattern_dest++ = '_';
if (*accel_key == GDK_VoidSymbol)
if (*accel_key == GDK_KEY_VoidSymbol)
*accel_key = gdk_keyval_to_lower (gdk_unicode_to_keyval (c));
}
@ -4302,7 +4302,7 @@ gtk_label_set_uline_text_internal (GtkLabel *label,
const gchar *str)
{
GtkLabelPrivate *priv = label->priv;
guint accel_key = GDK_VoidSymbol;
guint accel_key = GDK_KEY_VoidSymbol;
gchar *new_str;
gchar *pattern;

2
gtk/gtkmain.c
View File

@ -1713,7 +1713,7 @@ gtk_main_do_event (GdkEvent *event)
/* Catch alt press to enable auto-mnemonics;
* menus are handled elsewhere
*/
if ((event->key.keyval == GDK_Alt_L || event->key.keyval == GDK_Alt_R) &&
if ((event->key.keyval == GDK_KEY_Alt_L || event->key.keyval == GDK_KEY_Alt_R) &&
!GTK_IS_MENU_SHELL (grab_widget))
{
gboolean auto_mnemonics;

38
gtk/gtkmenu.c
View File

@ -742,82 +742,82 @@ gtk_menu_class_init (GtkMenuClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
GDK_Up, 0,
GDK_KEY_Up, 0,
I_("move-current"), 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Up, 0,
GDK_KEY_KP_Up, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
GDK_Down, 0,
GDK_KEY_Down, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Down, 0,
GDK_KEY_KP_Down, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
GDK_Left, 0,
GDK_KEY_Left, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Left, 0,
GDK_KEY_KP_Left, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
GDK_Right, 0,
GDK_KEY_Right, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Right, 0,
GDK_KEY_KP_Right, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
gtk_binding_entry_add_signal (binding_set,
GDK_Home, 0,
GDK_KEY_Home, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_START);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Home, 0,
GDK_KEY_KP_Home, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_START);
gtk_binding_entry_add_signal (binding_set,
GDK_End, 0,
GDK_KEY_End, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_END);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_End, 0,
GDK_KEY_KP_End, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_END);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Up, 0,
GDK_KEY_Page_Up, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_PAGE_UP);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Page_Up, 0,
GDK_KEY_KP_Page_Up, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_PAGE_UP);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Down, 0,
GDK_KEY_Page_Down, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Page_Down, 0,
GDK_KEY_KP_Page_Down, 0,
"move-scroll", 1,
GTK_TYPE_SCROLL_TYPE,
GTK_SCROLL_PAGE_DOWN);
@ -3429,9 +3429,9 @@ gtk_menu_key_press (GtkWidget *widget,
switch (event->keyval)
{
case GDK_Delete:
case GDK_KP_Delete:
case GDK_BackSpace:
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
delete = TRUE;
break;
default:

16
gtk/gtkmenubar.c
View File

@ -107,42 +107,42 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
GDK_Left, 0,
GDK_KEY_Left, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Left, 0,
GDK_KEY_KP_Left, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
GDK_Right, 0,
GDK_KEY_Right, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Right, 0,
GDK_KEY_KP_Right, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
GDK_Up, 0,
GDK_KEY_Up, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Up, 0,
GDK_KEY_KP_Up, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
GDK_Down, 0,
GDK_KEY_Down, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Down, 0,
GDK_KEY_KP_Down, 0,
"move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);

16
gtk/gtkmenushell.c
View File

@ -328,39 +328,39 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set,
GDK_Escape, 0,
GDK_KEY_Escape, 0,
"cancel", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_Return, 0,
GDK_KEY_Return, 0,
"activate-current", 1,
G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_ISO_Enter, 0,
GDK_KEY_ISO_Enter, 0,
"activate-current", 1,
G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Enter, 0,
GDK_KEY_KP_Enter, 0,
"activate-current", 1,
G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
GDK_KEY_space, 0,
"activate-current", 1,
G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
GDK_KEY_KP_Space, 0,
"activate-current", 1,
G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_F10, 0,
GDK_KEY_F10, 0,
"cycle-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set,
GDK_F10, GDK_SHIFT_MASK,
GDK_KEY_F10, GDK_SHIFT_MASK,
"cycle-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);

52
gtk/gtknotebook.c
View File

@ -482,10 +482,10 @@ add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers,
GtkDirectionType direction)
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, modifiers,
"move_focus_out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, modifiers,
"move_focus_out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@ -495,7 +495,7 @@ add_arrow_bindings (GtkBindingSet *binding_set,
guint keysym,
GtkDirectionType direction)
{
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
"move_focus_out", 1,
@ -511,7 +511,7 @@ add_reorder_bindings (GtkBindingSet *binding_set,
GtkDirectionType direction,
gboolean move_to_last)
{
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, GDK_MOD1_MASK,
"reorder_tab", 2,
@ -978,62 +978,62 @@ gtk_notebook_class_init (GtkNotebookClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
GDK_KEY_space, 0,
"select-page", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
GDK_KEY_KP_Space, 0,
"select-page", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_Home, 0,
GDK_KEY_Home, 0,
"focus-tab", 1,
GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_FIRST);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Home, 0,
GDK_KEY_KP_Home, 0,
"focus-tab", 1,
GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_FIRST);
gtk_binding_entry_add_signal (binding_set,
GDK_End, 0,
GDK_KEY_End, 0,
"focus-tab", 1,
GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_LAST);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_End, 0,
GDK_KEY_KP_End, 0,
"focus-tab", 1,
GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_LAST);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Up, GDK_CONTROL_MASK,
GDK_KEY_Page_Up, GDK_CONTROL_MASK,
"change-current-page", 1,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Down, GDK_CONTROL_MASK,
GDK_KEY_Page_Down, GDK_CONTROL_MASK,
"change-current-page", 1,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Up, GDK_CONTROL_MASK | GDK_MOD1_MASK,
GDK_KEY_Page_Up, GDK_CONTROL_MASK | GDK_MOD1_MASK,
"change-current-page", 1,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set,
GDK_Page_Down, GDK_CONTROL_MASK | GDK_MOD1_MASK,
GDK_KEY_Page_Down, GDK_CONTROL_MASK | GDK_MOD1_MASK,
"change-current-page", 1,
G_TYPE_INT, 1);
add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
add_arrow_bindings (binding_set, GDK_KEY_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_KEY_Down, GTK_DIR_DOWN);
add_arrow_bindings (binding_set, GDK_KEY_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_KEY_Right, GTK_DIR_RIGHT);
add_reorder_bindings (binding_set, GDK_Up, GTK_DIR_UP, FALSE);
add_reorder_bindings (binding_set, GDK_Down, GTK_DIR_DOWN, FALSE);
add_reorder_bindings (binding_set, GDK_Left, GTK_DIR_LEFT, FALSE);
add_reorder_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT, FALSE);
add_reorder_bindings (binding_set, GDK_Home, GTK_DIR_LEFT, TRUE);
add_reorder_bindings (binding_set, GDK_Home, GTK_DIR_UP, TRUE);
add_reorder_bindings (binding_set, GDK_End, GTK_DIR_RIGHT, TRUE);
add_reorder_bindings (binding_set, GDK_End, GTK_DIR_DOWN, TRUE);
add_reorder_bindings (binding_set, GDK_KEY_Up, GTK_DIR_UP, FALSE);
add_reorder_bindings (binding_set, GDK_KEY_Down, GTK_DIR_DOWN, FALSE);
add_reorder_bindings (binding_set, GDK_KEY_Left, GTK_DIR_LEFT, FALSE);
add_reorder_bindings (binding_set, GDK_KEY_Right, GTK_DIR_RIGHT, FALSE);
add_reorder_bindings (binding_set, GDK_KEY_Home, GTK_DIR_LEFT, TRUE);
add_reorder_bindings (binding_set, GDK_KEY_Home, GTK_DIR_UP, TRUE);
add_reorder_bindings (binding_set, GDK_KEY_End, GTK_DIR_RIGHT, TRUE);
add_reorder_bindings (binding_set, GDK_KEY_End, GTK_DIR_DOWN, TRUE);
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);

72
gtk/gtkpaned.c
View File

@ -191,9 +191,9 @@ static void
add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers)
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, modifiers,
"toggle-handle-focus", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, modifiers,
"toggle-handle-focus", 0);
}
@ -496,22 +496,22 @@ gtk_paned_class_init (GtkPanedClass *class)
/* F6 and friends */
gtk_binding_entry_add_signal (binding_set,
GDK_F6, 0,
GDK_KEY_F6, 0,
"cycle-child-focus", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_F6, GDK_SHIFT_MASK,
GDK_KEY_F6, GDK_SHIFT_MASK,
"cycle-child-focus", 1,
G_TYPE_BOOLEAN, TRUE);
/* F8 and friends */
gtk_binding_entry_add_signal (binding_set,
GDK_F8, 0,
GDK_KEY_F8, 0,
"cycle-handle-focus", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_F8, GDK_SHIFT_MASK,
GDK_KEY_F8, GDK_SHIFT_MASK,
"cycle-handle-focus", 1,
G_TYPE_BOOLEAN, TRUE);
@ -522,54 +522,54 @@ gtk_paned_class_init (GtkPanedClass *class)
/* accept and cancel positions */
gtk_binding_entry_add_signal (binding_set,
GDK_Escape, 0,
GDK_KEY_Escape, 0,
"cancel-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_Return, 0,
GDK_KEY_Return, 0,
"accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_ISO_Enter, 0,
GDK_KEY_ISO_Enter, 0,
"accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Enter, 0,
GDK_KEY_KP_Enter, 0,
"accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
GDK_KEY_space, 0,
"accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
GDK_KEY_KP_Space, 0,
"accept-position", 0);
/* move handle */
add_move_binding (binding_set, GDK_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_KP_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
add_move_binding (binding_set, GDK_KEY_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_KEY_KP_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
add_move_binding (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_RIGHT);
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KP_Right, 0, GTK_SCROLL_STEP_RIGHT);
add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_RIGHT);
add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_KP_Right, 0, GTK_SCROLL_STEP_RIGHT);
add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_UP);
add_move_binding (binding_set, GDK_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KP_Up, 0, GTK_SCROLL_STEP_UP);
add_move_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KP_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_STEP_UP);
add_move_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_KP_Up, 0, GTK_SCROLL_STEP_UP);
add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_KP_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_DOWN);
add_move_binding (binding_set, GDK_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
add_move_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KP_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_STEP_DOWN);
add_move_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_KEY_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_KP_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_End, 0, GTK_SCROLL_END);
add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END);
add_move_binding (binding_set, GDK_KEY_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_KEY_KP_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END);
add_move_binding (binding_set, GDK_KEY_KP_End, 0, GTK_SCROLL_END);
g_type_class_add_private (object_class, sizeof (GtkPanedPrivate));
}

2
gtk/gtkrange.c
View File

@ -2339,7 +2339,7 @@ gtk_range_key_press (GtkWidget *widget,
device = gdk_device_get_associated_device (device);
if (device == priv->grab_device &&
event->keyval == GDK_Escape &&
event->keyval == GDK_KEY_Escape &&
priv->grab_location != MOUSE_OUTSIDE)
{
stop_scrolling (range);

72
gtk/gtkscale.c
View File

@ -289,116 +289,116 @@ gtk_scale_class_init (GtkScaleClass *class)
binding_set = gtk_binding_set_by_class (class);
add_slider_binding (binding_set, GDK_Left, 0,
add_slider_binding (binding_set, GDK_KEY_Left, 0,
GTK_SCROLL_STEP_LEFT);
add_slider_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_KP_Left, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_SCROLL_STEP_LEFT);
add_slider_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_Right, 0,
add_slider_binding (binding_set, GDK_KEY_Right, 0,
GTK_SCROLL_STEP_RIGHT);
add_slider_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_KP_Right, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_SCROLL_STEP_RIGHT);
add_slider_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_Up, 0,
add_slider_binding (binding_set, GDK_KEY_Up, 0,
GTK_SCROLL_STEP_UP);
add_slider_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_KP_Up, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Up, 0,
GTK_SCROLL_STEP_UP);
add_slider_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_Down, 0,
add_slider_binding (binding_set, GDK_KEY_Down, 0,
GTK_SCROLL_STEP_DOWN);
add_slider_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_DOWN);
add_slider_binding (binding_set, GDK_KP_Down, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_SCROLL_STEP_DOWN);
add_slider_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_DOWN);
add_slider_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_Page_Up, 0,
add_slider_binding (binding_set, GDK_KEY_Page_Up, 0,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_KP_Page_Up, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Page_Up, 0,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_Page_Down, 0,
add_slider_binding (binding_set, GDK_KEY_Page_Down, 0,
GTK_SCROLL_PAGE_DOWN);
add_slider_binding (binding_set, GDK_KP_Page_Down, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Page_Down, 0,
GTK_SCROLL_PAGE_DOWN);
/* Logical bindings (vs. visual bindings above) */
add_slider_binding (binding_set, GDK_plus, 0,
add_slider_binding (binding_set, GDK_KEY_plus, 0,
GTK_SCROLL_STEP_FORWARD);
add_slider_binding (binding_set, GDK_minus, 0,
add_slider_binding (binding_set, GDK_KEY_minus, 0,
GTK_SCROLL_STEP_BACKWARD);
add_slider_binding (binding_set, GDK_plus, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_plus, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_FORWARD);
add_slider_binding (binding_set, GDK_minus, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_minus, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_BACKWARD);
add_slider_binding (binding_set, GDK_KP_Add, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Add, 0,
GTK_SCROLL_STEP_FORWARD);
add_slider_binding (binding_set, GDK_KP_Subtract, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Subtract, 0,
GTK_SCROLL_STEP_BACKWARD);
add_slider_binding (binding_set, GDK_KP_Add, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Add, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_FORWARD);
add_slider_binding (binding_set, GDK_KP_Subtract, GDK_CONTROL_MASK,
add_slider_binding (binding_set, GDK_KEY_KP_Subtract, GDK_CONTROL_MASK,
GTK_SCROLL_PAGE_BACKWARD);
add_slider_binding (binding_set, GDK_Home, 0,
add_slider_binding (binding_set, GDK_KEY_Home, 0,
GTK_SCROLL_START);
add_slider_binding (binding_set, GDK_KP_Home, 0,
add_slider_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_SCROLL_START);
add_slider_binding (binding_set, GDK_End, 0,
add_slider_binding (binding_set, GDK_KEY_End, 0,
GTK_SCROLL_END);
add_slider_binding (binding_set, GDK_KP_End, 0,
add_slider_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_SCROLL_END);
g_type_class_add_private (gobject_class, sizeof (GtkScalePrivate));

14
gtk/gtkscalebutton.c
View File

@ -334,17 +334,17 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
/* Key bindings */
binding_set = gtk_binding_set_by_class (widget_class);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"popup", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"popdown", 0);
}
@ -1380,7 +1380,7 @@ cb_dock_key_release (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
{
gtk_scale_button_popdown (GTK_WIDGET (user_data));
return TRUE;

30
gtk/gtkscrolledwindow.c
View File

@ -181,7 +181,7 @@ add_scroll_binding (GtkBindingSet *binding_set,
GtkScrollType scroll,
gboolean horizontal)
{
guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left;
gtk_binding_entry_add_signal (binding_set, keyval, mask,
"scroll-child", 2,
@ -198,10 +198,10 @@ add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers,
GtkDirectionType direction)
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, modifiers,
"move-focus-out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, modifiers,
"move-focus-out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@ -365,20 +365,20 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
binding_set = gtk_binding_set_by_class (class);
add_scroll_binding (binding_set, GDK_Left, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
add_scroll_binding (binding_set, GDK_Right, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, TRUE);
add_scroll_binding (binding_set, GDK_Up, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
add_scroll_binding (binding_set, GDK_Down, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, FALSE);
add_scroll_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
add_scroll_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_FORWARD, TRUE);
add_scroll_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_BACKWARD, FALSE);
add_scroll_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_FORWARD, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_FORWARD, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_BACKWARD, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_FORWARD, FALSE);
add_scroll_binding (binding_set, GDK_Home, GDK_CONTROL_MASK, GTK_SCROLL_START, TRUE);
add_scroll_binding (binding_set, GDK_End, GDK_CONTROL_MASK, GTK_SCROLL_END, TRUE);
add_scroll_binding (binding_set, GDK_Home, 0, GTK_SCROLL_START, FALSE);
add_scroll_binding (binding_set, GDK_End, 0, GTK_SCROLL_END, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK, GTK_SCROLL_START, TRUE);
add_scroll_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK, GTK_SCROLL_END, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Home, 0, GTK_SCROLL_START, FALSE);
add_scroll_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END, FALSE);
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);

16
gtk/gtkspinbutton.c
View File

@ -392,14 +392,14 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
binding_set = gtk_binding_set_by_class (class);
add_spin_binding (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_UP);
add_spin_binding (binding_set, GDK_KP_Up, 0, GTK_SCROLL_STEP_UP);
add_spin_binding (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_DOWN);
add_spin_binding (binding_set, GDK_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
add_spin_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_spin_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
add_spin_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
add_spin_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
add_spin_binding (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_STEP_UP);
add_spin_binding (binding_set, GDK_KEY_KP_Up, 0, GTK_SCROLL_STEP_UP);
add_spin_binding (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_STEP_DOWN);
add_spin_binding (binding_set, GDK_KEY_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
add_spin_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_spin_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
add_spin_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
g_type_class_add_private (class, sizeof (GtkSpinButtonPrivate));
}

10
gtk/gtkstatusicon.c
View File

@ -1702,11 +1702,11 @@ gtk_status_icon_key_press (GtkStatusIcon *status_icon,
state = event->state & gtk_accelerator_get_default_mod_mask ();
keyval = event->keyval;
if (state == 0 &&
(keyval == GDK_Return ||
keyval == GDK_KP_Enter ||
keyval == GDK_ISO_Enter ||
keyval == GDK_space ||
keyval == GDK_KP_Space))
(keyval == GDK_KEY_Return ||
keyval == GDK_KEY_KP_Enter ||
keyval == GDK_KEY_ISO_Enter ||
keyval == GDK_KEY_space ||
keyval == GDK_KEY_KP_Space))
{
emit_activate_signal (status_icon);
return TRUE;

130
gtk/gtktextview.c
View File

@ -1135,206 +1135,206 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
binding_set = gtk_binding_set_by_class (klass);
/* Moving the insertion point */
add_move_binding (binding_set, GDK_Right, 0,
add_move_binding (binding_set, GDK_KEY_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_KP_Right, 0,
add_move_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
add_move_binding (binding_set, GDK_Left, 0,
add_move_binding (binding_set, GDK_KEY_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_KP_Left, 0,
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_Up, 0,
add_move_binding (binding_set, GDK_KEY_Up, 0,
GTK_MOVEMENT_DISPLAY_LINES, -1);
add_move_binding (binding_set, GDK_KP_Up, 0,
add_move_binding (binding_set, GDK_KEY_KP_Up, 0,
GTK_MOVEMENT_DISPLAY_LINES, -1);
add_move_binding (binding_set, GDK_Down, 0,
add_move_binding (binding_set, GDK_KEY_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
add_move_binding (binding_set, GDK_KP_Down, 0,
add_move_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
add_move_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK,
GTK_MOVEMENT_PARAGRAPHS, -1);
add_move_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK,
GTK_MOVEMENT_PARAGRAPHS, -1);
add_move_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK,
GTK_MOVEMENT_PARAGRAPHS, 1);
add_move_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK,
GTK_MOVEMENT_PARAGRAPHS, 1);
add_move_binding (binding_set, GDK_Home, 0,
add_move_binding (binding_set, GDK_KEY_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_KP_Home, 0,
add_move_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_End, 0,
add_move_binding (binding_set, GDK_KEY_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_KP_End, 0,
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_Page_Up, 0,
add_move_binding (binding_set, GDK_KEY_Page_Up, 0,
GTK_MOVEMENT_PAGES, -1);
add_move_binding (binding_set, GDK_KP_Page_Up, 0,
add_move_binding (binding_set, GDK_KEY_KP_Page_Up, 0,
GTK_MOVEMENT_PAGES, -1);
add_move_binding (binding_set, GDK_Page_Down, 0,
add_move_binding (binding_set, GDK_KEY_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
add_move_binding (binding_set, GDK_KP_Page_Down, 0,
add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
add_move_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
add_move_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_CONTROL_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
add_move_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
add_move_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
add_move_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_CONTROL_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
/* Select all */
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
/* Unselect all */
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
"backspace", 0);
/* Make this do the same as Backspace, to help with mis-typing */
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
"backspace", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, 0,
"toggle-overwrite", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0,
"toggle-overwrite", 0);
/* Caret mode */
gtk_binding_entry_add_signal (binding_set, GDK_F7, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F7, 0,
"toggle-cursor-visible", 0);
/* Control-tab focus motion */
gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_CONTROL_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_CONTROL_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
@ -4415,9 +4415,9 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
}
/* use overall editability not can_insert, more predictable for users */
else if (priv->editable &&
(event->keyval == GDK_Return ||
event->keyval == GDK_ISO_Enter ||
event->keyval == GDK_KP_Enter))
(event->keyval == GDK_KEY_Return ||
event->keyval == GDK_KEY_ISO_Enter ||
event->keyval == GDK_KEY_KP_Enter))
{
/* this won't actually insert the newline if the cursor isn't
* editable
@ -4429,9 +4429,9 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
retval = TRUE;
}
/* Pass through Tab as literal tab, unless Control is held down */
else if ((event->keyval == GDK_Tab ||
event->keyval == GDK_KP_Tab ||
event->keyval == GDK_ISO_Left_Tab) &&
else if ((event->keyval == GDK_KEY_Tab ||
event->keyval == GDK_KEY_KP_Tab ||
event->keyval == GDK_KEY_ISO_Left_Tab) &&
!(event->state & GDK_CONTROL_MASK))
{
/* If the text widget isn't editable overall, or if the application

22
gtk/gtktoolbar.c
View File

@ -298,7 +298,7 @@ add_arrow_bindings (GtkBindingSet *binding_set,
guint keysym,
GtkDirectionType dir)
{
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, 0,
"move-focus", 1,
@ -314,11 +314,11 @@ add_ctrl_tab_bindings (GtkBindingSet *binding_set,
GtkDirectionType direction)
{
gtk_binding_entry_add_signal (binding_set,
GDK_Tab, GDK_CONTROL_MASK | modifiers,
GDK_KEY_Tab, GDK_CONTROL_MASK | modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Tab, GDK_CONTROL_MASK | modifiers,
GDK_KEY_KP_Tab, GDK_CONTROL_MASK | modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@ -581,21 +581,21 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
binding_set = gtk_binding_set_by_class (klass);
add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
add_arrow_bindings (binding_set, GDK_KEY_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_KEY_Right, GTK_DIR_RIGHT);
add_arrow_bindings (binding_set, GDK_KEY_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_KEY_Down, GTK_DIR_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, 0,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, 0,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);

172
gtk/gtktreeview.c
View File

@ -1098,217 +1098,217 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_TYPE_BOOLEAN, 0);
/* Key bindings */
gtk_tree_view_add_move_binding (binding_set, GDK_Up, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Up, 0, TRUE,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_Up, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Up, 0, TRUE,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_Down, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Down, 0, TRUE,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_Down, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Down, 0, TRUE,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK, FALSE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_p, GDK_CONTROL_MASK, FALSE,
GTK_MOVEMENT_DISPLAY_LINES, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK, FALSE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_n, GDK_CONTROL_MASK, FALSE,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_Home, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Home, 0, TRUE,
GTK_MOVEMENT_BUFFER_ENDS, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_Home, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Home, 0, TRUE,
GTK_MOVEMENT_BUFFER_ENDS, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_End, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_End, 0, TRUE,
GTK_MOVEMENT_BUFFER_ENDS, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_End, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_End, 0, TRUE,
GTK_MOVEMENT_BUFFER_ENDS, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_Page_Up, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Page_Up, 0, TRUE,
GTK_MOVEMENT_PAGES, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_Page_Up, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Page_Up, 0, TRUE,
GTK_MOVEMENT_PAGES, -1);
gtk_tree_view_add_move_binding (binding_set, GDK_Page_Down, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Page_Down, 0, TRUE,
GTK_MOVEMENT_PAGES, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_KP_Page_Down, 0, TRUE,
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0, TRUE,
GTK_MOVEMENT_PAGES, 1);
gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "move-cursor", 2,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "move-cursor", 2,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, "move-cursor", 2,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, "move-cursor", 2,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, "move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK, "select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK, "select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK, "select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_A, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK, "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_A, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK, "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_SHIFT_MASK, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SHIFT_MASK, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_SHIFT_MASK, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_SHIFT_MASK, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "select-cursor-row", 1,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
/* expand and collapse rows */
gtk_binding_entry_add_signal (binding_set, GDK_plus, 0, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_plus, 0, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_asterisk, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_asterisk, 0,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Multiply, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Multiply, 0,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Divide, 0,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE);
/* Not doable on US keyboards */
gtk_binding_entry_add_signal (binding_set, GDK_plus, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_plus, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Add, 0, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Add, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Add, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Right,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right,
GDK_CONTROL_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right,
GDK_CONTROL_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_minus, 0, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_minus, 0, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_minus, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Subtract, 0, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Subtract, GDK_SHIFT_MASK, "expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Left,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left,
GDK_CONTROL_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left,
GDK_CONTROL_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "select-cursor-parent", 0);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK, "select-cursor-parent", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0, "select-cursor-parent", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK, "select-cursor-parent", 0);
gtk_binding_entry_add_signal (binding_set, GDK_f, GDK_CONTROL_MASK, "start-interactive-search", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_f, GDK_CONTROL_MASK, "start-interactive-search", 0);
gtk_binding_entry_add_signal (binding_set, GDK_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
g_type_class_add_private (o_class, sizeof (GtkTreeViewPrivate));
}
@ -5332,7 +5332,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (tree_view->priv->rubber_band_status)
{
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
gtk_tree_view_stop_rubber_band (tree_view);
return TRUE;
@ -5340,7 +5340,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
{
if (event->keyval == GDK_Escape)
if (event->keyval == GDK_KEY_Escape)
{
tree_view->priv->cur_reorder = NULL;
gtk_tree_view_button_release_drag_column (widget, NULL);
@ -5367,8 +5367,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (focus_column &&
(event->state & GDK_SHIFT_MASK) && (event->state & GDK_MOD1_MASK) &&
(event->keyval == GDK_Left || event->keyval == GDK_KP_Left
|| event->keyval == GDK_Right || event->keyval == GDK_KP_Right))
(event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right))
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
@ -5378,8 +5378,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
return TRUE;
}
if (event->keyval == (rtl ? GDK_Right : GDK_Left)
|| event->keyval == (rtl ? GDK_KP_Right : GDK_KP_Left))
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{
GtkRequisition button_req;
gint old_width = column->resized_width;
@ -5412,8 +5412,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
else
gtk_widget_error_bell (widget);
}
else if (event->keyval == (rtl ? GDK_Left : GDK_Right)
|| event->keyval == (rtl ? GDK_KP_Left : GDK_KP_Right))
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{
gint old_width = column->resized_width;
@ -5438,15 +5438,15 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (focus_column &&
(event->state & GDK_MOD1_MASK) &&
(event->keyval == GDK_Left || event->keyval == GDK_KP_Left
|| event->keyval == GDK_Right || event->keyval == GDK_KP_Right
|| event->keyval == GDK_Home || event->keyval == GDK_KP_Home
|| event->keyval == GDK_End || event->keyval == GDK_KP_End))
(event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right
|| event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_KP_Home
|| event->keyval == GDK_KEY_End || event->keyval == GDK_KEY_KP_End))
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
if (event->keyval == (rtl ? GDK_Right : GDK_Left)
|| event->keyval == (rtl ? GDK_KP_Right : GDK_KP_Left))
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{
GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_LEFT);
@ -5455,8 +5455,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
else
gtk_widget_error_bell (widget);
}
else if (event->keyval == (rtl ? GDK_Left : GDK_Right)
|| event->keyval == (rtl ? GDK_KP_Left : GDK_KP_Right))
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{
GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_RIGHT);
@ -5465,7 +5465,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
else
gtk_widget_error_bell (widget);
}
else if (event->keyval == GDK_Home || event->keyval == GDK_KP_Home)
else if (event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_KP_Home)
{
GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_HOME);
@ -5474,7 +5474,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
else
gtk_widget_error_bell (widget);
}
else if (event->keyval == GDK_End || event->keyval == GDK_KP_End)
else if (event->keyval == GDK_KEY_End || event->keyval == GDK_KEY_KP_End)
{
GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_END);
@ -14439,10 +14439,10 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
/* close window and cancel the search */
if (!tree_view->priv->search_custom_entry_set
&& (event->keyval == GDK_Escape ||
event->keyval == GDK_Tab ||
event->keyval == GDK_KP_Tab ||
event->keyval == GDK_ISO_Left_Tab))
&& (event->keyval == GDK_KEY_Escape ||
event->keyval == GDK_KEY_Tab ||
event->keyval == GDK_KEY_KP_Tab ||
event->keyval == GDK_KEY_ISO_Left_Tab))
{
gtk_tree_view_search_dialog_hide (widget, tree_view,
gdk_event_get_device ((GdkEvent *) event));
@ -14450,7 +14450,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
}
/* select previous matching iter */
if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up)
{
if (!gtk_tree_view_search_move (widget, tree_view, TRUE))
gtk_widget_error_bell (widget);
@ -14459,7 +14459,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
}
if (((event->state & (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK)) == (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK))
&& (event->keyval == GDK_g || event->keyval == GDK_G))
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
if (!gtk_tree_view_search_move (widget, tree_view, TRUE))
gtk_widget_error_bell (widget);
@ -14468,7 +14468,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
}
/* select next matching iter */
if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down)
{
if (!gtk_tree_view_search_move (widget, tree_view, FALSE))
gtk_widget_error_bell (widget);
@ -14477,7 +14477,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
}
if (((event->state & (GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK)) == GTK_DEFAULT_ACCEL_MOD_MASK)
&& (event->keyval == GDK_g || event->keyval == GDK_G))
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
if (!gtk_tree_view_search_move (widget, tree_view, FALSE))
gtk_widget_error_bell (widget);

12
gtk/gtkwidget.c
View File

@ -2469,24 +2469,24 @@ gtk_widget_class_init (GtkWidgetClass *klass)
G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_F10, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F10, GDK_SHIFT_MASK,
"popup-menu", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Menu, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Menu, 0,
"popup-menu", 0);
gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F1, GDK_CONTROL_MASK,
"show-help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_TOOLTIP);
gtk_binding_entry_add_signal (binding_set, GDK_KP_F1, GDK_CONTROL_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_F1, GDK_CONTROL_MASK,
"show-help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_TOOLTIP);
gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_F1, GDK_SHIFT_MASK,
"show-help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_WHATS_THIS);
gtk_binding_entry_add_signal (binding_set, GDK_KP_F1, GDK_SHIFT_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_F1, GDK_SHIFT_MASK,
"show-help", 1,
GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_WHATS_THIS);

32
gtk/gtkwindow.c
View File

@ -413,10 +413,10 @@ add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers,
GtkDirectionType direction)
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@ -426,7 +426,7 @@ add_arrow_bindings (GtkBindingSet *binding_set,
guint keysym,
GtkDirectionType direction)
{
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, 0,
"move-focus", 1,
@ -907,22 +907,22 @@ gtk_window_class_init (GtkWindowClass *klass)
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
"activate-focus", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0,
"activate-focus", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"activate-default", 0);
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"activate-default", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"activate-default", 0);
add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
add_arrow_bindings (binding_set, GDK_KEY_Up, GTK_DIR_UP);
add_arrow_bindings (binding_set, GDK_KEY_Down, GTK_DIR_DOWN);
add_arrow_bindings (binding_set, GDK_KEY_Left, GTK_DIR_LEFT);
add_arrow_bindings (binding_set, GDK_KEY_Right, GTK_DIR_RIGHT);
add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
@ -5129,8 +5129,8 @@ _gtk_window_query_nonaccels (GtkWindow *window,
if (!accel_mods)
{
static const guint bindings[] = {
GDK_space, GDK_KP_Space, GDK_Return, GDK_ISO_Enter, GDK_KP_Enter, GDK_Up, GDK_KP_Up, GDK_Down, GDK_KP_Down,
GDK_Left, GDK_KP_Left, GDK_Right, GDK_KP_Right, GDK_Tab, GDK_KP_Tab, GDK_ISO_Left_Tab,
GDK_KEY_space, GDK_KEY_KP_Space, GDK_KEY_Return, GDK_KEY_ISO_Enter, GDK_KEY_KP_Enter, GDK_KEY_Up, GDK_KEY_KP_Up, GDK_KEY_Down, GDK_KEY_KP_Down,
GDK_KEY_Left, GDK_KEY_KP_Left, GDK_KEY_Right, GDK_KEY_KP_Right, GDK_KEY_Tab, GDK_KEY_KP_Tab, GDK_KEY_ISO_Left_Tab,
};
guint i;
@ -8511,8 +8511,8 @@ add_to_key_hash (GtkWindow *window,
*/
if (modifiers & GDK_SHIFT_MASK)
{
if (keyval == GDK_Tab)
keyval = GDK_ISO_Left_Tab;
if (keyval == GDK_KEY_Tab)
keyval = GDK_KEY_ISO_Left_Tab;
else
keyval = gdk_keyval_to_upper (keyval);
}

2
gtk/tests/testing.c
View File

@ -62,7 +62,7 @@ test_button_keys (void)
g_assert (button != NULL);
gtk_widget_grab_focus (button);
g_assert (gtk_widget_has_focus (button));
simsuccess = gtk_test_widget_send_key (button, GDK_Return, 0);
simsuccess = gtk_test_widget_send_key (button, GDK_KEY_Return, 0);
g_assert (simsuccess == TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();

2
modules/input/gtkimcontextmultipress.c
View File

@ -410,7 +410,7 @@ load_config (GtkImContextMultipress *self)
keyval = gdk_keyval_from_name (keys[i]);
if (keyval == GDK_VoidSymbol)
if (keyval == GDK_KEY_VoidSymbol)
{
g_warning ("Error while trying to read the %s configuration file: "
"invalid key name \"%s\"",

36
modules/input/gtkimcontextthai.c
View File

@ -111,31 +111,31 @@ static gboolean
is_context_lost_key(guint keyval)
{
return ((keyval & 0xFF00) == 0xFF00) &&
(keyval == GDK_BackSpace ||
keyval == GDK_Tab ||
keyval == GDK_Linefeed ||
keyval == GDK_Clear ||
keyval == GDK_Return ||
keyval == GDK_Pause ||
keyval == GDK_Scroll_Lock ||
keyval == GDK_Sys_Req ||
keyval == GDK_Escape ||
keyval == GDK_Delete ||
(GDK_Home <= keyval && keyval <= GDK_Begin) || /* IsCursorkey */
(GDK_KP_Space <= keyval && keyval <= GDK_KP_Delete) || /* IsKeypadKey, non-chars only */
(GDK_Select <= keyval && keyval <= GDK_Break) || /* IsMiscFunctionKey */
(GDK_F1 <= keyval && keyval <= GDK_F35)); /* IsFunctionKey */
(keyval == GDK_KEY_BackSpace ||
keyval == GDK_KEY_Tab ||
keyval == GDK_KEY_Linefeed ||
keyval == GDK_KEY_Clear ||
keyval == GDK_KEY_Return ||
keyval == GDK_KEY_Pause ||
keyval == GDK_KEY_Scroll_Lock ||
keyval == GDK_KEY_Sys_Req ||
keyval == GDK_KEY_Escape ||
keyval == GDK_KEY_Delete ||
(GDK_KEY_Home <= keyval && keyval <= GDK_KEY_Begin) || /* IsCursorkey */
(GDK_KEY_KP_Space <= keyval && keyval <= GDK_KEY_KP_Delete) || /* IsKeypadKey, non-chars only */
(GDK_KEY_Select <= keyval && keyval <= GDK_KEY_Break) || /* IsMiscFunctionKey */
(GDK_KEY_F1 <= keyval && keyval <= GDK_KEY_F35)); /* IsFunctionKey */
}
static gboolean
is_context_intact_key(guint keyval)
{
return (((keyval & 0xFF00) == 0xFF00) &&
((GDK_Shift_L <= keyval && keyval <= GDK_Hyper_R) || /* IsModifierKey */
(keyval == GDK_Mode_switch) ||
(keyval == GDK_Num_Lock))) ||
((GDK_KEY_Shift_L <= keyval && keyval <= GDK_KEY_Hyper_R) || /* IsModifierKey */
(keyval == GDK_KEY_Mode_switch) ||
(keyval == GDK_KEY_Num_Lock))) ||
(((keyval & 0xFE00) == 0xFE00) &&
(GDK_ISO_Lock <= keyval && keyval <= GDK_ISO_Last_Group_Lock));
(GDK_KEY_ISO_Lock <= keyval && keyval <= GDK_KEY_ISO_Last_Group_Lock));
}
static gboolean

8
modules/input/imam-et.c
View File

@ -140,8 +140,8 @@ am_et_register_type (GTypeModule *module)
static guint16 am_et_compose_seqs[] = {
/* do punctuation and numerals here */
'\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_apostrophe,
'\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe,
'\'', '1', 0, 0, 0, 0, 0x1369,
'\'', '1', '0', 0, 0, 0, 0x1372,
'\'', '1', '0', '0', 0, 0, 0x137b,
@ -431,8 +431,8 @@ static guint16 am_et_compose_seqs[] = {
SYLW('x', 0x1238)
SYL('y', 0x12e8)
SYLW('z', 0x12d8)
GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
};
static void

12
modules/input/imcedilla.c
View File

@ -65,12 +65,12 @@ cedilla_register_type (GTypeModule *module)
* used extensively.
*/
static guint16 cedilla_compose_seqs[] = {
GDK_dead_acute, GDK_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_dead_acute, GDK_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
GDK_Multi_key, GDK_apostrophe, GDK_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_Multi_key, GDK_apostrophe, GDK_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
GDK_Multi_key, GDK_C, GDK_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_Multi_key, GDK_c, GDK_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
GDK_KEY_dead_acute, GDK_KEY_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_KEY_dead_acute, GDK_KEY_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
GDK_KEY_Multi_key, GDK_KEY_C, GDK_KEY_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
GDK_KEY_Multi_key, GDK_KEY_c, GDK_KEY_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
};
static void

268
modules/input/imcyrillic-translit.c
View File

@ -62,140 +62,140 @@ cyrillic_translit_register_type (GTypeModule *module)
* in iso-8859-5
*/
static guint16 cyrillic_compose_seqs[] = {
GDK_apostrophe, 0, 0, 0, 0, 0x44C, /* CYRILLIC SMALL LETTER SOFT SIGN */
GDK_apostrophe, GDK_apostrophe, 0, 0, 0, 0x42C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
GDK_slash, GDK_C, GDK_H, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
GDK_slash, GDK_C, GDK_h, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
GDK_slash, GDK_D, 0, 0, 0, 0x0402, /* CYRILLIC CAPITAL LETTER DJE */
GDK_slash, GDK_E, 0, 0, 0, 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
GDK_slash, GDK_G, 0, 0, 0, 0x0403, /* CYRILLIC CAPITAL LETTER GJE */
GDK_slash, GDK_I, 0, 0, 0, 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
GDK_slash, GDK_J, 0, 0, 0, 0x0408, /* CYRILLIC CAPITAL LETTER JE */
GDK_slash, GDK_K, 0, 0, 0, 0x040C, /* CYRILLIC CAPITAL LETTER KJE */
GDK_slash, GDK_L, 0, 0, 0, 0x0409, /* CYRILLIC CAPITAL LETTER LJE */
GDK_slash, GDK_N, 0, 0, 0, 0x040A, /* CYRILLIC CAPITAL LETTER NJE */
GDK_slash, GDK_S, 0, 0, 0, 0x0405, /* CYRILLIC CAPITAL LETTER DZE */
GDK_slash, GDK_S, GDK_H, GDK_T, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_slash, GDK_S, GDK_H, GDK_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_slash, GDK_S, GDK_h, GDK_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_slash, GDK_T, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_slash, GDK_Z, 0, 0, 0, 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */
GDK_slash, GDK_c, GDK_h, 0, 0, 0x045B, /* CYRILLIC SMALL LETTER TSHE */
GDK_slash, GDK_d, 0, 0, 0, 0x0452, /* CYRILLIC SMALL LETTER DJE */
GDK_slash, GDK_e, 0, 0, 0, 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
GDK_slash, GDK_g, 0, 0, 0, 0x0453, /* CYRILLIC SMALL LETTER GJE */
GDK_slash, GDK_i, 0, 0, 0, 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
GDK_slash, GDK_j, 0, 0, 0, 0x0458, /* CYRILLIC SMALL LETTER JE */
GDK_slash, GDK_k, 0, 0, 0, 0x045C, /* CYRILLIC SMALL LETTER KJE */
GDK_slash, GDK_l, 0, 0, 0, 0x0459, /* CYRILLIC SMALL LETTER LJE */
GDK_slash, GDK_n, 0, 0, 0, 0x045A, /* CYRILLIC SMALL LETTER NJE */
GDK_slash, GDK_s, 0, 0, 0, 0x0455, /* CYRILLIC SMALL LETTER DZE */
GDK_slash, GDK_s, GDK_h, GDK_t, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */
GDK_slash, GDK_t, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */
GDK_slash, GDK_z, 0, 0, 0, 0x045F, /* CYRILLIC SMALL LETTER DZHE */
GDK_A, 0, 0, 0, 0, 0x0410, /* CYRILLIC CAPITAL LETTER A */
GDK_B, 0, 0, 0, 0, 0x0411, /* CYRILLIC CAPITAL LETTER BE */
GDK_C, 0, 0, 0, 0, 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
GDK_C, GDK_H, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
GDK_C, GDK_h, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
GDK_D, 0, 0, 0, 0, 0x0414, /* CYRILLIC CAPITAL LETTER DE */
GDK_E, 0, 0, 0, 0, 0x0415, /* CYRILLIC CAPITAL LETTER IE */
GDK_E, GDK_apostrophe, 0, 0, 0, 0x042D, /* CYRILLIC CAPITAL LETTER E */
GDK_F, 0, 0, 0, 0, 0x0424, /* CYRILLIC CAPITAL LETTER EF */
GDK_G, 0, 0, 0, 0, 0x0413, /* CYRILLIC CAPITAL LETTER GE */
GDK_H, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_I, 0, 0, 0, 0, 0x0418, /* CYRILLIC CAPITAL LETTER I */
GDK_J, 0, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
GDK_J, GDK_apostrophe, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
GDK_J, GDK_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_J, GDK_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_J, GDK_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_J, GDK_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */
GDK_J, GDK_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_J, GDK_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_J, GDK_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_J, GDK_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */
GDK_K, 0, 0, 0, 0, 0x041A, /* CYRILLIC CAPITAL LETTER KA */
GDK_K, GDK_H, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_L, 0, 0, 0, 0, 0x041B, /* CYRILLIC CAPITAL LETTER EL */
GDK_M, 0, 0, 0, 0, 0x041C, /* CYRILLIC CAPITAL LETTER EM */
GDK_N, 0, 0, 0, 0, 0x041D, /* CYRILLIC CAPITAL LETTER EN */
GDK_O, 0, 0, 0, 0, 0x041E, /* CYRILLIC CAPITAL LETTER O */
GDK_P, 0, 0, 0, 0, 0x041F, /* CYRILLIC CAPITAL LETTER PE */
GDK_Q, 0, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_R, 0, 0, 0, 0, 0x0420, /* CYRILLIC CAPITAL LETTER ER */
GDK_S, 0, 0, 0, 0, 0x0421, /* CYRILLIC CAPITAL LETTER ES */
GDK_S, GDK_H, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
GDK_S, GDK_H, GDK_C, GDK_H, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_S, GDK_H, GDK_C, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_S, GDK_H, GDK_c, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_S, GDK_H, GDK_c, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_S, GDK_J, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_S, GDK_h, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
GDK_S, GDK_j, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_T, 0, 0, 0, 0, 0x0422, /* CYRILLIC CAPITAL LETTER TE */
GDK_U, 0, 0, 0, 0, 0x0423, /* CYRILLIC CAPITAL LETTER U */
GDK_U, GDK_apostrophe, 0, 0, 0, 0x040E, /* CYRILLIC CAPITAL LETTER SHORT */
GDK_V, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */
GDK_W, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */
GDK_X, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_Y, 0, 0, 0, 0, 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
GDK_Y, GDK_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_Y, GDK_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_Y, GDK_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_Y, GDK_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */
GDK_Y, GDK_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_Y, GDK_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_Y, GDK_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_Y, GDK_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */
GDK_Z, 0, 0, 0, 0, 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
GDK_Z, GDK_H, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
GDK_Z, GDK_h, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
GDK_a, 0, 0, 0, 0, 0x0430, /* CYRILLIC SMALL LETTER A */
GDK_b, 0, 0, 0, 0, 0x0431, /* CYRILLIC SMALL LETTER BE */
GDK_c, 0, 0, 0, 0, 0x0446, /* CYRILLIC SMALL LETTER TSE */
GDK_c, GDK_h, 0, 0, 0, 0x0447, /* CYRILLIC SMALL LETTER CHE */
GDK_d, 0, 0, 0, 0, 0x0434, /* CYRILLIC SMALL LETTER DE */
GDK_e, 0, 0, 0, 0, 0x0435, /* CYRILLIC SMALL LETTER IE */
GDK_e, GDK_apostrophe, 0, 0, 0, 0x044D, /* CYRILLIC SMALL LETTER E */
GDK_f, 0, 0, 0, 0, 0x0444, /* CYRILLIC SMALL LETTER EF */
GDK_g, 0, 0, 0, 0, 0x0433, /* CYRILLIC SMALL LETTER GE */
GDK_h, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_i, 0, 0, 0, 0, 0x0438, /* CYRILLIC SMALL LETTER I */
GDK_j, 0, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
GDK_j, GDK_apostrophe, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
GDK_j, GDK_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */
GDK_j, GDK_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */
GDK_j, GDK_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */
GDK_j, GDK_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */
GDK_k, 0, 0, 0, 0, 0x043A, /* CYRILLIC SMALL LETTER KA */
GDK_k, GDK_h, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_l, 0, 0, 0, 0, 0x043B, /* CYRILLIC SMALL LETTER EL */
GDK_m, 0, 0, 0, 0, 0x043C, /* CYRILLIC SMALL LETTER EM */
GDK_n, 0, 0, 0, 0, 0x043D, /* CYRILLIC SMALL LETTER EN */
GDK_o, 0, 0, 0, 0, 0x043E, /* CYRILLIC SMALL LETTER O */
GDK_p, 0, 0, 0, 0, 0x043F, /* CYRILLIC SMALL LETTER PE */
GDK_q, 0, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YA */
GDK_r, 0, 0, 0, 0, 0x0440, /* CYRILLIC SMALL LETTER ER */
GDK_s, 0, 0, 0, 0, 0x0441, /* CYRILLIC SMALL LETTER ES */
GDK_s, GDK_h, 0, 0, 0, 0x0448, /* CYRILLIC SMALL LETTER SHA */
GDK_s, GDK_h, GDK_c, GDK_h, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */
GDK_s, GDK_j, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */
GDK_t, 0, 0, 0, 0, 0x0442, /* CYRILLIC SMALL LETTER TE */
GDK_u, 0, 0, 0, 0, 0x0443, /* CYRILLIC SMALL LETTER U */
GDK_u, GDK_apostrophe, 0, 0, 0, 0x045E, /* CYRILLIC SMALL LETTER SHORT */
GDK_v, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */
GDK_w, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */
GDK_x, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_y, 0, 0, 0, 0, 0x044B, /* CYRILLIC SMALL LETTER YERU */
GDK_y, GDK_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */
GDK_y, GDK_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */
GDK_y, GDK_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */
GDK_y, GDK_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */
GDK_z, 0, 0, 0, 0, 0x0437, /* CYRILLIC SMALL LETTER ZE */
GDK_z, GDK_h, 0, 0, 0, 0x0436, /* CYRILLIC SMALL LETTER ZHE */
GDK_asciitilde, 0, 0, 0, 0, 0x44A, /* CYRILLIC SMALL LETTER HARD SIGN */
GDK_asciitilde, GDK_asciitilde, 0, 0, 0, 0x42A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
GDK_KEY_apostrophe, 0, 0, 0, 0, 0x44C, /* CYRILLIC SMALL LETTER SOFT SIGN */
GDK_KEY_apostrophe, GDK_KEY_apostrophe, 0, 0, 0, 0x42C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
GDK_KEY_slash, GDK_KEY_C, GDK_KEY_H, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
GDK_KEY_slash, GDK_KEY_C, GDK_KEY_h, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
GDK_KEY_slash, GDK_KEY_D, 0, 0, 0, 0x0402, /* CYRILLIC CAPITAL LETTER DJE */
GDK_KEY_slash, GDK_KEY_E, 0, 0, 0, 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
GDK_KEY_slash, GDK_KEY_G, 0, 0, 0, 0x0403, /* CYRILLIC CAPITAL LETTER GJE */
GDK_KEY_slash, GDK_KEY_I, 0, 0, 0, 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
GDK_KEY_slash, GDK_KEY_J, 0, 0, 0, 0x0408, /* CYRILLIC CAPITAL LETTER JE */
GDK_KEY_slash, GDK_KEY_K, 0, 0, 0, 0x040C, /* CYRILLIC CAPITAL LETTER KJE */
GDK_KEY_slash, GDK_KEY_L, 0, 0, 0, 0x0409, /* CYRILLIC CAPITAL LETTER LJE */
GDK_KEY_slash, GDK_KEY_N, 0, 0, 0, 0x040A, /* CYRILLIC CAPITAL LETTER NJE */
GDK_KEY_slash, GDK_KEY_S, 0, 0, 0, 0x0405, /* CYRILLIC CAPITAL LETTER DZE */
GDK_KEY_slash, GDK_KEY_S, GDK_KEY_H, GDK_KEY_T, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_S, GDK_KEY_H, GDK_KEY_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_S, GDK_KEY_h, GDK_KEY_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_T, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_Z, 0, 0, 0, 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */
GDK_KEY_slash, GDK_KEY_c, GDK_KEY_h, 0, 0, 0x045B, /* CYRILLIC SMALL LETTER TSHE */
GDK_KEY_slash, GDK_KEY_d, 0, 0, 0, 0x0452, /* CYRILLIC SMALL LETTER DJE */
GDK_KEY_slash, GDK_KEY_e, 0, 0, 0, 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
GDK_KEY_slash, GDK_KEY_g, 0, 0, 0, 0x0453, /* CYRILLIC SMALL LETTER GJE */
GDK_KEY_slash, GDK_KEY_i, 0, 0, 0, 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
GDK_KEY_slash, GDK_KEY_j, 0, 0, 0, 0x0458, /* CYRILLIC SMALL LETTER JE */
GDK_KEY_slash, GDK_KEY_k, 0, 0, 0, 0x045C, /* CYRILLIC SMALL LETTER KJE */
GDK_KEY_slash, GDK_KEY_l, 0, 0, 0, 0x0459, /* CYRILLIC SMALL LETTER LJE */
GDK_KEY_slash, GDK_KEY_n, 0, 0, 0, 0x045A, /* CYRILLIC SMALL LETTER NJE */
GDK_KEY_slash, GDK_KEY_s, 0, 0, 0, 0x0455, /* CYRILLIC SMALL LETTER DZE */
GDK_KEY_slash, GDK_KEY_s, GDK_KEY_h, GDK_KEY_t, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_t, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */
GDK_KEY_slash, GDK_KEY_z, 0, 0, 0, 0x045F, /* CYRILLIC SMALL LETTER DZHE */
GDK_KEY_A, 0, 0, 0, 0, 0x0410, /* CYRILLIC CAPITAL LETTER A */
GDK_KEY_B, 0, 0, 0, 0, 0x0411, /* CYRILLIC CAPITAL LETTER BE */
GDK_KEY_C, 0, 0, 0, 0, 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
GDK_KEY_C, GDK_KEY_H, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
GDK_KEY_C, GDK_KEY_h, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
GDK_KEY_D, 0, 0, 0, 0, 0x0414, /* CYRILLIC CAPITAL LETTER DE */
GDK_KEY_E, 0, 0, 0, 0, 0x0415, /* CYRILLIC CAPITAL LETTER IE */
GDK_KEY_E, GDK_KEY_apostrophe, 0, 0, 0, 0x042D, /* CYRILLIC CAPITAL LETTER E */
GDK_KEY_F, 0, 0, 0, 0, 0x0424, /* CYRILLIC CAPITAL LETTER EF */
GDK_KEY_G, 0, 0, 0, 0, 0x0413, /* CYRILLIC CAPITAL LETTER GE */
GDK_KEY_H, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_KEY_I, 0, 0, 0, 0, 0x0418, /* CYRILLIC CAPITAL LETTER I */
GDK_KEY_J, 0, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
GDK_KEY_J, GDK_KEY_apostrophe, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
GDK_KEY_J, GDK_KEY_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_J, GDK_KEY_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_KEY_J, GDK_KEY_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_KEY_J, GDK_KEY_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_J, GDK_KEY_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_J, GDK_KEY_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_KEY_J, GDK_KEY_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_KEY_J, GDK_KEY_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_K, 0, 0, 0, 0, 0x041A, /* CYRILLIC CAPITAL LETTER KA */
GDK_KEY_K, GDK_KEY_H, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_KEY_L, 0, 0, 0, 0, 0x041B, /* CYRILLIC CAPITAL LETTER EL */
GDK_KEY_M, 0, 0, 0, 0, 0x041C, /* CYRILLIC CAPITAL LETTER EM */
GDK_KEY_N, 0, 0, 0, 0, 0x041D, /* CYRILLIC CAPITAL LETTER EN */
GDK_KEY_O, 0, 0, 0, 0, 0x041E, /* CYRILLIC CAPITAL LETTER O */
GDK_KEY_P, 0, 0, 0, 0, 0x041F, /* CYRILLIC CAPITAL LETTER PE */
GDK_KEY_Q, 0, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_R, 0, 0, 0, 0, 0x0420, /* CYRILLIC CAPITAL LETTER ER */
GDK_KEY_S, 0, 0, 0, 0, 0x0421, /* CYRILLIC CAPITAL LETTER ES */
GDK_KEY_S, GDK_KEY_H, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
GDK_KEY_S, GDK_KEY_H, GDK_KEY_C, GDK_KEY_H, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_S, GDK_KEY_H, GDK_KEY_C, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_S, GDK_KEY_H, GDK_KEY_c, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_S, GDK_KEY_H, GDK_KEY_c, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_S, GDK_KEY_J, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_S, GDK_KEY_h, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
GDK_KEY_S, GDK_KEY_j, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */
GDK_KEY_T, 0, 0, 0, 0, 0x0422, /* CYRILLIC CAPITAL LETTER TE */
GDK_KEY_U, 0, 0, 0, 0, 0x0423, /* CYRILLIC CAPITAL LETTER U */
GDK_KEY_U, GDK_KEY_apostrophe, 0, 0, 0, 0x040E, /* CYRILLIC CAPITAL LETTER SHORT */
GDK_KEY_V, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */
GDK_KEY_W, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */
GDK_KEY_X, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */
GDK_KEY_Y, 0, 0, 0, 0, 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
GDK_KEY_Y, GDK_KEY_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_Y, GDK_KEY_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_KEY_Y, GDK_KEY_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_KEY_Y, GDK_KEY_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */
GDK_KEY_Y, GDK_KEY_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */
GDK_KEY_Y, GDK_KEY_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */
GDK_KEY_Y, GDK_KEY_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */
GDK_KEY_Y, GDK_KEY_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */
GDK_KEY_Z, 0, 0, 0, 0, 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
GDK_KEY_Z, GDK_KEY_H, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
GDK_KEY_Z, GDK_KEY_h, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
GDK_KEY_a, 0, 0, 0, 0, 0x0430, /* CYRILLIC SMALL LETTER A */
GDK_KEY_b, 0, 0, 0, 0, 0x0431, /* CYRILLIC SMALL LETTER BE */
GDK_KEY_c, 0, 0, 0, 0, 0x0446, /* CYRILLIC SMALL LETTER TSE */
GDK_KEY_c, GDK_KEY_h, 0, 0, 0, 0x0447, /* CYRILLIC SMALL LETTER CHE */
GDK_KEY_d, 0, 0, 0, 0, 0x0434, /* CYRILLIC SMALL LETTER DE */
GDK_KEY_e, 0, 0, 0, 0, 0x0435, /* CYRILLIC SMALL LETTER IE */
GDK_KEY_e, GDK_KEY_apostrophe, 0, 0, 0, 0x044D, /* CYRILLIC SMALL LETTER E */
GDK_KEY_f, 0, 0, 0, 0, 0x0444, /* CYRILLIC SMALL LETTER EF */
GDK_KEY_g, 0, 0, 0, 0, 0x0433, /* CYRILLIC SMALL LETTER GE */
GDK_KEY_h, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_KEY_i, 0, 0, 0, 0, 0x0438, /* CYRILLIC SMALL LETTER I */
GDK_KEY_j, 0, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
GDK_KEY_j, GDK_KEY_apostrophe, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
GDK_KEY_j, GDK_KEY_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */
GDK_KEY_j, GDK_KEY_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */
GDK_KEY_j, GDK_KEY_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */
GDK_KEY_j, GDK_KEY_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */
GDK_KEY_k, 0, 0, 0, 0, 0x043A, /* CYRILLIC SMALL LETTER KA */
GDK_KEY_k, GDK_KEY_h, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_KEY_l, 0, 0, 0, 0, 0x043B, /* CYRILLIC SMALL LETTER EL */
GDK_KEY_m, 0, 0, 0, 0, 0x043C, /* CYRILLIC SMALL LETTER EM */
GDK_KEY_n, 0, 0, 0, 0, 0x043D, /* CYRILLIC SMALL LETTER EN */
GDK_KEY_o, 0, 0, 0, 0, 0x043E, /* CYRILLIC SMALL LETTER O */
GDK_KEY_p, 0, 0, 0, 0, 0x043F, /* CYRILLIC SMALL LETTER PE */
GDK_KEY_q, 0, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YA */
GDK_KEY_r, 0, 0, 0, 0, 0x0440, /* CYRILLIC SMALL LETTER ER */
GDK_KEY_s, 0, 0, 0, 0, 0x0441, /* CYRILLIC SMALL LETTER ES */
GDK_KEY_s, GDK_KEY_h, 0, 0, 0, 0x0448, /* CYRILLIC SMALL LETTER SHA */
GDK_KEY_s, GDK_KEY_h, GDK_KEY_c, GDK_KEY_h, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */
GDK_KEY_s, GDK_KEY_j, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */
GDK_KEY_t, 0, 0, 0, 0, 0x0442, /* CYRILLIC SMALL LETTER TE */
GDK_KEY_u, 0, 0, 0, 0, 0x0443, /* CYRILLIC SMALL LETTER U */
GDK_KEY_u, GDK_KEY_apostrophe, 0, 0, 0, 0x045E, /* CYRILLIC SMALL LETTER SHORT */
GDK_KEY_v, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */
GDK_KEY_w, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */
GDK_KEY_x, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */
GDK_KEY_y, 0, 0, 0, 0, 0x044B, /* CYRILLIC SMALL LETTER YERU */
GDK_KEY_y, GDK_KEY_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */
GDK_KEY_y, GDK_KEY_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */
GDK_KEY_y, GDK_KEY_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */
GDK_KEY_y, GDK_KEY_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */
GDK_KEY_z, 0, 0, 0, 0, 0x0437, /* CYRILLIC SMALL LETTER ZE */
GDK_KEY_z, GDK_KEY_h, 0, 0, 0, 0x0436, /* CYRILLIC SMALL LETTER ZHE */
GDK_KEY_asciitilde, 0, 0, 0, 0, 0x44A, /* CYRILLIC SMALL LETTER HARD SIGN */
GDK_KEY_asciitilde, GDK_KEY_asciitilde, 0, 0, 0, 0x42A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
};
static void

4
modules/input/iminuktitut.c
View File

@ -104,8 +104,8 @@ static guint16 inuktitut_compose_seqs[] = {
SYL('v', 0x1555, 0x155d, 2) /* as f */
SYL('y', 0x1528, 0x153e, 2) /* As j */
SYL(GDK_lstroke, 0x15a0, 0x15a6, 3) /* l- */
SYL(GDK_eng, 0x158f, 0x1595, 3) /* ng */
SYL(GDK_KEY_lstroke, 0x15a0, 0x15a6, 3) /* l- */
SYL(GDK_KEY_eng, 0x158f, 0x1595, 3) /* ng */
};
static void

120
modules/input/imipa.c
View File

@ -62,67 +62,67 @@ ipa_register_type (GTypeModule *module)
* in iso-8859-5
*/
static guint16 ipa_compose_seqs[] = {
GDK_ampersand, 0, 0, 0, 0, 0x263, /* LATIN SMALL LETTER GAMMA */
GDK_apostrophe, 0, 0, 0, 0, 0x2C8, /* MODIFIER LETTER VERTICAL LINE */
GDK_slash, GDK_apostrophe, 0, 0, 0, 0x2CA, /* MODIFIER LETTER ACUTE ACCENT */
GDK_slash, GDK_slash, 0, 0, 0, 0x02F, /* SOLIDUS */
GDK_slash, GDK_3, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */
GDK_slash, GDK_A, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */
GDK_slash, GDK_R, 0, 0, 0, 0x281, /* LATIN LETTER SMALL CAPITAL INVERTED R */
GDK_slash, GDK_a, 0, 0, 0, 0x250, /* LATIN SMALL LETTER TURNED A */
GDK_slash, GDK_c, 0, 0, 0, 0x254, /* LATIN SMALL LETTER OPEN O */
GDK_slash, GDK_e, 0, 0, 0, 0x259, /* LATIN SMALL LETTER SCHWA */
GDK_slash, GDK_h, 0, 0, 0, 0x265, /* LATIN SMALL LETTER TURNED H */
GDK_slash, GDK_m, 0, 0, 0, 0x26F, /* LATIN SMALL LETTER TURNED M */
GDK_slash, GDK_r, 0, 0, 0, 0x279, /* LATIN SMALL LETTER TURNED R */
GDK_slash, GDK_v, 0, 0, 0, 0x28C, /* LATIN SMALL LETTER TURNED V */
GDK_slash, GDK_w, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */
GDK_slash, GDK_y, 0, 0, 0, 0x28E, /* LATIN SMALL LETTER TRUEND Y*/
GDK_3, 0, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */
GDK_colon, 0, 0, 0, 0, 0x2D0, /* MODIFIER LETTER TRIANGULAR COLON */
GDK_A, 0, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */
GDK_E, 0, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */
GDK_I, 0, 0, 0, 0, 0x26A, /* LATIN LETTER SMALL CAPITAL I */
GDK_L, 0, 0, 0, 0, 0x29F, /* LATIN LETTER SMALL CAPITAL L */
GDK_M, 0, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */
GDK_O, 0, 0, 0, 0, 0x04F, /* LATIN LETTER SMALL CAPITAL OE */
GDK_O, GDK_E, 0, 0, 0, 0x276, /* LATIN LETTER SMALL CAPITAL OE */
GDK_R, 0, 0, 0, 0, 0x280, /* LATIN LETTER SMALL CAPITAL R */
GDK_U, 0, 0, 0, 0, 0x28A, /* LATIN SMALL LETTER UPSILON */
GDK_Y, 0, 0, 0, 0, 0x28F, /* LATIN LETTER SMALL CAPITAL Y */
GDK_grave, 0, 0, 0, 0, 0x2CC, /* MODIFIER LETTER LOW VERTICAL LINE */
GDK_a, 0, 0, 0, 0, 0x061, /* LATIN SMALL LETTER A */
GDK_a, GDK_e, 0, 0, 0, 0x0E6, /* LATIN SMALL LETTER AE */
GDK_c, 0, 0, 0, 0, 0x063, /* LATIN SMALL LETTER C */
GDK_c, GDK_comma, 0, 0, 0, 0x0E7, /* LATIN SMALL LETTER C WITH CEDILLA */
GDK_d, 0, 0, 0, 0, 0x064, /* LATIN SMALL LETTER E */
GDK_d, GDK_apostrophe, 0, 0, 0, 0x064, /* LATIN SMALL LETTER D */
GDK_d, GDK_h, 0, 0, 0, 0x0F0, /* LATIN SMALL LETTER ETH */
GDK_e, 0, 0, 0, 0, 0x065, /* LATIN SMALL LETTER E */
GDK_e, GDK_minus, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */
GDK_e, GDK_bar, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */
GDK_g, 0, 0, 0, 0, 0x067, /* LATIN SMALL LETTER G */
GDK_g, GDK_n, 0, 0, 0, 0x272, /* LATIN SMALL LETTER N WITH LEFT HOOK */
GDK_i, 0, 0, 0, 0, 0x069, /* LATIN SMALL LETTER I */
GDK_i, GDK_minus, 0, 0, 0, 0x268, /* LATIN SMALL LETTER I WITH STROKE */
GDK_n, 0, 0, 0, 0, 0x06e, /* LATIN SMALL LETTER N */
GDK_n, GDK_g, 0, 0, 0, 0x14B, /* LATIN SMALL LETTER ENG */
GDK_o, 0, 0, 0, 0, 0x06f, /* LATIN SMALL LETTER O */
GDK_o, GDK_minus, 0, 0, 0, 0x275, /* LATIN LETTER BARRED O */
GDK_o, GDK_slash, 0, 0, 0, 0x0F8, /* LATIN SMALL LETTER O WITH STROKE */
GDK_o, GDK_e, 0, 0, 0, 0x153, /* LATIN SMALL LIGATURE OE */
GDK_o, GDK_bar, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */
GDK_s, 0, 0, 0, 0, 0x073, /* LATIN SMALL LETTER_ESH */
GDK_s, GDK_h, 0, 0, 0, 0x283, /* LATIN SMALL LETTER_ESH */
GDK_t, 0, 0, 0, 0, 0x074, /* LATIN SMALL LETTER T */
GDK_t, GDK_h, 0, 0, 0, 0x3B8, /* GREEK SMALL LETTER THETA */
GDK_u, 0, 0, 0, 0, 0x075, /* LATIN SMALL LETTER U */
GDK_u, GDK_minus, 0, 0, 0, 0x289, /* LATIN LETTER U BAR */
GDK_z, 0, 0, 0, 0, 0x07A, /* LATIN SMALL LETTER Z */
GDK_z, GDK_h, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */
GDK_bar, GDK_o, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */
GDK_KEY_ampersand, 0, 0, 0, 0, 0x263, /* LATIN SMALL LETTER GAMMA */
GDK_KEY_apostrophe, 0, 0, 0, 0, 0x2C8, /* MODIFIER LETTER VERTICAL LINE */
GDK_KEY_slash, GDK_KEY_apostrophe, 0, 0, 0, 0x2CA, /* MODIFIER LETTER ACUTE ACCENT */
GDK_KEY_slash, GDK_KEY_slash, 0, 0, 0, 0x02F, /* SOLIDUS */
GDK_KEY_slash, GDK_KEY_3, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */
GDK_KEY_slash, GDK_KEY_A, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */
GDK_KEY_slash, GDK_KEY_R, 0, 0, 0, 0x281, /* LATIN LETTER SMALL CAPITAL INVERTED R */
GDK_KEY_slash, GDK_KEY_a, 0, 0, 0, 0x250, /* LATIN SMALL LETTER TURNED A */
GDK_KEY_slash, GDK_KEY_c, 0, 0, 0, 0x254, /* LATIN SMALL LETTER OPEN O */
GDK_KEY_slash, GDK_KEY_e, 0, 0, 0, 0x259, /* LATIN SMALL LETTER SCHWA */
GDK_KEY_slash, GDK_KEY_h, 0, 0, 0, 0x265, /* LATIN SMALL LETTER TURNED H */
GDK_KEY_slash, GDK_KEY_m, 0, 0, 0, 0x26F, /* LATIN SMALL LETTER TURNED M */
GDK_KEY_slash, GDK_KEY_r, 0, 0, 0, 0x279, /* LATIN SMALL LETTER TURNED R */
GDK_KEY_slash, GDK_KEY_v, 0, 0, 0, 0x28C, /* LATIN SMALL LETTER TURNED V */
GDK_KEY_slash, GDK_KEY_w, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */
GDK_KEY_slash, GDK_KEY_y, 0, 0, 0, 0x28E, /* LATIN SMALL LETTER TRUEND Y*/
GDK_KEY_3, 0, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */
GDK_KEY_colon, 0, 0, 0, 0, 0x2D0, /* MODIFIER LETTER TRIANGULAR COLON */
GDK_KEY_A, 0, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */
GDK_KEY_E, 0, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */
GDK_KEY_I, 0, 0, 0, 0, 0x26A, /* LATIN LETTER SMALL CAPITAL I */
GDK_KEY_L, 0, 0, 0, 0, 0x29F, /* LATIN LETTER SMALL CAPITAL L */
GDK_KEY_M, 0, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */
GDK_KEY_O, 0, 0, 0, 0, 0x04F, /* LATIN LETTER SMALL CAPITAL OE */
GDK_KEY_O, GDK_KEY_E, 0, 0, 0, 0x276, /* LATIN LETTER SMALL CAPITAL OE */
GDK_KEY_R, 0, 0, 0, 0, 0x280, /* LATIN LETTER SMALL CAPITAL R */
GDK_KEY_U, 0, 0, 0, 0, 0x28A, /* LATIN SMALL LETTER UPSILON */
GDK_KEY_Y, 0, 0, 0, 0, 0x28F, /* LATIN LETTER SMALL CAPITAL Y */
GDK_KEY_grave, 0, 0, 0, 0, 0x2CC, /* MODIFIER LETTER LOW VERTICAL LINE */
GDK_KEY_a, 0, 0, 0, 0, 0x061, /* LATIN SMALL LETTER A */
GDK_KEY_a, GDK_KEY_e, 0, 0, 0, 0x0E6, /* LATIN SMALL LETTER AE */
GDK_KEY_c, 0, 0, 0, 0, 0x063, /* LATIN SMALL LETTER C */
GDK_KEY_c, GDK_KEY_comma, 0, 0, 0, 0x0E7, /* LATIN SMALL LETTER C WITH CEDILLA */
GDK_KEY_d, 0, 0, 0, 0, 0x064, /* LATIN SMALL LETTER E */
GDK_KEY_d, GDK_KEY_apostrophe, 0, 0, 0, 0x064, /* LATIN SMALL LETTER D */
GDK_KEY_d, GDK_KEY_h, 0, 0, 0, 0x0F0, /* LATIN SMALL LETTER ETH */
GDK_KEY_e, 0, 0, 0, 0, 0x065, /* LATIN SMALL LETTER E */
GDK_KEY_e, GDK_KEY_minus, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */
GDK_KEY_e, GDK_KEY_bar, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */
GDK_KEY_g, 0, 0, 0, 0, 0x067, /* LATIN SMALL LETTER G */
GDK_KEY_g, GDK_KEY_n, 0, 0, 0, 0x272, /* LATIN SMALL LETTER N WITH LEFT HOOK */
GDK_KEY_i, 0, 0, 0, 0, 0x069, /* LATIN SMALL LETTER I */
GDK_KEY_i, GDK_KEY_minus, 0, 0, 0, 0x268, /* LATIN SMALL LETTER I WITH STROKE */
GDK_KEY_n, 0, 0, 0, 0, 0x06e, /* LATIN SMALL LETTER N */
GDK_KEY_n, GDK_KEY_g, 0, 0, 0, 0x14B, /* LATIN SMALL LETTER ENG */
GDK_KEY_o, 0, 0, 0, 0, 0x06f, /* LATIN SMALL LETTER O */
GDK_KEY_o, GDK_KEY_minus, 0, 0, 0, 0x275, /* LATIN LETTER BARRED O */
GDK_KEY_o, GDK_KEY_slash, 0, 0, 0, 0x0F8, /* LATIN SMALL LETTER O WITH STROKE */
GDK_KEY_o, GDK_KEY_e, 0, 0, 0, 0x153, /* LATIN SMALL LIGATURE OE */
GDK_KEY_o, GDK_KEY_bar, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */
GDK_KEY_s, 0, 0, 0, 0, 0x073, /* LATIN SMALL LETTER_ESH */
GDK_KEY_s, GDK_KEY_h, 0, 0, 0, 0x283, /* LATIN SMALL LETTER_ESH */
GDK_KEY_t, 0, 0, 0, 0, 0x074, /* LATIN SMALL LETTER T */
GDK_KEY_t, GDK_KEY_h, 0, 0, 0, 0x3B8, /* GREEK SMALL LETTER THETA */
GDK_KEY_u, 0, 0, 0, 0, 0x075, /* LATIN SMALL LETTER U */
GDK_KEY_u, GDK_KEY_minus, 0, 0, 0, 0x289, /* LATIN LETTER U BAR */
GDK_KEY_z, 0, 0, 0, 0, 0x07A, /* LATIN SMALL LETTER Z */
GDK_KEY_z, GDK_KEY_h, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */
GDK_KEY_bar, GDK_KEY_o, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */
GDK_asciitilde, 0, 0, 0, 0, 0x303, /* COMBINING TILDE */
GDK_KEY_asciitilde, 0, 0, 0, 0, 0x303, /* COMBINING TILDE */
};

8
modules/input/imti-er.c
View File

@ -140,8 +140,8 @@ ti_er_register_type (GTypeModule *module)
static guint16 ti_er_compose_seqs[] = {
/* do punctuation and numerals here */
'\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_apostrophe,
'\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe,
'\'', '1', 0, 0, 0, 0, 0x1369,
'\'', '1', '0', 0, 0, 0, 0x1372,
'\'', '1', '0', '0', 0, 0, 0x137b,
@ -430,8 +430,8 @@ static guint16 ti_er_compose_seqs[] = {
SYLW('x', 0x1238)
SYL('y', 0x12e8)
SYLW('z', 0x12d8)
GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
};
static void

8
modules/input/imti-et.c
View File

@ -140,8 +140,8 @@ ti_et_register_type (GTypeModule *module)
static guint16 ti_et_compose_seqs[] = {
/* do punctuation and numerals here */
'\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_apostrophe,
'\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */
'\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe,
'\'', '1', 0, 0, 0, 0, 0x1369,
'\'', '1', '0', 0, 0, 0, 0x1372,
'\'', '1', '0', '0', 0, 0, 0x137b,
@ -430,8 +430,8 @@ static guint16 ti_et_compose_seqs[] = {
SYLW('x', 0x1238)
SYL('y', 0x12e8)
SYLW('z', 0x12d8)
GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361,
};
static void

322
modules/input/imviqr.c
View File

@ -61,168 +61,168 @@ viqr_register_type (GTypeModule *module)
}
static guint16 viqr_compose_seqs[] = {
GDK_A, 0, 0, 0, 0, 'A',
GDK_A, GDK_apostrophe, 0, 0, 0, 0xc1,
GDK_A, GDK_parenleft, 0, 0, 0, 0x102,
GDK_A, GDK_parenleft, GDK_apostrophe, 0, 0, 0x1eae,
GDK_A, GDK_parenleft, GDK_period, 0, 0, 0x1eb6,
GDK_A, GDK_parenleft, GDK_question, 0, 0, 0x1eb2,
GDK_A, GDK_parenleft, GDK_grave, 0, 0, 0x1eb0,
GDK_A, GDK_parenleft, GDK_asciitilde, 0, 0, 0x1eb4,
GDK_A, GDK_period, 0, 0, 0, 0x1ea0,
GDK_A, GDK_question, 0, 0, 0, 0x1ea2,
GDK_A, GDK_asciicircum, 0, 0, 0, 0xc2,
GDK_A, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ea4,
GDK_A, GDK_asciicircum, GDK_period, 0, 0, 0x1eac,
GDK_A, GDK_asciicircum, GDK_question, 0, 0, 0x1ea8,
GDK_A, GDK_asciicircum, GDK_grave, 0, 0, 0x1ea6,
GDK_A, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1eaa,
GDK_A, GDK_grave, 0, 0, 0, 0xc0,
GDK_A, GDK_asciitilde, 0, 0, 0, 0xc3,
GDK_D, 0, 0, 0, 0, 'D',
GDK_D, GDK_D, 0, 0, 0, 0x110,
GDK_D, GDK_d, 0, 0, 0, 0x110,
GDK_E, 0, 0, 0, 0, 'E',
GDK_E, GDK_apostrophe, 0, 0, 0, 0xc9,
GDK_E, GDK_period, 0, 0, 0, 0x1eb8,
GDK_E, GDK_question, 0, 0, 0, 0x1eba,
GDK_E, GDK_asciicircum, 0, 0, 0, 0xca,
GDK_E, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ebe,
GDK_E, GDK_asciicircum, GDK_period, 0, 0, 0x1ec6,
GDK_E, GDK_asciicircum, GDK_question, 0, 0, 0x1ec2,
GDK_E, GDK_asciicircum, GDK_grave, 0, 0, 0x1ec0,
GDK_E, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ec4,
GDK_E, GDK_grave, 0, 0, 0, 0xc8,
GDK_E, GDK_asciitilde, 0, 0, 0, 0x1ebc,
GDK_I, 0, 0, 0, 0, 'I',
GDK_I, GDK_apostrophe, 0, 0, 0, 0xcd,
GDK_I, GDK_period, 0, 0, 0, 0x1eca,
GDK_I, GDK_question, 0, 0, 0, 0x1ec8,
GDK_I, GDK_grave, 0, 0, 0, 0xcc,
GDK_I, GDK_asciitilde, 0, 0, 0, 0x128,
GDK_O, 0, 0, 0, 0, 'O',
GDK_O, GDK_apostrophe, 0, 0, 0, 0xD3,
GDK_O, GDK_plus, 0, 0, 0, 0x1a0,
GDK_O, GDK_plus, GDK_apostrophe, 0, 0, 0x1eda,
GDK_O, GDK_plus, GDK_period, 0, 0, 0x1ee2,
GDK_O, GDK_plus, GDK_question, 0, 0, 0x1ede,
GDK_O, GDK_plus, GDK_grave, 0, 0, 0x1edc,
GDK_O, GDK_plus, GDK_asciitilde, 0, 0, 0x1ee0,
GDK_O, GDK_period, 0, 0, 0, 0x1ecc,
GDK_O, GDK_question, 0, 0, 0, 0x1ece,
GDK_O, GDK_asciicircum, 0, 0, 0, 0xd4,
GDK_O, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ed0,
GDK_O, GDK_asciicircum, GDK_period, 0, 0, 0x1ed8,
GDK_O, GDK_asciicircum, GDK_question, 0, 0, 0x1ed4,
GDK_O, GDK_asciicircum, GDK_grave, 0, 0, 0x1ed2,
GDK_O, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ed6,
GDK_O, GDK_grave, 0, 0, 0, 0xD2,
GDK_O, GDK_asciitilde, 0, 0, 0, 0xD5,
GDK_U, 0, 0, 0, 0, 'U',
GDK_U, GDK_apostrophe, 0, 0, 0, 0xDA,
GDK_U, GDK_plus, 0, 0, 0, 0x1af,
GDK_U, GDK_plus, GDK_apostrophe, 0, 0, 0x1ee8,
GDK_U, GDK_plus, GDK_period, 0, 0, 0x1ef0,
GDK_U, GDK_plus, GDK_question, 0, 0, 0x1eec,
GDK_U, GDK_plus, GDK_grave, 0, 0, 0x1eea,
GDK_U, GDK_plus, GDK_asciitilde, 0, 0, 0x1eee,
GDK_U, GDK_period, 0, 0, 0, 0x1ee4,
GDK_U, GDK_question, 0, 0, 0, 0x1ee6,
GDK_U, GDK_grave, 0, 0, 0, 0xd9,
GDK_U, GDK_asciitilde, 0, 0, 0, 0x168,
GDK_Y, 0, 0, 0, 0, 'Y',
GDK_Y, GDK_apostrophe, 0, 0, 0, 0xdd,
GDK_Y, GDK_period, 0, 0, 0, 0x1ef4,
GDK_Y, GDK_question, 0, 0, 0, 0x1ef6,
GDK_Y, GDK_grave, 0, 0, 0, 0x1ef2,
GDK_Y, GDK_asciitilde, 0, 0, 0, 0x1ef8,
GDK_KEY_A, 0, 0, 0, 0, 'A',
GDK_KEY_A, GDK_KEY_apostrophe, 0, 0, 0, 0xc1,
GDK_KEY_A, GDK_KEY_parenleft, 0, 0, 0, 0x102,
GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_apostrophe, 0, 0, 0x1eae,
GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_period, 0, 0, 0x1eb6,
GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_question, 0, 0, 0x1eb2,
GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_grave, 0, 0, 0x1eb0,
GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_asciitilde, 0, 0, 0x1eb4,
GDK_KEY_A, GDK_KEY_period, 0, 0, 0, 0x1ea0,
GDK_KEY_A, GDK_KEY_question, 0, 0, 0, 0x1ea2,
GDK_KEY_A, GDK_KEY_asciicircum, 0, 0, 0, 0xc2,
GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ea4,
GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1eac,
GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ea8,
GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ea6,
GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1eaa,
GDK_KEY_A, GDK_KEY_grave, 0, 0, 0, 0xc0,
GDK_KEY_A, GDK_KEY_asciitilde, 0, 0, 0, 0xc3,
GDK_KEY_D, 0, 0, 0, 0, 'D',
GDK_KEY_D, GDK_KEY_D, 0, 0, 0, 0x110,
GDK_KEY_D, GDK_KEY_d, 0, 0, 0, 0x110,
GDK_KEY_E, 0, 0, 0, 0, 'E',
GDK_KEY_E, GDK_KEY_apostrophe, 0, 0, 0, 0xc9,
GDK_KEY_E, GDK_KEY_period, 0, 0, 0, 0x1eb8,
GDK_KEY_E, GDK_KEY_question, 0, 0, 0, 0x1eba,
GDK_KEY_E, GDK_KEY_asciicircum, 0, 0, 0, 0xca,
GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ebe,
GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ec6,
GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ec2,
GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ec0,
GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ec4,
GDK_KEY_E, GDK_KEY_grave, 0, 0, 0, 0xc8,
GDK_KEY_E, GDK_KEY_asciitilde, 0, 0, 0, 0x1ebc,
GDK_KEY_I, 0, 0, 0, 0, 'I',
GDK_KEY_I, GDK_KEY_apostrophe, 0, 0, 0, 0xcd,
GDK_KEY_I, GDK_KEY_period, 0, 0, 0, 0x1eca,
GDK_KEY_I, GDK_KEY_question, 0, 0, 0, 0x1ec8,
GDK_KEY_I, GDK_KEY_grave, 0, 0, 0, 0xcc,
GDK_KEY_I, GDK_KEY_asciitilde, 0, 0, 0, 0x128,
GDK_KEY_O, 0, 0, 0, 0, 'O',
GDK_KEY_O, GDK_KEY_apostrophe, 0, 0, 0, 0xD3,
GDK_KEY_O, GDK_KEY_plus, 0, 0, 0, 0x1a0,
GDK_KEY_O, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1eda,
GDK_KEY_O, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ee2,
GDK_KEY_O, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1ede,
GDK_KEY_O, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1edc,
GDK_KEY_O, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1ee0,
GDK_KEY_O, GDK_KEY_period, 0, 0, 0, 0x1ecc,
GDK_KEY_O, GDK_KEY_question, 0, 0, 0, 0x1ece,
GDK_KEY_O, GDK_KEY_asciicircum, 0, 0, 0, 0xd4,
GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ed0,
GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ed8,
GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ed4,
GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ed2,
GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ed6,
GDK_KEY_O, GDK_KEY_grave, 0, 0, 0, 0xD2,
GDK_KEY_O, GDK_KEY_asciitilde, 0, 0, 0, 0xD5,
GDK_KEY_U, 0, 0, 0, 0, 'U',
GDK_KEY_U, GDK_KEY_apostrophe, 0, 0, 0, 0xDA,
GDK_KEY_U, GDK_KEY_plus, 0, 0, 0, 0x1af,
GDK_KEY_U, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1ee8,
GDK_KEY_U, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ef0,
GDK_KEY_U, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1eec,
GDK_KEY_U, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1eea,
GDK_KEY_U, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1eee,
GDK_KEY_U, GDK_KEY_period, 0, 0, 0, 0x1ee4,
GDK_KEY_U, GDK_KEY_question, 0, 0, 0, 0x1ee6,
GDK_KEY_U, GDK_KEY_grave, 0, 0, 0, 0xd9,
GDK_KEY_U, GDK_KEY_asciitilde, 0, 0, 0, 0x168,
GDK_KEY_Y, 0, 0, 0, 0, 'Y',
GDK_KEY_Y, GDK_KEY_apostrophe, 0, 0, 0, 0xdd,
GDK_KEY_Y, GDK_KEY_period, 0, 0, 0, 0x1ef4,
GDK_KEY_Y, GDK_KEY_question, 0, 0, 0, 0x1ef6,
GDK_KEY_Y, GDK_KEY_grave, 0, 0, 0, 0x1ef2,
GDK_KEY_Y, GDK_KEY_asciitilde, 0, 0, 0, 0x1ef8,
/* Do we need anything else here? */
GDK_backslash, 0, 0, 0, 0, 0,
GDK_backslash, GDK_apostrophe, 0, 0, 0, '\'',
GDK_backslash, GDK_parenleft, 0, 0, 0, '(',
GDK_backslash, GDK_plus, 0, 0, 0, '+',
GDK_backslash, GDK_period, 0, 0, 0, '.',
GDK_backslash, GDK_question, 0, 0, 0, '?',
GDK_backslash, GDK_D, 0, 0, 0, 'D',
GDK_backslash, GDK_backslash, 0, 0, 0, '\\',
GDK_backslash, GDK_asciicircum, 0, 0, 0, '^',
GDK_backslash, GDK_grave, 0, 0, 0, '`',
GDK_backslash, GDK_d, 0, 0, 0, 'd',
GDK_backslash, GDK_asciitilde, 0, 0, 0, '~',
GDK_a, 0, 0, 0, 0, 'a',
GDK_a, GDK_apostrophe, 0, 0, 0, 0xe1,
GDK_a, GDK_parenleft, 0, 0, 0, 0x103,
GDK_a, GDK_parenleft, GDK_apostrophe, 0, 0, 0x1eaf,
GDK_a, GDK_parenleft, GDK_period, 0, 0, 0x1eb7,
GDK_a, GDK_parenleft, GDK_question, 0, 0, 0x1eb3,
GDK_a, GDK_parenleft, GDK_grave, 0, 0, 0x1eb1,
GDK_a, GDK_parenleft, GDK_asciitilde, 0, 0, 0x1eb5,
GDK_a, GDK_period, 0, 0, 0, 0x1ea1,
GDK_a, GDK_question, 0, 0, 0, 0x1ea3,
GDK_a, GDK_asciicircum, 0, 0, 0, 0xe2,
GDK_a, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ea5,
GDK_a, GDK_asciicircum, GDK_period, 0, 0, 0x1ead,
GDK_a, GDK_asciicircum, GDK_question, 0, 0, 0x1ea9,
GDK_a, GDK_asciicircum, GDK_grave, 0, 0, 0x1ea7,
GDK_a, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1eab,
GDK_a, GDK_grave, 0, 0, 0, 0xe0,
GDK_a, GDK_asciitilde, 0, 0, 0, 0xe3,
GDK_d, 0, 0, 0, 0, 'd',
GDK_d, GDK_d, 0, 0, 0, 0x111,
GDK_e, 0, 0, 0, 0, 'e',
GDK_e, GDK_apostrophe, 0, 0, 0, 0xe9,
GDK_e, GDK_period, 0, 0, 0, 0x1eb9,
GDK_e, GDK_question, 0, 0, 0, 0x1ebb,
GDK_e, GDK_asciicircum, 0, 0, 0, 0xea,
GDK_e, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ebf,
GDK_e, GDK_asciicircum, GDK_period, 0, 0, 0x1ec7,
GDK_e, GDK_asciicircum, GDK_question, 0, 0, 0x1ec3,
GDK_e, GDK_asciicircum, GDK_grave, 0, 0, 0x1ec1,
GDK_e, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ec5,
GDK_e, GDK_grave, 0, 0, 0, 0xe8,
GDK_e, GDK_asciitilde, 0, 0, 0, 0x1ebd,
GDK_i, 0, 0, 0, 0, 'i',
GDK_i, GDK_apostrophe, 0, 0, 0, 0xed,
GDK_i, GDK_period, 0, 0, 0, 0x1ecb,
GDK_i, GDK_question, 0, 0, 0, 0x1ec9,
GDK_i, GDK_grave, 0, 0, 0, 0xec,
GDK_i, GDK_asciitilde, 0, 0, 0, 0x129,
GDK_o, 0, 0, 0, 0, 'o',
GDK_o, GDK_apostrophe, 0, 0, 0, 0xF3,
GDK_o, GDK_plus, 0, 0, 0, 0x1a1,
GDK_o, GDK_plus, GDK_apostrophe, 0, 0, 0x1edb,
GDK_o, GDK_plus, GDK_period, 0, 0, 0x1ee3,
GDK_o, GDK_plus, GDK_question, 0, 0, 0x1edf,
GDK_o, GDK_plus, GDK_grave, 0, 0, 0x1edd,
GDK_o, GDK_plus, GDK_asciitilde, 0, 0, 0x1ee1,
GDK_o, GDK_period, 0, 0, 0, 0x1ecd,
GDK_o, GDK_question, 0, 0, 0, 0x1ecf,
GDK_o, GDK_asciicircum, 0, 0, 0, 0xf4,
GDK_o, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ed1,
GDK_o, GDK_asciicircum, GDK_period, 0, 0, 0x1ed9,
GDK_o, GDK_asciicircum, GDK_question, 0, 0, 0x1ed5,
GDK_o, GDK_asciicircum, GDK_grave, 0, 0, 0x1ed3,
GDK_o, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ed7,
GDK_o, GDK_grave, 0, 0, 0, 0xF2,
GDK_o, GDK_asciitilde, 0, 0, 0, 0xF5,
GDK_u, 0, 0, 0, 0, 'u',
GDK_u, GDK_apostrophe, 0, 0, 0, 0xFA,
GDK_u, GDK_plus, 0, 0, 0, 0x1b0,
GDK_u, GDK_plus, GDK_apostrophe, 0, 0, 0x1ee9,
GDK_u, GDK_plus, GDK_period, 0, 0, 0x1ef1,
GDK_u, GDK_plus, GDK_question, 0, 0, 0x1eed,
GDK_u, GDK_plus, GDK_grave, 0, 0, 0x1eeb,
GDK_u, GDK_plus, GDK_asciitilde, 0, 0, 0x1eef,
GDK_u, GDK_period, 0, 0, 0, 0x1ee5,
GDK_u, GDK_question, 0, 0, 0, 0x1ee7,
GDK_u, GDK_grave, 0, 0, 0, 0xf9,
GDK_u, GDK_asciitilde, 0, 0, 0, 0x169,
GDK_y, 0, 0, 0, 0, 'y',
GDK_y, GDK_apostrophe, 0, 0, 0, 0xfd,
GDK_y, GDK_period, 0, 0, 0, 0x1ef5,
GDK_y, GDK_question, 0, 0, 0, 0x1ef7,
GDK_y, GDK_grave, 0, 0, 0, 0x1ef3,
GDK_y, GDK_asciitilde, 0, 0, 0, 0x1ef9,
GDK_KEY_backslash, 0, 0, 0, 0, 0,
GDK_KEY_backslash, GDK_KEY_apostrophe, 0, 0, 0, '\'',
GDK_KEY_backslash, GDK_KEY_parenleft, 0, 0, 0, '(',
GDK_KEY_backslash, GDK_KEY_plus, 0, 0, 0, '+',
GDK_KEY_backslash, GDK_KEY_period, 0, 0, 0, '.',
GDK_KEY_backslash, GDK_KEY_question, 0, 0, 0, '?',
GDK_KEY_backslash, GDK_KEY_D, 0, 0, 0, 'D',
GDK_KEY_backslash, GDK_KEY_backslash, 0, 0, 0, '\\',
GDK_KEY_backslash, GDK_KEY_asciicircum, 0, 0, 0, '^',
GDK_KEY_backslash, GDK_KEY_grave, 0, 0, 0, '`',
GDK_KEY_backslash, GDK_KEY_d, 0, 0, 0, 'd',
GDK_KEY_backslash, GDK_KEY_asciitilde, 0, 0, 0, '~',
GDK_KEY_a, 0, 0, 0, 0, 'a',
GDK_KEY_a, GDK_KEY_apostrophe, 0, 0, 0, 0xe1,
GDK_KEY_a, GDK_KEY_parenleft, 0, 0, 0, 0x103,
GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_apostrophe, 0, 0, 0x1eaf,
GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_period, 0, 0, 0x1eb7,
GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_question, 0, 0, 0x1eb3,
GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_grave, 0, 0, 0x1eb1,
GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_asciitilde, 0, 0, 0x1eb5,
GDK_KEY_a, GDK_KEY_period, 0, 0, 0, 0x1ea1,
GDK_KEY_a, GDK_KEY_question, 0, 0, 0, 0x1ea3,
GDK_KEY_a, GDK_KEY_asciicircum, 0, 0, 0, 0xe2,
GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ea5,
GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ead,
GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ea9,
GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ea7,
GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1eab,
GDK_KEY_a, GDK_KEY_grave, 0, 0, 0, 0xe0,
GDK_KEY_a, GDK_KEY_asciitilde, 0, 0, 0, 0xe3,
GDK_KEY_d, 0, 0, 0, 0, 'd',
GDK_KEY_d, GDK_KEY_d, 0, 0, 0, 0x111,
GDK_KEY_e, 0, 0, 0, 0, 'e',
GDK_KEY_e, GDK_KEY_apostrophe, 0, 0, 0, 0xe9,
GDK_KEY_e, GDK_KEY_period, 0, 0, 0, 0x1eb9,
GDK_KEY_e, GDK_KEY_question, 0, 0, 0, 0x1ebb,
GDK_KEY_e, GDK_KEY_asciicircum, 0, 0, 0, 0xea,
GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ebf,
GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ec7,
GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ec3,
GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ec1,
GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ec5,
GDK_KEY_e, GDK_KEY_grave, 0, 0, 0, 0xe8,
GDK_KEY_e, GDK_KEY_asciitilde, 0, 0, 0, 0x1ebd,
GDK_KEY_i, 0, 0, 0, 0, 'i',
GDK_KEY_i, GDK_KEY_apostrophe, 0, 0, 0, 0xed,
GDK_KEY_i, GDK_KEY_period, 0, 0, 0, 0x1ecb,
GDK_KEY_i, GDK_KEY_question, 0, 0, 0, 0x1ec9,
GDK_KEY_i, GDK_KEY_grave, 0, 0, 0, 0xec,
GDK_KEY_i, GDK_KEY_asciitilde, 0, 0, 0, 0x129,
GDK_KEY_o, 0, 0, 0, 0, 'o',
GDK_KEY_o, GDK_KEY_apostrophe, 0, 0, 0, 0xF3,
GDK_KEY_o, GDK_KEY_plus, 0, 0, 0, 0x1a1,
GDK_KEY_o, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1edb,
GDK_KEY_o, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ee3,
GDK_KEY_o, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1edf,
GDK_KEY_o, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1edd,
GDK_KEY_o, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1ee1,
GDK_KEY_o, GDK_KEY_period, 0, 0, 0, 0x1ecd,
GDK_KEY_o, GDK_KEY_question, 0, 0, 0, 0x1ecf,
GDK_KEY_o, GDK_KEY_asciicircum, 0, 0, 0, 0xf4,
GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ed1,
GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ed9,
GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ed5,
GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ed3,
GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ed7,
GDK_KEY_o, GDK_KEY_grave, 0, 0, 0, 0xF2,
GDK_KEY_o, GDK_KEY_asciitilde, 0, 0, 0, 0xF5,
GDK_KEY_u, 0, 0, 0, 0, 'u',
GDK_KEY_u, GDK_KEY_apostrophe, 0, 0, 0, 0xFA,
GDK_KEY_u, GDK_KEY_plus, 0, 0, 0, 0x1b0,
GDK_KEY_u, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1ee9,
GDK_KEY_u, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ef1,
GDK_KEY_u, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1eed,
GDK_KEY_u, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1eeb,
GDK_KEY_u, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1eef,
GDK_KEY_u, GDK_KEY_period, 0, 0, 0, 0x1ee5,
GDK_KEY_u, GDK_KEY_question, 0, 0, 0, 0x1ee7,
GDK_KEY_u, GDK_KEY_grave, 0, 0, 0, 0xf9,
GDK_KEY_u, GDK_KEY_asciitilde, 0, 0, 0, 0x169,
GDK_KEY_y, 0, 0, 0, 0, 'y',
GDK_KEY_y, GDK_KEY_apostrophe, 0, 0, 0, 0xfd,
GDK_KEY_y, GDK_KEY_period, 0, 0, 0, 0x1ef5,
GDK_KEY_y, GDK_KEY_question, 0, 0, 0, 0x1ef7,
GDK_KEY_y, GDK_KEY_grave, 0, 0, 0, 0x1ef3,
GDK_KEY_y, GDK_KEY_asciitilde, 0, 0, 0, 0x1ef9,
};
static void

4
modules/other/gail/gailbutton.c
View File

@ -668,7 +668,7 @@ gail_button_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
if (return_value == NULL)
@ -696,7 +696,7 @@ gail_button_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
}

2
modules/other/gail/gailcombobox.c
View File

@ -392,7 +392,7 @@ gail_combo_box_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
g_free (combo_box->press_keybinding);

2
modules/other/gail/gailentry.c
View File

@ -1324,7 +1324,7 @@ gail_entry_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
g_free (entry->activate_keybinding);

2
modules/other/gail/gailexpander.c
View File

@ -473,7 +473,7 @@ gail_expander_get_keybinding (AtkAction *action,
guint key_val;
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
g_free (expander->activate_keybinding);
expander->activate_keybinding = return_value;

2
modules/other/gail/gailmenuitem.c
View File

@ -461,7 +461,7 @@ gail_menu_item_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (child))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (child));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
{
key = gtk_accelerator_name (key_val, mnemonic_modifier);
if (full_keybinding)

2
modules/other/gail/gailrange.c
View File

@ -460,7 +460,7 @@ gail_range_get_keybinding (AtkAction *action,
if (GTK_IS_LABEL (label))
{
key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label));
if (key_val != GDK_VoidSymbol)
if (key_val != GDK_KEY_VoidSymbol)
return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK);
}
g_free (range->activate_keybinding);

10
tests/testgtk.c
View File

@ -2278,7 +2278,7 @@ void create_labels (GtkWidget *widget)
"but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
"<span underline=\"double\">We like <sup>superscript</sup> and <sub>subscript</sub> too</span>");
g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_s);
g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_KEY_s);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
@ -3511,7 +3511,7 @@ create_menus (GtkWidget *widget)
gtk_widget_add_accelerator (menuitem,
"activate",
accel_group,
GDK_F1,
GDK_KEY_F1,
0,
GTK_ACCEL_VISIBLE);
menuitem = gtk_check_menu_item_new_with_label ("Accelerator Locked");
@ -3520,7 +3520,7 @@ create_menus (GtkWidget *widget)
gtk_widget_add_accelerator (menuitem,
"activate",
accel_group,
GDK_F2,
GDK_KEY_F2,
0,
GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
menuitem = gtk_check_menu_item_new_with_label ("Accelerators Frozen");
@ -3529,13 +3529,13 @@ create_menus (GtkWidget *widget)
gtk_widget_add_accelerator (menuitem,
"activate",
accel_group,
GDK_F2,
GDK_KEY_F2,
0,
GTK_ACCEL_VISIBLE);
gtk_widget_add_accelerator (menuitem,
"activate",
accel_group,
GDK_F3,
GDK_KEY_F3,
0,
GTK_ACCEL_VISIBLE);