Commit e41477f3 authored by Daniel Stone's avatar Daniel Stone

Colours: Fix --disable-xcms

Disable large tracts of colour management code when passing
--disable-xcms.
parent 11ea0974
......@@ -53,7 +53,9 @@ Colormap XCreateColormap(
UnlockDisplay(dpy);
SyncHandle();
#ifdef XCMS
_XcmsAddCmapRec(dpy, mid, w, visual);
#endif
return(mid);
}
......@@ -46,6 +46,9 @@ XFreeColormap(
UnlockDisplay(dpy);
SyncHandle();
#ifdef XCMS
_XcmsDeleteCmapRec(dpy, cmap);
#endif
return 1;
}
......@@ -51,6 +51,7 @@ XColor *exact_def) /* RETURN */
XcmsColor cmsColor_exact;
Status ret;
#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
......@@ -76,6 +77,7 @@ XColor *exact_def) /* RETURN */
break;
}
}
#endif
/*
* Xcms and i18n approach failed.
......
......@@ -49,6 +49,7 @@ XLookupColor (
XcmsCCC ccc;
XcmsColor cmsColor_exact;
#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
......@@ -73,6 +74,7 @@ XLookupColor (
break;
}
}
#endif
/*
* Xcms and i18n methods failed, so lets pass it to the server
......
......@@ -86,6 +86,7 @@ XParseColor (
}
#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
......@@ -109,6 +110,7 @@ XParseColor (
break;
}
}
#endif
/*
* Xcms and i18n methods failed, so lets pass it to the server
......
......@@ -88,6 +88,9 @@ void XSetStandardColormap(
stdcmap.visualid = sp->root_visual->visualid;
stdcmap.killid = None; /* don't know how to kill this one */
#ifdef XCMS
XSetRGBColormaps (dpy, w, &stdcmap, 1, property);
#endif
return;
}
......@@ -48,6 +48,7 @@ int flags) /* DoRed, DoGreen, DoBlue */
XcmsColor cmsColor_exact;
XColor scr_def;
#ifdef XCMS
/*
* Let's Attempt to use Xcms approach to Parse Color
*/
......@@ -64,6 +65,7 @@ int flags) /* DoRed, DoGreen, DoBlue */
* name. Thus pass name to the X Server.
*/
}
#endif
/*
* The Xcms and i18n methods failed, so lets pass it to the server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment