[PATCH 0/12] Input fixes for 1.6 - backing out XI2

Peter Hutterer peter.hutterer at who-t.net
Thu Nov 27 23:02:58 PST 2008


Keith:

Here's the patch series for backing out XI2 for server-1.6. 
git://people.freedesktop.org/whot/xserver server-1.6-branch

http://cgit.freedesktop.org/~whot/xserver/log/?h=server-1.6-branch

Note the last two patches are not server-1.6 specific, they should also apply
to master. I included them because without them, gimp will bring the server
down when xkb tries to access nonexistant structs.

== Summary: ==
 - All new XI2 requests have been removed.
 - All new XI2 events have been removed. This includes
   DeviceEnter/LeaveNotifies and the XGE events for hierarchy changes,
   etc.
 - No MD class switching anymore (see below).
 - No XI events from MDs anymore (see below).
 - No implicit detaching of SDs (see below). 
 - Dependency on inputproto 1.5 added.

== Details: ==
The XI 1.x input model allows one core pointer, one core keyboard and multiple
XI devices. The request handling to create new MDs has been removed, so we
only have VCP and VCK (which are hardcoded since 1.4).

CP and CK must not send XI events and therefore don't need to
switch classes either. The MD class switching present in master has been
removed. Not sending XI events from CP/CK means we don't have to worry about
supporting device grabs and core grabs on the same device either. And we don't
have to detach SD on grabs either.
 
== Log and stat : ==

Since f0e7a792bedbf9fe9844298ac74445a8116c52aa:

Peter Hutterer (12):
      Xi: remove all new XI2 protocol requests and their handling.
      Xi: remove the GetExtensionVersion hack - don't reply with supported version.
      Xi: don't list attachment in ListInputDevices, but list all SDs.
      Xi: don't allow VCP/VCK be OpenDevice'd, but allow all SDs.
      dix: No DeviceEnterLeave events in server 1.6
      input: don't switch MDs' classes around between SDs.
      Xi: Purge XGE remainders, we don't have any XGE events anymore.
      dix: Don't deliver XI events from MDs.
      dix: don't detach SDs during grabs.
      Require inputproto 1.5
      xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.
      xkb: don't attempt to filter events for devices without key classes.

diffstat:
 Xi/chdevcur.c      |  111 -------------------
 Xi/chdevcur.h      |   39 ------
 Xi/chdevhier.c     |  305 -----------------------------------------------------
 Xi/chdevhier.h     |   42 -------
 Xi/extgrbdev.c     |  216 -------------------------------------
 Xi/extgrbdev.h     |   43 -------
 Xi/getcptr.c       |  108 ------------------
 Xi/getcptr.h       |   43 -------
 Xi/querydp.c       |  168 -----------------------------
 Xi/querydp.h       |   44 -------
 Xi/setcptr.c       |  103 -----------------
 Xi/setcptr.h       |   36 ------
 Xi/warpdevp.c      |  175 ------------------------------
 Xi/warpdevp.h      |   39 ------
 Xi/xiselev.c       |   81 --------------
 Xi/xiselev.h       |   40 ------
 b/Xi/Makefile.am   |   18 ---
 b/Xi/exevents.c    |   49 --------
 b/Xi/extinit.c     |  171 -----------------------------
 b/Xi/getvers.c     |   13 --
 b/Xi/listdev.c     |   34 -----
 b/Xi/opendev.c     |   11 -
 b/configure.ac     |    2 
 b/dix/devices.c    |   20 ---
 b/dix/enterleave.c |   36 ------
 b/dix/events.c     |  202 +++--------------------------------
 b/dix/getevents.c  |   44 -------
 b/mi/mieq.c        |   11 -
 b/xkb/xkbEvents.c  |   33 ++++-
 29 files changed, 55 insertions(+), 2182 deletions(-)

Cheers,
   Peter




More information about the xorg mailing list