fdo-mirrors/xorg-xcbproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xcbproto.git synced 2026-05-07 18:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xkb: Unify Overlay1Behavior and Overlay2Behavior

Browse source 
These two structs are used by the server in the exact same way, and are
handled together (see xkb/xkbPrKeyEv.c, XkbKB_Overlay{1,2} handling).
There is no need to use different (and for some reason slightly
different) types for them.

Reviewed-by: Daniel Martin <consume.noise@gmail.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
This commit is contained in:
Ran Benita 2013-08-06 11:33:45 +03:00 • committed by Daniel Martin
parent e8980ab471
commit 2cd2d5f0c7
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xkb.xml
View file

@ -467,32 +467,26 @@ authorization from the authors.
<field name="group" type="CARD8" />
</struct>
<struct name="Overlay1Behavior">
<struct name="OverlayBehavior">
<field name="type" type="CARD8" />
<field name="key" type="KEYCODE" />
</struct>
<struct name="Overlay2Behavior">
<field name="type" type="CARD8" />
<field name="key" type="CARD8" />
</struct>
<typedef oldname="LockBehavior" newname="PermamentLockBehavior" />
<typedef oldname="RadioGroupBehavior" newname="PermamentRadioGroupBehavior" />
<typedef oldname="Overlay1Behavior" newname="PermamentOverlay1Behavior" />
<typedef oldname="Overlay2Behavior" newname="PermamentOverlay2Behavior" />
<typedef oldname="OverlayBehavior" newname="PermamentOverlayBehavior" />
<union name="Behavior">
<field name="common" type="CommonBehavior" />
<field name="default" type="DefaultBehavior" />
<field name="lock" type="LockBehavior" />
<field name="radioGroup" type="RadioGroupBehavior" />
<field name="overlay1" type="Overlay1Behavior" />
<field name="overlay2" type="Overlay2Behavior" />
<field name="overlay1" type="OverlayBehavior" />
<field name="overlay2" type="OverlayBehavior" />
<field name="permamentLock" type="PermamentLockBehavior" />
<field name="permamentRadioGroup" type="PermamentRadioGroupBehavior" />
<field name="permamentOverlay1" type="PermamentOverlay1Behavior" />
<field name="permamentOverlay2" type="PermamentOverlay2Behavior" />
<field name="permamentOverlay1" type="PermamentOverlayBehavior" />
<field name="permamentOverlay2" type="PermamentOverlayBehavior" />
<field name="type" type="CARD8" />
</union>