[lcd4linux @ 2000-03-26 19:03:52 by reinelt]

more Pixmap renaming
quoting of '#' in config file

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@23 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/README b/README
index cde123f8cdc7351b70d72a082d760fa75fae5c2a..3840096cadb358d1f0e33f9afad8bcb1ff5d298b 100644 (file)
--- a/README
+++ b/README
@@ -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: 
 

diff --git a/Raster.c b/Raster.c
index 295e97337c201509d4daaf88ed6066d1a30f3039..78f2b9a64c5e1db7bc05ededd6ec1e5ae2bd8aba 100644 (file)
--- a/Raster.c
+++ b/Raster.c
@@ -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;
     }
   }
   

diff --git a/XWindow.c b/XWindow.c
index d52c7ac714a1c64e624758cc1334cd3db3748602..b87dcd157e1ad107019253a5c435b9107c91650b 100644 (file)
--- a/XWindow.c
+++ b/XWindow.c
@@ -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;
     }
   }
   

diff --git a/cfg.c b/cfg.c
index 4b97a0a243f23185f3f60ed6450d208a5d5b6bf5..1e0df084e6c56619aa628fd17f1d0b331770fac2 100644 (file)
--- a/cfg.c
+++ b/cfg.c
@@ -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;
     }

diff --git a/pixmap.h b/pixmap.h
index 5dcc812441b79ccc4dc26b11f2e23daa6a31827b..dc3fbae8832bf198e0353f46f371d7107455ce5a 100644 (file)
--- a/pixmap.h
+++ b/pixmap.h
@@ -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);