diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/vfb/InitOutput.c | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/vfb/InitOutput.c')
| -rw-r--r-- | xorg-server/hw/vfb/InitOutput.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/xorg-server/hw/vfb/InitOutput.c b/xorg-server/hw/vfb/InitOutput.c index fd383e1c2..e7dd1d95f 100644 --- a/xorg-server/hw/vfb/InitOutput.c +++ b/xorg-server/hw/vfb/InitOutput.c @@ -35,7 +35,6 @@ from The Open Group. #endif #include <stdio.h> #include <X11/X.h> -#define NEED_EVENTS #include <X11/Xproto.h> #include <X11/Xos.h> #include "scrnintstr.h" @@ -164,7 +163,7 @@ vfbBitsPerPixel(int depth) } void -ddxGiveUp() +ddxGiveUp(void) { int i; @@ -215,7 +214,7 @@ ddxGiveUp() } void -AbortDDX() +AbortDDX(void) { ddxGiveUp(); } @@ -228,12 +227,12 @@ DarwinHandleGUI(int argc, char *argv[]) #endif void -OsVendorInit() +OsVendorInit(void) { } void -OsVendorFatalError() +OsVendorFatalError(void) { } @@ -245,7 +244,7 @@ void ddxBeforeReset(void) #endif void -ddxUseMsg() +ddxUseMsg(void) { ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); @@ -509,8 +508,10 @@ vfbUninstallColormap(ColormapPtr pmap) { if (pmap->mid != pmap->pScreen->defColormap) { - curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap, - RT_COLORMAP); + dixLookupResourceByType((pointer *)&curpmap, + pmap->pScreen->defColormap, + RT_COLORMAP, serverClient, + DixInstallAccess); (*pmap->pScreen->InstallColormap)(curpmap); } } @@ -891,6 +892,12 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) (1 << DirectColor)), 8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff); break; + case 30: + miSetVisualTypesAndMasks (30, + ((1 << TrueColor) | + (1 << DirectColor)), + 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); + break; } miSetPixmapDepths (); |