diff options
| author | Torrey Lyons <torrey@mrcla.com> | 2004-07-30 17:37:09 +0000 |
|---|---|---|
| committer | Torrey Lyons <torrey@mrcla.com> | 2004-07-30 17:37:09 +0000 |
| commit | 41641c11ec8994f1bc4bd1b05ae2cb38167c8312 (patch) | |
| tree | a0c55c44d6333f0a68d133bf3d44bb106c83ddb6 | |
| parent | f4c84e7dbf0f25a2544d4400e600310421683f3c (diff) | |
Make XDarwin not default to StaticColor on ix86 (Shantonu Sen).
| -rw-r--r-- | hw/darwin/iokit/xfIOKit.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 0c8104e67..fc43cf8a5 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -9,7 +9,7 @@ * **************************************************************/ /* - * Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved. + * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -33,7 +33,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2004/04/23 19:15:17 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include "X.h" @@ -269,7 +269,7 @@ static void *XFIOKitHIDThread(void *unused) default: continue; } - + DarwinEQEnqueue(&xe); } } @@ -466,7 +466,9 @@ static Bool SetupFBandHID( #ifdef __i386__ /* x86 in 8bit mode currently needs fixed color map... */ - if( pixelInfo.bitsPerComponent == 8 ) { + if (pixelInfo.bitsPerComponent == 8 && + pixelInfo.componentCount == 1) + { pixelInfo.pixelType = kIOFixedCLUTPixels; } #endif @@ -574,7 +576,7 @@ Bool DarwinModeAddScreen( * XFIOKitShadowUpdate * Update the damaged regions of the shadow framebuffer on the screen. */ -static void XFIOKitShadowUpdate(ScreenPtr pScreen, +static void XFIOKitShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf) { DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen); |