andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make XDarwin not default to StaticColor on ix86 (Shantonu Sen).

Browse Source
This commit is contained in:
Torrey Lyons 2004-07-30 17:37:09 +00:00
parent f4c84e7dbf
commit 41641c11ec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/darwin/iokit/xfIOKit.c
View File

@ -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 * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * 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, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
#include "X.h" #include "X.h"
@ -269,7 +269,7 @@ static void *XFIOKitHIDThread(void *unused)
default: default:
continue; continue;
} }
DarwinEQEnqueue(&xe); DarwinEQEnqueue(&xe);
} }
} }
@ -466,7 +466,9 @@ static Bool SetupFBandHID(
#ifdef __i386__ #ifdef __i386__
/* x86 in 8bit mode currently needs fixed color map... */ /* x86 in 8bit mode currently needs fixed color map... */
if( pixelInfo.bitsPerComponent == 8 ) { if (pixelInfo.bitsPerComponent == 8 &&
pixelInfo.componentCount == 1)
{
pixelInfo.pixelType = kIOFixedCLUTPixels; pixelInfo.pixelType = kIOFixedCLUTPixels;
} }
#endif #endif
@ -574,7 +576,7 @@ Bool DarwinModeAddScreen(
* XFIOKitShadowUpdate * XFIOKitShadowUpdate
* Update the damaged regions of the shadow framebuffer on the screen. * Update the damaged regions of the shadow framebuffer on the screen.
*/ */
static void XFIOKitShadowUpdate(ScreenPtr pScreen, static void XFIOKitShadowUpdate(ScreenPtr pScreen,
shadowBufPtr pBuf) shadowBufPtr pBuf)
{ {
DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen); DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);