diff options
| -rw-r--r-- | drv_generic_graphic.c | 14 | ||||
| -rw-r--r-- | layout.h | 7 | ||||
| -rw-r--r-- | lcd4linux.conf.sample | 8 |
3 files changed, 18 insertions, 11 deletions
diff --git a/drv_generic_graphic.c b/drv_generic_graphic.c index a2dcda4..e56401f 100644 --- a/drv_generic_graphic.c +++ b/drv_generic_graphic.c @@ -23,6 +23,9 @@ * * * $Log: drv_generic_graphic.c,v $ + * Revision 1.25 2006/02/27 07:53:52 reinelt + * some more graphic issues fixed + * * Revision 1.24 2006/02/27 06:15:55 reinelt * indent... * @@ -175,7 +178,7 @@ int XRES, YRES; /* pixels of one char cell */ /* pixel colors */ RGBA FG_COL = { R: 0x00, G: 0x00, B: 0x00, A:0xff }; RGBA BG_COL = { R: 0xff, G: 0xff, B: 0xff, A:0xff }; -RGBA BL_COL = { R: 0x00, G: 0x00, B: 0x00, A:0x00 }; +RGBA BL_COL = { R: 0xff, G: 0xff, B: 0xff, A:0x00 }; RGBA NO_COL = { R: 0x00, G: 0x00, B: 0x00, A:0x00 }; static char *Section = NULL; @@ -632,14 +635,14 @@ int drv_generic_graphic_init(const char *section, const char *driver) if (color) free(color); - color = cfg_get(Section, "background", "ffffffff"); + color = cfg_get(Section, "background", "ffffff00"); if (color2RGBA(color, &BG_COL) < 0) { error("%s: ignoring illegal color '%s'", Driver, color); } if (color) free(color); - color = cfg_get(Section, "basecolor", "00000000"); + color = cfg_get(Section, "basecolor", "ffffff"); if (color2RGBA(color, &BL_COL) < 0) { error("%s: ignoring illegal color '%s'", Driver, color); } @@ -677,10 +680,7 @@ int drv_generic_graphic_clear(void) { int i, l; - for (i = 0; i < LCOLS * LROWS; i++) - drv_generic_graphic_FB[LAYERS - 1][i] = BG_COL; - - for (l = 0; l < LAYERS - 1; l++) + for (l = 0; l < LAYERS; l++) for (i = 0; i < LCOLS * LROWS; i++) drv_generic_graphic_FB[l][i] = NO_COL; @@ -1,4 +1,4 @@ -/* $Id: layout.h,v 1.4 2006/02/07 05:36:13 reinelt Exp $ +/* $Id: layout.h,v 1.5 2006/02/27 07:53:52 reinelt Exp $ * * new layouter framework * @@ -23,6 +23,9 @@ * * * $Log: layout.h,v $ + * Revision 1.5 2006/02/27 07:53:52 reinelt + * some more graphic issues fixed + * * Revision 1.4 2006/02/07 05:36:13 reinelt * Layers added to Layout * @@ -45,7 +48,7 @@ #define _LAYOUT_H_ /* number of layers */ -#define LAYERS 4 +#define LAYERS 3 int layout_init(const char *section); diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample index 0f74bf5..a25c2be 100644 --- a/lcd4linux.conf.sample +++ b/lcd4linux.conf.sample @@ -827,7 +827,7 @@ Widget GPO_Test255 { Widget ImageTest { class 'Image' - file '/home/michi/lcd4linux.png' + file 'Michi.png' update 1000 visible 1 } @@ -890,9 +890,13 @@ Layout TestLayer { } Layout TestImage { - Row1 { + Row4 { Col1 'OS' } + Row2 { + Col1 'CPU' + Col10 'RAM' + } Layer 2 { X1.Y1 'ImageTest' } |