gtk+ r21762 - in branches/gtk-2-14: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Wed Nov  5 19:14:51 2008
New Revision: 21762
URL: http://svn.gnome.org/viewvc/gtk+?rev=21762&view=rev

Log:
2008-11-05  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/gdkevents-quartz.c:
	(get_keyboard_modifiers_from_ns_event), (create_key_event): Revert
	(at least for now) the alt/cmd switching since it breaks the
	"alt-gr" functionality of alt which makes it impossible to input
	lots of characters.


Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/quartz/gdkevents-quartz.c

Modified: branches/gtk-2-14/gdk/quartz/gdkevents-quartz.c
==============================================================================
--- branches/gtk-2-14/gdk/quartz/gdkevents-quartz.c	(original)
+++ branches/gtk-2-14/gdk/quartz/gdkevents-quartz.c	Wed Nov  5 19:14:51 2008
@@ -475,8 +475,6 @@
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
   if (nsflags & NSCommandKeyMask)
-    modifiers |= GDK_META_MASK;
-  if (nsflags & NSAlternateKeyMask)
     modifiers |= GDK_MOD1_MASK;
 
   return modifiers;
@@ -1587,7 +1585,7 @@
         {
         case GDK_Meta_R:
         case GDK_Meta_L:
-          mask = GDK_META_MASK;
+          mask = GDK_MOD1_MASK;
           break;
         case GDK_Shift_R:
         case GDK_Shift_L:
@@ -1598,7 +1596,7 @@
           break;
         case GDK_Alt_R:
         case GDK_Alt_L:
-          mask = GDK_MOD1_MASK;
+          mask = GDK_MOD5_MASK;
           break;
         case GDK_Control_R:
         case GDK_Control_L: