stronger type hints

xpra/platform/win32/gui.py

@@ -595,17 +595,18 @@ def add_window_hooks(window) -> None:
                 apply_maxsize_hints(window, window.geometry_hints)
 
         if LANGCHANGE:
-            def inputlangchange(_hwnd, _event, wParam, lParam):
+            def inputlangchange(_hwnd: int, _event: int, wParam: int, lParam: int) -> int:
                 keylog("WM_INPUTLANGCHANGE: character set: %i, input locale identifier: %i", wParam, lParam)
                 window.keyboard_layout_changed("WM_INPUTLANGCHANGE", wParam, lParam)
+                return 0
 
             win32hooks.add_window_event_handler(win32con.WM_INPUTLANGCHANGE, inputlangchange)
 
         if WHEEL:
             VERTICAL = "vertical"
             HORIZONTAL = "horizontal"
 
-            def handle_wheel(orientation, wParam, lParam):
+            def handle_wheel(orientation: str, wParam: int, lParam: int):
                 distance = wParam >> 16
                 if distance > 2 ** 15:
                     # ie: 0xFF88 -> 0x78 (120)
@@ -630,11 +631,11 @@ def handle_wheel(orientation, wParam, lParam):
                     device_id = -1
                     client.wheel_event(device_id, wid, deltax, deltay, pointer)
 
-            def mousewheel(_hwnd, _event, wParam, lParam):
+            def mousewheel(_hwnd: int, _event: int, wParam: int, lParam: int) -> int:
                 handle_wheel(VERTICAL, wParam, lParam)
                 return 0
 
-            def mousehwheel(_hwnd, _event, wParam, lParam):
+            def mousehwheel(_hwnd: int, _event: int, wParam: int, lParam: int) -> int:
                 handle_wheel(HORIZONTAL, wParam, lParam)
                 return 0
 

xpra/platform/win32/window_hooks.py

@@ -67,7 +67,7 @@ def __init__(self, hwnd: int):
         log("Win32Hooks: window frame size is %sx%s", self.frame_width, self.frame_height)
         log("Win32Hooks: message_map=%s", self._message_map)
 
-    def add_window_event_handler(self, event: int, handler: Callable) -> None:
+    def add_window_event_handler(self, event: int, handler: Callable[[int, int, int, int], int]) -> None:
         self._message_map[event] = handler
 
     def setup(self) -> None:
@@ -78,7 +78,7 @@ def setup(self) -> None:
         except Exception:
             log.error(f"Error setting up window hook for {self._hwnd}", exc_info=True)
 
-    def on_getminmaxinfo(self, hwnd: int, msg, wparam: int, lparam: int):
+    def on_getminmaxinfo(self, hwnd: int, msg, wparam: int, lparam: int) -> int:
         if (self.min_size or self.max_size) and lparam:
             info = cast(lparam, POINTER(MINMAXINFO)).contents
             style = GetWindowLongW(hwnd, win32con.GWL_STYLE)