mirror of
https://github.com/netfun2000/lcd4linux.git
synced 2026-02-27 09:44:34 +08:00
[lcd4linux @ 2004-02-24 05:54:57 by reinelt]
X11 driver ported git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@375 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
This commit is contained in:
reinelt
+1
-2
@@ -71,8 +71,7 @@ drv_MatrixOrbital.c \
|
||||
MilfordInstruments.c \
|
||||
PalmPilot.c \
|
||||
Raster.c \
|
||||
SIN.c \
|
||||
XWindow.c \
|
||||
drv_X11.c \
|
||||
Text.c \
|
||||
font_6x8.h
|
||||
|
||||
|
||||
+15
-16
@@ -115,7 +115,7 @@ lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h deb
|
||||
|
||||
#liblcd4linux_la_SOURCES =
|
||||
|
||||
EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_graphic.c drv_generic_graphic.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c drv_HD44780.c drv_M50530.c drv_T6963.c drv_USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c SIN.c XWindow.c Text.c font_6x8.h
|
||||
EXTRA_lcd4linux_SOURCES = drv_generic_text.c drv_generic_text.h drv_generic_graphic.c drv_generic_graphic.h drv_generic_serial.c drv_generic_serial.h drv_generic_parport.c drv_generic_parport.h BeckmannEgle.c drv_Crystalfontz.c drv_Cwlinux.c drv_HD44780.c drv_M50530.c drv_T6963.c drv_USBLCD.c drv_MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c drv_X11.c Text.c font_6x8.h
|
||||
|
||||
|
||||
EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Rows README.Tokens README.Drivers README.Plugins README.KDE plugin_sample.c
|
||||
@@ -163,21 +163,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/BeckmannEgle.P .deps/MilfordInstruments.P \
|
||||
.deps/PalmPilot.P .deps/Raster.P .deps/SIN.P .deps/Text.P \
|
||||
.deps/XWindow.P .deps/cfg.P .deps/debug.P .deps/drv.P \
|
||||
.deps/drv_Crystalfontz.P .deps/drv_Cwlinux.P .deps/drv_HD44780.P \
|
||||
.deps/drv_M50530.P .deps/drv_MatrixOrbital.P .deps/drv_T6963.P \
|
||||
.deps/drv_USBLCD.P .deps/drv_generic_graphic.P \
|
||||
.deps/drv_generic_parport.P .deps/drv_generic_serial.P \
|
||||
.deps/drv_generic_text.P .deps/evaluator.P .deps/hash.P .deps/layout.P \
|
||||
.deps/lcd4linux.P .deps/lock.P .deps/pid.P .deps/plugin.P \
|
||||
.deps/plugin_cfg.P .deps/plugin_cpuinfo.P .deps/plugin_dvb.P \
|
||||
.deps/plugin_i2c_sensors.P .deps/plugin_imon.P .deps/plugin_loadavg.P \
|
||||
.deps/plugin_math.P .deps/plugin_meminfo.P .deps/plugin_netdev.P \
|
||||
.deps/plugin_ppp.P .deps/plugin_proc_stat.P .deps/plugin_string.P \
|
||||
.deps/plugin_uname.P .deps/plugin_xmms.P .deps/timer.P .deps/udelay.P \
|
||||
.deps/widget.P .deps/widget_bar.P .deps/widget_icon.P \
|
||||
.deps/widget_text.P
|
||||
.deps/PalmPilot.P .deps/Raster.P .deps/Text.P .deps/cfg.P .deps/debug.P \
|
||||
.deps/drv.P .deps/drv_Crystalfontz.P .deps/drv_Cwlinux.P \
|
||||
.deps/drv_HD44780.P .deps/drv_M50530.P .deps/drv_MatrixOrbital.P \
|
||||
.deps/drv_T6963.P .deps/drv_USBLCD.P .deps/drv_X11.P \
|
||||
.deps/drv_generic_graphic.P .deps/drv_generic_parport.P \
|
||||
.deps/drv_generic_serial.P .deps/drv_generic_text.P .deps/evaluator.P \
|
||||
.deps/hash.P .deps/layout.P .deps/lcd4linux.P .deps/lock.P .deps/pid.P \
|
||||
.deps/plugin.P .deps/plugin_cfg.P .deps/plugin_cpuinfo.P \
|
||||
.deps/plugin_dvb.P .deps/plugin_i2c_sensors.P .deps/plugin_imon.P \
|
||||
.deps/plugin_loadavg.P .deps/plugin_math.P .deps/plugin_meminfo.P \
|
||||
.deps/plugin_netdev.P .deps/plugin_ppp.P .deps/plugin_proc_stat.P \
|
||||
.deps/plugin_string.P .deps/plugin_uname.P .deps/plugin_xmms.P \
|
||||
.deps/timer.P .deps/udelay.P .deps/widget.P .deps/widget_bar.P \
|
||||
.deps/widget_icon.P .deps/widget_text.P
|
||||
SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES)
|
||||
OBJECTS = $(lcd4linux_OBJECTS)
|
||||
|
||||
|
||||
@@ -1,628 +0,0 @@
|
||||
/* $Id: XWindow.c,v 1.40 2004/01/30 20:57:55 reinelt Exp $
|
||||
*
|
||||
* X11 Driver for LCD4Linux
|
||||
*
|
||||
* Copyright 2000 Herbert Rosmanith <herp@wildsau.idv.uni-linz.ac.at>
|
||||
*
|
||||
* This file is part of LCD4Linux.
|
||||
*
|
||||
* LCD4Linux 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, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
*
|
||||
* $Log: XWindow.c,v $
|
||||
* Revision 1.40 2004/01/30 20:57:55 reinelt
|
||||
* HD44780 patch from Martin Hejl
|
||||
* dmalloc integrated
|
||||
*
|
||||
* Revision 1.39 2004/01/29 04:40:02 reinelt
|
||||
* every .c file includes "config.h" now
|
||||
*
|
||||
* Revision 1.38 2004/01/09 04:16:06 reinelt
|
||||
* added 'section' argument to cfg_get(), but NULLed it on all calls by now.
|
||||
*
|
||||
* Revision 1.37 2004/01/06 22:33:14 reinelt
|
||||
* Copyright statements cleaned up
|
||||
*
|
||||
* Revision 1.36 2003/10/22 04:32:25 reinelt
|
||||
* fixed icon bug found by Rob van Nieuwkerk
|
||||
*
|
||||
* Revision 1.35 2003/10/05 17:58:50 reinelt
|
||||
* libtool junk; copyright messages cleaned up
|
||||
*
|
||||
* Revision 1.34 2003/09/10 14:01:53 reinelt
|
||||
* icons nearly finished\!
|
||||
*
|
||||
* Revision 1.33 2003/09/09 06:54:43 reinelt
|
||||
* new function 'cfg_number()'
|
||||
*
|
||||
* Revision 1.32 2003/07/24 04:48:09 reinelt
|
||||
* 'soft clear' needed for virtual rows
|
||||
*
|
||||
* Revision 1.31 2003/04/12 16:23:10 reinelt
|
||||
* small glitch in XWindow.c (thanks to Moe Wibble)
|
||||
*
|
||||
* Revision 1.30 2003/02/22 07:53:10 reinelt
|
||||
* cfg_get(key,defval)
|
||||
*
|
||||
* Revision 1.29 2003/02/18 06:13:44 reinelt
|
||||
* X11 driver fixes and cleanup
|
||||
*
|
||||
* Revision 1.28 2003/02/17 06:06:12 reinelt
|
||||
* small bug in X11 driver: omit pixel gap between cahracters
|
||||
*
|
||||
* Revision 1.27 2002/08/19 04:41:20 reinelt
|
||||
* introduced bar.c, moved bar stuff from display.h to bar.h
|
||||
*
|
||||
* Revision 1.26 2001/08/05 17:13:29 reinelt
|
||||
*
|
||||
* cleaned up inlude of sys/time.h and time.h
|
||||
*
|
||||
* Revision 1.25 2001/03/16 16:40:17 ltoetsch
|
||||
* implemented time bar
|
||||
*
|
||||
* Revision 1.24 2001/03/01 11:08:16 reinelt
|
||||
*
|
||||
* reworked configure to allow selection of drivers
|
||||
*
|
||||
* Revision 1.23 2001/02/26 00:33:37 herp
|
||||
* fixed X11 signal handler
|
||||
*
|
||||
* Revision 1.22 2001/02/13 09:00:13 reinelt
|
||||
*
|
||||
* prepared framework for GPO's (general purpose outputs)
|
||||
*
|
||||
* Revision 1.21 2000/08/10 18:42:20 reinelt
|
||||
*
|
||||
* fixed some bugs with the new syslog code
|
||||
*
|
||||
* Revision 1.20 2000/08/10 09:44:09 reinelt
|
||||
*
|
||||
* new debugging scheme: error(), info(), debug()
|
||||
* uses syslog if in daemon mode
|
||||
*
|
||||
* Revision 1.19 2000/08/09 09:50:29 reinelt
|
||||
*
|
||||
* opened 0.98 development
|
||||
* removed driver-specific signal-handlers
|
||||
* added 'quit'-function to driver structure
|
||||
* added global signal-handler
|
||||
*
|
||||
* Revision 1.18 2000/05/02 23:07:48 herp
|
||||
* Crystalfontz initial coding
|
||||
*
|
||||
* Revision 1.17 2000/04/05 05:58:36 reinelt
|
||||
*
|
||||
* fixed bug in XWindow.c: union semun isn't defined with glibc-2.1
|
||||
*
|
||||
* Revision 1.16 2000/04/03 23:53:23 herp
|
||||
* fixed a bug that caused pixel-errors ("fliegendreck") under high load
|
||||
*
|
||||
* Revision 1.15 2000/04/03 04:01:31 reinelt
|
||||
*
|
||||
* if 'gap' is specified as -1, a gap of (pixelsize+pixelgap) is selected automatically
|
||||
*
|
||||
* Revision 1.14 2000/04/02 22:07:10 herp
|
||||
* fixded a bug that occasionally caused Xlib errors
|
||||
*
|
||||
* Revision 1.13 2000/04/01 22:40:42 herp
|
||||
* geometric correction (too many pixelgaps)
|
||||
* lcd4linux main should return int, not void
|
||||
*
|
||||
* Revision 1.12 2000/04/01 19:33:45 herp
|
||||
*
|
||||
* colors in format \#RRGGBB in config-file now understood
|
||||
*
|
||||
* Revision 1.11 2000/04/01 16:22:38 reinelt
|
||||
*
|
||||
* bug that caused a segfault in processor.c fixed (thanks to herp)
|
||||
*
|
||||
* Revision 1.10 2000/03/31 01:42:11 herp
|
||||
*
|
||||
* semaphore bug fixed
|
||||
*
|
||||
* Revision 1.9 2000/03/30 16:46:57 reinelt
|
||||
*
|
||||
* configure now handles '--with-x' and '--without-x' correct
|
||||
*
|
||||
* Revision 1.8 2000/03/28 08:48:33 reinelt
|
||||
*
|
||||
* README.X11 added
|
||||
*
|
||||
* Revision 1.7 2000/03/28 07:22:15 reinelt
|
||||
*
|
||||
* version 0.95 released
|
||||
* X11 driver up and running
|
||||
* minor bugs fixed
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
* exported fuctions:
|
||||
*
|
||||
* struct LCD XWindow[]
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Mon Feb 26 02:07:52 MET 2001 fixed sighandler
|
||||
* Tue Apr 4 02:37:38 MET 2000 fixed a bug that caused pixelerrors under h/load
|
||||
* Sun Apr 2 22:07:10 MET 2000 fixed a bug that occasionally caused Xlib error
|
||||
* Sun Apr 2 01:32:48 MET 2000 geometric correction (too many pixelgaps)
|
||||
* Sat Apr 1 22:18:04 MET 2000 colors in format \#RRGGBB in config-file
|
||||
* Fri Mar 31 01:42:11 MET 2000 semaphore bug fixed
|
||||
* Sun Mar 26 15:28:23 MET 2000 various rewrites
|
||||
* Sat Mar 25 23:58:19 MET 2000 use generic pixmap driver
|
||||
* Thu Mar 23 01:05:07 MET 2000 multithreading, synchronization
|
||||
* Tue Mar 21 22:22:03 MET 2000 initial coding
|
||||
*
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/sem.h>
|
||||
#include <sys/shm.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "debug.h"
|
||||
#include "cfg.h"
|
||||
#include "display.h"
|
||||
#include "bar.h"
|
||||
#include "icon.h"
|
||||
#include "pixmap.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* glibc 2.1 requires defining semun ourselves */
|
||||
#ifdef _SEM_SEMUN_UNDEFINED
|
||||
union semun {
|
||||
int val;
|
||||
struct semid_ds *buf;
|
||||
unsigned short int *array;
|
||||
struct seminfo *__buf;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
static LCD Lcd;
|
||||
static Display *dp;
|
||||
static int sc;
|
||||
static Window w,rw;
|
||||
static Visual *vi;
|
||||
static int dd;
|
||||
static Colormap cm;
|
||||
static GC gc,gcb,gch;
|
||||
static XColor co[3];
|
||||
static Pixmap pmback;
|
||||
|
||||
static unsigned char *LCDpixmap2;
|
||||
static char *rgbfg,*rgbbg,*rgbhg;
|
||||
static int pixel=-1; /*pointsize in pixel*/
|
||||
static int pgap=0; /*gap between points */
|
||||
static int rgap=0; /*row gap between lines*/
|
||||
static int cgap=0; /*column gap between characters*/
|
||||
static int border=0; /*window border*/
|
||||
static int rows=-1,cols=-1; /*rows+cols without background*/
|
||||
static int xres=-1,yres=-1; /*xres+yres (same as self->...)*/
|
||||
static int icons; /* number of user-defined icons */
|
||||
static int dimx,dimy; /*total window dimension in pixel*/
|
||||
static int boxw,boxh; /*box width, box height*/
|
||||
static int async_update(); /*PROTO*/
|
||||
static pid_t async_updater_pid=1;
|
||||
static int semid=-1;
|
||||
static int shmid=-1;
|
||||
static int ppid; /*parent pid*/
|
||||
|
||||
|
||||
static void acquire_lock()
|
||||
{
|
||||
struct sembuf sembuf;
|
||||
sembuf.sem_num=0;
|
||||
sembuf.sem_op=-1;
|
||||
sembuf.sem_flg=0;
|
||||
semop(semid,&sembuf,1); /* get mutex */
|
||||
}
|
||||
|
||||
|
||||
static void release_lock()
|
||||
{
|
||||
struct sembuf sembuf;
|
||||
sembuf.sem_num=0;
|
||||
sembuf.sem_op=1;
|
||||
sembuf.sem_flg=0;
|
||||
semop(semid,&sembuf,1); /* free mutex */
|
||||
}
|
||||
|
||||
|
||||
static void semcleanup()
|
||||
{
|
||||
union semun arg;
|
||||
if (semid>-1) semctl(semid,0,IPC_RMID,arg);
|
||||
}
|
||||
|
||||
|
||||
static void shmcleanup()
|
||||
{
|
||||
if (shmid>-1) shmctl(shmid,IPC_RMID,NULL);
|
||||
}
|
||||
|
||||
|
||||
static void quit_updater()
|
||||
{
|
||||
int i;
|
||||
if (async_updater_pid>1) {
|
||||
i=async_updater_pid;
|
||||
async_updater_pid=1;
|
||||
kill(i,9);
|
||||
waitpid(i,&i,0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void sig_updater(int sig)
|
||||
{
|
||||
kill(ppid,sig);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
||||
static void init_signals()
|
||||
{
|
||||
unsigned int ignsig=(1<<SIGBUS)|(1<<SIGFPE)|(1<<SIGSEGV)|
|
||||
(1<<SIGTSTP)|(1<<SIGCHLD)|(1<<SIGCONT)|
|
||||
(1<<SIGTTIN)|(1<<SIGWINCH);
|
||||
int i;
|
||||
for(i=0;i<NSIG;i++)
|
||||
if (((1<<i)&ignsig)==0)
|
||||
signal(i,sig_updater);
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int init_shm(int nbytes,unsigned char **buf)
|
||||
{
|
||||
shmid=shmget(IPC_PRIVATE,nbytes,SHM_R|SHM_W);
|
||||
if (shmid==-1) {
|
||||
error ("X11: shmget() failed: %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
*buf=shmat(shmid,NULL,0);
|
||||
if (*buf==NULL) {
|
||||
error ("X11: shmat() failed: %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* acording to SUN-Solaris man-pages: */
|
||||
#define SEM_ALTER 0200
|
||||
|
||||
static int init_thread(int bufsiz)
|
||||
{
|
||||
union semun semun;
|
||||
|
||||
semid=semget(IPC_PRIVATE,1,SEM_ALTER);
|
||||
if (semid==-1) {
|
||||
error ("X11: semget() failed: %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
semun.val=1;
|
||||
semctl(semid,0,SETVAL,semun);
|
||||
|
||||
ppid=getpid();
|
||||
switch(async_updater_pid=fork()) {
|
||||
case -1:
|
||||
error ("X11: fork() failed: %s", strerror(errno));
|
||||
return -1;
|
||||
case 0:
|
||||
async_update();
|
||||
error ("X11: async_update failed");
|
||||
kill(ppid,SIGTERM);
|
||||
exit(-1);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
signal(SIGCHLD,quit_updater);
|
||||
atexit(quit_updater);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int init_x(int rows,int cols,int xres,int yres)
|
||||
{
|
||||
XSetWindowAttributes wa;
|
||||
XSizeHints size_hints;
|
||||
XColor co_dummy;
|
||||
XEvent ev;
|
||||
|
||||
if ((dp=XOpenDisplay(NULL))==NULL) {
|
||||
error ("X11: can't open display");
|
||||
return -1;
|
||||
}
|
||||
sc=DefaultScreen(dp);
|
||||
gc=DefaultGC(dp,sc);
|
||||
vi=DefaultVisual(dp,sc);
|
||||
dd=DefaultDepth(dp,sc);
|
||||
rw=DefaultRootWindow(dp);
|
||||
cm=DefaultColormap(dp,sc);
|
||||
|
||||
if (XAllocNamedColor(dp,cm,rgbfg,&co[0],&co_dummy)==False) {
|
||||
error ("X11: can't alloc foreground color '%s'",
|
||||
rgbfg);
|
||||
return -1;
|
||||
}
|
||||
if (XAllocNamedColor(dp,cm,rgbbg,&co[1],&co_dummy)==False) {
|
||||
error ("X11: can't alloc background color '%s'",
|
||||
rgbbg);
|
||||
return -1;
|
||||
}
|
||||
if (XAllocNamedColor(dp,cm,rgbhg,&co[2],&co_dummy)==False) {
|
||||
error ("X11: can't alloc halfground color '%s'",
|
||||
rgbhg);
|
||||
return -1;
|
||||
}
|
||||
boxw=xres*pixel+(xres-1)*pgap+cgap;
|
||||
boxh=yres*pixel+(yres-1)*pgap+rgap;
|
||||
dimx=cols*xres*pixel+(cols*xres-1)*pgap+(cols-1)*cgap;
|
||||
dimy=rows*yres*pixel+(rows*yres-1)*pgap+(rows-1)*rgap;
|
||||
wa.event_mask=ExposureMask;
|
||||
w=XCreateWindow(dp,rw,0,0,dimx+2*border,dimy+2*border,0,0,
|
||||
InputOutput,vi,CWEventMask,&wa);
|
||||
pmback=XCreatePixmap(dp,w,dimx,dimy,dd);
|
||||
size_hints.min_width=size_hints.max_width=dimx+2*border;
|
||||
size_hints.min_height=size_hints.max_height=dimy+2*border;
|
||||
size_hints.flags=PPosition|PSize|PMinSize|PMaxSize;
|
||||
XSetWMProperties(dp,w,NULL,NULL,NULL,0,&size_hints,NULL,NULL);
|
||||
XSetForeground(dp,gc,co[0].pixel);
|
||||
XSetBackground(dp,gc,co[1].pixel);
|
||||
gcb=XCreateGC(dp,w,0,NULL);
|
||||
XSetForeground(dp,gcb,co[1].pixel);
|
||||
XSetBackground(dp,gcb,co[0].pixel);
|
||||
gch=XCreateGC(dp,w,0,NULL);
|
||||
XSetForeground(dp,gch,co[2].pixel);
|
||||
XSetBackground(dp,gch,co[0].pixel);
|
||||
XFillRectangle(dp,pmback,gcb,0,0,dimx,dimy);
|
||||
XSetWindowBackground(dp,w,co[1].pixel);
|
||||
XClearWindow(dp,w);
|
||||
XStoreName(dp,w,"XLCD4Linux");
|
||||
XMapWindow(dp,w);
|
||||
XFlush(dp);
|
||||
for(;;) {
|
||||
XNextEvent(dp,&ev);
|
||||
if (ev.type==Expose && ev.xexpose.count==0)
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdinit(LCD *Self)
|
||||
{
|
||||
char *s;
|
||||
|
||||
if (sscanf(s=cfg_get(NULL, "size", "20x4"),"%dx%d",&cols,&rows)!=2
|
||||
|| rows<1 || cols<1) {
|
||||
error ("X11: bad size '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "font", "5x8"),"%dx%d",&xres,&yres)!=2
|
||||
|| xres<5 || yres>10) {
|
||||
error ("X11: bad font '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "pixel", "4+1"),"%d+%d",&pixel,&pgap)!=2
|
||||
|| pixel<1 || pgap<0) {
|
||||
error ("X11: bad pixel '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "gap", "-1x-1"),"%dx%d",&cgap,&rgap)!=2
|
||||
|| cgap<-1 || rgap<-1) {
|
||||
error ("X11: bad gap '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (rgap<0) rgap=pixel+pgap;
|
||||
if (cgap<0) cgap=pixel+pgap;
|
||||
|
||||
if (cfg_number(NULL, "border", 0, 0, 1000000, &border)<0) return -1;
|
||||
|
||||
rgbfg=cfg_get(NULL, "foreground", "#000000");
|
||||
rgbbg=cfg_get(NULL, "background", "#80d000");
|
||||
rgbhg=cfg_get(NULL, "halfground", "#70c000");
|
||||
if (*rgbfg=='\\') rgbfg++;
|
||||
if (*rgbbg=='\\') rgbbg++;
|
||||
if (*rgbhg=='\\') rgbhg++;
|
||||
|
||||
if (pix_init(rows,cols,xres,yres)==-1) return -1;
|
||||
|
||||
if (cfg_number(NULL, "Icons", 0, 0, 8, &icons) < 0) return -1;
|
||||
if (icons>0) {
|
||||
info ("allocating %d icons", icons);
|
||||
icon_init(rows, cols, xres, yres, 8, icons, pix_icon);
|
||||
}
|
||||
|
||||
if (init_x(rows,cols,xres,yres)==-1) return -1;
|
||||
init_signals();
|
||||
if (init_shm(rows*cols*xres*yres,&LCDpixmap2)==-1) return -1;
|
||||
memset(LCDpixmap2,0xff,rows*yres*cols*xres);
|
||||
if (init_thread(rows*cols*xres*yres)==-1) return -1;
|
||||
Self->rows=rows;
|
||||
Self->cols=cols;
|
||||
Self->xres=xres;
|
||||
Self->yres=yres;
|
||||
Self->icons=icons;
|
||||
Lcd=*Self;
|
||||
|
||||
pix_clear();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdclear(int full)
|
||||
{
|
||||
icon_clear();
|
||||
pix_clear();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdput(int row,int col, char *text)
|
||||
{
|
||||
return pix_put(row,col,text);
|
||||
}
|
||||
|
||||
|
||||
int xlcdbar(int type, int row, int col, int max, int len1, int len2)
|
||||
{
|
||||
return pix_bar(type,row,col,max,len1,len2);
|
||||
}
|
||||
|
||||
|
||||
int xlcdicon (int num, int seq, int row, int col)
|
||||
{
|
||||
return icon_draw (num, seq, row, col);
|
||||
}
|
||||
|
||||
|
||||
int xlcdflush() {
|
||||
int dirty;
|
||||
int row,col;
|
||||
|
||||
acquire_lock();
|
||||
dirty=0;
|
||||
for(row=0;row<rows*yres;row++) {
|
||||
int y=border+(row/yres)*rgap+row*(pixel+pgap);
|
||||
for(col=0;col<cols*xres;col++) {
|
||||
int x=border+(col/xres)*cgap+col*(pixel+pgap);
|
||||
int p=row*cols*xres+col;
|
||||
if (LCDpixmap[p]^LCDpixmap2[p]) {
|
||||
XFillRectangle(dp,w,LCDpixmap[p]?gc:gch,x,y,pixel,pixel);
|
||||
LCDpixmap2[p]=LCDpixmap[p];
|
||||
dirty=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (dirty) XSync(dp,False);
|
||||
release_lock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdquit(void)
|
||||
{
|
||||
semcleanup();
|
||||
shmcleanup();
|
||||
quit_updater();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* this one should only be called from the updater-thread
|
||||
* no user serviceable parts inside
|
||||
*/
|
||||
|
||||
static void update(int x,int y,int width,int height)
|
||||
{
|
||||
/*
|
||||
* theory of operation:
|
||||
* instead of the old, fully-featured but complicated update
|
||||
* region calculation, we do an update of the whole display,
|
||||
* but check before every pixel if the pixel region is inside
|
||||
* the update region.
|
||||
*/
|
||||
|
||||
int x0, y0;
|
||||
int x1, y1;
|
||||
int row, col;
|
||||
int dirty;
|
||||
|
||||
x0=x-pixel;
|
||||
y0=y-pixel;
|
||||
x1=x+pixel+width;
|
||||
y1=y+pixel+height;
|
||||
|
||||
dirty=0;
|
||||
for(row=0;row<rows*yres;row++) {
|
||||
int y=border+(row/yres)*rgap+row*(pixel+pgap);
|
||||
if (y<y0 || y>y1) continue;
|
||||
for(col=0;col<cols*xres;col++) {
|
||||
int x=border+(col/xres)*cgap+col*(pixel+pgap);
|
||||
int p;
|
||||
if (x<x0 || x>x1) continue;
|
||||
p=row*cols*xres+col;
|
||||
XFillRectangle(dp,w,LCDpixmap2[p]?gc:gch,x,y,pixel,pixel);
|
||||
dirty=1;
|
||||
}
|
||||
}
|
||||
if (dirty) XSync(dp,False);
|
||||
}
|
||||
|
||||
|
||||
static int async_update()
|
||||
{
|
||||
XSetWindowAttributes wa;
|
||||
XEvent ev;
|
||||
|
||||
if ((dp=XOpenDisplay(NULL))==NULL)
|
||||
return -1;
|
||||
wa.event_mask=ExposureMask;
|
||||
XChangeWindowAttributes(dp,w,CWEventMask,&wa);
|
||||
for(;;) {
|
||||
XWindowEvent(dp,w,ExposureMask,&ev);
|
||||
if (ev.type==Expose) {
|
||||
acquire_lock();
|
||||
update(ev.xexpose.x,ev.xexpose.y,
|
||||
ev.xexpose.width,ev.xexpose.height);
|
||||
release_lock();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
LCD XWindow[] = {
|
||||
{ name: "X11",
|
||||
rows: 0,
|
||||
cols: 0,
|
||||
xres: 0,
|
||||
yres: 0,
|
||||
bars: BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 | BAR_V2 | BAR_T,
|
||||
icons: 0,
|
||||
gpos: 0,
|
||||
init: xlcdinit,
|
||||
clear: xlcdclear,
|
||||
put: xlcdput,
|
||||
bar: xlcdbar,
|
||||
icon: xlcdicon,
|
||||
gpo: NULL,
|
||||
flush: xlcdflush,
|
||||
quit: xlcdquit
|
||||
},
|
||||
{ NULL }
|
||||
};
|
||||
@@ -21096,8 +21096,9 @@ if test "$X11" = "yes"; then
|
||||
echo "$as_me: error: X11 headers or libraries not available: X11 driver disabled" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
# DRIVERS="$DRIVERS XWindow.lo"
|
||||
# DRIVERS="$DRIVERS XWindow.o"
|
||||
GRAPHIC="yes"
|
||||
# DRIVERS="$DRIVERS drv_X11.lo"
|
||||
DRIVERS="$DRIVERS drv_X11.o"
|
||||
DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
|
||||
+3
-2
@@ -246,8 +246,9 @@ if test "$X11" = "yes"; then
|
||||
if test "$no_x" = "yes"; then
|
||||
AC_MSG_ERROR(X11 headers or libraries not available: X11 driver disabled)
|
||||
else
|
||||
# DRIVERS="$DRIVERS XWindow.lo"
|
||||
# DRIVERS="$DRIVERS XWindow.o"
|
||||
GRAPHIC="yes"
|
||||
# DRIVERS="$DRIVERS drv_X11.lo"
|
||||
DRIVERS="$DRIVERS drv_X11.o"
|
||||
DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
|
||||
AC_DEFINE(WITH_X11,1,[X11 driver])
|
||||
fi
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $Id: drv.c,v 1.8 2004/02/15 21:43:43 reinelt Exp $
|
||||
/* $Id: drv.c,v 1.9 2004/02/24 05:55:04 reinelt Exp $
|
||||
*
|
||||
* new framework for display drivers
|
||||
*
|
||||
@@ -23,6 +23,10 @@
|
||||
*
|
||||
*
|
||||
* $Log: drv.c,v $
|
||||
* Revision 1.9 2004/02/24 05:55:04 reinelt
|
||||
*
|
||||
* X11 driver ported
|
||||
*
|
||||
* Revision 1.8 2004/02/15 21:43:43 reinelt
|
||||
* T6963 driver nearly finished
|
||||
* framework for graphic displays done
|
||||
@@ -115,7 +119,7 @@ extern DRIVER drv_MatrixOrbital;
|
||||
extern DRIVER drv_MilfordInstruments;
|
||||
extern DRIVER drv_PalmPilot;
|
||||
extern DRIVER drv_Raster;
|
||||
extern DRIVER drv_XWindow;
|
||||
extern DRIVER drv_X11;
|
||||
extern DRIVER drv_Text;
|
||||
|
||||
// output file for Raster driver
|
||||
@@ -163,9 +167,11 @@ DRIVER *Driver[] = {
|
||||
#if defined (WITH_PNG) || defined(WITH_PPM)
|
||||
&Raster,
|
||||
#endif
|
||||
#ifdef WITH_X11
|
||||
&XWindow,
|
||||
#endif
|
||||
*/
|
||||
#ifdef WITH_X11
|
||||
&drv_X11,
|
||||
#endif
|
||||
/* Fixme
|
||||
#ifdef WITH_TEXT
|
||||
&Text,
|
||||
#endif
|
||||
|
||||
+40
-3
@@ -1,4 +1,4 @@
|
||||
/* $Id: drv_T6963.c,v 1.3 2004/02/22 17:35:41 reinelt Exp $
|
||||
/* $Id: drv_T6963.c,v 1.4 2004/02/24 05:55:04 reinelt Exp $
|
||||
*
|
||||
* new style driver for T6963-based displays
|
||||
*
|
||||
@@ -23,6 +23,10 @@
|
||||
*
|
||||
*
|
||||
* $Log: drv_T6963.c,v $
|
||||
* Revision 1.4 2004/02/24 05:55:04 reinelt
|
||||
*
|
||||
* X11 driver ported
|
||||
*
|
||||
* Revision 1.3 2004/02/22 17:35:41 reinelt
|
||||
* some fixes for generic graphic driver and T6963
|
||||
* removed ^M from plugin_imon (Nico, are you editing under Windows?)
|
||||
@@ -69,6 +73,10 @@
|
||||
#include "drv_generic_graphic.h"
|
||||
#include "drv_generic_parport.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif
|
||||
|
||||
static char Name[]="T6963";
|
||||
static int Model;
|
||||
|
||||
@@ -377,8 +385,27 @@ static int drv_T6_start (char *section)
|
||||
return -1;
|
||||
}
|
||||
|
||||
TROWS=DROWS/8; // text rows, assume 6x8 font
|
||||
TCOLS=DCOLS/6; // text cols, assume 6x8 font
|
||||
s=cfg_get(section, "Font", "6x8");
|
||||
if (s==NULL || *s=='\0') {
|
||||
error ("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
XRES = -1;
|
||||
YRES = -1;
|
||||
if (sscanf(s, "%dx%d", &XRES, &YRES)!=2 || XRES<1 || YRES<1) {
|
||||
error ("%s: bad Font '%s' from %s", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Fixme: provider other fonts someday...
|
||||
if (XRES!=6 && YRES!=8) {
|
||||
error ("%s: bad Font '%s' from %s (only 6x8 at the moment)", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
TROWS=DROWS/YRES; // text rows
|
||||
TCOLS=DCOLS/XRES; // text cols
|
||||
|
||||
Buffer1=malloc(DCOLS*TROWS);
|
||||
if (Buffer1==NULL) {
|
||||
@@ -527,6 +554,16 @@ int drv_T6_quit (void) {
|
||||
drv_generic_parport_close();
|
||||
drv_generic_graphic_quit();
|
||||
|
||||
if (Buffer1) {
|
||||
free (Buffer1);
|
||||
Buffer1=NULL;
|
||||
}
|
||||
|
||||
if (Buffer2) {
|
||||
free (Buffer2);
|
||||
Buffer2=NULL;
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,561 @@
|
||||
/* $Id: drv_X11.c,v 1.1 2004/02/24 05:55:04 reinelt Exp $
|
||||
*
|
||||
* new style X11 Driver for LCD4Linux
|
||||
*
|
||||
* Copyright 1999-2004 Michael Reinelt <reinelt@eunet.at>
|
||||
* Copyright 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
|
||||
*
|
||||
* based on the old XWindow.c which is
|
||||
* Copyright 2000 Herbert Rosmanith <herp@wildsau.idv.uni-linz.ac.at>
|
||||
*
|
||||
* This file is part of LCD4Linux.
|
||||
*
|
||||
* LCD4Linux 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, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
*
|
||||
* $Log: drv_X11.c,v $
|
||||
* Revision 1.1 2004/02/24 05:55:04 reinelt
|
||||
*
|
||||
* X11 driver ported
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
* exported fuctions:
|
||||
*
|
||||
* struct DRIVER drv_X11
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <termios.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/time.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include "debug.h"
|
||||
#include "cfg.h"
|
||||
#include "timer.h"
|
||||
#include "udelay.h"
|
||||
#include "plugin.h"
|
||||
#include "widget.h"
|
||||
#include "widget_text.h"
|
||||
#include "widget_icon.h"
|
||||
#include "widget_bar.h"
|
||||
#include "drv.h"
|
||||
#include "drv_generic_graphic.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif
|
||||
|
||||
static char Name[]="X11";
|
||||
|
||||
static char *fg_col,*bg_col,*hg_col;
|
||||
|
||||
static int pixel = -1; // pointsize in pixel
|
||||
static int pgap = 0; // gap between points
|
||||
static int rgap = 0; // row gap between lines
|
||||
static int cgap = 0; // column gap between characters
|
||||
static int border = 0; // window border
|
||||
|
||||
static int dimx, dimy; // total window dimension in pixel
|
||||
|
||||
static unsigned char *drv_X11_FB=NULL;
|
||||
|
||||
static Display *dp;
|
||||
static int sc, dd;
|
||||
static Window w, rw;
|
||||
static Visual *vi;
|
||||
static GC fg_gc, bg_gc, hg_gc;
|
||||
static Colormap cm;
|
||||
static XColor fg_xc, bg_xc, hg_xc;
|
||||
static Pixmap pm;
|
||||
|
||||
|
||||
#if 0
|
||||
static LCD Lcd;
|
||||
|
||||
static unsigned char *LCDpixmap2;
|
||||
static int DROWS=-1,DCOLS=-1; /*DROWS+DCOLS without background*/
|
||||
static int XRES=-1,YRES=-1; /*XRES+YRES (same as self->...)*/
|
||||
static int icons; /* number of user-defined icons */
|
||||
static int async_update(); /*PROTO*/
|
||||
static pid_t async_updater_pid=1;
|
||||
static int semid=-1;
|
||||
static int shmid=-1;
|
||||
static int ppid; /*parent pid*/
|
||||
|
||||
#endif
|
||||
|
||||
// ****************************************
|
||||
// *** hardware dependant functions ***
|
||||
// ****************************************
|
||||
|
||||
static void drv_X11_blit(int row, int col, int height, int width)
|
||||
{
|
||||
int r, c;
|
||||
int dirty = 0;
|
||||
|
||||
for (r=row; r<row+height && r<DROWS; r++) {
|
||||
int y = border + (r/YRES)*rgap + r*(pixel+pgap);
|
||||
for (c=col; c<col+width && c<DCOLS; c++) {
|
||||
int x = border + (c/XRES)*cgap + c*(pixel+pgap);
|
||||
unsigned char p = drv_generic_graphic_FB[r*LCOLS+c];
|
||||
if (drv_X11_FB[r*DCOLS+c] != p) {
|
||||
XFillRectangle( dp, w, p? fg_gc:hg_gc, x, y, pixel, pixel);
|
||||
drv_X11_FB[r*DCOLS+c] = p;
|
||||
dirty=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (dirty) {
|
||||
XSync(dp, False);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void drv_X11_expose(int x, int y, int width, int height)
|
||||
{
|
||||
/*
|
||||
* theory of operation:
|
||||
* instead of the old, fully-featured but complicated update
|
||||
* region calculation, we do an update of the whole display,
|
||||
* but check before every pixel if the pixel region is inside
|
||||
* the update region.
|
||||
*/
|
||||
|
||||
int r, c;
|
||||
int x0, y0;
|
||||
int x1, y1;
|
||||
|
||||
x0 = x-pixel;
|
||||
x1 = x+pixel+width;
|
||||
y0 = y-pixel;
|
||||
y1 = y+pixel+height;
|
||||
|
||||
for (r=0; r<DROWS; r++) {
|
||||
int yc = border + (r/YRES)*rgap + r*(pixel+pgap);
|
||||
if (yc<y0 || yc>y1) continue;
|
||||
for (c=0; c<DCOLS; c++) {
|
||||
int xc = border + (c/XRES)*cgap + c*(pixel+pgap);
|
||||
if (xc<x0 || xc>x1) continue;
|
||||
XFillRectangle( dp, w, drv_generic_graphic_FB[r*LCOLS+c]? fg_gc:hg_gc, xc, yc, pixel, pixel);
|
||||
}
|
||||
}
|
||||
XSync(dp, False);
|
||||
}
|
||||
|
||||
|
||||
static void drv_X11_timer (void *notused)
|
||||
{
|
||||
XEvent ev;
|
||||
|
||||
if (XCheckWindowEvent(dp, w, ExposureMask, &ev)==0) return;
|
||||
if (ev.type==Expose) {
|
||||
drv_X11_expose (ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int drv_X11_start (char *section)
|
||||
{
|
||||
char *s;
|
||||
XSetWindowAttributes wa;
|
||||
XSizeHints sh;
|
||||
XColor dummy;
|
||||
XEvent ev;
|
||||
|
||||
|
||||
// read display size from config
|
||||
if (sscanf(s=cfg_get(section, "Size", "120x32"), "%dx%d", &DCOLS, &DROWS)!=2 || DCOLS<1 || DROWS<1) {
|
||||
error ("%s: bad Size '%s' from %s", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (sscanf(s=cfg_get(section, "font", "5x8"), "%dx%d", &XRES, &YRES)!=2 || XRES<1|| YRES<1) {
|
||||
error ("%s: bad font '%s' from %s", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (sscanf(s=cfg_get(section, "pixel", "4+1"), "%d+%d", &pixel, &pgap)!=2 || pixel<1 || pgap<0) {
|
||||
error ("%s: bad pixel '%s' from %s", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (sscanf(s=cfg_get(section, "gap", "-1x-1"), "%dx%d", &cgap, &rgap)!=2 || cgap<-1 || rgap<-1) {
|
||||
error ("%s: bad gap '%s' from %s", Name, s, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
if (rgap<0) rgap=pixel+pgap;
|
||||
if (cgap<0) cgap=pixel+pgap;
|
||||
|
||||
if (cfg_number(section, "border", 0, 0, 1000000, &border)<0) return -1;
|
||||
|
||||
fg_col=cfg_get(section, "foreground", "#000000");
|
||||
bg_col=cfg_get(section, "background", "#80d000");
|
||||
hg_col=cfg_get(section, "halfground", "#70c000");
|
||||
if (*fg_col=='\\') fg_col++;
|
||||
if (*bg_col=='\\') bg_col++;
|
||||
if (*hg_col=='\\') hg_col++;
|
||||
|
||||
|
||||
drv_X11_FB = malloc(DCOLS*DROWS);
|
||||
if (drv_X11_FB==NULL) {
|
||||
error ("%s: framebuffer could not be allocated: malloc() failed", Name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
// init with 255 so all 'halfground' pixels will be drawn
|
||||
memset(drv_X11_FB, 255, DCOLS*DROWS*sizeof(*drv_X11_FB));
|
||||
|
||||
if ((dp=XOpenDisplay(NULL))==NULL) {
|
||||
error ("%s: can't open display", Name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
sc = DefaultScreen(dp);
|
||||
fg_gc = DefaultGC(dp, sc);
|
||||
vi = DefaultVisual(dp, sc);
|
||||
dd = DefaultDepth(dp, sc);
|
||||
rw = DefaultRootWindow(dp);
|
||||
cm = DefaultColormap(dp, sc);
|
||||
|
||||
if (XAllocNamedColor(dp, cm, fg_col, &fg_xc, &dummy) == False) {
|
||||
error ("%s: can't alloc foreground color '%s'", Name, fg_col);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (XAllocNamedColor(dp, cm, bg_col, &bg_xc, &dummy)==False) {
|
||||
error ("%s: can't alloc background color '%s'", Name, bg_col);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (XAllocNamedColor(dp, cm, hg_col, &hg_xc, &dummy)==False) {
|
||||
error ("%s: can't alloc halfground color '%s'", Name, hg_col);
|
||||
return -1;
|
||||
}
|
||||
|
||||
dimx = DCOLS*pixel + (DCOLS-1)*pgap + (DCOLS/XRES-1)*cgap;
|
||||
dimy = DROWS*pixel + (DROWS-1)*pgap + (DROWS/YRES-1)*rgap;
|
||||
|
||||
wa.event_mask=ExposureMask;
|
||||
|
||||
w = XCreateWindow(dp, rw, 0, 0, dimx+2*border, dimy+2*border, 0, 0, InputOutput, vi, CWEventMask, &wa);
|
||||
|
||||
pm = XCreatePixmap(dp, w, dimx, dimy, dd);
|
||||
|
||||
sh.min_width = sh.max_width = dimx+2*border;
|
||||
sh.min_height = sh.max_height = dimy+2*border;
|
||||
sh.flags = PPosition|PSize|PMinSize|PMaxSize;
|
||||
|
||||
XSetWMProperties(dp, w, NULL, NULL, NULL, 0, &sh, NULL, NULL);
|
||||
|
||||
|
||||
XSetForeground(dp, fg_gc, fg_xc.pixel);
|
||||
XSetBackground(dp, fg_gc, bg_xc.pixel);
|
||||
|
||||
bg_gc = XCreateGC(dp, w, 0, NULL);
|
||||
XSetForeground(dp, bg_gc, bg_xc.pixel);
|
||||
XSetBackground(dp, bg_gc, fg_xc.pixel);
|
||||
|
||||
hg_gc = XCreateGC(dp, w, 0, NULL);
|
||||
XSetForeground(dp, hg_gc, hg_xc.pixel);
|
||||
XSetBackground(dp, hg_gc, fg_xc.pixel);
|
||||
|
||||
XFillRectangle(dp, pm, bg_gc, 0, 0, dimx+2*border, dimy+2*border);
|
||||
XSetWindowBackground(dp, w, bg_xc.pixel);
|
||||
XClearWindow(dp, w);
|
||||
|
||||
XStoreName(dp, w, "LCD4Linux");
|
||||
XMapWindow(dp, w);
|
||||
|
||||
XFlush(dp);
|
||||
|
||||
while(1) {
|
||||
XNextEvent(dp,&ev);
|
||||
if (ev.type==Expose && ev.xexpose.count==0)
|
||||
break;
|
||||
}
|
||||
|
||||
// regularly process X events
|
||||
// Fixme: make 20msec configurable
|
||||
timer_add (drv_X11_timer, NULL, 20, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static int init_x(int rows,int cols,int XRES,int YRES)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdinit(LCD *Self)
|
||||
{
|
||||
char *s;
|
||||
|
||||
if (sscanf(s=cfg_get(NULL, "size", "20x4"),"%dx%d",&DCOLS,&DROWS)!=2
|
||||
|| DROWS<1 || DCOLS<1) {
|
||||
error ("X11: bad size '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "font", "5x8"),"%dx%d",&XRES,&YRES)!=2
|
||||
|| XRES<5 || YRES>10) {
|
||||
error ("X11: bad font '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "pixel", "4+1"),"%d+%d",&pixel,&pgap)!=2
|
||||
|| pixel<1 || pgap<0) {
|
||||
error ("X11: bad pixel '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (sscanf(s=cfg_get(NULL, "gap", "-1x-1"),"%dx%d",&cgap,&rgap)!=2
|
||||
|| cgap<-1 || rgap<-1) {
|
||||
error ("X11: bad gap '%s'",s);
|
||||
return -1;
|
||||
}
|
||||
if (rgap<0) rgap=pixel+pgap;
|
||||
if (cgap<0) cgap=pixel+pgap;
|
||||
|
||||
if (cfg_number(NULL, "border", 0, 0, 1000000, &border)<0) return -1;
|
||||
|
||||
fg_col=cfg_get(NULL, "foreground", "#000000");
|
||||
bg_col=cfg_get(NULL, "background", "#80d000");
|
||||
hg_col=cfg_get(NULL, "halfground", "#70c000");
|
||||
if (*fg_col=='\\') fg_col++;
|
||||
if (*bg_col=='\\') bg_col++;
|
||||
if (*hg_col=='\\') hg_col++;
|
||||
|
||||
if (pix_init(DROWS,DCOLS,XRES,YRES)==-1) return -1;
|
||||
|
||||
if (cfg_number(NULL, "Icons", 0, 0, 8, &icons) < 0) return -1;
|
||||
if (icons>0) {
|
||||
info ("allocating %d icons", icons);
|
||||
icon_init(DROWS, DCOLS, XRES, YRES, 8, icons, pix_icon);
|
||||
}
|
||||
|
||||
if (init_x(DROWS,DCOLS,XRES,YRES)==-1) return -1;
|
||||
init_signals();
|
||||
if (init_shm(DROWS*DCOLS*XRES*YRES,&LCDpixmap2)==-1) return -1;
|
||||
memset(LCDpixmap2,0xff,DROWS*YRES*DCOLS*XRES);
|
||||
if (init_thread(DROWS*DCOLS*XRES*YRES)==-1) return -1;
|
||||
Self->DROWS=DROWS;
|
||||
Self->DCOLS=DCOLS;
|
||||
Self->XRES=XRES;
|
||||
Self->YRES=YRES;
|
||||
Self->icons=icons;
|
||||
Lcd=*Self;
|
||||
|
||||
pix_clear();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int xlcdflush() {
|
||||
int dirty;
|
||||
int row,col;
|
||||
|
||||
acquire_lock();
|
||||
dirty=0;
|
||||
for(row=0;row<DROWS*YRES;row++) {
|
||||
int y=border+(row/YRES)*rgap+row*(pixel+pgap);
|
||||
for(col=0;col<DCOLS*XRES;col++) {
|
||||
int x=border+(col/XRES)*cgap+col*(pixel+pgap);
|
||||
int p=row*DCOLS*XRES+col;
|
||||
if (LCDpixmap[p]^LCDpixmap2[p]) {
|
||||
XFillRectangle(dp,w,LCDpixmap[p]?fg_gc:hg_gc,x,y,pixel,pixel);
|
||||
LCDpixmap2[p]=LCDpixmap[p];
|
||||
dirty=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (dirty) XSync(dp,False);
|
||||
release_lock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* this one should only be called from the updater-thread
|
||||
* no user serviceable parts inside
|
||||
*/
|
||||
|
||||
static void update(int x,int y,int width,int height)
|
||||
{
|
||||
/*
|
||||
* theory of operation:
|
||||
* instead of the old, fully-featured but complicated update
|
||||
* region calculation, we do an update of the whole display,
|
||||
* but check before every pixel if the pixel region is inside
|
||||
* the update region.
|
||||
*/
|
||||
|
||||
int x0, y0;
|
||||
int x1, y1;
|
||||
int row, col;
|
||||
int dirty;
|
||||
|
||||
x0=x-pixel;
|
||||
y0=y-pixel;
|
||||
x1=x+pixel+width;
|
||||
y1=y+pixel+height;
|
||||
|
||||
dirty=0;
|
||||
for(row=0; row<DROWS; row++) {
|
||||
int y = border + (row/YRES)*rgap + row*(pixel+pgap);
|
||||
if (y<y0 || y>y1) continue;
|
||||
for(col=0; col<DCOLS; col++) {
|
||||
int x = border + (col/XRES)*cgap + col*(pixel+pgap);
|
||||
int p;
|
||||
if (x<x0 || x>x1) continue;
|
||||
p=row*DCOLS*XRES+col;
|
||||
XFillRectangle(dp,w,LCDpixmap2[p]?fg_gc:hg_gc,x,y,pixel,pixel);
|
||||
dirty=1;
|
||||
}
|
||||
}
|
||||
if (dirty) XSync(dp,False);
|
||||
}
|
||||
|
||||
|
||||
static int async_update()
|
||||
{
|
||||
XSetWindowAttributes wa;
|
||||
XEvent ev;
|
||||
|
||||
if ((dp=XOpenDisplay(NULL))==NULL)
|
||||
return -1;
|
||||
wa.event_mask=ExposureMask;
|
||||
XChangeWindowAttributes(dp,w,CWEventMask,&wa);
|
||||
for(;;) {
|
||||
XWindowEvent(dp,w,ExposureMask,&ev);
|
||||
if (ev.type==Expose) {
|
||||
acquire_lock();
|
||||
update(ev.xexpose.x,ev.xexpose.y,
|
||||
ev.xexpose.width,ev.xexpose.height);
|
||||
release_lock();
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// ****************************************
|
||||
// *** plugins ***
|
||||
// ****************************************
|
||||
|
||||
// none at the moment...
|
||||
|
||||
|
||||
// ****************************************
|
||||
// *** widget callbacks ***
|
||||
// ****************************************
|
||||
|
||||
|
||||
// using drv_generic_graphic_draw(W)
|
||||
// using drv_generic_graphic_icon_draw(W)
|
||||
// using drv_generic_graphic_bar_draw(W)
|
||||
|
||||
|
||||
// ****************************************
|
||||
// *** exported functions ***
|
||||
// ****************************************
|
||||
|
||||
|
||||
// list models
|
||||
int drv_X11_list (void)
|
||||
{
|
||||
printf ("any");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// initialize driver & display
|
||||
int drv_X11_init (char *section)
|
||||
{
|
||||
WIDGET_CLASS wc;
|
||||
int ret;
|
||||
|
||||
// real worker functions
|
||||
drv_generic_graphic_real_blit = drv_X11_blit;
|
||||
|
||||
// start display
|
||||
if ((ret=drv_X11_start (section))!=0)
|
||||
return ret;
|
||||
|
||||
// initialize generic graphic driver
|
||||
if ((ret=drv_generic_graphic_init(section, Name))!=0)
|
||||
return ret;
|
||||
|
||||
// initially expose window
|
||||
drv_X11_expose (0, 0, dimx+2*border, dimy+2*border);
|
||||
|
||||
// register text widget
|
||||
wc=Widget_Text;
|
||||
wc.draw=drv_generic_graphic_draw;
|
||||
widget_register(&wc);
|
||||
|
||||
// register icon widget
|
||||
wc=Widget_Icon;
|
||||
wc.draw=drv_generic_graphic_icon_draw;
|
||||
widget_register(&wc);
|
||||
|
||||
// register bar widget
|
||||
wc=Widget_Bar;
|
||||
wc.draw=drv_generic_graphic_bar_draw;
|
||||
widget_register(&wc);
|
||||
|
||||
// register plugins
|
||||
// none at the moment...
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// close driver & display
|
||||
int drv_X11_quit (void) {
|
||||
|
||||
info("%s: shutting down.", Name);
|
||||
drv_generic_graphic_quit();
|
||||
|
||||
if (drv_X11_FB) {
|
||||
free (drv_X11_FB);
|
||||
drv_X11_FB=NULL;
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
DRIVER drv_X11 = {
|
||||
name: Name,
|
||||
list: drv_X11_list,
|
||||
init: drv_X11_init,
|
||||
quit: drv_X11_quit,
|
||||
};
|
||||
|
||||
|
||||
+4
-15
@@ -23,6 +23,10 @@
|
||||
*
|
||||
*
|
||||
* $Log: drv_generic_graphic.c,v $
|
||||
* Revision 1.4 2004/02/24 05:55:04 reinelt
|
||||
*
|
||||
* X11 driver ported
|
||||
*
|
||||
* Revision 1.3 2004/02/22 17:35:41 reinelt
|
||||
* some fixes for generic graphic driver and T6963
|
||||
* removed ^M from plugin_imon (Nico, are you editing under Windows?)
|
||||
@@ -272,24 +276,9 @@ int drv_generic_graphic_bar_draw (WIDGET *W)
|
||||
|
||||
int drv_generic_graphic_init (char *section, char *driver)
|
||||
{
|
||||
char *font;
|
||||
|
||||
Section=section;
|
||||
Driver=driver;
|
||||
|
||||
font=cfg_get(section, "Font", "6x8");
|
||||
if (font==NULL || *font=='\0') {
|
||||
error ("%s: no '%s.Font' entry from %s", Driver, section, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
XRES = -1;
|
||||
YRES = -1;
|
||||
if (sscanf(font, "%dx%d", &XRES, &YRES)!=2 || XRES<1 || YRES<1) {
|
||||
error ("%s: bad Font '%s' from %s", Driver, font, cfg_source());
|
||||
return -1;
|
||||
}
|
||||
|
||||
// init layout framebuffer
|
||||
LROWS = 0;
|
||||
LCOLS = 0;
|
||||
|
||||
+22
-9
@@ -82,6 +82,18 @@ Display T6963-240x64 {
|
||||
}
|
||||
|
||||
|
||||
Display XWindow {
|
||||
Driver 'X11'
|
||||
Size '120x32'
|
||||
Font '6x8'
|
||||
Pixel '4+1'
|
||||
Gap '-1x-1'
|
||||
Border 20
|
||||
Foreground '#000000'
|
||||
Background '#80d000'
|
||||
Halfground '#70c000'
|
||||
}
|
||||
|
||||
Widget OS {
|
||||
class 'Text'
|
||||
expression '*** '.uname('sysname').' '.uname('release').' ***'
|
||||
@@ -334,14 +346,14 @@ Layout Default {
|
||||
Col1 'Load'
|
||||
Col11 'LoadBar'
|
||||
}
|
||||
Row5 {
|
||||
Col1 'Disk'
|
||||
Col11 'DiskBar'
|
||||
}
|
||||
Row6 {
|
||||
Col1 'Eth0'
|
||||
Col11 'Eth0Bar'
|
||||
}
|
||||
# Row5 {
|
||||
# Col1 'Disk'
|
||||
# Col11 'DiskBar'
|
||||
# }
|
||||
# Row6 {
|
||||
# Col1 'Eth0'
|
||||
# Col11 'Eth0Bar'
|
||||
# }
|
||||
}
|
||||
|
||||
Layout L24x8 {
|
||||
@@ -395,7 +407,8 @@ Layout Test {
|
||||
#Display 'CF632'
|
||||
#Display 'CF633'
|
||||
#Display 'USBLCD'
|
||||
Display 'T6963-240x64'
|
||||
#Display 'T6963-240x64'
|
||||
Display 'XWindow'
|
||||
|
||||
Layout 'Default'
|
||||
#Layout 'L16x2'
|
||||
|
||||
Reference in New Issue
Block a user