From b7601c3acbea0878bea1c403d2f67dbfa833ffd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 20 Mar 2013 17:16:37 +0100 Subject: [PATCH] ctk-curses: Cleanup --- platform/native/Makefile.native | 3 +-- platform/native/contiki-conf.h | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/platform/native/Makefile.native b/platform/native/Makefile.native index d74485149..369a1fd45 100644 --- a/platform/native/Makefile.native +++ b/platform/native/Makefile.native @@ -30,8 +30,7 @@ CONTIKI_TARGET_SOURCEFILES += tapdev6.c endif endif -CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c -CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) +CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c $(CONTIKI_TARGET_SOURCEFILES) .SUFFIXES: diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index 2c3cc17f2..e3739e9be 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -208,20 +208,18 @@ typedef unsigned short uip_stats_t; #define CTK_CONF_MENUS 0 #endif /* PLATFORM_BUILD */ -/* curses doesn't define this one */ -#define COLOR_GRAY COLOR_CYAN - +/* base background color for widgets */ #define COLOR_BG COLOR_BLUE #define BORDERCOLOR COLOR_BLACK #define SCREENCOLOR COLOR_BLACK #define BACKGROUNDCOLOR COLOR_BLACK #define WINDOWCOLOR_FOCUS COLOR_WHITE | COLOR_BG * 0x10 -#define WINDOWCOLOR COLOR_GRAY | COLOR_BG * 0x10 +#define WINDOWCOLOR COLOR_CYAN | COLOR_BG * 0x10 #define DIALOGCOLOR COLOR_WHITE | COLOR_BG * 0x10 #define WIDGETCOLOR_HLINK COLOR_CYAN | COLOR_BG * 0x10 #define WIDGETCOLOR_FWIN COLOR_WHITE | COLOR_BG * 0x10 -#define WIDGETCOLOR COLOR_GRAY | COLOR_BG * 0x10 +#define WIDGETCOLOR COLOR_CYAN | COLOR_BG * 0x10 #define WIDGETCOLOR_DIALOG COLOR_WHITE | COLOR_BG * 0x10 #define WIDGETCOLOR_FOCUS COLOR_YELLOW | COLOR_BG * 0x10 #define MENUCOLOR COLOR_WHITE | COLOR_BG * 0x10