diff options
Diffstat (limited to 'apps/plugins/lib/grey_draw.c')
-rw-r--r-- | apps/plugins/lib/grey_draw.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c index 5879b8e35a..2ae96603df 100644 --- a/apps/plugins/lib/grey_draw.c +++ b/apps/plugins/lib/grey_draw.c | |||
@@ -63,7 +63,7 @@ void grey_clear_display(void) | |||
63 | int value = (_grey_info.drawmode & DRMODE_INVERSEVID) ? | 63 | int value = (_grey_info.drawmode & DRMODE_INVERSEVID) ? |
64 | _grey_info.fg_brightness : _grey_info.bg_brightness; | 64 | _grey_info.fg_brightness : _grey_info.bg_brightness; |
65 | 65 | ||
66 | _grey_info.rb->memset(_grey_info.buffer, value, | 66 | rb->memset(_grey_info.buffer, value, |
67 | _GREY_MULUQ(_grey_info.width, _grey_info.height)); | 67 | _GREY_MULUQ(_grey_info.width, _grey_info.height)); |
68 | } | 68 | } |
69 | 69 | ||
@@ -196,7 +196,7 @@ void grey_hline(int x1, int x2, int y) | |||
196 | dst = &_grey_info.buffer[_GREY_MULUQ(_grey_info.width, y) + x1]; | 196 | dst = &_grey_info.buffer[_GREY_MULUQ(_grey_info.width, y) + x1]; |
197 | 197 | ||
198 | if (fillopt) | 198 | if (fillopt) |
199 | _grey_info.rb->memset(dst, value, x2 - x1 + 1); | 199 | rb->memset(dst, value, x2 - x1 + 1); |
200 | else | 200 | else |
201 | { | 201 | { |
202 | unsigned char *dst_end = dst + x2 - x1; | 202 | unsigned char *dst_end = dst + x2 - x1; |
@@ -381,7 +381,7 @@ void grey_fillrect(int x, int y, int width, int height) | |||
381 | do | 381 | do |
382 | { | 382 | { |
383 | if (fillopt) | 383 | if (fillopt) |
384 | _grey_info.rb->memset(dst, value, width); | 384 | rb->memset(dst, value, width); |
385 | else | 385 | else |
386 | { | 386 | { |
387 | unsigned char *dst_row = dst; | 387 | unsigned char *dst_row = dst; |
@@ -516,7 +516,7 @@ void grey_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
516 | 516 | ||
517 | do | 517 | do |
518 | { | 518 | { |
519 | _grey_info.rb->memcpy(dst, src, width); | 519 | rb->memcpy(dst, src, width); |
520 | dst += _grey_info.width; | 520 | dst += _grey_info.width; |
521 | src += stride; | 521 | src += stride; |
522 | } | 522 | } |
@@ -535,9 +535,9 @@ void grey_putsxyofs(int x, int y, int ofs, const unsigned char *str) | |||
535 | { | 535 | { |
536 | int ch; | 536 | int ch; |
537 | unsigned short *ucs; | 537 | unsigned short *ucs; |
538 | struct font* pf = _grey_info.rb->font_get(_grey_info.curfont); | 538 | struct font* pf = rb->font_get(_grey_info.curfont); |
539 | 539 | ||
540 | ucs = _grey_info.rb->bidi_l2v(str, 1); | 540 | ucs = rb->bidi_l2v(str, 1); |
541 | 541 | ||
542 | while ((ch = *ucs++) != 0 && x < _grey_info.width) | 542 | while ((ch = *ucs++) != 0 && x < _grey_info.width) |
543 | { | 543 | { |
@@ -545,7 +545,7 @@ void grey_putsxyofs(int x, int y, int ofs, const unsigned char *str) | |||
545 | const unsigned char *bits; | 545 | const unsigned char *bits; |
546 | 546 | ||
547 | /* get proportional width and glyph bits */ | 547 | /* get proportional width and glyph bits */ |
548 | width = _grey_info.rb->font_get_width(pf, ch); | 548 | width = rb->font_get_width(pf, ch); |
549 | 549 | ||
550 | if (ofs > width) | 550 | if (ofs > width) |
551 | { | 551 | { |
@@ -553,7 +553,7 @@ void grey_putsxyofs(int x, int y, int ofs, const unsigned char *str) | |||
553 | continue; | 553 | continue; |
554 | } | 554 | } |
555 | 555 | ||
556 | bits = _grey_info.rb->font_get_bits(pf, ch); | 556 | bits = rb->font_get_bits(pf, ch); |
557 | 557 | ||
558 | grey_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height); | 558 | grey_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height); |
559 | 559 | ||
@@ -577,10 +577,10 @@ void grey_ub_clear_display(void) | |||
577 | _grey_info.fg_brightness : | 577 | _grey_info.fg_brightness : |
578 | _grey_info.bg_brightness]; | 578 | _grey_info.bg_brightness]; |
579 | 579 | ||
580 | _grey_info.rb->memset(_grey_info.values, value, | 580 | rb->memset(_grey_info.values, value, |
581 | _GREY_MULUQ(_grey_info.width, _grey_info.height)); | 581 | _GREY_MULUQ(_grey_info.width, _grey_info.height)); |
582 | #ifdef SIMULATOR | 582 | #ifdef SIMULATOR |
583 | _grey_info.rb->sim_lcd_ex_update_rect(_grey_info.x, _grey_info.y, | 583 | rb->sim_lcd_ex_update_rect(_grey_info.x, _grey_info.y, |
584 | _grey_info.width, _grey_info.height); | 584 | _grey_info.width, _grey_info.height); |
585 | #endif | 585 | #endif |
586 | } | 586 | } |
@@ -655,7 +655,7 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
655 | } | 655 | } |
656 | while (++yc < ye); | 656 | while (++yc < ye); |
657 | #ifdef SIMULATOR | 657 | #ifdef SIMULATOR |
658 | _grey_info.rb->sim_lcd_ex_update_rect(_grey_info.x + x, _grey_info.y + y, | 658 | rb->sim_lcd_ex_update_rect(_grey_info.x + x, _grey_info.y + y, |
659 | width, height); | 659 | width, height); |
660 | #endif | 660 | #endif |
661 | } | 661 | } |