Update to 1.20.7
This commit is contained in:
Jaromir Capik
parent
348857914e
commit
54bb2cb353
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
gpm-1.20.6.tar.lzma
|
||||
/gpm-1.20.7.tar.lzma
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- gpm-1.20.1/doc/gpm.info.orig 2008-05-22 16:10:27.000000000 +0200
|
||||
+++ gpm-1.20.1/doc/gpm.info 2008-05-22 16:10:34.000000000 +0200
|
||||
@@ -5,7 +5,7 @@ produced by makeinfo version 4.0 from
|
||||
|
||||
INFO-DIR-SECTION Miscellaneous
|
||||
START-INFO-DIR-ENTRY
|
||||
-* Gpm: (gpm). A server wich hands mouse events to non-X programs.
|
||||
+* Gpm: (gpm). A server which hands mouse events to non-X programs.
|
||||
END-INFO-DIR-ENTRY
|
||||
|
||||
This file is a user's and programmer's manual for gpm 1.20.1.
|
||||
@ -1,10 +0,0 @@
|
||||
--- gpm-1.20.3/src/daemon/open_console.c.gcc4.3 2008-05-28 11:12:34.000000000 +0200
|
||||
+++ gpm-1.20.3/src/daemon/open_console.c 2008-05-28 11:12:40.000000000 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include <fcntl.h> /* open and co. */
|
||||
#include <sys/stat.h> /* stat() */
|
||||
-#include <stropts.h> /* ioctl */
|
||||
|
||||
/* Linux specific (to be outsourced in gpm2 */
|
||||
#include <linux/serial.h> /* for serial console check */
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up gpm-1.20.6/configure.ac.libtool gpm-1.20.6/configure.ac
|
||||
--- gpm-1.20.6/configure.ac.libtool 2009-02-11 08:12:00.000000000 +0100
|
||||
+++ gpm-1.20.6/configure.ac 2009-02-11 08:12:08.000000000 +0100
|
||||
@@ -42,7 +42,7 @@ release="`cat $srcdir/.gitversion`"
|
||||
#
|
||||
|
||||
AC_PROG_CC
|
||||
-AC_PROG_RANLIB
|
||||
+AC_PROG_LIBTOOL
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_YACC
|
||||
AC_PROG_LN_S
|
||||
@ -1,20 +1,8 @@
|
||||
From 8ed907a388bf7c993b60889661b032f10bbaadd2 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <8ed907a388bf7c993b60889661b032f10bbaadd2.1327401287.git.npajkovs@redhat.com>
|
||||
From: Nikola Pajkovsky <npajkovs@redhat.com>
|
||||
Date: Tue, 24 Jan 2012 11:34:42 +0100
|
||||
Subject: [PATCH] rhbz#668480 - gpm-types(7) manpage fixes
|
||||
|
||||
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
|
||||
---
|
||||
doc/doc.gpm.in | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/doc/doc.gpm.in b/doc/doc.gpm.in
|
||||
index 0dafb31..b27865d 100644
|
||||
--- a/doc/doc.gpm.in
|
||||
+++ b/doc/doc.gpm.in
|
||||
@@ -600,7 +600,7 @@ error. When the document refer to ``standard serial options'' it means
|
||||
that one of @t{-o dtr}, @t{-o rts}, @t{-o both} can be specified to
|
||||
diff -Naur gpm-1.20.7.orig/doc/doc.gpm.in gpm-1.20.7/doc/doc.gpm.in
|
||||
--- gpm-1.20.7.orig/doc/doc.gpm.in 2012-10-26 23:21:38.000000000 +0200
|
||||
+++ gpm-1.20.7/doc/doc.gpm.in 2013-07-19 19:40:33.374213536 +0200
|
||||
@@ -600,7 +600,7 @@
|
||||
that one of @t{\-o dtr}, @t{\-o rts}, @t{\-o both} can be specified to
|
||||
toggle the control lines of the serial port.
|
||||
|
||||
-The following mouse type are corrently recognized:
|
||||
@ -22,16 +10,16 @@ index 0dafb31..b27865d 100644
|
||||
|
||||
@table @code
|
||||
@item bare Microsoft
|
||||
@@ -621,7 +621,7 @@ The following mouse type are corrently recognized:
|
||||
@@ -621,7 +621,7 @@
|
||||
this is your case, use the @samp{bare} mouse type. Some new
|
||||
two-button devices are ``plug and play'', and they don't play
|
||||
fair at all; in this case try @t{-t pnp}. Many (most)
|
||||
fair at all; in this case try @t{\-t pnp}. Many (most)
|
||||
- three-button devices that use the microsoft protocol fail to
|
||||
+ three-button devices that use the Microsoft protocol fail to
|
||||
report some middle-button events during mouse motion. Since
|
||||
the protocol does not distinguish between the middle button
|
||||
going up and the middle button going down it would be liable
|
||||
@@ -649,7 +649,7 @@ The following mouse type are corrently recognized:
|
||||
@@ -649,7 +649,7 @@
|
||||
decoder gets into a confused state where it thinks the middle
|
||||
button is up when it's down and vice versa. (If you get sick
|
||||
of having to do this, please don't blame gpm; blame your buggy
|
||||
@ -40,6 +28,3 @@ index 0dafb31..b27865d 100644
|
||||
protocol can be made to do the MouseSystems protocol
|
||||
instead. The ``3 Button Serial Mouse mini-HOWTO'' has
|
||||
information about this.) This mouse decoder accepts standard
|
||||
--
|
||||
1.7.9.rc2
|
||||
|
||||
1576
gpm-aarch64.patch
1576
gpm-aarch64.patch
File diff suppressed because it is too large
Load Diff
135
gpm.init
135
gpm.init
@ -1,135 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# chkconfig: 2345 85 15
|
||||
# description: GPM adds mouse support to text-based Linux applications such \
|
||||
# as the Midnight Commander. It also allows mouse-based console \
|
||||
# cut-and-paste operations, and includes support for pop-up \
|
||||
# menus on the console.
|
||||
# processname: gpm
|
||||
# pidfile: /var/run/gpm.pid
|
||||
# config: /etc/sysconfig/mouse
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: gpm
|
||||
# Required-Start: $syslog $local_fs
|
||||
# Required-Stop: $syslog $local_fs
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Start and stop gpm daemon
|
||||
# Description: GPM adds mouse support to text-based Linux applications such
|
||||
# as the Midnight Commander. It also allows mouse-based console
|
||||
# cut-and-paste operations, and includes support for pop-up
|
||||
# menus on the console.
|
||||
### END INIT INFO
|
||||
|
||||
# source function library
|
||||
. /etc/init.d/functions
|
||||
|
||||
if test -e /etc/sysconfig/mouse ; then
|
||||
. /etc/sysconfig/mouse
|
||||
fi
|
||||
|
||||
RETVAL=0
|
||||
|
||||
check() {
|
||||
# Check that we're a privileged user
|
||||
[ `id -u` = 0 ] || exit 4
|
||||
|
||||
# Check if acpid is executable
|
||||
test -x /usr/sbin/gpm || exit 5
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
check
|
||||
|
||||
if [ ! -f /var/lock/subsys/gpm ]; then
|
||||
echo -n $"Starting console mouse services: "
|
||||
|
||||
if [ -z "$MOUSETYPE" ]; then
|
||||
MOUSETYPE="exps2"
|
||||
fi
|
||||
|
||||
if [ -z "$DEVICE" ]; then
|
||||
DEVICE="/dev/input/mice"
|
||||
fi
|
||||
|
||||
if [ "$MOUSETYPE" = "none" ]; then
|
||||
echo $"(no mouse is configured)"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$MOUSETYPE" = "Microsoft" ]; then
|
||||
MOUSETYPE=ms
|
||||
fi
|
||||
|
||||
if [ -n "$IMOUSETYPE" ]; then
|
||||
if [ "$(pidofproc inputattach)" = "" ]; then
|
||||
modprobe sermouse > /dev/null 2>&1
|
||||
/usr/sbin/inputattach -$IMOUSETYPE $DEVICE --daemon
|
||||
DEVICE="/dev/input/mice"
|
||||
MOUSETYPE="exps2"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$MOUSETYPE" ]; then
|
||||
daemon /usr/sbin/gpm -m $DEVICE -t $MOUSETYPE $OPTIONS
|
||||
else
|
||||
daemon /usr/sbin/gpm -m $DEVICE $OPTIONS
|
||||
fi
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gpm
|
||||
echo
|
||||
fi
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
check
|
||||
|
||||
echo -n $"Shutting down console mouse services: "
|
||||
killproc /usr/sbin/gpm
|
||||
if [ -n "$IMOUSETYPE" ]; then
|
||||
killproc inputattach
|
||||
fi
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gpm
|
||||
echo
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
force-reload|reload|try-restart)
|
||||
echo "$0: Unimplemented feature."
|
||||
RETVAL=3
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
condrestart)
|
||||
if [ -f /var/lock/subsys/gpm ]; then
|
||||
restart
|
||||
fi
|
||||
;;
|
||||
status)
|
||||
status gpm
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
|
||||
RETVAL=2
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
29
gpm.spec
29
gpm.spec
@ -1,7 +1,7 @@
|
||||
Summary: A mouse server for the Linux console
|
||||
Name: gpm
|
||||
Version: 1.20.6
|
||||
Release: 33%{?dist}
|
||||
Version: 1.20.7
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.nico.schottelius.org/software/gpm/
|
||||
@ -10,13 +10,10 @@ Source: http://www.nico.schottelius.org/software/gpm/archives/%{name}-%{version}
|
||||
Source1: gpm.service
|
||||
Patch1: gpm-1.20.6-multilib.patch
|
||||
Patch2: gpm-1.20.1-lib-silent.patch
|
||||
Patch3: gpm-1.20.3-gcc4.3.patch
|
||||
Patch4: gpm-1.20.5-close-fds.patch
|
||||
Patch5: gpm-1.20.1-weak-wgetch.patch
|
||||
Patch6: gpm-1.20.6-libtool.patch
|
||||
Patch7: 0001-rhbz-668480-gpm-types-7-manpage-fixes.patch
|
||||
Patch7: gpm-1.20.7-rhbz-668480-gpm-types-7-manpage-fixes.patch
|
||||
Patch8: gpm-1.20.6-missing-header-dir-in-make-depend.patch
|
||||
Patch9: gpm-aarch64.patch
|
||||
#Patch7: gpm-1.20.6-capability.patch
|
||||
Requires(post): systemd systemd-sysv info
|
||||
Requires(preun): systemd info
|
||||
@ -66,24 +63,19 @@ mouse support to text-based Linux applications.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
./autogen.sh
|
||||
|
||||
%patch1 -p1 -b .multilib
|
||||
%patch2 -p1 -b .lib-silent
|
||||
%patch3 -p1 -b .gcc4.3
|
||||
%patch4 -p1 -b .close-fds
|
||||
%patch5 -p1 -b .weak-wgetch
|
||||
%patch6 -p1 -b .libtool
|
||||
%patch7 -p1
|
||||
# not sure if this is really needed
|
||||
%patch8 -p1
|
||||
%patch9 -p1 -b .aarch64
|
||||
|
||||
#%patch7 -p1 -b .capability
|
||||
|
||||
iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
|
||||
touch -c -r TODO TODO.utf8
|
||||
mv -f TODO.utf8 TODO
|
||||
|
||||
autoreconf
|
||||
|
||||
%build
|
||||
# ld fails with PIE
|
||||
#LDFLAGS='-Wl,-z,relro,-z,now -pie'
|
||||
@ -153,8 +145,8 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc BUGS COPYING README TODO
|
||||
%doc doc/README* doc/FAQ doc/Announce doc/changes/*
|
||||
%doc COPYING README TODO
|
||||
%doc doc/README* doc/FAQ doc/Announce doc/changelog
|
||||
%{_infodir}/*
|
||||
%ifnarch s390 s390x
|
||||
%config(noreplace) %{_sysconfdir}/gpm-*
|
||||
@ -175,6 +167,9 @@ fi
|
||||
%{_libdir}/libgpm.a
|
||||
|
||||
%changelog
|
||||
* Fri Jul 19 2013 Jaromir Capik <jcapik@redhat.com> - 1.20.7-1
|
||||
- Update to 1.20.7
|
||||
|
||||
* Wed Jul 03 2013 Jaromir Capik <jcapik@redhat.com> - 1.20.6-33
|
||||
- Replacing systemd unit path with _unitdir macro
|
||||
|
||||
|
||||
646
inputattach.c
646
inputattach.c
@ -1,646 +0,0 @@
|
||||
/*
|
||||
* $Id: inputattach.c,v 1.24 2006/02/08 12:19:31 vojtech Exp $
|
||||
*
|
||||
* Copyright (c) 1999-2000 Vojtech Pavlik
|
||||
*
|
||||
* Sponsored by SuSE
|
||||
*
|
||||
* Twiddler support Copyright (c) 2001 Arndt Schoenewald
|
||||
* Sponsored by Quelltext AG (http://www.quelltext-ag.de), Dortmund, Germany
|
||||
*/
|
||||
|
||||
/*
|
||||
* Input line discipline attach program
|
||||
*/
|
||||
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* Should you need to contact me, the author, you can do so either by
|
||||
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
||||
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
||||
*/
|
||||
|
||||
#include <linux/serio.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <termios.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "serio-ids.h"
|
||||
|
||||
static int readchar(int fd, unsigned char *c, int timeout)
|
||||
{
|
||||
struct timeval tv;
|
||||
fd_set set;
|
||||
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = timeout * 1000;
|
||||
|
||||
FD_ZERO(&set);
|
||||
FD_SET(fd, &set);
|
||||
|
||||
if (!select(fd + 1, &set, NULL, NULL, &tv))
|
||||
return -1;
|
||||
|
||||
if (read(fd, c, 1) != 1)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void setline(int fd, int flags, int speed)
|
||||
{
|
||||
struct termios t;
|
||||
|
||||
tcgetattr(fd, &t);
|
||||
|
||||
t.c_cflag = flags | CREAD | HUPCL | CLOCAL;
|
||||
t.c_iflag = IGNBRK | IGNPAR;
|
||||
t.c_oflag = 0;
|
||||
t.c_lflag = 0;
|
||||
t.c_cc[VMIN ] = 1;
|
||||
t.c_cc[VTIME] = 0;
|
||||
|
||||
cfsetispeed(&t, speed);
|
||||
cfsetospeed(&t, speed);
|
||||
|
||||
tcsetattr(fd, TCSANOW, &t);
|
||||
}
|
||||
|
||||
static int logitech_command(int fd, char *c)
|
||||
{
|
||||
int i;
|
||||
unsigned char d;
|
||||
|
||||
for (i = 0; c[i]; i++) {
|
||||
write(fd, c + i, 1);
|
||||
if (readchar(fd, &d, 1000))
|
||||
return -1;
|
||||
if (c[i] != d)
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int magellan_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
write(fd, "m3\rpBB\rz\r", 9);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int warrior_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
if (logitech_command(fd, "*S"))
|
||||
return -1;
|
||||
|
||||
setline(fd, CS8, B4800);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int spaceball_waitchar(int fd, unsigned char c, unsigned char *d,
|
||||
int timeout)
|
||||
{
|
||||
unsigned char b = 0;
|
||||
|
||||
while (!readchar(fd, &b, timeout)) {
|
||||
if (b == 0x0a)
|
||||
continue;
|
||||
*d++ = b;
|
||||
if (b == c)
|
||||
break;
|
||||
}
|
||||
|
||||
*d = 0;
|
||||
|
||||
return -(b != c);
|
||||
}
|
||||
|
||||
static int spaceball_waitcmd(int fd, char c, char *d)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 8; i++) {
|
||||
if (spaceball_waitchar(fd, 0x0d, d, 1000))
|
||||
return -1;
|
||||
if (d[0] == c)
|
||||
return 0;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int spaceball_cmd(int fd, char *c, char *d)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; c[i]; i++)
|
||||
write(fd, c + i, 1);
|
||||
write(fd, "\r", 1);
|
||||
|
||||
i = spaceball_waitcmd(fd, toupper(c[0]), d);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
#define SPACEBALL_1003 1
|
||||
#define SPACEBALL_2003B 3
|
||||
#define SPACEBALL_2003C 4
|
||||
#define SPACEBALL_3003C 7
|
||||
#define SPACEBALL_4000FLX 8
|
||||
#define SPACEBALL_4000FLX_L 9
|
||||
|
||||
static int spaceball_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
char r[64];
|
||||
|
||||
if (spaceball_waitchar(fd, 0x11, r, 4000) ||
|
||||
spaceball_waitchar(fd, 0x0d, r, 1000))
|
||||
return -1;
|
||||
|
||||
if (spaceball_waitcmd(fd, '@', r))
|
||||
return -1;
|
||||
|
||||
if (strncmp("@1 Spaceball alive", r, 18))
|
||||
return -1;
|
||||
|
||||
if (spaceball_waitcmd(fd, '@', r))
|
||||
return -1;
|
||||
|
||||
if (spaceball_cmd(fd, "hm", r))
|
||||
return -1;
|
||||
|
||||
if (!strncmp("Hm2003B", r, 7))
|
||||
*id = SPACEBALL_2003B;
|
||||
if (!strncmp("Hm2003C", r, 7))
|
||||
*id = SPACEBALL_2003C;
|
||||
if (!strncmp("Hm3003C", r, 7))
|
||||
*id = SPACEBALL_3003C;
|
||||
|
||||
if (!strncmp("HvFirmware", r, 10)) {
|
||||
|
||||
if (spaceball_cmd(fd, "\"", r))
|
||||
return -1;
|
||||
|
||||
if (strncmp("\"1 Spaceball 4000 FLX", r, 21))
|
||||
return -1;
|
||||
|
||||
if (spaceball_waitcmd(fd, '"', r))
|
||||
return -1;
|
||||
|
||||
if (strstr(r, " L "))
|
||||
*id = SPACEBALL_4000FLX_L;
|
||||
else
|
||||
*id = SPACEBALL_4000FLX;
|
||||
|
||||
if (spaceball_waitcmd(fd, '"', r))
|
||||
return -1;
|
||||
|
||||
if (spaceball_cmd(fd, "YS", r))
|
||||
return -1;
|
||||
|
||||
if (spaceball_cmd(fd, "M", r))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (spaceball_cmd(fd, "P@A@A", r) ||
|
||||
spaceball_cmd(fd, "FT@", r) ||
|
||||
spaceball_cmd(fd, "MSS", r))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stinger_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
int i;
|
||||
unsigned char c;
|
||||
unsigned char *response = "\r\n0600520058C272";
|
||||
|
||||
if (write(fd, " E5E5", 5) != 5) /* Enable command */
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < 16; i++) /* Check for Stinger */
|
||||
if (readchar(fd, &c, 200) || c != response[i])
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mzp_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
if (logitech_command(fd, "*X*q"))
|
||||
return -1;
|
||||
|
||||
setline(fd, CS8, B9600);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int newton_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
int i;
|
||||
unsigned char c;
|
||||
unsigned char response[35] = {
|
||||
0x16, 0x10, 0x02, 0x64, 0x5f, 0x69, 0x64, 0x00,
|
||||
0x00, 0x00, 0x0c, 0x6b, 0x79, 0x62, 0x64, 0x61,
|
||||
0x70, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x01, 0x6e,
|
||||
0x6f, 0x66, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x10,
|
||||
0x03, 0xdd, 0xe7
|
||||
};
|
||||
|
||||
for (i = 0; i < sizeof(response); i++)
|
||||
if (readchar(fd, &c, 400) || c != response[i])
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int twiddler_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
unsigned char c[10];
|
||||
int count, line;
|
||||
|
||||
/* Turn DTR off, otherwise the Twiddler won't send any data. */
|
||||
if (ioctl(fd, TIOCMGET, &line))
|
||||
return -1;
|
||||
line &= ~TIOCM_DTR;
|
||||
if (ioctl(fd, TIOCMSET, &line))
|
||||
return -1;
|
||||
|
||||
/*
|
||||
* Check whether the device on the serial line is the Twiddler.
|
||||
*
|
||||
* The Twiddler sends data packets of 5 bytes which have the following
|
||||
* properties: the MSB is 0 on the first and 1 on all other bytes, and
|
||||
* the high order nibble of the last byte is always 0x8.
|
||||
*
|
||||
* We read and check two of those 5 byte packets to be sure that we
|
||||
* are indeed talking to a Twiddler.
|
||||
*/
|
||||
|
||||
/* Read at most 5 bytes until we find one with the MSB set to 0 */
|
||||
for (count = 0; count < 5; count++) {
|
||||
if (readchar(fd, c, 500))
|
||||
return -1;
|
||||
if ((c[0] & 0x80) == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
if (count == 5) {
|
||||
/* Could not find header byte in data stream */
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Read remaining 4 bytes plus the full next data packet */
|
||||
for (count = 1; count < 10; count++)
|
||||
if (readchar(fd, c + count, 500))
|
||||
return -1;
|
||||
|
||||
/* Check whether the bytes of both data packets obey the rules */
|
||||
for (count = 1; count < 10; count++) {
|
||||
if ((count % 5 == 0 && (c[count] & 0x80) != 0x00) ||
|
||||
(count % 5 == 4 && (c[count] & 0xF0) != 0x80) ||
|
||||
(count % 5 != 0 && (c[count] & 0x80) != 0x80)) {
|
||||
/* Invalid byte in data packet */
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fujitsu_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
unsigned char cmd, data;
|
||||
|
||||
/* Wake up the touchscreen */
|
||||
cmd = 0xff; /* Dummy data */;
|
||||
if (write(fd, &cmd, 1) != 1)
|
||||
return -1;
|
||||
|
||||
/* Wait to settle down */
|
||||
usleep(100 * 1000); /* 100 ms */
|
||||
|
||||
/* Reset the touchscreen */
|
||||
cmd = 0x81; /* Cold reset */
|
||||
if (write(fd, &cmd, 1) != 1)
|
||||
return -1;
|
||||
|
||||
/* Read ACK */
|
||||
if (readchar(fd, &data, 100) || (data & 0xbf) != 0x90)
|
||||
return -1;
|
||||
|
||||
/* Read status */
|
||||
if (readchar(fd, &data, 100) || data != 0x00)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dump_init(int fd, unsigned long *id, unsigned long *extra)
|
||||
{
|
||||
unsigned char c, o = 0;
|
||||
|
||||
c = 0x80;
|
||||
|
||||
if (write(fd, &c, 1) != 1) /* Enable command */
|
||||
return -1;
|
||||
|
||||
while (1)
|
||||
if (!readchar(fd, &c, 1)) {
|
||||
printf("%02x (%c) ", c, ((c > 32) && (c < 127)) ? c : 'x');
|
||||
o = 1;
|
||||
} else {
|
||||
if (o) {
|
||||
printf("\n");
|
||||
o = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct input_types {
|
||||
const char *name;
|
||||
const char *name2;
|
||||
const char *desc;
|
||||
int speed;
|
||||
int flags;
|
||||
unsigned long type;
|
||||
unsigned long id;
|
||||
unsigned long extra;
|
||||
int flush;
|
||||
int (*init)(int fd, unsigned long *id, unsigned long *extra);
|
||||
};
|
||||
|
||||
static struct input_types input_types[] = {
|
||||
{ "--sunkbd", "-skb", "Sun Type 4 and Type 5 keyboards",
|
||||
B1200, CS8,
|
||||
SERIO_SUNKBD, 0x00, 0x00, 1, NULL },
|
||||
{ "--lkkbd", "-lk", "DEC LK201 / LK401 keyboards",
|
||||
B4800, CS8|CSTOPB,
|
||||
SERIO_LKKBD, 0x00, 0x00, 1, NULL },
|
||||
{ "--vsxxx-aa", "-vs",
|
||||
"DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-A tablet",
|
||||
B4800, CS8|CSTOPB|PARENB|PARODD,
|
||||
SERIO_VSXXXAA, 0x00, 0x00, 1, NULL },
|
||||
{ "--spaceorb", "-orb", "SpaceOrb 360 / SpaceBall Avenger",
|
||||
B9600, CS8,
|
||||
SERIO_SPACEORB, 0x00, 0x00, 1, NULL },
|
||||
{ "--spaceball", "-sbl", "SpaceBall 2003 / 3003 / 4000 FLX",
|
||||
B9600, CS8,
|
||||
SERIO_SPACEBALL, 0x00, 0x00, 0, spaceball_init },
|
||||
{ "--magellan", "-mag", "Magellan / SpaceMouse",
|
||||
B9600, CS8 | CSTOPB | CRTSCTS,
|
||||
SERIO_MAGELLAN, 0x00, 0x00, 1, magellan_init },
|
||||
{ "--warrior", "-war", "WingMan Warrior",
|
||||
B1200, CS7 | CSTOPB,
|
||||
SERIO_WARRIOR, 0x00, 0x00, 1, warrior_init },
|
||||
{ "--stinger", "-sting", "Gravis Stinger",
|
||||
B1200, CS8,
|
||||
SERIO_STINGER, 0x00, 0x00, 1, stinger_init },
|
||||
{ "--mousesystems", "-msc", "3-button Mouse Systems mouse",
|
||||
B1200, CS8,
|
||||
SERIO_MSC, 0x00, 0x01, 1, NULL },
|
||||
{ "--sunmouse", "-sun", "3-button Sun mouse",
|
||||
B1200, CS8,
|
||||
SERIO_SUN, 0x00, 0x01, 1, NULL },
|
||||
{ "--microsoft", "-bare", "2-button Microsoft mouse",
|
||||
B1200, CS7,
|
||||
SERIO_MS, 0x00, 0x00, 1, NULL },
|
||||
{ "--mshack", "-ms", "3-button mouse in Microsoft mode",
|
||||
B1200, CS7,
|
||||
SERIO_MS, 0x00, 0x01, 1, NULL },
|
||||
{ "--mouseman", "-mman", "3-button Logitech / Genius mouse",
|
||||
B1200, CS7,
|
||||
SERIO_MP, 0x00, 0x01, 1, NULL },
|
||||
{ "--intellimouse", "-ms3", "Microsoft IntelliMouse",
|
||||
B1200, CS7,
|
||||
SERIO_MZ, 0x00, 0x11, 1, NULL },
|
||||
{ "--mmwheel", "-mmw",
|
||||
"Logitech mouse with 4-5 buttons or a wheel",
|
||||
B1200, CS7 | CSTOPB,
|
||||
SERIO_MZP, 0x00, 0x13, 1, mzp_init },
|
||||
{ "--iforce", "-ifor", "I-Force joystick or wheel",
|
||||
B38400, CS8,
|
||||
SERIO_IFORCE, 0x00, 0x00, 0, NULL },
|
||||
{ "--newtonkbd", "-newt", "Newton keyboard",
|
||||
B9600, CS8,
|
||||
SERIO_NEWTON, 0x00, 0x00, 1, newton_init },
|
||||
{ "--h3600ts", "-ipaq", "Ipaq h3600 touchscreen",
|
||||
B115200, CS8,
|
||||
SERIO_H3600, 0x00, 0x00, 0, NULL },
|
||||
{ "--stowawaykbd", "-ipaqkbd", "Stowaway keyboard",
|
||||
B115200, CS8,
|
||||
SERIO_STOWAWAY, 0x00, 0x00, 1, NULL },
|
||||
{ "--ps2serkbd", "-ps2ser", "PS/2 via serial keyboard",
|
||||
B1200, CS8,
|
||||
SERIO_PS2SER, 0x00, 0x00, 1, NULL },
|
||||
{ "--twiddler", "-twid", "Handykey Twiddler chording keyboard",
|
||||
B2400, CS8,
|
||||
SERIO_TWIDKBD, 0x00, 0x00, 0, twiddler_init },
|
||||
{ "--twiddler-joy", "-twidjoy", "Handykey Twiddler used as a joystick",
|
||||
B2400, CS8,
|
||||
SERIO_TWIDJOY, 0x00, 0x00, 0, twiddler_init },
|
||||
{ "--elotouch", "-elo", "ELO touchscreen, 10-byte mode",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_ELO, 0x00, 0x00, 0, NULL },
|
||||
{ "--elo4002", "-elo6b", "ELO touchscreen, 6-byte mode",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_ELO, 0x01, 0x00, 0, NULL },
|
||||
{ "--elo271-140", "-elo4b", "ELO touchscreen, 4-byte mode",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_ELO, 0x02, 0x00, 0, NULL },
|
||||
{ "--elo261-280", "-elo3b", "ELO Touchscreen, 3-byte mode",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_ELO, 0x03, 0x00, 0, NULL },
|
||||
{ "--mtouch", "-mtouch", "MicroTouch (3M) touchscreen",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_MICROTOUCH, 0x00, 0x00, 0, NULL },
|
||||
{ "--touchright", "-tr", "Touchright serial touchscreen",
|
||||
B9600, CS8 | CRTSCTS,
|
||||
SERIO_TOUCHRIGHT, 0x00, 0x00, 0, NULL },
|
||||
{ "--touchwin", "-tw", "Touchwindow serial touchscreen",
|
||||
B4800, CS8 | CRTSCTS,
|
||||
SERIO_TOUCHWIN, 0x00, 0x00, 0, NULL },
|
||||
{ "--penmount", "-pm", "Penmount touchscreen",
|
||||
B19200, CS8 | CRTSCTS,
|
||||
SERIO_PENMOUNT, 0x00, 0x00, 0, NULL },
|
||||
{ "--fujitsu", "-fjt", "Fujitsu serial touchscreen",
|
||||
B9600, CS8,
|
||||
SERIO_FUJITSU, 0x00, 0x00, 1, fujitsu_init },
|
||||
{ "--dump", "-dump", "Just enable device",
|
||||
B2400, CS8,
|
||||
0, 0x00, 0x00, 0, dump_init },
|
||||
{ "--w8001", "-w8001", "Wacom W8001",
|
||||
B38400, CS8,
|
||||
SERIO_W8001, 0x00, 0x00, 0, NULL },
|
||||
{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static void show_help(void)
|
||||
{
|
||||
struct input_types *type;
|
||||
|
||||
puts("");
|
||||
puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
|
||||
puts("");
|
||||
puts("Modes:");
|
||||
|
||||
for (type = input_types; type->name; type++)
|
||||
printf(" %-16s %-8s %s\n",
|
||||
type->name, type->name2, type->desc);
|
||||
|
||||
puts("");
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
unsigned long devt;
|
||||
int ldisc;
|
||||
struct input_types *type = NULL;
|
||||
const char *device = NULL;
|
||||
int daemon_mode = 0;
|
||||
int need_device = 0;
|
||||
unsigned long id, extra;
|
||||
int fd;
|
||||
int i;
|
||||
char c;
|
||||
int retval;
|
||||
int baud = -1;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (!strcasecmp(argv[i], "--help")) {
|
||||
show_help();
|
||||
return EXIT_SUCCESS;
|
||||
} else if (!strcasecmp(argv[i], "--daemon")) {
|
||||
daemon_mode = 1;
|
||||
} else if (need_device) {
|
||||
device = argv[i];
|
||||
need_device = 0;
|
||||
} else if (!strcasecmp(argv[i], "--baud")) {
|
||||
if (argc <= i + 1) {
|
||||
show_help();
|
||||
fprintf(stderr,
|
||||
"inputattach: require baud rate\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
baud = atoi(argv[++i]);
|
||||
} else {
|
||||
if (type && type->name) {
|
||||
fprintf(stderr,
|
||||
"inputattach: '%s' - "
|
||||
"only one mode allowed\n", argv[i]);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
for (type = input_types; type->name; type++) {
|
||||
if (!strcasecmp(argv[i], type->name) ||
|
||||
!strcasecmp(argv[i], type->name2)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!type->name) {
|
||||
fprintf(stderr,
|
||||
"inputattach: invalid mode '%s'\n",
|
||||
argv[i]);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
need_device = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (!type || !type->name) {
|
||||
fprintf(stderr, "inputattach: must specify mode\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (need_device) {
|
||||
fprintf(stderr, "inputattach: must specify device\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NONBLOCK);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, "inputattach: '%s' - %s\n",
|
||||
device, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
|
||||
switch(baud) {
|
||||
case -1: break;
|
||||
case 2400: type->speed = B2400; break;
|
||||
case 4800: type->speed = B4800; break;
|
||||
case 9600: type->speed = B9600; break;
|
||||
case 19200: type->speed = B19200; break;
|
||||
case 38400: type->speed = B38400; break;
|
||||
default:
|
||||
fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
|
||||
baud);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
setline(fd, type->flags, type->speed);
|
||||
|
||||
if (type->flush)
|
||||
while (!readchar(fd, &c, 100))
|
||||
/* empty */;
|
||||
|
||||
id = type->id;
|
||||
extra = type->extra;
|
||||
|
||||
if (type->init && type->init(fd, &id, &extra)) {
|
||||
fprintf(stderr, "inputattach: device initialization failed\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
ldisc = N_MOUSE;
|
||||
if (ioctl(fd, TIOCSETD, &ldisc)) {
|
||||
fprintf(stderr, "inputattach: can't set line discipline\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
devt = type->type | (id << 8) | (extra << 16);
|
||||
|
||||
if (ioctl(fd, SPIOCSTYPE, &devt)) {
|
||||
fprintf(stderr, "inputattach: can't set device type\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
retval = EXIT_SUCCESS;
|
||||
if (daemon_mode && daemon(0, 0) < 0) {
|
||||
perror("inputattach");
|
||||
retval = EXIT_FAILURE;
|
||||
}
|
||||
|
||||
read(fd, NULL, 0);
|
||||
|
||||
ldisc = 0;
|
||||
ioctl(fd, TIOCSETD, &ldisc);
|
||||
close(fd);
|
||||
|
||||
return retval;
|
||||
}
|
||||
111
serio-ids.h
111
serio-ids.h
@ -1,111 +0,0 @@
|
||||
#ifndef _SERIO_IDS_H
|
||||
#define _SERIO_IDS_H
|
||||
|
||||
#ifndef SERIO_RS232
|
||||
# define SERIO_RS232 0x02
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Serio types
|
||||
*/
|
||||
#ifndef SERIO_UNKNOWN
|
||||
# define SERIO_UNKNOWN 0x00
|
||||
#endif
|
||||
#ifndef SERIO_MSC
|
||||
# define SERIO_MSC 0x01
|
||||
#endif
|
||||
#ifndef SERIO_SUN
|
||||
# define SERIO_SUN 0x02
|
||||
#endif
|
||||
#ifndef SERIO_MS
|
||||
# define SERIO_MS 0x03
|
||||
#endif
|
||||
#ifndef SERIO_MP
|
||||
# define SERIO_MP 0x04
|
||||
#endif
|
||||
#ifndef SERIO_MZ
|
||||
# define SERIO_MZ 0x05
|
||||
#endif
|
||||
#ifndef SERIO_MZP
|
||||
# define SERIO_MZP 0x06
|
||||
#endif
|
||||
#ifndef SERIO_MZPP
|
||||
# define SERIO_MZPP 0x07
|
||||
#endif
|
||||
#ifndef SERIO_VSXXXAA
|
||||
# define SERIO_VSXXXAA 0x08
|
||||
#endif
|
||||
#ifndef SERIO_SUNKBD
|
||||
# define SERIO_SUNKBD 0x10
|
||||
#endif
|
||||
#ifndef SERIO_WARRIOR
|
||||
# define SERIO_WARRIOR 0x18
|
||||
#endif
|
||||
#ifndef SERIO_SPACEORB
|
||||
# define SERIO_SPACEORB 0x19
|
||||
#endif
|
||||
#ifndef SERIO_MAGELLAN
|
||||
# define SERIO_MAGELLAN 0x1a
|
||||
#endif
|
||||
#ifndef SERIO_SPACEBALL
|
||||
# define SERIO_SPACEBALL 0x1b
|
||||
#endif
|
||||
#ifndef SERIO_GUNZE
|
||||
# define SERIO_GUNZE 0x1c
|
||||
#endif
|
||||
#ifndef SERIO_IFORCE
|
||||
# define SERIO_IFORCE 0x1d
|
||||
#endif
|
||||
#ifndef SERIO_STINGER
|
||||
# define SERIO_STINGER 0x1e
|
||||
#endif
|
||||
#ifndef SERIO_NEWTON
|
||||
# define SERIO_NEWTON 0x1f
|
||||
#endif
|
||||
#ifndef SERIO_STOWAWAY
|
||||
# define SERIO_STOWAWAY 0x20
|
||||
#endif
|
||||
#ifndef SERIO_H3600
|
||||
# define SERIO_H3600 0x21
|
||||
#endif
|
||||
#ifndef SERIO_PS2SER
|
||||
# define SERIO_PS2SER 0x22
|
||||
#endif
|
||||
#ifndef SERIO_TWIDKBD
|
||||
# define SERIO_TWIDKBD 0x23
|
||||
#endif
|
||||
#ifndef SERIO_TWIDJOY
|
||||
# define SERIO_TWIDJOY 0x24
|
||||
#endif
|
||||
#ifndef SERIO_HIL
|
||||
# define SERIO_HIL 0x25
|
||||
#endif
|
||||
#ifndef SERIO_SNES232
|
||||
# define SERIO_SNES232 0x26
|
||||
#endif
|
||||
#ifndef SERIO_SEMTECH
|
||||
# define SERIO_SEMTECH 0x27
|
||||
#endif
|
||||
#ifndef SERIO_LKKBD
|
||||
# define SERIO_LKKBD 0x28
|
||||
#endif
|
||||
#ifndef SERIO_ELO
|
||||
# define SERIO_ELO 0x29
|
||||
#endif
|
||||
#ifndef SERIO_MICROTOUCH
|
||||
# define SERIO_MICROTOUCH 0x30
|
||||
#endif
|
||||
#ifndef SERIO_PENMOUNT
|
||||
# define SERIO_PENMOUNT 0x31
|
||||
#endif
|
||||
#ifndef SERIO_TOUCHRIGHT
|
||||
# define SERIO_TOUCHRIGHT 0x32
|
||||
#endif
|
||||
#ifndef SERIO_TOUCHWIN
|
||||
# define SERIO_TOUCHWIN 0x33
|
||||
#endif
|
||||
#ifndef SERIO_FUJITSU
|
||||
# define SERIO_FUJITSU 0x34
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user