diff options
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r-- | apps/plugins/lib/SOURCES | 8 | ||||
-rw-r--r-- | apps/plugins/lib/checkbox.h | 4 | ||||
-rw-r--r-- | apps/plugins/lib/display_text.c | 8 | ||||
-rw-r--r-- | apps/plugins/lib/grey.h | 4 | ||||
-rw-r--r-- | apps/plugins/lib/highscore.c | 35 | ||||
-rw-r--r-- | apps/plugins/lib/mylcd.h | 28 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_bmp.h | 2 | ||||
-rw-r--r-- | apps/plugins/lib/simple_viewer.c | 20 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd.h | 3 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd_core.c | 3 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd_draw.c | 3 |
11 files changed, 8 insertions, 110 deletions
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index effc076eb7..545a754500 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -13,7 +13,7 @@ display_text.c | |||
13 | strncpy.c | 13 | strncpy.c |
14 | stdio_compat.c | 14 | stdio_compat.c |
15 | 15 | ||
16 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) | 16 | #if (LCD_DEPTH < 4) |
17 | grey_core.c | 17 | grey_core.c |
18 | grey_draw.c | 18 | grey_draw.c |
19 | grey_parm.c | 19 | grey_parm.c |
@@ -23,7 +23,7 @@ grey_scroll.c | |||
23 | grey_coldfire.S | 23 | grey_coldfire.S |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #endif /* HAVE_LCD_BITMAP && LCD_DEPTH < 4 */ | 26 | #endif /* LCD_DEPTH < 4 */ |
27 | 27 | ||
28 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 28 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
29 | overlay.c | 29 | overlay.c |
@@ -33,8 +33,6 @@ overlay.c | |||
33 | profile_plugin.c | 33 | profile_plugin.c |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifdef HAVE_LCD_BITMAP | ||
37 | |||
38 | #ifdef CPU_ARM | 36 | #ifdef CPU_ARM |
39 | pluginlib_jpeg_idct_arm.S | 37 | pluginlib_jpeg_idct_arm.S |
40 | #endif | 38 | #endif |
@@ -65,8 +63,6 @@ pluginlib_albumart.c | |||
65 | 63 | ||
66 | kbd_helper.c | 64 | kbd_helper.c |
67 | 65 | ||
68 | #endif /* HAVE_LCD_BITMAP */ | ||
69 | |||
70 | #ifdef HAVE_TOUCHSCREEN | 66 | #ifdef HAVE_TOUCHSCREEN |
71 | pluginlib_touchscreen.c | 67 | pluginlib_touchscreen.c |
72 | #endif | 68 | #endif |
diff --git a/apps/plugins/lib/checkbox.h b/apps/plugins/lib/checkbox.h index 81a26e15ba..d4318f2305 100644 --- a/apps/plugins/lib/checkbox.h +++ b/apps/plugins/lib/checkbox.h | |||
@@ -21,11 +21,7 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #ifdef HAVE_LCD_BITMAP | ||
25 | |||
26 | /* | 24 | /* |
27 | * Print a checkbox | 25 | * Print a checkbox |
28 | */ | 26 | */ |
29 | void checkbox(int x, int y, int width, int height, bool checked); | 27 | void checkbox(int x, int y, int width, int height, bool checked); |
30 | |||
31 | #endif | ||
diff --git a/apps/plugins/lib/display_text.c b/apps/plugins/lib/display_text.c index 90712a649f..5f37b736df 100644 --- a/apps/plugins/lib/display_text.c +++ b/apps/plugins/lib/display_text.c | |||
@@ -39,9 +39,7 @@ static bool wait_key_press(void) | |||
39 | bool display_text(unsigned short words, char** text, struct style_text* style, | 39 | bool display_text(unsigned short words, char** text, struct style_text* style, |
40 | struct viewport* vp_text, bool wait_key) | 40 | struct viewport* vp_text, bool wait_key) |
41 | { | 41 | { |
42 | #ifdef HAVE_LCD_BITMAP | ||
43 | int prev_drawmode; | 42 | int prev_drawmode; |
44 | #endif | ||
45 | #ifdef HAVE_LCD_COLOR | 43 | #ifdef HAVE_LCD_COLOR |
46 | int standard_fgcolor; | 44 | int standard_fgcolor; |
47 | #endif | 45 | #endif |
@@ -55,10 +53,8 @@ bool display_text(unsigned short words, char** text, struct style_text* style, | |||
55 | vp_height = vp_text->height; | 53 | vp_height = vp_text->height; |
56 | } | 54 | } |
57 | rb->screens[SCREEN_MAIN]->set_viewport(vp_text); | 55 | rb->screens[SCREEN_MAIN]->set_viewport(vp_text); |
58 | #ifdef HAVE_LCD_BITMAP | ||
59 | prev_drawmode = rb->lcd_get_drawmode(); | 56 | prev_drawmode = rb->lcd_get_drawmode(); |
60 | rb->lcd_set_drawmode(DRMODE_SOLID); | 57 | rb->lcd_set_drawmode(DRMODE_SOLID); |
61 | #endif | ||
62 | #ifdef HAVE_LCD_COLOR | 58 | #ifdef HAVE_LCD_COLOR |
63 | standard_fgcolor = rb->lcd_get_foreground(); | 59 | standard_fgcolor = rb->lcd_get_foreground(); |
64 | #endif | 60 | #endif |
@@ -121,11 +117,9 @@ bool display_text(unsigned short words, char** text, struct style_text* style, | |||
121 | #endif | 117 | #endif |
122 | rb->lcd_putsxy(x, y, text[i]); | 118 | rb->lcd_putsxy(x, y, text[i]); |
123 | /* underline the word */ | 119 | /* underline the word */ |
124 | #ifdef HAVE_LCD_BITMAP | ||
125 | if (style[style_index].flags&TEXT_UNDERLINE) { | 120 | if (style[style_index].flags&TEXT_UNDERLINE) { |
126 | rb->lcd_hline(x, x+width, y+height-1); | 121 | rb->lcd_hline(x, x+width, y+height-1); |
127 | } | 122 | } |
128 | #endif | ||
129 | #ifdef HAVE_LCD_COLOR | 123 | #ifdef HAVE_LCD_COLOR |
130 | rb->lcd_set_foreground(standard_fgcolor); | 124 | rb->lcd_set_foreground(standard_fgcolor); |
131 | #endif | 125 | #endif |
@@ -134,9 +128,7 @@ bool display_text(unsigned short words, char** text, struct style_text* style, | |||
134 | x += width + space_w; | 128 | x += width + space_w; |
135 | } | 129 | } |
136 | rb->screens[SCREEN_MAIN]->update_viewport(); | 130 | rb->screens[SCREEN_MAIN]->update_viewport(); |
137 | #ifdef HAVE_LCD_BITMAP | ||
138 | rb->lcd_set_drawmode(prev_drawmode); | 131 | rb->lcd_set_drawmode(prev_drawmode); |
139 | #endif | ||
140 | if (wait_key) | 132 | if (wait_key) |
141 | { | 133 | { |
142 | if (wait_key_press()) | 134 | if (wait_key_press()) |
diff --git a/apps/plugins/lib/grey.h b/apps/plugins/lib/grey.h index 63e896bfb6..0e064f46b2 100644 --- a/apps/plugins/lib/grey.h +++ b/apps/plugins/lib/grey.h | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "plugin.h" | 30 | #include "plugin.h" |
31 | 31 | ||
32 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) | 32 | #if (LCD_DEPTH < 4) |
33 | 33 | ||
34 | /* The greyscale lib uses 8 bit brightness values natively on input. */ | 34 | /* The greyscale lib uses 8 bit brightness values natively on input. */ |
35 | #define GREY_BRIGHTNESS(y) (y) | 35 | #define GREY_BRIGHTNESS(y) (y) |
@@ -201,5 +201,5 @@ struct _grey_info | |||
201 | /* Global variable, defined in the plugin */ | 201 | /* Global variable, defined in the plugin */ |
202 | extern struct _grey_info _grey_info; | 202 | extern struct _grey_info _grey_info; |
203 | 203 | ||
204 | #endif /* HAVE_LCD_BITMAP && (LCD_DEPTH < 4) */ | 204 | #endif /* (LCD_DEPTH < 4) */ |
205 | #endif /* __GREY_H__ */ | 205 | #endif /* __GREY_H__ */ |
diff --git a/apps/plugins/lib/highscore.c b/apps/plugins/lib/highscore.c index ff7a166222..3aae955bfc 100644 --- a/apps/plugins/lib/highscore.c +++ b/apps/plugins/lib/highscore.c | |||
@@ -119,7 +119,6 @@ bool highscore_would_update(int score, struct highscore *scores, | |||
119 | return (num_scores > 0) && (score > scores[num_scores-1].score); | 119 | return (num_scores > 0) && (score > scores[num_scores-1].score); |
120 | } | 120 | } |
121 | 121 | ||
122 | #ifdef HAVE_LCD_BITMAP | ||
123 | #define MARGIN 5 | 122 | #define MARGIN 5 |
124 | void highscore_show(int position, struct highscore *scores, int num_scores, | 123 | void highscore_show(int position, struct highscore *scores, int num_scores, |
125 | bool show_level) | 124 | bool show_level) |
@@ -179,37 +178,3 @@ void highscore_show(int position, struct highscore *scores, int num_scores, | |||
179 | rb->lcd_set_foreground(fgcolor); | 178 | rb->lcd_set_foreground(fgcolor); |
180 | #endif | 179 | #endif |
181 | } | 180 | } |
182 | #else | ||
183 | struct scoreinfo { | ||
184 | struct highscore *scores; | ||
185 | int position; | ||
186 | bool show_level; | ||
187 | }; | ||
188 | static const char* get_score(int selected, void * data, | ||
189 | char * buffer, size_t buffer_len) | ||
190 | { | ||
191 | struct scoreinfo *scoreinfo = (struct scoreinfo *) data; | ||
192 | int len; | ||
193 | len = rb->snprintf(buffer, buffer_len, "%c%d) %4d", | ||
194 | (scoreinfo->position == selected?'*':' '), | ||
195 | selected+1, scoreinfo->scores[selected].score); | ||
196 | |||
197 | if (scoreinfo->show_level) | ||
198 | rb->snprintf(buffer + len, buffer_len - len, " %d", | ||
199 | scoreinfo->scores[selected].level); | ||
200 | return buffer; | ||
201 | } | ||
202 | |||
203 | void highscore_show(int position, struct highscore *scores, int num_scores, | ||
204 | bool show_level) | ||
205 | { | ||
206 | struct simplelist_info info; | ||
207 | struct scoreinfo scoreinfo = {scores, position, show_level}; | ||
208 | rb->simplelist_info_init(&info, "High Scores", num_scores, &scoreinfo); | ||
209 | if (position >= 0) | ||
210 | info.selection = position; | ||
211 | info.hide_selection = true; | ||
212 | info.get_name = get_score; | ||
213 | rb->simplelist_show_list(&info); | ||
214 | } | ||
215 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/lib/mylcd.h b/apps/plugins/lib/mylcd.h index a543d60890..47bdec9e2c 100644 --- a/apps/plugins/lib/mylcd.h +++ b/apps/plugins/lib/mylcd.h | |||
@@ -35,7 +35,7 @@ | |||
35 | * lib/grey.h should be included before including this | 35 | * lib/grey.h should be included before including this |
36 | * header. For bitmap LCD's, defaults to rb->lcd_XXXX otherwise. | 36 | * header. For bitmap LCD's, defaults to rb->lcd_XXXX otherwise. |
37 | */ | 37 | */ |
38 | #if defined (HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && defined(__GREY_H__) | 38 | #if (LCD_DEPTH < 4) && defined(__GREY_H__) |
39 | #define MYLCD_CFG_GREYLIB /* using greylib */ | 39 | #define MYLCD_CFG_GREYLIB /* using greylib */ |
40 | #define mylcd_(fn) grey_##fn | 40 | #define mylcd_(fn) grey_##fn |
41 | #define myxlcd_(fn) grey_##fn | 41 | #define myxlcd_(fn) grey_##fn |
@@ -51,7 +51,8 @@ | |||
51 | #define MYLCD_DEFAULT_FG GREY_BLACK | 51 | #define MYLCD_DEFAULT_FG GREY_BLACK |
52 | #define MYLCD_DEFAULT_BG GREY_WHITE | 52 | #define MYLCD_DEFAULT_BG GREY_WHITE |
53 | 53 | ||
54 | #elif defined (HAVE_LCD_BITMAP) | 54 | #else |
55 | |||
55 | #define MYLCD_CFG_RB_XLCD /* using standard (X)LCD routines */ | 56 | #define MYLCD_CFG_RB_XLCD /* using standard (X)LCD routines */ |
56 | #define mylcd_(fn) rb->lcd_##fn | 57 | #define mylcd_(fn) rb->lcd_##fn |
57 | #define myxlcd_(fn) xlcd_##fn | 58 | #define myxlcd_(fn) xlcd_##fn |
@@ -67,18 +68,11 @@ | |||
67 | #define MYLCD_DEFAULT_FG LCD_DEFAULT_FG | 68 | #define MYLCD_DEFAULT_FG LCD_DEFAULT_FG |
68 | #define MYLCD_DEFAULT_BG LCD_DEFAULT_BG | 69 | #define MYLCD_DEFAULT_BG LCD_DEFAULT_BG |
69 | 70 | ||
70 | #else | ||
71 | #error Configuration not supported! Did you forget to include the correct lib header? | ||
72 | #endif /* end LCD type selection */ | 71 | #endif /* end LCD type selection */ |
73 | 72 | ||
74 | /* Update functions */ | 73 | /* Update functions */ |
75 | #define mylcd_update mylcd_(update) | 74 | #define mylcd_update mylcd_(update) |
76 | #ifdef HAVE_LCD_BITMAP | ||
77 | #define mylcd_update_rect mylcd_(update_rect) | 75 | #define mylcd_update_rect mylcd_(update_rect) |
78 | #else | ||
79 | static inline void mylcd_update_rect(int x, int y, int w, int h) | ||
80 | { (void)x; (void)y; (void)w; (void)h; pgfx_update(); } | ||
81 | #endif /* HAVE_LCD_BITMAP */ | ||
82 | 76 | ||
83 | /* Update functions - unbuffered : special handling for these | 77 | /* Update functions - unbuffered : special handling for these |
84 | * It is desirable to still evaluate arguments even if there will | 78 | * It is desirable to still evaluate arguments even if there will |
@@ -104,7 +98,6 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
104 | #define mylcd_set_drawmode mylcd_(set_drawmode) | 98 | #define mylcd_set_drawmode mylcd_(set_drawmode) |
105 | #define mylcd_get_drawmode mylcd_(get_drawmode) | 99 | #define mylcd_get_drawmode mylcd_(get_drawmode) |
106 | 100 | ||
107 | #ifdef HAVE_LCD_BITMAP | ||
108 | #define mylcd_set_foreground mylcd_(set_foreground) | 101 | #define mylcd_set_foreground mylcd_(set_foreground) |
109 | #define mylcd_get_foreground mylcd_(get_foreground) | 102 | #define mylcd_get_foreground mylcd_(get_foreground) |
110 | #define mylcd_set_background mylcd_(set_background) | 103 | #define mylcd_set_background mylcd_(set_background) |
@@ -112,7 +105,6 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
112 | #define mylcd_set_drawinfo mylcd_(set_drawinfo) | 105 | #define mylcd_set_drawinfo mylcd_(set_drawinfo) |
113 | #define mylcd_setfont mylcd_(setfont) | 106 | #define mylcd_setfont mylcd_(setfont) |
114 | #define mylcd_getstringsize mylcd_(getstringsize) | 107 | #define mylcd_getstringsize mylcd_(getstringsize) |
115 | #endif /* HAVE_LCD_BITMAP */ | ||
116 | 108 | ||
117 | /* Whole display */ | 109 | /* Whole display */ |
118 | #define mylcd_clear_display mylcd_(clear_display) | 110 | #define mylcd_clear_display mylcd_(clear_display) |
@@ -131,57 +123,43 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
131 | 123 | ||
132 | /* Filled Primitives */ | 124 | /* Filled Primitives */ |
133 | #define mylcd_fillrect mylcd_(fillrect) | 125 | #define mylcd_fillrect mylcd_(fillrect) |
134 | #ifdef HAVE_LCD_BITMAP | ||
135 | #define mylcd_filltriangle myxlcd_(filltriangle) | 126 | #define mylcd_filltriangle myxlcd_(filltriangle) |
136 | #endif /* HAVE_LCD_BITMAP */ | ||
137 | 127 | ||
138 | /* Bitmaps */ | 128 | /* Bitmaps */ |
139 | #define mylcd_mono_bitmap_part mylcd_(mono_bitmap_part) | 129 | #define mylcd_mono_bitmap_part mylcd_(mono_bitmap_part) |
140 | #define mylcd_mono_bitmap mylcd_(mono_bitmap) | 130 | #define mylcd_mono_bitmap mylcd_(mono_bitmap) |
141 | 131 | ||
142 | #ifdef HAVE_LCD_BITMAP | ||
143 | #define mylcd_gray_bitmap_part myxlcd_(gray_bitmap_part) | 132 | #define mylcd_gray_bitmap_part myxlcd_(gray_bitmap_part) |
144 | #define mylcd_gray_bitmap myxlcd_(gray_bitmap) | 133 | #define mylcd_gray_bitmap myxlcd_(gray_bitmap) |
145 | #if 0 /* possible, but not implemented in greylib */ | 134 | #if 0 /* possible, but not implemented in greylib */ |
146 | #define mylcd_color_bitmap_part myxlcd_(color_bitmap_part) | 135 | #define mylcd_color_bitmap_part myxlcd_(color_bitmap_part) |
147 | #define mylcd_color_bitmap myxlcd_(color_bitmap) | 136 | #define mylcd_color_bitmap myxlcd_(color_bitmap) |
148 | #endif | 137 | #endif |
149 | #endif /* HAVE_LCD_BITMAP */ | ||
150 | 138 | ||
151 | /* Bitmaps - unbuffered */ | 139 | /* Bitmaps - unbuffered */ |
152 | #ifdef HAVE_LCD_BITMAP | ||
153 | #define mylcd_ub_gray_bitmap_part myxlcd_ub_(gray_bitmap_part) | 140 | #define mylcd_ub_gray_bitmap_part myxlcd_ub_(gray_bitmap_part) |
154 | #define mylcd_ub_gray_bitmap myxlcd_ub_(gray_bitmap) | 141 | #define mylcd_ub_gray_bitmap myxlcd_ub_(gray_bitmap) |
155 | #endif /* HAVE_LCD_BITMAP */ | ||
156 | 142 | ||
157 | /* Text */ | 143 | /* Text */ |
158 | /* lcd_putsxyofs is static'ed in the core for now on color */ | 144 | /* lcd_putsxyofs is static'ed in the core for now on color */ |
159 | #ifdef HAVE_LCD_BITMAP | ||
160 | #define mylcd_putsxyofs mylcd_(putsxyofs) | 145 | #define mylcd_putsxyofs mylcd_(putsxyofs) |
161 | #define mylcd_putsxy mylcd_(putsxy) | 146 | #define mylcd_putsxy mylcd_(putsxy) |
162 | #endif /* HAVE_LCD_BITMAP */ | ||
163 | 147 | ||
164 | /* Scrolling */ | 148 | /* Scrolling */ |
165 | #ifdef HAVE_LCD_BITMAP | ||
166 | #define mylcd_scroll_left myxlcd_(scroll_left) | 149 | #define mylcd_scroll_left myxlcd_(scroll_left) |
167 | #define mylcd_scroll_right myxlcd_(scroll_right) | 150 | #define mylcd_scroll_right myxlcd_(scroll_right) |
168 | #define mylcd_scroll_up myxlcd_(scroll_up) | 151 | #define mylcd_scroll_up myxlcd_(scroll_up) |
169 | #define mylcd_scroll_down myxlcd_(scroll_down) | 152 | #define mylcd_scroll_down myxlcd_(scroll_down) |
170 | #endif /* HAVE_LCD_BITMAP */ | ||
171 | 153 | ||
172 | /* Scrolling - unbuffered */ | 154 | /* Scrolling - unbuffered */ |
173 | #ifdef HAVE_LCD_BITMAP | ||
174 | #define mylcd_ub_scroll_left myxlcd_ub_(scroll_left) | 155 | #define mylcd_ub_scroll_left myxlcd_ub_(scroll_left) |
175 | #define mylcd_ub_scroll_right myxlcd_ub_(scroll_right) | 156 | #define mylcd_ub_scroll_right myxlcd_ub_(scroll_right) |
176 | #define mylcd_ub_scroll_up myxlcd_ub_(scroll_up) | 157 | #define mylcd_ub_scroll_up myxlcd_ub_(scroll_up) |
177 | #define mylcd_ub_scroll_down myxlcd_ub_(scroll_down) | 158 | #define mylcd_ub_scroll_down myxlcd_ub_(scroll_down) |
178 | #endif /* HAVE_LCD_BITMAP */ | ||
179 | 159 | ||
180 | /* Viewports */ | 160 | /* Viewports */ |
181 | #ifdef HAVE_LCD_BITMAP | ||
182 | #define mylcd_clear_viewport mylcd_(clear_viewport) | 161 | #define mylcd_clear_viewport mylcd_(clear_viewport) |
183 | #define mylcd_set_viewport mylcd_(set_viewport) | 162 | #define mylcd_set_viewport mylcd_(set_viewport) |
184 | #define mylcd_viewport_set_fullscreen mylcd_viewport_(set_fullscreen) | 163 | #define mylcd_viewport_set_fullscreen mylcd_viewport_(set_fullscreen) |
185 | #endif /* HAVE_LCD_BITMAP */ | ||
186 | 164 | ||
187 | #endif /* MYLCD_H */ | 165 | #endif /* MYLCD_H */ |
diff --git a/apps/plugins/lib/pluginlib_bmp.h b/apps/plugins/lib/pluginlib_bmp.h index be0cfd9091..f0540988de 100644 --- a/apps/plugins/lib/pluginlib_bmp.h +++ b/apps/plugins/lib/pluginlib_bmp.h | |||
@@ -37,7 +37,7 @@ int save_bmp_file( char* filename, struct bitmap *bm ); | |||
37 | */ | 37 | */ |
38 | void simple_resize_bitmap(struct bitmap *src, struct bitmap *dst); | 38 | void simple_resize_bitmap(struct bitmap *src, struct bitmap *dst); |
39 | 39 | ||
40 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) | 40 | #if (LCD_DEPTH < 4) |
41 | /** | 41 | /** |
42 | Same as simple_resize_bitmap except this is for use with greylib. | 42 | Same as simple_resize_bitmap except this is for use with greylib. |
43 | */ | 43 | */ |
diff --git a/apps/plugins/lib/simple_viewer.c b/apps/plugins/lib/simple_viewer.c index 4c05ee68c5..0b554e054d 100644 --- a/apps/plugins/lib/simple_viewer.c +++ b/apps/plugins/lib/simple_viewer.c | |||
@@ -27,10 +27,8 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | struct view_info { | 29 | struct view_info { |
30 | #ifdef HAVE_LCD_BITMAP | ||
31 | struct font* pf; | 30 | struct font* pf; |
32 | struct viewport scrollbar_vp; /* viewport for scrollbar */ | 31 | struct viewport scrollbar_vp; /* viewport for scrollbar */ |
33 | #endif | ||
34 | struct viewport vp; | 32 | struct viewport vp; |
35 | const char *title; | 33 | const char *title; |
36 | const char *text; /* displayed text */ | 34 | const char *text; /* displayed text */ |
@@ -89,15 +87,12 @@ static void calc_line_count(struct view_info *info) | |||
89 | { | 87 | { |
90 | const char *ptr = info->text; | 88 | const char *ptr = info->text; |
91 | int i = 0; | 89 | int i = 0; |
92 | #ifdef HAVE_LCD_BITMAP | ||
93 | bool scrollbar = false; | 90 | bool scrollbar = false; |
94 | #endif | ||
95 | 91 | ||
96 | while (*ptr) | 92 | while (*ptr) |
97 | { | 93 | { |
98 | ptr = get_next_line(ptr, info); | 94 | ptr = get_next_line(ptr, info); |
99 | i++; | 95 | i++; |
100 | #ifdef HAVE_LCD_BITMAP | ||
101 | if (!scrollbar && i > info->display_lines) | 96 | if (!scrollbar && i > info->display_lines) |
102 | { | 97 | { |
103 | ptr = info->text; | 98 | ptr = info->text; |
@@ -111,7 +106,6 @@ static void calc_line_count(struct view_info *info) | |||
111 | info->scrollbar_vp.x = info->vp.width; | 106 | info->scrollbar_vp.x = info->vp.width; |
112 | scrollbar = true; | 107 | scrollbar = true; |
113 | } | 108 | } |
114 | #endif | ||
115 | } | 109 | } |
116 | info->line_count = i; | 110 | info->line_count = i; |
117 | } | 111 | } |
@@ -144,12 +138,8 @@ static int init_view(struct view_info *info, | |||
144 | const char *title, const char *text) | 138 | const char *title, const char *text) |
145 | { | 139 | { |
146 | rb->viewport_set_defaults(&info->vp, SCREEN_MAIN); | 140 | rb->viewport_set_defaults(&info->vp, SCREEN_MAIN); |
147 | #ifdef HAVE_LCD_BITMAP | ||
148 | info->pf = rb->font_get(FONT_UI); | 141 | info->pf = rb->font_get(FONT_UI); |
149 | info->display_lines = info->vp.height / info->pf->height; | 142 | info->display_lines = info->vp.height / info->pf->height; |
150 | #else | ||
151 | info->display_lines = info->vp.height; | ||
152 | #endif | ||
153 | 143 | ||
154 | info->title = title; | 144 | info->title = title; |
155 | info->text = text; | 145 | info->text = text; |
@@ -157,7 +147,6 @@ static int init_view(struct view_info *info, | |||
157 | info->line = 0; | 147 | info->line = 0; |
158 | info->start = 0; | 148 | info->start = 0; |
159 | 149 | ||
160 | #ifdef HAVE_LCD_BITMAP | ||
161 | /* no title for small screens. */ | 150 | /* no title for small screens. */ |
162 | if (info->display_lines < 4) | 151 | if (info->display_lines < 4) |
163 | { | 152 | { |
@@ -169,7 +158,6 @@ static int init_view(struct view_info *info, | |||
169 | info->vp.y += info->pf->height; | 158 | info->vp.y += info->pf->height; |
170 | info->vp.height -= info->pf->height; | 159 | info->vp.height -= info->pf->height; |
171 | } | 160 | } |
172 | #endif | ||
173 | 161 | ||
174 | calc_line_count(info); | 162 | calc_line_count(info); |
175 | return 0; | 163 | return 0; |
@@ -177,11 +165,7 @@ static int init_view(struct view_info *info, | |||
177 | 165 | ||
178 | static void draw_text(struct view_info *info) | 166 | static void draw_text(struct view_info *info) |
179 | { | 167 | { |
180 | #ifdef HAVE_LCD_BITMAP | ||
181 | #define OUTPUT_SIZE LCD_WIDTH+1 | 168 | #define OUTPUT_SIZE LCD_WIDTH+1 |
182 | #else | ||
183 | #define OUTPUT_SIZE LCD_WIDTH*3+1 | ||
184 | #endif | ||
185 | static char output[OUTPUT_SIZE]; | 169 | static char output[OUTPUT_SIZE]; |
186 | const char *text, *ptr; | 170 | const char *text, *ptr; |
187 | int max_show, line; | 171 | int max_show, line; |
@@ -190,14 +174,12 @@ static void draw_text(struct view_info *info) | |||
190 | /* clear screen */ | 174 | /* clear screen */ |
191 | display->clear_display(); | 175 | display->clear_display(); |
192 | 176 | ||
193 | #ifdef HAVE_LCD_BITMAP | ||
194 | /* display title. */ | 177 | /* display title. */ |
195 | if(info->title) | 178 | if(info->title) |
196 | { | 179 | { |
197 | display->set_viewport(NULL); | 180 | display->set_viewport(NULL); |
198 | display->puts(0, 0, info->title); | 181 | display->puts(0, 0, info->title); |
199 | } | 182 | } |
200 | #endif | ||
201 | 183 | ||
202 | max_show = MIN(info->line_count - info->line, info->display_lines); | 184 | max_show = MIN(info->line_count - info->line, info->display_lines); |
203 | text = info->text + info->start; | 185 | text = info->text + info->start; |
@@ -215,7 +197,6 @@ static void draw_text(struct view_info *info) | |||
215 | display->puts(0, line, output); | 197 | display->puts(0, line, output); |
216 | text = ptr; | 198 | text = ptr; |
217 | } | 199 | } |
218 | #ifdef HAVE_LCD_BITMAP | ||
219 | if (info->line_count > info->display_lines) | 200 | if (info->line_count > info->display_lines) |
220 | { | 201 | { |
221 | display->set_viewport(&info->scrollbar_vp); | 202 | display->set_viewport(&info->scrollbar_vp); |
@@ -224,7 +205,6 @@ static void draw_text(struct view_info *info) | |||
224 | info->line_count, info->line, info->line + max_show, | 205 | info->line_count, info->line, info->line + max_show, |
225 | VERTICAL); | 206 | VERTICAL); |
226 | } | 207 | } |
227 | #endif | ||
228 | 208 | ||
229 | display->set_viewport(NULL); | 209 | display->set_viewport(NULL); |
230 | display->update(); | 210 | display->update(); |
diff --git a/apps/plugins/lib/xlcd.h b/apps/plugins/lib/xlcd.h index abd5cff62b..963c7c4831 100644 --- a/apps/plugins/lib/xlcd.h +++ b/apps/plugins/lib/xlcd.h | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | 28 | ||
29 | #ifdef HAVE_LCD_BITMAP | ||
30 | |||
31 | void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3); | 29 | void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3); |
32 | void xlcd_filltriangle_screen(struct screen* display, | 30 | void xlcd_filltriangle_screen(struct screen* display, |
33 | int x1, int y1, int x2, int y2, int x3, int y3); | 31 | int x1, int y1, int x2, int y2, int x3, int y3); |
@@ -54,6 +52,5 @@ void xlcd_scroll_right(int count); | |||
54 | void xlcd_scroll_up(int count); | 52 | void xlcd_scroll_up(int count); |
55 | void xlcd_scroll_down(int count); | 53 | void xlcd_scroll_down(int count); |
56 | 54 | ||
57 | #endif /* HAVE_LCD_BITMAP */ | ||
58 | #endif /* __XLCD_H__ */ | 55 | #endif /* __XLCD_H__ */ |
59 | 56 | ||
diff --git a/apps/plugins/lib/xlcd_core.c b/apps/plugins/lib/xlcd_core.c index 87e73b5485..47875a51a9 100644 --- a/apps/plugins/lib/xlcd_core.c +++ b/apps/plugins/lib/xlcd_core.c | |||
@@ -24,8 +24,5 @@ | |||
24 | 24 | ||
25 | #include "plugin.h" | 25 | #include "plugin.h" |
26 | 26 | ||
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | #include "xlcd.h" | 27 | #include "xlcd.h" |
29 | 28 | ||
30 | #endif /* HAVE_LCD_BITMAP */ | ||
31 | |||
diff --git a/apps/plugins/lib/xlcd_draw.c b/apps/plugins/lib/xlcd_draw.c index 311782c21f..25ef7518a1 100644 --- a/apps/plugins/lib/xlcd_draw.c +++ b/apps/plugins/lib/xlcd_draw.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include "plugin.h" | 25 | #include "plugin.h" |
26 | 26 | ||
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | #include "xlcd.h" | 27 | #include "xlcd.h" |
29 | 28 | ||
30 | /* sort the given coordinates by increasing x value */ | 29 | /* sort the given coordinates by increasing x value */ |
@@ -486,5 +485,3 @@ void xlcd_color_bitmap(const unsigned char *src, int x, int y, int width, | |||
486 | #endif /* HAVE_LCD_COLOR */ | 485 | #endif /* HAVE_LCD_COLOR */ |
487 | 486 | ||
488 | #endif /* LCD_DEPTH >= 8 */ | 487 | #endif /* LCD_DEPTH >= 8 */ |
489 | |||
490 | #endif /* HAVE_LCD_BITMAP */ | ||