From 4527e2b776cfcdac2b189b5439b9a3d0b6433077 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 4 Jul 2011 13:46:24 +1000 Subject: [PATCH] xfree86: when implicitly choosing a core device, set the option to a value Devices are core pointers/keyboards by default now anyway, but let's set the option to some value instead of just NULL. Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone --- hw/xfree86/common/xf86Config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index ddd0b3684..04d0180a9 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1216,7 +1216,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) *devs[count - 1] = Pointer; devs[count - 1]->options = xf86addNewOption(devs[count -1]->options, - xnfstrdup("CorePointer"), NULL); + xnfstrdup("CorePointer"), "on"); devs[count] = NULL; servlayoutp->inputs = devs; } @@ -1261,7 +1261,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) Pointer.fd = -1; *devs[count - 1] = Pointer; devs[count - 1]->options = - xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL); + xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), "on"); devs[count] = NULL; servlayoutp->inputs = devs; } @@ -1359,7 +1359,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) *devs[count - 1] = Keyboard; devs[count - 1]->options = xf86addNewOption(devs[count - 1]->options, - xnfstrdup("CoreKeyboard"), NULL); + xnfstrdup("CoreKeyboard"), "on"); devs[count] = NULL; servlayoutp->inputs = devs; }