diff options
Diffstat (limited to 'driver/xf86-input-citron')
| -rw-r--r-- | driver/xf86-input-citron/ChangeLog | 317 | ||||
| -rw-r--r-- | driver/xf86-input-citron/Makefile.am | 10 | ||||
| -rw-r--r-- | driver/xf86-input-citron/man/citron.man | 3 | ||||
| -rw-r--r-- | driver/xf86-input-citron/src/citron.c | 12 | ||||
| -rw-r--r-- | driver/xf86-input-citron/src/citron.h | 2 |
5 files changed, 294 insertions, 50 deletions
diff --git a/driver/xf86-input-citron/ChangeLog b/driver/xf86-input-citron/ChangeLog index 62fa05825..951d5e0c0 100644 --- a/driver/xf86-input-citron/ChangeLog +++ b/driver/xf86-input-citron/ChangeLog @@ -1,61 +1,298 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 9a4d7854273a34c1a32f46fb52f2f8c3a227cd12 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:09:45 2007 +0200 - * configure.ac: - * src/citron.c: - Unlibcwrap. Bump server version requirement. Bump to 2.2.0. + Generate ChangeLog from git. -2006-03-01 Peter Kunzmann <kunzmann@citron.de> +commit f2cd377905ba74d6c13ab9e4f4491146e90a7e0d +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:03:33 2007 +0200 - * man/citron.man: - Change most -'s to \-. - Update list of supported devices. + Added some more patterns to .gitignore. - * src/citron.c: - * src/citron.h: - Call the PostButton event when breaking beams. - Added channels for ambient overload, keys and pwmex channels. - Beep on keyclicks. - Bug #6065: Add NULL to default_options[] to prevent crash. +commit 83adcd21fade2746b9a1b8e3ca3cc097db440919 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:02:23 2007 +0200 - * configure.ac: - Bump to version 2.15. + Bumped version to 2.2.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a7295991a74b725a27efb1ed07ba4e396374b288 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Sep 7 10:14:14 2007 -0700 - * configure.ac: - Update package version for X11R7 release. + Move from TSCalibrationCtl to AbsCalibCtl - requires inputproto >= 1.4.1 + + Based on xf86-input-dmc commit 43a05fb4cb02f15fc91d0909a3cab37a9de6b622 by + Daniel Stone. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 75aca9fa1429ca9e2aa696c32cb77ca12d8c7856 +Author: Brice Goglin <bgoglin@debian.org> +Date: Tue Aug 7 09:50:40 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Define CITOUCH_VERSION* using PACKAGE_VERSION* -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 53a748872a1468845b99e7d9b90f2fcebf45c2b7 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Mar 1 10:33:07 2007 -0800 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + renamed: .cvsignore -> .gitignore -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit af0c6207afdcacc75c37e51f9f6fc4da1e3f5f57 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Mar 1 10:32:45 2007 -0800 - * configure.ac: - Update package version number for X11R7 RC3 release. + Replace references to XFree86/XF86Config in man page -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cacf63ad6432dd0a50df657b115cc17a22380a23 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 16:56:48 2006 +0000 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Unlibcwrap. Bump server version requirement. Bump to 2.2.0. -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit 82d53242c29bd3413cd3f167346d1d9f49a4dc13 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Mar 1 22:18:57 2006 +0000 - * configure.ac: - Only build dlloader modules by default. + keysym.h -> X11/keysym.h (minor compile fix). -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6b4742d17bcda83c7e23c828e49c04df42e411e2 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Mar 1 22:03:04 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Changes from Peter Kunzmann at Citron: + Change most -'s to \-. Update list of supported devices. + Call the PostButton event when breaking beams. Added channels for ambient + overload, keys and pwmex channels. Beep on keyclicks. Bug #6065: Add + NULL to default_options[] to prevent crash. + Bump to version 2.15. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8d5332b1d382c450112b4cf1b6813529b429d203 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Update package version for X11R7 release. + +commit 7492636f9514e3406a703ad62c09e8a597d47f7f +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:49 2005 +0000 + + Stub COPYING files + +commit 188e6952d3be04d4dad2ea3d1a40377a66b610be +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Dec 19 09:07:49 2005 +0000 + + Typo fixes, mailing list & url updates, and other changes to prepare for + X11R6.9 & 7.0 releases. + +commit fbe2b454ef4186dc98a5e31c27579322a74329ac +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:13 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 5d7ed446c18b8608926e693007d87e166d307d5c +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:28 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 1fe9eb74abe1260cc0948a820331423350759d62 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:29 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit ac581e01df3d241b2526e296ef28f80ee1526223 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 3be71ecdecf59548a8d247de0ce6ef758d83bff8 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:54 2005 +0000 + + Only build dlloader modules by default. + +commit a1a81ce3573d76399b0a1f87e2d944629630830e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:05 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 113f94d5740821fbfb9a307e0b807c9477acc7d1 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:01 2005 +0000 + + Add .cvsignores for drivers. + +commit 96066a398c9702db311f5397ca2674b2e5682cfe +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:11 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 58d71f3507c903488665fa5f9718580630b71a07 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:49 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 8adc791cd360dec3bbc328a2c76ffa8358d5c0cd +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Fri Oct 21 17:24:34 2005 +0000 + + Sun bug #6202893: nroff: if-else overflow.; line 93, file citron.7 + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6202893> + (Sam Lau - Sun Microsystems) + +commit 390e528ddf888a25423b3f404228b4c2ed5cb3ec +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:47:59 2005 +0000 + + Update package version number for RC1 release. + +commit 50b6052617081b32ba54b9b56a142578b992b1ac +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit db124786d0587f6cbf932caca3d96287de9cae48 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:26 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 3f576c1ba0d041587d9dd84e50e3f19cb8f4fba8 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:54 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f0f77ad905c8b26584b6a7c7267d2d2afaad17f5 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:37 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 678c95d225917c68e32a6d6614aaf6b316443322 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit f706dac42faa46f369523a9130f3bc1d83686795 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 6ef16cf6992a500ad7214dd9147479aa77a19454 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:21 2005 +0000 + + Make the module dir configurable + +commit 5ae736718a172d3a9d464d5190ba607a1de4b8da +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:58 2005 +0000 + + Update all input drivers to pass distcheck + +commit f910c47f757944b0c5904f245f943301eb716a7c +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 589438d80cdf6de5e91bd93b5e1499c8f89ed4e1 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:58 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 3b95f5ab9aca05a13d1062ab42d5771b9b088fd1 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sun Jul 3 08:53:44 2005 +0000 + + Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". + +commit c75acfc7e0a7294839fe0e7960f1769e80d139b3 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Fri Jul 1 22:43:22 2005 +0000 + + Change all misc.h and os.h references to <X11/foo.h>. + +commit 2ed45230d3c2f00356ad9dc20bcc368c32ed1738 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:00 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 4eb604aee09c4009c26011de4f79f471795f4983 +Author: Adam Jackson <ajax@nwnk.net> +Date: Wed Sep 22 04:38:03 2004 +0000 + + Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones. + +commit 4b285dc4884e3717678f15467b4af30ed81bc0a6 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 517ff4d31ac900a782a205771872a556bdc882a6 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 6783ec2448a12a502fe3ff44c49fe3071eadabc3 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:30 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ba766c19ecfde3af4c97ef3a827180bf797023df +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 4c67b5403cdecdb4f515643c64f43877ce12f940 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:23:34 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit be23cfeae88e85ac20934ee5a46bee9282b413a9 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:47 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 65fb6299c299cc85cec45105910f0952a339bc8d +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 913a596e57ca476d7cb721ba3b471a6a5b593781 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff --git a/driver/xf86-input-citron/Makefile.am b/driver/xf86-input-citron/Makefile.am index 7052905f3..891219898 100644 --- a/driver/xf86-input-citron/Makefile.am +++ b/driver/xf86-input-citron/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2005 Adam Jackson. +# $Id: Makefile.am,v 1.2 2008/08/23 13:05:44 matthieu Exp $ # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -20,3 +20,11 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) diff --git a/driver/xf86-input-citron/man/citron.man b/driver/xf86-input-citron/man/citron.man index 437ce99f7..c8a00fc73 100644 --- a/driver/xf86-input-citron/man/citron.man +++ b/driver/xf86-input-citron/man/citron.man @@ -1,5 +1,4 @@ .\" Copyright (c) 2000-2003 Peter Kunzmann <support@citron.de> -.\" $Id: citron.man,v 1.1 2006/11/26 19:48:56 matthieu Exp $ .\" .\" $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ .\" $XdotOrg: driver/xf86-input-citron/man/citron.man,v 1.5 2006/03/01 22:03:04 daniels Exp $ @@ -903,6 +902,6 @@ is the duration in [ms]. "60" .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__). .SH "AUTHORS" 2000\-2005 \- written by Citron GmbH (support@citron.de) diff --git a/driver/xf86-input-citron/src/citron.c b/driver/xf86-input-citron/src/citron.c index f9b3ce6b0..773cd8072 100644 --- a/driver/xf86-input-citron/src/citron.c +++ b/driver/xf86-input-citron/src/citron.c @@ -1,4 +1,4 @@ -/* $Id: citron.c,v 1.1 2006/11/26 19:48:58 matthieu Exp $ +/* $Id: citron.c,v 1.2 2008/08/23 13:05:44 matthieu Exp $ * Copyright (c) 1998 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a @@ -138,12 +138,12 @@ #define INITT 0 /* Initialisation of touch in first loop */ -#define CITOUCH_VERSION 0x220 char version[]="Touch Driver V2.2.0 (c) 1999-2006 Citron GmbH"; -#define CITOUCH_VERSION_MAJOR ((CITOUCH_VERSION >> 8) & 0xf) -#define CITOUCH_VERSION_MINOR ((CITOUCH_VERSION >> 4) & 0xf) -#define CITOUCH_VERSION_PATCH ((CITOUCH_VERSION >> 0) & 0xf) +#define CITOUCH_VERSION PACKAGE_VERSION +#define CITOUCH_VERSION_MAJOR PACKAGE_VERSION_MAJOR +#define CITOUCH_VERSION_MINOR PACKAGE_VERSION_MINOR +#define CITOUCH_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL /***************************************************************************** @@ -2020,7 +2020,7 @@ static void cit_ProcessPacket(cit_PrivatePtr priv) static int ControlProc (LocalDevicePtr local, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; cit_PrivatePtr priv = (cit_PrivatePtr) (local->private); DBG(5, ErrorF("%sControlProc called\n", CI_INFO)); diff --git a/driver/xf86-input-citron/src/citron.h b/driver/xf86-input-citron/src/citron.h index 788d78536..3b2b8b865 100644 --- a/driver/xf86-input-citron/src/citron.h +++ b/driver/xf86-input-citron/src/citron.h @@ -1,4 +1,4 @@ -/* $Id: citron.h,v 1.1 2006/11/26 19:48:56 matthieu Exp $ +/* $Id: citron.h,v 1.2 2008/08/23 13:05:44 matthieu Exp $ * Copyright (c) 1998 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a |