xserver: Branch 'master'

[GitLab Mirror]

 xkb/xkmread.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aeed57d722f2eb978c17fd7e859334d34af38d05
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Mar 26 00:09:41 2021 +0200

    xkb: Fix parsing of XkbSA_DeviceValuator action type
    
    The xkb spec defines that the 7th element of the DeviceValuator key
    action description is "valuator 2 value".
    
    This error most likely was accidentally introduced as a copy-paste error
    in edeb033f29ae2d52e86c543ccbf22fb7ae1fdb7f.
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 1666e3216..842887c09 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -532,7 +532,7 @@ ReadXkmCompatMap(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes)
             act->devval.v1_value = wire.actionData[3];
             act->devval.v2_what = wire.actionData[4];
             act->devval.v2_ndx = wire.actionData[5];
-            act->devval.v2_what = wire.actionData[6];
+            act->devval.v2_value = wire.actionData[6];
             break;
 
         case XkbSA_XFree86Private: