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

new option Offset for xosd driver

Browse Source
This commit is contained in:
marschap
2007-04-25 21:13:45 +00:00
parent 1b0dc1831e
commit d4bff4c520
5 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/xosdlib_drv.c
+30 -6
View File
@@ -57,7 +57,9 @@ MODULE_EXPORT char *symbol_prefix = "xosdlib_drv_";
MODULE_EXPORT int
xosdlib_drv_init (Driver *drvthis)
{
char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE;
const char *size;
const char *offset;
int x, y;
int tmp;
PrivateData *p;
@@ -84,9 +86,7 @@ xosdlib_drv_init (Driver *drvthis)
int w;
int h;
strncpy(size, drvthis->config_get_string(drvthis->name, "Size",
0, DEFAULT_SIZE), sizeof(size));
size[sizeof(size) - 1] = '\0';
size = drvthis->config_get_string(drvthis->name, "Size", 0, DEFAULT_SIZE);
debug(RPT_INFO, "%s: Size (in config) is '%s'", __FUNCTION__, size);
if ((sscanf(size, "%dx%d", &w, &h) != 2) ||
(w <= 0) || (w > LCD_MAX_WIDTH) ||
@@ -110,6 +110,20 @@ xosdlib_drv_init (Driver *drvthis)
}
report(RPT_INFO, "%s: using size %dx%d", drvthis->name, p->width, p->height);
/* Which x/y offsets */
offset = drvthis->config_get_string(drvthis->name, "Offset", 0, DEFAULT_OFFSET);
debug(RPT_INFO, "%s: Offset (in config) is '%s'", __FUNCTION__, offset);
if (sscanf(offset, "%dx%d", &x, &y) != 2) {
report(RPT_WARNING, "%s: cannot read Offset: %s. using default %s",
drvthis->name, offset, DEFAULT_OFFSET);
sscanf(DEFAULT_OFFSET, "%dx%d", &x, &y);
}
p->xoffs= x;
p->yoffs = y;
report(RPT_INFO, "%s: using offset %dx%d", drvthis->name, p->xoffs, p->yoffs);
/* Which backlight brightness */
tmp = drvthis->config_get_int(drvthis->name, "Brightness", 0, DEFAULT_BRIGHTNESS);
debug(RPT_INFO, "%s: Brightness (in config) is '%d'", __FUNCTION__, tmp);
@@ -144,10 +158,20 @@ xosdlib_drv_init (Driver *drvthis)
}
/* set font */
if (xosd_set_font(p->osd, p->font) == -1) {
if (xosd_set_font(p->osd, p->font) != 0) {
report(RPT_ERR, "%s: xosd_set_font() failed", drvthis->name);
return -1;
}
}
/* set x/y offsets */
if (xosd_set_horizontal_offset(p->osd, p->xoffs) != 0) {
report(RPT_ERR, "%s: xosd_set_horizontal_offset() failed", drvthis->name);
return -1;
}
if (xosd_set_vertical_offset(p->osd, p->yoffs) != 0) {
report(RPT_ERR, "%s: xosd_set_vertical_offset() failed", drvthis->name);
return -1;
}
/* make sure the frame buffer is there... */
p->framebuf = (unsigned char *) malloc(p->width * p->height);
server/drivers/xosdlib_drv.h
+1
View File
@@ -5,6 +5,7 @@
#define DEFAULT_FONT "fixed"
#define DEFAULT_SIZE "20x4"
#define DEFAULT_OFFSET "0x0"
#define DEFAULT_CONTRAST 500
#define DEFAULT_BRIGHTNESS 1000
#define DEFAULT_OFFBRIGHTNESS 500