Mercurial > emacs
changeset 56277:fd126130c3cd
macterm.c (mac_get_emulated_btn)
(mac_event_to_emacs_modifiers): Fix emulated mouse button
support to correctly mask out modifiers.
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Tue, 29 Jun 2004 06:23:08 +0000 |
| parents | b04610e283ce |
| children | 3d525d0266de |
| files | src/ChangeLog src/macterm.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jun 29 02:37:52 2004 +0000 +++ b/src/ChangeLog Tue Jun 29 06:23:08 2004 +0000 @@ -1,9 +1,15 @@ +2004-06-29 Steven Tamm <steventamm@mac.com> + + * macterm.c (mac_get_emulated_btn) + (mac_event_to_emacs_modifiers): Fix emulated mouse button + support to correctly mask out modifiers. + 2004-06-29 David Kastrup <dak@gnu.org> * search.c (Fset_match_data): Allow buffer before end of list which can happen if set-match-data is using a pre-consed list. -2004-06-28 Steven Tamm <tamm@Steven-Tamms-Computer.local> +2004-06-28 Steven Tamm <steventamm@mac.com> * macterm.c (XTread_socket): Correctly set the frame position after the window is moved.
--- a/src/macterm.c Tue Jun 29 02:37:52 2004 +0000 +++ b/src/macterm.c Tue Jun 29 06:23:08 2004 +0000 @@ -7018,7 +7018,7 @@ 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 @@ if (!NILP (Vmac_emulate_three_button_mouse) && GetEventClass(eventRef) == kEventClassMouse) { - mods &= ~(optionKey & cmdKey); + mods &= ~(optionKey | cmdKey); } return mac_to_emacs_modifiers (mods); }