|
78 | 78 | BUTTONS = ["left", "right", "middle"] |
79 | 79 |
|
80 | 80 | mouse_bufs = [] |
| 81 | +mouse_read_counts = [0, 0] |
81 | 82 | for mouse_tg in mouse_tgs: |
82 | 83 | # Buffer to hold data read from the mouse |
83 | 84 | # Boot mice have 4 byte reports |
84 | 85 | mouse_bufs.append(array.array("b", [0] * 4)) |
85 | 86 |
|
86 | 87 |
|
| 88 | +def get_mouse_deltas(mouse_index): |
| 89 | + if mouse_read_counts[mouse_index] == 4: |
| 90 | + delta_x = mouse_bufs[mouse_index][1] |
| 91 | + delta_y = mouse_bufs[mouse_index][2] |
| 92 | + elif mouse_read_counts[mouse_index] == 8: |
| 93 | + delta_x = mouse_bufs[mouse_index][2] |
| 94 | + delta_y = mouse_bufs[mouse_index][4] |
| 95 | + else: |
| 96 | + raise ValueError( |
| 97 | + f"Unsupported mouse packet size: {mouse_packet_sizes[mouse_index]}, must be 4 or 8" |
| 98 | + ) |
| 99 | + return delta_x, delta_y |
| 100 | + |
| 101 | + |
87 | 102 | while True: |
88 | 103 | for mouse_index, mouse in enumerate(mice): |
89 | 104 | try: |
90 | 105 | count = mouse.read( |
91 | 106 | mouse_endpoint_addresses[mouse_index], mouse_bufs[mouse_index], timeout=10 |
92 | 107 | ) |
| 108 | + mouse_read_counts[mouse_index] = count |
93 | 109 | except usb.core.USBTimeoutError: |
94 | 110 | continue |
95 | | - |
| 111 | + mouse_deltas = get_mouse_deltas(mouse_index) |
96 | 112 | mouse_tgs[mouse_index].x = max( |
97 | | - 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_bufs[mouse_index][1]) |
| 113 | + 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_deltas[0]) |
98 | 114 | ) |
99 | 115 | mouse_tgs[mouse_index].y = max( |
100 | | - 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_bufs[mouse_index][2]) |
| 116 | + 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_deltas[1]) |
101 | 117 | ) |
102 | 118 |
|
103 | 119 | out_str = f"{mouse_tgs[mouse_index].x},{mouse_tgs[mouse_index].y}" |
|
0 commit comments