Index: apps/plugins/viewer.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/viewer.c,v
retrieving revision 1.19
diff -u -r1.19 viewer.c
--- apps/plugins/viewer.c	19 Dec 2005 00:11:27 -0000	1.19
+++ apps/plugins/viewer.c	4 Jan 2006 17:14:48 -0000
@@ -118,6 +118,8 @@
 #define VIEWER_LINE_DOWN (BUTTON_ON | BUTTON_DOWN)
 #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT)
 #define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT)
+#define VIEWER_PREV (BUTTON_ON | BUTTON_OFF)
+#define VIEWER_NEXT (BUTTON_ON | BUTTON_SELECT)
 
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define VIEWER_QUIT BUTTON_MENU
@@ -1141,6 +1143,14 @@
                 break;
 
             case VIEWER_SCREEN_LEFT:
+		if (view_mode == WIDE) {
+                    /* Screen left */
+                    col -= draw_columns/glyph_width['o'];
+                    col = col_limit(col);
+		}
+				
+		viewer_draw(col);
+		break;
             case VIEWER_SCREEN_LEFT | BUTTON_REPEAT:
                 if (view_mode == WIDE) {
                     /* Screen left */
@@ -1156,6 +1166,14 @@
                 break;
 
             case VIEWER_SCREEN_RIGHT:
+		if (view_mode == WIDE) {
+                    /* Screen right */
+                    col += draw_columns/glyph_width['o'];
+                    col = col_limit(col);
+		}
+			
+		viewer_draw(col);
+		break;
             case VIEWER_SCREEN_RIGHT | BUTTON_REPEAT:
                 if (view_mode == WIDE) {
                     /* Screen right */
@@ -1238,7 +1256,21 @@
                 viewer_draw(col);
                 break;
 #endif
-
+#ifdef VIEWER_NEXT		
+            case VIEWER_NEXT:
+            case VIEWER_NEXT | BUTTON_REPEAT:
+		rb->audio_next();
+		break;
+		
+#endif
+#ifdef VIEWER_PREV		
+            case VIEWER_PREV:
+            case VIEWER_PREV | BUTTON_REPEAT:
+		rb->audio_prev();
+		break;
+		
+#endif
+	
             default:
                 if (rb->default_event_handler_ex(button, viewer_exit, NULL)
                     == SYS_USB_CONNECTED)