mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving cellwidth and cellheight to PrivateData.

Browse Source
This commit is contained in:
dglaude
2002-03-04 17:50:03 +00:00
parent 16c90bc00b
commit 214128bf0f
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/MtxOrb.c
+15 -18
View File
@@ -71,10 +71,6 @@
#define IS_VFD_DISPLAY (p->MtxOrb_type == MTXORB_VFD) #define IS_VFD_DISPLAY (p->MtxOrb_type == MTXORB_VFD)
#define IS_VKD_DISPLAY (p->MtxOrb_type == MTXORB_VKD) #define IS_VKD_DISPLAY (p->MtxOrb_type == MTXORB_VKD)
/* TODO: Remove this if not in use anymore...
* #define NotEnoughArgs (i + 1 > argc)
*/
/* /*
NOTE: This does not appear to make use of the NOTE: This does not appear to make use of the
hbar and vbar functions present in the LKD202-25. hbar and vbar functions present in the LKD202-25.
@@ -161,9 +157,6 @@ typedef enum {
MTXORB_VKD MTXORB_VKD
} MtxOrb_type_type; } MtxOrb_type_type;
static int cellwidth = LCD_DEFAULT_CELLWIDTH;
static int cellheight = LCD_DEFAULT_CELLHEIGHT;
/* This is an embrionic Private Date, it need to grow ! */ /* This is an embrionic Private Date, it need to grow ! */
typedef struct p { typedef struct p {
@@ -188,6 +181,8 @@ typedef struct p {
char forward_key; char forward_key;
char main_menu_key; char main_menu_key;
int keypad_test_mode; int keypad_test_mode;
int cellwidth;
int cellheight;
} PrivateData; } PrivateData;
/* Vars for the server core */ /* Vars for the server core */
@@ -273,6 +268,8 @@ MtxOrb_init (Driver *drvthis, char *args)
p->forward_key = MTXORB_DEFAULT_FORWARD_KEY; p->forward_key = MTXORB_DEFAULT_FORWARD_KEY;
p->main_menu_key = MTXORB_DEFAULT_MAIN_MENU_KEY; p->main_menu_key = MTXORB_DEFAULT_MAIN_MENU_KEY;
p->keypad_test_mode = 0; p->keypad_test_mode = 0;
p->cellwidth = LCD_DEFAULT_CELLWIDTH;
p->cellheight = LCD_DEFAULT_CELLHEIGHT;
debug( RPT_INFO, "MtxOrb: init(%p,%s)", drvthis, args ); debug( RPT_INFO, "MtxOrb: init(%p,%s)", drvthis, args );
@@ -987,22 +984,22 @@ MtxOrb_old_vbar (Driver *drvthis, int x, int len)
if (len > 0) { if (len > 0) {
for (y = p->height; y > 0 && len > 0; y--) { for (y = p->height; y > 0 && len > 0; y--) {
if (len >= cellheight) if (len >= p->cellheight)
MtxOrb_icon (drvthis, x, y, barb); MtxOrb_icon (drvthis, x, y, barb);
else else
MtxOrb_icon (drvthis, x, y, mapu[len]); MtxOrb_icon (drvthis, x, y, mapu[len]);
len -= cellheight; len -= p->cellheight;
} }
} else { } else {
len = -len; len = -len;
for (y = 2; y <= p->height && len > 0; y++) { for (y = 2; y <= p->height && len > 0; y++) {
if (len >= cellheight) if (len >= p->cellheight)
MtxOrb_icon (drvthis, x, y, barb); MtxOrb_icon (drvthis, x, y, barb);
else else
MtxOrb_icon (drvthis, x, y, mapd[len]); MtxOrb_icon (drvthis, x, y, mapd[len]);
len -= cellheight; len -= p->cellheight;
} }
} }
@@ -1029,23 +1026,23 @@ MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len)
if (len > 0) { if (len > 0) {
for (; x <= p->width && len > 0; x++) { for (; x <= p->width && len > 0; x++) {
if (len >= cellwidth) if (len >= p->cellwidth)
MtxOrb_icon (drvthis, x, y, barb); MtxOrb_icon (drvthis, x, y, barb);
else else
MtxOrb_icon (drvthis, x, y, mapr[len]); MtxOrb_icon (drvthis, x, y, mapr[len]);
len -= cellwidth; len -= p->cellwidth;
} }
} else { } else {
len = -len; len = -len;
for (; x > 0 && len > 0; x--) { for (; x > 0 && len > 0; x--) {
if (len >= cellwidth) if (len >= p->cellwidth)
MtxOrb_icon (drvthis, x, y, barb); MtxOrb_icon (drvthis, x, y, barb);
else else
MtxOrb_icon (drvthis, x, y, mapl[len]); MtxOrb_icon (drvthis, x, y, mapl[len]);
len -= cellwidth; len -= p->cellwidth;
} }
} }
@@ -1126,16 +1123,16 @@ MtxOrb_set_char (Driver *drvthis, int n, char *dat)
snprintf (out, sizeof(out), "\x0FEN%c", n); snprintf (out, sizeof(out), "\x0FEN%c", n);
write (p->fd, out, 3); write (p->fd, out, 3);
for (row = 0; row < cellheight; row++) { for (row = 0; row < p->cellheight; row++) {
letter = 0; letter = 0;
for (col = 0; col < cellwidth; col++) { for (col = 0; col < p->cellwidth; col++) {
/* shift to make room for new scan line data */ /* shift to make room for new scan line data */
letter <<= 1; letter <<= 1;
/* Now read a single bit of data /* Now read a single bit of data
* -- one entry in dat[] -- * -- one entry in dat[] --
* and add it to the binary data in "letter" * and add it to the binary data in "letter"
*/ */
letter |= (dat[(row * cellwidth) + col] > 0); letter |= (dat[(row * p->cellwidth) + col] > 0);
} }
write (p->fd, &letter, 1); /* write one character for each row */ write (p->fd, &letter, 1); /* write one character for each row */
} }