auto-import changelog data from gpm-1.20.1-44.src.rpm
Wed Mar 17 2004 Bill Nottingham <notting@redhat.com> 1.20.1-44
- include inputattach
- if configured mouse has IMOUSETYPE, use inputattach
Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
Thu Feb 26 2004 Adrian Havill <havill@redhat.com> 1.20.1-43
- add event device (for 2.6 kernel) superpatch-- includes all patches up to
release 38; thanks to Dmitry Torokhov
- change default mouse device over to /dev/input/mice
- set mouse type to Intellimouse Explorer (exps2), which is what the 2.6
kernel exports by default
Sat Feb 14 2004 Florian La Roche <Florian.LaRoche@redhat.de>
- already add shared lib symlinks at install time
- fix subscript #114289
Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
Tue Nov 18 2003 Adrian Havill <havill@redhat.com> 1.20.1-39
- re-add the $OPTIONS that gets pulled in from /etc/sysconfig/gpm to the
init.d script (#110248)
This commit is contained in:
cvsdist
parent
c78d0885e9
commit
f476c1f288
@ -1,23 +0,0 @@
|
||||
diff -pruN gpm-1.20.1/src/lib/liblow.c.orig gpm-1.20.1/src/lib/liblow.c
|
||||
--- gpm-1.20.1/src/lib/liblow.c.orig 2003-08-03 17:55:00.000000000 +0200
|
||||
+++ gpm-1.20.1/src/lib/liblow.c 2003-08-03 17:59:49.000000000 +0200
|
||||
@@ -199,8 +199,6 @@ int Gpm_Open(Gpm_Connect *conn, int flag
|
||||
Gpm_Stst *new = NULL;
|
||||
char* sock_name = 0;
|
||||
|
||||
- option.consolename = NULL;
|
||||
-
|
||||
#if 0
|
||||
gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
|
||||
#endif
|
||||
@@ -259,6 +257,10 @@ int Gpm_Open(Gpm_Connect *conn, int flag
|
||||
gpm_report(GPM_PR_ERR,"checking tty name failed");
|
||||
goto err;
|
||||
}
|
||||
+ if (option.consolename == NULL) {
|
||||
+ gpm_report(GPM_PR_ERR,"option.consolename not set");
|
||||
+ goto err;
|
||||
+ }
|
||||
/* do we really need this check ? */
|
||||
if(strncmp(tty,option.consolename,strlen(option.consolename)-1)
|
||||
|| !isdigit(tty[strlen(option.consolename)-1])) {
|
||||
@ -1,56 +0,0 @@
|
||||
--- gpm-1.20.1/src/report.c.nodebug 2002-12-24 17:57:16.000000000 -0500
|
||||
+++ gpm-1.20.1/src/report.c 2003-07-02 15:07:19.000000000 -0400
|
||||
@@ -126,6 +126,7 @@
|
||||
/******************** RUNNING *****************/
|
||||
case GPM_RUN_DAEMON:
|
||||
switch(stat) {
|
||||
+#if 0
|
||||
case GPM_STAT_INFO:
|
||||
#ifdef HAVE_VSYSLOG
|
||||
syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
|
||||
@@ -165,6 +166,7 @@
|
||||
fclose(console);
|
||||
}
|
||||
break;
|
||||
+#endif
|
||||
|
||||
case GPM_STAT_OOPS:
|
||||
#ifdef HAVE_VSYSLOG
|
||||
@@ -183,6 +185,7 @@
|
||||
/******************** DEBUGGING and CLIENT *****************/
|
||||
case GPM_RUN_DEBUG:
|
||||
switch(stat) {
|
||||
+#if 0
|
||||
case GPM_STAT_INFO:
|
||||
console = stdout;
|
||||
fprintf(console,GPM_STRING_INFO); break;
|
||||
@@ -195,13 +198,15 @@
|
||||
case GPM_STAT_DEBUG:
|
||||
console = stderr;
|
||||
fprintf(console,GPM_STRING_DEBUG); break;
|
||||
+#endif
|
||||
case GPM_STAT_OOPS:
|
||||
console = stderr;
|
||||
fprintf(console,GPM_STRING_OOPS); break;
|
||||
+ vfprintf(console,text,ap);
|
||||
+ fprintf(console,"\n");
|
||||
+ break;
|
||||
}
|
||||
|
||||
- vfprintf(console,text,ap);
|
||||
- fprintf(console,"\n");
|
||||
|
||||
if(stat == GPM_STAT_OOPS) exit(1);
|
||||
|
||||
--- gpm-1.20.1/src/lib/liblow.c.orig 2003-07-02 15:24:40.000000000 -0400
|
||||
+++ gpm-1.20.1/src/lib/liblow.c 2003-07-02 15:24:44.000000000 -0400
|
||||
@@ -201,7 +201,9 @@
|
||||
|
||||
option.consolename = NULL;
|
||||
|
||||
+#if 0
|
||||
gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
|
||||
+#endif
|
||||
|
||||
/*....................................... First of all, check xterm */
|
||||
|
||||
11
gpm-1.20.1-subscript.patch
Normal file
11
gpm-1.20.1-subscript.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- gpm-1.20.1/src/mice.c.lr 2004-02-15 09:19:48.000000000 +0100
|
||||
+++ gpm-1.20.1/src/mice.c 2004-02-15 09:22:18.000000000 +0100
|
||||
@@ -2112,7 +2112,7 @@
|
||||
for (i=0; i<4; i++)
|
||||
if (gunze_calib[i] & ~1023) calibok = 0;
|
||||
if (gunze_calib[0] == gunze_calib[2]) calibok = 0;
|
||||
- if (gunze_calib[1] == gunze_calib[4]) calibok = 0;
|
||||
+ if (gunze_calib[1] == gunze_calib[3]) calibok = 0;
|
||||
fclose(f);
|
||||
}
|
||||
if (!calibok) {
|
||||
@ -1,46 +0,0 @@
|
||||
When libncurses is configured with gpm support and gpm with ncurses support,
|
||||
libncurses.so depends on libgpm.so and libgpm.so depends on libncurses.so.
|
||||
Such loops should never happen.
|
||||
If Gpm_Wgetch is passed non-NULL win argument, it must have been created by
|
||||
ncurses anyway and so it should be already loaded.
|
||||
On the other side, if Gpm_Wgetch is never used or used just with
|
||||
NULL argument, libncurses is never needed.
|
||||
|
||||
--- gpm-1.20.1/configure.in.jj Tue Jul 18 09:17:32 2000
|
||||
+++ gpm-1.20.1/configure.in Mon Jun 16 10:51:16 2003
|
||||
@@ -98,7 +98,7 @@ No|no|N|n) SHARED_LIBS=-lc ;;
|
||||
AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
|
||||
else :; fi
|
||||
done
|
||||
- SHARED_LIBS="$LIBS $TERMLIBS -lc"
|
||||
+ SHARED_LIBS="-lc"
|
||||
LIBS=$SAVELIBS ;;
|
||||
esac
|
||||
|
||||
--- gpm-1.20.1/configure.jj Tue Jul 18 09:18:10 2000
|
||||
+++ gpm-1.20.1/configure Mon Jun 16 10:51:32 2003
|
||||
@@ -1582,7 +1582,7 @@ fi
|
||||
|
||||
else :; fi
|
||||
done
|
||||
- SHARED_LIBS="$LIBS $TERMLIBS -lc"
|
||||
+ SHARED_LIBS="-lc"
|
||||
LIBS=$SAVELIBS ;;
|
||||
esac
|
||||
|
||||
--- gpm-1.20.1/src/lib/libcurses.c.jj Mon Jan 17 16:34:00 2000
|
||||
+++ gpm-1.20.1/src/lib/libcurses.c Mon Jun 16 10:55:52 2003
|
||||
@@ -40,7 +40,12 @@
|
||||
#endif /* HAVE_NCURSES_CURSES_H */
|
||||
#endif /* HAVE_NCURSES_H */
|
||||
|
||||
-#define GET(win) ((win) ? wgetch(win) : getch())
|
||||
+/* If win != NULL, it must have been created by ncurses anyway.
|
||||
+ Avoid circular library dependencies. */
|
||||
+#pragma weak wgetch
|
||||
+#pragma weak stdscr
|
||||
+
|
||||
+#define GET(win) ((win && wgetch) ? wgetch(win) : getch())
|
||||
|
||||
int Gpm_Wgetch(WINDOW *win)
|
||||
{
|
||||
7023
gpm-evdev-cumulative.patch
Normal file
7023
gpm-evdev-cumulative.patch
Normal file
File diff suppressed because it is too large
Load Diff
10
gpm.init
10
gpm.init
@ -39,11 +39,17 @@ start() {
|
||||
if [ -z "$DEVICE" ]; then
|
||||
DEVICE="/dev/mouse"
|
||||
fi
|
||||
|
||||
if [ -n "$IMOUSETYPE" ]; then
|
||||
modprobe sermouse > /dev/null 2>&1
|
||||
/usr/sbin/inputattach -$IMOUSETYPE $DEVICE --daemon
|
||||
. /etc/sysconfig/gpm
|
||||
fi
|
||||
|
||||
if [ -n "$MOUSETYPE" ]; then
|
||||
daemon gpm -m $DEVICE -t $MOUSETYPE
|
||||
daemon gpm -m $DEVICE -t $MOUSETYPE $OPTIONS
|
||||
else
|
||||
daemon gpm -m $DEVICE
|
||||
daemon gpm -m $DEVICE $OPTIONS
|
||||
fi
|
||||
RETVAL=$?
|
||||
echo
|
||||
|
||||
60
gpm.spec
60
gpm.spec
@ -1,20 +1,15 @@
|
||||
Summary: A mouse server for the Linux console.
|
||||
Name: gpm
|
||||
Version: 1.20.1
|
||||
Release: 38
|
||||
Release: 44
|
||||
License: GPL
|
||||
Group: System Environment/Daemons
|
||||
Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
|
||||
Source1: gpm.init
|
||||
Patch5: gpm-1.20.1-secenhance.patch
|
||||
Patch6: gpm-1.20.1-limits.patch
|
||||
Patch7: gpm-1.20.1-serialconsole.patch
|
||||
Patch10: gpm-1.20.1-norepeater.patch
|
||||
Patch11: gpm-1.20.1-weak-wgetch.patch
|
||||
Patch12: gpm-1.20.1-math.patch
|
||||
Patch13: gpm-1.20.1-nodebug.patch
|
||||
Patch14: gpm-1.20.1-deref-null.patch
|
||||
Patch15: gpm-1.20.1-gpmopen.patch
|
||||
Source2: inputattach.c
|
||||
Patch1: gpm-evdev-cumulative.patch
|
||||
Patch2: gpm-1.20.1-math.patch
|
||||
Patch16: gpm-1.20.1-subscript.patch
|
||||
|
||||
Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
|
||||
Requires: bash >= 2.0
|
||||
@ -46,14 +41,9 @@ mouse button.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch5 -p1 -b .secenhance
|
||||
%patch6 -p1 -b .limits
|
||||
#%patch7 -p1 -b .serialconsole
|
||||
#%patch10 -p1 -b .repeater
|
||||
%patch11 -p1 -b .weak-wgetch
|
||||
%patch12 -p1 -b .math
|
||||
%patch13 -p1 -b .nodebug
|
||||
%patch15 -p1 -b .gpmopen
|
||||
%patch1 -p1 -b .evdev
|
||||
%patch2 -p1 -b .math
|
||||
%patch16 -p1 -b .subscript
|
||||
|
||||
%build
|
||||
autoconf
|
||||
@ -61,6 +51,8 @@ CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" \
|
||||
lispdir=%{buildroot}%{_datadir}/emacs/site-lisp \
|
||||
%configure
|
||||
make
|
||||
gcc $RPM_OPT_FLAGS -o inputattach %{SOURCE2}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
@ -70,6 +62,7 @@ PATH=/sbin:$PATH:/usr/sbin:$PATH
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
|
||||
%makeinstall lispdir=%{buildroot}%{_datadir}/emacs/site-lisp
|
||||
install -m 755 inputattach %{buildroot}/%{_sbindir}
|
||||
|
||||
%ifnarch s390 s390x
|
||||
install -m644 doc/gpm-root.1 %{buildroot}%{_mandir}/man1
|
||||
@ -85,6 +78,7 @@ cp contrib/emacs/t-mouse.el* %{buildroot}%{_datadir}/emacs/site-lisp
|
||||
pushd %{buildroot}
|
||||
chmod +x .%{_libdir}/libgpm.so.%{LIBVER}
|
||||
ln -sf libgpm.so.%{LIBVER} .%{_libdir}/libgpm.so
|
||||
/sbin/ldconfig -n .%{_libdir}
|
||||
gzip -9nf .%{_infodir}/gpm.info*
|
||||
popd
|
||||
}
|
||||
@ -98,7 +92,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
|
||||
cat >$RPM_BUILD_ROOT/etc/sysconfig/gpm <<EOF
|
||||
# Additional options for gpm (e.g. acceleration), device
|
||||
OPTIONS=""
|
||||
DEVICE="/dev/mouse"
|
||||
DEVICE="/dev/input/mice"
|
||||
MOUSETYPE="exps2"
|
||||
EOF
|
||||
|
||||
# remove stuff from the buildroot that we aren't shipping
|
||||
@ -109,6 +104,7 @@ rm -f $RPM_BUILD_ROOT/usr/sbin/gpm
|
||||
rm -f $RPM_BUILD_ROOT/usr/bin/hltest
|
||||
rm -f $RPM_BUILD_ROOT/usr/bin/mouse-test
|
||||
rm -rf $RPM_BUILD_ROOT/%{_mandir}
|
||||
rm -f $RPM_BUILD_ROOT/usr/sbin/inputattach
|
||||
%endif
|
||||
|
||||
%clean
|
||||
@ -152,6 +148,7 @@ fi
|
||||
%{_mandir}/man7/gpm-types*
|
||||
%{_mandir}/man8/gpm*
|
||||
/usr/sbin/gpm
|
||||
/usr/sbin/inputattach
|
||||
%endif
|
||||
%{_datadir}/emacs/site-lisp/t-mouse.el
|
||||
%{_datadir}/emacs/site-lisp/t-mouse.elc
|
||||
@ -166,6 +163,31 @@ fi
|
||||
%{_libdir}/libgpm.so
|
||||
|
||||
%changelog
|
||||
* Wed Mar 17 2004 Bill Nottingham <notting@redhat.com> 1.20.1-44
|
||||
- include inputattach
|
||||
- if configured mouse has IMOUSETYPE, use inputattach
|
||||
|
||||
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Thu Feb 26 2004 Adrian Havill <havill@redhat.com> 1.20.1-43
|
||||
- add event device (for 2.6 kernel) superpatch-- includes all
|
||||
patches up to release 38; thanks to Dmitry Torokhov
|
||||
- change default mouse device over to /dev/input/mice
|
||||
- set mouse type to Intellimouse Explorer (exps2), which is what
|
||||
the 2.6 kernel exports by default
|
||||
|
||||
* Sat Feb 14 2004 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
- already add shared lib symlinks at install time
|
||||
- fix subscript #114289
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Nov 18 2003 Adrian Havill <havill@redhat.com> 1.20.1-39
|
||||
- re-add the $OPTIONS that gets pulled in from /etc/sysconfig/gpm
|
||||
to the init.d script (#110248)
|
||||
|
||||
* Wed Aug 07 2003 Adrian Havill <havill@redhat.com> 1.20.1-38
|
||||
- Gpm_Open() NULL deref revisited (#101104). Patch by
|
||||
<leonardjo@hetnet.nl>
|
||||
|
||||
472
inputattach.c
Normal file
472
inputattach.c
Normal file
@ -0,0 +1,472 @@
|
||||
/*
|
||||
* $Id: inputattach.c,v 1.1 2004/09/09 05:52:18 cvsdist 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 <assert.h>
|
||||
#include <ctype.h>
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
int magellan_init(int fd, long *id, long *extra)
|
||||
{
|
||||
write(fd, "m3\rpBB\rz\r", 9);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int warrior_init(int fd, long *id, long *extra)
|
||||
{
|
||||
if (logitech_command(fd, "*S")) return -1;
|
||||
setline(fd, CS8, B4800);
|
||||
return 0;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
int spaceball_init(int fd, long *id, 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;
|
||||
}
|
||||
|
||||
int stinger_init(int fd, long *id, 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;
|
||||
}
|
||||
|
||||
int mzp_init(int fd, long *id, long *extra)
|
||||
{
|
||||
if (logitech_command(fd, "*X*q")) return -1;
|
||||
setline(fd, CS8, B9600);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int newton_init(int fd, long *id, 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 < 35; i++)
|
||||
if (readchar(fd, &c, 400) || (c != response[i]))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int twiddler_init(int fd, long *id, 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+0, 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) != 0)
|
||||
|| (count % 5 == 4 && (c[count] & 0xF0) != 0x80)
|
||||
|| (count % 5 != 0 && (c[count] & 0x80) != 0x80)) {
|
||||
/* Invalid byte in data packet */
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dump_init(int fd, long *id, 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 {
|
||||
char name[16];
|
||||
char name2[16];
|
||||
int speed;
|
||||
int flags;
|
||||
unsigned long type;
|
||||
unsigned long extra;
|
||||
int flush;
|
||||
int (*init)(int fd, long *id, long *extra);
|
||||
};
|
||||
|
||||
struct input_types input_types[] = {
|
||||
|
||||
{ "--sunkbd", "-skb", B1200, CS8, SERIO_SUNKBD, 0x00, 1, NULL },
|
||||
{ "--spaceorb", "-orb", B9600, CS8, SERIO_SPACEORB, 0x00, 1, NULL },
|
||||
{ "--spaceball", "-sbl", B9600, CS8, SERIO_SPACEBALL,0x00, 0, spaceball_init },
|
||||
{ "--magellan", "-mag", B9600, CS8 | CSTOPB | CRTSCTS, SERIO_MAGELLAN, 0x00, 1, magellan_init },
|
||||
{ "--warrior", "-war", B1200, CS7 | CSTOPB, SERIO_WARRIOR, 0x00, 1, warrior_init },
|
||||
{ "--stinger", "-sting", B1200, CS8, SERIO_STINGER, 0x00, 1, stinger_init },
|
||||
{ "--mousesystems", "-msc", B1200, CS8, SERIO_MSC, 0x01, 1, NULL },
|
||||
{ "--sunmouse", "-sun", B1200, CS8, SERIO_SUN, 0x01, 1, NULL },
|
||||
{ "--microsoft", "-bare", B1200, CS7, SERIO_MS, 0x00, 1, NULL },
|
||||
{ "--mshack", "-ms", B1200, CS7, SERIO_MS, 0x01, 1, NULL },
|
||||
{ "--mouseman", "-mman", B1200, CS7, SERIO_MP, 0x01, 1, NULL },
|
||||
{ "--intellimouse", "-ms3", B1200, CS7, SERIO_MZ, 0x11, 1, NULL },
|
||||
{ "--mmwheel", "-mmw", B1200, CS7 | CSTOPB, SERIO_MZP, 0x13, 1, mzp_init },
|
||||
{ "--iforce", "-ifor", B38400, CS8, SERIO_IFORCE, 0x00, 0, NULL },
|
||||
{ "--newtonkbd", "-newt", B9600, CS8, SERIO_NEWTON, 0x00, 0, newton_init },
|
||||
{ "--h3600ts", "-ipaq", B115200, CS8, SERIO_H3600, 0x00, 0, NULL },
|
||||
{ "--stowawaykbd", "-ipaqkbd", B115200, CS8, SERIO_STOWAWAY, 0x00, 0, NULL },
|
||||
{ "--ps2serkbd", "-ps2ser", B1200, CS8, SERIO_PS2SER, 0x00, 1, NULL },
|
||||
#if 0
|
||||
{ "--twiddler", "-twid", B2400, CS8, SERIO_TWIDKBD, 0x00, 0, twiddler_init },
|
||||
{ "--twiddler-joy", "-twidjoy", B2400, CS8, SERIO_TWIDJOY, 0x00, 0, twiddler_init },
|
||||
{ "--ipod-remote", "-ipod", B9600, CS8, SERIO_IPOD_REM, 0x00, 0, NULL },
|
||||
#endif
|
||||
{ "--dump", "-dump", B2400, CS8, 0, 0x00, 0, dump_init },
|
||||
{ "", "", 0, 0 }
|
||||
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
unsigned long devt;
|
||||
int ldisc;
|
||||
int type;
|
||||
long id, extra;
|
||||
int fd;
|
||||
char c;
|
||||
|
||||
if (argc < 2 || argc > 4 || (argc == 4 && strcmp(argv[3], "--daemon")) || !strcmp("--help", argv[1])) {
|
||||
puts("");
|
||||
puts("Usage: inputttach <mode> <device>");
|
||||
puts("");
|
||||
puts("Modes:");
|
||||
puts(" --sunkbd -skb Sun Type 4 and Type 5 keyboards");
|
||||
puts(" --spaceorb -orb SpaceOrb 360 / SpaceBall Avenger");
|
||||
puts(" --spaceball -sbl SpaceBall 2003 / 3003 / 4000 FLX");
|
||||
puts(" --magellan -mag Magellan / SpaceMouse");
|
||||
puts(" --warrior -war WingMan Warrior");
|
||||
puts(" --stinger -stng Gravis Stinger");
|
||||
puts(" --mousesystems -msc 3-button Mouse Systems mice");
|
||||
puts(" --sunmouse -sun 3-button Sun mice");
|
||||
puts(" --microsoft -bare 2-button Microsoft mice");
|
||||
puts(" --mshack -ms 3-button mice in Microsoft mode");
|
||||
puts(" --mouseman -mman 3-button Logitech and Genius mice");
|
||||
puts(" --intellimouse -ms3 Microsoft IntelliMouse");
|
||||
puts(" --mmwheel -mmw Logitech mice with 4-5 buttons or wheel");
|
||||
puts(" --iforce -ifor I-Force joysticks and wheels");
|
||||
puts(" --h3600ts -ipaq Ipaq h3600 touchscreen");
|
||||
puts(" --stowawaykbd -ipaqkbd Stowaway keyboard");
|
||||
puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard");
|
||||
#if 0
|
||||
puts(" --twiddler -twid Handykey Twiddler chording keyboard");
|
||||
puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick");
|
||||
puts(" --ipod-remote -ipod iPod remote control");
|
||||
#endif
|
||||
puts("");
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (type = 0; input_types[type].speed; type++) {
|
||||
if (!strncasecmp(argv[1], input_types[type].name, 16) ||
|
||||
!strncasecmp(argv[1], input_types[type].name2, 16))
|
||||
break;
|
||||
}
|
||||
|
||||
if (!input_types[type].speed) {
|
||||
fprintf(stderr, "inputattach: invalid mode\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((fd = open(argv[2], O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) {
|
||||
perror("inputattach");
|
||||
return 1;
|
||||
}
|
||||
|
||||
setline(fd, input_types[type].flags, input_types[type].speed);
|
||||
|
||||
if (input_types[type].flush)
|
||||
while (!readchar(fd, &c, 100));
|
||||
|
||||
id = 0;
|
||||
extra = input_types[type].extra;
|
||||
|
||||
if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
|
||||
fprintf(stderr, "inputattach: device initialization failed\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
ldisc = N_MOUSE;
|
||||
if(ioctl(fd, TIOCSETD, &ldisc)) {
|
||||
fprintf(stderr, "inputattach: can't set line discipline\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
|
||||
|
||||
if(ioctl(fd, SPIOCSTYPE, &devt)) {
|
||||
fprintf(stderr, "inputattach: can't set device type\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (argc == 4 && !strcmp(argv[3],"--daemon"))
|
||||
daemon(0,0);
|
||||
|
||||
read(fd, NULL, 0);
|
||||
|
||||
ldisc = 0;
|
||||
ioctl(fd, TIOCSETD, &ldisc);
|
||||
close(fd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user