[PATCH] doc: fix: s/XkbAllBellNotifyMask/XkbBellNotifyMask/

Daniel Hahler git at thequod.de
Sat Nov 8 09:09:42 PST 2014


On 08.11.2014 06:50, Alan Coopersmith wrote:
> Shouldn't it be XkbAllBellEventsMask?  That's what the library spec says:
> http://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Detecting_Bells
>
> and what the X server seems to check for:
> http://cgit.freedesktop.org/xorg/xserver/tree/xkb/xkb.c#n286

Yes, this might be what was really meant.

But using XkbAllBellEventsMask instead of XkbBellNotifyMask in pulseaudio's x11-bell module does not appear to work:

This works:

    XkbSelectEvents(pa_x11_wrapper_get_display(u->x11_wrapper), XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask);

This does not:

    XkbSelectEvents(pa_x11_wrapper_get_display(u->x11_wrapper), XkbUseCoreKbd, XkbAllBellEventsMask, XkbAllBellEventsMask);

I am not sure, if the mask is meant to be used here like this.

And what about XkbSetAutoResetControls and XkbChangeEnabledControls then?
I assume the XkbAllBellEventsMask mask is only meant for handling events, and not settings?


Thanks,
Daniel.

> On 11/ 6/14 09:42 PM, Daniel Hahler wrote:
>> ---
>>   man/xkb/XkbBell.man            | 2 +-
>>   man/xkb/XkbBellEvent.man       | 2 +-
>>   man/xkb/XkbDeviceBell.man      | 2 +-
>>   man/xkb/XkbDeviceBellEvent.man | 2 +-
>>   man/xkb/XkbForceBell.man       | 2 +-
>>   man/xkb/XkbForceDeviceBell.man | 2 +-
>>   6 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/man/xkb/XkbBell.man b/man/xkb/XkbBell.man
>> index c6fc0e0..f08efc3 100644
>> --- a/man/xkb/XkbBell.man
>> +++ b/man/xkb/XkbBell.man
>> @@ -278,7 +278,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>> diff --git a/man/xkb/XkbBellEvent.man b/man/xkb/XkbBellEvent.man
>> index bf6f469..af18702 100644
>> --- a/man/xkb/XkbBellEvent.man
>> +++ b/man/xkb/XkbBellEvent.man
>> @@ -278,7 +278,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>> diff --git a/man/xkb/XkbDeviceBell.man b/man/xkb/XkbDeviceBell.man
>> index bf78681..dd74a14 100644
>> --- a/man/xkb/XkbDeviceBell.man
>> +++ b/man/xkb/XkbDeviceBell.man
>> @@ -247,7 +247,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>> diff --git a/man/xkb/XkbDeviceBellEvent.man b/man/xkb/XkbDeviceBellEvent.man
>> index 92a31d5..b2bf33a 100644
>> --- a/man/xkb/XkbDeviceBellEvent.man
>> +++ b/man/xkb/XkbDeviceBellEvent.man
>> @@ -274,7 +274,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>> diff --git a/man/xkb/XkbForceBell.man b/man/xkb/XkbForceBell.man
>> index bb3f7fc..b092653 100644
>> --- a/man/xkb/XkbForceBell.man
>> +++ b/man/xkb/XkbForceBell.man
>> @@ -272,7 +272,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>> diff --git a/man/xkb/XkbForceDeviceBell.man b/man/xkb/XkbForceDeviceBell.man
>> index 6419dec..6134603 100644
>> --- a/man/xkb/XkbForceDeviceBell.man
>> +++ b/man/xkb/XkbForceDeviceBell.man
>> @@ -251,7 +251,7 @@ However, you can call
>>   .I XkbSelectEventDetails
>>   using XkbBellNotify as the
>>   .I event_type
>> -and specifying XkbAllBellNotifyMask in
>> +and specifying XkbBellNotifyMask in
>>   .I bits_to_change
>>   and
>>   .I values_for_bits.
>>
>
>


-- 
http://daniel.hahler.de/



More information about the xorg-devel mailing list