I'm confused by the comment, "and just using master" ... because the prototype changes:
> -XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, > DeviceChangedEvent *dce) > +XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce) which seems like you were just using device... On Oct 19, 2011, at 11:25 PM, Peter Hutterer wrote: > Instead of device and master (and just using master), drop the master > argument and let the callers pass in the device the event is to be sent for. > > No effective functional changes. > > Signed-off-by: Peter Hutterer <[email protected]> > --- > Xi/exevents.c | 6 +++--- > dix/devices.c | 2 +- > include/exevents.h | 3 +-- > 3 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/Xi/exevents.c b/Xi/exevents.c > index 74a78ec..2ae5a62 100644 > --- a/Xi/exevents.c > +++ b/Xi/exevents.c > @@ -651,7 +651,7 @@ DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to, > DeviceChangedEvent *dc > * Send an XI2 DeviceChangedEvent to all interested clients. > */ > void > -XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, > DeviceChangedEvent *dce) > +XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce) > { > xXIDeviceChangedEvent *dcce; > int rc; > @@ -665,7 +665,7 @@ XISendDeviceChangedEvent(DeviceIntPtr device, > DeviceIntPtr master, DeviceChanged > > /* we don't actually swap if there's a NullClient, swapping is done > * later when event is delivered. */ > - SendEventToAllWindows(master, XI_DeviceChangedMask, (xEvent*)dcce, 1); > + SendEventToAllWindows(device, XI_DeviceChangedMask, (xEvent*)dcce, 1); > free(dcce); > } > > @@ -699,7 +699,7 @@ ChangeMasterDeviceClasses(DeviceIntPtr device, > DeviceChangedEvent *dce) > > /* FIXME: the classes may have changed since we generated the event. */ > DeepCopyDeviceClasses(slave, device, dce); > - XISendDeviceChangedEvent(slave, device, dce); > + XISendDeviceChangedEvent(device, dce); > } > > /** > diff --git a/dix/devices.c b/dix/devices.c > index 64557aa..7c196e0 100644 > --- a/dix/devices.c > +++ b/dix/devices.c > @@ -2360,7 +2360,7 @@ RecalculateMasterButtons(DeviceIntPtr slave) > event.keys.max_keycode = master->key->xkbInfo->desc->max_key_code; > } > > - XISendDeviceChangedEvent(master, master, &event); > + XISendDeviceChangedEvent(master, &event); > } > } > > diff --git a/include/exevents.h b/include/exevents.h > index 4fe6c61..720fb2e 100644 > --- a/include/exevents.h > +++ b/include/exevents.h > @@ -322,8 +322,7 @@ extern int > XIShouldNotify(ClientPtr client, DeviceIntPtr dev); > > extern void > -XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, > - DeviceChangedEvent *dce); > +XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce); > > extern int > XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client, > -- > 1.7.6.4 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
