procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle color allocation failures caused by colormap changes

Browse source 
* src/xterm.c (x_alloc_nearest_color_1): Recompute color cells
if allocation of cached value failed.
This commit is contained in:
Po Lu 2022-03-07 20:08:13 +08:00
parent 3e4d4f472d
commit 4b0e1c6502
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/xterm.c
View file

@ -3857,6 +3857,10 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
long nearest_delta, trial_delta;
int x;
Status status;
bool retry = false;
int ncolor_cells, i;
start:
cells = x_color_cells (dpy, &no_cells);
@ -3887,6 +3891,30 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
color->blue = cells[nearest].blue;
status = XAllocColor (dpy, cmap, color);
if (status != 0 && !retry)
{
/* Our private cache of color cells is probably out of date.
Refresh it here, and try to allocate the nearest color
from the new colormap. */
retry = true;
xfree (dpyinfo->color_cells);
ncolor_cells = XDisplayCells (dpy, XScreenNumberOfScreen (dpyinfo->screen));
dpyinfo->color_cells = xnmalloc (ncolor_cells,
sizeof *dpyinfo->color_cells);
dpyinfo->ncolor_cells = ncolor_cells;
for (i = 0; i < ncolor_cells; ++i)
dpyinfo->color_cells[i].pixel = i;
XQueryColors (dpy, dpyinfo->cmap,
dpyinfo->color_cells, ncolor_cells);
goto start;
}
rc = status != 0;
}
else