/[emacs]/emacs/src/macterm.c
ViewVC logotype

Diff of /emacs/src/macterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.72 by tamm, Mon Jun 28 16:20:38 2004 UTC revision 1.73 by tamm, Tue Jun 29 06:23:08 2004 UTC
# Line 7018  mac_get_emulated_btn ( UInt32 modifiers Line 7018  mac_get_emulated_btn ( UInt32 modifiers
7018    int result = 0;    int result = 0;
7019    if (!NILP (Vmac_emulate_three_button_mouse)) {    if (!NILP (Vmac_emulate_three_button_mouse)) {
7020      int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);      int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
7021      if (modifiers & controlKey)      if (modifiers & cmdKey)
7022        result = cmdIs3 ? 2 : 1;        result = cmdIs3 ? 2 : 1;
7023      else if (modifiers & optionKey)      else if (modifiers & optionKey)
7024        result = cmdIs3 ? 1 : 2;        result = cmdIs3 ? 1 : 2;
# Line 7038  mac_event_to_emacs_modifiers (EventRef e Line 7038  mac_event_to_emacs_modifiers (EventRef e
7038    if (!NILP (Vmac_emulate_three_button_mouse) &&    if (!NILP (Vmac_emulate_three_button_mouse) &&
7039        GetEventClass(eventRef) == kEventClassMouse)        GetEventClass(eventRef) == kEventClassMouse)
7040      {      {
7041        mods &= ~(optionKey & cmdKey);        mods &= ~(optionKey | cmdKey);
7042      }      }
7043    return mac_to_emacs_modifiers (mods);    return mac_to_emacs_modifiers (mods);
7044  }  }

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.73

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26