X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16c1f7f345e1850f590cfbf67c3b00fbb6d2e62e..8aa4edd248534c4c1879c93d363d1b7fb8e8c5c6:/src/motif/palette.cpp diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp index e5ec732673..450c691097 100644 --- a/src/motif/palette.cpp +++ b/src/motif/palette.cpp @@ -9,29 +9,101 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* + * Colour map + * + * When constructed with the default constructor, we start from + * the wxApp::GetMainColormap, allocating additional read-only cells + * in Create(). The cells are freed on the next call to Create() + * or when the destructor is called. + */ + +/* Wolfram Gloger +I have implemented basic colormap support for the X11 versions of +wxWindows, notably wxPalette::Create(). The way I did it is to +allocate additional read-only color cells in the default colormap. In +general you will get arbitrary pixel values assigned to these new +cells and therefore I added a method wxColourMap::TransferBitmap() +which maps the pixel values 0..n to the real ones obtained with +Create(). This is only implemented for the popular case of 8-bit +depth. + +Allocating read-write color cells would involve installing a private +X11 colormap for a particular window, and AFAIK this is not +recommended; only the window manager should do this... Also, it is +not the functionality that wxPalette::Create() aims to provide. + */ + #ifdef __GNUG__ #pragma implementation "palette.h" #endif #include "wx/palette.h" +#include "wx/window.h" +#include "wx/app.h" +#include "wx/utils.h" + +#include +#include "wx/motif/private.h" #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject) #endif /* - * Palette - * - */ +* Palette +* +*/ + +wxXPalette::wxXPalette() +{ + m_cmap = (WXColormap) 0; + m_pix_array_n = 0; + m_pix_array = (unsigned long*) 0; + m_display = (WXDisplay*) 0; + m_destroyable = FALSE; +} wxPaletteRefData::wxPaletteRefData() { - m_colormap = (WXColormap) 0; } wxPaletteRefData::~wxPaletteRefData() { - // TODO + XColor xcol; + Display *display = (Display*) NULL; + + wxNode *node, *next; + + for (node = m_palettes.First(); node; node = next) { + wxXPalette *c = (wxXPalette *)node->Data(); + unsigned long *pix_array = c->m_pix_array; + Colormap cmap = (Colormap) c->m_cmap; + bool destroyable = c->m_destroyable; + int pix_array_n = c->m_pix_array_n; + display = (Display*) c->m_display; + + if (pix_array_n > 0) + { + // XFreeColors(display, cmap, pix_array, pix_array_n, 0); + // Be careful not to free '0' pixels... + int i, j; + for(i=j=0; i i) XFreeColors(display, cmap, &pix_array[i], j-i, 0); + while(jNext(); + m_palettes.DeleteNode(node); + delete c; + } } wxPalette::wxPalette() @@ -49,20 +121,53 @@ wxPalette::~wxPalette() bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) { - UnRef(); - - m_refData = new wxPaletteRefData; - - // TODO - - return FALSE; + UnRef(); + + if (!n) { + return FALSE; + } + + m_refData = new wxPaletteRefData; + + XColor xcol; + Display* display = (Display*) wxGetDisplay(); + + unsigned long *pix_array; + Colormap cmap; + int pix_array_n; + + cmap = (Colormap) wxTheApp->GetMainColormap(display); + + pix_array = new unsigned long[n]; + if (!pix_array) + return FALSE; + + pix_array_n = n; + xcol.flags = DoRed | DoGreen | DoBlue; + for(int i = 0; i < n; i++) { + xcol.red = (unsigned short)red[i] << 8; + xcol.green = (unsigned short)green[i] << 8; + xcol.blue = (unsigned short)blue[i] << 8; + pix_array[i] = (XAllocColor(display, cmap, &xcol) == 0) ? 0 : xcol.pixel; + } + + wxXPalette *c = new wxXPalette; + + c->m_pix_array_n = pix_array_n; + c->m_pix_array = pix_array; + c->m_cmap = (WXColormap) cmap; + c->m_display = (WXDisplay*) display; + c->m_destroyable = FALSE; + M_PALETTEDATA->m_palettes.Append(c); + + return TRUE; } int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const { if ( !m_refData ) - return FALSE; - + return FALSE; + // TODO return FALSE; } @@ -70,13 +175,179 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const { if ( !m_refData ) - return FALSE; - + return FALSE; + if (index < 0 || index > 255) return FALSE; - + // TODO return FALSE; } +WXColormap wxPalette::GetXColormap(WXDisplay* display) const +{ + if (!M_PALETTEDATA || (M_PALETTEDATA->m_palettes.Number() == 0)) + return wxTheApp->GetMainColormap(display); + + wxNode* node = M_PALETTEDATA->m_palettes.First(); + if (!display && node) + { + wxXPalette* p = (wxXPalette*) node->Data(); + return p->m_cmap; + } + while (node) + { + wxXPalette* p = (wxXPalette*) node->Data(); + if (p->m_display == display) + return p->m_cmap; + + node = node->Next(); + } + + /* Make a new one: */ + wxXPalette *c = new wxXPalette; + wxXPalette *first = (wxXPalette *)M_PALETTEDATA->m_palettes.First()->Data(); + XColor xcol; + int pix_array_n = first->m_pix_array_n; + + c->m_pix_array_n = pix_array_n; + c->m_pix_array = new unsigned long[pix_array_n]; + c->m_display = display; + c->m_cmap = wxTheApp->GetMainColormap(display); + c->m_destroyable = FALSE; + + xcol.flags = DoRed | DoGreen | DoBlue; + int i; + for (i = 0; i < pix_array_n; i++) + { + xcol.pixel = first->m_pix_array[i]; + XQueryColor((Display*) first->m_display, (Colormap) first->m_cmap, &xcol); + c->m_pix_array[i] = + (XAllocColor((Display*) display, (Colormap) c->m_cmap, &xcol) == 0) ? 0 : xcol.pixel; + } + + // wxPalette* nonConstThis = (wxPalette*) this; + + M_PALETTEDATA->m_palettes.Append(c); + + return c->m_cmap; +} + +bool wxPalette::TransferBitmap(void *data, int depth, int size) +{ + switch(depth) { + case 8: + { + unsigned char *uptr = (unsigned char *)data; + int pix_array_n; + unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n); + while(size-- > 0) + { + if((int)*uptr < pix_array_n) + *uptr = (unsigned char)pix_array[*uptr]; + uptr++; + } + + return TRUE; + } + default: + return FALSE; + } +} + +bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz, + void *dest, unsigned int bpp) +{ + int pix_array_n; + unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n); + switch(bpp) { + case 8: { + unsigned char *dptr = (unsigned char *)dest; + while(sz-- > 0) { + if((int)*data < pix_array_n) + *dptr = (unsigned char)pix_array[*data]; + data++; + dptr++; + } + break; + } + case 16: { + unsigned short *dptr = (unsigned short *)dest; + while(sz-- > 0) { + if((int)*data < pix_array_n) + *dptr = (unsigned short)pix_array[*data]; + data++; + dptr++; + } + break; + } + case 24: { + struct rgb24 { unsigned char r, g, b; } *dptr = (struct rgb24 *)dest; + while(sz-- > 0) { + if((int)*data < pix_array_n) { + dptr->r = pix_array[*data] & 0xFF; + dptr->g = (pix_array[*data] >> 8) & 0xFF; + dptr->b = (pix_array[*data] >> 16) & 0xFF; + } + data++; + dptr++; + } + break; + } + case 32: { + unsigned long *dptr = (unsigned long *)dest; + while(sz-- > 0) { + if((int)*data < pix_array_n) + *dptr = pix_array[*data]; + data++; + dptr++; + } + break; + } + default: + return FALSE; + } + return TRUE; +} + +unsigned long *wxPalette::GetXPixArray(WXDisplay *display, int *n) +{ + if (!M_PALETTEDATA) + return (unsigned long*) 0; + wxNode *node; + + for (node = M_PALETTEDATA->m_palettes.First(); node; node = node->Next()) + { + wxXPalette *c = (wxXPalette *)node->Data(); + if (c->m_display == display) + { + if (n) + *n = c->m_pix_array_n; + return c->m_pix_array; + } + } + + /* Not found; call GetXColormap, which will create it, then this again */ + if (GetXColormap(display)) + return GetXPixArray(display, n); + else + return (unsigned long*) 0; +} + +void wxPalette::PutXColormap(WXDisplay* display, WXColormap cm, bool dp) +{ + UnRef(); + + m_refData = new wxPaletteRefData; + + wxXPalette *c = new wxXPalette; + + c->m_pix_array_n = 0; + c->m_pix_array = (unsigned long*) NULL; + c->m_display = display; + c->m_cmap = cm; + c->m_destroyable = dp; + + M_PALETTEDATA->m_palettes.Append(c); +}