Removed unnamed unions to compile with gcc 2.95

Only report correct amount of buttons to xorg-server-1.3

Call InitButtonClassDeviceStruct with right number of buttons and right mapping. Works correctly
since xorg-server-1.3.

2 files changed, 28 insertions, 25 deletions

diff --git a/src/jstk.c b/src/jstk.c
index ceaeb4f..30363b5 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -245,24 +245,32 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
                       int                what)
 {
   int i;
-  CARD8            map[MAXBUTTONS];
+  CARD8            map[MAXBUTTONS+1];
   LocalDevicePtr   local = (LocalDevicePtr)pJstk->public.devicePrivate;
   JoystickDevPtr   priv  = (JoystickDevPtr)XI_PRIVATE(pJstk);
 
   switch (what)
     {
-    case DEVICE_INIT:
+    case DEVICE_INIT: {
+      int m;
       DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-      for (i=1; i<MAXBUTTONS; i++) map[i] = i;
-
-      if (InitButtonClassDeviceStruct(pJstk, MAXBUTTONS, map) == FALSE) {
-        ErrorF("unable to allocate Button class device\n");
-        return !Success;
+      m=0;
+      for (i=0; i<MAXBUTTONS; i++) 
+          if (priv->button[i].mapping == MAPPING_BUTTON)
+      {
+          m++;
+          map[m] = priv->button[i].buttonnumber;
+          priv->button[i].buttonnumber = m;
       }
-
-      if (InitFocusClassDeviceStruct(pJstk) == FALSE) {
-        ErrorF("unable to init Focus class device\n");
-        return !Success;
+      if (m != 0) {
+          if (InitButtonClassDeviceStruct(pJstk, m, map) == FALSE) {
+            ErrorF("unable to allocate Button class device\n");
+            return !Success;
+          }
+          if (InitFocusClassDeviceStruct(pJstk) == FALSE) {
+            ErrorF("unable to init Focus class device\n");
+            return !Success;
+          }
       }
 
       if (InitValuatorClassDeviceStruct(pJstk, 
@@ -291,7 +299,8 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
         /* allocate the motion history buffer if needed */
         xf86MotionHistoryAllocate(local);
       }
-      break; 
+      break;
+    }
 
     case DEVICE_ON:
       DBG(1, ErrorF("jstkDeviceControlProc  what=ON name=%s\n", priv->device));
diff --git a/src/jstk.h b/src/jstk.h
index 2c8a1ff..85b2b51 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -78,10 +78,8 @@ typedef struct _AXIS {
     JOYSTICKMAPPING mapping;
     int             value;
     int             deadzone;
-    union {
-        float       currentspeed;
-        float       previousposition;
-    };
+    float           currentspeed;
+    float           previousposition;
     float           amplify;
 } AXIS;
 
@@ -90,15 +88,11 @@ typedef struct _AXIS {
 typedef struct _BUTTON {
    JOYSTICKMAPPING mapping;
    char pressed;
-   union {
-       int buttonnumber;    /* MAPPING_BUTTON */
-       struct {
-           float amplify;       /* MAPPING_X/Y/ZX/ZY, 
-                                   MAPPING_SPEED_MULTIPLY */
-           float currentspeed;  /* MAPPING_X/Y/ZX/ZY */
-       };
-       unsigned int keys[MAXKEYSPERBUTTON]; /* MAPPING_KEY */
-   };
+   int buttonnumber;    /* MAPPING_BUTTON */
+   float amplify;       /* MAPPING_X/Y/ZX/ZY, 
+                           MAPPING_SPEED_MULTIPLY */
+   float currentspeed;  /* MAPPING_X/Y/ZX/ZY */
+   unsigned int keys[MAXKEYSPERBUTTON]; /* MAPPING_KEY */
 } BUTTON;
 
 #define MAXBUTTONS 32