tmore color map hackery from axel. - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit fff395d75c5f9621bc0681550ff66be05acd065b
(DIR) parent 2774920b35a57ef4bc70b7612f35bfec21a7231b
(HTM) Author: rsc <devnull@localhost>
Date: Fri, 26 Mar 2004 17:44:45 +0000
more color map hackery from axel.
Diffstat:
M src/libdraw/x11-init.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c
t@@ -578,6 +578,10 @@ plan9cmap(void)
* Initialize and install the rgbv color map as a private color map
* for this application. It gets the best colors when it has the
* cursor focus.
+ *
+ * We always choose the best depth possible, but that might not
+ * be the default depth. On such "suboptimal" systems, we have to allocate an
+ * empty color map anyway, according to Axel Belinfante.
*/
static int
setupcmap(XWindow w)
t@@ -591,17 +595,8 @@ setupcmap(XWindow w)
return 0;
if(_x.depth >= 24) {
- /*
- * This is needed for SunOS. Ask Axel Belinfante.
- */
- if(_x.usetable == 0){
- _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocAll);
- XStoreColors(_x.display, _x.cmap, _x.map, 256);
- for(i = 0; i < 256; i++){
- _x.tox11[i] = i;
- _x.toplan9[i] = i;
- }
- }
+ if(_x.usetable == 0)
+ _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocNone);
/*
* The pixel value returned from XGetPixel needs to
t@@ -647,6 +642,8 @@ setupcmap(XWindow w)
* Do nothing. We have no way to express a
* mixed-endian 16-bit screen, so pretend they don't exist.
*/
+ if(_x.usetable == 0)
+ _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocNone);
}else if(_x.vis->class == PseudoColor){
if(_x.usetable == 0){
_x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocAll);