commit c9b3b2e8f84a99c337c7d75d734b120e1582e45e
author Marcus Meissner <Marcus.Meissner@caldera.de> Tue Dec 12 00:38:58 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 12 00:38:58 2000 +0000
tree 54a0f0987faacccf37b17f18f25218e0b166aadb
parent e371e682cb2975a684910459e78bdb91c5faf6df

Added preferences to dinput drivers (so we can have two joystick
drivers). Implemented a joystick driver for the Linux 2.4
dev/input/event API.

dlls/dinput/dinput_main.c

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 6f43804..01eab89 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -33,7 +33,7 @@
 static ICOM_VTABLE(IDirectInput7A) ddi7avt;
 
 /* This array will be filled a dinput.so loading */
-#define MAX_WINE_DINPUT_DEVICES 3
+#define MAX_WINE_DINPUT_DEVICES 4
 static dinput_device * dinput_devices[MAX_WINE_DINPUT_DEVICES];
 static int nrof_dinput_devices = 0;
 
@@ -41,7 +41,20 @@
  * the ELF startup initialisation at this point.
  */
 void dinput_register_device(dinput_device *device) {
-    dinput_devices[nrof_dinput_devices++] = device;
+    int	i;
+
+    /* insert according to priority */
+    for (i=0;i<nrof_dinput_devices;i++) {
+	if (dinput_devices[i]->pref <= device->pref) {
+	    memcpy(dinput_devices+i+1,dinput_devices+i,sizeof(dinput_devices[0])*(nrof_dinput_devices-i));
+	    dinput_devices[i] = device;
+	    break;
+	}
+    }
+    if (i==nrof_dinput_devices)	/* not found, or too low priority */
+	dinput_devices[nrof_dinput_devices] = device;
+
+    nrof_dinput_devices++;
 
     /* increase MAX_DDRAW_DRIVERS if the line below triggers */
     assert(nrof_dinput_devices <= MAX_WINE_DINPUT_DEVICES);