deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ctk-curses: Introduce CTK-specific color names

Browse source 
Since ncurses also defines COLOR_BLACK and friends, and we want
to avoid including curses.h in contiki-conf.h, define CTK_COLOR_*
constants and map them to curses colors in ctk-curses.c.
This commit is contained in:
François Revol 2013-03-26 11:37:10 +01:00
parent 56f11e7524
commit ada305a3be
3 changed files with 48 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
platform/native/ctk/ctk-curses.c
View file

@ -66,6 +66,26 @@ static unsigned short xpos;
static unsigned short ypos;
static unsigned char button;
/* map CTK colors to curses colors */
static unsigned char ctk_color_map[8] = {
COLOR_BLACK,
COLOR_RED,
COLOR_GREEN,
COLOR_YELLOW,
COLOR_BLUE,
COLOR_MAGENTA,
COLOR_CYAN,
COLOR_WHITE
};
static unsigned char map_color(unsigned char color)
{
unsigned char c;
c = ctk_color_map[color & 0x0f];
c |= ctk_color_map[(color >> 4) & 0x07] << 4;
return c;
}
/*-----------------------------------------------------------------------------------*/
static void
ctrlhandler(int sig)
@ -212,8 +232,8 @@ clrscr(void)
void
bgcolor(unsigned char c)
{
c = map_color(c);
color = ((c << 4) | (color & 0xF0));
/* Presume this to be one of the first calls. */
console_init();
}
@ -339,7 +359,7 @@ cputcxy(unsigned char x, unsigned char y, char c)
void
textcolor(unsigned char c)
{
color = c;
color = map_color(c);
setcolor();
}
/*-----------------------------------------------------------------------------------*/