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

coding style harmonizing; more checks

Browse Source
This commit is contained in:
marschap
2006-04-07 15:58:43 +00:00
parent 5486360e08
commit 0756946378
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/text.c
+28 -21
View File
@@ -38,9 +38,9 @@
// Variables // Variables
int width; static int width;
int height; static int height;
char * framebuf; static char * framebuf;
// Vars for the server core // Vars for the server core
MODULE_EXPORT char *api_version = API_VERSION; MODULE_EXPORT char *api_version = API_VERSION;
@@ -59,29 +59,37 @@ text_init (Driver *drvthis)
char buf[256]; char buf[256];
// Set display sizes // Set display sizes
if( drvthis->request_display_width() > 0 if ((drvthis->request_display_width() > 0)
&& drvthis->request_display_height() > 0 ) { && (drvthis->request_display_height() > 0)) {
// Use size from primary driver // Use size from primary driver
width = drvthis->request_display_width(); width = drvthis->request_display_width();
height = drvthis->request_display_height(); height = drvthis->request_display_height();
} }
else { else {
/* Use our own size from config file */ /* Use our own size from config file */
strncpy(buf, drvthis->config_get_string ( drvthis->name , "size" , 0 , TEXTDRV_DEFAULT_SIZE), sizeof(buf)); strncpy(buf, drvthis->config_get_string(drvthis->name, "Size", 0, TEXTDRV_DEFAULT_SIZE), sizeof(buf));
buf[sizeof(buf)-1]=0; buf[sizeof(buf)-1] = '\0';
if( sscanf(buf , "%dx%d", &width, &height ) != 2 if ((sscanf(buf , "%dx%d", &width, &height) != 2)
|| (width <= 0) || (width <= 0) || (width > LCD_MAX_WIDTH)
|| (height <= 0)) { || (height <= 0) || (height > LCD_MAX_HEIGHT)) {
report (RPT_WARNING, "TEXT: Cannot read size: %s. Using default value: %s\n", buf, TEXTDRV_DEFAULT_SIZE); report(RPT_WARNING, "%s: cannot read Size: %s; using default %s",
drvthis->name, buf, TEXTDRV_DEFAULT_SIZE);
sscanf(TEXTDRV_DEFAULT_SIZE, "%dx%d", &width, &height); sscanf(TEXTDRV_DEFAULT_SIZE, "%dx%d", &width, &height);
} }
} }
// Allocate the framebuffer // Allocate the framebuffer
framebuf = malloc(width * height); framebuf = malloc(width * height);
if (framebuf == NULL) {
report(RPT_ERR, "%s: unable to create framebuffer", drvthis->name);
return -1;
}
memset(framebuf, ' ', width * height); memset(framebuf, ' ', width * height);
return 0; report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 1;
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -145,7 +153,6 @@ text_flush (Driver *drvthis)
} }
out[width] = 0; out[width] = 0;
printf("|%s|\n", out); printf("|%s|\n", out);
} }
for (i = 0; i < width; i++) { for (i = 0; i < width; i++) {
@@ -167,7 +174,12 @@ text_string (Driver *drvthis, int x, int y, char string[])
x--; y--; // Convert 1-based coords to 0-based... x--; y--; // Convert 1-based coords to 0-based...
for (i = 0; string[i]; i++) { if ((x < 0) || (y < 0) || (x >= width) || (y >= height))
return;
for (i = 0; string[i] != '\0'; i++) {
if (x + i >= width) // no write over right border
break;
framebuf[(y * width) + x + i] = string[i]; framebuf[(y * width) + x + i] = string[i];
} }
} }
@@ -190,7 +202,7 @@ text_chr (Driver *drvthis, int x, int y, char c)
MODULE_EXPORT void MODULE_EXPORT void
text_set_contrast (Driver *drvthis, int promille) text_set_contrast (Driver *drvthis, int promille)
{ {
debug(RPT_DEBUG, "Contrast: %d\n", promille); debug(RPT_DEBUG, "Contrast: %d", promille);
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -201,11 +213,6 @@ text_backlight (Driver *drvthis, int on)
{ {
//PrivateData * p = (PrivateData*) drvthis->private_data; //PrivateData * p = (PrivateData*) drvthis->private_data;
if(on) { debug(RPT_DEBUG, "Backlight %s", (on) ? "ON" : "OFF");
debug(RPT_DEBUG, "Backlight ON\n");
}
else {
debug(RPT_DEBUG, "Backlight OFF\n");
}
} }