First attempt at merging version 2 from oddlabs svn repository. Merging version 2

git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/branches/version2@137 e343933a-64c8-49c5-92b1-88f2ce3e89e8

1 files changed, 0 insertions, 160 deletions

diff --git a/plugins/linux/src/native/joystickInterface.cpp b/plugins/linux/src/native/joystickInterface.cpp
deleted file mode 100644
index da96a61..0000000
--- a/plugins/linux/src/native/joystickInterface.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright (C) 2003 Jeremy Booth ([email protected])
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this 
- * list of conditions and the following disclaimer. Redistributions in binary 
- * form must reproduce the above copyright notice, this list of conditions and 
- * the following disclaimer in the documentation and/or other materials provided
- * with the distribution. 
- * The name of the author may not be used to endorse or promote products derived
- * from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
- */
-
-#include <sys/dir.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <linux/joystick.h>
-#include <string.h>
-#include <malloc.h>
-#include <unistd.h>
-#include "Device.h"
-#include "JoystickDevice.h"
-
-int jsNumDevices;
-int joystickInterfaceVersion;
-Device **jsDeviceList;
-int jsInited = 0;
-
-int jsFileFilter(const struct direct *entry) {
-  if (strncmp(entry->d_name, "js", 2) == 0) {
-    return 1;
-  }
-    return 0;
-  }
-
-int jsGetDeviceFiles(char ***filenames) {
-  struct direct **files;
-  int num_files, i;
-  char dirName[12];
-  
-  sprintf(dirName, "/dev/input");
-
-  num_files = scandir(dirName, &files, &jsFileFilter, alphasort);
-  
-  if(num_files==0) {
-  	sprintf(dirName, "/dev");
-  	num_files = scandir(dirName, &files, &jsFileFilter, alphasort);
-  }
-
-  *filenames = (char **)malloc(num_files * sizeof(char *));
-
-  for(i=0;i<num_files;i++) {
-    char *filename = files[i]->d_name;
-    char *fullFileName;
-
-    fullFileName = (char *)malloc((strlen(dirName) + 1 + strlen(filename) + 1));
-    sprintf(fullFileName, "%s/%s", dirName, filename);
-    (*filenames)[i] = fullFileName;
-  }
-
-  return num_files;
-}
-
-int jsInit() {
-  int fd=-1;
-  int i;
-  char **deviceFileNames;
-  int numDeviceFiles;
-
-  numDeviceFiles = jsGetDeviceFiles(&deviceFileNames);
-  if(numDeviceFiles<0) {
-    return -1;
-  }
-  
-  if(numDeviceFiles==0) {
-    jsNumDevices = 0;
-    jsInited=1;
-  	return 0;
-  }
-  
-  if ((fd = open(deviceFileNames[0], O_RDONLY)) <0) {
-    jsNumDevices = 0;
-    jsInited=1;
-    return 0;
-  }
-
-  if (ioctl(fd, JSIOCGVERSION, &joystickInterfaceVersion)) {
-    close(fd);
-    jsNumDevices = 0;
-    jsInited=1;
-    return 0;
-  }
-
-  if(fd>=0) {close(fd);}
-
-  Device *tempDeviceList[numDeviceFiles];
- 
-  jsNumDevices = 0;
-  for(i=0;i<numDeviceFiles;i++) {
-    JoystickDevice *tempDevice = new JoystickDevice(deviceFileNames[i]); 
-    // The device has a copy of the name, free the memory
-    free(deviceFileNames[i]);
-    if(tempDevice->isValidDevice()==1) {
-      tempDeviceList[i] = tempDevice;
-      jsNumDevices++;
-    }
-  }
-
-  int jsTempDeviceCount = 0;
-  // Now we know for certain which devices are open, we can take notes
-  jsDeviceList = (Device **)malloc(jsNumDevices * sizeof(Device *));
-  for(i=0;i<jsNumDevices;i++) {
-    while(tempDeviceList[jsTempDeviceCount] == NULL) {
-      jsTempDeviceCount++;
-    }
-    jsDeviceList[i] = tempDeviceList[jsTempDeviceCount];
-    //printf("Copied joystick %d to %d\n", jsTempDeviceCount, i);
-    jsTempDeviceCount++;
-  }
-  
-  // Free the file names array, which should now be free anyway.
-  free(deviceFileNames);
-
-  jsInited=1;
-
-  return 0;
-}
-
-int jsGetJoystickInterfaceVersionNumber() {
-  return joystickInterfaceVersion;
-}
-
-int jsGetNumberDevices() {
-  if(jsInited) {
-    return jsNumDevices;
-  }
-  return -1;
-}
-
-void jsGetDevices(Device **theirDeviceList) {
-  int i;
-  for(i=0;i<jsNumDevices;i++) {
-    theirDeviceList[i] = jsDeviceList[i];
-  }
-}