xserver-xorg-input-evtouch: Changes to 'debian-unstable'
69-touchscreen.rules | 14
ChangeLog | 7
Makefile.am | 2
Makefile.in | 165 +--
aclocal.m4 | 187 +--
calibrate.sh | 8
configure | 1559 +++++++++++++++++++++++----------
configure.ac | 7
debian/patches/01-randr-rotation.patch | 52 -
debian/patches/series | 1
ev_calibrate.c | 9
evtouch.c | 255 ++---
evtouch.h | 13
libtouch.c | 3
14 files changed, 1438 insertions(+), 844 deletions(-)
New commits:
commit 68a77dcf187616e87ca90d144b2d721a3f13dec0
Author: Mattia Dongili <malattia@linux.it>
Date: Mon Apr 30 17:51:26 2007 +0900
Remove Randr rotation patch applied upstream.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/01-randr-rotation.patch b/debian/patches/01-randr-rotation.patch
deleted file mode 100644
index 5ec0034..0000000
--- a/debian/patches/01-randr-rotation.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur xf86-input-evtouch-0.8.3/evtouch.c xf86-input-evtouch-0.8.3.dirty/evtouch.c
---- xf86-input-evtouch-0.8.3/evtouch.c 2007-02-15 18:52:07.000000000 +0100
-+++ xf86-input-evtouch-0.8.3.dirty/evtouch.c 2007-02-19 17:25:30.033293860 +0100
-@@ -41,6 +41,7 @@
- #include <xf86_OSproc.h>
- #include <xf86Xinput.h>
- #include <xisb.h>
-+#include <randrstr.h>
- #include <exevents.h>
- #include <string.h>
-
-@@ -821,6 +822,8 @@
- #endif
-
- EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
-+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num];
-+ Rotation r = RRGetRotation(pScrn->pScreen);
-
- DBGOUT(2, "FIRST: v0=%d v1=%d\n", v0, v1);
-
-@@ -965,10 +968,28 @@
- } else if (priv->rotate == EV_ROTATE_CCW) {
- v0 = screen_height - yc;
- v1 = xc;
-- } else {
-- v0 = xc;
-- v1 = yc;
- }
-+
-+ switch (r) {
-+ case RR_Rotate_0:
-+ v0 = xc;
-+ v1 = yc;
-+ break;
-+ case RR_Rotate_180:
-+ v0 = screen_width - xc;
-+ v1 = screen_height - yc;
-+ break;
-+ case RR_Rotate_90:
-+ v0 = screen_height - yc;
-+ v1 = xc;
-+ break;
-+ case RR_Rotate_270:
-+ v0 = yc;
-+ v1 = screen_width - xc;
-+ break;
-+ default:
-+ break;
-+ }
- }
-
- DBGOUT(2, "FINAL: v0=%d v1=%d\n", v0, v1);
diff --git a/debian/patches/series b/debian/patches/series
index e9553a3..d05f7ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-randr-rotation.patch
02-buttonless-device.patch
commit fc60dcabd627b9df2b13ba8eb7d81d702d330890
Author: Mattia Dongili <malattia@linux.it>
Date: Mon Apr 30 17:35:45 2007 +0900
Import upstream sources (version 0.8.4)
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/69-touchscreen.rules b/69-touchscreen.rules
new file mode 100644
index 0000000..e0ebec4
--- /dev/null
+++ b/69-touchscreen.rules
@@ -0,0 +1,14 @@
+# Evtouch udev.rules
+#
+# Because Evtouch can't autoprobe devices we assume that we only
+# Have one device so we can make it like this :P
+#
+# List here your touchscreen, check if it works and send it to rpms_AT_ilmi_DOT_fi
+# Name can be found in /proc/bus/input/devices (In console make command 'cat /proc/bus/input/devices')
+#
+# Tested on Telepeak Model 800-Y-Y-V (http://www.telepeak.com). Should work on most eGalax based stuff!
+KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="eGalax Inc. USB TouchController", SYMLINK+="input/evtouch_event"
+#
+# This could be also like this (eGalax Inc. USB TouchController)
+# KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="0eef", ATTRS{idProduct}=="0001", SYMLINK+="input/evtouch_event"
+#
diff --git a/ChangeLog b/ChangeLog
index da19c47..ab9b7af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+0.8.4
+ - Added XRandr-support (Mattia Dongili)
+ - Fixed Error in calibrate.sh
+ - Minor Compile-Warning fixes (Tuukka Pasanen)
+ - Make CURSORDIR work again (Tuukka Pasanen)
+ - added udev-rules for touchscreen device detection (Tuuka Pasanen + me)
+
0.8.3:
- removed useless trigger_sm
- fixed Middle-Button-Handling again
diff --git a/Makefile.am b/Makefile.am
index b92b3c2..4555c94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,31 +19,22 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
EXTRA_DIST = ev_calibrate.c ev_calibrate.h evtouch.h calibrate.sh make_distrib.sh \
-README.calibration empty_cursor.xbm
+README.calibration empty_cursor.xbm 69-touchscreen.rules
noinst_HEADERS = libtouch.h evtouch.h ev_calibrate.h
if ENABLE_EVCAL
-bin_PROGRAMS = ev_calibrate
+pkglib_PROGRAMS = ev_calibrate
+pkglib_SCRIPTS = calibrate.sh
+pkgdata_DATA = empty_cursor.xbm
ev_calibrate_SOURCES = ev_calibrate.c
ev_calibrate_LDFLAGS = @EVCALIBRATE_LIBS@ @EVCALIBRATE_LDFLAGS@
-ev_calibrate_CFLAGS = @EVCALIBRATE_CFLAGS@
-
-install-data-hook:
- $(INSTALL) -m 755 -d $(DESTDIR)/@CURSORDIR@
- $(INSTALL_DATA) empty_cursor.xbm $(DESTDIR)/@CURSORDIR@/empty_cursor.xbm
- $(INSTALL_DATA) calibrate.sh $(DESTDIR)/@CURSORDIR@/calibrate.sh
-
-uninstall-hook:
- rm -f $(DESTDIR)/@CURSORDIR@/empty_cursor.xbm
- rm -f $(DESTDIR)/@CURSORDIR@/calibrate.sh
- rm -rf $(DESTDIR)/@CURSORDIR@
-
+ev_calibrate_CFLAGS = @EVCALIBRATE_CFLAGS@ -DCURSORDIR=\"$(pkgdatadir)\"
endif
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_CFLAGS = -DXINPUT -DDEBUG=y
+@DRIVER_NAME@_drv_la_CFLAGS = -DXINPUT -DDEBUG=y @EVTOUCH_CFLAGS@
@DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c libtouch.c
diff --git a/Makefile.in b/Makefile.in
index f4c585b..bd20a6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,6 +36,8 @@
+
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -58,7 +60,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@ENABLE_EVCAL_TRUE@bin_PROGRAMS = ev_calibrate$(EXEEXT)
+@ENABLE_EVCAL_TRUE@pkglib_PROGRAMS = ev_calibrate$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
@@ -81,7 +83,8 @@ am__vpath_adj = case $$p in \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" \
- "$(DESTDIR)$(bindir)"
+ "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkglibdir)" \
+ "$(DESTDIR)$(pkgdatadir)"
@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES)
@DRIVER_NAME@_drv_la_LIBADD =
@@ -89,13 +92,15 @@ am_@DRIVER_NAME@_drv_la_OBJECTS = \
@DRIVER_NAME@_drv_la-@DRIVER_NAME@.lo \
@DRIVER_NAME@_drv_la-libtouch.lo
@DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(pkglib_PROGRAMS)
am__ev_calibrate_SOURCES_DIST = ev_calibrate.c
@ENABLE_EVCAL_TRUE@am_ev_calibrate_OBJECTS = \
@ENABLE_EVCAL_TRUE@ ev_calibrate-ev_calibrate.$(OBJEXT)
ev_calibrate_OBJECTS = $(am_ev_calibrate_OBJECTS)
ev_calibrate_LDADD = $(LDADD)
+pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(pkglib_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -110,6 +115,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
SOURCES = $(@DRIVER_NAME@_drv_la_SOURCES) $(ev_calibrate_SOURCES)
DIST_SOURCES = $(@DRIVER_NAME@_drv_la_SOURCES) \
$(am__ev_calibrate_SOURCES_DIST)
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgdata_DATA)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -157,6 +164,7 @@ ENABLE_EVCAL_TRUE = @ENABLE_EVCAL_TRUE@
EVCALIBRATE_CFLAGS = @EVCALIBRATE_CFLAGS@
EVCALIBRATE_LDFLAGS = @EVCALIBRATE_LDFLAGS@
EVCALIBRATE_LIBS = @EVCALIBRATE_LIBS@
+EVTOUCH_CFLAGS = @EVTOUCH_CFLAGS@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -240,15 +248,17 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = ev_calibrate.c ev_calibrate.h evtouch.h calibrate.sh make_distrib.sh \
-README.calibration empty_cursor.xbm
+README.calibration empty_cursor.xbm 69-touchscreen.rules
noinst_HEADERS = libtouch.h evtouch.h ev_calibrate.h
+@ENABLE_EVCAL_TRUE@pkglib_SCRIPTS = calibrate.sh
+@ENABLE_EVCAL_TRUE@pkgdata_DATA = empty_cursor.xbm
@ENABLE_EVCAL_TRUE@ev_calibrate_SOURCES = ev_calibrate.c
@ENABLE_EVCAL_TRUE@ev_calibrate_LDFLAGS = @EVCALIBRATE_LIBS@ @EVCALIBRATE_LDFLAGS@
-@ENABLE_EVCAL_TRUE@ev_calibrate_CFLAGS = @EVCALIBRATE_CFLAGS@
+@ENABLE_EVCAL_TRUE@ev_calibrate_CFLAGS = @EVCALIBRATE_CFLAGS@ -DCURSORDIR=\"$(pkgdatadir)\"
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_CFLAGS = -DXINPUT -DDEBUG=y
+@DRIVER_NAME@_drv_la_CFLAGS = -DXINPUT -DDEBUG=y @EVTOUCH_CFLAGS@
@DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c libtouch.c
all: config.h
@@ -335,30 +345,30 @@ clean-@DRIVER_NAME@_drv_laLTLIBRARIES:
done
@DRIVER_NAME@_drv.la: $(@DRIVER_NAME@_drv_la_OBJECTS) $(@DRIVER_NAME@_drv_la_DEPENDENCIES)
$(LINK) -rpath $(@DRIVER_NAME@_drv_ladir) $(@DRIVER_NAME@_drv_la_LDFLAGS) $(@DRIVER_NAME@_drv_la_OBJECTS) $(@DRIVER_NAME@_drv_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \
else :; fi; \
done
-uninstall-binPROGRAMS:
+uninstall-pkglibPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ @list='$(pkglib_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
done
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+clean-pkglibPROGRAMS:
+ @list='$(pkglib_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
@@ -366,6 +376,25 @@ clean-binPROGRAMS:
ev_calibrate$(EXEEXT): $(ev_calibrate_OBJECTS) $(ev_calibrate_DEPENDENCIES)
@rm -f ev_calibrate$(EXEEXT)
$(LINK) $(ev_calibrate_LDFLAGS) $(ev_calibrate_OBJECTS) $(ev_calibrate_LDADD) $(LIBS)
+install-pkglibSCRIPTS: $(pkglib_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(pkglibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(pkglibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pkglibSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkglib_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+ done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -435,6 +464,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-pkgdataDATA: $(pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+ $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
+
+uninstall-pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgdata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -612,9 +658,10 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+ $(HEADERS) config.h
installdirs:
- for dir in "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkgdatadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -641,12 +688,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_EVCAL_FALSE@install-data-hook:
-@ENABLE_EVCAL_FALSE@uninstall-hook:
clean: clean-am
-clean-am: clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-binPROGRAMS \
- clean-generic clean-libtool mostlyclean-am
+clean-am: clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-generic \
+ clean-libtool clean-pkglibPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -665,11 +710,10 @@ info: info-am
info-am:
-install-data-am: install-@DRIVER_NAME@_drv_laLTLIBRARIES
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am: install-@DRIVER_NAME@_drv_laLTLIBRARIES \
+ install-pkgdataDATA
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-pkglibPROGRAMS install-pkglibSCRIPTS
install-info: install-info-am
@@ -698,38 +742,27 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES \
- uninstall-binPROGRAMS uninstall-info-am
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+ uninstall-info-am uninstall-pkgdataDATA \
+ uninstall-pkglibPROGRAMS uninstall-pkglibSCRIPTS
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-binPROGRAMS \
- clean-generic clean-libtool ctags dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ clean-@DRIVER_NAME@_drv_laLTLIBRARIES clean-generic \
+ clean-libtool clean-pkglibPROGRAMS ctags dist dist-all \
+ dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-@DRIVER_NAME@_drv_laLTLIBRARIES install-am \
- install-binPROGRAMS install-data install-data-am \
- install-data-hook install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-pkgdataDATA \
+ install-pkglibPROGRAMS install-pkglibSCRIPTS install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES \
- uninstall-am uninstall-binPROGRAMS uninstall-hook \
- uninstall-info-am
-
-
-@ENABLE_EVCAL_TRUE@install-data-hook:
-@ENABLE_EVCAL_TRUE@ $(INSTALL) -m 755 -d $(DESTDIR)/@CURSORDIR@
-@ENABLE_EVCAL_TRUE@ $(INSTALL_DATA) empty_cursor.xbm $(DESTDIR)/@CURSORDIR@/empty_cursor.xbm
-@ENABLE_EVCAL_TRUE@ $(INSTALL_DATA) calibrate.sh $(DESTDIR)/@CURSORDIR@/calibrate.sh
+ uninstall-am uninstall-info-am uninstall-pkgdataDATA \
+ uninstall-pkglibPROGRAMS uninstall-pkglibSCRIPTS
-@ENABLE_EVCAL_TRUE@uninstall-hook:
-@ENABLE_EVCAL_TRUE@ rm -f $(DESTDIR)/@CURSORDIR@/empty_cursor.xbm
-@ENABLE_EVCAL_TRUE@ rm -f $(DESTDIR)/@CURSORDIR@/calibrate.sh
-@ENABLE_EVCAL_TRUE@ rm -rf $(DESTDIR)/@CURSORDIR@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/calibrate.sh b/calibrate.sh
index be2c1df..9eba97d 100755
--- a/calibrate.sh
+++ b/calibrate.sh
@@ -1,15 +1,15 @@
#!/bin/bash
XINIT=`which xinit`
XSERVER=`which X`
-EVCALIBRATE="./ev_calibrate"
-[ -n "$EVCALIBRATE" ] || EVCALIBRATE=`which ev_calibrate`
+EVCALIBRATE=`which ev_calibrate || echo ./ev_calibrate`
+
+echo $EVCALIBRATE
if ! [ -x "$EVCALIBRATE" ] ; then
echo "ev_calibrate not found exiting ..."
exit 1;
fi
echo "evalibrate located at $EVCALIBRATE"
-exit 0;
if [ -z "$XINIT" ]; then
echo "xinit not found exiting ..."
@@ -33,5 +33,5 @@ mknod /tmp/ev_calibrate p
echo "Starting calibration program..."
sleep 2
-$XINIT $EVCALIBRATE -- $XSERVER
+$XINIT $EVCALIBRATE -- $XSERVER
exit 0
diff --git a/config.h.in b/config.h.in
index f97c6af..7bfac8e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2,9 +2,6 @@
#include "xorg-server.h"
-/* Define this to the ev_calibrate cursor directory */
-#undef CURSORDIR
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
diff --git a/configure b/configure
index 8eb2192..ca21468 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for xf86-input-evtouch 0.8.3.
+# Generated by GNU Autoconf 2.60 for xf86-input-evtouch 0.8.4.
#
-# Report bugs to <http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html>.
+# Report bugs to <http://www.conan.de/touchscreen/evtouch.html>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -713,9 +713,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-evtouch'
PACKAGE_TARNAME='xf86-input-evtouch'
-PACKAGE_VERSION='0.8.3'
-PACKAGE_STRING='xf86-input-evtouch 0.8.3'
-PACKAGE_BUGREPORT='http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html'
+PACKAGE_VERSION='0.8.4'
+PACKAGE_STRING='xf86-input-evtouch 0.8.4'
+PACKAGE_BUGREPORT='http://www.conan.de/touchscreen/evtouch.html'
ac_unique_file="Makefile.am"
# Factoring default headers for most tests.
@@ -868,6 +868,7 @@ EVCALIBRATE_CFLAGS
EVCALIBRATE_LIBS
CURSORDIR
EVCALIBRATE_LDFLAGS
+EVTOUCH_CFLAGS
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1392,7 +1393,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evtouch 0.8.3 to adapt to many kinds of systems.
+\`configure' configures xf86-input-evtouch 0.8.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1462,7 +1463,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evtouch 0.8.3:";;
+ short | recursive ) echo "Configuration of xf86-input-evtouch 0.8.4:";;
esac
cat <<\_ACEOF
@@ -1491,8 +1492,6 @@ Optional Packages:
--with-xorg-module-dir=DIR
Default xorg module directory
[default=$libdir/xorg/modules]
- --with-cursor-dir=DIR Default ev_calibrate cursor directory
- [default=$datadir/evtouch]
Some influential environment variables:
CC C compiler command
@@ -1518,7 +1517,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html>.
+Report bugs to <http://www.conan.de/touchscreen/evtouch.html>.
_ACEOF
ac_status=$?
fi
@@ -1579,7 +1578,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evtouch configure 0.8.3
+xf86-input-evtouch configure 0.8.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1592,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evtouch $as_me 0.8.3, which was
+It was created by xf86-input-evtouch $as_me 0.8.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2265,7 +2264,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-evtouch'
- VERSION='0.8.3'
+ VERSION='0.8.4'
cat >>confdefs.h <<_ACEOF
@@ -4415,7 +4414,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4418 "configure"' > conftest.$ac_ext
+ echo '#line 4417 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5287,9 +5286,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
-## -------------------------------------------------------------------------- ##
-## Report this to http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html ##
-## -------------------------------------------------------------------------- ##
+## ----------------------------------------------------------- ##
+## Report this to http://www.conan.de/touchscreen/evtouch.html ##
+## ----------------------------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -7379,11 +7378,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7382: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7381: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7386: \$? = $ac_status" >&5
+ echo "$as_me:7385: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7647,11 +7646,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7650: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7649: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7654: \$? = $ac_status" >&5
+ echo "$as_me:7653: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7751,11 +7750,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7754: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7753: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7758: \$? = $ac_status" >&5
+ echo "$as_me:7757: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10192,7 +10191,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10195 "configure"
+#line 10194 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10292,7 +10291,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10295 "configure"
+#line 10294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12660,11 +12659,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12663: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12662: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12667: \$? = $ac_status" >&5
+ echo "$as_me:12666: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12764,11 +12763,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12766: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12771: \$? = $ac_status" >&5
+ echo "$as_me:12770: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14325,11 +14324,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14328: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14327: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14332: \$? = $ac_status" >&5
+ echo "$as_me:14331: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14429,11 +14428,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14432: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14431: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14436: \$? = $ac_status" >&5
+ echo "$as_me:14435: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16648,11 +16647,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16651: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16650: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16655: \$? = $ac_status" >&5
+ echo "$as_me:16654: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16916,11 +16915,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16919: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16918: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16923: \$? = $ac_status" >&5
+ echo "$as_me:16922: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17020,11 +17019,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17023: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17027: \$? = $ac_status" >&5
+ echo "$as_me:17026: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21170,30 +21169,16 @@ echo "$as_me: error: You need libpthread to build ev_calibrate" >&2;}
{ (exit 1); exit 1; }; }
fi
-fi
-# ev_calibrate auxiliary directory for empty_cursor.xbm
-
-# Check whether --with-cursor-dir was given.
-if test "${with_cursor_dir+set}" = set; then
- withval=$with_cursor_dir; cursordir="$withval"
-else
- cursordir="$datadir/evtouch"
-fi
-
-eval CURSORDIR="$cursordir"
-
-cat >>confdefs.h <<_ACEOF
-#define CURSORDIR "$cursordir"
-_ACEOF
-
+ EVCALIBRATE_CFLAGS="$EVCALIBRATE_CFLAGS $CFLAGS $XORG_CFLAGS -DCURSORDIRECTORY=\"\\\"$CURSORDIR\\\"\""
+fi
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$CFLAGS $XORG_CFLAGS "
+EVTOUCH_CFLAGS="$CFLAGS $XORG_CFLAGS "
# Checks for header files.
@@ -21816,7 +21801,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evtouch $as_me 0.8.3, which was
+This file was extended by xf86-input-evtouch $as_me 0.8.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21869,7 +21854,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-evtouch config.status 0.8.3
+xf86-input-evtouch config.status 0.8.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -22202,11 +22187,12 @@ EVCALIBRATE_CFLAGS!$EVCALIBRATE_CFLAGS$ac_delim
EVCALIBRATE_LIBS!$EVCALIBRATE_LIBS$ac_delim
CURSORDIR!$CURSORDIR$ac_delim
EVCALIBRATE_LDFLAGS!$EVCALIBRATE_LDFLAGS$ac_delim
+EVTOUCH_CFLAGS!$EVTOUCH_CFLAGS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 56a6b8b..242af2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,12 +16,12 @@
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHE DEALINGS IN THE SOFTWARE.
#
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.59)
-AC_INIT([xf86-input-evtouch],[0.8.3],[http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html],[xf86-input-evtouch])
+AC_INIT([xf86-input-evtouch],[0.8.4],[http://www.conan.de/touchscreen/evtouch.html],[xf86-input-evtouch])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
@@ -70,24 +70,18 @@ if test "${enable_evcalibrate}" = "true" ; then
AC_CHECK_LIB([pthread], [pthread_create],
[ EVCALIBRATE_LDFLAGS="$EVCALIBRATE_LDFLAGS -lpthread" ],
[ AC_MSG_ERROR([You need libpthread to build ev_calibrate]) ])
+
+ EVCALIBRATE_CFLAGS="$EVCALIBRATE_CFLAGS $CFLAGS $XORG_CFLAGS -DCURSORDIRECTORY=\"\\\"$CURSORDIR\\\"\""
+ AC_SUBST(CURSORDIR)
+ AC_SUBST(EVCALIBRATE_CFLAGS)
+ AC_SUBST(EVCALIBRATE_LDFLAGS)
fi
-# ev_calibrate auxiliary directory for empty_cursor.xbm
-AC_ARG_WITH(cursor-dir,
- AS_HELP_STRING(--with-cursor-dir=DIR,Default ev_calibrate cursor directory [[[default=$datadir/evtouch]]]),
- [cursordir="$withval"],
- [cursordir="$datadir/evtouch"])
-eval CURSORDIR="$cursordir"
-AC_DEFINE_UNQUOTED(CURSORDIR, "$cursordir", [Define this to the ev_calibrate cursor directory])
-AC_SUBST(CURSORDIR)
-
-AC_SUBST(EVCALIBRATE_CFLAGS)
-AC_SUBST(EVCALIBRATE_LDFLAGS)
dnl AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$CFLAGS $XORG_CFLAGS "
-AC_SUBST([CFLAGS])
+EVTOUCH_CFLAGS="$CFLAGS $XORG_CFLAGS "
+AC_SUBST(EVTOUCH_CFLAGS)
# Checks for header files.
AC_HEADER_STDC
diff --git a/ev_calibrate.c b/ev_calibrate.c
index 9f841fd..c027723 100644
--- a/ev_calibrate.c
+++ b/ev_calibrate.c
@@ -16,7 +16,9 @@
#include "ev_calibrate.h"
#include "config.h"
-
+#ifndef CURSORDIRECTORY
+#define CURSORDIRECTORY ""
+#endif
pthread_mutex_t got_min_max_mtx;
pthread_mutex_t min_max_mtx;
@@ -284,9 +286,8 @@ int main (void)
exit (-1);
}
-
rc = XReadBitmapFile(display, win,
- CURSORDIR"/empty_cursor.xbm",
+ CURSORDIRECTORY"/empty_cursor.xbm",
&cursor_width, &cursor_height,
&cursor_pic,
&hotspot_x, &hotspot_y);
@@ -294,7 +295,7 @@ int main (void)
/* check for failure or success. */
switch (rc) {
case BitmapOpenFailed:
- fprintf(stderr, "XReadBitmapFile - could not open file 'empty_cursor.xbm'.\n");
+ fprintf(stderr, "XReadBitmapFile - could not open file '%s/empty_cursor.xbm'.\n", CURSORDIRECTORY);
break;
case BitmapFileInvalid:
fprintf(stderr,
diff --git a/evtouch.c b/evtouch.c
index fbfbdb8..1603d4f 100644
--- a/evtouch.c
+++ b/evtouch.c
@@ -36,11 +36,16 @@
#include <X11/Xos.h>
#include <misc.h>
#include <xf86.h>
+
+#ifndef NEED_XF86_TYPES
#define NEED_XF86_TYPES
+#endif
+
#include <xf86_ansic.h>
#include <xf86_OSproc.h>
#include <xf86Xinput.h>
#include <xisb.h>
+#include <randrstr.h>
#include <exevents.h>
#include <string.h>
@@ -92,7 +97,7 @@ static XF86ModuleVersionInfo VersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
- 0, 8, 3,
+ 0, 8, 4,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
@@ -114,7 +119,7 @@ Plug( pointer module,
static void
-Unplug(pointer p)
+Unplug(pointer p)
{
DBGOUT(1, "EVTouch: Unplug\n");
}
@@ -149,7 +154,7 @@ emulate3Timer(OsTimerPtr timer, CARD32 now, pointer _local)
{
int sigstate;
- DBGOUT(2,"EVTouch: %s\n", __FUNCTION__);
+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__);
LocalDevicePtr local = (LocalDevicePtr)_local;
EVTouchPrivatePtr priv = (EVTouchPrivatePtr) local->private;
@@ -193,15 +198,54 @@ emulate3Timer(OsTimerPtr timer, CARD32 now, pointer _local)
priv->cur_y);
}
-
priv->emulate3_timer_expired = TRUE;
xf86UnblockSIGIO(sigstate);
return 0;
}
+static void DoBtnAction(EVTouchPrivatePtr priv)
+{
+ int btn = 0;
+ LocalDevicePtr local = priv->local;
+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, priv->btn_count);
+
+ for (btn = 0; btn < priv->btn_count; btn++) {
+ DBGOUT(9, "EVTouch: %s do_it = %d \n",
+ __FUNCTION__, priv->btn_actions[btn].do_it);
+ if (priv->btn_actions[btn].do_it != 0) {
+ if (priv->emulate3_timer != NULL)
+ {
+ TimerFree(priv->emulate3_timer);
+ priv->emulate3_timer=NULL;
+ priv->emulate3_timer_expired = FALSE;
+ }
Reply to: