forked from len0rd/rockbox
Preparations for implementing the new graphics api: Ordered lcd bitmap driver defines, variables and functions by function groups. Centralised some definitions, code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6844 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold
parent
bec1afada5
commit
6a556c1740
6 changed files with 1511 additions and 1601 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -18,8 +18,6 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "lcd.h"
|
#include "lcd.h"
|
||||||
#include "kernel.h"
|
#include "kernel.h"
|
||||||
|
|
@ -58,38 +56,9 @@
|
||||||
#define LCD_CNTL_COLUMN 0x13
|
#define LCD_CNTL_COLUMN 0x13
|
||||||
#define LCD_CNTL_DATA_WRITE 0x1d
|
#define LCD_CNTL_DATA_WRITE 0x1d
|
||||||
|
|
||||||
#define SCROLL_SPACING 3
|
|
||||||
|
|
||||||
#define SCROLLABLE_LINES 26
|
#define SCROLLABLE_LINES 26
|
||||||
|
|
||||||
struct scrollinfo {
|
/*** globals ***/
|
||||||
char line[MAX_PATH + LCD_WIDTH/2 + SCROLL_SPACING + 2];
|
|
||||||
int len; /* length of line in chars */
|
|
||||||
int width; /* length of line in pixels */
|
|
||||||
int offset;
|
|
||||||
int startx;
|
|
||||||
bool backward; /* scroll presently forward or backward? */
|
|
||||||
bool bidir;
|
|
||||||
bool invert; /* invert the scrolled text */
|
|
||||||
long start_tick;
|
|
||||||
};
|
|
||||||
|
|
||||||
static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
|
|
||||||
|
|
||||||
static void scroll_thread(void);
|
|
||||||
static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
|
|
||||||
static const char scroll_name[] = "scroll";
|
|
||||||
static char scroll_ticks = 12; /* # of ticks between updates*/
|
|
||||||
static int scroll_delay = HZ/2; /* ticks delay before start */
|
|
||||||
static char scroll_step = 6; /* pixels per scroll step */
|
|
||||||
static int bidir_limit = 50; /* percent */
|
|
||||||
static struct scrollinfo scroll[SCROLLABLE_LINES];
|
|
||||||
static int xmargin = 0;
|
|
||||||
static int ymargin = 0;
|
|
||||||
static int curfont = FONT_SYSFIXED;
|
|
||||||
#ifndef SIMULATOR
|
|
||||||
static int xoffset = 0; /* needed for flip */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]
|
unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]
|
||||||
#ifndef SIMULATOR
|
#ifndef SIMULATOR
|
||||||
|
|
@ -97,6 +66,13 @@ unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
|
|
||||||
|
static int xmargin = 0;
|
||||||
|
static int ymargin = 0;
|
||||||
|
static int curfont = FONT_SYSFIXED;
|
||||||
|
#ifndef SIMULATOR
|
||||||
|
static int xoffset = 0; /* needed for flip */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* All zeros and ones bitmaps for area filling */
|
/* All zeros and ones bitmaps for area filling */
|
||||||
static const unsigned char zeros[16] = {
|
static const unsigned char zeros[16] = {
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||||
|
|
@ -106,11 +82,85 @@ static const unsigned char ones[16] = {
|
||||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* scrolling */
|
||||||
|
static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
|
||||||
|
static void scroll_thread(void);
|
||||||
|
static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
|
||||||
|
static const char scroll_name[] = "scroll";
|
||||||
|
static char scroll_ticks = 12; /* # of ticks between updates*/
|
||||||
|
static int scroll_delay = HZ/2; /* ticks delay before start */
|
||||||
|
static char scroll_step = 6; /* pixels per scroll step */
|
||||||
|
static int bidir_limit = 50; /* percent */
|
||||||
|
static struct scrollinfo scroll[SCROLLABLE_LINES];
|
||||||
|
|
||||||
|
static const char scroll_tick_table[16] = {
|
||||||
|
/* Hz values:
|
||||||
|
1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */
|
||||||
|
100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
|
||||||
|
};
|
||||||
|
|
||||||
|
/*** driver code is in lcd.S ***/
|
||||||
|
|
||||||
|
/*** hardware configuration ***/
|
||||||
|
|
||||||
int lcd_default_contrast(void)
|
int lcd_default_contrast(void)
|
||||||
{
|
{
|
||||||
return 28;
|
return 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef SIMULATOR
|
||||||
|
|
||||||
|
void lcd_set_contrast(int val)
|
||||||
|
{
|
||||||
|
lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void lcd_set_invert_display(bool yesno)
|
||||||
|
{
|
||||||
|
lcd_write_command(LCD_CNTL_REVERSE | (yesno?1:0));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* turn the display upside down (call lcd_update() afterwards) */
|
||||||
|
void lcd_set_flip(bool yesno)
|
||||||
|
{
|
||||||
|
if (yesno)
|
||||||
|
{
|
||||||
|
lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 1);
|
||||||
|
lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 0);
|
||||||
|
lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 0);
|
||||||
|
xoffset = 160 - LCD_WIDTH; /* 160 colums minus the 160 we have */
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 0);
|
||||||
|
lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 1);
|
||||||
|
lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 1);
|
||||||
|
xoffset = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Rolls up the lcd display by the specified amount of lines.
|
||||||
|
* Lines that are rolled out over the top of the screen are
|
||||||
|
* rolled in from the bottom again. This is a hardware
|
||||||
|
* remapping only and all operations on the lcd are affected.
|
||||||
|
* ->
|
||||||
|
* @param int lines - The number of lines that are rolled.
|
||||||
|
* The value must be 0 <= pixels < LCD_HEIGHT. */
|
||||||
|
void lcd_roll(int lines)
|
||||||
|
{
|
||||||
|
char data[2];
|
||||||
|
|
||||||
|
lines &= LCD_HEIGHT-1;
|
||||||
|
data[0] = lines & 0xff;
|
||||||
|
data[1] = lines >> 8;
|
||||||
|
|
||||||
|
lcd_write_command(LCD_CNTL_DISPLAY_START_LINE);
|
||||||
|
lcd_write_data(data, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* !SIMULATOR */
|
||||||
|
|
||||||
|
/* LCD init */
|
||||||
#ifdef SIMULATOR
|
#ifdef SIMULATOR
|
||||||
|
|
||||||
void lcd_init(void)
|
void lcd_init(void)
|
||||||
|
|
@ -118,13 +168,9 @@ void lcd_init(void)
|
||||||
create_thread(scroll_thread, scroll_stack,
|
create_thread(scroll_thread, scroll_stack,
|
||||||
sizeof(scroll_stack), scroll_name);
|
sizeof(scroll_stack), scroll_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
/*
|
void lcd_init(void)
|
||||||
* Initialize LCD
|
|
||||||
*/
|
|
||||||
void lcd_init (void)
|
|
||||||
{
|
{
|
||||||
/* GPO35 is the LCD A0 pin
|
/* GPO35 is the LCD A0 pin
|
||||||
GPO46 is LCD RESET */
|
GPO46 is LCD RESET */
|
||||||
|
|
@ -170,10 +216,11 @@ void lcd_init (void)
|
||||||
sizeof(scroll_stack), scroll_name);
|
sizeof(scroll_stack), scroll_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*** update functions ***/
|
||||||
|
|
||||||
/* Performance function that works with an external buffer
|
/* Performance function that works with an external buffer
|
||||||
note that y and height are in 8-pixel units! */
|
note that y and height are in 8-pixel units! */
|
||||||
void lcd_blit (const unsigned char* p_data, int x, int y, int width,
|
void lcd_blit(const unsigned char* p_data, int x, int y, int width,
|
||||||
int height, int stride)
|
int height, int stride)
|
||||||
{
|
{
|
||||||
/* Copy display bitmap to hardware */
|
/* Copy display bitmap to hardware */
|
||||||
|
|
@ -189,12 +236,10 @@ void lcd_blit (const unsigned char* p_data, int x, int y, int width,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/* Update the display.
|
||||||
* Update the display.
|
This must be called after all other LCD functions that change the display. */
|
||||||
* This must be called after all other LCD functions that change the display.
|
void lcd_update(void) __attribute__ ((section (".icode")));
|
||||||
*/
|
void lcd_update(void)
|
||||||
void lcd_update (void) __attribute__ ((section (".icode")));
|
|
||||||
void lcd_update (void)
|
|
||||||
{
|
{
|
||||||
int y;
|
int y;
|
||||||
|
|
||||||
|
|
@ -209,12 +254,9 @@ void lcd_update (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/* Update a fraction of the display. */
|
||||||
* Update a fraction of the display.
|
void lcd_update_rect(int, int, int, int) __attribute__ ((section (".icode")));
|
||||||
*/
|
void lcd_update_rect(int x_start, int y, int width, int height)
|
||||||
void lcd_update_rect (int, int, int, int) __attribute__ ((section (".icode")));
|
|
||||||
void lcd_update_rect (int x_start, int y,
|
|
||||||
int width, int height)
|
|
||||||
{
|
{
|
||||||
int ymax;
|
int ymax;
|
||||||
|
|
||||||
|
|
@ -239,64 +281,9 @@ void lcd_update_rect (int x_start, int y,
|
||||||
lcd_write_data (&lcd_framebuffer[y][x_start], width);
|
lcd_write_data (&lcd_framebuffer[y][x_start], width);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* !SIMULATOR */
|
||||||
|
|
||||||
void lcd_set_contrast(int val)
|
/*** parameter handling ***/
|
||||||
{
|
|
||||||
lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void lcd_set_invert_display(bool yesno)
|
|
||||||
{
|
|
||||||
lcd_write_command(LCD_CNTL_REVERSE | (yesno?1:0));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* turn the display upside down (call lcd_update() afterwards) */
|
|
||||||
void lcd_set_flip(bool yesno)
|
|
||||||
{
|
|
||||||
if (yesno)
|
|
||||||
{
|
|
||||||
lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 1);
|
|
||||||
lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 0);
|
|
||||||
lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 0);
|
|
||||||
xoffset = 160 - LCD_WIDTH; /* 160 colums minus the 160 we have */
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 0);
|
|
||||||
lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 1);
|
|
||||||
lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 1);
|
|
||||||
xoffset = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rolls up the lcd display by the specified amount of lines.
|
|
||||||
* Lines that are rolled out over the top of the screen are
|
|
||||||
* rolled in from the bottom again. This is a hardware
|
|
||||||
* remapping only and all operations on the lcd are affected.
|
|
||||||
* ->
|
|
||||||
* @param int lines - The number of lines that are rolled.
|
|
||||||
* The value must be 0 <= pixels < LCD_HEIGHT.
|
|
||||||
*/
|
|
||||||
void lcd_roll(int lines)
|
|
||||||
{
|
|
||||||
char data[2];
|
|
||||||
|
|
||||||
lines &= LCD_HEIGHT-1;
|
|
||||||
data[0] = lines & 0xff;
|
|
||||||
data[1] = lines >> 8;
|
|
||||||
|
|
||||||
lcd_write_command(LCD_CNTL_DISPLAY_START_LINE);
|
|
||||||
lcd_write_data(data, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SIMULATOR */
|
|
||||||
|
|
||||||
void lcd_clear_display (void)
|
|
||||||
{
|
|
||||||
memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
|
|
||||||
scrolling_lines = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void lcd_setmargins(int x, int y)
|
void lcd_setmargins(int x, int y)
|
||||||
{
|
{
|
||||||
|
|
@ -324,111 +311,237 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h)
|
||||||
return font_getstringsize(str, w, h, curfont);
|
return font_getstringsize(str, w, h, curfont);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* put a string at a given char position */
|
/*** drawing functions ***/
|
||||||
void lcd_puts(int x, int y, const unsigned char *str)
|
|
||||||
|
void lcd_clear_display(void)
|
||||||
{
|
{
|
||||||
lcd_puts_style(x, y, str, STYLE_DEFAULT);
|
memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
|
||||||
|
scrolling_lines = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_puts_style(int x, int y, const unsigned char *str, int style)
|
/* Set a single pixel */
|
||||||
|
void lcd_drawpixel(int x, int y)
|
||||||
{
|
{
|
||||||
int xpos,ypos,w,h;
|
DRAW_PIXEL(x,y);
|
||||||
|
|
||||||
#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
|
|
||||||
/* We make the simulator truncate the string if it reaches the right edge,
|
|
||||||
as otherwise it'll wrap. The real target doesn't wrap. */
|
|
||||||
|
|
||||||
char buffer[12];
|
|
||||||
if(strlen(str)+x > 11 ) {
|
|
||||||
strncpy(buffer, str, sizeof buffer);
|
|
||||||
buffer[11-x]=0;
|
|
||||||
str = buffer;
|
|
||||||
}
|
|
||||||
xmargin = 0;
|
|
||||||
ymargin = 8;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* make sure scrolling is turned off on the line we are updating */
|
|
||||||
scrolling_lines &= ~(1 << y);
|
|
||||||
|
|
||||||
if(!str || !str[0])
|
|
||||||
return;
|
|
||||||
|
|
||||||
lcd_getstringsize(str, &w, &h);
|
|
||||||
xpos = xmargin + x*w / strlen(str);
|
|
||||||
ypos = ymargin + y*h;
|
|
||||||
lcd_putsxy(xpos, ypos, str);
|
|
||||||
lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
|
|
||||||
if (style & STYLE_INVERT)
|
|
||||||
lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h);
|
|
||||||
|
|
||||||
#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
|
|
||||||
lcd_update();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* put a string at a given pixel position, skipping first ofs pixel columns */
|
/* Clear a single pixel */
|
||||||
static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
|
void lcd_clearpixel(int x, int y)
|
||||||
{
|
{
|
||||||
int ch;
|
CLEAR_PIXEL(x,y);
|
||||||
struct font* pf = font_get(curfont);
|
}
|
||||||
|
|
||||||
while ((ch = *str++) != '\0' && x < LCD_WIDTH)
|
/* Invert a single pixel */
|
||||||
{
|
void lcd_invertpixel(int x, int y)
|
||||||
int gwidth, width;
|
{
|
||||||
|
INVERT_PIXEL(x,y);
|
||||||
|
}
|
||||||
|
|
||||||
/* check input range */
|
void lcd_drawline(int x1, int y1, int x2, int y2)
|
||||||
if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
|
{
|
||||||
ch = pf->defaultchar;
|
int numpixels;
|
||||||
ch -= pf->firstchar;
|
int i;
|
||||||
|
int deltax, deltay;
|
||||||
|
int d, dinc1, dinc2;
|
||||||
|
int x, xinc1, xinc2;
|
||||||
|
int y, yinc1, yinc2;
|
||||||
|
|
||||||
/* get proportional width and glyph bits */
|
deltax = abs(x2 - x1);
|
||||||
gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
|
deltay = abs(y2 - y1);
|
||||||
width = MIN (gwidth, LCD_WIDTH - x);
|
|
||||||
|
|
||||||
if (ofs != 0)
|
if(deltax >= deltay)
|
||||||
{
|
{
|
||||||
if (ofs > width)
|
numpixels = deltax;
|
||||||
{
|
d = 2 * deltay - deltax;
|
||||||
ofs -= width;
|
dinc1 = deltay * 2;
|
||||||
continue;
|
dinc2 = (deltay - deltax) * 2;
|
||||||
}
|
xinc1 = 1;
|
||||||
width -= ofs;
|
xinc2 = 1;
|
||||||
}
|
yinc1 = 0;
|
||||||
|
yinc2 = 1;
|
||||||
if (width > 0)
|
|
||||||
{
|
|
||||||
unsigned int i;
|
|
||||||
const unsigned char* bits = pf->bits +
|
|
||||||
(pf->offset ? pf->offset[ch]
|
|
||||||
: ((pf->height + 7) / 8 * pf->maxwidth * ch));
|
|
||||||
|
|
||||||
if (ofs != 0)
|
|
||||||
{
|
|
||||||
for (i = 0; i < pf->height; i += 8)
|
|
||||||
{
|
|
||||||
lcd_bitmap (bits + ofs, x, y + i, width,
|
|
||||||
MIN(8, pf->height - i), true);
|
|
||||||
bits += gwidth;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
lcd_bitmap ((unsigned char*) bits, x, y, gwidth,
|
{
|
||||||
pf->height, true);
|
numpixels = deltay;
|
||||||
x += width;
|
d = 2 * deltax - deltay;
|
||||||
|
dinc1 = deltax * 2;
|
||||||
|
dinc2 = (deltax - deltay) * 2;
|
||||||
|
xinc1 = 0;
|
||||||
|
xinc2 = 1;
|
||||||
|
yinc1 = 1;
|
||||||
|
yinc2 = 1;
|
||||||
|
}
|
||||||
|
numpixels++; /* include endpoints */
|
||||||
|
|
||||||
|
if(x1 > x2)
|
||||||
|
{
|
||||||
|
xinc1 = -xinc1;
|
||||||
|
xinc2 = -xinc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(y1 > y2)
|
||||||
|
{
|
||||||
|
yinc1 = -yinc1;
|
||||||
|
yinc2 = -yinc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
x = x1;
|
||||||
|
y = y1;
|
||||||
|
|
||||||
|
for(i=0; i<numpixels; i++)
|
||||||
|
{
|
||||||
|
DRAW_PIXEL(x,y);
|
||||||
|
|
||||||
|
if(d < 0)
|
||||||
|
{
|
||||||
|
d += dinc1;
|
||||||
|
x += xinc1;
|
||||||
|
y += yinc1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
d += dinc2;
|
||||||
|
x += xinc2;
|
||||||
|
y += yinc2;
|
||||||
}
|
}
|
||||||
ofs = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* put a string at a given pixel position */
|
void lcd_clearline(int x1, int y1, int x2, int y2)
|
||||||
void lcd_putsxy(int x, int y, const unsigned char *str)
|
|
||||||
{
|
{
|
||||||
lcd_putsxyofs(x, y, 0, str);
|
int numpixels;
|
||||||
|
int i;
|
||||||
|
int deltax, deltay;
|
||||||
|
int d, dinc1, dinc2;
|
||||||
|
int x, xinc1, xinc2;
|
||||||
|
int y, yinc1, yinc2;
|
||||||
|
|
||||||
|
deltax = abs(x2 - x1);
|
||||||
|
deltay = abs(y2 - y1);
|
||||||
|
|
||||||
|
if(deltax >= deltay)
|
||||||
|
{
|
||||||
|
numpixels = deltax;
|
||||||
|
d = 2 * deltay - deltax;
|
||||||
|
dinc1 = deltay * 2;
|
||||||
|
dinc2 = (deltay - deltax) * 2;
|
||||||
|
xinc1 = 1;
|
||||||
|
xinc2 = 1;
|
||||||
|
yinc1 = 0;
|
||||||
|
yinc2 = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
numpixels = deltay;
|
||||||
|
d = 2 * deltax - deltay;
|
||||||
|
dinc1 = deltax * 2;
|
||||||
|
dinc2 = (deltax - deltay) * 2;
|
||||||
|
xinc1 = 0;
|
||||||
|
xinc2 = 1;
|
||||||
|
yinc1 = 1;
|
||||||
|
yinc2 = 1;
|
||||||
|
}
|
||||||
|
numpixels++; /* include endpoints */
|
||||||
|
|
||||||
|
if(x1 > x2)
|
||||||
|
{
|
||||||
|
xinc1 = -xinc1;
|
||||||
|
xinc2 = -xinc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(y1 > y2)
|
||||||
|
{
|
||||||
|
yinc1 = -yinc1;
|
||||||
|
yinc2 = -yinc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
x = x1;
|
||||||
|
y = y1;
|
||||||
|
|
||||||
|
for(i=0; i<numpixels; i++)
|
||||||
|
{
|
||||||
|
CLEAR_PIXEL(x,y);
|
||||||
|
|
||||||
|
if(d < 0)
|
||||||
|
{
|
||||||
|
d += dinc1;
|
||||||
|
x += xinc1;
|
||||||
|
y += yinc1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
d += dinc2;
|
||||||
|
x += xinc2;
|
||||||
|
y += yinc2;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/* Draw a rectangle with upper left corner at (x, y) and size (nx, ny) */
|
||||||
* About Rockbox' internal bitmap format:
|
void lcd_drawrect(int x, int y, int nx, int ny)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (x > LCD_WIDTH)
|
||||||
|
return;
|
||||||
|
if (y > LCD_HEIGHT)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (x + nx > LCD_WIDTH)
|
||||||
|
nx = LCD_WIDTH - x;
|
||||||
|
if (y + ny > LCD_HEIGHT)
|
||||||
|
ny = LCD_HEIGHT - y;
|
||||||
|
|
||||||
|
/* vertical lines */
|
||||||
|
for (i = 0; i < ny; i++) {
|
||||||
|
DRAW_PIXEL(x, (y + i));
|
||||||
|
DRAW_PIXEL((x + nx - 1), (y + i));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* horizontal lines */
|
||||||
|
for (i = 0; i < nx; i++) {
|
||||||
|
DRAW_PIXEL((x + i),y);
|
||||||
|
DRAW_PIXEL((x + i),(y + ny - 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Clear a rectangular area at (x, y), size (nx, ny) */
|
||||||
|
void lcd_clearrect(int x, int y, int nx, int ny)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < nx; i++)
|
||||||
|
lcd_bitmap (zeros, x+i, y, 1, ny, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fill a rectangular area at (x, y), size (nx, ny) */
|
||||||
|
void lcd_fillrect(int x, int y, int nx, int ny)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < nx; i++)
|
||||||
|
lcd_bitmap (ones, x+i, y, 1, ny, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Invert a rectangular area at (x, y), size (nx, ny) */
|
||||||
|
void lcd_invertrect(int x, int y, int nx, int ny)
|
||||||
|
{
|
||||||
|
int i, j;
|
||||||
|
|
||||||
|
if (x > LCD_WIDTH)
|
||||||
|
return;
|
||||||
|
if (y > LCD_HEIGHT)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (x + nx > LCD_WIDTH)
|
||||||
|
nx = LCD_WIDTH - x;
|
||||||
|
if (y + ny > LCD_HEIGHT)
|
||||||
|
ny = LCD_HEIGHT - y;
|
||||||
|
|
||||||
|
for (i = 0; i < nx; i++)
|
||||||
|
for (j = 0; j < ny; j++)
|
||||||
|
INVERT_PIXEL((x + i), (y + j));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* About Rockbox' internal bitmap format:
|
||||||
*
|
*
|
||||||
* A bitmap contains one bit for every pixel that defines if that pixel is
|
* A bitmap contains one bit for every pixel that defines if that pixel is
|
||||||
* black (1) or white (0). Bits within a byte are arranged vertically, LSB
|
* black (1) or white (0). Bits within a byte are arranged vertically, LSB
|
||||||
|
|
@ -437,16 +550,13 @@ void lcd_putsxy(int x, int y, const unsigned char *str)
|
||||||
* byte 1 2nd from left etc. The first row of bytes defines pixel rows
|
* byte 1 2nd from left etc. The first row of bytes defines pixel rows
|
||||||
* 0..7, the second row defines pixel row 8..15 etc.
|
* 0..7, the second row defines pixel row 8..15 etc.
|
||||||
*
|
*
|
||||||
* This is the same as the internal lcd hw format.
|
* This is the same as the internal lcd hw format. */
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/* Draw a bitmap at (x, y), size (nx, ny)
|
||||||
* Draw a bitmap at (x, y), size (nx, ny)
|
if 'clear' is true, clear destination area first */
|
||||||
* if 'clear' is true, clear destination area first
|
void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
|
||||||
*/
|
|
||||||
void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
|
|
||||||
bool clear) __attribute__ ((section (".icode")));
|
bool clear) __attribute__ ((section (".icode")));
|
||||||
void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
|
void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
|
||||||
bool clear)
|
bool clear)
|
||||||
{
|
{
|
||||||
const unsigned char *src_col;
|
const unsigned char *src_col;
|
||||||
|
|
@ -531,77 +641,95 @@ void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/* put a string at a given pixel position, skipping first ofs pixel columns */
|
||||||
* Draw a rectangle with upper left corner at (x, y)
|
static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
|
||||||
* and size (nx, ny)
|
|
||||||
*/
|
|
||||||
void lcd_drawrect (int x, int y, int nx, int ny)
|
|
||||||
{
|
{
|
||||||
int i;
|
int ch;
|
||||||
|
struct font* pf = font_get(curfont);
|
||||||
|
|
||||||
if (x > LCD_WIDTH)
|
while ((ch = *str++) != '\0' && x < LCD_WIDTH)
|
||||||
return;
|
{
|
||||||
if (y > LCD_HEIGHT)
|
int gwidth, width;
|
||||||
return;
|
|
||||||
|
|
||||||
if (x + nx > LCD_WIDTH)
|
/* check input range */
|
||||||
nx = LCD_WIDTH - x;
|
if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
|
||||||
if (y + ny > LCD_HEIGHT)
|
ch = pf->defaultchar;
|
||||||
ny = LCD_HEIGHT - y;
|
ch -= pf->firstchar;
|
||||||
|
|
||||||
/* vertical lines */
|
/* get proportional width and glyph bits */
|
||||||
for (i = 0; i < ny; i++) {
|
gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
|
||||||
DRAW_PIXEL(x, (y + i));
|
width = MIN (gwidth, LCD_WIDTH - x);
|
||||||
DRAW_PIXEL((x + nx - 1), (y + i));
|
|
||||||
|
if (ofs != 0)
|
||||||
|
{
|
||||||
|
if (ofs > width)
|
||||||
|
{
|
||||||
|
ofs -= width;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
width -= ofs;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* horizontal lines */
|
if (width > 0)
|
||||||
for (i = 0; i < nx; i++) {
|
{
|
||||||
DRAW_PIXEL((x + i),y);
|
unsigned int i;
|
||||||
DRAW_PIXEL((x + i),(y + ny - 1));
|
const unsigned char* bits = pf->bits +
|
||||||
|
(pf->offset ? pf->offset[ch]
|
||||||
|
: ((pf->height + 7) / 8 * pf->maxwidth * ch));
|
||||||
|
|
||||||
|
if (ofs != 0)
|
||||||
|
{
|
||||||
|
for (i = 0; i < pf->height; i += 8)
|
||||||
|
{
|
||||||
|
lcd_bitmap (bits + ofs, x, y + i, width,
|
||||||
|
MIN(8, pf->height - i), true);
|
||||||
|
bits += gwidth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
lcd_bitmap ((unsigned char*) bits, x, y, gwidth,
|
||||||
|
pf->height, true);
|
||||||
|
x += width;
|
||||||
|
}
|
||||||
|
ofs = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/* put a string at a given pixel position */
|
||||||
* Clear a rectangular area at (x, y), size (nx, ny)
|
void lcd_putsxy(int x, int y, const unsigned char *str)
|
||||||
*/
|
|
||||||
void lcd_clearrect (int x, int y, int nx, int ny)
|
|
||||||
{
|
{
|
||||||
int i;
|
lcd_putsxyofs(x, y, 0, str);
|
||||||
for (i = 0; i < nx; i++)
|
|
||||||
lcd_bitmap (zeros, x+i, y, 1, ny, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*** line oriented text output ***/
|
||||||
* Fill a rectangular area at (x, y), size (nx, ny)
|
|
||||||
*/
|
|
||||||
void lcd_fillrect (int x, int y, int nx, int ny)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < nx; i++)
|
|
||||||
lcd_bitmap (ones, x+i, y, 1, ny, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Invert a rectangular area at (x, y), size (nx, ny) */
|
void lcd_puts_style(int x, int y, const unsigned char *str, int style)
|
||||||
void lcd_invertrect (int x, int y, int nx, int ny)
|
|
||||||
{
|
{
|
||||||
int i, j;
|
int xpos,ypos,w,h;
|
||||||
|
|
||||||
if (x > LCD_WIDTH)
|
/* make sure scrolling is turned off on the line we are updating */
|
||||||
return;
|
scrolling_lines &= ~(1 << y);
|
||||||
if (y > LCD_HEIGHT)
|
|
||||||
|
if(!str || !str[0])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (x + nx > LCD_WIDTH)
|
lcd_getstringsize(str, &w, &h);
|
||||||
nx = LCD_WIDTH - x;
|
xpos = xmargin + x*w / strlen(str);
|
||||||
if (y + ny > LCD_HEIGHT)
|
ypos = ymargin + y*h;
|
||||||
ny = LCD_HEIGHT - y;
|
lcd_putsxy(xpos, ypos, str);
|
||||||
|
lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
|
||||||
for (i = 0; i < nx; i++)
|
if (style & STYLE_INVERT)
|
||||||
for (j = 0; j < ny; j++)
|
lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h);
|
||||||
INVERT_PIXEL((x + i), (y + j));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* put a string at a given char position */
|
||||||
|
void lcd_puts(int x, int y, const unsigned char *str)
|
||||||
|
{
|
||||||
|
lcd_puts_style(x, y, str, STYLE_DEFAULT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*** scrolling ***/
|
||||||
|
|
||||||
/* Reverse the invert setting of the scrolling line (if any) at given char
|
/* Reverse the invert setting of the scrolling line (if any) at given char
|
||||||
position. Setting will go into affect next time line scrolls. */
|
position. Setting will go into affect next time line scrolls. */
|
||||||
void lcd_invertscroll(int x, int y)
|
void lcd_invertscroll(int x, int y)
|
||||||
|
|
@ -614,168 +742,29 @@ void lcd_invertscroll(int x, int y)
|
||||||
s->invert = !s->invert;
|
s->invert = !s->invert;
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_drawline( int x1, int y1, int x2, int y2 )
|
void lcd_stop_scroll(void)
|
||||||
{
|
{
|
||||||
int numpixels;
|
scrolling_lines=0;
|
||||||
int i;
|
|
||||||
int deltax, deltay;
|
|
||||||
int d, dinc1, dinc2;
|
|
||||||
int x, xinc1, xinc2;
|
|
||||||
int y, yinc1, yinc2;
|
|
||||||
|
|
||||||
deltax = abs(x2 - x1);
|
|
||||||
deltay = abs(y2 - y1);
|
|
||||||
|
|
||||||
if(deltax >= deltay)
|
|
||||||
{
|
|
||||||
numpixels = deltax;
|
|
||||||
d = 2 * deltay - deltax;
|
|
||||||
dinc1 = deltay * 2;
|
|
||||||
dinc2 = (deltay - deltax) * 2;
|
|
||||||
xinc1 = 1;
|
|
||||||
xinc2 = 1;
|
|
||||||
yinc1 = 0;
|
|
||||||
yinc2 = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
numpixels = deltay;
|
|
||||||
d = 2 * deltax - deltay;
|
|
||||||
dinc1 = deltax * 2;
|
|
||||||
dinc2 = (deltax - deltay) * 2;
|
|
||||||
xinc1 = 0;
|
|
||||||
xinc2 = 1;
|
|
||||||
yinc1 = 1;
|
|
||||||
yinc2 = 1;
|
|
||||||
}
|
|
||||||
numpixels++; /* include endpoints */
|
|
||||||
|
|
||||||
if(x1 > x2)
|
|
||||||
{
|
|
||||||
xinc1 = -xinc1;
|
|
||||||
xinc2 = -xinc2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(y1 > y2)
|
|
||||||
{
|
|
||||||
yinc1 = -yinc1;
|
|
||||||
yinc2 = -yinc2;
|
|
||||||
}
|
|
||||||
|
|
||||||
x = x1;
|
|
||||||
y = y1;
|
|
||||||
|
|
||||||
for(i=0; i<numpixels; i++)
|
|
||||||
{
|
|
||||||
DRAW_PIXEL(x,y);
|
|
||||||
|
|
||||||
if(d < 0)
|
|
||||||
{
|
|
||||||
d += dinc1;
|
|
||||||
x += xinc1;
|
|
||||||
y += yinc1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
d += dinc2;
|
|
||||||
x += xinc2;
|
|
||||||
y += yinc2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_clearline( int x1, int y1, int x2, int y2 )
|
void lcd_scroll_speed(int speed)
|
||||||
{
|
{
|
||||||
int numpixels;
|
scroll_ticks = scroll_tick_table[speed];
|
||||||
int i;
|
|
||||||
int deltax, deltay;
|
|
||||||
int d, dinc1, dinc2;
|
|
||||||
int x, xinc1, xinc2;
|
|
||||||
int y, yinc1, yinc2;
|
|
||||||
|
|
||||||
deltax = abs(x2 - x1);
|
|
||||||
deltay = abs(y2 - y1);
|
|
||||||
|
|
||||||
if(deltax >= deltay)
|
|
||||||
{
|
|
||||||
numpixels = deltax;
|
|
||||||
d = 2 * deltay - deltax;
|
|
||||||
dinc1 = deltay * 2;
|
|
||||||
dinc2 = (deltay - deltax) * 2;
|
|
||||||
xinc1 = 1;
|
|
||||||
xinc2 = 1;
|
|
||||||
yinc1 = 0;
|
|
||||||
yinc2 = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
numpixels = deltay;
|
|
||||||
d = 2 * deltax - deltay;
|
|
||||||
dinc1 = deltax * 2;
|
|
||||||
dinc2 = (deltax - deltay) * 2;
|
|
||||||
xinc1 = 0;
|
|
||||||
xinc2 = 1;
|
|
||||||
yinc1 = 1;
|
|
||||||
yinc2 = 1;
|
|
||||||
}
|
|
||||||
numpixels++; /* include endpoints */
|
|
||||||
|
|
||||||
if(x1 > x2)
|
|
||||||
{
|
|
||||||
xinc1 = -xinc1;
|
|
||||||
xinc2 = -xinc2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(y1 > y2)
|
|
||||||
{
|
|
||||||
yinc1 = -yinc1;
|
|
||||||
yinc2 = -yinc2;
|
|
||||||
}
|
|
||||||
|
|
||||||
x = x1;
|
|
||||||
y = y1;
|
|
||||||
|
|
||||||
for(i=0; i<numpixels; i++)
|
|
||||||
{
|
|
||||||
CLEAR_PIXEL(x,y);
|
|
||||||
|
|
||||||
if(d < 0)
|
|
||||||
{
|
|
||||||
d += dinc1;
|
|
||||||
x += xinc1;
|
|
||||||
y += yinc1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
d += dinc2;
|
|
||||||
x += xinc2;
|
|
||||||
y += yinc2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
void lcd_scroll_step(int step)
|
||||||
* Set a single pixel
|
|
||||||
*/
|
|
||||||
void lcd_drawpixel(int x, int y)
|
|
||||||
{
|
{
|
||||||
DRAW_PIXEL(x,y);
|
scroll_step = step;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
void lcd_scroll_delay(int ms)
|
||||||
* Clear a single pixel
|
|
||||||
*/
|
|
||||||
void lcd_clearpixel(int x, int y)
|
|
||||||
{
|
{
|
||||||
CLEAR_PIXEL(x,y);
|
scroll_delay = ms / (HZ / 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
void lcd_bidir_scroll(int percent)
|
||||||
* Invert a single pixel
|
|
||||||
*/
|
|
||||||
void lcd_invertpixel(int x, int y)
|
|
||||||
{
|
{
|
||||||
INVERT_PIXEL(x,y);
|
bidir_limit = percent;
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_puts_scroll(int x, int y, const unsigned char *string)
|
void lcd_puts_scroll(int x, int y, const unsigned char *string)
|
||||||
|
|
@ -840,36 +829,6 @@ void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
|
||||||
scrolling_lines &= ~(1<<y);
|
scrolling_lines &= ~(1<<y);
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_stop_scroll(void)
|
|
||||||
{
|
|
||||||
scrolling_lines=0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char scroll_tick_table[16] = {
|
|
||||||
/* Hz values:
|
|
||||||
1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */
|
|
||||||
100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
|
|
||||||
};
|
|
||||||
|
|
||||||
void lcd_scroll_speed(int speed)
|
|
||||||
{
|
|
||||||
scroll_ticks = scroll_tick_table[speed];
|
|
||||||
}
|
|
||||||
|
|
||||||
void lcd_scroll_step(int step)
|
|
||||||
{
|
|
||||||
scroll_step = step;
|
|
||||||
}
|
|
||||||
|
|
||||||
void lcd_scroll_delay(int ms)
|
|
||||||
{
|
|
||||||
scroll_delay = ms / (HZ / 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
void lcd_bidir_scroll(int percent)
|
|
||||||
{
|
|
||||||
bidir_limit = percent;
|
|
||||||
}
|
|
||||||
static void scroll_thread(void)
|
static void scroll_thread(void)
|
||||||
{
|
{
|
||||||
struct font* pf;
|
struct font* pf;
|
||||||
|
|
@ -932,4 +891,3 @@ static void scroll_thread(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -64,20 +64,6 @@ extern unsigned char extended_font_player[NO_EXTENDED_LCD_CHARS][8];
|
||||||
|
|
||||||
/*** generic code ***/
|
/*** generic code ***/
|
||||||
|
|
||||||
struct scrollinfo {
|
|
||||||
int mode;
|
|
||||||
char text[MAX_PATH];
|
|
||||||
int textlen;
|
|
||||||
int offset;
|
|
||||||
int turn_offset;
|
|
||||||
int startx;
|
|
||||||
int starty;
|
|
||||||
long scroll_start_tick;
|
|
||||||
int direction; /* +1 for right or -1 for left*/
|
|
||||||
int jump_scroll;
|
|
||||||
int jump_scroll_steps;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define MAX_CURSOR_CHARS 8
|
#define MAX_CURSOR_CHARS 8
|
||||||
struct cursorinfo {
|
struct cursorinfo {
|
||||||
int len;
|
int len;
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -7,7 +7,7 @@
|
||||||
* \/ \/ \/ \/ \/
|
* \/ \/ \/ \/ \/
|
||||||
* $Id$
|
* $Id$
|
||||||
*
|
*
|
||||||
* Copyright (C) 2005 by Richard S. La Charité
|
* Copyright (C) 2005 by Richard S. La Charité
|
||||||
*
|
*
|
||||||
* All files in this archive are subject to the GNU General Public License.
|
* All files in this archive are subject to the GNU General Public License.
|
||||||
* See the file COPYING in the source tree root for full license agreement.
|
* See the file COPYING in the source tree root for full license agreement.
|
||||||
|
|
@ -25,6 +25,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifdef HAVE_REMOTE_LCD
|
#ifdef HAVE_REMOTE_LCD
|
||||||
|
|
||||||
#define REMOTE_DRAW_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] |= (1<<((y)&7))
|
#define REMOTE_DRAW_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] |= (1<<((y)&7))
|
||||||
#define REMOTE_CLEAR_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] &= ~(1<<((y)&7))
|
#define REMOTE_CLEAR_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] &= ~(1<<((y)&7))
|
||||||
#define REMOTE_INVERT_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] ^= (1<<((y)&7))
|
#define REMOTE_INVERT_PIXEL(x,y) lcd_remote_framebuffer[(y)/8][(x)] ^= (1<<((y)&7))
|
||||||
|
|
@ -33,66 +34,52 @@
|
||||||
#define STYLE_INVERT 1
|
#define STYLE_INVERT 1
|
||||||
|
|
||||||
extern void lcd_remote_init(void);
|
extern void lcd_remote_init(void);
|
||||||
extern void lcd_remote_clear_display(void);
|
|
||||||
extern void lcd_remote_backlight_on(void);
|
extern void lcd_remote_backlight_on(void);
|
||||||
extern void lcd_remote_backlight_off(void);
|
extern void lcd_remote_backlight_off(void);
|
||||||
extern void lcd_remote_stop_scroll(void);
|
|
||||||
extern void lcd_remote_scroll_speed( int speed );
|
|
||||||
extern void lcd_remote_scroll_delay( int ms );
|
|
||||||
extern void lcd_remote_set_contrast(int val);
|
|
||||||
extern int lcd_remote_default_contrast(void);
|
extern int lcd_remote_default_contrast(void);
|
||||||
extern void lcd_remote_update(void);
|
extern void lcd_remote_set_contrast(int val);
|
||||||
extern void lcd_remote_update_rect (int x_start, int y,
|
|
||||||
int width, int height);
|
|
||||||
|
|
||||||
|
extern void lcd_remote_clear_display(void);
|
||||||
extern void lcd_remote_puts(int x, int y, const unsigned char *string);
|
extern void lcd_remote_puts(int x, int y, const unsigned char *string);
|
||||||
extern void lcd_remote_puts_style(int x, int y, const unsigned char *string,
|
extern void lcd_remote_puts_style(int x, int y, const unsigned char *string,
|
||||||
int style);
|
int style);
|
||||||
|
extern void lcd_remote_putc(int x, int y, unsigned short ch);
|
||||||
extern void lcd_remote_puts_scroll(int x, int y, const unsigned char* string );
|
extern void lcd_remote_stop_scroll(void);
|
||||||
|
extern void lcd_remote_scroll_speed(int speed);
|
||||||
|
extern void lcd_remote_scroll_delay(int ms);
|
||||||
|
extern void lcd_remote_puts_scroll(int x, int y, const unsigned char* string);
|
||||||
extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char* string,
|
extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char* string,
|
||||||
int style);
|
int style);
|
||||||
|
|
||||||
extern void lcd_remote_putc(int x, int y, unsigned short ch);
|
extern void lcd_remote_update(void);
|
||||||
|
extern void lcd_remote_update_rect int x_start, int y, int width, int height);
|
||||||
|
|
||||||
|
/* Memory copy of display bitmap */
|
||||||
|
extern unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH];
|
||||||
|
|
||||||
|
extern void lcd_remote_set_invert_display(bool yesno);
|
||||||
|
extern void lcd_remote_set_flip(bool yesno);
|
||||||
|
extern void lcd_remote_roll(int pixels);
|
||||||
extern void lcd_remote_setmargins(int xmargin, int ymargin);
|
extern void lcd_remote_setmargins(int xmargin, int ymargin);
|
||||||
extern int lcd_remote_getxmargin(void);
|
extern int lcd_remote_getxmargin(void);
|
||||||
extern int lcd_remote_getymargin(void);
|
extern int lcd_remote_getymargin(void);
|
||||||
|
extern void lcd_remote_setfont(int font);
|
||||||
/*
|
extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
|
||||||
* Memory copy of display bitmap
|
|
||||||
*/
|
|
||||||
extern unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH];
|
|
||||||
|
|
||||||
extern void lcd_remote_bitmap (const unsigned char *src, int x, int y,
|
|
||||||
int nx, int ny, bool clear);
|
|
||||||
extern void lcd_remote_clearrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_remote_fillrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_remote_invertrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_remote_drawrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_remote_invertrect (int x, int y, int nx, int ny);
|
|
||||||
//extern void lcd_invertscroll(int x, int y);
|
|
||||||
extern void lcd_remote_drawline( int x1, int y1, int x2, int y2 );
|
|
||||||
extern void lcd_remote_clearline( int x1, int y1, int x2, int y2 );
|
|
||||||
extern void lcd_remote_drawpixel(int x, int y);
|
extern void lcd_remote_drawpixel(int x, int y);
|
||||||
extern void lcd_remote_clearpixel(int x, int y);
|
extern void lcd_remote_clearpixel(int x, int y);
|
||||||
extern void lcd_remote_invertpixel(int x, int y);
|
extern void lcd_remote_invertpixel(int x, int y);
|
||||||
extern void lcd_remote_roll(int pixels);
|
extern void lcd_remote_drawline(int x1, int y1, int x2, int y2);
|
||||||
extern void lcd_remote_set_invert_display(bool yesno);
|
extern void lcd_remote_clearline(int x1, int y1, int x2, int y2);
|
||||||
extern void lcd_remote_set_flip(bool yesno);
|
extern void lcd_remote_drawrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_remote_clearrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_remote_fillrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_remote_invertrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_remote_bitmap(const unsigned char *src, int x, int y,
|
||||||
|
int nx, int ny, bool clear);
|
||||||
|
extern void lcd_remote_putsxy(int x, int y, const unsigned char *string);
|
||||||
|
extern void lcd_remote_invertscroll(int x, int y);
|
||||||
extern void lcd_remote_bidir_scroll(int threshold);
|
extern void lcd_remote_bidir_scroll(int threshold);
|
||||||
extern void lcd_remote_scroll_step(int pixels);
|
extern void lcd_remote_scroll_step(int pixels);
|
||||||
extern void lcd_remote_setfont(int font);
|
|
||||||
extern void lcd_remote_putsxy(int x, int y, const unsigned char *string);
|
|
||||||
extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -29,35 +29,38 @@
|
||||||
|
|
||||||
#ifdef SIMULATOR
|
#ifdef SIMULATOR
|
||||||
#define lcd_icon(x,y) sim_lcd_icon(x,y)
|
#define lcd_icon(x,y) sim_lcd_icon(x,y)
|
||||||
|
#define MAX_PATH 260
|
||||||
|
#else
|
||||||
|
#include "file.h" /* for MAX_PATH; FIXME: Why does this not work for sims? */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* common functions */
|
/* common functions */
|
||||||
|
extern void lcd_write_command(int byte);
|
||||||
|
extern void lcd_write_command_ex(int cmd, int data1, int data2);
|
||||||
|
extern void lcd_write_data(const unsigned char* p_bytes, int count);
|
||||||
extern void lcd_init(void);
|
extern void lcd_init(void);
|
||||||
extern void lcd_clear_display(void);
|
|
||||||
extern void lcd_backlight(bool on);
|
extern void lcd_backlight(bool on);
|
||||||
|
extern int lcd_default_contrast(void);
|
||||||
|
extern void lcd_set_contrast(int val);
|
||||||
|
|
||||||
|
extern void lcd_clear_display(void);
|
||||||
extern void lcd_puts(int x, int y, const unsigned char *string);
|
extern void lcd_puts(int x, int y, const unsigned char *string);
|
||||||
extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
|
extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
|
||||||
extern void lcd_putc(int x, int y, unsigned short ch);
|
extern void lcd_putc(int x, int y, unsigned short ch);
|
||||||
|
extern void lcd_stop_scroll(void);
|
||||||
extern void lcd_puts_scroll(int x, int y, const unsigned char* string );
|
extern void lcd_scroll_speed(int speed);
|
||||||
|
extern void lcd_scroll_delay(int ms);
|
||||||
|
extern void lcd_puts_scroll(int x, int y, const unsigned char* string);
|
||||||
extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,
|
extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,
|
||||||
int style);
|
int style);
|
||||||
extern void lcd_icon(int icon, bool enable);
|
extern void lcd_icon(int icon, bool enable);
|
||||||
extern void lcd_stop_scroll(void);
|
|
||||||
extern void lcd_scroll_speed( int speed );
|
|
||||||
extern void lcd_scroll_delay( int ms );
|
|
||||||
extern void lcd_set_contrast(int val);
|
|
||||||
extern void lcd_write_command( int byte );
|
|
||||||
extern void lcd_write_command_ex( int cmd, int data1, int data2);
|
|
||||||
extern void lcd_write_data( const unsigned char* p_bytes, int count );
|
|
||||||
extern int lcd_default_contrast(void);
|
|
||||||
|
|
||||||
#if defined(SIMULATOR) || defined(HAVE_LCD_BITMAP)
|
#if defined(SIMULATOR) || defined(HAVE_LCD_BITMAP)
|
||||||
extern void lcd_update(void);
|
|
||||||
/* performance function */
|
/* performance function */
|
||||||
extern void lcd_blit (const unsigned char* p_data, int x, int y, int width,
|
extern void lcd_blit(const unsigned char* p_data, int x, int y, int width,
|
||||||
int height, int stride);
|
int height, int stride);
|
||||||
|
|
||||||
|
extern void lcd_update(void);
|
||||||
/* update a fraction of the screen */
|
/* update a fraction of the screen */
|
||||||
extern void lcd_update_rect(int x, int y, int width, int height);
|
extern void lcd_update_rect(int x, int y, int width, int height);
|
||||||
|
|
||||||
|
|
@ -97,56 +100,84 @@ enum
|
||||||
ICON_PARAM
|
ICON_PARAM
|
||||||
};
|
};
|
||||||
|
|
||||||
extern void lcd_define_hw_pattern (int which,const char *pattern,int length);
|
extern void lcd_double_height(bool on);
|
||||||
extern void lcd_define_pattern (int which,const char *pattern);
|
extern void lcd_define_hw_pattern(int which,const char *pattern,int length);
|
||||||
extern void lcd_double_height (bool on);
|
extern void lcd_define_pattern(int which,const char *pattern);
|
||||||
#define JUMP_SCROLL_ALWAYS 5
|
|
||||||
extern void lcd_jump_scroll (int mode); /* 0=off, 1=once, ..., ALWAYS */
|
|
||||||
extern void lcd_jump_scroll_delay( int ms );
|
|
||||||
unsigned char lcd_get_locked_pattern(void);
|
unsigned char lcd_get_locked_pattern(void);
|
||||||
void lcd_unlock_pattern(unsigned char pat);
|
void lcd_unlock_pattern(unsigned char pat);
|
||||||
extern void lcd_bidir_scroll(int threshold);
|
|
||||||
void lcd_put_cursor(int x, int y, char cursor_char);
|
void lcd_put_cursor(int x, int y, char cursor_char);
|
||||||
void lcd_remove_cursor(void);
|
void lcd_remove_cursor(void);
|
||||||
|
extern void lcd_bidir_scroll(int threshold);
|
||||||
|
#define JUMP_SCROLL_ALWAYS 5
|
||||||
|
extern void lcd_jump_scroll(int mode); /* 0=off, 1=once, ..., ALWAYS */
|
||||||
|
extern void lcd_jump_scroll_delay(int ms);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
|
#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
|
||||||
#if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7))
|
#define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7))
|
||||||
#define CLEAR_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] &= ~(1<<((y)&7))
|
#define CLEAR_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] &= ~(1<<((y)&7))
|
||||||
#define INVERT_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] ^= (1<<((y)&7))
|
#define INVERT_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] ^= (1<<((y)&7))
|
||||||
|
|
||||||
/*
|
/* Memory copy of display bitmap */
|
||||||
* Memory copy of display bitmap
|
|
||||||
*/
|
|
||||||
extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
|
extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
|
||||||
|
|
||||||
|
extern void lcd_set_invert_display(bool yesno);
|
||||||
|
extern void lcd_set_flip(bool yesno);
|
||||||
|
extern void lcd_roll(int pixels);
|
||||||
extern void lcd_setmargins(int xmargin, int ymargin);
|
extern void lcd_setmargins(int xmargin, int ymargin);
|
||||||
extern int lcd_getxmargin(void);
|
extern int lcd_getxmargin(void);
|
||||||
extern int lcd_getymargin(void);
|
extern int lcd_getymargin(void);
|
||||||
extern void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
|
extern void lcd_setfont(int font);
|
||||||
bool clear);
|
extern int lcd_getstringsize(const unsigned char *str, int *w, int *h);
|
||||||
extern void lcd_clearrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_fillrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_drawrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_invertrect (int x, int y, int nx, int ny);
|
|
||||||
extern void lcd_invertscroll(int x, int y);
|
|
||||||
extern void lcd_drawline( int x1, int y1, int x2, int y2 );
|
|
||||||
extern void lcd_clearline( int x1, int y1, int x2, int y2 );
|
|
||||||
extern void lcd_drawpixel(int x, int y);
|
extern void lcd_drawpixel(int x, int y);
|
||||||
extern void lcd_clearpixel(int x, int y);
|
extern void lcd_clearpixel(int x, int y);
|
||||||
extern void lcd_invertpixel(int x, int y);
|
extern void lcd_invertpixel(int x, int y);
|
||||||
extern void lcd_roll(int pixels);
|
extern void lcd_drawline(int x1, int y1, int x2, int y2);
|
||||||
extern void lcd_set_invert_display(bool yesno);
|
extern void lcd_clearline(int x1, int y1, int x2, int y2);
|
||||||
extern void lcd_set_flip(bool yesno);
|
extern void lcd_drawrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_clearrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_fillrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_invertrect(int x, int y, int nx, int ny);
|
||||||
|
extern void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
|
||||||
|
bool clear);
|
||||||
|
extern void lcd_putsxy(int x, int y, const unsigned char *string);
|
||||||
|
extern void lcd_invertscroll(int x, int y);
|
||||||
extern void lcd_bidir_scroll(int threshold);
|
extern void lcd_bidir_scroll(int threshold);
|
||||||
extern void lcd_scroll_step(int pixels);
|
extern void lcd_scroll_step(int pixels);
|
||||||
extern void lcd_setfont(int font);
|
|
||||||
extern void lcd_putsxy(int x, int y, const unsigned char *string);
|
|
||||||
extern int lcd_getstringsize(const unsigned char *str, int *w, int *h);
|
|
||||||
|
|
||||||
#endif /* CHARCELLS / BITMAP */
|
#endif /* CHARCELLS / BITMAP */
|
||||||
|
|
||||||
|
/* internal usage, but in multiple drivers */
|
||||||
|
#ifdef HAVE_LCD_BITMAP
|
||||||
|
#define SCROLL_SPACING 3
|
||||||
|
|
||||||
|
struct scrollinfo {
|
||||||
|
char line[MAX_PATH + LCD_WIDTH/2 + SCROLL_SPACING + 2];
|
||||||
|
int len; /* length of line in chars */
|
||||||
|
int width; /* length of line in pixels */
|
||||||
|
int offset;
|
||||||
|
int startx;
|
||||||
|
bool backward; /* scroll presently forward or backward? */
|
||||||
|
bool bidir;
|
||||||
|
bool invert; /* invert the scrolled text */
|
||||||
|
long start_tick;
|
||||||
|
};
|
||||||
|
#else /* !HAVE_LCD_BITMAP */
|
||||||
|
|
||||||
|
struct scrollinfo {
|
||||||
|
int mode;
|
||||||
|
char text[MAX_PATH];
|
||||||
|
int textlen;
|
||||||
|
int offset;
|
||||||
|
int turn_offset;
|
||||||
|
int startx;
|
||||||
|
int starty;
|
||||||
|
long scroll_start_tick;
|
||||||
|
int direction; /* +1 for right or -1 for left*/
|
||||||
|
int jump_scroll;
|
||||||
|
int jump_scroll_steps;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __LCD_H__ */
|
#endif /* __LCD_H__ */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue