config: expose config_info as an input option.

config_info is the only reliable indicator we have in the server for
duplicate devices (drivers can test for maj/min on fds as well). Don't set
this after the device has been initialized but assume it's important enough
to set during NIDR.

This makes the option "config_info" available to the drivers as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2010-07-22 09:09:10 +10:00
commit 31c71425ac
3 changed files with 4 additions and 10 deletions

View file

@ -353,6 +353,7 @@ xf86ActivateDevice(LocalDevicePtr local)
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
dev->config_info = xf86SetStrOption(local->options, "config_info", NULL);
RegisterOtherDevice(dev);
XkbSetExtension(dev, ProcessKeyboardEvent);