From 0b8629ada4293370d220bbb7e6c195c711baee7d Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 16 Apr 2010 15:34:33 +0000 Subject: svn merge -r534:HEAD ^/branches/released . --- xorg-server/hw/vfb/InitInput.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xorg-server/hw/vfb') diff --git a/xorg-server/hw/vfb/InitInput.c b/xorg-server/hw/vfb/InitInput.c index 35d1dc4d2..10bb6a599 100644 --- a/xorg-server/hw/vfb/InitInput.c +++ b/xorg-server/hw/vfb/InitInput.c @@ -43,6 +43,7 @@ from The Open Group. #include #include "xserver-properties.h" #include "exevents.h" +#include "extinit.h" Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) @@ -136,10 +137,15 @@ void InitInput(int argc, char *argv[]) { DeviceIntPtr p, k; + Atom xiclass; p = AddInputDevice(serverClient, vfbMouseProc, TRUE); k = AddInputDevice(serverClient, vfbKeybdProc, TRUE); RegisterPointerDevice(p); + xiclass = MakeAtom(XI_MOUSE, sizeof(XI_MOUSE) - 1, TRUE); + AssignTypeAndName(p, xiclass, "Xvfb mouse"); RegisterKeyboardDevice(k); + xiclass = MakeAtom(XI_KEYBOARD, sizeof(XI_KEYBOARD) - 1, TRUE); + AssignTypeAndName(k, xiclass, "Xvfb keyboard"); (void)mieqInit(); } -- cgit v1.2.3