[PATCH:xf86-input-keyboard 17/23] Make OpenKeyboard() warn instead of error out.

Thomas Klausner wiz at NetBSD.org
Mon Jul 29 14:23:43 PDT 2013


This way we can still setup keyboard map manually by xmodmap(1)
etc. on less well supported ports.

>From Izumi Tsutsui <tsutsui at NetBSD.org>
Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
---
 src/bsd_kbd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 083d84d..1048a13 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -432,10 +432,10 @@ OpenKeyboard(InputInfoPtr pInfo)
                break;
 #endif
            default:
-               xf86Msg(X_ERROR, "%s: Unsupported wskbd type \"%d\"",
-                                pInfo->name, pKbd->wsKbdType);
-               close(pInfo->fd);
-               return FALSE;
+               xf86Msg(X_WARNING, "%s: Unsupported wskbd type \"%d\"\n",
+                                  pInfo->name, pKbd->wsKbdType);
+               printWsType("Unknown wskbd", pInfo->name);
+               break;
        }
     }
 #endif
-- 
1.8.3.3



More information about the xorg-devel mailing list