2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
*
|
2004-12-04 01:43:13 +01:00
|
|
|
* Copyright © 2000 SuSE, Inc.
|
2003-11-14 17:48:57 +01:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that
|
|
|
|
* copyright notice and this permission notice appear in supporting
|
|
|
|
* documentation, and that the name of SuSE not be used in advertising or
|
|
|
|
* publicity pertaining to distribution of the software without specific,
|
|
|
|
* written prior permission. SuSE makes no representations about the
|
|
|
|
* suitability of this software for any purpose. It is provided "as is"
|
|
|
|
* without express or implied warranty.
|
|
|
|
*
|
|
|
|
* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
|
|
|
|
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
* Author: Keith Packard, SuSE, Inc.
|
|
|
|
*/
|
|
|
|
|
2004-05-16 07:08:39 +02:00
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2006-02-10 23:00:30 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
2003-11-14 17:48:57 +01:00
|
|
|
#include "fb.h"
|
|
|
|
#include "fboverlay.h"
|
2006-02-10 23:00:30 +01:00
|
|
|
#include "shmint.h"
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2008-08-29 00:05:40 +02:00
|
|
|
static int fbOverlayScreenPrivateKeyIndex;
|
|
|
|
static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
DevPrivateKey fbOverlayGetScreenPrivateKey(void)
|
2004-07-30 22:30:57 +02:00
|
|
|
{
|
2007-08-28 15:28:25 +02:00
|
|
|
return fbOverlayScreenPrivateKey;
|
2004-07-30 22:30:57 +02:00
|
|
|
}
|
|
|
|
|
2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
* Replace this if you want something supporting
|
|
|
|
* multiple overlays with the same depth
|
|
|
|
*/
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayCreateWindow(WindowPtr pWin)
|
|
|
|
{
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
|
|
|
|
int i;
|
|
|
|
PixmapPtr pPixmap;
|
|
|
|
|
|
|
|
if (pWin->drawable.class != InputOutput)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
#ifdef FB_SCREEN_PRIVATE
|
|
|
|
if (pWin->drawable.bitsPerPixel == 32)
|
|
|
|
pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
pPixmap = pScrPriv->layer[i].u.run.pixmap;
|
|
|
|
if (pWin->drawable.depth == pPixmap->drawable.depth)
|
|
|
|
{
|
2007-08-28 15:28:25 +02:00
|
|
|
dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), pPixmap);
|
2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
* Make sure layer keys are written correctly by
|
|
|
|
* having non-root layers set to full while the
|
|
|
|
* root layer is set to empty. This will cause
|
|
|
|
* all of the layers to get painted when the root
|
|
|
|
* is mapped
|
|
|
|
*/
|
|
|
|
if (!pWin->parent)
|
|
|
|
{
|
|
|
|
REGION_EMPTY (pWin->drawable.pScreen,
|
|
|
|
&pScrPriv->layer[i].u.run.region);
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
|
|
|
|
{
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
(*pScreen->DestroyPixmap)(pScrPriv->layer[i].u.run.pixmap);
|
|
|
|
REGION_UNINIT (pScreen, &pScrPriv->layer[i].u.run.region);
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return layer containing this window
|
|
|
|
*/
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayWindowLayer(WindowPtr pWin)
|
|
|
|
{
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
2007-08-28 15:28:25 +02:00
|
|
|
if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey()) ==
|
2003-11-14 17:48:57 +01:00
|
|
|
(pointer) pScrPriv->layer[i].u.run.pixmap)
|
|
|
|
return i;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayCreateScreenResources(ScreenPtr pScreen)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
|
|
|
|
PixmapPtr pPixmap;
|
|
|
|
pointer pbits;
|
|
|
|
int width;
|
|
|
|
int depth;
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
if (!miCreateScreenResources(pScreen))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
box.x1 = 0;
|
|
|
|
box.y1 = 0;
|
|
|
|
box.x2 = pScreen->width;
|
|
|
|
box.y2 = pScreen->height;
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
pbits = pScrPriv->layer[i].u.init.pbits;
|
|
|
|
width = pScrPriv->layer[i].u.init.width;
|
|
|
|
depth = pScrPriv->layer[i].u.init.depth;
|
2007-10-31 22:15:35 +01:00
|
|
|
pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
|
2003-11-14 17:48:57 +01:00
|
|
|
if (!pPixmap)
|
|
|
|
return FALSE;
|
|
|
|
if (!(*pScreen->ModifyPixmapHeader)(pPixmap, pScreen->width,
|
|
|
|
pScreen->height, depth,
|
|
|
|
BitsPerPixel(depth),
|
|
|
|
PixmapBytePad(width, depth),
|
|
|
|
pbits))
|
|
|
|
return FALSE;
|
|
|
|
pScrPriv->layer[i].u.run.pixmap = pPixmap;
|
|
|
|
REGION_INIT(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0);
|
|
|
|
}
|
|
|
|
pScreen->devPrivate = pScrPriv->layer[0].u.run.pixmap;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayPaintKey (DrawablePtr pDrawable,
|
|
|
|
RegionPtr pRegion,
|
|
|
|
CARD32 pixel,
|
|
|
|
int layer)
|
|
|
|
{
|
|
|
|
fbFillRegionSolid (pDrawable, pRegion, 0,
|
|
|
|
fbReplicatePixel (pixel, pDrawable->bitsPerPixel));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Track visible region for each layer
|
|
|
|
*/
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayUpdateLayerRegion (ScreenPtr pScreen,
|
|
|
|
int layer,
|
|
|
|
RegionPtr prgn)
|
|
|
|
{
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
|
|
|
|
int i;
|
|
|
|
RegionRec rgnNew;
|
|
|
|
|
|
|
|
if (!prgn || !REGION_NOTEMPTY(pScreen, prgn))
|
|
|
|
return;
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
if (i == layer)
|
|
|
|
{
|
|
|
|
/* add new piece to this fb */
|
|
|
|
REGION_UNION (pScreen,
|
|
|
|
&pScrPriv->layer[i].u.run.region,
|
|
|
|
&pScrPriv->layer[i].u.run.region,
|
|
|
|
prgn);
|
|
|
|
}
|
|
|
|
else if (REGION_NOTEMPTY (pScreen,
|
|
|
|
&pScrPriv->layer[i].u.run.region))
|
|
|
|
{
|
|
|
|
/* paint new piece with chroma key */
|
2003-11-25 20:29:01 +01:00
|
|
|
REGION_NULL (pScreen, &rgnNew);
|
2003-11-14 17:48:57 +01:00
|
|
|
REGION_INTERSECT (pScreen,
|
|
|
|
&rgnNew,
|
|
|
|
prgn,
|
|
|
|
&pScrPriv->layer[i].u.run.region);
|
|
|
|
(*pScrPriv->PaintKey) (&pScrPriv->layer[i].u.run.pixmap->drawable,
|
|
|
|
&rgnNew,
|
|
|
|
pScrPriv->layer[i].key,
|
|
|
|
i);
|
|
|
|
REGION_UNINIT(pScreen, &rgnNew);
|
|
|
|
/* remove piece from other fbs */
|
|
|
|
REGION_SUBTRACT (pScreen,
|
|
|
|
&pScrPriv->layer[i].u.run.region,
|
|
|
|
&pScrPriv->layer[i].u.run.region,
|
|
|
|
prgn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy only areas in each layer containing real bits
|
|
|
|
*/
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayCopyWindow(WindowPtr pWin,
|
|
|
|
DDXPointRec ptOldOrg,
|
|
|
|
RegionPtr prgnSrc)
|
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pWin->drawable.pScreen;
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
|
|
|
|
RegionRec rgnDst;
|
|
|
|
int dx, dy;
|
|
|
|
int i;
|
|
|
|
RegionRec layerRgn[FB_OVERLAY_MAX];
|
|
|
|
PixmapPtr pPixmap;
|
|
|
|
|
|
|
|
dx = ptOldOrg.x - pWin->drawable.x;
|
|
|
|
dy = ptOldOrg.y - pWin->drawable.y;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clip to existing bits
|
|
|
|
*/
|
|
|
|
REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy);
|
2003-11-25 20:29:01 +01:00
|
|
|
REGION_NULL (pScreen, &rgnDst);
|
2003-11-14 17:48:57 +01:00
|
|
|
REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
|
|
|
|
REGION_TRANSLATE(pScreen, &rgnDst, dx, dy);
|
|
|
|
/*
|
|
|
|
* Compute the portion of each fb affected by this copy
|
|
|
|
*/
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
2003-11-25 20:29:01 +01:00
|
|
|
REGION_NULL (pScreen, &layerRgn[i]);
|
2003-11-14 17:48:57 +01:00
|
|
|
REGION_INTERSECT(pScreen, &layerRgn[i], &rgnDst,
|
|
|
|
&pScrPriv->layer[i].u.run.region);
|
|
|
|
if (REGION_NOTEMPTY (pScreen, &layerRgn[i]))
|
|
|
|
{
|
|
|
|
REGION_TRANSLATE(pScreen, &layerRgn[i], -dx, -dy);
|
|
|
|
pPixmap = pScrPriv->layer[i].u.run.pixmap;
|
2009-02-04 19:48:03 +01:00
|
|
|
miCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
|
2003-11-14 17:48:57 +01:00
|
|
|
0,
|
|
|
|
&layerRgn[i], dx, dy, pScrPriv->CopyWindow, 0,
|
|
|
|
(void *)(long) i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Update regions
|
|
|
|
*/
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
if (REGION_NOTEMPTY (pScreen, &layerRgn[i]))
|
|
|
|
fbOverlayUpdateLayerRegion (pScreen, i, &layerRgn[i]);
|
|
|
|
|
|
|
|
REGION_UNINIT(pScreen, &layerRgn[i]);
|
|
|
|
}
|
|
|
|
REGION_UNINIT(pScreen, &rgnDst);
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayWindowExposures (WindowPtr pWin,
|
|
|
|
RegionPtr prgn,
|
|
|
|
RegionPtr other_exposed)
|
|
|
|
{
|
|
|
|
fbOverlayUpdateLayerRegion (pWin->drawable.pScreen,
|
|
|
|
fbOverlayWindowLayer (pWin),
|
|
|
|
prgn);
|
|
|
|
miWindowExposures(pWin, prgn, other_exposed);
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlaySetupScreen(ScreenPtr pScreen,
|
|
|
|
pointer pbits1,
|
|
|
|
pointer pbits2,
|
|
|
|
int xsize,
|
|
|
|
int ysize,
|
|
|
|
int dpix,
|
|
|
|
int dpiy,
|
|
|
|
int width1,
|
|
|
|
int width2,
|
|
|
|
int bpp1,
|
|
|
|
int bpp2)
|
|
|
|
{
|
|
|
|
return fbSetupScreen (pScreen,
|
|
|
|
pbits1,
|
|
|
|
xsize,
|
|
|
|
ysize,
|
|
|
|
dpix,
|
|
|
|
dpiy,
|
|
|
|
width1,
|
|
|
|
bpp1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Bool
|
|
|
|
fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
|
|
|
|
{
|
|
|
|
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
|
|
|
|
int pitch;
|
|
|
|
Bool retval;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if((retval = fbOverlayCreateScreenResources(pScreen))) {
|
|
|
|
for (i = 0; i < pScrPriv->nlayers; i++)
|
|
|
|
{
|
|
|
|
/* fix the screen pixmap */
|
|
|
|
PixmapPtr pPix = (PixmapPtr) pScrPriv->layer[i].u.run.pixmap;
|
|
|
|
if (pPix->drawable.bitsPerPixel == 32) {
|
|
|
|
pPix->drawable.bitsPerPixel = 24;
|
|
|
|
pitch = BitmapBytePad(pPix->drawable.width * 24);
|
|
|
|
pPix->devKind = pitch;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
fbOverlayFinishScreenInit(ScreenPtr pScreen,
|
|
|
|
pointer pbits1,
|
|
|
|
pointer pbits2,
|
|
|
|
int xsize,
|
|
|
|
int ysize,
|
|
|
|
int dpix,
|
|
|
|
int dpiy,
|
|
|
|
int width1,
|
|
|
|
int width2,
|
|
|
|
int bpp1,
|
|
|
|
int bpp2,
|
|
|
|
int depth1,
|
|
|
|
int depth2)
|
|
|
|
{
|
|
|
|
VisualPtr visuals;
|
|
|
|
DepthPtr depths;
|
|
|
|
int nvisuals;
|
|
|
|
int ndepths;
|
|
|
|
int bpp = 0, imagebpp = 32;
|
|
|
|
VisualID defaultVisual;
|
|
|
|
FbOverlayScrPrivPtr pScrPriv;
|
|
|
|
|
|
|
|
pScrPriv = xalloc (sizeof (FbOverlayScrPrivRec));
|
|
|
|
if (!pScrPriv)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
#ifdef FB_24_32BIT
|
|
|
|
if (bpp1 == 32 || bpp2 == 32)
|
|
|
|
bpp = 32;
|
|
|
|
else if (bpp1 == 24 || bpp2 == 24)
|
|
|
|
bpp = 24;
|
|
|
|
|
|
|
|
if (bpp == 24)
|
|
|
|
{
|
|
|
|
int f;
|
|
|
|
|
|
|
|
imagebpp = 32;
|
|
|
|
/*
|
|
|
|
* Check to see if we're advertising a 24bpp image format,
|
|
|
|
* in which case windows will use it in preference to a 32 bit
|
|
|
|
* format.
|
|
|
|
*/
|
|
|
|
for (f = 0; f < screenInfo.numPixmapFormats; f++)
|
|
|
|
{
|
|
|
|
if (screenInfo.formats[f].bitsPerPixel == 24)
|
|
|
|
{
|
|
|
|
imagebpp = 24;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef FB_SCREEN_PRIVATE
|
|
|
|
if (imagebpp == 32)
|
|
|
|
{
|
|
|
|
fbGetScreenPrivate(pScreen)->win32bpp = bpp;
|
|
|
|
fbGetScreenPrivate(pScreen)->pix32bpp = bpp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fbGetScreenPrivate(pScreen)->win32bpp = 32;
|
|
|
|
fbGetScreenPrivate(pScreen)->pix32bpp = 32;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &depth1,
|
|
|
|
&defaultVisual, ((unsigned long)1<<(bpp1-1)) |
|
|
|
|
((unsigned long)1<<(bpp2-1)), 8))
|
|
|
|
return FALSE;
|
|
|
|
if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0,
|
|
|
|
depth1, ndepths, depths,
|
2007-07-05 21:56:25 +02:00
|
|
|
defaultVisual, nvisuals, visuals))
|
2003-11-14 17:48:57 +01:00
|
|
|
return FALSE;
|
|
|
|
/* MI thinks there's no frame buffer */
|
|
|
|
#ifdef MITSHM
|
|
|
|
ShmRegisterFbFuncs(pScreen);
|
|
|
|
#endif
|
|
|
|
pScreen->minInstalledCmaps = 1;
|
|
|
|
pScreen->maxInstalledCmaps = 2;
|
|
|
|
|
|
|
|
pScrPriv->nlayers = 2;
|
|
|
|
pScrPriv->PaintKey = fbOverlayPaintKey;
|
|
|
|
pScrPriv->CopyWindow = fbCopyWindowProc;
|
|
|
|
pScrPriv->layer[0].u.init.pbits = pbits1;
|
|
|
|
pScrPriv->layer[0].u.init.width = width1;
|
|
|
|
pScrPriv->layer[0].u.init.depth = depth1;
|
|
|
|
|
|
|
|
pScrPriv->layer[1].u.init.pbits = pbits2;
|
|
|
|
pScrPriv->layer[1].u.init.width = width2;
|
|
|
|
pScrPriv->layer[1].u.init.depth = depth2;
|
|
|
|
|
2007-08-28 15:28:25 +02:00
|
|
|
dixSetPrivate(&pScreen->devPrivates, fbOverlayScreenPrivateKey, pScrPriv);
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
/* overwrite miCloseScreen with our own */
|
|
|
|
pScreen->CloseScreen = fbOverlayCloseScreen;
|
|
|
|
pScreen->CreateScreenResources = fbOverlayCreateScreenResources;
|
|
|
|
pScreen->CreateWindow = fbOverlayCreateWindow;
|
|
|
|
pScreen->WindowExposures = fbOverlayWindowExposures;
|
|
|
|
pScreen->CopyWindow = fbOverlayCopyWindow;
|
|
|
|
#ifdef FB_24_32BIT
|
|
|
|
if (bpp == 24 && imagebpp == 32)
|
|
|
|
{
|
|
|
|
pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
|
|
|
|
pScreen->CreateScreenResources = fb24_32OverlayCreateScreenResources;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|