From bf1c2688c27865e3baa41f4e99cfd28be0ffe801 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Tue, 28 Jun 2005 17:09:03 +0000
Subject: [PATCH] make other drivers also work correctly when SEAMLESS_HBARS is
 set

---
 server/drivers/IOWarrior.c | 10 ++++++++++
 server/drivers/bayrad.c    | 23 +++++++++++++++++++++--
 server/drivers/hd44780.c   | 11 +++++++++++
 server/drivers/lcterm.c    | 11 +++++++++++
 server/drivers/wirz-sli.c  | 11 +++++++++++
 5 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c
index 833ca43..1fc4f06 100644
--- a/server/drivers/IOWarrior.c
+++ b/server/drivers/IOWarrior.c
@@ -752,6 +752,15 @@ char d[CELLWIDTH*CELLHEIGHT] = {
   1, 1, 1, 1, 0,
   1, 1, 1, 1, 0,
   1, 1, 1, 1, 0 };
+char e[CELLWIDTH*CELLHEIGHT] = {
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1 };
 
   if (p->ccmode != hbar) {
     if (p->ccmode != standard) {
@@ -766,6 +775,7 @@ char d[CELLWIDTH*CELLHEIGHT] = {
     IOWarrior_set_char(drvthis, 2, b);
     IOWarrior_set_char(drvthis, 3, c);
     IOWarrior_set_char(drvthis, 4, d);
+    IOWarrior_set_char(drvthis, 5, e);
   }
 }
 
diff --git a/server/drivers/bayrad.c b/server/drivers/bayrad.c
index 2a455bd..01ae076 100644
--- a/server/drivers/bayrad.c
+++ b/server/drivers/bayrad.c
@@ -193,7 +193,7 @@ char bar_down[7][5*8] = {  /* Presently, this is not used */
 	 0,0,0,0,0,
       },};
 
-char bar_right[4][5*8] = {
+char bar_right[5][5*8] = {
   {
 	 1,0,0,0,0, //  char r1[] =
 	 1,0,0,0,0,
@@ -230,9 +230,18 @@ char bar_right[4][5*8] = {
 	 1,1,1,1,0,
 	 1,1,1,1,0,
 	 1,1,1,1,0,
+      },{
+	 1,1,1,1,1, //  char r5[] =
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
       },};
 
-char bar_left[4][5*8] = {  /* Presently, this is not used. */
+char bar_left[5][5*8] = {  /* Presently, this is not used. */
   {
 	 0,0,0,0,1, //  char l1[] =
 	 0,0,0,0,1,
@@ -269,6 +278,15 @@ char bar_left[4][5*8] = {  /* Presently, this is not used. */
 	 0,1,1,1,1,
 	 0,1,1,1,1,
 	 0,1,1,1,1,
+      },{
+	 1,1,1,1,1, //  char l5[] =
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
       },};
 
 
@@ -624,6 +642,7 @@ bayrad_init_hbar(Driver * drvthis)
   bayrad_set_char(drvthis, 2, bar_right[1]);
   bayrad_set_char(drvthis, 3, bar_right[2]);
   bayrad_set_char(drvthis, 4, bar_right[3]);
+  bayrad_set_char(drvthis, 5, bar_right[4]);
 
 return;
 }
diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c
index 442cf44..ff04c74 100644
--- a/server/drivers/hd44780.c
+++ b/server/drivers/hd44780.c
@@ -692,6 +692,16 @@ HD44780_init_hbar (Driver *drvthis)
 		1, 1, 1, 1, 0,
 		1, 1, 1, 1, 0,
 	};
+	char e[] = {
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+		1, 1, 1, 1, 0,
+	};
 
 	if( p->ccmode == CCMODE_HBAR ) {
 		/* Work already done */
@@ -709,6 +719,7 @@ HD44780_init_hbar (Driver *drvthis)
 	HD44780_set_char (drvthis, 2, b);
 	HD44780_set_char (drvthis, 3, c);
 	HD44780_set_char (drvthis, 4, d);
+	HD44780_set_char (drvthis, 5, e);
 
 }
 
diff --git a/server/drivers/lcterm.c b/server/drivers/lcterm.c
index 31c2653..e6ec4e7 100644
--- a/server/drivers/lcterm.c
+++ b/server/drivers/lcterm.c
@@ -470,6 +470,16 @@ lcterm_init_hbar (Driver *drvthis)
     1, 1, 1, 1, 0,
     1, 1, 1, 1, 0,
   };
+  static char hbar_5[] = {
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1,
+  };
 
   if( p->last_ccmode == CCMODE_HBAR ) /* Work already done */
     return;
@@ -486,6 +496,7 @@ lcterm_init_hbar (Driver *drvthis)
   lcterm_set_char (drvthis, 2, hbar_2);
   lcterm_set_char (drvthis, 3, hbar_3);
   lcterm_set_char (drvthis, 4, hbar_4);
+  lcterm_set_char (drvthis, 5, hbar_5);
 }
 
 
diff --git a/server/drivers/wirz-sli.c b/server/drivers/wirz-sli.c
index 7f4c320..6ab5c0f 100644
--- a/server/drivers/wirz-sli.c
+++ b/server/drivers/wirz-sli.c
@@ -388,12 +388,23 @@ sli_init_hbar (Driver *drvthis)
 		1, 1, 1, 1, 0,
 		1, 1, 1, 1, 0,
 	};
+	char e[] = {
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+		1, 1, 1, 1, 1,
+	};
 
 	if (custom != hbar) {
 		sli_set_char (drvthis, 1, a);
 		sli_set_char (drvthis, 2, b);
 		sli_set_char (drvthis, 3, c);
 		sli_set_char (drvthis, 4, d);
+		sli_set_char (drvthis, 5, e);
 		custom = hbar;
 	}
 }