[lcd4linux @ 2002-08-19 07:36:29 by reinelt]

finished bar.c, USBLCD is the first driver that uses the generic bar functions

7 files changed, 481 insertions, 359 deletions

diff --git a/BeckmannEgle.c b/BeckmannEgle.c
index 2607397..0e744ce 100644
--- a/BeckmannEgle.c
+++ b/BeckmannEgle.c
@@ -1,4 +1,4 @@
-/* $Id: BeckmannEgle.c,v 1.7 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: BeckmannEgle.c,v 1.8 2002/08/19 07:36:29 reinelt Exp $
  *
  * driver for Beckmann+Egle mini terminals
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: BeckmannEgle.c,v $
+ * Revision 1.8  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.7  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -88,21 +92,6 @@ typedef struct {
   int type;
 } MODEL;
 
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int segment;
-} BAR;
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int used;
-  int ascii;
-} SEGMENT;
-
 static LCD Lcd;
 static char *Port=NULL;
 static int Device=-1;
diff --git a/HD44780.c b/HD44780.c
index 48aefb0..97f4cea 100644
--- a/HD44780.c
+++ b/HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: HD44780.c,v 1.23 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: HD44780.c,v 1.24 2002/08/19 07:36:29 reinelt Exp $
  *
  * driver for display modules based on the HD44780 chip
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: HD44780.c,v $
+ * Revision 1.24  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.23  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -179,21 +183,6 @@
 #define CHARS 8
 #define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 )
 
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int segment;
-} BAR;
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int used;
-  int ascii;
-} SEGMENT;
-
 static LCD Lcd;
 
 
diff --git a/M50530.c b/M50530.c
index 1928cc3..b6cad32 100644
--- a/M50530.c
+++ b/M50530.c
@@ -1,4 +1,4 @@
-/* $Id: M50530.c,v 1.3 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: M50530.c,v 1.4 2002/08/19 07:36:29 reinelt Exp $
  *
  * driver for display modules based on the M50530 chip
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: M50530.c,v $
+ * Revision 1.4  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.3  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -72,21 +76,6 @@
 #define CHARS 8
 #define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 )
 
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int segment;
-} BAR;
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int used;
-  int ascii;
-} SEGMENT;
-
 static LCD Lcd;
 
 
diff --git a/MatrixOrbital.c b/MatrixOrbital.c
index 1b3f443..b9c9876 100644
--- a/MatrixOrbital.c
+++ b/MatrixOrbital.c
@@ -1,4 +1,4 @@
-/* $Id: MatrixOrbital.c,v 1.23 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: MatrixOrbital.c,v 1.24 2002/08/19 07:36:29 reinelt Exp $
  *
  * driver for Matrix Orbital serial display modules
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: MatrixOrbital.c,v $
+ * Revision 1.24  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.23  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -149,21 +153,6 @@
 #define CHARS 8
 #define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 )
 
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int segment;
-} BAR;
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int used;
-  int ascii;
-} SEGMENT;
-
 static LCD Lcd;
 static char *Port=NULL;
 static speed_t Speed;
diff --git a/USBLCD.c b/USBLCD.c
index 4702590..85c05db 100644
--- a/USBLCD.c
+++ b/USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: USBLCD.c,v 1.4 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: USBLCD.c,v 1.5 2002/08/19 07:36:29 reinelt Exp $
  *
  * Driver for USBLCD ( see http://www.usblcd.de )
  * This Driver is based on HD44780.c
@@ -22,6 +22,10 @@
  *
  *
  * $Log: USBLCD.c,v $
+ * Revision 1.5  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.4  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -74,50 +78,26 @@
 #define XRES 5
 #define YRES 8
 #define CHARS 8
-#define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 )
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int segment;
-} BAR;
-
-typedef struct {
-  int len1;
-  int len2;
-  int type;
-  int used;
-  int ascii;
-} SEGMENT;
 
 static LCD Lcd;
 
 int usblcd_file;
 
 static char *Port=NULL;
-
-
 static char Txt[4][40];
-static BAR  Bar[4][40];
-
-static int nSegment=2;
-static SEGMENT Segment[128] = {{ len1:0,   len2:0,   type:255, used:0, ascii:32 },
-			       { len1:255, len2:255, type:255, used:0, ascii:255 }};
-
 
 static unsigned char  Buffer[1024];
 static unsigned char *BufPtr;
 
 static void USBLCD_send ()
 {
-  struct timeval now, end;
-  gettimeofday (&now, NULL);
+  // struct timeval now, end;
+  // gettimeofday (&now, NULL);
   
   write(usblcd_file,Buffer,BufPtr-Buffer);
 
-  gettimeofday (&end, NULL);
-  debug ("send %d: %d usec (%d usec/byte)", BufPtr-Buffer, 1000000*(end.tv_sec-now.tv_sec)+end.tv_usec-now.tv_usec, (1000000*(end.tv_sec-now.tv_sec)+end.tv_usec-now.tv_usec)/(BufPtr-Buffer));
+  // gettimeofday (&end, NULL);
+  // debug ("send %d: %d usec (%d usec/byte)", BufPtr-Buffer, 1000000*(end.tv_sec-now.tv_sec)+end.tv_usec-now.tv_usec, (1000000*(end.tv_sec-now.tv_sec)+end.tv_usec-now.tv_usec)/(BufPtr-Buffer));
 
   BufPtr=Buffer;
 
@@ -149,45 +129,39 @@ static int USBLCD_open (void)
     error ("USBLCD: open(%s) failed: %s", Port, strerror(errno));
     return -1;
   }
-
+  
   memset(buf,0,sizeof(buf));
-
-  if( ioctl(usblcd_file,GET_DRV_VERSION, buf)!=0) {
+  if (ioctl(usblcd_file,GET_DRV_VERSION, buf)!=0) {
     error ("USBLCD: ioctl() failed, could not get Driver Version!");
     return -2;
-  } ;
-
+  }
   debug("Driver Version: %s",buf);
 
-  if( sscanf(buf,"USBLCD Driver Version %d.%d",&major,&minor)!=2) {
+  if (sscanf(buf,"USBLCD Driver Version %d.%d",&major,&minor)!=2) {
     error("USBLCD: could not read Driver Version!");
     return -4;
-  };
- 
-  if(major!=1) {
+  }
+  if (major!=1) {
     error("USBLCD: Driver Version not supported!");
     return -4;
   }
 
   memset(buf,0,sizeof(buf));
-
-  if( ioctl(usblcd_file,GET_HARD_VERSION, buf)!=0) {
+  if (ioctl(usblcd_file,GET_HARD_VERSION, buf)!=0) {
     error ("USBLCD: ioctl() failed, could not get Hardware Version!");
     return -3;
-  } ;
-
+  }
   debug("Hardware Version: %s",buf);
 
-  if( sscanf(buf,"%d.%d",&major,&minor)!=2) {
+  if (sscanf(buf,"%d.%d",&major,&minor)!=2) {
     error("USBLCD: could not read Hardware Version!");
     return -4;
   };
-
-  if(major!=1) {
+  if (major!=1) {
     error("USBLCD: Hardware Version not supported!");
     return -4;
   }
-
+  
   BufPtr=Buffer;
 
   USBLCD_command (0x29); // 8 Bit mode, 1/16 duty cycle, 5x8 font
@@ -198,172 +172,12 @@ static int USBLCD_open (void)
   return 0;
 }
 
-static void USBLCD_process_bars (void)
-{
-  int row, col;
-  int i, j;
-  
-  for (i=2; i<nSegment && Segment[i].used; i++);
-  for (j=i+1; j<nSegment; j++) {
-    if (Segment[j].used)
-      Segment[i++]=Segment[j];
-  }
-  nSegment=i;
-  
-  for (row=0; row<Lcd.rows; row++) {
-    for (col=0; col<Lcd.cols; col++) {
-      if (Bar[row][col].type==0) continue;
-      for (i=0; i<nSegment; i++) {
-	if (Segment[i].type & Bar[row][col].type &&
-	    Segment[i].len1== Bar[row][col].len1 &&
-	    Segment[i].len2== Bar[row][col].len2) break;
-      }
-      if (i==nSegment) {
-	nSegment++;
-	Segment[i].len1=Bar[row][col].len1;
-	Segment[i].len2=Bar[row][col].len2;
-	Segment[i].type=Bar[row][col].type;
-	Segment[i].used=0;
-	Segment[i].ascii=-1;
-      }
-      Bar[row][col].segment=i;
-    }
-  }
-}
-
-static int USBLCD_segment_diff (int i, int j)
+static void USBLCD_define_char (int ascii, char *buffer)
 {
-  int RES;
-  int i1, i2, j1, j2;
-  
-  if (i==j) return 65535;
-  if (!(Segment[i].type & Segment[j].type)) return 65535;
-  if (Segment[i].len1==0 && Segment[j].len1!=0) return 65535;
-  if (Segment[i].len2==0 && Segment[j].len2!=0) return 65535;
-  RES=Segment[i].type & BAR_H ? XRES:YRES;
-  if (Segment[i].len1>=RES && Segment[j].len1<RES) return 65535;
-  if (Segment[i].len2>=RES && Segment[j].len2<RES) return 65535;
-  if (Segment[i].len1==Segment[i].len2 && Segment[j].len1!=Segment[j].len2) return 65535;
-
-  i1=Segment[i].len1; if (i1>RES) i1=RES;
-  i2=Segment[i].len2; if (i2>RES) i2=RES;
-  j1=Segment[j].len1; if (j1>RES) i1=RES;
-  j2=Segment[j].len2; if (j2>RES) i2=RES;
-  
-  return (i1-i2)*(i1-i2)+(j1-j2)*(j1-j2);
+  USBLCD_command (0x40|8*ascii);
+  USBLCD_write (buffer, 8);
 }
 
-static void USBLCD_compact_bars (void)
-{
-  int i, j, r, c, min;
-  int pack_i, pack_j;
-  int pass1=1;
-  int deviation[nSegment][nSegment];
-  
-  if (nSegment>CHARS+2) {
-
-    for (i=2; i<nSegment; i++) {
-      for (j=0; j<nSegment; j++) {
-	deviation[i][j]=USBLCD_segment_diff(i,j);
-      }
-    }
-    
-    while (nSegment>CHARS+2) {
-      min=65535;
-      pack_i=-1;
-      pack_j=-1;
-      for (i=2; i<nSegment; i++) {
-	if (pass1 && Segment[i].used) continue;
-	for (j=0; j<nSegment; j++) {
-	  if (deviation[i][j]<min) {
-	    min=deviation[i][j];
-	    pack_i=i;
-	    pack_j=j;
-	  }
-	}
-      }
-      if (pack_i==-1) {
-	if (pass1) {
-	  pass1=0;
-	  continue;
-	} else {
-	  error ("USBLCD: unable to compact bar characters");
-	  nSegment=CHARS;
-	  break;
-	}
-      } 
-      
-      nSegment--;
-      Segment[pack_i]=Segment[nSegment];
-      
-      for (i=0; i<nSegment; i++) {
-	deviation[pack_i][i]=deviation[nSegment][i];
-	deviation[i][pack_i]=deviation[i][nSegment];
-      }
-      
-      for (r=0; r<Lcd.rows; r++) {
-	for (c=0; c<Lcd.cols; c++) {
-	  if (Bar[r][c].segment==pack_i)
-	    Bar[r][c].segment=pack_j;
-	  if (Bar[r][c].segment==nSegment)
-	    Bar[r][c].segment=pack_i;
-	}
-      }
-    }
-  }
-}
-
-static void USBLCD_define_chars (void)
-{
-  int c, i, j;
-  char buffer[8];
-
-  for (i=2; i<nSegment; i++) {
-    if (Segment[i].used) continue;
-    if (Segment[i].ascii!=-1) continue;
-    for (c=0; c<CHARS; c++) {
-      for (j=2; j<nSegment; j++) {
-	if (Segment[j].ascii==c) break;
-      }
-      if (j==nSegment) break;
-    }
-    Segment[i].ascii=c;
-    switch (Segment[i].type) {
-    case BAR_L:
-      for (j=0; j<4; j++) {
-	char Pixel[] = { 0, 1, 3, 7, 15, 31 };
-	buffer[j]=Pixel[Segment[i].len1];
-	buffer[j+4]=Pixel[Segment[i].len2];
-      }
-      break;
-    case BAR_R:
-      for (j=0; j<4; j++) {
-	char Pixel[] = { 0, 16, 24, 28, 30, 31 };
-	buffer[j]=Pixel[Segment[i].len1];
-	buffer[j+4]=Pixel[Segment[i].len2];
-      }
-      break;
-    case BAR_U:
-      for (j=0; j<Segment[i].len1; j++) {
-	buffer[7-j]=31;
-      }
-      for (; j<YRES; j++) {
-	buffer[7-j]=0;
-      }
-      break;
-    case BAR_D:
-      for (j=0; j<Segment[i].len1; j++) {
-	buffer[j]=31;
-      }
-      for (; j<YRES; j++) {
-	buffer[j]=0;
-      }
-      break;
-    }
-    USBLCD_command (0x40|8*c);
-    USBLCD_write (buffer, 8);
-  }
-}
 
 int USBLCD_clear (void)
 {
@@ -372,16 +186,17 @@ int USBLCD_clear (void)
   for (row=0; row<Lcd.rows; row++) {
     for (col=0; col<Lcd.cols; col++) {
       Txt[row][col]='\t';
-      Bar[row][col].len1=-1;
-      Bar[row][col].len2=-1;
-      Bar[row][col].type=0;
-      Bar[row][col].segment=-1;
     }
   }
+
+  bar_clear();
+
   USBLCD_command (0x01); // clear display
+
   return 0;
 }
 
+
 int USBLCD_init (LCD *Self)
 {
   int rows=-1, cols=-1 ;
@@ -421,18 +236,24 @@ int USBLCD_init (LCD *Self)
   if (USBLCD_open()!=0)
     return -1;
   
+  bar_init(rows, cols, XRES, YRES, CHARS);
+  bar_add_segment(  0,  0,255, 32); // ASCII  32 = blank
+  bar_add_segment(255,255,255,255); // ASCII 255 = block
+
   USBLCD_clear();
   USBLCD_send();
 
   return 0;
 }
 
+
 void USBLCD_goto (int row, int col)
 {
   int pos=(row%2)*64+(row/2)*20+col;
   USBLCD_command (0x80|pos);
 }
 
+
 int USBLCD_put (int row, int col, char *text)
 {
   char *p=&Txt[row][col];
@@ -444,97 +265,26 @@ int USBLCD_put (int row, int col, char *text)
   return 0;
 }
 
+
 int USBLCD_bar (int type, int row, int col, int max, int len1, int len2)
 {
-  int rev=0;
-  
-  if (len1<1) len1=1;
-  else if (len1>max) len1=max;
-  
-  if (len2<1) len2=1;
-  else if (len2>max) len2=max;
-  
-  switch (type) {
-  case BAR_L:
-    len1=max-len1;
-    len2=max-len2;
-    rev=1;
-    
-  case BAR_R:
-    while (max>0 && col<=Lcd.cols) {
-      Bar[row][col].type=type;
-      Bar[row][col].segment=-1;
-      if (len1>=XRES) {
-	Bar[row][col].len1=rev?0:XRES;
-	len1-=XRES;
-      } else {
-	Bar[row][col].len1=rev?XRES-len1:len1;
-	len1=0;
-      }
-      if (len2>=XRES) {
-	Bar[row][col].len2=rev?0:XRES;
-	len2-=XRES;
-      } else {
-	Bar[row][col].len2=rev?XRES-len2:len2;
-	len2=0;
-      }
-      max-=XRES;
-      col++;
-    }
-    break;
-
-  case BAR_U:
-    len1=max-len1;
-    len2=max-len2;
-    rev=1;
-    
-  case BAR_D:
-    while (max>0 && row<=Lcd.rows) {
-      Bar[row][col].type=type;
-      Bar[row][col].segment=-1;
-      if (len1>=YRES) {
-	Bar[row][col].len1=rev?0:YRES;
-	len1-=YRES;
-      } else {
-	Bar[row][col].len1=rev?YRES-len1:len1;
-	len1=0;
-      }
-      if (len2>=YRES) {
-	Bar[row][col].len2=rev?0:YRES;
-	len2-=YRES;
-      } else {
-	Bar[row][col].len2=rev?YRES-len2:len2;
-	len2=0;
-      }
-      max-=YRES;
-      row++;
-    }
-    break;
-
-  }
-  return 0;
+  return bar_draw (type, row, col, max, len1, len2);
 }
 
+
 int USBLCD_flush (void)
 {
   char buffer[256];
   char *p;
-  int s, row, col;
-  
-  USBLCD_process_bars();
-  USBLCD_compact_bars();
-  USBLCD_define_chars();
+  int c, row, col;
   
-  for (s=0; s<nSegment; s++) {
-    Segment[s].used=0;
-  }
+  bar_process(&USBLCD_define_char);
 
   for (row=0; row<Lcd.rows; row++) {
     for (col=0; col<Lcd.cols; col++) {
-      s=Bar[row][col].segment;
-      if (s!=-1) {
-	Segment[s].used=1;
-	Txt[row][col]=Segment[s].ascii;
+      c=bar_peek(row, col);
+      if (c!=-1) {
+	Txt[row][col]=(char)c;
       }
     }
     for (col=0; col<Lcd.cols; col++) {
@@ -553,6 +303,7 @@ int USBLCD_flush (void)
   return 0;
 }
 
+
 int USBLCD_quit (void)
 {
   USBLCD_send();
@@ -561,7 +312,22 @@ int USBLCD_quit (void)
   return 0;
 }
 
+
 LCD USBLCD[] = {
-  { "USBLCD",0,0,XRES,YRES,BARS,0,USBLCD_init,USBLCD_clear,USBLCD_put,USBLCD_bar,NULL,USBLCD_flush,USBLCD_quit },
+  { name: "USBLCD",
+    rows:  0,
+    cols:  0,
+    xres:  XRES,
+    yres:  YRES,
+    bars:  BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2,
+    gpos:  0,
+    init:  USBLCD_init,
+    clear: USBLCD_clear,
+    put:   USBLCD_put,
+    bar:   USBLCD_bar,
+    gpo:   NULL,
+    flush: USBLCD_flush,
+    quit:  USBLCD_quit 
+  },
   { NULL }
 };
diff --git a/bar.c b/bar.c
index f0df581..e48ae4d 100644
--- a/bar.c
+++ b/bar.c
@@ -1,4 +1,4 @@
-/* $Id: bar.c,v 1.1 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: bar.c,v 1.2 2002/08/19 07:36:29 reinelt Exp $
  *
  * generic bar handling
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: bar.c,v $
+ * Revision 1.2  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.1  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -29,9 +33,377 @@
 /* 
  * exported functions:
  *
+ * int bar_init (int rows, int cols, int xres, int yres, int chars)
+ *
+ * void bar_clear(void)
+ *
+ * void bar_add_segment(int len1, int len2, int type, int ascii)
+ *
+ * int bar_draw (int type, int row, int col, int max, int len1, int len2)
+ *
+ * int bar_process (void)
+ *
+ * int bar_peek (int row, int col)
  *
  */
 
