diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-02-08 01:14:29 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-02-08 01:14:29 +0000 |
commit | 56647275b5f108e7116aee2ecb27b7e4b47c5600 (patch) | |
tree | bb24a18f027bd4c9e921a96193938fd8a5216967 /apps/plugins/lib | |
parent | cb0c5a3c03bb141139e5442d328663352edee134 (diff) | |
download | rockbox-56647275b5f108e7116aee2ecb27b7e4b47c5600.tar.gz rockbox-56647275b5f108e7116aee2ecb27b7e4b47c5600.zip |
JPEG viewer adapted to colour targets (greyscale only for now). New functions in the lcd extensions plugin library for drawing canonical greyscale bitmaps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8617 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r-- | apps/plugins/lib/xlcd.c | 132 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd.h | 7 |
2 files changed, 139 insertions, 0 deletions
diff --git a/apps/plugins/lib/xlcd.c b/apps/plugins/lib/xlcd.c index a842cf5eb7..57650ba05d 100644 --- a/apps/plugins/lib/xlcd.c +++ b/apps/plugins/lib/xlcd.c | |||
@@ -107,6 +107,138 @@ void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3) | |||
107 | 107 | ||
108 | #if LCD_DEPTH >= 8 | 108 | #if LCD_DEPTH >= 8 |
109 | 109 | ||
110 | #ifdef HAVE_LCD_COLOR | ||
111 | static const fb_data graylut[256] = { | ||
112 | #if LCD_PIXELFORMAT == RGB565 | ||
113 | 0x0000, 0x0000, 0x0000, 0x0020, 0x0020, 0x0821, 0x0821, 0x0841, | ||
114 | 0x0841, 0x0841, 0x0841, 0x0861, 0x0861, 0x1062, 0x1062, 0x1082, | ||
115 | 0x1082, 0x1082, 0x1082, 0x10a2, 0x10a2, 0x18a3, 0x18a3, 0x18c3, | ||
116 | 0x18c3, 0x18c3, 0x18c3, 0x18e3, 0x18e3, 0x20e4, 0x20e4, 0x2104, | ||
117 | 0x2104, 0x2104, 0x2104, 0x2124, 0x2124, 0x2124, 0x2925, 0x2945, | ||
118 | 0x2945, 0x2945, 0x2945, 0x2965, 0x2965, 0x2965, 0x3166, 0x3186, | ||
119 | 0x3186, 0x3186, 0x3186, 0x31a6, 0x31a6, 0x31a6, 0x39a7, 0x39c7, | ||
120 | 0x39c7, 0x39c7, 0x39c7, 0x39e7, 0x39e7, 0x39e7, 0x41e8, 0x4208, | ||
121 | 0x4208, 0x4208, 0x4208, 0x4228, 0x4228, 0x4228, 0x4a29, 0x4a49, | ||
122 | 0x4a49, 0x4a49, 0x4a49, 0x4a69, 0x4a69, 0x4a69, 0x4a69, 0x528a, | ||
123 | 0x528a, 0x528a, 0x528a, 0x52aa, 0x52aa, 0x52aa, 0x52aa, 0x5aab, | ||
124 | 0x5acb, 0x5acb, 0x5acb, 0x5acb, 0x5aeb, 0x5aeb, 0x5aeb, 0x62ec, | ||
125 | 0x630c, 0x630c, 0x630c, 0x630c, 0x632c, 0x632c, 0x632c, 0x6b2d, | ||
126 | 0x6b4d, 0x6b4d, 0x6b4d, 0x6b4d, 0x6b6d, 0x6b6d, 0x6b6d, 0x6b6d, | ||
127 | 0x738e, 0x738e, 0x738e, 0x738e, 0x73ae, 0x73ae, 0x73ae, 0x73ae, | ||
128 | 0x7bcf, 0x7bcf, 0x7bcf, 0x7bcf, 0x7bef, 0x7bef, 0x7bef, 0x7bef, | ||
129 | 0x8410, 0x8410, 0x8410, 0x8410, 0x8430, 0x8430, 0x8430, 0x8430, | ||
130 | 0x8c51, 0x8c51, 0x8c51, 0x8c51, 0x8c71, 0x8c71, 0x8c71, 0x8c71, | ||
131 | 0x9492, 0x9492, 0x9492, 0x9492, 0x94b2, 0x94b2, 0x94b2, 0x94b2, | ||
132 | 0x94d2, 0x9cd3, 0x9cd3, 0x9cd3, 0x9cf3, 0x9cf3, 0x9cf3, 0x9cf3, | ||
133 | 0x9d13, 0xa514, 0xa514, 0xa514, 0xa534, 0xa534, 0xa534, 0xa534, | ||
134 | 0xa554, 0xad55, 0xad55, 0xad55, 0xad55, 0xad75, 0xad75, 0xad75, | ||
135 | 0xad75, 0xb596, 0xb596, 0xb596, 0xb596, 0xb5b6, 0xb5b6, 0xb5b6, | ||
136 | 0xb5b6, 0xb5d6, 0xbdd7, 0xbdd7, 0xbdd7, 0xbdf7, 0xbdf7, 0xbdf7, | ||
137 | 0xbdf7, 0xbe17, 0xc618, 0xc618, 0xc618, 0xc638, 0xc638, 0xc638, | ||
138 | 0xc638, 0xc658, 0xce59, 0xce59, 0xce59, 0xce79, 0xce79, 0xce79, | ||
139 | 0xce79, 0xce99, 0xd69a, 0xd69a, 0xd69a, 0xd6ba, 0xd6ba, 0xd6ba, | ||
140 | 0xd6ba, 0xd6da, 0xd6da, 0xdedb, 0xdedb, 0xdefb, 0xdefb, 0xdefb, | ||
141 | 0xdefb, 0xdf1b, 0xdf1b, 0xe71c, 0xe71c, 0xe73c, 0xe73c, 0xe73c, | ||
142 | 0xe73c, 0xe75c, 0xe75c, 0xef5d, 0xef5d, 0xef7d, 0xef7d, 0xef7d, | ||
143 | 0xef7d, 0xef9d, 0xef9d, 0xf79e, 0xf79e, 0xf7be, 0xf7be, 0xf7be, | ||
144 | 0xf7be, 0xf7de, 0xf7de, 0xffdf, 0xffdf, 0xffff, 0xffff, 0xffff | ||
145 | #elif LCD_PIXELFORMAT == RGB565SWAPPED | ||
146 | 0x0000, 0x0000, 0x0000, 0x2000, 0x2000, 0x2108, 0x2108, 0x4108, | ||
147 | 0x4108, 0x4108, 0x4108, 0x6108, 0x6108, 0x6210, 0x6210, 0x8210, | ||
148 | 0x8210, 0x8210, 0x8210, 0xa210, 0xa210, 0xa318, 0xa318, 0xc318, | ||
149 | 0xc318, 0xc318, 0xc318, 0xe318, 0xe318, 0xe420, 0xe420, 0x0421, | ||
150 | 0x0421, 0x0421, 0x0421, 0x2421, 0x2421, 0x2421, 0x2529, 0x4529, | ||
151 | 0x4529, 0x4529, 0x4529, 0x6529, 0x6529, 0x6529, 0x6631, 0x8631, | ||
152 | 0x8631, 0x8631, 0x8631, 0xa631, 0xa631, 0xa631, 0xa739, 0xc739, | ||
153 | 0xc739, 0xc739, 0xc739, 0xe739, 0xe739, 0xe739, 0xe841, 0x0842, | ||
154 | 0x0842, 0x0842, 0x0842, 0x2842, 0x2842, 0x2842, 0x294a, 0x494a, | ||
155 | 0x494a, 0x494a, 0x494a, 0x694a, 0x694a, 0x694a, 0x694a, 0x8a52, | ||
156 | 0x8a52, 0x8a52, 0x8a52, 0xaa52, 0xaa52, 0xaa52, 0xaa52, 0xab5a, | ||
157 | 0xcb5a, 0xcb5a, 0xcb5a, 0xcb5a, 0xeb5a, 0xeb5a, 0xeb5a, 0xec62, | ||
158 | 0x0c63, 0x0c63, 0x0c63, 0x0c63, 0x2c63, 0x2c63, 0x2c63, 0x2d6b, | ||
159 | 0x4d6b, 0x4d6b, 0x4d6b, 0x4d6b, 0x6d6b, 0x6d6b, 0x6d6b, 0x6d6b, | ||
160 | 0x8e73, 0x8e73, 0x8e73, 0x8e73, 0xae73, 0xae73, 0xae73, 0xae73, | ||
161 | 0xcf7b, 0xcf7b, 0xcf7b, 0xcf7b, 0xef7b, 0xef7b, 0xef7b, 0xef7b, | ||
162 | 0x1084, 0x1084, 0x1084, 0x1084, 0x3084, 0x3084, 0x3084, 0x3084, | ||
163 | 0x518c, 0x518c, 0x518c, 0x518c, 0x718c, 0x718c, 0x718c, 0x718c, | ||
164 | 0x9294, 0x9294, 0x9294, 0x9294, 0xb294, 0xb294, 0xb294, 0xb294, | ||
165 | 0xd294, 0xd39c, 0xd39c, 0xd39c, 0xf39c, 0xf39c, 0xf39c, 0xf39c, | ||
166 | 0x139d, 0x14a5, 0x14a5, 0x14a5, 0x34a5, 0x34a5, 0x34a5, 0x34a5, | ||
167 | 0x54a5, 0x55ad, 0x55ad, 0x55ad, 0x55ad, 0x75ad, 0x75ad, 0x75ad, | ||
168 | 0x75ad, 0x96b5, 0x96b5, 0x96b5, 0x96b5, 0xb6b5, 0xb6b5, 0xb6b5, | ||
169 | 0xb6b5, 0xd6b5, 0xd7bd, 0xd7bd, 0xd7bd, 0xf7bd, 0xf7bd, 0xf7bd, | ||
170 | 0xf7bd, 0x17be, 0x18c6, 0x18c6, 0x18c6, 0x38c6, 0x38c6, 0x38c6, | ||
171 | 0x38c6, 0x58c6, 0x59ce, 0x59ce, 0x59ce, 0x79ce, 0x79ce, 0x79ce, | ||
172 | 0x79ce, 0x99ce, 0x9ad6, 0x9ad6, 0x9ad6, 0xbad6, 0xbad6, 0xbad6, | ||
173 | 0xbad6, 0xdad6, 0xdad6, 0xdbde, 0xdbde, 0xfbde, 0xfbde, 0xfbde, | ||
174 | 0xfbde, 0x1bdf, 0x1bdf, 0x1ce7, 0x1ce7, 0x3ce7, 0x3ce7, 0x3ce7, | ||
175 | 0x3ce7, 0x5ce7, 0x5ce7, 0x5def, 0x5def, 0x7def, 0x7def, 0x7def, | ||
176 | 0x7def, 0x9def, 0x9def, 0x9ef7, 0x9ef7, 0xbef7, 0xbef7, 0xbef7, | ||
177 | 0xbef7, 0xdef7, 0xdef7, 0xdfff, 0xdfff, 0xffff, 0xffff, 0xffff | ||
178 | #endif /* LCD_PIXELFORMAT */ | ||
179 | }; | ||
180 | #endif /* HAVE_LCD_COLOR */ | ||
181 | |||
182 | /* Draw a partial greyscale bitmap, canonical 8 bit format */ | ||
183 | void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | ||
184 | int stride, int x, int y, int width, int height) | ||
185 | { | ||
186 | const unsigned char *src_end; | ||
187 | fb_data *dst; | ||
188 | |||
189 | /* nothing to draw? */ | ||
190 | if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) | ||
191 | || (x + width <= 0) || (y + height <= 0)) | ||
192 | return; | ||
193 | |||
194 | /* clipping */ | ||
195 | if (x < 0) | ||
196 | { | ||
197 | width += x; | ||
198 | src_x -= x; | ||
199 | x = 0; | ||
200 | } | ||
201 | if (y < 0) | ||
202 | { | ||
203 | height += y; | ||
204 | src_y -= y; | ||
205 | y = 0; | ||
206 | } | ||
207 | if (x + width > LCD_WIDTH) | ||
208 | width = LCD_WIDTH - x; | ||
209 | if (y + height > LCD_HEIGHT) | ||
210 | height = LCD_HEIGHT - y; | ||
211 | |||
212 | src += stride * src_y + src_x; /* move starting point */ | ||
213 | src_end = src + stride * height; | ||
214 | dst = local_rb->lcd_framebuffer + LCD_WIDTH * y + x; | ||
215 | |||
216 | do | ||
217 | { | ||
218 | const unsigned char *src_row = src; | ||
219 | const unsigned char *row_end = src_row + width; | ||
220 | fb_data *dst_row = dst; | ||
221 | |||
222 | #ifdef HAVE_LCD_COLOR | ||
223 | do | ||
224 | *dst_row++ = graylut[*src_row++]; | ||
225 | while (src_row < row_end); | ||
226 | #endif | ||
227 | |||
228 | src += stride; | ||
229 | dst += LCD_WIDTH; | ||
230 | } | ||
231 | while (src < src_end); | ||
232 | } | ||
233 | |||
234 | /* Draw a full greyscale bitmap, canonical 8 bit format */ | ||
235 | void xlcd_gray_bitmap(const unsigned char *src, int x, int y, int width, | ||
236 | int height) | ||
237 | { | ||
238 | xlcd_gray_bitmap_part(src, 0, 0, width, x, y, width, height); | ||
239 | } | ||
240 | |||
241 | |||
110 | void xlcd_scroll_left(int count) | 242 | void xlcd_scroll_left(int count) |
111 | { | 243 | { |
112 | fb_data *data, *data_end; | 244 | fb_data *data, *data_end; |
diff --git a/apps/plugins/lib/xlcd.h b/apps/plugins/lib/xlcd.h index 2eaa05cd0d..b177ee5308 100644 --- a/apps/plugins/lib/xlcd.h +++ b/apps/plugins/lib/xlcd.h | |||
@@ -29,6 +29,13 @@ | |||
29 | void xlcd_init(struct plugin_api* newrb); | 29 | void xlcd_init(struct plugin_api* newrb); |
30 | void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3); | 30 | void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3); |
31 | 31 | ||
32 | #if LCD_DEPTH >= 8 | ||
33 | void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | ||
34 | int stride, int x, int y, int width, int height); | ||
35 | void xlcd_gray_bitmap(const unsigned char *src, int x, int y, int width, | ||
36 | int height); | ||
37 | #endif | ||
38 | |||
32 | void xlcd_scroll_left(int count); | 39 | void xlcd_scroll_left(int count); |
33 | void xlcd_scroll_right(int count); | 40 | void xlcd_scroll_right(int count); |
34 | void xlcd_scroll_up(int count); | 41 | void xlcd_scroll_up(int count); |