cleaned up code substantially; got everything working; made help patches

svn path=/trunk/externals/hcs/; revision=1192

1 files changed, 215 insertions, 256 deletions

diff --git a/linuxmouse.c b/linuxmouse.c
index da7147e..568f2ff 100644
--- a/linuxmouse.c
+++ b/linuxmouse.c
@@ -3,7 +3,7 @@
 #define LINUXMOUSE_DEVICE   "/dev/input/event0"

 #define LINUXMOUSE_AXES     3

 

-static char *version = "$Revision: 1.2 $";

+static char *version = "$Revision: 1.3 $";

 

 /*------------------------------------------------------------------------------

  *  CLASS DEF

@@ -13,7 +13,7 @@ static t_class *linuxmouse_class;
 typedef struct _linuxmouse {

   t_object            x_obj;

   t_int               x_fd;

-  t_symbol*           x_devname;

+  t_symbol            *x_devname;

   int                 read_ok;

   int                 started;

   struct input_event  x_input_event; 

@@ -22,282 +22,241 @@ typedef struct _linuxmouse {
   t_outlet            *x_button_val_out;

   unsigned char       x_buttons;

   unsigned char       x_axes;

-}t_linuxmouse;

+} t_linuxmouse;

 

 /*------------------------------------------------------------------------------

  * IMPLEMENTATION                    

  */

 

-//DONE

-static int linuxmouse_close(t_linuxmouse *x)

-{

-    DEBUG(post("linuxmouse_close");)

-

-     if (x->x_fd <0) return 0;

-

-     close (x->x_fd);

-

-     return 1;

+/* Actions */

+void linuxmouse_stop(t_linuxmouse* x) {

+	DEBUG(post("linuxmouse_stop"););

+

+   if (x->x_fd >= 0 && x->started) { 

+		sys_rmpollfn(x->x_fd);

+		post("[linuxmouse] stopped");

+		x->started = 0;

+	} 

 }

 

-//DONE

-static int linuxmouse_open(t_linuxmouse *x,t_symbol* s)

-{

-  int eventType, eventCode;

-  unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)];

-  char devicename[256] = "Unknown";

-  DEBUG(post("linuxmouse_open");)

-

-  linuxmouse_close(x);

-

-  /* set obj device name to parameter 

-   * otherwise set to default

-   */  

-  if (s != &s_)

-    x->x_devname = s;

-  else {

-    post("You need to set a input device (i.e /dev/input/event0)");

-  }

-  

-  /* open device */

-  if (x->x_devname) {

-    post("opening ...");

-    /* open the linuxmouse device read-only, non-exclusive */

-    x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK);

-    if (x->x_fd >= 0 ) post("done");

-    else post("failed");

-  }

-  else {

-    return 1;

-  }

-  

-  /* test if device open */

-  if (x->x_fd >= 0)

-    post("%s opened",x->x_devname->s_name);

-  else {

-    post("unable to open %s",x->x_devname->s_name);

-    x->x_fd = -1;

-    return 0;

-  }

-  

-  /* read input_events from the LINUXMOUSE_DEVICE stream 

-   * It seems that is just there to flush the event input buffer?

-   */

-  while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1);

-  

-  /* get name of device */

-  ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename);

-  post ("configuring %s",devicename);

-

-  /* get bitmask representing supported events (axes, buttons, etc.) */

-  memset(bitmask, 0, sizeof(bitmask));

-  ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]);

-  post("Supported events:");

-    

-  x->x_axes = 0;

-  x->x_buttons = 0;

-    

-  /* cycle through all possible event types */

-  for (eventType = 0; eventType < EV_MAX; eventType++) {

-    if (test_bit(eventType, bitmask[0])) {

-      post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType);

-      //	post("Event type %d",eventType);

-

-      /* get bitmask representing supported button types */

-      ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]);

