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

add new driver for xosdlib based OnScreen Displays

Browse Source
This commit is contained in:
marschap
2005-07-27 19:32:37 +00:00
parent 9db867e71f
commit fb6bd00a53
6 changed files with 545 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LCDd.conf
+8
View File
@@ -638,5 +638,13 @@ Size=16x2
Device=/dev/lcd0
## OnScreen Display using libxosd ##
[xosd]
# set display size [default: 20x4]
Size=20x4
# font to use
Font=-*-terminus-*-r-*-*-*-320-*-*-*-*-*
# EOF
acinclude.m4
+19 -2
View File
@@ -8,13 +8,14 @@ AC_ARG_ENABLE(drivers,
[ mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,]
[ hd44780,joy,irman,lirc,bayrad,glk,mtc_s16209x]
[ stv5730,sed1330,sed1520,svga,lcdm001,t6963]
[ lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon]
[ lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon,xosd]
[ xosd]
[ \"all\" compiles all drivers],
drivers="$enableval",
drivers=[lcdm001,mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,bayrad,glk])
if test "$drivers" = "all"; then
drivers=[mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon]
drivers=[mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon,xosd]
fi
drivers=`echo $drivers | sed 's/,/ /g'`
@@ -256,6 +257,21 @@ dnl else
DRIVERS="$DRIVERS imon${SO}"
actdrivers=["$actdrivers imon"]
;;
xosd)
AC_CHECK_HEADERS([xosd.h],[
AC_CHECK_LIB(xosd, main,[
LIBXOSD=`xosd-config --libs`
DRIVERS="$DRIVERS xosd${SO}"
actdrivers=["$actdrivers xosd"]
],[
dnl else
AC_MSG_WARN([The xosd driver needs the xosd library])
])
],[
dnl else
AC_MSG_WARN([The xosd driver needs xosd.h])
])
;;
*)
AC_MSG_ERROR([Unknown driver $driver])
;;
@@ -272,6 +288,7 @@ AC_SUBST(LIBSVGA)
AC_SUBST(DRIVERS)
AC_SUBST(HD44780_DRIVERS)
AC_SUBST(LIBGLCD)
AC_SUBST(LIBXOSD)
])
debian/control
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ Source: lcdproc
Section: utils
Priority: extra
Maintainer: Jonathan Oxer <jon@debian.org>
Build-Depends: debhelper (>= 4.0.0), automake | automaken, autoconf2.13 | autoconf, texinfo, libncurses5-dev, libusb-dev (>= 0.1.8), libsvga1-dev
Build-Depends: debhelper (>= 4.0.0), automake | automaken, autoconf2.13 | autoconf, texinfo, libncurses5-dev, libusb-dev (>= 0.1.8), libsvga1-dev, libxosd-dev
Standards-Version: 3.6.0
Package: lcdproc
server/drivers/Makefile.am
+3 -1
View File
@@ -18,7 +18,7 @@ AM_LDFLAGS = @LDSHARED@
LIBS =
pkglib_PROGRAMS = @DRIVERS@
EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses CwLnx glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931 IOWarrior glcdlib imon
EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses CwLnx glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931 IOWarrior glcdlib imon xosd
noinst_LIBRARIES = libLCD.a
IOWarrior_CFLAGS = @libusb_cflags@
@@ -40,6 +40,7 @@ svga_LDADD = @LIBSVGA@
t6963_LDADD = libLCD.a
glcdlib_LDADD = libLCD.a @LIBGLCD@
imon_LDADD = libLCD.a
xosd_LDADD = @LIBXOSD@
libLCD_a_SOURCES = lcd_lib.h lcd_lib.c
@@ -71,5 +72,6 @@ wirz_sli_SOURCES = lcd.h wirz-sli.h wirz-sli.c report.h
ms6931_SOURCES = lcd.h ms6931.h ms6931.c report.h
glcdlib_SOURCES = lcd.h glcdlib.h glcdlib.c report.h
imon_SOURCES = lcd.h imon.h imon.c report.h
xosd_SOURCES = lcd.h xosdlib_drv.c xosdlib_drv.h report.h
INCLUDES = -I$(top_srcdir)
server/drivers/xosdlib_drv.c
+458
View File
@@ -0,0 +1,458 @@
/* This is the LCDproc driver for xosdlib
Copyright(C) 2005 Peter Marschall <peter@adpm.de>
based on GPL'ed code:
* misc. files from LCDproc source tree
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <termios.h>
#include <fcntl.h>
#include <string.h>
#include <sys/errno.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* Debug mode: un-comment to turn on debugging messages in the server */
/* #define DEBUG 1 */
#include "lcd.h"
#include "report.h"
#include "xosdlib_drv.h"
static char icon_char = '@';
/* Vars for the server core */
MODULE_EXPORT char *api_version = API_VERSION;
MODULE_EXPORT int stay_in_foreground = 1;
MODULE_EXPORT int supports_multiple = 0;
MODULE_EXPORT char *symbol_prefix = "xosdlib_drv_";
/**
* Init driver
*/
MODULE_EXPORT int
xosdlib_drv_init (Driver *drvthis)
{
char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE;
int tmp;
PrivateData *p;
/* Allocate and store private data */
p = (PrivateData *) calloc(1, sizeof(PrivateData));
if (p == NULL)
return -1;
if (drvthis->store_private_ptr(drvthis, p))
return -1;
/* Initialize the PrivateData structure */
p->contrast = DEFAULT_CONTRAST;
p->brightness = DEFAULT_BRIGHTNESS;
p->offbrightness = DEFAULT_OFFBRIGHTNESS;
debug (RPT_DEBUG, "%s(%p)", __FUNCTION__, drvthis);
/* Read config file */
/* Which size */
if (drvthis->config_has_key(drvthis->name, "Size")) {
int w;
int h;
strncpy(size, drvthis->config_get_string(drvthis->name, "Size",
0, DEFAULT_SIZE), sizeof(size));
size[sizeof(size) - 1] = '\0';
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) ||
(h <= 0) || (h > LCD_MAX_HEIGHT)) {
report(RPT_WARNING, "svga: Cannot read size: %s. Using default value.\n", size);
sscanf(DEFAULT_SIZE, "%dx%d", &w, &h);
}
p->width = w;
p->height = h;
}
else {
/* Determine the size of the screen */
p->width = drvthis->request_display_width();
p->height = drvthis->request_display_height();
if ((p->width <= 0) || (p->width >= LCD_MAX_WIDTH) ||
(p->height <= 0) || (p->height >= LCD_MAX_HEIGHT)) {
p->width = LCD_DEFAULT_WIDTH;
p->height = LCD_DEFAULT_HEIGHT;
}
}
report(RPT_INFO, "%s: Using size %dx%d", __FUNCTION__, p->width, p->height);
/* 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);
if ((tmp < 0) || (tmp > 1000)) {
report (RPT_WARNING, "%s: Brightness must be between 0 and 1000. Using default %d.\n",
__FUNCTION__, DEFAULT_BRIGHTNESS);
tmp = DEFAULT_BRIGHTNESS;
}
p->brightness = tmp;
/* Which backlight-off "brightness" */
tmp = drvthis->config_get_int (drvthis->name, "OffBrightness", 0, DEFAULT_OFFBRIGHTNESS);
debug (RPT_INFO, "%s: OffBrightness (in config) is '%d'", __FUNCTION__, tmp);
if ((tmp < 0) || (tmp > 1000)) {
report (RPT_WARNING, "%s: OffBrightness must be between 0 and 1000. Using default %d.\n",
__FUNCTION__, DEFAULT_OFFBRIGHTNESS);
tmp = DEFAULT_OFFBRIGHTNESS;
}
p->offbrightness = tmp;
/* which font */
strncpy(p->font, drvthis->config_get_string(drvthis->name, "Font",
0, DEFAULT_FONT), sizeof(p->font));
p->font[sizeof(p->font) - 1] = '\0';
debug (RPT_INFO, "%s: Font (in config) is '%s'", __FUNCTION__, p->font);
/* initialize xosdlib library */
p->osd = xosd_create(p->height);
if (p->osd == NULL) {
report(RPT_ERR, "xosd: xosd_create() failed.");
return -1;
}
/* set font */
if (xosd_set_font(p->osd, p->font) == -1) {
report(RPT_ERR, "xosd: xosd_set_font() failed.");
return -1;
}
/* make sure the frame buffer is there... */
p->framebuf = (unsigned char *) malloc(p->width * p->height);
if (p->framebuf == NULL) {
report(RPT_ERR, "%s: unable to create framebuffer.\n", __FUNCTION__);
return -1;
}
memset(p->framebuf, ' ', p->width * p->height);
/* make sure the framebuffer backing store is there... */
p->backingstore = (unsigned char *) malloc(p->width * p->height);
if (p->backingstore == NULL) {
report(RPT_ERR, "%s: unable to create framebuffer backing store.\n", __FUNCTION__);
return -1;
}
memset(p->backingstore, ' ', p->width * p->height);
return 0;
}
/**
* Close down driver
*/
MODULE_EXPORT void
xosdlib_drv_close (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
debug (RPT_DEBUG, "%s(%p)", __FUNCTION__, drvthis);
if (p != NULL) {
if (p->osd)
xosd_destroy(p->osd);
p->osd = NULL;
if (p->framebuf != NULL)
free(p->framebuf);
p->framebuf = NULL;
if (p->backingstore != NULL)
free(p->backingstore);
p->backingstore = NULL;
free(p);
}
drvthis->store_private_ptr(drvthis, NULL);
}
/**
* Return width
*/
MODULE_EXPORT int
xosdlib_drv_width (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
return p->width;
}
/**
* Return height
*/
MODULE_EXPORT int
xosdlib_drv_height (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
return p->height;
}
/**
* Clear screen
*/
MODULE_EXPORT void
xosdlib_drv_clear (Driver * drvthis)
{
PrivateData *p = drvthis->private_data;
debug (RPT_DEBUG, "%s(%p)", __FUNCTION__, drvthis);
memset(p->framebuf, ' ', p->width * p->height);
}
/**
* Flush framebuffer to screen
*/
MODULE_EXPORT void
xosdlib_drv_flush (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
int i;
char buffer[LCD_MAX_WIDTH];
debug (RPT_DEBUG, "%s(%p)", __FUNCTION__, drvthis);
for (i = 0; i < p->height; i++) {
memcpy(buffer, p->framebuf + (i * p->width), p->width);
buffer[p->width] = '\0';
debug(RPT_DEBUG, "xosd: flushed string \"%s\" at (%d,%d)", buffer, 0, i);
xosd_display(p->osd, i, XOSD_string, buffer);
}
}
/**
* Prints a string on the lcd display, at position (x,y). The
* upper-left is (1,1), and the lower right should be (p->width,p->height).
*/
MODULE_EXPORT void
xosdlib_drv_string (Driver *drvthis, int x, int y, char string[])
{
PrivateData *p = drvthis->private_data;
int i;
debug (RPT_DEBUG, "%s(%p, %d, %d, \"%s\")", __FUNCTION__, drvthis, x, y, string);
x--;
y--;
for (i = 0; string[i] != '\0'; i++) {
unsigned char c = (unsigned) string[i];
if (c == 255)
c = '#';
p->framebuf[(y * p->width) + x++] = c;
}
}
/**
* Prints a character on the lcd display, at position (x,y). The
* upper-left is (1,1), and the lower right should be (p->width,p->height).
*/
MODULE_EXPORT void
xosdlib_drv_chr (Driver *drvthis, int x, int y, char c)
{
PrivateData *p = drvthis->private_data;
debug (RPT_DEBUG, "%s(%p, %d, %d, \'%c\')", __FUNCTION__, drvthis, x, y, c);
x--;
y--;
switch ((unsigned) c) {
case '\0':
c = icon_char;
break;
case 255:
c = '#';
break;
}
p->framebuf[(y * p->width) + x] = c;
}
/**
* Writes a big number, but not. A bit like the curses driver.
*/
MODULE_EXPORT void
xosdlib_drv_old_num (Driver *drvthis, int x, int num)
{
char c;
int y, dx;
debug (RPT_DEBUG, "%s(%p, %d, %d)", __FUNCTION__, drvthis, x, num);
c = '0' + num;
for (y = 1; y < 5; y++)
for (dx = 0; dx < 3; dx++)
xosdlib_drv_chr (drvthis, x + dx, y, c);
}
/**
* Draws a vertical bar; erases entire column onscreen.
*/
MODULE_EXPORT void
xosdlib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
{
int pos;
debug (RPT_DEBUG, "%s(%p, %d, %d, %d, %d, %02x)", __FUNCTION__, drvthis, x, y, len, promille, pattern);
for (pos = 0; pos < len; pos++) {
if (2 * pos < ((long) promille * len / 500 + 1)) {
xosdlib_drv_chr (drvthis, x, y-pos, '|');
} else {
; /* print nothing */
}
}
}
/**
* Draws a horizontal bar to the right.
*/
MODULE_EXPORT void
xosdlib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
{
int pos;
debug (RPT_DEBUG, "%s(%p, %d, %d, %d, %d, %02x)", __FUNCTION__, drvthis, x, y, len, promille, pattern);
for (pos = 0; pos < len; pos++) {
if (2 * pos < ((long) promille * len / 500 + 1)) {
xosdlib_drv_chr (drvthis, x+pos, y, '-');
} else {
; /* print nothing */
}
}
}
/**
* Returns current contrast (in promille)
* This is only the locally stored contrast.
*/
MODULE_EXPORT int
xosdlib_drv_get_contrast (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
return p->contrast;
}
/**
* Changes screen contrast (in promille)
*/
MODULE_EXPORT void
xosdlib_drv_set_contrast (Driver *drvthis, int promille)
{
PrivateData *p = drvthis->private_data;
int contrast;
/* Check it */
if (promille < 0 || promille > 1000)
return;
/* store the software value since there is not get */
p->contrast = promille;
/* map range [0, 1000] to [0, 255] */
contrast = (p->contrast * 255) / 1000;
/* What to do with it ? */
}
/**
* Retrieves brightness (in promille)
*/
MODULE_EXPORT int
xosdlib_drv_get_brightness(Driver *drvthis, int state)
{
PrivateData *p = drvthis->private_data;
return (state == BACKLIGHT_ON) ? p->brightness : p->offbrightness;
}
/**
* Sets on/off brightness (in promille)
*/
MODULE_EXPORT void
xosdlib_drv_set_brightness(Driver *drvthis, int state, int promille)
{
PrivateData *p = drvthis->private_data;
/* Check it */
if (promille < 0 || promille > 1000)
return;
/* store the software value since there is no get */
if (state == BACKLIGHT_ON) {
p->brightness = promille;
}
else {
p->offbrightness = promille;
}
}
/**
* Sets the backlight on or off.
* The hardware support any value between 0 and 100.
*/
MODULE_EXPORT void
xosdlib_drv_backlight (Driver *drvthis, int on)
{
PrivateData *p = drvthis->private_data;
int value = (on == BACKLIGHT_ON) ? p->brightness : p->offbrightness;
/* map range [0, 1000] -> [1, 255] */
value = value * 255 / 1000;
if (value <= 0)
value = 1;
/* set font color */
//xosd_set_colour (p->osd, "#001122");
}
server/drivers/xosdlib_drv.h
+56
View File
@@ -0,0 +1,56 @@
#ifndef LCD_XOSDLIB_H
#define LCD_XOSDLIB_H
#include <xosd.h>
#define DEFAULT_FONT "fixed"
#define DEFAULT_SIZE "20x4"
#define DEFAULT_CONTRAST 500
#define DEFAULT_BRIGHTNESS 1000
#define DEFAULT_OFFBRIGHTNESS 500
#define DEFAULT_BACKLIGHT 0
#define CELLWIDTH 6
#define CELLHEIGHT 8
typedef struct driver_private_data {
/* xosd handle */
xosd *osd;
/* xosd properties */
char font[256];
/* dimensions */
int width, height;
int xoffs, yoffs;
/* framebuffer and buffer for old LCD contents */
unsigned char *framebuf;
unsigned char *backingstore;
int contrast;
int brightness;
int offbrightness;
} PrivateData;
MODULE_EXPORT int xosdlib_drv_init (Driver *drvthis);
MODULE_EXPORT void xosdlib_drv_close (Driver *drvthis);
MODULE_EXPORT int xosdlib_drv_width (Driver *drvthis);
MODULE_EXPORT int xosdlib_drv_height (Driver *drvthis);
MODULE_EXPORT void xosdlib_drv_clear (Driver *drvthis);
MODULE_EXPORT void xosdlib_drv_flush (Driver *drvthis);
MODULE_EXPORT void xosdlib_drv_string (Driver *drvthis, int x, int y, char string[]);
MODULE_EXPORT void xosdlib_drv_chr (Driver *drvthis, int x, int y, char c);
MODULE_EXPORT void xosdlib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
MODULE_EXPORT void xosdlib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
MODULE_EXPORT void xosdlib_drv_old_num (Driver *drvthis, int x, int num);
MODULE_EXPORT int xosdlib_drv_get_contrast (Driver *drvthis);
MODULE_EXPORT void xosdlib_drv_set_contrast (Driver *drvthis, int promille);
MODULE_EXPORT int xosdlib_drv_get_brightness(Driver *drvthis, int state);
MODULE_EXPORT void xosdlib_drv_set_brightness(Driver *drvthis, int state, int promille);
MODULE_EXPORT void xosdlib_drv_backlight (Driver *drvthis, int on);
#endif /* XOSDLIB_H */