callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename private keymap symbols to _gdk_x11_keymap...

Browse Source
This commit is contained in:
Matthias Clasen
2010-12-15 23:49:31 -05:00
parent 1d5afe4880
commit a97b1891b3
5 changed files with 334 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,10 +165,10 @@ translate_key_event (GdkDisplay *display,
NULL, NULL, &consumed);
state = event->key.state & ~consumed;
_gdk_keymap_add_virtual_modifiers_compat (keymap, &state);
_gdk_x11_keymap_add_virt_mods (keymap, &state);
event->key.state |= state;
event->key.is_modifier = _gdk_keymap_key_is_modifier (keymap, event->key.hardware_keycode);
event->key.is_modifier = _gdk_x11_keymap_key_is_modifier (keymap, event->key.hardware_keycode);
/* Fill in event->string crudely, since various programs
* depend on it.

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

@ -1009,7 +1009,7 @@ gdk_device_manager_xi2_translate_event (GdkEventTranslator *translator,
event->key.group = _gdk_x11_get_group_for_state (display, event->key.state);
event->key.hardware_keycode = xev->detail;
event->key.is_modifier = _gdk_keymap_key_is_modifier (keymap, event->key.hardware_keycode);
event->key.is_modifier = _gdk_x11_keymap_key_is_modifier (keymap, event->key.hardware_keycode);
device = g_hash_table_lookup (device_manager->id_table,
GUINT_TO_POINTER (xev->deviceid));
@ -1029,7 +1029,7 @@ gdk_device_manager_xi2_translate_event (GdkEventTranslator *translator,
NULL, NULL, &consumed);
state = event->key.state & ~consumed;
_gdk_keymap_add_virtual_modifiers_compat (keymap, &state);
_gdk_x11_keymap_add_virt_mods (keymap, &state);
event->key.state |= state;
translate_keyboard_string ((GdkEventKey *) event);

8
gdk/x11/gdkdisplay-x11.c
View File

@ -904,7 +904,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
/* Let XLib know that there is a new keyboard mapping.
*/
XRefreshKeyboardMapping (&xevent->xmapping);
_gdk_keymap_keys_changed (display);
_gdk_x11_keymap_keys_changed (display);
return_val = FALSE;
break;
@ -977,13 +977,13 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
{
case XkbNewKeyboardNotify:
case XkbMapNotify:
_gdk_keymap_keys_changed (display);
_gdk_x11_keymap_keys_changed (display);
return_val = FALSE;
break;
case XkbStateNotify:
_gdk_keymap_state_changed (display, xevent);
_gdk_x11_keymap_state_changed (display, xevent);
break;
}
}
@ -1411,7 +1411,7 @@ _gdk_x11_display_open (const gchar *display_name)
XkbNewKeyboardNotifyMask | XkbMapNotifyMask | XkbStateNotifyMask,
XkbNewKeyboardNotifyMask | XkbMapNotifyMask | XkbStateNotifyMask);
/* keep this in sync with _gdk_keymap_state_changed() */
/* keep this in sync with _gdk_x11_keymap_state_changed() */
XkbSelectEventDetails (display_x11->xdisplay,
XkbUseCoreKbd, XkbStateNotify,
XkbAllStateComponentsMask,

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

@ -405,7 +405,6 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
}
}
++keycode;
}
@ -690,11 +689,11 @@ update_lock_state (GdkKeymapX11 *keymap_x11,
|| (num_lock_state != keymap_x11->num_lock_state);
}
/* keep this in sync with the XkbSelectEventDetails() call
* in gdk_display_open()
/* keep this in sync with the XkbSelectEventDetails()
* call in gdk_display_open()
*/
void
_gdk_keymap_state_changed (GdkDisplay *display,
_gdk_x11_keymap_state_changed (GdkDisplay *display,
XEvent *xevent)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
@ -715,7 +714,7 @@ _gdk_keymap_state_changed (GdkDisplay *display,
#endif /* HAVE_XKB */
void
_gdk_keymap_keys_changed (GdkDisplay *display)
_gdk_x11_keymap_keys_changed (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
@ -915,8 +914,6 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap,
++i;
}
++keycode;
}
}
@ -1524,7 +1521,7 @@ _gdk_x11_get_group_for_state (GdkDisplay *display,
}
void
_gdk_keymap_add_virtual_modifiers_compat (GdkKeymap *keymap,
_gdk_x11_keymap_add_virt_mods (GdkKeymap *keymap,
GdkModifierType *modifiers)
{
GdkKeymapX11 *keymap_x11;
@ -1576,7 +1573,7 @@ gdk_x11_keymap_add_virtual_modifiers (GdkKeymap *keymap,
}
gboolean
_gdk_keymap_key_is_modifier (GdkKeymap *keymap,
_gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
guint keycode)
{
GdkKeymapX11 *keymap_x11;

8
gdk/x11/gdkprivate-x11.h
View File

@ -123,14 +123,14 @@ gboolean _gdk_x11_moveresize_handle_event (XEvent *event);
gboolean _gdk_x11_moveresize_configure_done (GdkDisplay *display,
GdkWindow *window);
void _gdk_keymap_state_changed (GdkDisplay *display,
void _gdk_x11_keymap_state_changed (GdkDisplay *display,
XEvent *event);
void _gdk_keymap_keys_changed (GdkDisplay *display);
void _gdk_x11_keymap_keys_changed (GdkDisplay *display);
gint _gdk_x11_get_group_for_state (GdkDisplay *display,
GdkModifierType state);
void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap *keymap,
void _gdk_x11_keymap_add_virt_mods (GdkKeymap *keymap,
GdkModifierType *modifiers);
gboolean _gdk_keymap_key_is_modifier (GdkKeymap *keymap,
gboolean _gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
guint keycode);
void _gdk_x11_initialize_locale (void);