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

Make gdk_keymap_translate_keyboard_state() handle NULL keymaps. (#139715,

Browse Source 
Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
	gdk_keymap_translate_keyboard_state() handle NULL
	keymaps. (#139715, Torsten Schoenfeld).
This commit is contained in:
Soeren Sandmann 2004-04-18 15:10:59 +00:00 committed by Søren Sandmann Pedersen
parent 79bc80feab
commit 8340991b7d
6 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Apr 18 17:06:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
gdk_keymap_translate_keyboard_state() handle NULL
keymaps. (#139715, Torsten Schoenfeld).
Sun Apr 18 16:59:21 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586,

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Sun Apr 18 17:06:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
gdk_keymap_translate_keyboard_state() handle NULL
keymaps. (#139715, Torsten Schoenfeld).
Sun Apr 18 16:59:21 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586,

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Sun Apr 18 17:06:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
gdk_keymap_translate_keyboard_state() handle NULL
keymaps. (#139715, Torsten Schoenfeld).
Sun Apr 18 16:59:21 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586,

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Sun Apr 18 17:06:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
gdk_keymap_translate_keyboard_state() handle NULL
keymaps. (#139715, Torsten Schoenfeld).
Sun Apr 18 16:59:21 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586,

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Sun Apr 18 17:06:03 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make
gdk_keymap_translate_keyboard_state() handle NULL
keymaps. (#139715, Torsten Schoenfeld).
Sun Apr 18 16:59:21 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Don't erase GDK_EXTRA_CFLAGS. Fixes bug 139586,

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

@ -378,6 +378,23 @@ get_keymap (GdkKeymapX11 *keymap_x11)
return keymap_x11->keymap;
}
#define GET_EFFECTIVE_KEYMAP(keymap) get_effective_keymap ((keymap), G_STRFUNC)
GdkKeymap *
get_effective_keymap (GdkKeymap *keymap,
const char *function)
{
if (!keymap)
{
GDK_NOTE (MULTIHEAD,
g_message ("reverting to default display keymap in %s",
function));
return gdk_keymap_get_default ();
}
return keymap;
}
#if HAVE_XKB
static PangoDirection
get_direction (GdkKeymapX11 *keymap_x11)
@ -444,13 +461,7 @@ _gdk_keymap_keys_changed (GdkDisplay *display)
PangoDirection
gdk_keymap_get_direction (GdkKeymap *keymap)
{
if (!keymap)
{
keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
GDK_NOTE (MULTIHEAD,
g_message ("_multihead : reverting to default display keymap "
"in gdk_keymap_get_direction"));
}
keymap = GET_EFFECTIVE_KEYMAP (keymap);
#if HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
@ -505,14 +516,7 @@ gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap,
g_return_val_if_fail (n_keys != NULL, FALSE);
g_return_val_if_fail (keyval != 0, FALSE);
if (!keymap)
{
keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
GDK_NOTE (MULTIHEAD,
g_message ("_multihead : reverting to default display keymap "
"in gdk_keymap_get_entries_for_keyval\n"));
}
keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_KEYMAP_X11 (keymap);
retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
@ -659,14 +663,7 @@ gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap,
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (n_entries != NULL, FALSE);
if (!keymap)
{
keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
GDK_NOTE (MULTIHEAD,
g_message ("_multihead : reverting to default display keymap "
"in gdk_keymap_get_entries_for_keycode\n"));
}
keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_KEYMAP_X11 (keymap);
update_keyrange (keymap_x11);
@ -832,15 +829,8 @@ gdk_keymap_lookup_key (GdkKeymap *keymap,
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), 0);
g_return_val_if_fail (key != NULL, 0);
g_return_val_if_fail (key->group < 4, 0);
if (!keymap)
{
keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
GDK_NOTE (MULTIHEAD,
g_message ("_multihead : reverting to default display keymap "
"in gdk_keymap_lookup_key\n"));
}
keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_KEYMAP_X11 (keymap);
#ifdef HAVE_XKB
@ -1165,7 +1155,8 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap,
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (group < 4, FALSE);
keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_KEYMAP_X11 (keymap);
if (keyval)