Commit 91e82e7e authored by Richard Hult's avatar Richard Hult Committed by Richard Hult

Check if gdk_unicode_to_keyval() worked before using the result. Makes

2008-05-04  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkkeys-quartz.c (maybe_update_keymap): Check if
	gdk_unicode_to_keyval() worked before using the result. Makes
	function keys work, bug #530156. Also add F16 to the function key
	map.

svn path=/trunk/; revision=20071
parent 37851161
2008-05-04 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkkeys-quartz.c (maybe_update_keymap): Check if
gdk_unicode_to_keyval() worked before using the result. Makes
function keys work, bug #530156. Also add F16 to the function key
map.
2008-05-04 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkkeys-quartz.c (maybe_update_keymap): Remove stray
......
......@@ -128,7 +128,8 @@ const static struct {
{ 111, GDK_F12, 0 },
{ 105, GDK_F13, 0 },
{ 107, GDK_F14, 0 },
{ 113, GDK_F15, 0 }
{ 113, GDK_F15, 0 },
{ 106, GDK_F16, 0 }
};
const static struct {
......@@ -255,7 +256,15 @@ maybe_update_keymap (void)
p[j] = GDK_ISO_Left_Tab;
if (!found)
p[j] = gdk_unicode_to_keyval (uc);
{
guint tmp;
tmp = gdk_unicode_to_keyval (uc);
if (tmp != (uc | 0x01000000))
p[j] = tmp;
else
p[j] = 0;
}
}
}
......@@ -330,7 +339,15 @@ maybe_update_keymap (void)
p[j] = GDK_ISO_Left_Tab;
if (!found)
p[j] = gdk_unicode_to_keyval (uc);
{
guint tmp;
tmp = gdk_unicode_to_keyval (uc);
if (tmp != (uc | 0x01000000))
p[j] = tmp;
else
p[j] = 0;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment