Index: apps/bookmark.c
===================================================================
RCS file: /cvsroot/rockbox/apps/bookmark.c,v
retrieving revision 1.47
diff -u -r1.47 bookmark.c
--- apps/bookmark.c	21 Jan 2006 23:43:56 -0000	1.47
+++ apps/bookmark.c	2 Apr 2006 17:42:54 -0000
@@ -430,7 +430,7 @@
         lcd_clear_display();
         gui_syncstatusbar_draw(&statusbars, false);
 #ifdef HAVE_LCD_BITMAP
-        lcd_setmargins(0, STATUSBAR_HEIGHT);
+        lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
         lcd_puts_scroll(0,0, str(LANG_BOOKMARK_AUTOLOAD_QUERY));
         lcd_puts(0,1, str(LANG_CONFIRM_WITH_PLAY_RECORDER));
         lcd_puts(0,2, str(LANG_BOOKMARK_SELECT_LIST_BOOKMARKS));
@@ -556,9 +556,9 @@
     int bookmark_count = 0;
 
 #ifdef HAVE_LCD_BITMAP
-    int x = lcd_getxmargin();
+    int x = lcd_getleftmargin();
     int y = lcd_getymargin();
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
 
     bookmark_count = get_bookmark_count(bookmark_file_name);
@@ -610,9 +610,9 @@
                 /* User wants to use this bookmark */
 #ifdef HAVE_LCD_BITMAP
                 if (global_settings.statusbar)
-                    lcd_setmargins(0, STATUSBAR_HEIGHT);
+                    lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
                 else
-                    lcd_setmargins(0, 0);
+                    lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
                 return bookmark;
 
@@ -643,7 +643,7 @@
             case SETTINGS_OK2:
 #endif
 #ifdef HAVE_LCD_BITMAP
-                lcd_setmargins(x, y);
+                lcd_setmargins(x, LCD_WIDTH, y);
 #endif
                 return NULL;
 
Index: apps/debug_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/debug_menu.c,v
retrieving revision 1.176
diff -u -r1.176 debug_menu.c
--- apps/debug_menu.c	26 Mar 2006 17:09:32 -0000	1.176
+++ apps/debug_menu.c	2 Apr 2006 17:56:53 -0000
@@ -86,7 +86,7 @@
     int i;
     int usage;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
     lcd_clear_display();
 
@@ -162,7 +162,7 @@
     int button;
     struct audio_debug d;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
     
     while(1)
@@ -236,7 +236,7 @@
 
     tick_add_task(dbg_audio_task);
     
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
     
     while(!done)
@@ -479,7 +479,7 @@
 
     system_memory_guard(oldmode);  /* re-enable memory guard */
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
     lcd_clear_display();
 
@@ -544,7 +544,7 @@
     
     system_memory_guard(oldmode);  /* re-enable memory guard */
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
     lcd_clear_display();
 
@@ -732,7 +732,7 @@
     unsigned int interruptstat;
     bool valnogood, symbolerr, parityerr;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_clear_display();
     lcd_setfont(FONT_SYSFIXED);
 
@@ -893,7 +893,7 @@
     int batt_int, batt_frac;
 
     lcd_setfont(FONT_SYSFIXED);
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_clear_display();
 
     while(1)
@@ -956,7 +956,7 @@
     int battery_voltage;
     int batt_int, batt_frac;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_clear_display();
     lcd_setfont(FONT_SYSFIXED);
 
@@ -1041,7 +1041,7 @@
     int button;
     int line;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_clear_display();
     lcd_setfont(FONT_SYSFIXED);
 
@@ -1207,7 +1207,7 @@
     int button;
 
 #ifdef HAVE_LCD_BITMAP
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
 #endif
     lcd_clear_display();
@@ -1284,7 +1284,7 @@
     unsigned short maxv, minv;
     char buf[32];
     
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
 
     while(1)
@@ -1556,7 +1556,7 @@
     
     card_name[6] = '\0';
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
 
     while (!done)
@@ -1660,7 +1660,7 @@
     char pio3[2], pio4[2];
 
 #ifdef HAVE_LCD_BITMAP
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
     
     while(!done)
@@ -1826,7 +1826,7 @@
     int line;
     char buf[32];
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
 
     while (!done)
@@ -1884,7 +1884,7 @@
     int line;
     char buf[32];
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_setfont(FONT_SYSFIXED);
 
     while (!done)
@@ -1965,7 +1965,7 @@
     bool fm_detected;
 
 #ifdef HAVE_LCD_BITMAP
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
 
     while(1)
Index: apps/logfdisp.c
===================================================================
RCS file: /cvsroot/rockbox/apps/logfdisp.c,v
retrieving revision 1.8
diff -u -r1.8 logfdisp.c
--- apps/logfdisp.c	23 Mar 2006 13:47:48 -0000	1.8
+++ apps/logfdisp.c	2 Apr 2006 17:42:54 -0000
@@ -70,7 +70,7 @@
     if(!lines)
         return false;
 
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
     lcd_clear_display();
     
     do {
Index: apps/onplay.c
===================================================================
RCS file: /cvsroot/rockbox/apps/onplay.c,v
retrieving revision 1.78
diff -u -r1.78 onplay.c
--- apps/onplay.c	26 Mar 2006 11:33:41 -0000	1.78
+++ apps/onplay.c	2 Apr 2006 17:42:54 -0000
@@ -940,9 +940,9 @@
 
 #ifdef HAVE_LCD_BITMAP
         if (global_settings.statusbar)
-            lcd_setmargins(0, STATUSBAR_HEIGHT);
+            lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
         else
-            lcd_setmargins(0, 0);
+            lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
     }
 
Index: apps/pcm_recording.c
===================================================================
RCS file: /cvsroot/rockbox/apps/pcm_recording.c,v
retrieving revision 1.6
diff -u -r1.6 pcm_recording.c
--- apps/pcm_recording.c	14 Sep 2005 10:55:45 -0000	1.6
+++ apps/pcm_recording.c	2 Apr 2006 17:42:54 -0000
@@ -71,7 +71,7 @@
 
     lcd_setfont(FONT_SYSFIXED);
     lcd_getstringsize("M", &w, &h);
-    lcd_setmargins(0, 8);
+    lcd_setmargins(0, LCD_WIDTH, 8);
 
     play_vol = 120;
 
Index: apps/playlist.c
===================================================================
RCS file: /cvsroot/rockbox/apps/playlist.c,v
retrieving revision 1.146
diff -u -r1.146 playlist.c
--- apps/playlist.c	1 Apr 2006 13:36:33 -0000	1.146
+++ apps/playlist.c	2 Apr 2006 17:42:54 -0000
@@ -465,9 +465,9 @@
     
 #ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
-        lcd_setmargins(0, STATUSBAR_HEIGHT);
+        lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
     else
-        lcd_setmargins(0, 0);
+        lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
 
     gui_syncsplash(0, true, str(LANG_PLAYLIST_LOAD));
@@ -1602,9 +1602,9 @@
 
 #ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
-        lcd_setmargins(0, STATUSBAR_HEIGHT);
+        lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
     else
-        lcd_setmargins(0, 0);
+        lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
 
     gui_syncsplash(0, true, fmt, count,
Index: apps/plugin.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugin.c,v
retrieving revision 1.165
diff -u -r1.165 plugin.c
--- apps/plugin.c	28 Mar 2006 16:18:21 -0000	1.165
+++ apps/plugin.c	2 Apr 2006 17:42:54 -0000
@@ -499,9 +499,9 @@
     plugin_loaded = true;
 
 #ifdef HAVE_LCD_BITMAP
-    xm = lcd_getxmargin();
+    xm = lcd_getleftmargin();
     ym = lcd_getymargin();
-    lcd_setmargins(0,0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 #ifdef HAVE_LCD_COLOR
     old_backdrop = lcd_get_backdrop();
     lcd_set_backdrop(NULL);
@@ -513,9 +513,9 @@
 #endif
 
 #ifdef HAVE_REMOTE_LCD
-    rxm = lcd_remote_getxmargin();
+    rxm = lcd_remote_getleftmargin();
     rym = lcd_remote_getymargin();
-    lcd_remote_setmargins(0, 0);
+    lcd_remote_setmargins(0, LCD_REMOTE_WIDTH, 0);
     lcd_remote_clear_display();
     lcd_remote_update();
 #endif
@@ -539,7 +539,7 @@
     lcd_set_drawmode(DRMODE_SOLID);
 #endif /* LCD_DEPTH */
     /* restore margins */
-    lcd_setmargins(xm,ym);
+    lcd_setmargins(xm, LCD_WIDTH, ym);
 #ifdef HAVE_LCD_COLOR
     lcd_set_backdrop(old_backdrop);
 #endif
@@ -549,7 +549,7 @@
 
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_drawmode(DRMODE_SOLID);
-    lcd_remote_setmargins(rxm, rym);
+    lcd_remote_setmargins(rxm, LCD_REMOTE_WIDTH, rym);
     lcd_remote_clear_display();
     lcd_remote_update();
 #endif
Index: apps/screen_access.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screen_access.c,v
retrieving revision 1.22
diff -u -r1.22 screen_access.c
--- apps/screen_access.c	10 Feb 2006 13:57:11 -0000	1.22
+++ apps/screen_access.c	2 Apr 2006 17:42:54 -0000
@@ -46,7 +46,8 @@
             screen->height=LCD_REMOTE_HEIGHT;
             screen->setmargins=&lcd_remote_setmargins;
             screen->getymargin=&lcd_remote_getymargin;
-            screen->getxmargin=&lcd_remote_getxmargin;
+            screen->getleftmargin=&lcd_remote_getleftmargin;
+            screen->getrightmargin=&lcd_remote_getrightmargin;            
             screen->setfont=&lcd_remote_setfont;
             screen->setfont(FONT_UI);
             screen->getstringsize=&lcd_remote_getstringsize;
@@ -116,7 +117,8 @@
             screen->height=LCD_HEIGHT;
             screen->setmargins=&lcd_setmargins;
             screen->getymargin=&lcd_getymargin;
-            screen->getxmargin=&lcd_getxmargin;
+            screen->getleftmargin=&lcd_getleftmargin;
+            screen->getrightmargin=&lcd_getrightmargin;            
             screen->setfont=&lcd_setfont;
             screen->setfont(FONT_UI);
             screen->getstringsize=&lcd_getstringsize;
Index: apps/screen_access.h
===================================================================
RCS file: /cvsroot/rockbox/apps/screen_access.h,v
retrieving revision 1.24
diff -u -r1.24 screen_access.h
--- apps/screen_access.h	10 Feb 2006 13:57:11 -0000	1.24
+++ apps/screen_access.h	2 Apr 2006 17:42:54 -0000
@@ -62,8 +62,9 @@
 #endif
 
 #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */
-    void (*setmargins)(int x, int y);
-    int (*getxmargin)(void);
+    void (*setmargins)(int x1, int x2, int y);
+    int (*getleftmargin)(void);
+    int (*getrightmargin)(void);    
     int (*getymargin)(void);
 
     void (*setfont)(int newfont);
@@ -150,10 +151,10 @@
 /*
  * Sets the x margin in pixels for the given screen
  * - screen : the screen structure
- * - xmargin : the number of pixels to the left of the screen
+ * - leftmargin : the number of pixels to the left of the screen
  */
 #define screen_set_xmargin(screen, xmargin) \
-    (screen)->setmargins(xmargin, (screen)->getymargin());
+    (screen)->setmargins(xmargin, LCD_WIDTH, (screen)->getymargin());
 
 /*
  * Sets the y margin in pixels for the given screen
@@ -161,7 +162,7 @@
  * - xmargin : the number of pixels to the top of the screen
  */
 #define screen_set_ymargin(screen, ymargin) \
-    (screen)->setmargins((screen)->getxmargin(), ymargin);
+    (screen)->setmargins((screen)->getleftmargin(), LCD_WIDTH, ymargin);
 
 #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD)
 /*
Index: apps/screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.148
diff -u -r1.148 screens.c
--- apps/screens.c	2 Apr 2006 10:41:16 -0000	1.148
+++ apps/screens.c	2 Apr 2006 17:51:28 -0000
@@ -481,11 +481,12 @@
     struct option_select left_option;
     struct option_select bottom_option;
     struct option_select right_option;
-    int old_x_margin, old_y_margin;
+    int old_left_margin, old_right_margin, old_y_margin;
 
-    old_x_margin = lcd_getxmargin();
+    old_left_margin = lcd_getleftmargin();
+    old_right_margin = lcd_getrightmargin();
     old_y_margin = lcd_getymargin();
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 
     static const struct opt_items left_items[] = {
         [0]={ STR(LANG_OFF) },
@@ -548,7 +549,7 @@
         }
         settings_save();
     }
-    lcd_setmargins(old_x_margin, old_y_margin);
+    lcd_setmargins(old_left_margin, old_right_margin, old_y_margin);
     return(res);
 }
 
@@ -571,11 +572,12 @@
     struct option_select left_option;
     struct option_select bottom_option;
     struct option_select right_option;
-    int old_x_margin, old_y_margin;
+    int old_left_margin, old_right_margin, old_y_margin;
 
-    old_x_margin = lcd_getxmargin();
+    old_left_margin = lcd_getleftmargin();
+    old_right_margin = lcd_getrightmargin();
     old_y_margin = lcd_getymargin();
-    lcd_setmargins(0, 0);
+    lcd_setmargins(0, LCD_WIDTH, 0);
 
     static const struct opt_items onoff_items[] = {
         [0]={ STR(LANG_OFF) },
@@ -608,7 +610,7 @@
     res=gui_syncquickscreen_run(&qs, button_enter);
     if(!res)
         settings_save();
-    lcd_setmargins(old_x_margin, old_y_margin);
+    lcd_setmargins(old_left_margin, old_right_margin, old_y_margin);
     return(res);
 }
 #endif /* BUTTON_F3 */
@@ -715,9 +717,9 @@
 
 #ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
-        lcd_setmargins(0, STATUSBAR_HEIGHT);
+        lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
     else
-        lcd_setmargins(0, 0);
+        lcd_setmargins(0, LCD_WIDTH, 0);
 #endif
     lcd_clear_display();
     lcd_puts_scroll(0, 0, string);
@@ -1016,7 +1018,7 @@
     }
 
 #if defined(HAVE_LCD_BITMAP)
-    lcd_setmargins(show_scrollbar ? SCROLLBAR_WIDTH : 0, y_margin);
+    lcd_setmargins(show_scrollbar ? SCROLLBAR_WIDTH : 0, LCD_WIDTH, y_margin);
 #endif
 
     while (!exit)
Index: apps/sound_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/sound_menu.c,v
retrieving revision 1.101
diff -u -r1.101 sound_menu.c
--- apps/sound_menu.c	29 Mar 2006 08:47:04 -0000	1.101
+++ apps/sound_menu.c	2 Apr 2006 17:42:54 -0000
@@ -520,7 +520,7 @@
     int exit_request = false;
     enum trigger_menu_option selected = TRIGGER_MODE;
     bool retval = false;
-    int old_x_margin, old_y_margin;
+    int old_left_margin, old_right_margin, old_y_margin;
 
 #define TRIGGER_MODE_COUNT 3
     static const unsigned char *trigger_modes[] = {
@@ -565,12 +565,13 @@
 
     lcd_clear_display();
 
-    old_x_margin = lcd_getxmargin();
+    old_left_margin = lcd_getleftmargin();
+    old_right_margin = lcd_getrightmargin();
     old_y_margin = lcd_getymargin();
     if(global_settings.statusbar)
-        lcd_setmargins(0, STATUSBAR_HEIGHT);
+        lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT);
     else
-        lcd_setmargins(0, 0);
+        lcd_setmargins(0, LCD_WIDTH, 0);
 
     lcd_getstringsize("M", &w, &h);
 
@@ -813,7 +814,7 @@
 
     peak_meter_trigger(false);
     lcd_setfont(FONT_UI);
-    lcd_setmargins(old_x_margin, old_y_margin);
+    lcd_setmargins(old_left_margin, old_right_margin, old_y_margin);
     return retval;
 }
 #endif
Index: apps/gui/gwps-common.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/gwps-common.c,v
retrieving revision 1.46
diff -u -r1.46 gwps-common.c
--- apps/gui/gwps-common.c	28 Mar 2006 10:07:34 -0000	1.46
+++ apps/gui/gwps-common.c	2 Apr 2006 17:42:54 -0000
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include "system.h"
 #include "settings.h"
 #include "rtc.h"
@@ -1263,6 +1264,35 @@
             case 0:
                 *buf++ = '%';
                 break;
+
+            case 'm': /* margins */
+            {
+                int x1=0;
+                int x2=gwps->display->width;
+
+                fmt++;
+                if (*fmt=='|') {
+                    char *p=strchr(fmt, '|');
+                    if (p) {
+                        fmt = ++p;
+                        if (isdigit(*p)) {
+                            x1=atoi(p);
+                            p=strchr(p, '|');
+                            if (p) {
+                                fmt = ++p;
+                                if (isdigit(*p)) {
+                                    x2=atoi(p);
+                                    p=strchr(p, '|');
+                                    if (p)
+                                        fmt = ++p;
+                                }
+                            }
+                        }
+                    }
+                }
+                gwps->display->setmargins( x1, x2, gwps->display->getymargin() );
+            } break;
+
             case 'a':
                 ++fmt;
                 /* remember where the current aligned text started */
@@ -1355,7 +1385,7 @@
                 level++;
                 break;
 
-            default:
+            default:            
                 value = get_tag(gwps->data, id3, nid3, fmt, temp_buf,
                                 sizeof(temp_buf), &tag_length,
                                 subline_time_mult, flags,&intval);
@@ -1803,7 +1833,7 @@
             else {
                 left_width = 0;
             }
-            left_xpos = 0;
+            left_xpos = display->getleftmargin();
 
             if (data->format_align[i][data->curr_subline[i]].center != 0) {
                 display->getstringsize((unsigned char *)data->format_align[i]
@@ -1813,7 +1843,7 @@
             else {
                 center_width = 0;
             }
-            center_xpos=(display->width - center_width) / 2;
+            center_xpos=(display->getrightmargin()-display->getleftmargin() - center_width) / 2 + display->getleftmargin();
 
             if (data->format_align[i][data->curr_subline[i]].right != 0) {
                 display->getstringsize((unsigned char *)data->format_align[i]
@@ -1823,7 +1853,7 @@
             else {
                 right_width = 0;
             }
-            right_xpos = (display->width - right_width);
+            right_xpos = (display->getrightmargin() - right_width);
 
             /* Checks for overlapping strings.
                If needed the overlapping strings will be merged, separated by a
@@ -1867,7 +1897,7 @@
                   data->format_align[i][data->curr_subline[i]].center;
                 /* calculate the new width and position of the merged string */
                 right_width = center_width + space_width + right_width;
-                right_xpos = (display->width - right_width);
+                right_xpos = (display->getrightmargin() - right_width);
                 /* there is no centered string anymore */
                 center_width = 0;
             }
@@ -1879,7 +1909,7 @@
                   data->format_align[i][data->curr_subline[i]].center;
                 /* calculate the new width and position of the string */
                 right_width = center_width;
-                right_xpos = (display->width - right_width);
+                right_xpos = (display->getrightmargin() - right_width);
                 /* there is no centered string anymore */
                 center_width = 0;
             }
@@ -1923,7 +1953,10 @@
                     ypos = (i*string_height)+display->getymargin();
                     update_line = true;
 
-                    if (left_width>display->width) {
+                    if ((left_width > display->width) || 
+                       (display->getrightmargin()-display->getleftmargin() < left_width) ||
+                       (display->getrightmargin()-display->getleftmargin() < center_width) ||
+                       (display->getrightmargin()-display->getleftmargin() < right_width)) {
                         display->puts_scroll(0, i,
                                              (unsigned char *)data->format_align[i]
                                              [data->curr_subline[i]].left);
@@ -1956,6 +1989,7 @@
                                             (unsigned char *)data->format_align[i]
                                             [data->curr_subline[i]].right);
                         }
+                        
                     }
 #else
                     display->puts_scroll(0, i, buf);
@@ -2001,6 +2035,8 @@
                                         (unsigned char *)data->format_align[i]
                                         [data->curr_subline[i]].right);
                     }
+                    
+                   
 #else
                     update_line = true;
                     display->puts(0, i, buf);
Index: apps/gui/gwps.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/gwps.c,v
retrieving revision 1.34
diff -u -r1.34 gwps.c
--- apps/gui/gwps.c	2 Apr 2006 10:41:16 -0000	1.34
+++ apps/gui/gwps.c	2 Apr 2006 17:42:54 -0000
@@ -74,11 +74,10 @@
 {
     int offset = 0;
     struct wps_data *data = gwps->data;
-    if(data->wps_sb_tag && data->show_sb_on_wps)
+    if((data->wps_sb_tag && data->show_sb_on_wps) || 
+       (global_settings.statusbar && !data->wps_sb_tag))
         offset = STATUSBAR_HEIGHT;
-    else if ( global_settings.statusbar && !data->wps_sb_tag)
-        offset = STATUSBAR_HEIGHT;
-    gwps->display->setmargins(0, offset);
+    gwps->display->setmargins(0, gwps->display->width, offset);
 }
 #endif
 
Index: apps/gui/list.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/list.c,v
retrieving revision 1.19
diff -u -r1.19 list.c
--- apps/gui/list.c	9 Mar 2006 22:26:22 -0000	1.19
+++ apps/gui/list.c	2 Apr 2006 17:42:54 -0000
@@ -84,7 +84,7 @@
     int line_ypos=display->getymargin()+display->char_height*selected_line;
     if (global_settings.invert_cursor)
     {
-        int line_xpos=display->getxmargin();
+        int line_xpos=display->getleftmargin();
         display->set_drawmode(DRMODE_COMPLEMENT);
         display->fillrect(line_xpos, line_ypos, display->width,
                           display->char_height);
Index: apps/recorder/recording.c
===================================================================
RCS file: /cvsroot/rockbox/apps/recorder/recording.c,v
retrieving revision 1.104
diff -u -r1.104 recording.c
--- apps/recorder/recording.c	1 Apr 2006 15:52:06 -0000	1.104
+++ apps/recorder/recording.c	2 Apr 2006 17:42:54 -0000
@@ -583,7 +583,7 @@
     {
         screens[i].setfont(FONT_SYSFIXED);
         screens[i].getstringsize("M", &w, &h);
-        screens[i].setmargins(global_settings.invert_cursor ? 0 : w, 8);
+        screens[i].setmargins(global_settings.invert_cursor ? 0 : w, screens[i].width, 8);
     }
     
     if(rec_create_directory() > 0)
@@ -920,7 +920,7 @@
                     FOR_NB_SCREENS(i)
                     {
                         screens[i].setfont(FONT_SYSFIXED);
-                        screens[i].setmargins(global_settings.invert_cursor ? 0 : w, 8);
+                        screens[i].setmargins(global_settings.invert_cursor ? 0 : w, screens[i].width, 8);
                     }
                 }
                 break;
Index: firmware/logf.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/logf.c,v
retrieving revision 1.8
diff -u -r1.8 logf.c
--- firmware/logf.c	30 Jun 2005 15:14:33 -0000	1.8
+++ firmware/logf.c	2 Apr 2006 17:42:54 -0000
@@ -52,7 +52,7 @@
     lcd_remote_getstringsize("A", &w, &h);
     lines = LCD_REMOTE_HEIGHT/h;
     columns = LCD_REMOTE_WIDTH/w;
-    lcd_remote_setmargins(0, 0);
+    lcd_remote_setmargins(0, LCD_REMOTE_WIDTH, 0);
     lcd_remote_clear_display();
     
     index = logfindex;
Index: firmware/drivers/lcd-16bit.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-16bit.c,v
retrieving revision 1.29
diff -u -r1.29 lcd-16bit.c
--- firmware/drivers/lcd-16bit.c	22 Mar 2006 09:53:27 -0000	1.29
+++ firmware/drivers/lcd-16bit.c	2 Apr 2006 17:42:54 -0000
@@ -51,7 +51,8 @@
 static unsigned fg_pattern IDATA_ATTR = LCD_DEFAULT_FG;
 static unsigned bg_pattern IDATA_ATTR = LCD_DEFAULT_BG;
 static int drawmode = DRMODE_SOLID;
-static int xmargin = 0;
+static int leftmargin = 0;
+static int rightmargin = LCD_WIDTH;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
 
@@ -127,15 +128,21 @@
     bg_pattern = bg_color;
 }
 
-void lcd_setmargins(int x, int y)
+void lcd_setmargins(int x1, int x2, int y)
 {
-    xmargin = x;
+    leftmargin = x1;
+    rightmargin = x2;
     ymargin = y;
 }
 
-int lcd_getxmargin(void)
+int lcd_getleftmargin(void)
 {
-    return xmargin;
+    return leftmargin;
+}
+
+int lcd_getrightmargin(void)
+{
+    return rightmargin;
 }
 
 int lcd_getymargin(void)
@@ -791,13 +798,16 @@
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / utf8length(str);
+    xpos = leftmargin + x*w / utf8length(str);
     ypos = ymargin + y*h;
     drawmode = (style & STYLE_INVERT) ?
                (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
     lcd_putsxyofs(xpos, ypos, offset, str);
     drawmode ^= DRMODE_INVERSEVID;
-    lcd_fillrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
+    lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h);
+    if (LCD_WIDTH>rightmargin) {
+        lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h);
+    }
     drawmode = lastmode;
 }
 
@@ -874,7 +884,7 @@
 
     lcd_getstringsize(string, &w, &h);
 
-    if (LCD_WIDTH - x * 8 - xmargin < w) {
+    if (rightmargin - x * 8 - leftmargin < w) {
         /* prepare scroll line */
         char *end;
 
@@ -887,7 +897,7 @@
         /* scroll bidirectional or forward only depending on the string
            width */
         if ( bidir_limit ) {
-            s->bidir = s->width < (LCD_WIDTH - xmargin) *
+            s->bidir = s->width < (rightmargin - leftmargin) *
                 (100 + bidir_limit) / 100;
         }
         else
@@ -900,12 +910,14 @@
         }
 
         end = strchr(s->line, '\0');
-        strncpy(end, string, LCD_WIDTH/2);
+        strncpy(end, string, rightmargin/2);
 
         s->len = utf8length(string);
         s->offset = offset;
         s->startx = x;
         s->backward = false;
+        s->left_margin=leftmargin;
+        s->right_margin=rightmargin;
         scrolling_lines |= (1<<y);
     }
     else
@@ -942,7 +954,7 @@
                 s->offset += scroll_step;
 
             pf = font_get(curfont);
-            xpos = xmargin + s->startx * s->width / s->len;
+            xpos = s->left_margin + s->startx * s->width / s->len;
             ypos = ymargin + index * pf->height;
 
             if (s->bidir) { /* scroll bidirectional */
@@ -952,9 +964,9 @@
                     s->backward = false;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
-                if (s->offset >= s->width - (LCD_WIDTH - xpos)) {
+                if (s->offset >= s->width - (s->right_margin - xpos)) {
                     /* at end of line */
-                    s->offset = s->width - (LCD_WIDTH - xpos);
+                    s->offset = s->width - (s->right_margin - xpos);
                     s->backward = true;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
@@ -969,8 +981,12 @@
             drawmode = s->invert ? 
                        (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
             lcd_putsxyofs(xpos, ypos, s->offset, s->line);
+            if (LCD_WIDTH>s->right_margin) {
+            drawmode ^= DRMODE_INVERSEVID;
+                lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height);
+            }
             drawmode = lastmode;
-            lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+            lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height);
         }
 
         sleep(scroll_ticks);
Index: firmware/drivers/lcd-2bit-horz.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-2bit-horz.c,v
retrieving revision 1.11
diff -u -r1.11 lcd-2bit-horz.c
--- firmware/drivers/lcd-2bit-horz.c	1 Apr 2006 23:48:03 -0000	1.11
+++ firmware/drivers/lcd-2bit-horz.c	2 Apr 2006 17:42:54 -0000
@@ -132,15 +132,21 @@
     lcd_set_background(bg_brightness);
 }
 
-void lcd_setmargins(int x, int y)
+void lcd_setmargins(int x1, int x2, int y)
 {
-    xmargin = x;
+    leftmargin = x1;
+    rightmargin = x2;
     ymargin = y;
 }
 
-int lcd_getxmargin(void)
+int lcd_getleftmargin(void)
 {
-    return xmargin;
+    return leftmargin;
+}
+
+int lcd_getrightmargin(void)
+{
+    return rightmargin;
 }
 
 int lcd_getymargin(void)
Index: firmware/drivers/lcd-h100-remote.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-h100-remote.c,v
retrieving revision 1.47
diff -u -r1.47 lcd-h100-remote.c
--- firmware/drivers/lcd-h100-remote.c	22 Mar 2006 09:53:27 -0000	1.47
+++ firmware/drivers/lcd-h100-remote.c	2 Apr 2006 17:42:54 -0000
@@ -80,7 +80,8 @@
                                      IBSS_ATTR;
 
 static int drawmode = DRMODE_SOLID;
-static int xmargin = 0;
+static int leftmargin = 0;
+static int rightmargin = LCD_REMOTE_WIDTH;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
 #ifndef SIMULATOR
@@ -589,15 +590,21 @@
     return drawmode;
 }
 
-void lcd_remote_setmargins(int x, int y)
+void lcd_remote_setmargins(int x1, int x2, int y)
 {
-    xmargin = x;
+    leftmargin = x1;
+    rightmargin = x2;    
     ymargin = y;
 }
 
-int lcd_remote_getxmargin(void)
+int lcd_remote_getleftmargin(void)
 {
-    return xmargin;
+    return leftmargin;
+}
+
+int lcd_remote_getrightmargin(void)
+{
+    return rightmargin;
 }
 
 int lcd_remote_getymargin(void)
@@ -1174,7 +1181,7 @@
         return;
 
     lcd_remote_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / utf8length((char *)str);
+    xpos = leftmargin + x*w / utf8length((char *)str);
     ypos = ymargin + y*h;
     drawmode = (style & STYLE_INVERT) ?
                (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
@@ -1257,7 +1264,7 @@
 
     lcd_remote_getstringsize(string, &w, &h);
 
-    if (LCD_REMOTE_WIDTH - x * 8 - xmargin < w) {
+    if (LCD_REMOTE_WIDTH - x * 8 - leftmargin < w) {
         /* prepare scroll line */
         char *end;
 
@@ -1270,7 +1277,7 @@
         /* scroll bidirectional or forward only depending on the string
            width */
         if ( bidir_limit ) {
-            s->bidir = s->width < (LCD_REMOTE_WIDTH - xmargin) *
+            s->bidir = s->width < (LCD_REMOTE_WIDTH - leftmargin) *
                 (100 + bidir_limit) / 100;
         }
         else
@@ -1334,7 +1341,7 @@
                 s->offset += scroll_step;
 
             pf = font_get(curfont);
-            xpos = xmargin + s->startx * s->width / s->len;
+            xpos = leftmargin + s->startx * s->width / s->len;
             ypos = ymargin + index * pf->height;
 
             if (s->bidir) { /* scroll bidirectional */
Index: firmware/drivers/lcd-h100.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-h100.c,v
retrieving revision 1.46
diff -u -r1.46 lcd-h100.c
--- firmware/drivers/lcd-h100.c	22 Mar 2006 09:53:27 -0000	1.46
+++ firmware/drivers/lcd-h100.c	2 Apr 2006 17:42:54 -0000
@@ -77,7 +77,8 @@
 static unsigned fg_pattern IDATA_ATTR = 0xFF; /* initially black */
 static unsigned bg_pattern IDATA_ATTR = 0x00; /* initially white */
 static int drawmode = DRMODE_SOLID;
-static int xmargin = 0;
+static int leftmargin = 0;
+static int rightmargin = 0;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
 
@@ -327,17 +328,25 @@
     lcd_set_background(bg_brightness);
 }
 
-void lcd_setmargins(int x, int y)
+void lcd_setmargins(int x1, int x2, int y)
 {
-    xmargin = x;
+    leftmargin = x1;
+    rightmargin = x2;
     ymargin = y;
+    
+}
+
+int lcd_getleftmargin(void)
+{
+    return leftmargin;
 }
 
-int lcd_getxmargin(void)
+int lcd_getrightmargin(void)
 {
-    return xmargin;
+    return rightmargin;
 }
 
+
 int lcd_getymargin(void)
 {
     return ymargin;
@@ -1090,13 +1099,16 @@
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / utf8length((char *)str);
+    xpos = leftmargin + x*w / utf8length((char *)str);
     ypos = ymargin + y*h;
     drawmode = (style & STYLE_INVERT) ?
                (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
     lcd_putsxyofs(xpos, ypos, offset, str);
     drawmode ^= DRMODE_INVERSEVID;
-    lcd_fillrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
+    lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h);
+    if (LCD_WIDTH>rightmargin) {
+        lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h);
+    }
     drawmode = lastmode;
 }
 
@@ -1173,7 +1185,7 @@
 
     lcd_getstringsize(string, &w, &h);
 
-    if (LCD_WIDTH - x * 8 - xmargin < w) {
+    if (rightmargin - x * 8 - leftmargin < w) {
         /* prepare scroll line */
         char *end;
 
@@ -1186,7 +1198,7 @@
         /* scroll bidirectional or forward only depending on the string
            width */
         if ( bidir_limit ) {
-            s->bidir = s->width < (LCD_WIDTH - xmargin) *
+            s->bidir = s->width < (rightmargin - leftmargin) *
                 (100 + bidir_limit) / 100;
         }
         else
@@ -1199,12 +1211,14 @@
         }
 
         end = strchr(s->line, '\0');
-        strncpy(end, (char *)string, LCD_WIDTH/2);
+        strncpy(end, (char *)string, rightmargin/2);
 
         s->len = utf8length((char *)string);
         s->offset = offset;
         s->startx = x;
         s->backward = false;
+        s->left_margin=leftmargin;
+        s->right_margin=rightmargin;
         scrolling_lines |= (1<<y);
     }
     else
@@ -1241,7 +1255,7 @@
                 s->offset += scroll_step;
 
             pf = font_get(curfont);
-            xpos = xmargin + s->startx * s->width / s->len;
+            xpos = s->left_margin + s->startx * s->width / s->len;
             ypos = ymargin + index * pf->height;
 
             if (s->bidir) { /* scroll bidirectional */
@@ -1251,9 +1265,9 @@
                     s->backward = false;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
-                if (s->offset >= s->width - (LCD_WIDTH - xpos)) {
+                if (s->offset >= s->width - (s->right_margin - xpos)) {
                     /* at end of line */
-                    s->offset = s->width - (LCD_WIDTH - xpos);
+                    s->offset = s->width - (s->right_margin - xpos);
                     s->backward = true;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
@@ -1268,8 +1282,12 @@
             drawmode = s->invert ?
                        (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
             lcd_putsxyofs(xpos, ypos, s->offset, s->line);
+            if (LCD_WIDTH>s->right_margin) {
+            drawmode ^= DRMODE_INVERSEVID;
+                lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height);
+            }
             drawmode = lastmode;
-            lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+            lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height);
         }
 
         sleep(scroll_ticks);
Index: firmware/drivers/lcd-recorder.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-recorder.c,v
retrieving revision 1.80
diff -u -r1.80 lcd-recorder.c
--- firmware/drivers/lcd-recorder.c	22 Mar 2006 09:53:27 -0000	1.80
+++ firmware/drivers/lcd-recorder.c	2 Apr 2006 17:42:54 -0000
@@ -80,7 +80,8 @@
 unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 
 static int drawmode = DRMODE_SOLID;
-static int xmargin = 0;
+static int leftmargin = 0;
+static int rightmargin = 0;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
 #ifndef SIMULATOR
@@ -362,15 +363,21 @@
     return drawmode;
 }
 
-void lcd_setmargins(int x, int y)
+void lcd_setmargins(int x1, int x2, int y)
 {
-    xmargin = x;
+    leftmargin = x1;
+    rightmargin = x2;    
     ymargin = y;
 }
 
-int lcd_getxmargin(void)
+int lcd_getleftmargin(void)
 {
-    return xmargin;
+    return leftmargin;
+}
+
+int lcd_getrightmargin(void)
+{
+    return rightmargin;
 }
 
 int lcd_getymargin(void)
@@ -942,13 +949,16 @@
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / utf8length(str);
+    xpos = leftmargin + x*w / utf8length(str);
     ypos = ymargin + y*h;
     drawmode = (style & STYLE_INVERT) ?
                (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
     lcd_putsxyofs(xpos, ypos, offset, str);
     drawmode ^= DRMODE_INVERSEVID;
-    lcd_fillrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
+    lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h);
+    if (LCD_WIDTH>rightmargin) {
+        lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h);
+    }
     drawmode = lastmode;
 }
 
@@ -1026,7 +1036,7 @@
 
     lcd_getstringsize(string, &w, &h);
 
-    if (LCD_WIDTH - x * 8 - xmargin < w) {
+    if (rightmargin - x * 8 - leftmargin < w) {
         /* prepare scroll line */
         char *end;
 
@@ -1039,7 +1049,7 @@
         /* scroll bidirectional or forward only depending on the string
            width */
         if ( bidir_limit ) {
-            s->bidir = s->width < (LCD_WIDTH - xmargin) *
+            s->bidir = s->width < (rightmargin - leftmargin) *
                 (100 + bidir_limit) / 100;
         }
         else
@@ -1052,12 +1062,14 @@
         }
 
         end = strchr(s->line, '\0');
-        strncpy(end, string, LCD_WIDTH/2);
+        strncpy(end, string, rightmargin/2);
 
         s->len = utf8length(string);
         s->offset = offset;
         s->startx = x;
         s->backward = false;
+        s->left_margin=leftmargin;
+        s->right_margin=rightmargin;
         scrolling_lines |= (1<<y);
     }
     else
@@ -1094,7 +1106,7 @@
                 s->offset += scroll_step;
 
             pf = font_get(curfont);
-            xpos = xmargin + s->startx * s->width / s->len;
+            xpos = s->left_margin + s->startx * s->width / s->len;
             ypos = ymargin + index * pf->height;
 
             if (s->bidir) { /* scroll bidirectional */
@@ -1104,9 +1116,9 @@
                     s->backward = false;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
-                if (s->offset >= s->width - (LCD_WIDTH - xpos)) {
+                if (s->offset >= s->width - (s->right_margin - xpos)) {
                     /* at end of line */
-                    s->offset = s->width - (LCD_WIDTH - xpos);
+                    s->offset = s->width - (s->right_margin - xpos);
                     s->backward = true;
                     s->start_tick = current_tick + scroll_delay * 2;
                 }
@@ -1121,8 +1133,12 @@
             drawmode = s->invert ?
                        (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
             lcd_putsxyofs(xpos, ypos, s->offset, s->line);
+            if (LCD_WIDTH>s->right_margin) {
+            drawmode ^= DRMODE_INVERSEVID;
+                lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height);
+            }
             drawmode = lastmode;
-            lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
+            lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height);
         }
 
         sleep(scroll_ticks);
Index: firmware/export/lcd-remote.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/lcd-remote.h,v
retrieving revision 1.18
diff -u -r1.18 lcd-remote.h
--- firmware/export/lcd-remote.h	17 Feb 2006 22:38:38 -0000	1.18
+++ firmware/export/lcd-remote.h	2 Apr 2006 17:42:54 -0000
@@ -72,8 +72,9 @@
 
 extern void lcd_remote_set_drawmode(int mode);
 extern int  lcd_remote_get_drawmode(void);
-extern void lcd_remote_setmargins(int xmargin, int ymargin);
-extern int  lcd_remote_getxmargin(void);
+extern void lcd_remote_setmargins(int leftmargin, int rightmargin, int ymargin);
+extern int  lcd_remote_getleftmargin(void);
+extern int  lcd_remote_getrightmargin(void);
 extern int  lcd_remote_getymargin(void);
 extern void lcd_remote_setfont(int font);
 extern int  lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
Index: firmware/export/lcd.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/lcd.h,v
retrieving revision 1.61
diff -u -r1.61 lcd.h
--- firmware/export/lcd.h	8 Mar 2006 01:14:42 -0000	1.61
+++ firmware/export/lcd.h	2 Apr 2006 17:42:54 -0000
@@ -252,8 +252,9 @@
 
 extern void lcd_set_drawmode(int mode);
 extern int  lcd_get_drawmode(void);
-extern void lcd_setmargins(int xmargin, int ymargin);
-extern int  lcd_getxmargin(void);
+extern void lcd_setmargins(int leftmargin, int rightmargin, int ymargin);
+extern int  lcd_getleftmargin(void);
+extern int  lcd_getrightmargin(void);
 extern int  lcd_getymargin(void);
 extern void lcd_setfont(int font);
 extern int  lcd_getstringsize(const unsigned char *str, int *w, int *h);
@@ -332,6 +333,8 @@
     bool bidir;
     bool invert; /* invert the scrolled text */
     long start_tick;
+    int left_margin;
+    int right_margin;
 };
 #else /* !HAVE_LCD_BITMAP */