From d79318f269d959d566ec66239b4c985afd61b259 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 May 2009 08:29:14 +1000 Subject: [PATCH] dix: Add a deviceid to the DeviceChangedEvent. ChangeDeviceId would actually overwrite the flags field if deviceid wasn't present. Aside from the event of course not telling which device generated it in the first place. Signed-off-by: Peter Hutterer --- dix/getevents.c | 1 + include/events.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dix/getevents.c b/dix/getevents.c index 5ff4f91b9..ff249c803 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -195,6 +195,7 @@ CreateClassesChangedEvent(EventList* event, dce = (DeviceChangedEvent*)event->event; memset(dce, 0, sizeof(DeviceChangedEvent)); + dce->deviceid = master->id; dce->header = ET_Internal; dce->length = sizeof(DeviceChangedEvent); dce->type = ET_DeviceChanged; diff --git a/include/events.h b/include/events.h index ab8f2176a..cc5092ee4 100644 --- a/include/events.h +++ b/include/events.h @@ -125,6 +125,7 @@ typedef struct int type; /**< ET_DeviceChanged */ int length; /**< Length in bytes */ Time time; /**< Time in ms */ + int deviceid; /**< Device whose capabilities have changed */ int flags; /**< Mask of ::HAS_OLD_SLAVE or ::HAS_NEW_SLAVE */ /** If flags & HAS_OLD_SLAVE is set, old_slaveid specifies SD previously * attached to this device. */