From 02c50cc95ba8ef99b87184cf9032af8e7e41bdd2 Mon Sep 17 00:00:00 2001
From: herp <>
Date: Tue, 2 May 2000 23:07:48 +0000
Subject: [lcd4linux @ 2000-05-02 23:07:48 by herp] Crystalfontz initial coding
---
Makefile.am | 2 ++
Makefile.in | 19 ++++++++++---------
XWindow.c | 11 ++++++-----
display.c | 7 ++++++-
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8a536bb..46191f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,7 @@ Skeleton.c \
MatrixOrbital.c \
BeckmannEgle.c \
HD44780.c \
+Crystalfontz.c Crystalfontz.h \
PalmPilot.c \
Raster.c \
XWindow.c
@@ -44,6 +45,7 @@ TODO \
README.Drivers \
README.MatrixOrbital \
README.HD44780 \
+README.Crystalfontz \
README.X11 \
README.KDE \
README.Raster
diff --git a/Makefile.in b/Makefile.in
index 02f07af..25a80e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,10 +73,10 @@ AM_CFLAGS = $(X_CFLAGS) -Wall
lcd4linux_LDFLAGS = $(X_LIBS)
@WITH_X_TRUE@lcd4linux_LDADD = -lX11
-lcd4linux_SOURCES = lcd4linux.c debug.h cfg.c cfg.h lock.c lock.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h fontmap.c fontmap.h Skeleton.c MatrixOrbital.c BeckmannEgle.c HD44780.c PalmPilot.c Raster.c XWindow.c
+lcd4linux_SOURCES = lcd4linux.c debug.h cfg.c cfg.h lock.c lock.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h fontmap.c fontmap.h Skeleton.c MatrixOrbital.c BeckmannEgle.c HD44780.c Crystalfontz.c Crystalfontz.h PalmPilot.c Raster.c XWindow.c
-EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm FAQ TODO README.Drivers README.MatrixOrbital README.HD44780 README.X11 README.KDE README.Raster
+EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm FAQ TODO README.Drivers README.MatrixOrbital README.HD44780 README.Crystalfontz README.X11 README.KDE README.Raster
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -94,8 +94,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
lcd4linux_OBJECTS = lcd4linux.o cfg.o lock.o parser.o processor.o \
system.o isdn.o filter.o udelay.o display.o pixmap.o fontmap.o \
-Skeleton.o MatrixOrbital.o BeckmannEgle.o HD44780.o PalmPilot.o \
-Raster.o XWindow.o
+Skeleton.o MatrixOrbital.o BeckmannEgle.o HD44780.o Crystalfontz.o \
+PalmPilot.o Raster.o XWindow.o
@WITH_X_TRUE@lcd4linux_DEPENDENCIES =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -109,11 +109,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
-DEP_FILES = .deps/BeckmannEgle.P .deps/HD44780.P .deps/MatrixOrbital.P \
-.deps/PalmPilot.P .deps/Raster.P .deps/Skeleton.P .deps/XWindow.P \
-.deps/cfg.P .deps/display.P .deps/filter.P .deps/fontmap.P .deps/isdn.P \
-.deps/lcd4linux.P .deps/lock.P .deps/parser.P .deps/pixmap.P \
-.deps/processor.P .deps/system.P .deps/udelay.P
+DEP_FILES = .deps/BeckmannEgle.P .deps/Crystalfontz.P .deps/HD44780.P \
+.deps/MatrixOrbital.P .deps/PalmPilot.P .deps/Raster.P .deps/Skeleton.P \
+.deps/XWindow.P .deps/cfg.P .deps/display.P .deps/filter.P \
+.deps/fontmap.P .deps/isdn.P .deps/lcd4linux.P .deps/lock.P \
+.deps/parser.P .deps/pixmap.P .deps/processor.P .deps/system.P \
+.deps/udelay.P
SOURCES = $(lcd4linux_SOURCES)
OBJECTS = $(lcd4linux_OBJECTS)
diff --git a/XWindow.c b/XWindow.c
index 3be439f..124dac2 100644
--- a/XWindow.c
+++ b/XWindow.c
@@ -1,4 +1,4 @@
-/* $Id: XWindow.c,v 1.17 2000/04/05 05:58:36 reinelt Exp $
+/* $Id: XWindow.c,v 1.18 2000/05/02 23:07:48 herp Exp $
*
* X11 Driver for LCD4Linux
*
@@ -20,6 +20,9 @@
*
*
* $Log: XWindow.c,v $
+ * 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
@@ -449,10 +452,8 @@ int dx,wx,wy;
/*lower right corner*/
x+=width-1;
y+=height-1;
- xto=xres*(x/boxw)+(x%boxw)/(pixel+pgap)
- -((x%boxw>xres*pixel+(xres-1)*pgap)?1:0);
- yto=yres*(y/boxh)+(y%boxh)/(pixel+pgap)
- -((y%boxh>yres*pixel+(yres-1)*pgap)?1:0);
+ xto=xres*(x/boxw)+(x%boxw)/(pixel+pgap);
+ yto=yres*(y/boxh)+(y%boxh)/(pixel+pgap);
pos=yfrom*xres*cols+xfrom;
wy=border+yfrom*(pixel+pgap)+(yfrom/yres)*(rgap-pgap);
diff --git a/display.c b/display.c
index 92f5943..1925d00 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.17 2000/05/02 06:05:00 reinelt Exp $
+/* $Id: display.c,v 1.18 2000/05/02 23:07:48 herp Exp $
*
* framework for device drivers
*
@@ -20,6 +20,9 @@
*
*
* $Log: display.c,v $
+ * Revision 1.18 2000/05/02 23:07:48 herp
+ * Crystalfontz initial coding
+ *
* Revision 1.17 2000/05/02 06:05:00 reinelt
*
* driver for 3Com Palm Pilot added
@@ -133,6 +136,7 @@ extern LCD Skeleton[];
extern LCD MatrixOrbital[];
extern LCD BeckmannEgle[];
extern LCD HD44780[];
+extern LCD Crystalfontz[];
extern LCD PalmPilot[];
extern LCD Raster[];
extern LCD XWindow[];
@@ -142,6 +146,7 @@ FAMILY Driver[] = {
{ "Matrix Orbital", MatrixOrbital },
{ "Beckmann+Egle", BeckmannEgle },
{ "HD 44780 based", HD44780 },
+ { "Crystalfontz", Crystalfontz },
{ "3Com Palm Pilot", PalmPilot },
{ "Raster", Raster },
#ifndef X_DISPLAY_MISSING
--
cgit v1.2.3