ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Fix remaining formatting of the find_joydevs().

This commit is contained in:
Vitaliy Margolen 2008-12-28 13:41:08 -07:00 committed by Alexandre Julliard
parent a610cfb64c
commit 8b09a8eb9d
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/dinput/joystick_linuxinput.c
View File

@ -263,27 +263,30 @@ static void find_joydevs(void)
continue; continue;
} }
/* A true joystick has at least axis X and Y, and at least 1 /* A true joystick has at least axis X and Y, and at least 1
* button. copied from linux/drivers/input/joydev.c */ * button. copied from linux/drivers/input/joydev.c */
if (test_bit(joydev.absbits,ABS_X) && test_bit(joydev.absbits,ABS_Y) && if (!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y) ||
( test_bit(joydev.keybits,BTN_TRIGGER) || !(test_bit(joydev.keybits, BTN_TRIGGER) ||
test_bit(joydev.keybits,BTN_A) || test_bit(joydev.keybits, BTN_A) ||
test_bit(joydev.keybits,BTN_1) test_bit(joydev.keybits, BTN_1)))
) {
) { close(fd);
continue;
}
if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) { if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1)))
close(fd); {
continue; close(fd);
continue;
} }
strcpy(joydev.device, buf); strcpy(joydev.device, buf);
buf[MAX_PATH - 1] = 0; buf[MAX_PATH - 1] = 0;
if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 && if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 &&
(joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1)))
strcpy(joydev.name, buf); strcpy(joydev.name, buf);
else else
joydev.name = joydev.device; joydev.name = joydev.device;
joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid = DInput_Wine_Joystick_Base_GUID;
joydev.guid.Data3 += have_joydevs; joydev.guid.Data3 += have_joydevs;
@ -305,9 +308,11 @@ static void find_joydevs(void)
} }
#endif #endif
for (j=0;j<ABS_MAX;j++) { for (j = 0; j < ABS_MAX;j ++)
if (test_bit(joydev.absbits,j)) { {
if (-1!=ioctl(fd,EVIOCGABS(j),&(joydev.axes[j]))) { if (!test_bit(joydev.absbits, j)) continue;
if (ioctl(fd, EVIOCGABS(j), &(joydev.axes[j])) != -1)
{
TRACE(" ... with axis %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", TRACE(" ... with axis %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n",
j, j,
joydev.axes[j].value, joydev.axes[j].value,
@ -317,7 +322,6 @@ static void find_joydevs(void)
joydev.axes[j].flat joydev.axes[j].flat
); );
} }
}
} }
if (!have_joydevs) if (!have_joydevs)
@ -333,7 +337,6 @@ static void find_joydevs(void)
joydevs = new_joydevs; joydevs = new_joydevs;
memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev)); memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev));
have_joydevs++; have_joydevs++;
}
close(fd); close(fd);
} }