Mercurial > emacs
comparison src/macterm.c @ 47830:ac4ceed3bbaf
* macterm.c (syms_of_macterm, mac_get_mouse_btn): Reversed
functionality of mac-wheel-button-is-mouse-2 to be correct. Also
switched the default to Qnil from Qt.
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Thu, 10 Oct 2002 22:05:02 +0000 |
parents | aeb8117c2101 |
children | 5dcac67745dc |
comparison
equal
deleted
inserted
replaced
47829:353dae5e0134 | 47830:ac4ceed3bbaf |
---|---|
11584 switch (result) | 11584 switch (result) |
11585 { | 11585 { |
11586 case kEventMouseButtonPrimary: | 11586 case kEventMouseButtonPrimary: |
11587 return 0; | 11587 return 0; |
11588 case kEventMouseButtonSecondary: | 11588 case kEventMouseButtonSecondary: |
11589 return NILP (Vmac_wheel_button_is_mouse_2) ? 2 : 1; | 11589 return NILP (Vmac_wheel_button_is_mouse_2) ? 1 : 2; |
11590 case kEventMouseButtonTertiary: | 11590 case kEventMouseButtonTertiary: |
11591 case 4: /* 4 is the number for the mouse wheel button */ | 11591 case 4: /* 4 is the number for the mouse wheel button */ |
11592 return NILP (Vmac_wheel_button_is_mouse_2) ? 1 : 2; | 11592 return NILP (Vmac_wheel_button_is_mouse_2) ? 2 : 1; |
11593 default: | 11593 default: |
11594 return 0; | 11594 return 0; |
11595 } | 11595 } |
11596 } | 11596 } |
11597 | 11597 |
13634 #if USE_CARBON_EVENTS | 13634 #if USE_CARBON_EVENTS |
13635 DEFVAR_LISP ("mac-wheel-button-is-mouse-2", &Vmac_wheel_button_is_mouse_2, | 13635 DEFVAR_LISP ("mac-wheel-button-is-mouse-2", &Vmac_wheel_button_is_mouse_2, |
13636 doc: /* Non-nil means that the wheel button will be treated as mouse-2 and | 13636 doc: /* Non-nil means that the wheel button will be treated as mouse-2 and |
13637 the right click will be mouse-3. | 13637 the right click will be mouse-3. |
13638 Otherwise, the right click will be mouse-2 and the wheel button mouse-3.*/); | 13638 Otherwise, the right click will be mouse-2 and the wheel button mouse-3.*/); |
13639 Vmac_wheel_button_is_mouse_2 = Qt; | 13639 Vmac_wheel_button_is_mouse_2 = Qnil; |
13640 | 13640 |
13641 DEFVAR_LISP ("mac-pass-command-to-system", &Vmac_pass_command_to_system, | 13641 DEFVAR_LISP ("mac-pass-command-to-system", &Vmac_pass_command_to_system, |
13642 doc: /* If non-nil, the Mac \"Command\" key is passed on to the Mac | 13642 doc: /* If non-nil, the Mac \"Command\" key is passed on to the Mac |
13643 Toolbox for processing before Emacs sees it. */); | 13643 Toolbox for processing before Emacs sees it. */); |
13644 Vmac_pass_command_to_system = Qt; | 13644 Vmac_pass_command_to_system = Qt; |