Change in hbar and vbar + cleanup ...WIP...
This commit is contained in:
+19
-8
@@ -823,6 +823,7 @@ MtxOrb_cursorblink (Driver *drvthis, int on)
|
|||||||
|
|
||||||
/******************************
|
/******************************
|
||||||
* Sets up for vertical bars. Call before lcd.vbar()
|
* Sets up for vertical bars. Call before lcd.vbar()
|
||||||
|
* TODO: REMOVE ME
|
||||||
*/
|
*/
|
||||||
MODULE_EXPORT void
|
MODULE_EXPORT void
|
||||||
MtxOrb_init_old_vbar (Driver *drvthis)
|
MtxOrb_init_old_vbar (Driver *drvthis)
|
||||||
@@ -831,6 +832,7 @@ MtxOrb_init_old_vbar (Driver *drvthis)
|
|||||||
|
|
||||||
/******************************
|
/******************************
|
||||||
* Inits horizontal bars...
|
* Inits horizontal bars...
|
||||||
|
* TODO: REMOVE ME
|
||||||
*/
|
*/
|
||||||
MODULE_EXPORT void
|
MODULE_EXPORT void
|
||||||
MtxOrb_init_old_hbar (Driver *drvthis)
|
MtxOrb_init_old_hbar (Driver *drvthis)
|
||||||
@@ -985,9 +987,11 @@ MtxOrb_old_vbar (Driver *drvthis, int x, int len)
|
|||||||
if (len > 0) {
|
if (len > 0) {
|
||||||
for (y = height; y > 0 && len > 0; y--) {
|
for (y = height; y > 0 && len > 0; y--) {
|
||||||
if (len >= cellheight)
|
if (len >= cellheight)
|
||||||
MtxOrb_chr (drvthis, x, y, 255 );
|
MtxOrb_icon (drvthis, x, y, barb);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, 255 ); */
|
||||||
else
|
else
|
||||||
MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapu[len]));
|
MtxOrb_icon (drvthis, x, y, mapu[len]);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapu[len])); */
|
||||||
|
|
||||||
len -= cellheight;
|
len -= cellheight;
|
||||||
}
|
}
|
||||||
@@ -995,9 +999,11 @@ MtxOrb_old_vbar (Driver *drvthis, int x, int len)
|
|||||||
len = -len;
|
len = -len;
|
||||||
for (y = 2; y <= height && len > 0; y++) {
|
for (y = 2; y <= height && len > 0; y++) {
|
||||||
if (len >= cellheight)
|
if (len >= cellheight)
|
||||||
MtxOrb_chr (drvthis, x, y, 255 );
|
MtxOrb_icon (drvthis, x, y, barb);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, 255 ); */
|
||||||
else
|
else
|
||||||
MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapd[len]));
|
MtxOrb_icon (drvthis, x, y, mapd[len]);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapd[len])); */
|
||||||
|
|
||||||
len -= cellheight;
|
len -= cellheight;
|
||||||
}
|
}
|
||||||
@@ -1025,9 +1031,11 @@ MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len)
|
|||||||
if (len > 0) {
|
if (len > 0) {
|
||||||
for (; x <= width && len > 0; x++) {
|
for (; x <= width && len > 0; x++) {
|
||||||
if (len >= cellwidth)
|
if (len >= cellwidth)
|
||||||
MtxOrb_chr (drvthis, x, y, 255 );
|
MtxOrb_icon (drvthis, x, y, barb);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, 255 ); */
|
||||||
else
|
else
|
||||||
MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapr[len]));
|
MtxOrb_icon (drvthis, x, y, mapr[len]);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapr[len])); */
|
||||||
|
|
||||||
len -= cellwidth;
|
len -= cellwidth;
|
||||||
|
|
||||||
@@ -1036,9 +1044,11 @@ MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len)
|
|||||||
len = -len;
|
len = -len;
|
||||||
for (; x > 0 && len > 0; x--) {
|
for (; x > 0 && len > 0; x--) {
|
||||||
if (len >= cellwidth)
|
if (len >= cellwidth)
|
||||||
MtxOrb_chr (drvthis, x, y, 255 );
|
MtxOrb_icon (drvthis, x, y, barb);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, 255 ); */
|
||||||
else
|
else
|
||||||
MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapl[len]));
|
MtxOrb_icon (drvthis, x, y, mapl[len]);
|
||||||
|
/* MtxOrb_chr (drvthis, x, y, MtxOrb_ask_bar (drvthis, mapl[len])); */
|
||||||
|
|
||||||
len -= cellwidth;
|
len -= cellwidth;
|
||||||
|
|
||||||
@@ -1165,6 +1175,7 @@ MtxOrb_set_char (Driver *drvthis, int n, char *dat)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: This need to be removed and replaced by the new _icon function.
|
/* TODO: This need to be removed and replaced by the new _icon function.
|
||||||
|
* TODO: REMOVE ME
|
||||||
*/
|
*/
|
||||||
MODULE_EXPORT void
|
MODULE_EXPORT void
|
||||||
MtxOrb_old_icon (Driver *drvthis, int which, char dest)
|
MtxOrb_old_icon (Driver *drvthis, int which, char dest)
|
||||||
|
|||||||
Reference in New Issue
Block a user