GNU bug report logs - #49359
[PATCH] services: xorg: Do not force driver for keyboard defaults.

Previous Next

To reply to this bug, email your comments to 49359 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH] services: xorg: Do not force driver for keyboard defaults.
Date: Sat,  3 Jul 2021 20:29:02 +0200

Let xorg choose the correct driver for keyboards; if need be the driver
can be forced by the user on a device by device basis.

* gnu/services/xorg.scm (xorg-configuration->file)[input-class-section]:
Remove matching on device path and forcing the driver.  Put each option
on a separate line.
---
 gnu/services/xorg.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 8ffea3b9dd..2c894ac6b9 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -225,27 +225,24 @@ EndSection"))
               (define (input-class-section layout variant model options)
                 (string-append "
 Section \"InputClass\"
-  Identifier \"evdev keyboard catchall\"
+  Identifier \"keyboard defaults\"
   MatchIsKeyboard \"on\"
-  Option \"XkbLayout\" " (object->string layout)
+  Option \"XkbLayout\" " (object->string layout) "\n"
   (if variant
       (string-append "  Option \"XkbVariant\" \""
-                     variant "\"")
+                     variant "\"\n")
       "")
   (if model
       (string-append "  Option \"XkbModel\" \""
-                     model "\"")
+                     model "\"\n")
       "")
   (match options
     (()
      "")
     (_
      (string-append "  Option \"XkbOptions\" \""
-                    (string-join options ",") "\""))) "
-
-  MatchDevicePath \"/dev/input/event*\"
-  Driver \"evdev\"
-EndSection\n"))
+                    (string-join options ",") "\"\n")))
+  "EndSection\n"))
 
               (define (expand modules)
                 ;; Append to MODULES the relevant /lib/xorg/modules
-- 
2.31.1

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 49359 <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#49359] [PATCH] services: xorg: Do not force driver for
 keyboard defaults.
Date: Sat, 03 Jul 2021 20:46:16 +0200

[Message part 1 (text/plain, inline)]

Brice,

Brice Waegeneire 写道：
> Let xorg choose the correct driver for keyboards; if need be the 
> driver
> can be forced by the user on a device by device basis.

Thanks, I think this is the right thing to do.

I hope someone will test this who (1) still uses ‘real’ Xorg (2) 
doesn't use just the HIDs that came free with their laptop :-)  I 
do neither.

LGTM otherwise!

T G-R

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.