Attachment #65366 for bug #101691

View | Details | Raw Unified | Return to bug 101691 | Differences between

and this patch




  reconnectDisplayState = NOTHING;
}

#define WARNING
static Bool reloadVisuals(int flexibility)
{
  int i, nitems;
  XVisualInfo *newVisuals, *vi;
  unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask;

  newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);


    }
  }

        #ifdef WARNING
        fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i);
        #endif

  if (i == nxagentNumVisuals)
  {
    nxagentVisuals = newVisuals;

Lines 48-54 Link Here

(-)nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig (-1 lines)
48	for (i = 0; i < nxagentNumVisuals; i++)	48	for (i = 0; i < nxagentNumVisuals; i++)
49	{	49	{
50	if (pVisual->class == nxagentVisuals[i].class &&	50	if (pVisual->class == nxagentVisuals[i].class &&
51	pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb &&
52	pVisual->ColormapEntries == nxagentVisuals[i].colormap_size &&	51	pVisual->ColormapEntries == nxagentVisuals[i].colormap_size &&
53	pVisual->nplanes == nxagentVisuals[i].depth &&	52	pVisual->nplanes == nxagentVisuals[i].depth &&
54	pVisual->redMask == nxagentVisuals[i].red_mask &&	53	pVisual->redMask == nxagentVisuals[i].red_mask &&

Return to bug 101691

Lines 1531-1541 Link Here

(-)nx-X11/programs/Xserver/hw/nxagent/Display.c.orig (-1 / +6 lines)
1531	reconnectDisplayState = NOTHING;	1531	reconnectDisplayState = NOTHING;
1532	}	1532	}
1533		1533
		1534	#define WARNING
1534	static Bool reloadVisuals(int flexibility)	1535	static Bool reloadVisuals(int flexibility)
1535	{	1536	{
1536	int i, nitems;	1537	int i, nitems;
1537	XVisualInfo newVisuals, vi;	1538	XVisualInfo newVisuals, vi;
1538	unsigned long mask = VisualAllMask & ~VisualIDMask;	1539	unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask;
1539		1540
1540	newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);	1541	newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);
1541		1542
Lines 1577-1582 Link Here
1577	}	1578	}
1578	}	1579	}
1579		1580
		1581	#ifdef WARNING
		1582	fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i);
		1583	#endif
		1584
1580	if (i == nxagentNumVisuals)	1585	if (i == nxagentNumVisuals)
1581	{	1586	{
1582	nxagentVisuals = newVisuals;	1587	nxagentVisuals = newVisuals;