Skip to content

Fix Remote Access as follower #18947

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

Merged
seanbudd merged 6 commits into from
Sep 19, 2025
Merged

Fix Remote Access as follower #18947

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e2e35d
Use INPUT from winBindings.user32
SaschaCowley Sep 19, 2025
25a2905
Moved structs to winBindings
SaschaCowley Sep 19, 2025
fccc646
Move constants
SaschaCowley Sep 19, 2025
481d218
Add pr number to changes
SaschaCowley Sep 19, 2025
6643c66
Rename i to input
SaschaCowley Sep 19, 2025
c241f37
Update source/winBindings/user32.py
SaschaCowley Sep 19, 2025
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
Next Next commit
Use INPUT from winBindings.user32
  • Loading branch information
@SaschaCowley
SaschaCowley committed Sep 19, 2025
commit 1e2e35d81debffdb066e811a61f4bd371d45dd54
65 changes: 7 additions & 58 deletions source/_remoteClient/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# See the file COPYING for more details.

import ctypes
from ctypes import POINTER, Structure, Union, c_long, c_ulong, wintypes
from enum import IntEnum, IntFlag

import api
Expand Down Expand Up @@ -69,56 +68,6 @@ class KeyEventFlag(IntFlag):
"""


class MOUSEINPUT(Structure):
_fields_ = (
("dx", c_long),
("dy", c_long),
("mouseData", wintypes.DWORD),
("dwFlags", wintypes.DWORD),
("time", wintypes.DWORD),
("dwExtraInfo", POINTER(c_ulong)),
)


class KEYBDINPUT(Structure):
_fields_ = (
("wVk", wintypes.WORD),
("wScan", wintypes.WORD),
("dwFlags", wintypes.DWORD),
("time", wintypes.DWORD),
("dwExtraInfo", POINTER(c_ulong)),
)


class HARDWAREINPUT(Structure):
_fields_ = (
("uMsg", wintypes.DWORD),
("wParamL", wintypes.WORD),
("wParamH", wintypes.WORD),
)


class INPUTUnion(Union):
_fields_ = (
("mi", MOUSEINPUT),
("ki", KEYBDINPUT),
("hi", HARDWAREINPUT),
)


class INPUT(Structure):
"""Stores information for synthesizing input events.

.. seealso::
https://learn.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-input
"""

_fields_ = (
("type", wintypes.DWORD),
("union", INPUTUnion),
)


class BrailleInputGesture(braille.BrailleDisplayGesture, brailleInput.BrailleInputGesture):
def __init__(self, **kwargs):
super().__init__()
Expand Down Expand Up @@ -217,15 +166,15 @@ def sendKey(vk: int | None = None, scan: int | None = None, extended: bool = Fal
:param extended: Whether this is an extended key, defaults to False
:param pressed: ``True`` if key pressed; ``False`` if released, defaults to True
"""
i = INPUT()
i.union.ki.wVk = vk
i = user32.INPUT()
Comment thread
SaschaCowley marked this conversation as resolved.
Outdated
i.ii.ki.wVk = vk
if scan:
i.union.ki.wScan = scan
i.ii.ki.wScan = scan
else: # No scancode provided, try to get one
i.union.ki.wScan = user32.MapVirtualKey(vk, VKMapType.VK_TO_VSC)
i.ii.ki.wScan = user32.MapVirtualKey(vk, VKMapType.VK_TO_VSC)
if not pressed:
i.union.ki.dwFlags |= KeyEventFlag.KEY_UP
i.ii.ki.dwFlags |= KeyEventFlag.KEY_UP
if extended:
i.union.ki.dwFlags |= KeyEventFlag.EXTENDED_KEY
i.ii.ki.dwFlags |= KeyEventFlag.EXTENDED_KEY
i.type = InputType.KEYBOARD
user32.SendInput(1, ctypes.byref(i), ctypes.sizeof(INPUT))
user32.SendInput(1, ctypes.byref(i), ctypes.sizeof(user32.INPUT))