diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | Raster.c | 9 | ||||
| -rw-r--r-- | XWindow.c | 9 | ||||
| -rw-r--r-- | cfg.c | 10 | ||||
| -rw-r--r-- | pixmap.h | 11 |
5 files changed, 33 insertions, 10 deletions
@@ -1,5 +1,5 @@ # -# $Id: README,v 1.1 2000/03/19 08:41:28 reinelt Exp $ +# $Id: README,v 1.2 2000/03/26 19:03:52 reinelt Exp $ # This is the README file for lcd4linux @@ -37,6 +37,8 @@ The configuration file (default: /etc/lcd4linux.conf) has a very simple format: Every line consists of a key and a value, seperated by whitespace (blanks or tabs). Values can contain whitespace, and can be enclosed in single or double quotes. A key must not contain whitespace. Keys are NOT case-sensitive. Order doesn't matter. +Empty lines and all text on a line after a '#' will be ignored. If you want to +use '#' in a value (think of X11-colors), you have to quote it with a backslash. The configuration file contains information for different modules of lcd4linux: @@ -1,4 +1,4 @@ -/* $Id: Raster.c,v 1.5 2000/03/26 18:46:28 reinelt Exp $ +/* $Id: Raster.c,v 1.6 2000/03/26 19:03:52 reinelt Exp $ * * driver for raster formats * @@ -20,6 +20,11 @@ * * * $Log: Raster.c,v $ + * Revision 1.6 2000/03/26 19:03:52 reinelt + * + * more Pixmap renaming + * quoting of '#' in config file + * * Revision 1.5 2000/03/26 18:46:28 reinelt * * bug in pixmap.c that leaded to empty bars fixed @@ -120,7 +125,7 @@ int Raster_flush (void) int a, b; for (a=0; a<pixel; a++) for (b=0; b<pixel; b++) - bitbuf[y*xsize+x+a*xsize+b]=Pixmap[row*Lcd.cols*Lcd.xres+col]+1; + bitbuf[y*xsize+x+a*xsize+b]=LCDpixmap[row*Lcd.cols*Lcd.xres+col]+1; } } @@ -1,4 +1,4 @@ -/* $Id: XWindow.c,v 1.5 2000/03/26 18:46:28 reinelt Exp $ +/* $Id: XWindow.c,v 1.6 2000/03/26 19:03:52 reinelt Exp $ * * driver for X11 * @@ -20,6 +20,11 @@ * * * $Log: XWindow.c,v $ + * Revision 1.6 2000/03/26 19:03:52 reinelt + * + * more Pixmap renaming + * quoting of '#' in config file + * * Revision 1.5 2000/03/26 18:46:28 reinelt * * bug in pixmap.c that leaded to empty bars fixed @@ -99,7 +104,7 @@ int X_flush (void) int a, b; for (a=0; a<pixel; a++) for (b=0; b<pixel; b++) - buffer[y*xsize+x+a*xsize+b]=Pixmap[row*Lcd.cols*Lcd.xres+col]+1; + buffer[y*xsize+x+a*xsize+b]=LCDpixmap[row*Lcd.cols*Lcd.xres+col]+1; } } @@ -1,4 +1,4 @@ -/* $Id: cfg.c,v 1.2 2000/03/10 17:36:02 reinelt Exp $ +/* $Id: cfg.c,v 1.3 2000/03/26 19:03:52 reinelt Exp $ * * config file stuff * @@ -20,6 +20,11 @@ * * * $Log: cfg.c,v $ + * Revision 1.3 2000/03/26 19:03:52 reinelt + * + * more Pixmap renaming + * quoting of '#' in config file + * * Revision 1.2 2000/03/10 17:36:02 reinelt * * first unstable but running release @@ -84,7 +89,8 @@ static char *strip (char *s) for (p=s; *p; p++) { if (*p=='"') do p++; while (*p && *p!='\n' && *p!='"'); if (*p=='\'') do p++; while (*p && *p!='\n' && *p!='\''); - if (*p=='#' || *p=='\n') { + if (p>s && *(p-1)=='\\' && *p=='#') + if (*p=='\n' || (*p=='#' && (p==s || *(p-1)!='\\'))) { *p='\0'; break; } @@ -1,4 +1,4 @@ -/* $Id: pixmap.h,v 1.2 2000/03/24 11:36:56 reinelt Exp $ +/* $Id: pixmap.h,v 1.3 2000/03/26 19:03:52 reinelt Exp $ * * generic pixmap driver * @@ -20,6 +20,11 @@ * * * $Log: pixmap.h,v $ + * Revision 1.3 2000/03/26 19:03:52 reinelt + * + * more Pixmap renaming + * quoting of '#' in config file + * * Revision 1.2 2000/03/24 11:36:56 reinelt * * new syntax for raster configuration @@ -37,9 +42,9 @@ #ifndef _PIXMAP_H_ #define _PIXMAP_H_ -extern unsigned char *Pixmap; +extern unsigned char *LCDpixmap; -int pix_clear(void); +int pix_clear (void); int pix_init (int rows, int cols, int xres, int yres); int pix_put (int row, int col, char *text); int pix_bar (int type, int row, int col, int max, int len1, int len2); |