diff options
| author | Richard Hult <richard@imendio.com> | 2008-04-30 17:42:27 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2008-04-30 17:42:27 +0000 |
| commit | 49f341f12cd5f5bc833e13e8b0c8e615907ed512 (patch) | |
| tree | fe8d217ee74c574f9cc8714df12e4afe09110c16 /gdk | |
| parent | 5f32702708866da22de95cd76c22e67cb352dc65 (diff) | |
| download | gtk+-49f341f12cd5f5bc833e13e8b0c8e615907ed512.tar.gz | |
Map Alt to Alt and Cmd to Meta. This is not only more logical but also
2008-04-30 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkevents-quartz.c:
(get_keyboard_modifiers_from_ns_event), (create_key_event): Map
Alt to Alt and Cmd to Meta. This is not only more logical but also
makes it easier to have Mac-like behavior.
svn path=/trunk/; revision=20054
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 912fdec898..01b95ff415 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -480,6 +480,8 @@ 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; @@ -1585,7 +1587,7 @@ create_key_event (GdkWindow *window, { case GDK_Meta_R: case GDK_Meta_L: - mask = GDK_MOD1_MASK; + mask = GDK_META_MASK; break; case GDK_Shift_R: case GDK_Shift_L: @@ -1596,7 +1598,7 @@ create_key_event (GdkWindow *window, break; case GDK_Alt_R: case GDK_Alt_L: - mask = GDK_MOD5_MASK; + mask = GDK_MOD1_MASK; break; case GDK_Control_R: case GDK_Control_L: @@ -2032,4 +2034,3 @@ gdk_screen_get_setting (GdkScreen *screen, return FALSE; } - |