+static int linuxmouse_close(t_linuxmouse *x) {

+	DEBUG(post("linuxmouse_close"););

 

-      /* cycle through all possible event codes (axes, keys, etc.) 

-       * testing to see which are supported  

-       */

-      for (eventCode = 0; eventCode < KEY_MAX; eventCode++) 

-	if (test_bit(eventCode, bitmask[eventType])) {

-	  post("    Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?");

-

-	  if ( eventType == EV_KEY ) 

-	    x->x_buttons++;

-	  else if  ( eventType == EV_REL ) 

-	    x->x_axes++;

+/* just to be safe, stop it first */

+	linuxmouse_stop(x);

+	

+   if (x->x_fd < 0) {

+		return 0;

+	}

+	else {		

+		close (x->x_fd);

+		post ("[linuxmouse] closed %s",x->x_devname->s_name);

+		return 1;

 	}

-    }        

-  }

-    

-  post ("\nUsing %d axes and %d buttons.", x->x_axes, x->x_buttons);

-  post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING");

-  post ("This object is under development!  The interface could change at anytime!");

-  post ("As I write cross-platform versions, the interface might have to change.");

-  post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING");

-    

-  return 1;

-}

-

-

-

-static int linuxmouse_read(t_linuxmouse *x,int fd)

-{

-  int readBytes;

-  int axis_num = 0;

-  t_float button_num = 0;

-    

-  if (x->x_fd < 0) return 0;

-  if (x->read_ok) {

-    readBytes = read(x->x_fd, &(x->x_input_event), sizeof(struct input_event));

-    DEBUG(post("reading %d",readBytes);)

-    if ( readBytes < 0 ) {

-      post("linuxmouse: read failed");

-      x->read_ok = 0;

-      return 0;

-    }

-  }

-  if ( x->x_input_event.type == EV_KEY ) {

-    /* key/button event type */

-    switch ( x->x_input_event.code ) {

-    case BTN_LEFT:

-      button_num = 0;

-      break;

-    case BTN_RIGHT:

-      button_num = 1;

-      break;

-    case BTN_MIDDLE:

-      button_num = 2;

-      break;

-    case BTN_SIDE:

-      button_num = 3;

-      break;

-    case BTN_EXTRA:

-      button_num = 4;

-      break;

-    case BTN_FORWARD:

-      button_num = 5;

-      break;

-    case BTN_BACK:

-      button_num = 6;

-      break;

-    }

-    outlet_float (x->x_button_val_out, x->x_input_event.value);

-    outlet_float (x->x_button_num_out, button_num);

-  }

-  else if  ( x->x_input_event.type == EV_REL ) {

-    /* Relative Axes Event Type */

-    switch ( x->x_input_event.code ) {

-    case REL_X:

-      axis_num = 0;

-      break;

-    case REL_Y:

-      axis_num = 1;

-      break;

-    case REL_WHEEL:

-      axis_num = 2;

-      break;

-    }

-    outlet_float (x->x_axis_out[axis_num], (int)x->x_input_event.value);	

-  }

-

-  return 1;    

 }

 

-

-

-/* Actions */

-

-static void linuxmouse_bang(t_linuxmouse* x)

-{

-    DEBUG(post("linuxmouse_bang");)

-   

+static int linuxmouse_open(t_linuxmouse *x, t_symbol *s) {

+	int eventType, eventCode;

+	unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)];

+	char devicename[256] = "Unknown";

+	

+	DEBUG(post("linuxmouse_open"););

+	

+	linuxmouse_close(x);

+

+/* For some reason, not initializing x->x_devname causes a seg fault */

+/* on this object, but it works fine on [linuxevent] */

+	t_symbol *temp = malloc(20);

+	temp->s_name = "/dev/input/event0";

+	x->x_devname = temp;

+	

+	/* set obj device name to parameter 

+	 * otherwise set to default

+	 */  

+	if (s != &s_) x->x_devname = s;

+	

+	/* open device */

+	if (x->x_devname) {

+		/* open the device read-only, non-exclusive */

+		x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK);

+		/* test if device open */

+		if (x->x_fd < 0 ) { 

+			post("[linuxmouse] open %s failed",x->x_devname->s_name);

+			x->x_fd = -1;

+			return 0;

+		}

+	} else {

+		post("[linuxmouse] no device set: %s",x->x_devname->s_name);

+		return 1;

+	}

+	

+	

+/* read input_events from the LINUXMOUSE_DEVICE stream 

+ * It seems that is just there to flush the event input buffer?

+ */

