Skip to content

Commit 93332c9

Browse files
committed
Clean up mouse module
1 parent 8d18817 commit 93332c9

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

sdl2/mouse.py

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
class SDL_Cursor(c_void_p):
4343
pass
4444

45-
45+
SDL_SystemCursor = c_int
4646
SDL_SYSTEM_CURSOR_ARROW = 0
4747
SDL_SYSTEM_CURSOR_IBEAM = 1
4848
SDL_SYSTEM_CURSOR_WAIT = 2
@@ -56,7 +56,23 @@ class SDL_Cursor(c_void_p):
5656
SDL_SYSTEM_CURSOR_NO = 10
5757
SDL_SYSTEM_CURSOR_HAND = 11
5858
SDL_NUM_SYSTEM_CURSORS = 12
59-
SDL_SystemCursor = c_int
59+
60+
SDL_MouseWheelDirection = c_int
61+
SDL_MOUSEWHEEL_NORMAL = 0
62+
SDL_MOUSEWHEEL_FLIPPED = 1
63+
64+
SDL_BUTTON = lambda X: (1 << ((X) - 1))
65+
SDL_BUTTON_LEFT = 1
66+
SDL_BUTTON_MIDDLE = 2
67+
SDL_BUTTON_RIGHT = 3
68+
SDL_BUTTON_X1 = 4
69+
SDL_BUTTON_X2 = 5
70+
SDL_BUTTON_LMASK = SDL_BUTTON(SDL_BUTTON_LEFT)
71+
SDL_BUTTON_MMASK = SDL_BUTTON(SDL_BUTTON_MIDDLE)
72+
SDL_BUTTON_RMASK = SDL_BUTTON(SDL_BUTTON_RIGHT)
73+
SDL_BUTTON_X1MASK = SDL_BUTTON(SDL_BUTTON_X1)
74+
SDL_BUTTON_X2MASK = SDL_BUTTON(SDL_BUTTON_X2)
75+
6076
SDL_GetMouseFocus = _bind("SDL_GetMouseFocus", None, POINTER(SDL_Window))
6177
SDL_GetMouseState = _bind("SDL_GetMouseState", [POINTER(c_int), POINTER(c_int)], Uint32)
6278
SDL_GetRelativeMouseState = _bind("SDL_GetRelativeMouseState", [POINTER(c_int), POINTER(c_int)], Uint32)
@@ -74,17 +90,3 @@ class SDL_Cursor(c_void_p):
7490
SDL_WarpMouseGlobal = _bind("SDL_WarpMouseGlobal", [c_int, c_int], c_int, added='2.0.4')
7591
SDL_CaptureMouse = _bind("SDL_CaptureMouse", [SDL_bool], c_int, added='2.0.4')
7692
SDL_GetGlobalMouseState = _bind("SDL_GetGlobalMouseState", [POINTER(c_int), POINTER(c_int)], Uint32, added='2.0.4')
77-
SDL_BUTTON = lambda X: (1 << ((X) - 1))
78-
SDL_BUTTON_LEFT = 1
79-
SDL_BUTTON_MIDDLE = 2
80-
SDL_BUTTON_RIGHT = 3
81-
SDL_BUTTON_X1 = 4
82-
SDL_BUTTON_X2 = 5
83-
SDL_BUTTON_LMASK = SDL_BUTTON(SDL_BUTTON_LEFT)
84-
SDL_BUTTON_MMASK = SDL_BUTTON(SDL_BUTTON_MIDDLE)
85-
SDL_BUTTON_RMASK = SDL_BUTTON(SDL_BUTTON_RIGHT)
86-
SDL_BUTTON_X1MASK = SDL_BUTTON(SDL_BUTTON_X1)
87-
SDL_BUTTON_X2MASK = SDL_BUTTON(SDL_BUTTON_X2)
88-
SDL_MOUSEWHEEL_NORMAL = 0
89-
SDL_MOUSEWHEEL_FLIPPED = 1
90-
SDL_MouseWheelDirection = c_int

0 commit comments

Comments
 (0)