Index: apps/plugins/minesweeper.c
===================================================================
--- apps/plugins/minesweeper.c	(revision 13678)
+++ apps/plugins/minesweeper.c	(working copy)
@@ -78,22 +78,27 @@
 
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD)
-#   define MINESWP_UP       BUTTON_SCROLL_BACK
-#   define MINESWP_DOWN     BUTTON_SCROLL_FWD
-#   define MINESWP_QUIT     BUTTON_MENU
-#   define MINESWP_START    BUTTON_SELECT
-#   define MINESWP_TOGGLE   BUTTON_PLAY
-#   define MINESWP_DISCOVER (BUTTON_SELECT | BUTTON_PLAY)
-#   define MINESWP_INFO     (BUTTON_SELECT | BUTTON_MENU)
+#   define MINESWP_SCROLLWHEEL
+#   define MINESWP_UP         BUTTON_MENU
+#   define MINESWP_DOWN       BUTTON_PLAY
+#   define MINESWP_NEXT       BUTTON_SCROLL_FWD
+#   define MINESWP_PREV       BUTTON_SCROLL_BACK
+#   define MINESWP_QUIT       (BUTTON_SELECT | BUTTON_MENU)
+#   define MINESWP_START      BUTTON_SELECT
+#   define MINESWP_TOGGLE_PRE BUTTON_SELECT
+#   define MINESWP_TOGGLE     (BUTTON_SELECT | BUTTON_REL)
+#   define MINESWP_DISCOVER   (BUTTON_SELECT | BUTTON_REPEAT)
+#   define MINESWP_INFO       (BUTTON_SELECT | BUTTON_PLAY)
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
-#   define MINESWP_UP       BUTTON_UP
-#   define MINESWP_DOWN     BUTTON_DOWN
-#   define MINESWP_QUIT     BUTTON_POWER
-#   define MINESWP_START    BUTTON_REC
-#   define MINESWP_TOGGLE   BUTTON_PLAY
-#   define MINESWP_DISCOVER BUTTON_SELECT
-#   define MINESWP_INFO     (BUTTON_REC | BUTTON_PLAY)
+#   define MINESWP_UP         BUTTON_UP
+#   define MINESWP_DOWN       BUTTON_DOWN
+#   define MINESWP_QUIT       BUTTON_POWER
+#   define MINESWP_START_PRE  BUTTON_REC
+#   define MINESWP_START      (BUTTON_REC | BUTTON_REL)
+#   define MINESWP_TOGGLE     BUTTON_PLAY
+#   define MINESWP_DISCOVER   BUTTON_SELECT
+#   define MINESWP_INFO       (BUTTON_REC | BUTTON_REPEAT)
 
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
 #   define MINESWP_UP       BUTTON_UP
@@ -105,9 +110,12 @@
 #   define MINESWP_INFO     BUTTON_MENU
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
+#   define MINESWP_SCROLLWHEEL
 #   define MINESWP_UP       BUTTON_UP
 #   define MINESWP_DOWN     BUTTON_DOWN
 #   define MINESWP_QUIT     BUTTON_POWER
+#   define MINESWP_NEXT     BUTTON_SCROLL_DOWN
+#   define MINESWP_PREV     BUTTON_SCROLL_UP
 #   define MINESWP_START    BUTTON_SELECT
 #   define MINESWP_TOGGLE   BUTTON_REC
 #   define MINESWP_DISCOVER BUTTON_SELECT
@@ -540,6 +548,24 @@
                 y = ( y + height - 1 )%height;
                 break;
 
+            /*move cursor though the entire field*/
+#ifdef MINESWP_SCROLLWHEEL
+            case MINESWP_NEXT:
+            case MINESWP_NEXT|BUTTON_REPEAT:
+                if (x == width -1 ) {
+                    y = ( y + 1 )%height;
+                }
+                x = ( x + 1 )%width;
+                break;
+
+            case MINESWP_PREV:
+            case MINESWP_PREV|BUTTON_REPEAT:
+                if (x == 0) {
+                    y = ( y + height - 1 )%height;
+                }
+                x = ( x + width - 1 )%width;
+                break;
+#endif
             /* discover a tile (and it's neighbors if .neighbors == 0) */
             case MINESWP_DISCOVER:
 #ifdef MINESWP_DISCOVER2