OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied joystick patch from Michael Champigny

Browse Source
This commit is contained in:
Brian Paul
2000-06-23 16:21:55 +00:00
parent 3c8299c779
commit 4ec13a48b1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/glut/glx/glut_input.c
View File

@@ -159,7 +159,7 @@ tabletPosChange(GLUTwindow * window, int first, int count, int *data)
}
#endif /* !_WIN32 */
int
static int
__glutProcessDeviceEvents(XEvent * event)
{
#if !defined(_WIN32)
@@ -264,18 +264,17 @@ __glutProcessDeviceEvents(XEvent * event)
#else
{
JOYINFOEX info;
int njoyId = 0;
int nConnected = 0;
MMRESULT result;
JOYCAPS joyCaps;
/* Loop through all possible joystick IDs until we get the error
JOYERR_PARMS. Count the number of times we get JOYERR_NOERROR
indicating an installed joystick driver with a joystick currently
attached to the port. */
while ((result = joyGetPosEx(njoyId++,&info)) != JOYERR_PARMS) {
if (result == JOYERR_NOERROR) {
++nConnected; /* The count of connected joysticks. */
}
if (joyGetPosEx(JOYSTICKID1,&info) != JOYERR_NOERROR) {
__glutHasJoystick = 1;
joyGetDevCaps(JOYSTICKID1, &joyCaps, sizeof(joyCaps));
__glutNumJoystickButtons = joyCaps.wNumButtons;
__glutNumJoystickAxes = joyCaps.wNumAxes;
} else {
__glutHasJoystick = 0;
__glutNumJoystickButtons = 0;
__glutNumJoystickAxes = 0;
}
}
#endif /* !_WIN32 */