+#include <stdlib.h>
+
 #include "bar.h"
 #include "debug.h"
 
+
+static int ROWS=0;
+static int COLS=0;
+static int XRES=0;
+static int YRES=0;
+static int CHARS=0;
+
+static int nSegment=0;
+static int fSegment=0;
+static SEGMENT Segment[128];
+
+static BAR *Bar=NULL;
+
+
+int bar_init (int rows, int cols, int xres, int yres, int chars)
+{
+  if (rows<1 || cols<1) 
+    return -1;
+  
+  ROWS=rows;
+  COLS=cols;
+  XRES=xres;
+  YRES=yres;
+  CHARS=chars;
+
+  if (Bar) {
+    free (Bar);
+  }
+  
+  if ((Bar=malloc (ROWS*COLS*sizeof(BAR)))==NULL) {
+    return -1;
+  }
+
+  bar_clear();
+
+  nSegment=0;
+  fSegment=0;
+
+  return 0;
+}
+
+
+void bar_clear(void)
+{
+  int n;
+
+  for (n=0; n<ROWS*COLS; n++) {
+    Bar[n].len1=-1;
+    Bar[n].len2=-1;
+    Bar[n].type=0;
+    Bar[n].segment=-1;
+  }
+
+}
+
+
+void bar_add_segment(int len1, int len2, int type, int ascii)
+{
+  Segment[fSegment].len1=len1;
+  Segment[fSegment].len2=len2;
+  Segment[fSegment].type=type;
+  Segment[fSegment].used=0;
+  Segment[fSegment].ascii=ascii;
+  
+  fSegment++;
+  nSegment=fSegment;
+}
+
+
+int bar_draw (int type, int row, int col, int max, int len1, int len2)
+{
+  int rev=0;
+  
+  if (len1<1) len1=1;
+  else if (len1>max) len1=max;
+  
+  if (len2<1) len2=1;
+  else if (len2>max) len2=max;
+  
+  switch (type) {
+  case BAR_L:
+    len1=max-len1;
+    len2=max-len2;
+    rev=1;
+    
+  case BAR_R:
+    while (max>0 && col<COLS) {
+      Bar[row*COLS+col].type=type;
+      Bar[row*COLS+col].segment=-1;
+      if (len1>=XRES) {
+	Bar[row*COLS+col].len1=rev?0:XRES;
+	len1-=XRES;
+      } else {
+	Bar[row*COLS+col].len1=rev?XRES-len1:len1;
+	len1=0;
+      }
+      if (len2>=XRES) {
+	Bar[row*COLS+col].len2=rev?0:XRES;
+	len2-=XRES;
+      } else {
+	Bar[row*COLS+col].len2=rev?XRES-len2:len2;
+	len2=0;
+      }
+      max-=XRES;
+      col++;
+    }
+    break;
+
+  case BAR_U:
+    len1=max-len1;
+    len2=max-len2;
+    rev=1;
+    
+  case BAR_D:
+    while (max>0 && row<ROWS) {
+      Bar[row*COLS+col].type=type;
+      Bar[row*COLS+col].segment=-1;
+      if (len1>=YRES) {
+	Bar[row*COLS+col].len1=rev?0:YRES;
+	len1-=YRES;
+      } else {
+	Bar[row*COLS+col].len1=rev?YRES-len1:len1;
+	len1=0;
+      }
+      if (len2>=YRES) {
+	Bar[row*COLS+col].len2=rev?0:YRES;
+	len2-=YRES;
+      } else {
+	Bar[row*COLS+col].len2=rev?YRES-len2:len2;
+	len2=0;
+      }
+      max-=YRES;
+      row++;
+    }
+    break;
+
+  }
+  return 0;
+}
+
+
+static void create_segments (void)
+{
+  int i, j, n;
+  
+  /* find first unused segment */
+  for (i=fSegment; i<nSegment && Segment[i].used; i++);
+
+  /* pack unused segments */
+  for (j=i+1; j<nSegment; j++) {
+    if (Segment[j].used)
+      Segment[i++]=Segment[j];
+  }
+  nSegment=i;
+  
+  /* create needed segments */
+  for (n=0; n<ROWS*COLS; n++) {
+    if (Bar[n].type==0) continue;
+    for (i=0; i<nSegment; i++) {
+      if (Segment[i].type & Bar[n].type &&
+	  Segment[i].len1== Bar[n].len1 &&
+	  Segment[i].len2== Bar[n].len2) break;
+    }
+    if (i==nSegment) {
+      nSegment++;
+      Segment[i].len1=Bar[n].len1;
+      Segment[i].len2=Bar[n].len2;
+      Segment[i].type=Bar[n].type;
+      Segment[i].used=0;
+      Segment[i].ascii=-1;
+    }
+    Bar[n].segment=i;
+  }
+}
+
+
+static int segment_deviation (int i, int j)
+{
+  int RES;
+  int i1, i2, j1, j2;
+  
+  if (i==j) return 65535;
+  if (!(Segment[i].type & Segment[j].type)) return 65535;
+  if (Segment[i].len1==0 && Segment[j].len1!=0) return 65535;
+  if (Segment[i].len2==0 && Segment[j].len2!=0) return 65535;
+  RES=Segment[i].type & BAR_H ? XRES:YRES;
+  if (Segment[i].len1>=RES && Segment[j].len1<RES) return 65535;
+  if (Segment[i].len2>=RES && Segment[j].len2<RES) return 65535;
+  if (Segment[i].len1==Segment[i].len2 && Segment[j].len1!=Segment[j].len2) return 65535;
+
+  i1=Segment[i].len1; if (i1>RES) i1=RES;
+  i2=Segment[i].len2; if (i2>RES) i2=RES;
+  j1=Segment[j].len1; if (j1>RES) i1=RES;
+  j2=Segment[j].len2; if (j2>RES) i2=RES;
+  
+  return (i1-i2)*(i1-i2)+(j1-j2)*(j1-j2);
+}
+
+
+static void pack_segments (void)
+{
+  int i, j, n, min;
+  int pack_i, pack_j;
+  int pass1=1;
+  int deviation[nSegment][nSegment];
+  
+  if (nSegment<=fSegment+CHARS) {
+    return;
+  }
+
+  for (i=0; i<nSegment-1; i++) {
+    for (j=i+1; j<nSegment; j++) {
+      int d=segment_deviation(i,j);
+      deviation[i][j]=d;
+      deviation[j][i]=d;
+    }
+  }
+    
+  while (nSegment>fSegment+CHARS) {
+    min=65535;
+    pack_i=-1;
+    pack_j=-1;
+    for (i=fSegment; i<nSegment; i++) {
+      if (pass1 && Segment[i].used) continue;
+      for (j=0; j<nSegment; j++) {
+	if (deviation[i][j]<min) {
+	  min=deviation[i][j];
+	  pack_i=i;
+	  pack_j=j;
+	}
+      }
+    }
+    if (pack_i==-1) {
+      if (pass1) {
+	pass1=0;
+	continue;
+      } else {
+	error ("unable to compact bar characters");
+	nSegment=CHARS;
+	break;
+      }
+    } 
+      
+    nSegment--;
+    Segment[pack_i]=Segment[nSegment];
+      
+    for (i=0; i<nSegment; i++) {
+      deviation[pack_i][i]=deviation[nSegment][i];
+      deviation[i][pack_i]=deviation[i][nSegment];
+    }
+      
+    for (n=0; n<ROWS*COLS; n++) {
+      if (Bar[n].segment==pack_i)   Bar[n].segment=pack_j;
+      if (Bar[n].segment==nSegment) Bar[n].segment=pack_i;
+    }
+  }
+}
+
+
+static void define_chars (int(*defchar)(int ascii, char *matrix))
+{
+  int c, i, j;
+  char buffer[8];
+
+  for (i=fSegment; i<nSegment; i++) {
+    if (Segment[i].used) continue;
+    if (Segment[i].ascii!=-1) continue;
+    for (c=0; c<CHARS; c++) {
+      for (j=fSegment; j<nSegment; j++) {
+	if (Segment[j].ascii==c) break;
+      }
+      if (j==nSegment) break;
+    }
+    Segment[i].ascii=c;
+    switch (Segment[i].type) {
+    case BAR_L:
+      for (j=0; j<4; j++) {
+#if 0
+	char Pixel[] = { 0, 1, 3, 7, 15, 31 };
+	buffer[j  ]=Pixel[Segment[i].len1];
+	buffer[j+4]=Pixel[Segment[i].len2];
+#else
+	buffer[j  ]=(1<<Segment[i].len1)-1;
+	buffer[j+4]=(1<<Segment[i].len2)-1;
+#endif
+      }
+      break;
+    case BAR_R:
+      for (j=0; j<4; j++) {
+#if 0
+	char Pixel[] = { 0, 16, 24, 28, 30, 31 };
+	buffer[j  ]=Pixel[Segment[i].len1];
+	buffer[j+4]=Pixel[Segment[i].len2];
+#else
+	buffer[j  ]=255<<(XRES-Segment[i].len1);
+	buffer[j+4]=255<<(XRES-Segment[i].len2);
+#endif
+      }
+      break;
+    case BAR_U:
+      for (j=0; j<Segment[i].len1; j++) {
+	buffer[7-j]=(1<<XRES)-1;
+      }
+      for (; j<YRES; j++) {
+	buffer[7-j]=0;
+      }
+      break;
+    case BAR_D:
+      for (j=0; j<Segment[i].len1; j++) {
+	buffer[j]=(1<<XRES)-1;
+      }
+      for (; j<YRES; j++) {
+	buffer[j]=0;
+      }
+      break;
+    }
+    defchar(c, buffer);
+  }
+}
+
+
+int bar_process (int(*defchar)(int ascii, char *matrix))
+{
+  int n, s;
+  
+  create_segments();
+  pack_segments();
+  define_chars(defchar);
+  
+  for (s=0; s<nSegment; s++) {
+    Segment[s].used=0;
+  }
+
+  for (n=0; n<ROWS*COLS; n++) {
+    s=Bar[n].segment;
+    if (s!=-1) {
+      Segment[s].used=1;
+    }
+  }
+  
+  return 0;
+}
+
+
+int bar_peek (int row, int col)
+{
+  int s;
+
+  s=Bar[row*COLS+col].segment;
+  if (s==-1) {
+    return -1;
+  } else {
+    return Segment[s].ascii;
+  }
+}
diff --git a/bar.h b/bar.h
index 4b932d4..2864cc7 100644
--- a/bar.h
+++ b/bar.h
@@ -1,4 +1,4 @@
-/* $Id: bar.h,v 1.1 2002/08/19 04:41:20 reinelt Exp $
+/* $Id: bar.h,v 1.2 2002/08/19 07:36:29 reinelt Exp $
  *
  * generic bar handling
  *
@@ -20,6 +20,10 @@
  *
  *
  * $Log: bar.h,v $
+ * Revision 1.2  2002/08/19 07:36:29  reinelt
+ *
+ * finished bar.c, USBLCD is the first driver that uses the generic bar functions
+ *
  * Revision 1.1  2002/08/19 04:41:20  reinelt
  * introduced bar.c, moved bar stuff from display.h to bar.h
  *
@@ -42,4 +46,28 @@
 #define BAR_V (BAR_U | BAR_D | BAR_T)
 #define BAR_HV (BAR_H | BAR_V)
 
+
+typedef struct {
+  int len1;
+  int len2;
+  int type;
+  int segment;
+} BAR;
+
+typedef struct {
+  int len1;
+  int len2;
+  int type;
+  int used;
+  int ascii;
+} SEGMENT;
+
+
+int  bar_init (int rows, int cols, int xres, int yres, int chars);
+void bar_clear(void);
+void bar_add_segment(int len1, int len2, int type, int ascii);
+int  bar_draw (int type, int row, int col, int max, int len1, int len2);
+int  bar_process (int(*defchar)(int ascii, char *matrix));
+int  bar_peek (int row, int col);
+
 #endif