Advanced merge warning - internal events

Peter Hutterer peter.hutterer at who-t.net
Wed Feb 18 22:27:57 PST 2009


This is an advanced warning that, come Monday-ish I'll be merging the internal
events rework into master.

Quick reminder: internal events decouple the server's internal event format
from the wire protocol format, leading to some deduplication and also to the
possibility of doing XI2 properly.

I rebased fixes in here and there but it's pretty much the same to what I sent
out a few weeks back. (Sorry Jeremy, XQuartz is probably broken now, see the
custom event handlers)

I was running it stable on all my boxes for the last weeks.  Shortlog below.

Cheers,
  Peter


The following changes since commit 64e595d12e05c4df56b0230cc57924b9beb274d3:
  Peter Hutterer (1):
        dix: check if keybd->key is valid before getting the keyboard state.

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git internal-events

Peter Hutterer (25):
      include: add XInternalEvent.
      dix: add InternalEvent -> core/xi event conversion routines.
      dix: add GetCoreType and GetXIType.
      dix: Add temporary conversion function ConvertBackToXI.
      dix: switch event generation to InternalEvents.
      mi: switch the EQ to contain InternalEvents only.
      dix: change eventconvert to always return an array of xEvents
      xkb: Switch the xkb event processing path over to InternalEvents.
      Xi: support InternalEvents in UpdateDeviceState, parts of POE and EnqueueEvent
      dix: update CheckMotion to deal with DeviceEvents.
      Xi: make ProcessOtherEvents more InternalEvent aware.
      dix: fix EnqueueEvent to work with internal events.
      dix: convert passive grabs to use internal events.
      dix: Deliver{Grabbed|Focused|Device}Events API changed to InternalEvents.
      dix: Switch DeliverGrabbedEvents to use internal events.
      dix: switch DeliverFocusedEvent to internal events.
      dix: switch DeliverDeviceEvents to internal events.
      dix: switch DeliverGrabbedEvent to internal events.
      dix: CheckPassiveGrabsOnWindow moved to internal events.
      dix: Fix PostSyntheticMotion to use a DeviceEvent for posting.
      xkb: _XkbFilterRedirectKey needs to pass InternalEvents down.
      Input: change processing API to InternalEvents.
      dix: remove un-used getValuatorEvents and countValuatorEvents from getevents.c
      mi: change custom handlers to internal events
      mi: split EQ popping and event processing into two functions.

 Xext/xtest.c                |    4 +-
 Xi/exevents.c               |  291 ++++++++++-----------
 dix/Makefile.am             |    2 +
 dix/eventconvert.c          |  346 ++++++++++++++++++++++++
 dix/events.c                |  611 ++++++++++++++++++++++++-------------------
 dix/getevents.c             |  222 +++++++---------
 hw/xfree86/common/xf86DGA.c |  205 ++++++++-------
 include/Makefile.am         |    2 +-
 include/dix.h               |   34 +--
 include/eventconvert.h      |   36 +++
 include/events.h            |  215 +++++++++++++++
 include/exevents.h          |    8 +-
 include/input.h             |   21 +-
 include/inputstr.h          |    8 +-
 include/xkbsrv.h            |   19 +-
 mi/mi.h                     |   16 +-
 mi/mieq.c                   |  248 +++++++----------
 xkb/ddxDevBtn.c             |    4 +
 xkb/xkbAccessX.c            |   72 +++---
 xkb/xkbActions.c            |   42 ++--
 xkb/xkbPrKeyEv.c            |   76 +++---
 21 files changed, 1539 insertions(+), 943 deletions(-)
 create mode 100644 dix/eventconvert.c
 create mode 100644 include/eventconvert.h
 create mode 100644 include/events.h


More information about the xorg-devel mailing list