diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-23 13:20:35 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-23 13:20:35 +0000 |
commit | bdbdb97f19655a635a2d37f81f9fe1e31f9162b2 (patch) | |
tree | ea5672478b70e550910bc179a7644afa70c0d057 /apps/plugin.c | |
parent | c1b8df05e1def3096ff6d2ea55f23b2e72936fce (diff) | |
download | rockbox-bdbdb97f19655a635a2d37f81f9fe1e31f9162b2.tar.gz rockbox-bdbdb97f19655a635a2d37f81f9fe1e31f9162b2.zip |
FS#9051 - remove LCD margins... use viewports if you need them...
NOTE to WPS people....
%m has been removed, but (i think) because of the other %m tags it wont fail if you try loading a wps with %m|..|, it will just be ignored.
Also note that if the statusbar is enabled the default viewport is 8 pixels shorter than when its not, i.e (0,0) is really (0,8) if the statusbar is shown... I dont think this will be a major issue because almost no WPS show the bar and use bitmaps... text only WPS shouldnt be affected.
Please report problem screens in http://forums.rockbox.org/index.php?topic=17358.0
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17763 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugin.c')
-rw-r--r-- | apps/plugin.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 9a435b24bc..21f6d178ea 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -75,7 +75,6 @@ static const struct plugin_api rockbox_api = { | |||
75 | lcd_set_contrast, | 75 | lcd_set_contrast, |
76 | lcd_update, | 76 | lcd_update, |
77 | lcd_clear_display, | 77 | lcd_clear_display, |
78 | lcd_setmargins, | ||
79 | lcd_getstringsize, | 78 | lcd_getstringsize, |
80 | lcd_putsxy, | 79 | lcd_putsxy, |
81 | lcd_puts, | 80 | lcd_puts, |
@@ -131,6 +130,10 @@ static const struct plugin_api rockbox_api = { | |||
131 | #ifdef HAVE_LCD_INVERT | 130 | #ifdef HAVE_LCD_INVERT |
132 | lcd_set_invert_display, | 131 | lcd_set_invert_display, |
133 | #endif /* HAVE_LCD_INVERT */ | 132 | #endif /* HAVE_LCD_INVERT */ |
133 | #ifdef HAVE_LCD_ENABLE | ||
134 | lcd_set_enable_hook, | ||
135 | &button_queue, | ||
136 | #endif | ||
134 | bidi_l2v, | 137 | bidi_l2v, |
135 | font_get_bits, | 138 | font_get_bits, |
136 | font_load, | 139 | font_load, |
@@ -158,7 +161,6 @@ static const struct plugin_api rockbox_api = { | |||
158 | /* remote lcd */ | 161 | /* remote lcd */ |
159 | lcd_remote_set_contrast, | 162 | lcd_remote_set_contrast, |
160 | lcd_remote_clear_display, | 163 | lcd_remote_clear_display, |
161 | lcd_remote_setmargins, | ||
162 | lcd_remote_puts, | 164 | lcd_remote_puts, |
163 | lcd_remote_puts_scroll, | 165 | lcd_remote_puts_scroll, |
164 | lcd_remote_stop_scroll, | 166 | lcd_remote_stop_scroll, |
@@ -216,6 +218,8 @@ static const struct plugin_api rockbox_api = { | |||
216 | gui_synclist_limit_scroll, | 218 | gui_synclist_limit_scroll, |
217 | gui_synclist_do_button, | 219 | gui_synclist_do_button, |
218 | gui_synclist_set_title, | 220 | gui_synclist_set_title, |
221 | simplelist_info_init, | ||
222 | simplelist_show_list, | ||
219 | 223 | ||
220 | /* button */ | 224 | /* button */ |
221 | button_get, | 225 | button_get, |
@@ -598,13 +602,7 @@ static const struct plugin_api rockbox_api = { | |||
598 | 602 | ||
599 | /* new stuff at the end, sort into place next time | 603 | /* new stuff at the end, sort into place next time |
600 | the API gets incompatible */ | 604 | the API gets incompatible */ |
601 | simplelist_info_init, | ||
602 | simplelist_show_list, | ||
603 | 605 | ||
604 | #ifdef HAVE_LCD_ENABLE | ||
605 | lcd_set_enable_hook, | ||
606 | &button_queue, | ||
607 | #endif | ||
608 | }; | 606 | }; |
609 | 607 | ||
610 | int plugin_load(const char* plugin, const void* parameter) | 608 | int plugin_load(const char* plugin, const void* parameter) |
@@ -620,10 +618,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
620 | unsigned my_core; | 618 | unsigned my_core; |
621 | #endif | 619 | #endif |
622 | #endif /* !SIMULATOR */ | 620 | #endif /* !SIMULATOR */ |
623 | int xm, ym; | ||
624 | #ifdef HAVE_REMOTE_LCD | ||
625 | int rxm, rym; | ||
626 | #endif | ||
627 | 621 | ||
628 | #if LCD_DEPTH > 1 | 622 | #if LCD_DEPTH > 1 |
629 | fb_data* old_backdrop; | 623 | fb_data* old_backdrop; |
@@ -705,10 +699,7 @@ int plugin_load(const char* plugin, const void* parameter) | |||
705 | #endif | 699 | #endif |
706 | 700 | ||
707 | plugin_loaded = true; | 701 | plugin_loaded = true; |
708 | 702 | ||
709 | xm = lcd_getxmargin(); | ||
710 | ym = lcd_getymargin(); | ||
711 | lcd_setmargins(0,0); | ||
712 | 703 | ||
713 | #if defined HAVE_LCD_BITMAP && LCD_DEPTH > 1 | 704 | #if defined HAVE_LCD_BITMAP && LCD_DEPTH > 1 |
714 | old_backdrop = lcd_get_backdrop(); | 705 | old_backdrop = lcd_get_backdrop(); |
@@ -717,9 +708,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
717 | lcd_update(); | 708 | lcd_update(); |
718 | 709 | ||
719 | #ifdef HAVE_REMOTE_LCD | 710 | #ifdef HAVE_REMOTE_LCD |
720 | rxm = lcd_remote_getxmargin(); | ||
721 | rym = lcd_remote_getymargin(); | ||
722 | lcd_remote_setmargins(0, 0); | ||
723 | lcd_remote_clear_display(); | 711 | lcd_remote_clear_display(); |
724 | lcd_remote_update(); | 712 | lcd_remote_update(); |
725 | #endif | 713 | #endif |
@@ -744,8 +732,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
744 | #endif /* LCD_DEPTH */ | 732 | #endif /* LCD_DEPTH */ |
745 | #endif /* HAVE_LCD_BITMAP */ | 733 | #endif /* HAVE_LCD_BITMAP */ |
746 | 734 | ||
747 | /* restore margins */ | ||
748 | lcd_setmargins(xm,ym); | ||
749 | lcd_clear_display(); | 735 | lcd_clear_display(); |
750 | lcd_update(); | 736 | lcd_update(); |
751 | 737 | ||
@@ -756,7 +742,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
756 | #else | 742 | #else |
757 | lcd_remote_set_drawmode(DRMODE_SOLID); | 743 | lcd_remote_set_drawmode(DRMODE_SOLID); |
758 | #endif | 744 | #endif |
759 | lcd_remote_setmargins(rxm, rym); | ||
760 | lcd_remote_clear_display(); | 745 | lcd_remote_clear_display(); |
761 | 746 | ||
762 | 747 | ||