[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/sun Use "empty" for rmlvo...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/16901e8d8365
branches:  trunk
changeset: 10524:16901e8d8365
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Aug 01 01:49:58 2020 +0000

description:
Use "empty" for rmlvo model and layout to avoid lingering default settings.

Now all modifier keys (CTRL, SHIFT, and NumLock) work as expected.

It seems XkbApplyMappingChange() doesn't update some XKB modifier
settings even if new modmap data is specified.

diffstat:

 external/mit/xorg-server/dist/hw/sun/sunKbd.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 507add92398d -r 16901e8d8365 external/mit/xorg-server/dist/hw/sun/sunKbd.c
--- a/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Fri Jul 31 19:35:22 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Sat Aug 01 01:49:58 2020 +0000
@@ -592,8 +592,8 @@
     }
 #else
     rmlvo->rules = "base";
-    rmlvo->model = NULL;
-    rmlvo->layout = NULL;
+    rmlvo->model = "empty";
+    rmlvo->layout = "empty";
     rmlvo->variant = NULL;
     rmlvo->options = NULL;
 #endif
@@ -649,9 +649,10 @@
 
        sunInitKbdNames(&rmlvo, pKeyboard->devicePrivate);
 #if 0 /* XXX needs more work for Xorg xkb */
-       InitKeyboardDeviceStruct(device, rmlvo,
+       InitKeyboardDeviceStruct(device, &rmlvo,
                                 sunBell, sunKbdCtrl);
 #else
+       XkbSetRulesDflts(&rmlvo);
        InitKeyboardDeviceStruct(device, NULL,
                                 sunBell, sunKbdCtrl);
        XkbApplyMappingChange(device, workingKeySyms,