+	while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1);

+	

+	/* get name of device */

+	ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename);

+	post ("Configuring %s on %s.",devicename,x->x_devname->s_name);

+	post("\nSupported events:");

+

+	/* get bitmask representing supported events (axes, buttons, etc.) */

+	memset(bitmask, 0, sizeof(bitmask));

+	ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]);

+	

+	x->x_axes = 0;

+	x->x_buttons = 0;

+	

+	/* cycle through all possible event types */

+	for (eventType = 0; eventType < EV_MAX; eventType++) {

+		if (test_bit(eventType, bitmask[0])) {

+			post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType);

+			//	post("Event type %d",eventType);

+			

+			/* get bitmask representing supported button types */

+			ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]);

+			

+			/* cycle through all possible event codes (axes, keys, etc.) 

+			 * testing to see which are supported  

+			 */

+			for (eventCode = 0; eventCode < KEY_MAX; eventCode++) {				

+				if (test_bit(eventCode, bitmask[eventType])) {

+					post("    Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?");

+					

+					if ( eventType == EV_KEY ) 

+						x->x_buttons++;

+					else if  ( eventType == EV_REL ) 

+						x->x_axes++;

+				}

+			}

+		}        

+	}

+	

+	post ("\nUsing %d axes and %d buttons.", x->x_axes, x->x_buttons);

+	post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING");

+	post ("This object is under development!  The interface could change at anytime!");

+	post ("As I write cross-platform versions, the interface might have to change.");

+	post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n");

+	

+	return 1;

 }

 

-static void linuxmouse_float(t_linuxmouse* x)

-{

-    DEBUG(post("linuxmouse_float");)

-   

+static int linuxmouse_read(t_linuxmouse *x,int fd) {

+	int axis_num = 0;

+	t_float button_num = 0;

+	

+	if (x->x_fd < 0) return 0;

+	

+	while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) {

+		if  ( x->x_input_event.type == EV_REL ) {

+			/* Relative Axes Event Type */

+			switch ( x->x_input_event.code ) {

+				case REL_X:

+					axis_num = 0;

+					break;

+				case REL_Y:

+					axis_num = 1;

+					break;

+				case REL_WHEEL:

+					axis_num = 2;

+					break;

+			}

+			outlet_float (x->x_axis_out[axis_num], (int)x->x_input_event.value);	

+		}

+		else if ( x->x_input_event.type == EV_KEY ) {

+			/* key/button event type */

+			switch ( x->x_input_event.code ) {

+				case BTN_LEFT:

+					button_num = 0;

+					break;

+				case BTN_RIGHT:

+					button_num = 1;

+					break;

+				case BTN_MIDDLE:

+					button_num = 2;

+					break;

+				case BTN_SIDE:

+					button_num = 3;

+					break;

+				case BTN_EXTRA:

+					button_num = 4;

+					break;

+				case BTN_FORWARD:

+					button_num = 5;

+					break;

+				case BTN_BACK:

+					button_num = 6;

+					break;

+			}

+			outlet_float (x->x_button_val_out, x->x_input_event.value);

+			outlet_float (x->x_button_num_out, button_num);

+		}

+ 	}	 

+	

+	return 1;    

 }

 

-// DONE

-void linuxmouse_start(t_linuxmouse* x)

-{

-  DEBUG(post("linuxmouse_start");)

-

-    if (x->x_fd >= 0 && !x->started) {

-       sys_addpollfn(x->x_fd, (t_fdpollfn)linuxmouse_read, x);

-       post("linuxmouse: start");

-       x->started = 1;

-    }

-}

