X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=6066335d64e1f2193d93acfcd5da54a8e29081c4;hp=9526f198b7c3e228b4f13e1834eab148d07c4fd9;hb=cf41c74d18630924c1e32ad913d315a493402ef9;hpb=a59ebe8eb3a68db0a2ffcb8ce5127c767737d5ad

diff --git a/src/events.c b/src/events.c
index 9526f198..6066335d 100644
--- a/src/events.c
+++ b/src/events.c
@@ -665,7 +665,6 @@ static struct
 
 static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 {
-#if 1
   int x = event->x * overlay.grid_xsize;
   int y = event->y * overlay.grid_ysize;
   int grid_button = overlay.grid_button[x][y];
@@ -677,30 +676,6 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 	     grid_button == CHAR_GRID_BUTTON_SNAP  ? setup.input[0].key.snap :
 	     grid_button == CHAR_GRID_BUTTON_DROP  ? setup.input[0].key.drop :
 	     KSYM_UNDEFINED);
-#else
-  float ypos = 1.0 - 1.0 / 3.0 * video.display_width / video.display_height;
-  float event_x = (event->x);
-  float event_y = (event->y - ypos) / (1 - ypos);
-  Key key = (event_x > 0         && event_x < 1.0 / 6.0 &&
-	     event_y > 2.0 / 3.0 && event_y < 1 ?
-	     setup.input[0].key.snap :
-	     event_x > 1.0 / 6.0 && event_x < 1.0 / 3.0 &&
-	     event_y > 2.0 / 3.0 && event_y < 1 ?
-	     setup.input[0].key.drop :
-	     event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
-	     event_y > 0         && event_y < 1.0 / 3.0 ?
-	     setup.input[0].key.up :
-	     event_x > 6.0 / 9.0 && event_x < 7.0 / 9.0 &&
-	     event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
-	     setup.input[0].key.left :
-	     event_x > 8.0 / 9.0 && event_x < 1 &&
-	     event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
-	     setup.input[0].key.right :
-	     event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
-	     event_y > 2.0 / 3.0 && event_y < 1 ?
-	     setup.input[0].key.down :
-	     KSYM_UNDEFINED);
-#endif
   int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
 		    KEY_PRESSED);
   char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :