patch 8.0.1800: X11: getting color is slow
Problem: X11: getting color is slow.
Solution: Avoid using sprintf() and XParseColor(), put the RGB values in
XColor directly.
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 097de5f..4908449 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2296,15 +2296,24 @@
guicolor_T
gui_mch_get_rgb_color(int r, int g, int b)
{
- char spec[8]; /* space enough to hold "#RRGGBB" */
XColor available;
Colormap colormap;
+/* Using XParseColor() is very slow, put rgb in XColor directly.
+
+ char spec[8]; // space enough to hold "#RRGGBB"
vim_snprintf(spec, sizeof(spec), "#%.2x%.2x%.2x", r, g, b);
- colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy));
if (XParseColor(gui.dpy, colormap, (char *)spec, &available) != 0
&& XAllocColor(gui.dpy, colormap, &available) != 0)
return (guicolor_T)available.pixel;
+*/
+ colormap = DefaultColormap(gui.dpy, DefaultScreen(gui.dpy));
+ vim_memset(&available, 0, sizeof(XColor));
+ available.red = r << 8;
+ available.green = g << 8;
+ available.blue = b << 8;
+ if (XAllocColor(gui.dpy, colormap, &available) != 0)
+ return (guicolor_T)available.pixel;
return INVALCOLOR;
}
diff --git a/src/version.c b/src/version.c
index 7f7e1b6..0e1cdff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1800,
+/**/
1799,
/**/
1798,