diff options
Diffstat (limited to 'hw/vfb')
-rw-r--r-- | hw/vfb/InitInput.c | 6 | ||||
-rw-r--r-- | hw/vfb/InitOutput.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 35d1dc4d2..10bb6a599 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -43,6 +43,7 @@ from The Open Group. #include <X11/keysym.h> #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(); } diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index e7dd1d95f..60915fdbf 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -248,10 +248,8 @@ ddxUseMsg(void) { ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); -#ifdef RENDER - ErrorF("+/-render turn on/of RENDER extension support" + ErrorF("+/-render turn on/off RENDER extension support" "(default on)\n"); -#endif ErrorF("-linebias n adjust thin line pixelization\n"); ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-whitepixel n pixel value for white\n"); @@ -904,10 +902,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel); -#ifdef RENDER if (ret && Render) fbPictureInit (pScreen, 0, 0); -#endif if (!ret) return FALSE; |