gtk+ r20073 - in branches/gtk-2-12: . gdk/quartz
- From: rhult svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r20073 - in branches/gtk-2-12: . gdk/quartz
- Date: Sun, 4 May 2008 21:14:22 +0100 (BST)
Author: rhult
Date: Sun May 4 20:14:22 2008
New Revision: 20073
URL: http://svn.gnome.org/viewvc/gtk+?rev=20073&view=rev
Log:
2008-05-04 Richard Hult <richard imendio com>
Revert this commit from 2008-05-01, as it requires more changes to
work completely:
* 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.
Modified:
branches/gtk-2-12/ChangeLog
branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c
Modified: branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c (original)
+++ branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c Sun May 4 20:14:22 2008
@@ -480,8 +480,6 @@
if (nsflags & NSControlKeyMask)
modifiers |= GDK_CONTROL_MASK;
if (nsflags & NSCommandKeyMask)
- modifiers |= GDK_META_MASK;
- if (nsflags & NSAlternateKeyMask)
modifiers |= GDK_MOD1_MASK;
return modifiers;
@@ -1577,7 +1575,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:
@@ -1588,7 +1586,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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]