frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1654) Xnest: fetch visuals from XCB setup data instead of Xlib 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-15 10:58:18 +02:00
parent a38fc83799
commit 47e352dbe8
3 changed files with 71 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/xnest/Display.c
View File

@ -41,7 +41,6 @@ is" without express or implied warranty.
Display *xnestDisplay = NULL;
XVisualInfo *xnestVisuals;
int xnestNumVisuals;
int xnestDefaultVisualIndex;
Colormap *xnestDefaultColormaps;
static uint16_t xnestNumDefaultColormaps;
int xnestNumPixmapFormats;
@ -90,29 +89,6 @@ xnestOpenDisplay(int argc, char *argv[])
if (xnestNumVisuals == 0 || xnestVisuals == NULL)
FatalError("Unable to find any visuals.\n");
if (xnestUserDefaultClass || xnestUserDefaultDepth) {
xnestDefaultVisualIndex = UNDEFINED;
for (i = 0; i < xnestNumVisuals; i++)
if ((!xnestUserDefaultClass ||
xnestVisuals[i].class == xnestDefaultClass)
&&
(!xnestUserDefaultDepth ||
xnestVisuals[i].depth == xnestDefaultDepth)) {
xnestDefaultVisualIndex = i;
break;
}
if (xnestDefaultVisualIndex == UNDEFINED)
FatalError("Unable to find desired default visual.\n");
}
else {
vi.visualid = XVisualIDFromVisual(DefaultVisual(xnestDisplay,
xnestUpstreamInfo.screenId));
xnestDefaultVisualIndex = 0;
for (i = 0; i < xnestNumVisuals; i++)
if (vi.visualid == xnestVisuals[i].visualid)
xnestDefaultVisualIndex = i;
}
xnestNumDefaultColormaps = xnestNumVisuals;
xnestDefaultColormaps = xallocarray(xnestNumDefaultColormaps,
sizeof(Colormap));

1
hw/xnest/Display.h
View File

@ -27,7 +27,6 @@ is" without express or implied warranty.
extern Display *xnestDisplay;
extern XVisualInfo *xnestVisuals;
extern int xnestNumVisuals;
extern int xnestDefaultVisualIndex;
extern Colormap *xnestDefaultColormaps;
extern int xnestNumDefaultClormaps;
extern int xnestNumPixmapFormats;

96
hw/xnest/Screen.c
View File

