all repos — fluxbox @ afd7e5a6b7043812e472994dd2f49941094ee080

custom fork of the fluxbox windowmanager

removed color functions
fluxgen fluxgen
commit

afd7e5a6b7043812e472994dd2f49941094ee080

parent

3dc5c4bf551155acad7a0173115496fd845c2417

2 files changed, 2 insertions(+), 25 deletions(-)

jump to
M src/Image.ccsrc/Image.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Image.cc,v 1.14 2002/09/14 13:52:08 fluxgen Exp $ +// $Id: Image.cc,v 1.15 2002/09/14 15:05:00 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE

@@ -2306,26 +2306,6 @@ return;

} } } -} - - - - -unsigned long BImageControl::color(const char *colorname) { - XColor color; - color.pixel = 0; - - if (! XParseColor(basedisplay->getXDisplay(), colormap(), colorname, &color)) - fprintf(stderr, "BImageControl::color: color parse error: \"%s\"\n", - colorname); - else { - if (! XAllocColor(basedisplay->getXDisplay(), colormap(), &color)) - fprintf(stderr, "BImageControl::color: color alloc error: \"%s\"\n", - colorname); - else - fprintf(stderr, "%s(%d) Allocated color:%s", __FILE__, __LINE__, colorname); - } - return color.pixel; }
M src/Image.hhsrc/Image.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Image.hh,v 1.12 2002/09/14 13:50:38 fluxgen Exp $ +// $Id: Image.hh,v 1.13 2002/09/14 15:03:32 fluxgen Exp $ #ifndef IMAGE_HH #define IMAGE_HH

@@ -120,9 +120,6 @@ /// @return depth of screen

inline int depth() const { return screen_depth; } inline int colorsPerChannel() const { return colors_per_channel; } - unsigned long color(const char *colorname); - unsigned long color(const char *, unsigned char *, unsigned char *, - unsigned char *); unsigned long getSqrt(unsigned int val); /** Render to pixmap