+void linuxmouse_start(t_linuxmouse* x) {

+	DEBUG(post("linuxmouse_start"););

 

-

-// DONE

-void linuxmouse_stop(t_linuxmouse* x)

-{

-  DEBUG(post("linuxmouse_stop");)

-

-    if (x->x_fd >= 0 && x->started) { 

-        sys_rmpollfn(x->x_fd);

-        post("linuxmouse: stop");

-        x->started = 0;

-    }

+   if (x->x_fd >= 0 && !x->started) {

+		sys_addpollfn(x->x_fd, (t_fdpollfn)linuxmouse_read, x);

+		post("[linuxmouse] started");

+		x->started = 1;

+	} else {

+		post("You need to set a input device (i.e /dev/input/event0)");

+	}

 }

 

-/* Misc setup functions */

-

-

-static void linuxmouse_free(t_linuxmouse* x)

-{

-  DEBUG(post("linuxmouse_free");)

+/* setup functions */

+static void linuxmouse_free(t_linuxmouse* x) {

+	DEBUG(post("linuxmouse_free"););

     

-    if (x->x_fd < 0) return;

-  

-  linuxmouse_stop(x);

-  

-  close (x->x_fd);

+	if (x->x_fd < 0) return;

+	linuxmouse_stop(x);	

+	close (x->x_fd);

 }

 

-static void *linuxmouse_new(t_symbol *s)

-{

-  int i;

-  t_linuxmouse *x = (t_linuxmouse *)pd_new(linuxmouse_class);

-

-  DEBUG(post("linuxmouse_new");)

-  

-  /* init vars */

-  x->x_fd = -1;

-  x->read_ok = 1;

-  x->started = 0;

-  

-  /* create outlets for each axis */

-  for (i = 0; i < LINUXMOUSE_AXES; i++) 

-    x->x_axis_out[i] = outlet_new(&x->x_obj, &s_float);

-  

-  /* create outlets for buttons */

-  x->x_button_num_out = outlet_new(&x->x_obj, &s_float);

-  x->x_button_val_out = outlet_new(&x->x_obj, &s_float);

-  

-  if (s != &s_)

-    x->x_devname = s;

-  

-  /* Open the device and save settings */

-  

-  if (!linuxmouse_open(x,s)) return x;

-  

-  return (x);

+static void *linuxmouse_new(t_symbol *s) {

+	int i;

+	t_linuxmouse *x = (t_linuxmouse *)pd_new(linuxmouse_class);

+	

+	DEBUG(post("linuxmouse_new"););

+	

+	post("[linuxmouse] %s, written by Hans-Christoph Steiner <hans@eds.org>",version);  

+	

+	/* init vars */

+	x->x_fd = -1;

+	x->read_ok = 1;

+	x->started = 0;

+	

+	/* create outlets for each axis */

+	for (i = 0; i < LINUXMOUSE_AXES; i++) 

+		x->x_axis_out[i] = outlet_new(&x->x_obj, &s_float);

+	

+	/* create outlets for buttons */

+	x->x_button_num_out = outlet_new(&x->x_obj, &s_float);

+	x->x_button_val_out = outlet_new(&x->x_obj, &s_float);

+

+	if (!linuxmouse_open(x,s)) return x;

+	

+	return (x);

 }

 

-

-void linuxmouse_setup(void)

-{

-  DEBUG(post("linuxmouse_setup");)

-  linuxmouse_class = class_new(gensym("linuxmouse"), 

-			     (t_newmethod)linuxmouse_new, 

-			     (t_method)linuxmouse_free,

-			     sizeof(t_linuxmouse),0,A_DEFSYM,0);

-

-  /* add inlet datatype methods */

-  class_addfloat(linuxmouse_class,(t_method) linuxmouse_float);

-  class_addbang(linuxmouse_class,(t_method) linuxmouse_bang);

-

-  /* add inlet message methods */

-  class_addmethod(linuxmouse_class, (t_method) linuxmouse_open,gensym("open"),A_DEFSYM);

-  class_addmethod(linuxmouse_class,(t_method) linuxmouse_close,gensym("close"),0);

-  class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("start"),0);

-  class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("stop"),0);

-  

+void linuxmouse_setup(void) {

+	DEBUG(post("linuxmouse_setup"););

+	linuxmouse_class = class_new(gensym("linuxmouse"), 

+										  (t_newmethod)linuxmouse_new, 

+										  (t_method)linuxmouse_free,

+										  sizeof(t_linuxmouse), 0, A_DEFSYM, 0);

+	

+	/* add inlet message methods */

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_open,gensym("open"),A_DEFSYM,0);

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_close,gensym("close"),0);

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("start"),0);

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("stop"),0);	

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("poll"),0);

+	class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("nopoll"),0);	

 }