diff options
| author | Richard Hult <richard@imendio.com> | 2008-11-05 19:14:51 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2008-11-05 19:14:51 +0000 |
| commit | 2da67f5c8562048739d17bf81af10f6193fd1258 (patch) | |
| tree | e0a2979099f4e67f224d1848a1cd3a637d13fc1b | |
| parent | 0140d8ec47c6da43f5b4ae970e7e25c13bced6e4 (diff) | |
| download | gdk-pixbuf-2da67f5c8562048739d17bf81af10f6193fd1258.tar.gz | |
Merged from trunk:
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.
svn path=/branches/gtk-2-14/; revision=21762
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 6 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,13 @@ +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. + 2008-11-04 Tor Lillqvist <tml@novell.com> Bug 557212 - Problem with which window gains focus and is visible 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: |