xserver-xorg-input-mouse: Changes to 'debian-experimental'
.gitignore | 6
ChangeLog | 198 ++++++++++++++++++++++++++
configure.ac | 19 --
debian/README.source | 73 +++++++++
debian/changelog | 34 ++++
debian/control | 8 -
debian/local/10-x11-mouse.fdi | 10 +
debian/rules | 8 -
debian/xsfbs/repack.sh | 32 ++++
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 ------------------------------------------
man/.cvsignore | 2
man/mousedrv.man | 3
src/.cvsignore | 6
src/mouse.c | 198 +++++++-------------------
src/mouse.h | 3
src/sun_mouse.c | 104 +++++++-------
17 files changed, 487 insertions(+), 549 deletions(-)
New commits:
commit 11a82baf260ad5b5f2d72f02a8ac0df18995aac2
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Dec 5 22:37:48 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 044950b..35a5d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.5.0-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:04 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Dec 2009 22:37:33 +0100
xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
commit 78e6c0dfd9dfdf4f2c01402a657581ce922c8a91
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:23 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index f7ad30f..044950b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:30:50 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:04 +0200
xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c212ee8..ef051c1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-input-dev,
x11proto-core-dev,
x11proto-randr-dev,
commit 9e230a8beaa8ac77f159a9b1f20408689b8bc8d6
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 15:39:14 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index 53c1a52..f7ad30f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:30:50 +0200
diff --git a/debian/control b/debian/control
index 2a04c08..c212ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
dpkg-dev (>= 1.14.17),
automake,
libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git
commit c12a06ddabe311e71d8ac4fcec6ed3c1e38eab31
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 15:31:17 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 84f370f..d800f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,201 @@
+commit 2b6dc8ccfe85356d309e3191cf5b942c6d4e0cd5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 12:09:46 2009 +1000
+
+ mouse 1.5.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6bae95035db026b7f3189a21942ce7953a6e3437
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 6 12:07:45 2009 +1000
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 622cf1834725c3348cfdc41c12e39b327011c836
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Sep 12 20:18:06 2009 -0700
+
+ Fix crashes due to MouseBlockHandler/MouseWakeupHandler with invalid devices
+
+ Don't install the handlers if devices failed to open/initalize.
+ Remove the handlers when disabling Emulate3Soft mode, since otherwise
+ they'll be left around when device is closed & device structs are freed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit bc7933171e08215ba28bc06c80ee1bc1febc0522
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Sep 9 11:48:58 2009 +1000
+
+ mouse 1.4.99.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 04a29c8c8ebc6fbc6f5b67026b659a2ffdd6540b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 7 11:12:13 2009 -0400
+
+ xf86-input-mouse: Remove unused .cvsignore file #23776
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fa997144458527856b71fa162a105a46af8e688a
+Author: Donald Kayser <xorg@kayser.net>
+Date: Thu Sep 3 09:22:30 2009 +1000
+
+ signed/unsigned fixes for delta x,y movement
+
+ Changed the cast of (char) to (signed char) while computing delta x
+ and delta y mouse movements. The C standard does not define compiler
+ behavior, and currently with PPC builds, the (char) cast is unsigned.
+ To guarantee that the compiler will generate signed values, the cast
+ has been changed
+
+ Signed-off-by: Donald Kayser <xorg@kayser.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f292f23baf4db048917a2acd4def9fab4293bc85
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 20 13:49:52 2009 -0700
+
+ sun_mouse: Don't try calling ioctls if mouse fd wasn't opened
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit f93c927178a352eec00b3323eb935cc6f27243b0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 20 13:29:25 2009 -0700
+
+ Remove check for OS/2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 1be9e3cf0c491cddfb5985b6b3cc65581313f98f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 20 13:26:40 2009 -0700
+
+ sun_mouse: Check if streams module is already on the stack before pushing it
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit bf95ccf496d6674a83c44d559e3eef8729c69449
+Author: Dima Kogan <dkogan@secretsauce.net>
+Date: Sun Aug 16 22:27:28 2009 -0700
+
+ Restrict wheel emulation to a single axis at a time.
+
+ Wheel emulation works for both horizontal and vertical axes. Thus, if a
+ device doesn't move in perfect straight line, scroll events build up on the
+ respective other axis.
+
+ In some clients, scroll wheel events have specific meanings other than
+ scrolling (e.g. mplayer). In these clients, erroneous scrolling events come
+ at a high cost.
+
+ Thus, if a scroll wheel event is generated for one axis, reset the inertia
+ of the other axis to 0, avoiding the buildup of these erroneous scrolling
+ events.
+
+ Signed-off-by: Dima Kogan <dkogan@secretsauce.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2d43329d778d7bfae5d9c99611ad49efa56716a6
+Author: Dima Kogan <dkogan@secretsauce.net>
+Date: Sun Aug 16 21:33:43 2009 -0700
+
+ Allow 0 as wheel emulation button for unconditional scrolling (#20529)
+
+ If wheel emulation is on and the emulation button is 0, then any x/y motion
+ of the device is converted into wheel events. The device becomes a
+ scrolling-only device.
+
+ Signed-off-by: Dima Kogan <dkogan@dkogan@cds.caltech.edu>
+ Signed-off-by: Dima Kogan <dkogan@secretsauce.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0996fd2e3dcac813ad450884e8c117bc4d49b89a
+Merge: 66bdf8d 8a3f6f7
+Author: Charlie <root@netbsd.(none)>
+Date: Thu Jul 9 10:05:46 2009 +0200
+
+ Merge branch 'master' of ssh://mbalmer@git.freedesktop.org/git/xorg/driver/xf86-input-mouse
+
+commit 66bdf8d3f289a3ada44c37f3ceb00fc728975cac
+Author: Charlie <root@netbsd.(none)>
+Date: Thu Jul 9 08:09:54 2009 +0200
+
+ Conditionally declare some variables that are only used conditionally.
+
+ Reviewed-by: Matthieu Herrn <matthieu@openbsd.org>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8a3f6f75218080b3e7657cb104c6f8e025f358ef
+Author: Charlie <root@netbsd.(none)>
+Date: Thu Jul 9 08:09:54 2009 +0200
+
+ Conditionally declare some variables that are only used conditionally.
+
+commit 2ddc4e9b2882914a56508613fe069c7335c64cc7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 18 16:11:47 2009 +1000
+
+ Protect against ABI_XINPUT_VERSION 7.
+
+ Missing the actual button and axis labeling, this can be added at a later
+ point in time.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 91bf15dd2af4bf9a83e317b8821bcbbfdba02338
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri May 29 10:07:19 2009 +1000
+
+ Remove ModuleInfoRec and associated bits.
+
+ ModuleInfoRec was removed with 2107becb0ce2ffda001be65728c53563496d8d50 from
+ the server. The MouseOpts were only used from the ModuleInfoRec, they're
+ gone now too.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b698a24ab233ec5da2ebd36b5f6f199219de6d44
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Mar 25 08:37:01 2009 +1000
+
+ Remove xf86MouseProtocolIDToName and xf86MouseProtocolNameToID.
+
+ Both were only used from the xf86-misc extension which is gone from the
+ server as of 1.6.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6887ca0de8314b6029d5df63777b29c46eeb9442
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Mar 25 08:45:10 2009 +1000
+
+ Require xorg-server 1.5.99.901 or higher.
+
+ 1.6 is the first server release that has the xf86OSmouse.h and related code
+ removed. This code has moved into the mouse driver and attempts of using a
+ mouse driver that provides xf86OSmouse.h with a pre-1.6 xserver may fail.
+
+ See also:
+ http://lists.freedesktop.org/archives/xorg/2009-March/044501.html
+
+ Reported-by: Jeremy C. Reed <reed@reedmedia.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit abc65bec5c88acd0a8699920e18473cfa007169f
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Wed Feb 4 20:48:33 2009 -0200
+
+ Janitor: use $PKG_CONFIG and update .gitignore.
+
+ Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+
commit 5058dc340278f2498dd1b4db129dc6dd6b0e0964
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 18:38:57 2009 -0800
diff --git a/debian/changelog b/debian/changelog
index ebb8a07..53c1a52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:30:50 +0200
+
xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
* Rename the fdi file to match what we're installing... (closes: #542806)
commit 2b6dc8ccfe85356d309e3191cf5b942c6d4e0cd5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:09:46 2009 +1000
mouse 1.5.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ebb736e..11c7cab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.4.99.1,
+ 1.5.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit 6bae95035db026b7f3189a21942ce7953a6e3437
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:07:45 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8610206..ebb736e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ AC_INIT([xf86-input-mouse],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
-# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
@@ -45,7 +45,7 @@ AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
@@ -89,11 +89,6 @@ AC_SUBST([OS_MOUSE_NAME])
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
XORG_CHECK_LINUXDOC
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 622cf1834725c3348cfdc41c12e39b327011c836
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Sep 12 20:18:06 2009 -0700
Fix crashes due to MouseBlockHandler/MouseWakeupHandler with invalid devices
Don't install the handlers if devices failed to open/initalize.
Remove the handlers when disabling Emulate3Soft mode, since otherwise
they'll be left around when device is closed & device structs are freed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/mouse.c b/src/mouse.c
index 23dc726..8347be9 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1691,6 +1691,11 @@ MouseProc(DeviceIntPtr device, int what)
}
xf86FlushInput(pInfo->fd);
xf86AddEnabledDevice(pInfo);
+ if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
+ RegisterBlockAndWakeupHandlers (MouseBlockHandler,
+ MouseWakeupHandler,
+ (pointer) pInfo);
+ }
}
}
}
@@ -1701,11 +1706,6 @@ MouseProc(DeviceIntPtr device, int what)
pMse->wheelButtonExpires = GetTimeInMillis ();
device->public.on = TRUE;
FlushButtons(pMse);
- if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
- {
- RegisterBlockAndWakeupHandlers (MouseBlockHandler, MouseWakeupHandler,
- (pointer) pInfo);
- }
break;
case DEVICE_OFF:
@@ -1720,7 +1720,8 @@ MouseProc(DeviceIntPtr device, int what)
pInfo->fd = -1;
if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
{
- RemoveBlockAndWakeupHandlers (MouseBlockHandler, MouseWakeupHandler,
+ RemoveBlockAndWakeupHandlers (MouseBlockHandler,
+ MouseWakeupHandler,
(pointer) pInfo);
}
}
@@ -1967,7 +1968,10 @@ Emulate3ButtonsSoft(InputInfoPtr pInfo)
buttonTimer(pInfo);
xf86Msg(X_INFO,"3rd Button detected: disabling emulate3Button\n");
-
+
+ RemoveBlockAndWakeupHandlers (MouseBlockHandler, MouseWakeupHandler,
+ (pointer) pInfo);
+
return FALSE;
}
commit bc7933171e08215ba28bc06c80ee1bc1febc0522
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 11:48:58 2009 +1000
mouse 1.4.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 78c278a..8610206 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.4.0,
+ 1.4.99.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit 04a29c8c8ebc6fbc6f5b67026b659a2ffdd6540b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-input-mouse: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit fa997144458527856b71fa162a105a46af8e688a
Author: Donald Kayser <xorg@kayser.net>
Date: Thu Sep 3 09:22:30 2009 +1000
signed/unsigned fixes for delta x,y movement
Changed the cast of (char) to (signed char) while computing delta x
and delta y mouse movements. The C standard does not define compiler
behavior, and currently with PPC builds, the (char) cast is unsigned.
To guarantee that the compiler will generate signed values, the cast
has been changed
Signed-off-by: Donald Kayser <xorg@kayser.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/mouse.c b/src/mouse.c
index aff2512..23dc726 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1301,8 +1301,8 @@ MouseReadInput(InputInfoPtr pInfo)
buttons = (pMse->lastButtons & 2)
| ((int)(pBuf[0] & 0x20) >> 3)
| ((int)(pBuf[0] & 0x10) >> 4);
- dx = (char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
- dy = (char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
+ dx = (signed char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
+ dy = (signed char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
break;
case PROT_GLIDE: /* ALPS GlidePoint */
@@ -1311,14 +1311,14 @@ MouseReadInput(InputInfoPtr pInfo)
buttons = (pMse->lastButtons & (8 + 2))
| ((int)(pBuf[0] & 0x20) >> 3)
| ((int)(pBuf[0] & 0x10) >> 4);
- dx = (char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
- dy = (char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
+ dx = (signed char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
+ dy = (signed char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
break;
case PROT_MSC: /* Mouse Systems Corp */
buttons = (~pBuf[0]) & 0x07;
- dx = (char)(pBuf[1]) + (char)(pBuf[3]);
- dy = - ((char)(pBuf[2]) + (char)(pBuf[4]));
+ dx = (signed char)(pBuf[1]) + (char)(pBuf[3]);
+ dy = - ((signed char)(pBuf[2]) + (char)(pBuf[4]));
break;
case PROT_MMHIT: /* MM_HitTablet */
@@ -1346,8 +1346,8 @@ MouseReadInput(InputInfoPtr pInfo)
case PROT_BM: /* BusMouse */
buttons = (~pBuf[0]) & 0x07;
- dx = (char)pBuf[1];
- dy = - (char)pBuf[2];
+ dx = (signed char)pBuf[1];
+ dy = - (signed char)pBuf[2];
break;
case PROT_PS2: /* PS/2 mouse */
@@ -1511,8 +1511,8 @@ MouseReadInput(InputInfoPtr pInfo)
buttons = ((int)(pBuf[0] & 0x20) >> 3)
| ((int)(pBuf[0] & 0x10) >> 4)
| ((int)(pBuf[3] & 0x10) >> 3);
- dx = (char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
- dy = (char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
+ dx = (signed char)(((pBuf[0] & 0x03) << 6) | (pBuf[1] & 0x3F));
+ dy = (signed char)(((pBuf[0] & 0x0C) << 4) | (pBuf[2] & 0x3F));
dz = (pBuf[3] & 0x08) ? ((int)(pBuf[3] & 0x0F) - 0x10) :
((int)(pBuf[3] & 0x0F));
break;
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
Reply to: