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

harmonize messages; add a few initialization fixes

Browse Source
This commit is contained in:
marschap
2006-04-08 17:27:16 +00:00
parent 3ac4831122
commit 2e7305d540
1 changed files with 65 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/glcdlib.c
+40 -46
View File
@@ -37,12 +37,6 @@
#include "glcdlib.h" #include "glcdlib.h"
#define DEBUG3 if(debug_level > 2) printf
#define DEBUG4 if(debug_level > 3) printf
#define debug_level 2
//extern int debug_level;
// our private data // our private data
typedef struct { typedef struct {
GlcdDriver * glcdDriver; GlcdDriver * glcdDriver;
@@ -63,18 +57,16 @@ MODULE_EXPORT int glcdlib_init (Driver *drvthis)
// Alocate, initialize and store private p // Alocate, initialize and store private p
pPD = (glcdlibPD *) malloc(sizeof(glcdlibPD)); pPD = (glcdlibPD *) malloc(sizeof(glcdlibPD));
if(!pPD) if (pPD == NULL) {
{ report(RPT_ERR, "%s: failed to allocate private data", drvthis->name);
debug(RPT_ERR, "glcdlib_init: failed to allocate private data");
return -1; return -1;
} }
pPD->glcdDriver = 0; pPD->glcdDriver = NULL;
memset(pPD->info, '\0', sizeof(pPD->info)); memset(pPD->info, '\0', sizeof(pPD->info));
if( drvthis->store_private_ptr( drvthis, pPD ) ) if (drvthis->store_private_ptr(drvthis, pPD)) {
{ report(RPT_ERR, "%s: failed to store private data pointer", drvthis->name);
debug(RPT_ERR, "glcdlib_init: failed to store private data pointer");
return -1; return -1;
} }
@@ -92,40 +84,37 @@ MODULE_EXPORT int glcdlib_init (Driver *drvthis)
strncpy(strCfgDriver, strncpy(strCfgDriver,
drvthis->config_get_string(drvthis->name, "Driver", 0, "image"), drvthis->config_get_string(drvthis->name, "Driver", 0, "image"),
sizeof(strCfgDriver)); sizeof(strCfgDriver));
strCfgDriver[sizeof(strCfgDriver)-1] = '\0';
// use or not FreeType2 // use or not FreeType2
bool bCfgUseFT2 = drvthis->config_get_bool(drvthis->name, "UseFT2", 0, true); bool bCfgUseFT2 = drvthis->config_get_bool(drvthis->name, "UseFT2", 0, true);
// which text resolution // which text resolution
char strTextResDefault[] = "16x4"; const char strTextResDefault[] = "16x4";
char strTextRes[7]; char strTextRes[7];
int nCfgTextWidth = 0; int nCfgTextWidth = 0;
int nCfgTextRows = 0; int nCfgTextRows = 0;
strncpy(strTextRes, strncpy(strTextRes,
drvthis->config_get_string ( drvthis->name, drvthis->config_get_string(drvthis->name, "TextResolution", 0, strTextResDefault),
"TextResolution",
0,
strTextResDefault),
sizeof(strTextRes)); sizeof(strTextRes));
strTextRes[sizeof(strTextRes)-1]=0; strTextRes[sizeof(strTextRes)-1] = '\0';
if( sscanf(strTextRes, "%dx%d", &nCfgTextWidth, &nCfgTextRows ) != 2 if ((sscanf(strTextRes, "%dx%d", &nCfgTextWidth, &nCfgTextRows) != 2)
|| (nCfgTextWidth <= 0) || (nCfgTextWidth > LCD_MAX_WIDTH) || (nCfgTextWidth <= 0) || (nCfgTextWidth > LCD_MAX_WIDTH)
|| (nCfgTextRows <= 0) || (nCfgTextRows > LCD_MAX_HEIGHT)) || (nCfgTextRows <= 0) || (nCfgTextRows > LCD_MAX_HEIGHT))
{ {
report(RPT_WARNING, report(RPT_WARNING,
"GLCDLIB: Cannot read or invalid TextResolution: %s, Using default value.\n", "%s: cannot read or invalid TextResolution: %s; using default %s",
strTextResDefault); drvthis->name, strTextRes, strTextResDefault);
sscanf(strTextResDefault, "%dx%d", &nCfgTextWidth, &nCfgTextRows); sscanf(strTextResDefault, "%dx%d", &nCfgTextWidth, &nCfgTextRows);
} }
// which font file // which font file
const char strCfgFontFileDef[] = "/usr/share/fonts/corefonts/courbd.ttf";
char strCfgFontFile[256]; char strCfgFontFile[256];
strncpy(strCfgFontFile, strncpy(strCfgFontFile,
drvthis->config_get_string ( drvthis->name, drvthis->config_get_string(drvthis->name, "FontFile", 0, strCfgFontFileDef),
"FontFile",
0,
"/usr/share/fonts/corefonts/courbd.ttf"),
sizeof(strCfgFontFile)); sizeof(strCfgFontFile));
strCfgFontFile[sizeof(strCfgFontFile)-1] = '\0';
//################################################################## //##################################################################
// these only apply if bCfgUseFT2 = yes: // these only apply if bCfgUseFT2 = yes:
@@ -135,26 +124,24 @@ MODULE_EXPORT int glcdlib_init (Driver *drvthis)
strncpy(strCfgEncoding, strncpy(strCfgEncoding,
drvthis->config_get_string(drvthis->name, "CharEncoding", 0, "ISO8859-1"), drvthis->config_get_string(drvthis->name, "CharEncoding", 0, "ISO8859-1"),
sizeof(strCfgEncoding)); sizeof(strCfgEncoding));
strCfgEncoding[sizeof(strCfgEncoding)-1] = '\0';
// minimum font face pixel resolution // minimum font face pixel resolution
char strMinFaceSizeDef[] = "6x8"; const char strMinFaceSizeDef[] = "6x8";
char strMinFontFaceSize[7]; char strMinFontFaceSize[7];
int nCfgMinFontFaceWidth = 0; int nCfgMinFontFaceWidth = 0;
int nCfgMinFontFaceHeight = 0; int nCfgMinFontFaceHeight = 0;
strncpy(strMinFontFaceSize, strncpy(strMinFontFaceSize,
drvthis->config_get_string ( drvthis->name, drvthis->config_get_string(drvthis->name, "MinFontFaceSize", 0, strMinFaceSizeDef),
"MinFontFaceSize",
0,
strMinFaceSizeDef),
sizeof(strMinFontFaceSize)); sizeof(strMinFontFaceSize));
strTextRes[sizeof(strMinFontFaceSize)-1]=0; strMinFontFaceSize[sizeof(strMinFontFaceSize)-1] = '\0';
if( sscanf(strMinFontFaceSize, "%dx%d", &nCfgMinFontFaceWidth, &nCfgMinFontFaceHeight ) != 2 if ((sscanf(strMinFontFaceSize, "%dx%d", &nCfgMinFontFaceWidth, &nCfgMinFontFaceHeight) != 2)
|| (nCfgMinFontFaceWidth <= 0) || (nCfgMinFontFaceWidth > LCD_MAX_WIDTH) || (nCfgMinFontFaceWidth <= 0) || (nCfgMinFontFaceWidth > LCD_MAX_WIDTH)
|| (nCfgMinFontFaceHeight <= 0) || (nCfgMinFontFaceHeight > LCD_MAX_HEIGHT)) || (nCfgMinFontFaceHeight <= 0) || (nCfgMinFontFaceHeight > LCD_MAX_HEIGHT))
{ {
report(RPT_WARNING, report(RPT_WARNING,
"GLCDLIB: Cannot read or invalid TextResolution: %s, Using default value.\n", "%s: cannot read or invalid MinFontFaceSize: %s; using default %s",
strMinFaceSizeDef); drvthis->name, strMinFontFaceSize, strMinFaceSizeDef);
sscanf(strMinFaceSizeDef, "%dx%d", &nCfgMinFontFaceWidth, &nCfgMinFontFaceHeight); sscanf(strMinFaceSizeDef, "%dx%d", &nCfgMinFontFaceWidth, &nCfgMinFontFaceHeight);
} }
@@ -180,9 +167,8 @@ MODULE_EXPORT int glcdlib_init (Driver *drvthis)
// instantiate driver in the wrapper library // instantiate driver in the wrapper library
pPD->glcdDriver = glcddriverCreate(); pPD->glcdDriver = glcddriverCreate();
if( !pPD->glcdDriver ) if (pPD->glcdDriver == NULL) {
{ report(RPT_ERR, "%s: failed to instantiate glcdlib wrapper", drvthis->name);
debug(RPT_ERR, "glcdlib_init: failed to instantiate glcdlib wrapper");
return -1; return -1;
} }
@@ -207,18 +193,26 @@ MODULE_EXPORT int glcdlib_init (Driver *drvthis)
bool bInvert = drvthis->config_get_bool(drvthis->name, "Invert", 0, false); bool bInvert = drvthis->config_get_bool(drvthis->name, "Invert", 0, false);
glcddriverInvert(pPD->glcdDriver, bInvert); glcddriverInvert(pPD->glcdDriver, bInvert);
debug (RPT_INFO, "GLCDLIB: Initialization done!"); report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 0;
return 1;
} }
MODULE_EXPORT void MODULE_EXPORT void
glcdlib_close (Driver *drvthis) glcdlib_close (Driver *drvthis)
{ {
debug (RPT_INFO, "Shutting down!\n"); debug(RPT_INFO, "Shutting down!");
glcdlibPD * pPD = drvthis->private_data; glcdlibPD * pPD = drvthis->private_data;
if (pPD != NULL) {
if (pPD->glcdDriver != NULL)
glcddriverDestroy(pPD->glcdDriver); glcddriverDestroy(pPD->glcdDriver);
pPD->glcdDriver = 0; pPD->glcdDriver = NULL;
free(pPD);
}
drvthis->store_private_ptr(drvthis, NULL);
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -247,7 +241,7 @@ glcdlib_height (Driver *drvthis)
MODULE_EXPORT void MODULE_EXPORT void
glcdlib_clear (Driver *drvthis) glcdlib_clear (Driver *drvthis)
{ {
debug (RPT_DEBUG, "Clearing screen\n"); debug(RPT_DEBUG, "Clearing screen");
glcdlibPD * pPD = drvthis->private_data; glcdlibPD * pPD = drvthis->private_data;
glcddriverClear(pPD->glcdDriver); glcddriverClear(pPD->glcdDriver);
} }
@@ -258,7 +252,7 @@ glcdlib_clear (Driver *drvthis)
MODULE_EXPORT void MODULE_EXPORT void
glcdlib_flush (Driver *drvthis) glcdlib_flush (Driver *drvthis)
{ {
debug (RPT_DEBUG, "glcdlib_flush: Flushing pixbuffer(s)\n"); debug(RPT_DEBUG, "glcdlib_flush: Flushing pixbuffer(s)");
glcdlibPD * pPD = drvthis->private_data; glcdlibPD * pPD = drvthis->private_data;
glcddriverRefresh(pPD->glcdDriver, false); glcddriverRefresh(pPD->glcdDriver, false);
} }
@@ -270,7 +264,7 @@ glcdlib_flush (Driver *drvthis)
MODULE_EXPORT void MODULE_EXPORT void
glcdlib_string (Driver *drvthis, int x, int y, char string[]) glcdlib_string (Driver *drvthis, int x, int y, char string[])
{ {
debug (RPT_DEBUG, "String out\n"); debug(RPT_DEBUG, "String out");
y--; y--;
x--; x--;
glcdlibPD * pPD = drvthis->private_data; glcdlibPD * pPD = drvthis->private_data;
@@ -284,7 +278,7 @@ glcdlib_string (Driver *drvthis, int x, int y, char string[])
MODULE_EXPORT void MODULE_EXPORT void
glcdlib_chr (Driver *drvthis, int x, int y, char c) glcdlib_chr (Driver *drvthis, int x, int y, char c)
{ {
debug (RPT_DEBUG, "Char out\n"); debug(RPT_DEBUG, "Char out");
y--; y--;
x--; x--;
glcdlibPD * pPD = drvthis->private_data; glcdlibPD * pPD = drvthis->private_data;