Skip to content

feature: added macOS mouse button names 4 to 32. #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UUoocl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feature: added macOS mouse button names 4 to 32. #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions lib/pynput/mouse/_darwin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,26 @@ def _button_value(base_name, mouse_button):
)


class Button(enum.Enum):
"""The various buttons."""

unknown = None
left = _button_value('kCGEventLeft', 0)
middle = _button_value('kCGEventOther', 2)
right = _button_value('kCGEventRight', 1)
_BUTTON_NAMES = [
'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten',
'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen',
'seventeen', 'eighteen', 'nineteen', 'twenty', 'twenty_one',
'twenty_two', 'twenty_three', 'twenty_four', 'twenty_five',
'twenty_six', 'twenty_seven', 'twenty_eight', 'twenty_nine',
'thirty', 'thirty_one', 'thirty_two'
]

_names = [
('unknown', None),
('left', _button_value('kCGEventLeft', 0)),
('middle', _button_value('kCGEventOther', 2)),
('right', _button_value('kCGEventRight', 1)),
]
for i, name in enumerate(_BUTTON_NAMES, start=3):
_names.append((name, _button_value('kCGEventOther', i)))

Button = enum.Enum('Button', _names, module=__name__)
Button.__doc__ = "The various buttons."


class Controller(_base.Controller):
Expand Down Expand Up @@ -190,16 +203,21 @@ def _handle_message(self, _proxy, event_type, event, _refcon, injected):
self.on_scroll(px, py, dx, dy, injected)

else:
button_number = Quartz.CGEventGetIntegerValueField(
event, Quartz.kCGMouseEventButtonNumber)
for button in Button:
try:
(press, release, drag), _ = button.value
(press, release, drag), btn_num = button.value
except TypeError:
# Button.unknown cannot be enumerated
continue

# Press and release generate click events, and drag
# generates move events
if event_type in (press, release):
self.on_click(px, py, button, event_type == press, injected)
elif event_type == drag:
self.on_move(px, py, injected)
if button_number == btn_num:
if event_type in (press, release):
self.on_click(px, py, button, event_type == press, injected)
break
elif event_type == drag:
self.on_move(px, py, injected)
break