AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert (at least for now) the alt/cmd switching since it breaks the

Browse Source 
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
This commit is contained in:
Richard Hult 2008-11-05 19:12:48 +00:00 committed by Richard Hult
parent 89e28e068c
commit 31357d3cc7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-11-05 Christian Dywan <christian@imendio.com> 2008-11-05 Christian Dywan <christian@imendio.com>
Bug 559404 – gtk_editable_insert_text counts length in bytes Bug 559404 – gtk_editable_insert_text counts length in bytes

6
gdk/quartz/gdkevents-quartz.c
View File

@ -475,8 +475,6 @@ get_keyboard_modifiers_from_ns_event (NSEvent *nsevent)
if (nsflags & NSControlKeyMask) if (nsflags & NSControlKeyMask)
modifiers |= GDK_CONTROL_MASK; modifiers |= GDK_CONTROL_MASK;
if (nsflags & NSCommandKeyMask) if (nsflags & NSCommandKeyMask)
modifiers |= GDK_META_MASK;
if (nsflags & NSAlternateKeyMask)
modifiers |= GDK_MOD1_MASK; modifiers |= GDK_MOD1_MASK;
return modifiers; return modifiers;
@ -1587,7 +1585,7 @@ create_key_event (GdkWindow *window,
{ {
case GDK_Meta_R: case GDK_Meta_R:
case GDK_Meta_L: case GDK_Meta_L:
mask = GDK_META_MASK; mask = GDK_MOD1_MASK;
break; break;
case GDK_Shift_R: case GDK_Shift_R:
case GDK_Shift_L: case GDK_Shift_L:
@ -1598,7 +1596,7 @@ create_key_event (GdkWindow *window,
break; break;
case GDK_Alt_R: case GDK_Alt_R:
case GDK_Alt_L: case GDK_Alt_L:
mask = GDK_MOD1_MASK; mask = GDK_MOD5_MASK;
break; break;
case GDK_Control_R: case GDK_Control_R:
case GDK_Control_L: case GDK_Control_L: