diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 22:14:41 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 22:14:41 +0100 |
commit | d146970ca1e5c9b0641301d50823d29b2e25c9e4 (patch) | |
tree | 30f738042a8d81e9336b594d1d52ec75e428d3b2 /apps/plugins/lib/grey_scroll.c | |
parent | e1c7b3b8f72becc9079c04253a2985f577850a48 (diff) | |
download | rockbox-d146970ca1e5c9b0641301d50823d29b2e25c9e4.tar.gz rockbox-d146970ca1e5c9b0641301d50823d29b2e25c9e4.zip |
lcd/grey: Enable viewport fg_pattern and bg_pattern for all bitmap targets.
Greylib performed a horrible hack and stored fg and bg patterns in other
struct viewport fields. One of them was just removed. So instead of
this hack simply enable the *_pattern fields for mono targets as well,
so that greylib can use them normally.
Change-Id: Ib0842ebcc97f5bf9d9382b4471903afa2f96f39f
Diffstat (limited to 'apps/plugins/lib/grey_scroll.c')
-rw-r--r-- | apps/plugins/lib/grey_scroll.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/apps/plugins/lib/grey_scroll.c b/apps/plugins/lib/grey_scroll.c index 78e5725d05..a9ce45db92 100644 --- a/apps/plugins/lib/grey_scroll.c +++ b/apps/plugins/lib/grey_scroll.c | |||
@@ -48,8 +48,7 @@ void grey_scroll_left(int count) | |||
48 | data = _grey_info.buffer; | 48 | data = _grey_info.buffer; |
49 | data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); | 49 | data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); |
50 | length = _grey_info.width - count; | 50 | length = _grey_info.width - count; |
51 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? | 51 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; |
52 | _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); | ||
53 | 52 | ||
54 | do | 53 | do |
55 | { | 54 | { |
@@ -77,8 +76,7 @@ void grey_scroll_right(int count) | |||
77 | data = _grey_info.buffer; | 76 | data = _grey_info.buffer; |
78 | data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); | 77 | data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); |
79 | length = _grey_info.width - count; | 78 | length = _grey_info.width - count; |
80 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? | 79 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; |
81 | _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); | ||
82 | 80 | ||
83 | do | 81 | do |
84 | { | 82 | { |
@@ -104,8 +102,7 @@ void grey_scroll_up(int count) | |||
104 | 102 | ||
105 | shift = _GREY_MULUQ(_grey_info.width, count); | 103 | shift = _GREY_MULUQ(_grey_info.width, count); |
106 | length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); | 104 | length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); |
107 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? | 105 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; |
108 | _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); | ||
109 | 106 | ||
110 | rb->memmove(_grey_info.buffer, _grey_info.buffer + shift, | 107 | rb->memmove(_grey_info.buffer, _grey_info.buffer + shift, |
111 | length); | 108 | length); |
@@ -127,8 +124,7 @@ void grey_scroll_down(int count) | |||
127 | 124 | ||
128 | shift = _GREY_MULUQ(_grey_info.width, count); | 125 | shift = _GREY_MULUQ(_grey_info.width, count); |
129 | length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); | 126 | length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); |
130 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? | 127 | blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; |
131 | _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); | ||
132 | 128 | ||
133 | rb->memmove(_grey_info.buffer + shift, _grey_info.buffer, | 129 | rb->memmove(_grey_info.buffer + shift, _grey_info.buffer, |
134 | length); | 130 | length); |
@@ -155,8 +151,7 @@ void grey_ub_scroll_left(int count) | |||
155 | length = (_grey_info.width - count) << _GREY_BSHIFT; | 151 | length = (_grey_info.width - count) << _GREY_BSHIFT; |
156 | count <<= _GREY_BSHIFT; | 152 | count <<= _GREY_BSHIFT; |
157 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? | 153 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? |
158 | _GREY_FG_BRIGHTNESS(vp) : | 154 | vp->fg_pattern : vp->bg_pattern]; |
159 | _GREY_BG_BRIGHTNESS(vp)]; | ||
160 | do | 155 | do |
161 | { | 156 | { |
162 | rb->memmove(data, data + count, length); | 157 | rb->memmove(data, data + count, length); |
@@ -189,8 +184,7 @@ void grey_ub_scroll_right(int count) | |||
189 | length = (_grey_info.width - count) << _GREY_BSHIFT; | 184 | length = (_grey_info.width - count) << _GREY_BSHIFT; |
190 | count <<= _GREY_BSHIFT; | 185 | count <<= _GREY_BSHIFT; |
191 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? | 186 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? |
192 | _GREY_FG_BRIGHTNESS(vp) : | 187 | vp->fg_pattern : vp->bg_pattern]; |
193 | _GREY_BG_BRIGHTNESS(vp)]; | ||
194 | do | 188 | do |
195 | { | 189 | { |
196 | rb->memmove(data + count, data, length); | 190 | rb->memmove(data + count, data, length); |
@@ -220,8 +214,7 @@ void grey_ub_scroll_up(int count) | |||
220 | dst = _grey_info.values; | 214 | dst = _grey_info.values; |
221 | end = dst + _GREY_MULUQ(_grey_info.height, _grey_info.width); | 215 | end = dst + _GREY_MULUQ(_grey_info.height, _grey_info.width); |
222 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? | 216 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? |
223 | _GREY_FG_BRIGHTNESS(vp) : | 217 | vp->fg_pattern : vp->bg_pattern]; |
224 | _GREY_BG_BRIGHTNESS(vp)]; | ||
225 | 218 | ||
226 | #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ | 219 | #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ |
227 | || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) | 220 | || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) |
@@ -296,8 +289,7 @@ void grey_ub_scroll_down(int count) | |||
296 | start = _grey_info.values; | 289 | start = _grey_info.values; |
297 | dst = start + _GREY_MULUQ(_grey_info.height, _grey_info.width); | 290 | dst = start + _GREY_MULUQ(_grey_info.height, _grey_info.width); |
298 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? | 291 | blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? |
299 | _GREY_FG_BRIGHTNESS(vp) : | 292 | vp->fg_pattern : vp->bg_pattern]; |
300 | _GREY_BG_BRIGHTNESS(vp)]; | ||
301 | 293 | ||
302 | #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ | 294 | #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ |
303 | || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) | 295 | || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) |