# HG changeset patch
# User Jim Grandpre <jim.tla@gmail.com>
# Date 1276494244 14400
# Node ID 86c171888eee59d18599ca944f2386a59f648db0
# Parent  eea1bf53effa5cc2b0d63d270d7ea91a97915eee
Added gesture test c file. Beginning of gesture recognition.

diff -r eea1bf53effa -r 86c171888eee Makefile.in
--- a/Makefile.in	Tue Jun 01 02:54:33 2010 -0400
+++ b/Makefile.in	Mon Jun 14 01:44:04 2010 -0400
@@ -44,7 +44,7 @@
 
 DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS
 
-HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h
+HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h SDL_touch.h
 
 LT_AGE      = @LT_AGE@
 LT_CURRENT  = @LT_CURRENT@
diff -r eea1bf53effa -r 86c171888eee touchTest/TODO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/touchTest/TODO	Mon Jun 14 01:44:04 2010 -0400
@@ -0,0 +1,1 @@
+Pressure is sometimes negative
diff -r eea1bf53effa -r 86c171888eee touchTest/gestureTest.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/touchTest/gestureTest.c	Mon Jun 14 01:44:04 2010 -0400
@@ -0,0 +1,360 @@
+#include <stdio.h>
+#include <SDL.h>
+#include <math.h>
+#include <SDL_touch.h>
+
+#define PI 3.1415926535897
+#define WIDTH 640
+#define HEIGHT 480
+#define BPP 4
+#define DEPTH 32
+
+#define MAXFINGERS 3
+
+
+
+
+//MUST BE A POWER OF 2!
+#define EVENT_BUF_SIZE 256
+
+SDL_Event events[EVENT_BUF_SIZE];
+int eventWrite;
+
+int mousx,mousy;
+int keystat[512];
+int bstatus;
+
+int colors[7] = {0xFF,0xFF00,0xFF0000,0xFFFF00,0x00FFFF,0xFF00FF,0xFFFFFF};
+
+int index2fingerid[MAXFINGERS];
+int fingersDown;
+
+typedef struct {
+  float x,y;
+} Point;
+
+typedef struct {
+  Point p;
+  float pressure;
+  int id;
+} Finger;
+
+
+Finger finger[MAXFINGERS];
+
+Finger gestureLast[MAXFINGERS];
+
+void handler (int sig)
+{
+  printf ("\exiting...(%d)\n", sig);
+  exit (0);
+}
+
+void perror_exit (char *error)
+{
+  perror (error);
+  handler (9);
+}
+
+
+void setpix(SDL_Surface *screen, int x, int y, unsigned int col)
+{
+  Uint32 *pixmem32;
+  Uint32 colour;
+  
+  if((unsigned)x > screen->w) return;
+  if((unsigned)y > screen->h) return;
+
+  pixmem32 = (Uint32*) screen->pixels  + y*screen->pitch/BPP + x;
+  
+  Uint8 r,g,b;
+  float a;
+  
+  memcpy(&colour,pixmem32,screen->format->BytesPerPixel);
+
+  SDL_GetRGB(colour,screen->format,&r,&g,&b); //Always returns 0xFFFFFF?
+  //r = 0;g = 0; b = 0;
+  a = (col>>24)&0xFF;
+  if(a == 0) a = 0xFF; //Hack, to make things easier.
+  a /= 0xFF;
+  r = r*(1-a) + ((col>>16)&0xFF)*(a);
+  g = g*(1-a) + ((col>> 8)&0xFF)*(a);
+  b = b*(1-a) + ((col>> 0)&0xFF)*(a);
+  colour = SDL_MapRGB( screen->format,r, g, b);
+  
+
+  *pixmem32 = colour;
+}
+
+void drawCircle(SDL_Surface* screen,int x,int y,int r,unsigned int c)
+{
+
+  float a;
+  int tx;
+  /*
+  for(a=0;a<PI/2;a+=1.f/(float)abs(r))
+  {
+    if(r > 0) { //r > 0 ==> filled circle
+      for(tx=x-r*cos(a);tx<x+r*cos(a);tx++) {
+	setpix(screen,tx,(int)(y+r*sin(a)),c);
+	setpix(screen,tx,(int)(y-r*sin(a)),c);
+      }
+    }
+    else {
+      //Draw Outline
+      setpix(screen,(int)(x+r*cos(a)),(int)(y+r*sin(a)),c);
+      setpix(screen,(int)(x-r*cos(a)),(int)(y+r*sin(a)),c);
+      setpix(screen,(int)(x+r*cos(a)),(int)(y-r*sin(a)),c);
+      setpix(screen,(int)(x-r*cos(a)),(int)(y-r*sin(a)),c);
+    }
+    }*/
+  int ty;
+  float xr;
+  for(ty = -abs(r);ty <= abs(r);ty++) {
+    xr = sqrt(r*r - ty*ty);
+    if(r > 0) { //r > 0 ==> filled circle
+      for(tx=-xr+.5;tx<=xr-.5;tx++) {
+	setpix(screen,x+tx,y+ty,c);
+      }
+    }
+    else {
+      setpix(screen,x-xr+.5,y+ty,c);
+      setpix(screen,x+xr-.5,y+ty,c);
+    }
+  }
+}
+
+void DrawScreen(SDL_Surface* screen, int h)
+{
+  int x, y, xm,ym,c;
+  if(SDL_MUSTLOCK(screen))
+    {                                              
+      if(SDL_LockSurface(screen) < 0) return;
+    }
+  for(y = 0; y < screen->h; y++ )
+    {
+      for( x = 0; x < screen->w; x++ )
+        {
+	  //setpixel(screen, x, y, (x*x)/256+3*y+h, (y*y)/256+x+h, h);
+	  //xm = (x+h)%screen->w;
+	  //ym = (y+h)%screen->w;
+	  //c = sin(h/256*2*PI)*x*y/screen->w/screen->h;
+	  //setpix(screen,x,y,255*sin(xm/screen->w*2*PI),sin(h/255*2*PI)*255*y/screen->h,c);
+	  setpix(screen,x,y,((x%255)<<16) + ((y%255)<<8) + (x+y)%255);
+	  //setpix(screen,x,y,0); //Inefficient, but that's okay...
+        }
+    }
+  drawCircle(screen,mousx,mousy,-30,0xFFFFFF);
+  
+  int i;
+//draw Touch History
+  for(i = 0;i < MAXFINGERS;i++) gestureLast[i].id = -1;
+  for(i = SDL_max(0,eventWrite - EVENT_BUF_SIZE);i != eventWrite;i++) {
+    SDL_Event event = events[i&(EVENT_BUF_SIZE-1)];
+    int age = eventWrite - i - 1;
+    if(event.type == SDL_FINGERMOTION || 
+       event.type == SDL_FINGERDOWN ||
+       event.type == SDL_FINGERUP) {
+      SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId);
+      //SDL_Finger* inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
+	    
+      float x = ((float)event.tfinger.x)/inTouch->xres;
+      float y = ((float)event.tfinger.y)/inTouch->yres;
+      int j,empty = -1;
+      for(j = 0;j<MAXFINGERS;j++) {
+	if(gestureLast[j].id == event.tfinger.fingerId) {
+	  if(event.type == SDL_FINGERUP) {
+	    gestureLast[j].id = -1;
+	    break;
+	  }
+	  else {
+	    gestureLast[j].p.x = x;
+	    gestureLast[j].p.y = y;
+	    break;
+	    //pressure?
+	  }	  
+	}
+	else if(gestureLast[j].id == -1 && empty == -1) {
+	  empty = j;
+	}
+      }
+
+      if(j >= MAXFINGERS && empty >= 0) {
+	printf("Finger Down!!!\n");
+	j = empty; //important that j is the index of the added finger
+	gestureLast[j].id = event.tfinger.fingerId;
+	gestureLast[j].p.x  = x;
+	gestureLast[j].p.y  = y;
+      }
+
+      //draw the touch && each centroid:
+
+      if(gestureLast[j].id < 0) continue; //Finger up. Or some error...
+      int k;
+      for(k = 0; k < MAXFINGERS;k++) {
+
+	if(gestureLast[k].id < 0) continue;
+	//colors have no alpha, so shouldn't overflow
+	unsigned int c = (colors[gestureLast[j].id%7] + 
+			  colors[gestureLast[k].id%7])/2; 
+	unsigned int col = 
+	  ((unsigned int)(c*(.1+.85))) |
+	  ((unsigned int)((0xFF*(1-((float)age)/EVENT_BUF_SIZE))) & 0xFF)<<24;
+	x = (gestureLast[j].p.x + gestureLast[k].p.x)/2;
+	y = (gestureLast[j].p.y + gestureLast[k].p.y)/2;
+	if(event.type == SDL_FINGERMOTION)
+	  drawCircle(screen,x*screen->w,y*screen->h,5,col);
+	else if(event.type == SDL_FINGERDOWN)
+	  drawCircle(screen,x*screen->w,y*screen->h,-10,col);
+      }      
+    }
+  }
+  
+
+  for(i=0;i<MAXFINGERS;i++)
+    if(finger[i].p.x >= 0 && finger[i].p.y >= 0)
+      if(finger[i].pressure > 0)
+	drawCircle(screen,finger[i].p.x*screen->w,finger[i].p.y*screen->h
+		   ,20,0xFF*finger[i].pressure);
+      else
+	drawCircle(screen,finger[i].p.x*screen->w,finger[i].p.y*screen->h
+		   ,20,0xFF);
+
+  
+  
+
+  if(SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
+  
+  SDL_Flip(screen);
+}
+
+SDL_Surface* initScreen(int width,int height)
+{
+  return SDL_SetVideoMode(width, height, DEPTH,
+			  SDL_HWSURFACE | SDL_RESIZABLE);
+}
+
+int main(int argc, char* argv[])
+{  
+  SDL_Surface *screen;
+  SDL_Event event;
+  
+  int keypress = 0;
+  int h=0,s=1,i,j;
+
+  memset(keystat,0,512*sizeof(keystat[0]));
+  if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1;
+  
+  if (!(screen = initScreen(WIDTH,HEIGHT)))
+    {
+      SDL_Quit();
+      return 1;
+    }
+
+  while(!keystat[27]) {
+    //Poll SDL
+    while(SDL_PollEvent(&event)) 
+      {
+	//Record _all_ events
+	events[eventWrite & (EVENT_BUF_SIZE-1)] = event;
+	eventWrite++;
+	
+	switch (event.type) 
+	  {
+	  case SDL_QUIT:
+	    keystat[27] = 1;
+	    break;
+	  case SDL_KEYDOWN:
+	    //printf("%i\n",event.key.keysym.sym);
+	    keystat[event.key.keysym.sym] = 1;
+	    //keypress = 1;
+	    break;
+	  case SDL_KEYUP:
+	      //printf("%i\n",event.key.keysym.sym);
+	    keystat[event.key.keysym.sym] = 0;
+	    //keypress = 1;
+	    break;
+	  case SDL_VIDEORESIZE:
+	    if (!(screen = initScreen(event.resize.w,
+				      event.resize.h)))
+	      {
+		SDL_Quit();
+		return 1;
+	      }
+	    break;
+	  case SDL_MOUSEMOTION:
+	    mousx = event.motion.x;
+	    mousy = event.motion.y; 
+	    break;
+	  case SDL_MOUSEBUTTONDOWN:
+	    bstatus |=  (1<<(event.button.button-1));
+	    break;
+	  case SDL_MOUSEBUTTONUP:
+	    bstatus &= ~(1<<(event.button.button-1));
+	    break;
+	  case SDL_FINGERMOTION:    
+	    ;
+	    //printf("Finger: %i,x: %i, y: %i\n",event.tfinger.fingerId,
+	    //	   event.tfinger.x,event.tfinger.y);
+	    SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId);
+	    SDL_Finger* inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
+
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == event.tfinger.fingerId) 	      
+		break;
+	    if(i == MAXFINGERS) break;  
+	    if(inTouch > 0) {
+	      finger[i].p.x = ((float)event.tfinger.x)/
+		inTouch->xres;
+	      finger[i].p.y = ((float)event.tfinger.y)/
+		inTouch->yres;
+	      
+	      finger[i].pressure = 
+		((float)event.tfinger.pressure)/inTouch->pressureres;
+	      
+	      printf("Finger: %i, Pressure: %f Pressureres: %i\n",
+		     event.tfinger.fingerId,
+		     finger[i].pressure,
+		     inTouch->pressureres);
+	      //printf("Finger: %i, pressure: %f\n",event.tfinger.fingerId,
+	      //   finger[event.tfinger.fingerId].pressure);
+	    }
+	    
+	    break;	    
+	  case SDL_FINGERDOWN:
+	    printf("Finger: %i down - x: %i, y: %i\n",event.tfinger.fingerId,
+		   event.tfinger.x,event.tfinger.y);
+
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == -1) {
+		index2fingerid[i] = event.tfinger.fingerId;
+		break;
+	      }
+	    finger[i].p.x = event.tfinger.x;
+	    finger[i].p.y = event.tfinger.y;
+	    break;
+	  case SDL_FINGERUP:
+	    printf("Figner: %i up - x: %i, y: %i\n",event.tfinger.fingerId,
+	           event.tfinger.x,event.tfinger.y);
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == event.tfinger.fingerId) {
+		index2fingerid[i] = -1;
+		break;
+	      }
+	    finger[i].p.x = -1;
+	    finger[i].p.y = -1;
+	    break;
+	  }
+      }
+    //And draw
+    DrawScreen(screen,h);
+    /*
+      for(i=0;i<512;i++) 
+      if(keystat[i]) printf("%i\n",i);
+      printf("Buttons:%i\n",bstatus);
+    */
+  }  
+  SDL_Quit();
+      
+  return 0;
+}
diff -r eea1bf53effa -r 86c171888eee touchTest/makefile
--- a/touchTest/makefile	Tue Jun 01 02:54:33 2010 -0400
+++ b/touchTest/makefile	Mon Jun 14 01:44:04 2010 -0400
@@ -1,4 +1,5 @@
 SDLTest : touchSimp.c touchPong.c
+	gcc gestureTest.c -o gestureTest `sdl-config --cflags --libs` -g
 	gcc touchTest.c -o touchTest `sdl-config --cflags --libs` -g		
 	gcc touchSimp.c -o touchSimp `sdl-config --cflags --libs` -g
 	gcc touchPong.c -o touchPong `sdl-config --cflags --libs` -g