fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 09:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make property translation system configurable from the command line.

Browse source
This commit is contained in:
David Reveman 2008-07-15 18:12:34 -04:00
parent e77fb301e1
commit 33ea398c24
3 changed files with 303 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hw/dmx/dmx.h
View file

@ -88,6 +88,12 @@ typedef struct _DMXIgnore {
unsigned long sequence;
} DMXIgnore;
typedef struct _DMXPropTrans {
const char *name;
const char *format;
Atom type;
} DMXPropTrans;
/** Provide the typedef globally, but keep the contents opaque outside
* of the input routines. \see dmxinput.h */
typedef struct _DMXInputInfo DMXInputInfo;
@ -352,6 +358,9 @@ extern int xRROutputsPerScreen;
extern int xRRCrtcsPerScreen;
#endif
extern DMXPropTrans *dmxPropTrans;
extern int dmxPropTransNum;
/** Wrap screen or GC function pointer */
#define DMX_WRAP(_entry, _newfunc, _saved, _actual) \
do { \

29
hw/dmx/dmxinit.c
View file

@ -135,6 +135,9 @@ int xRROutputsPerScreen = 2;
int xRRCrtcsPerScreen = 2;
#endif
DMXPropTrans *dmxPropTrans = NULL;
int dmxPropTransNum = 0;
#include <execinfo.h>
static void
@ -773,6 +776,11 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
"Dynamic screen addition/removal error (see above).\n");
}
for (i = 0; i < dmxPropTransNum; i++)
dmxPropTrans[i].type = MakeAtom ((char *) dmxPropTrans[i].name,
strlen (dmxPropTrans[i].name),
TRUE);
if (!dmxConfigDisplaysFromCommandLine ())
dmxLaunchDisplay (argc, argv, dmxLaunchIndex, dmxLaunchVT);
@ -1143,6 +1151,26 @@ int ddxProcessArgument(int argc, char *argv[], int i)
}
retval = 3;
}
else if (!strcmp (argv[i], "-prop"))
{
if ((i + 2) < argc)
{
DMXPropTrans *prop;
prop = xrealloc (dmxPropTrans, sizeof (DMXPropTrans) *
(dmxPropTransNum + 1));
if (prop)
{
prop[dmxPropTransNum].name = argv[i + 1];
prop[dmxPropTransNum].format = argv[i + 2];
prop[dmxPropTransNum].type = 0;
dmxPropTransNum++;
dmxPropTrans = prop;
}
}
retval = 3;
}
else if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
{
dmxLaunchVT = argv[i];
@ -1197,6 +1225,7 @@ void ddxUseMsg(void)
#endif
ErrorF("-param ... Specify configuration parameters (e.g.,\n");
ErrorF(" XkbRules, XkbModel, XkbLayout, etc.)\n");
ErrorF("-prop name format Specify property translation\n");
ErrorF("\n");
ErrorF(" If the -input string matches a -display string, then input\n"
" is taken from that backend display. (XInput cannot be taken\n"

501
hw/dmx/dmxwindow.c
View file

@ -1213,6 +1213,214 @@ dmxDoUpdateWindowPixmap(WindowPtr pWindow)
}
}
static void
dmxTranslateWindowProperty (WindowPtr pWindow,
char type,
unsigned char *data,
unsigned char *output)
{
ScreenPtr pScreen = pWindow->drawable.pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
switch (type) {
case 'a':
case 'A': {
Atom *src = (Atom *) data;
Atom *dst = (Atom *) output;
char *name;
name = NameForAtom (*src);
if (name)
*dst = XInternAtom (dmxScreen->beDisplay, name, FALSE);
else
*dst = *src;
} break;
case 'p':
case 'P': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
PixmapPtr pPixmap;
XID id = *src;
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRT_PIXMAP,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pPixmap,
id,
RT_PIXMAP,
serverClient,
DixReadAccess) == Success)
*dst = (DMX_GET_PIXMAP_PRIV (pPixmap))->pixmap;
else
*dst = *src;
} break;
case 'm':
case 'M': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
ColormapPtr pColormap;
XID id = *src;
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRT_COLORMAP,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pColormap,
id,
RT_COLORMAP,
serverClient,
DixReadAccess) == Success)
*dst = (DMX_GET_COLORMAP_PRIV (pColormap))->cmap;
else
*dst = *src;
} break;
case 'c':
case 'C': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
CursorPtr pCursor;
if (dixLookupResource ((pointer *) &pCursor,
*src,
RT_CURSOR,
serverClient,
DixReadAccess) == Success)
*dst = (DMX_GET_CURSOR_PRIV (pCursor, pScreen))->cursor;
else
*dst = *src;
} break;
case 'd':
case 'D': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
DrawablePtr pDrawable;
XID id = *src;
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRC_DRAWABLE,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pDrawable,
id,
RC_DRAWABLE,
serverClient,
DixReadAccess) == Success)
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
WindowPtr pWin = (WindowPtr) pDrawable;
*dst = (DMX_GET_WINDOW_PRIV (pWin))->window;
}
else
{
PixmapPtr pPixmap = (PixmapPtr) pDrawable;
*dst = (DMX_GET_PIXMAP_PRIV (pPixmap))->pixmap;
}
}
else
*dst = *src;
} break;
case 'f':
case 'F': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
FontPtr pFont;
if (dixLookupResource ((pointer *) &pFont,
*src,
RT_FONT,
serverClient,
DixReadAccess) == Success)
{
dmxFontPrivPtr pFontPriv =
FontGetPrivate (pFont, dmxFontPrivateIndex);
*dst = pFontPriv->font[pScreen->myNum]->fid;
}
else
*dst = *src;
} break;
case 'v':
case 'V': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
Visual *visual;
visual = dmxLookupVisualFromID (pScreen, *src);
if (visual)
*dst = XVisualIDFromVisual (visual);
else
*dst = *src;
} break;
case 'w':
case 'W': {
XID *src = (XID *) data;
XID *dst = (XID *) output;
WindowPtr pWin;
XID id = *src;
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRT_WINDOW,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pWin,
id,
RT_WINDOW,
serverClient,
DixReadAccess) == Success)
*dst = (DMX_GET_WINDOW_PRIV (pWin))->window;
else
*dst = *src;
} break;
default:
*((CARD32 *) output) = *((CARD32 *) data);
break;
}
}
void
dmxBESetWindowProperty (WindowPtr pWindow,
PropertyPtr pProp)
@ -1221,261 +1429,82 @@ dmxBESetWindowProperty (WindowPtr pWindow,
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV (pWindow);
unsigned char *data = pProp->data;
const char *format = NULL;
int i;
if (!dmxScreen->beDisplay)
return;
switch (pProp->type) {
case XA_ATOM: {
Atom *dst, *src = (Atom *) data;
dst = (Atom *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
/* only 32 bit data types can be translated */
if (pProp->format == 32)
{
switch (pProp->type) {
case XA_ATOM:
format = "a";
break;
case XA_BITMAP:
case XA_PIXMAP:
format = "p";
break;
case XA_COLORMAP:
format = "m";
break;
case XA_CURSOR:
format = "c";
break;
case XA_DRAWABLE:
format = "d";
break;
case XA_FONT:
format = "f";
break;
case XA_VISUALID:
format = "v";
break;
case XA_WINDOW:
format = "w";
break;
default:
for (i = 0; i < dmxPropTransNum; i++)
{
char *name;
name = NameForAtom (src[i]);
if (name)
dst[i] = XInternAtom (dmxScreen->beDisplay, name, FALSE);
else
dst[i] = src[i];
}
}
} break;
case XA_BITMAP:
case XA_PIXMAP: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
PixmapPtr pPixmap;
XID id = src[i];
#ifdef PANORAMIX
if (!noPanoramiXExtension)
if (pProp->type == dmxPropTrans[i].type)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRT_PIXMAP,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
format = dmxPropTrans[i].format;
break;
}
#endif
if (dixLookupResource ((pointer *) &pPixmap,
id,
RT_PIXMAP,
serverClient,
DixReadAccess) == Success)
dst[i] = (DMX_GET_PIXMAP_PRIV (pPixmap))->pixmap;
else
dst[i] = src[i];
}
}
} break;
case XA_COLORMAP: {
XID *dst, *src = (XID *) data;
}
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (format)
{
unsigned char *dst, *src = data;
dst = xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
int j;
i = j = 0;
data = dst;
while (format[j] != '\0')
{
ColormapPtr pColormap;
XID id = src[i];
if (i++ == pProp->size)
break;
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (format[j] == '.')
j = 0;
if (dixLookupResource ((pointer *) &res,
id,
XRT_COLORMAP,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
dmxTranslateWindowProperty (pWindow, format[j], src, dst);
if (dixLookupResource ((pointer *) &pColormap,
id,
RT_COLORMAP,
serverClient,
DixReadAccess) == Success)
dst[i] = (DMX_GET_COLORMAP_PRIV (pColormap))->cmap;
else
dst[i] = src[i];
src += (pProp->format >> 3);
dst += (pProp->format >> 3);
}
if (i < pProp->size)
memcpy (dst, src, pProp->size - i);
}
} break;
case XA_CURSOR: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
CursorPtr pCursor;
if (dixLookupResource ((pointer *) &pCursor,
src[i],
RT_CURSOR,
serverClient,
DixReadAccess) == Success)
dst[i] = (DMX_GET_CURSOR_PRIV (pCursor, pScreen))->cursor;
else
dst[i] = src[i];
}
}
} break;
case XA_DRAWABLE: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
DrawablePtr pDrawable;
XID id = src[i];
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRC_DRAWABLE,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pDrawable,
id,
RC_DRAWABLE,
serverClient,
DixReadAccess) == Success)
{
if (pDrawable->type == DRAWABLE_WINDOW)
{
WindowPtr pWin = (WindowPtr) pDrawable;
dst[i] = (DMX_GET_WINDOW_PRIV (pWin))->window;
}
else
{
PixmapPtr pPixmap = (PixmapPtr) pDrawable;
dst[i] = (DMX_GET_PIXMAP_PRIV (pPixmap))->pixmap;
}
}
else
dst[i] = src[i];
}
}
} break;
case XA_FONT: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
FontPtr pFont;
if (dixLookupResource ((pointer *) &pFont,
src[i],
RT_FONT,
serverClient,
DixReadAccess) == Success)
{
dmxFontPrivPtr pFontPriv =
FontGetPrivate (pFont, dmxFontPrivateIndex);
dst[i] = pFontPriv->font[pScreen->myNum]->fid;
}
else
dst[i] = src[i];
}
}
} break;
case XA_VISUALID: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
Visual *visual;
visual = dmxLookupVisualFromID (pScreen, src[i]);
if (visual)
dst[i] = XVisualIDFromVisual (visual);
else
dst[i] = src[i];
}
}
} break;
case XA_WINDOW: {
XID *dst, *src = (XID *) data;
dst = (XID *) xalloc (pProp->size * (pProp->format >> 3));
if (dst)
{
data = (unsigned char *) dst;
for (i = 0; i < pProp->size; i++)
{
WindowPtr pWin;
XID id = src[i];
#ifdef PANORAMIX
if (!noPanoramiXExtension)
{
PanoramiXRes *res;
if (dixLookupResource ((pointer *) &res,
id,
XRT_WINDOW,
serverClient,
DixReadAccess) == Success)
id = res->info[pScreen->myNum].id;
}
#endif
if (dixLookupResource ((pointer *) &pWin,
id,
RT_WINDOW,
serverClient,
DixReadAccess) == Success)
dst[i] = (DMX_GET_WINDOW_PRIV (pWin))->window;
else
dst[i] = src[i];
}
}
} break;
}
XLIB_PROLOGUE (dmxScreen);