@ -169,10 +169,6 @@ static int add_depth_visual(DepthPtr depths, int numDepths, int nplanes, VisualI
Bool
xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
{
VisualPtr visuals;
DepthPtr depths;
int numVisuals, numDepths;
int i, j;
unsigned long valuemask;
VisualID defaultVisual;
int rootDepth;
@ -198,48 +194,57 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
PRIVATE_CURSOR, 0))
return FALSE;
visuals = xallocarray(xnestNumVisuals, sizeof(VisualRec));
numVisuals = 0;
int numVisuals = 0;
VisualPtr visuals = calloc(1, sizeof(VisualRec));
int numDepths = 1;
DepthPtr depths = calloc(MAXDEPTH, sizeof(DepthRec));
if (!visuals || !depths) {
free(visuals);
free(depths);
return FALSE;
}
depths = (DepthPtr) malloc(MAXDEPTH * sizeof(DepthRec));
depths[0].depth = 1;
depths[0].numVids = 0;
depths[0].vids = (VisualID *) malloc(MAXVISUALSPERDEPTH * sizeof(VisualID));
numDepths = 1;
depths[0].vids = calloc(MAXVISUALSPERDEPTH, sizeof(VisualID));
int found_default_visual = 0;
for (i = 0; i < xnestNumVisuals; i++) {
visuals[numVisuals].class = xnestVisuals[i].class;
visuals[numVisuals].bitsPerRGBValue = xnestVisuals[i].bits_per_rgb;
visuals[numVisuals].ColormapEntries = xnestVisuals[i].colormap_size;
visuals[numVisuals].nplanes = xnestVisuals[i].depth;
visuals[numVisuals].redMask = xnestVisuals[i].red_mask;
visuals[numVisuals].greenMask = xnestVisuals[i].green_mask;
visuals[numVisuals].blueMask = xnestVisuals[i].blue_mask;
visuals[numVisuals].offsetRed = offset(xnestVisuals[i].red_mask);
visuals[numVisuals].offsetGreen = offset(xnestVisuals[i].green_mask);
visuals[numVisuals].offsetBlue = offset(xnestVisuals[i].blue_mask);
/* Check for and remove duplicates. */
for (j = 0; j < numVisuals; j++) {
if (visuals[numVisuals].class == visuals[j].class &&
visuals[numVisuals].bitsPerRGBValue ==
visuals[j].bitsPerRGBValue &&
visuals[numVisuals].ColormapEntries ==
visuals[j].ColormapEntries &&
visuals[numVisuals].nplanes == visuals[j].nplanes &&
visuals[numVisuals].redMask == visuals[j].redMask &&
visuals[numVisuals].greenMask == visuals[j].greenMask &&
visuals[numVisuals].blueMask == visuals[j].blueMask &&
visuals[numVisuals].offsetRed == visuals[j].offsetRed &&
visuals[numVisuals].offsetGreen == visuals[j].offsetGreen &&
visuals[numVisuals].offsetBlue == visuals[j].offsetBlue)
break;
xcb_depth_iterator_t depth_iter;
for (depth_iter = xcb_screen_allowed_depths_iterator(xnestUpstreamInfo.screenInfo);
depth_iter.rem;
xcb_depth_next(&depth_iter))
{
int vlen = xcb_depth_visuals_length (depth_iter.data);
xcb_visualtype_t *vts = xcb_depth_visuals (depth_iter.data);
for (int x=0; x<vlen; x++) {
for (int j = 0; j < numVisuals; j++) {
if (vts[x]._class == visuals[j].class &&
vts[x].bits_per_rgb_value == visuals[j].bitsPerRGBValue &&
vts[x].colormap_entries == visuals[j].ColormapEntries &&
depth_iter.data->depth == visuals[j].nplanes &&
vts[x].red_mask == visuals[j].redMask &&
vts[x].green_mask == visuals[j].greenMask &&
vts[x].blue_mask == visuals[j].blueMask &&
offset(vts[x].red_mask) == visuals[j].offsetRed &&
offset(vts[x].green_mask) == visuals[j].offsetGreen &&
offset(vts[x].blue_mask) == visuals[j].offsetBlue)
goto breakout;
}
if (j < numVisuals)
break;
visuals[numVisuals].vid = FakeClientID(0);
visuals[numVisuals] = (VisualRec) {
.class = vts[x]._class,
.bitsPerRGBValue = vts[x].bits_per_rgb_value,
.ColormapEntries = vts[x].colormap_entries,
.nplanes = depth_iter.data->depth,
.redMask = vts[x].red_mask,
.greenMask = vts[x].green_mask,
.blueMask = vts[x].blue_mask,
.offsetRed = offset(vts[x].red_mask),
.offsetGreen = offset(vts[x].green_mask),
.offsetBlue = offset(vts[x].blue_mask),
.vid = FakeClientID(0),
};
numDepths = add_depth_visual(depths, numDepths, visuals[numVisuals].nplanes, visuals[numVisuals].vid);
@ -255,18 +260,25 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
else
{
VisualID visual_id = xnestUpstreamInfo.screenInfo->root_visual;
if (visual_id == xnestVisuals[i].visualid) {
if (visual_id == vts[x].visual_id) {
defaultVisual = visuals[numVisuals].vid;
rootDepth = visuals[numVisuals].nplanes;
found_default_visual = 1;
}
}
numVisuals++;
visuals = reallocarray(visuals, numVisuals+1, sizeof(VisualRec));
}
}
breakout:
visuals = reallocarray(visuals, numVisuals, sizeof(VisualRec));
defaultVisual = visuals[xnestDefaultVisualIndex].vid;
rootDepth = visuals[xnestDefaultVisualIndex].nplanes;
if (!found_default_visual) {
ErrorF("Xnest: can't find matching visual for user specified depth %d\n", xnestDefaultDepth);
defaultVisual = visuals[0].vid;
rootDepth = visuals[0].nplanes;
}
if (xnestParentWindow != 0) {
xRectangle r = xnest_get_geometry(xnestUpstreamInfo.conn, xnestParentWindow);