[PATCH 3/8] dix: rename DeliverEventsToClients to DeliverEventsToWindowMask

Peter Hutterer peter.hutterer at who-t.net
Wed Jun 1 23:50:34 PDT 2011


On Sun, May 29, 2011 at 01:42:05PM +0200, Simon Thum wrote:
> On 05/27/2011 07:13 AM, Peter Hutterer wrote:
> > To avoid confusion with a future patch and it better describes what this
> > does anyway - delivering events to all clients that have the event mask on
> > the window.
> I find the name a tiny bit off - the window mask doesn't get anything
> delivered, does it? Eg. DeliverToClientsOfWindow? The mask filtering is
> implied by the protocol I assume.

plenty of ambiguity there either way, unfortunately. Is the window client
the one that selected for events or the one that created the window?
Same with "selection" which can also mean the clipboard.

I find window mask is the least ambiguous, precisely because the mask is not
something that gets anything delivered but only decides the delivery.

Cheers,
  Peter

> > 
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> >  dix/events.c |   10 +++++-----
> >  1 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/dix/events.c b/dix/events.c
> > index cab5185..076a46b 100644
> > --- a/dix/events.c
> > +++ b/dix/events.c
> > @@ -2079,9 +2079,9 @@ out:
> >   * mask for this event.
> >   */
> >  static enum EventDeliveryState
> > -DeliverEventToClients(DeviceIntPtr dev, WindowPtr win, xEvent *events,
> > -                      int count, Mask filter, GrabPtr grab,
> > -                      ClientPtr *client_return, Mask *mask_return)
> > +DeliverEventToWindowMask(DeviceIntPtr dev, WindowPtr win, xEvent *events,
> > +                         int count, Mask filter, GrabPtr grab,
> > +                         ClientPtr *client_return, Mask *mask_return)
> >  {
> >      int attempt;
> >      enum EventDeliveryState rc = EVENT_SKIP;
> > @@ -2190,8 +2190,8 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
> >      {
> >          enum EventDeliveryState rc;
> >  
> > -        rc = DeliverEventToClients(pDev, pWin, pEvents, count, filter, grab,
> > -                                   &client, &deliveryMask);
> > +        rc = DeliverEventToWindowMask(pDev, pWin, pEvents, count, filter,
> > +                                      grab, &client, &deliveryMask);
> >  
> >          switch(rc)
> >          {
> 


More information about the xorg-devel mailing list