diff options
| author | Steven Tamm <steventamm@mac.com> | 2004-06-29 06:23:08 +0000 |
|---|---|---|
| committer | Steven Tamm <steventamm@mac.com> | 2004-06-29 06:23:08 +0000 |
| commit | c61278bbde089da22d4a774fe348536c172c20da (patch) | |
| tree | 0918ebf077e006133087dff48744fe0569f166f2 /src/macterm.c | |
| parent | c3762cbd4b8d9569291a20465315a024881eb17c (diff) | |
| download | emacs-c61278bbde089da22d4a774fe348536c172c20da.tar.gz | |
macterm.c (mac_get_emulated_btn)
(mac_event_to_emacs_modifiers): Fix emulated mouse button
support to correctly mask out modifiers.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macterm.c b/src/macterm.c index bef37addaa6..b9584be50bc 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -7018,7 +7018,7 @@ mac_get_emulated_btn ( UInt32 modifiers ) int result = 0; if (!NILP (Vmac_emulate_three_button_mouse)) { int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse); - if (modifiers & controlKey) + if (modifiers & cmdKey) result = cmdIs3 ? 2 : 1; else if (modifiers & optionKey) result = cmdIs3 ? 1 : 2; @@ -7038,7 +7038,7 @@ mac_event_to_emacs_modifiers (EventRef eventRef) if (!NILP (Vmac_emulate_three_button_mouse) && GetEventClass(eventRef) == kEventClassMouse) { - mods &= ~(optionKey & cmdKey); + mods &= ~(optionKey | cmdKey); } return mac_to_emacs_modifiers (mods); } |