We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Send SDL_JOYDEVICEADDED with or without udev

sdl_joystick_linux_events.diff (text/plain), 3.75 KB, created by Joseph Carter on 2013-10-11 10:18:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Carter

Created: 2013-10-11 10:18:41 UTC

Size: 3.75 KB

patch

obsolete

>diff -r 7995e0920bf9 src/joystick/linux/SDL_sysjoystick.c
>--- a/src/joystick/linux/SDL_sysjoystick.c	Wed Oct 09 11:30:01 2013 -0300
>+++ b/src/joystick/linux/SDL_sysjoystick.c	Thu Oct 10 06:10:04 2013 -0700
>@@ -138,8 +138,6 @@
> #if SDL_USE_LIBUDEV
> void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
> {
>-    int instance;
>-    
>     if (devpath == NULL || !(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
>         return;
>     }
>@@ -147,41 +145,11 @@
>     switch( udev_type )
>     {
>         case SDL_UDEV_DEVICEADDED:
>-            instance = MaybeAddDevice(devpath);
>-            if (instance != -1) {
>-                /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
>-                #if !SDL_EVENTS_DISABLED
>-                SDL_Event event;
>-                event.type = SDL_JOYDEVICEADDED;
>-
>-                if (SDL_GetEventState(event.type) == SDL_ENABLE) {
>-                    event.jdevice.which = instance;
>-                    if ( (SDL_EventOK == NULL) ||
>-                         (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
>-                        SDL_PushEvent(&event);
>-                    }
>-                }
>-                #endif /* !SDL_EVENTS_DISABLED */
>-            }
>+            MaybeAddDevice(devpath);
>             break;
>             
>         case SDL_UDEV_DEVICEREMOVED:
>-            instance = MaybeRemoveDevice(devpath);
>-            if (instance != -1) {
>-                /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
>-                #if !SDL_EVENTS_DISABLED
>-                SDL_Event event;
>-                event.type = SDL_JOYDEVICEREMOVED;
>-
>-                if (SDL_GetEventState(event.type) == SDL_ENABLE) {
>-                    event.jdevice.which = instance;
>-                    if ( (SDL_EventOK == NULL) ||
>-                         (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
>-                        SDL_PushEvent(&event);
>-                    }
>-                }
>-                #endif /* !SDL_EVENTS_DISABLED */
>-            }
>+            MaybeRemoveDevice(devpath);
>             break;
>             
>         default:
>@@ -202,6 +170,9 @@
>     char namebuf[128];
>     SDL_JoystickGUID guid;
>     SDL_joylist_item *item;
>+#if !SDL_EVENTS_DISABLED
>+    SDL_Event event;
>+#endif
> 
>     if (path == NULL) {
>         return -1;
>@@ -259,6 +230,19 @@
>         SDL_joylist_tail = item;
>     }
> 
>+    /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
>+#if !SDL_EVENTS_DISABLED
>+    event.type = SDL_JOYDEVICEADDED;
>+
>+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
>+        event.jdevice.which = numjoysticks;
>+        if ( (SDL_EventOK == NULL) ||
>+             (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
>+            SDL_PushEvent(&event);
>+        }
>+    }
>+#endif /* !SDL_EVENTS_DISABLED */
>+
>     return numjoysticks++;
> }
> 
>@@ -269,6 +253,9 @@
> {
>     SDL_joylist_item *item;
>     SDL_joylist_item *prev = NULL;
>+#if !SDL_EVENTS_DISABLED
>+    SDL_Event event;
>+#endif
> 
>     if (path == NULL) {
>         return -1;
>@@ -290,6 +277,20 @@
>             if (item == SDL_joylist_tail) {
>                 SDL_joylist_tail = prev;
>             }
>+
>+            /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
>+#if !SDL_EVENTS_DISABLED
>+            event.type = SDL_JOYDEVICEREMOVED;
>+
>+            if (SDL_GetEventState(event.type) == SDL_ENABLE) {
>+                event.jdevice.which = item->device_instance;
>+                if ( (SDL_EventOK == NULL) ||
>+                     (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
>+                    SDL_PushEvent(&event);
>+                }
>+            }
>+#endif /* !SDL_EVENTS_DISABLED */
>+
>             SDL_free(item->path);
>             SDL_free(item->name);
>             SDL_free(item);

Actions: View | Diff

Attachments on bug 2148: 1363

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.