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.zip rockbox-d146970ca1e5c9b0641301d50823d29b2e25c9e4.tar.gz rockbox-d146970ca1e5c9b0641301d50823d29b2e25c9e4.tar.bz2 rockbox-d146970ca1e5c9b0641301d50823d29b2e25c9e4.tar.xz | |
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 78e5725..a9ce45d 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) data = _grey_info.buffer; data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); length = _grey_info.width - count; - blank = (vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); + blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; do { @@ -77,8 +76,7 @@ void grey_scroll_right(int count) data = _grey_info.buffer; data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); length = _grey_info.width - count; - blank = (vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); + blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; do { @@ -104,8 +102,7 @@ void grey_scroll_up(int count) shift = _GREY_MULUQ(_grey_info.width, count); length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); - blank = (vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); + blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; rb->memmove(_grey_info.buffer, _grey_info.buffer + shift, length); @@ -127,8 +124,7 @@ void grey_scroll_down(int count) shift = _GREY_MULUQ(_grey_info.width, count); length = _GREY_MULUQ(_grey_info.width, _grey_info.height - count); - blank = (vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : _GREY_BG_BRIGHTNESS(vp); + blank = (vp->drawmode & DRMODE_INVERSEVID) ? vp->fg_pattern : vp->bg_pattern; rb->memmove(_grey_info.buffer + shift, _grey_info.buffer, length); @@ -155,8 +151,7 @@ void grey_ub_scroll_left(int count) length = (_grey_info.width - count) << _GREY_BSHIFT; count <<= _GREY_BSHIFT; blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : - _GREY_BG_BRIGHTNESS(vp)]; + vp->fg_pattern : vp->bg_pattern]; do { rb->memmove(data, data + count, length); @@ -189,8 +184,7 @@ void grey_ub_scroll_right(int count) length = (_grey_info.width - count) << _GREY_BSHIFT; count <<= _GREY_BSHIFT; blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : - _GREY_BG_BRIGHTNESS(vp)]; + vp->fg_pattern : vp->bg_pattern]; do { rb->memmove(data + count, data, length); @@ -220,8 +214,7 @@ void grey_ub_scroll_up(int count) dst = _grey_info.values; end = dst + _GREY_MULUQ(_grey_info.height, _grey_info.width); blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : - _GREY_BG_BRIGHTNESS(vp)]; + vp->fg_pattern : vp->bg_pattern]; #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) @@ -296,8 +289,7 @@ void grey_ub_scroll_down(int count) start = _grey_info.values; dst = start + _GREY_MULUQ(_grey_info.height, _grey_info.width); blank = _grey_info.gvalue[(vp->drawmode & DRMODE_INVERSEVID) ? - _GREY_FG_BRIGHTNESS(vp) : - _GREY_BG_BRIGHTNESS(vp)]; + vp->fg_pattern : vp->bg_pattern]; #if (LCD_PIXELFORMAT == VERTICAL_PACKING) \ || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) |