diff options
| author | Richard Hult <richard@imendio.com> | 2008-11-05 19:12:48 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2008-11-05 19:12:48 +0000 |
| commit | 31357d3cc7d37e5b0fe674835406c255a961a358 (patch) | |
| tree | 204b0a3352c390e5e41ee8b4398903fe2c206589 /gdk | |
| parent | 89e28e068ccd2f54516dd68b5ed58198480a246c (diff) | |
| download | gdk-pixbuf-31357d3cc7d37e5b0fe674835406c255a961a358.tar.gz | |
Revert (at least for now) the alt/cmd switching since it breaks the
2008-11-05 Richard Hult <richard@imendio.com>
* 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.
svn path=/trunk/; revision=21761
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index fc223a3d1..bc301955d 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -475,8 +475,6 @@ get_keyboard_modifiers_from_ns_event (NSEvent *nsevent) 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 @@ create_key_event (GdkWindow *window, { 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 @@ create_key_event (GdkWindow *window, 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: |