From ec61d4ff4a3f3ed62cdc1d6a378efecd11e69fd2 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 25 Dec 2025 18:29:11 +0100 Subject: Remove dead code from 'plastic' scheme implementation - The removed code had been disabled in the year 2003 or earlier for reasons mentioned in those old commits and has never been officially used again. Use `git blame` to find these commits. - Update comments and copyright. - Remove empty lines. --- src/fl_plastic.cxx | 63 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 60 deletions(-) diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index e9ca0bd2a..0830f0451 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -1,10 +1,11 @@ // -// "Plastic" drawing routines for the Fast Light Tool Kit (FLTK). +// "Plastic" scheme drawing routines for the Fast Light Tool Kit (FLTK). // // These box types provide a cross between Aqua and KDE buttons; kindof // like translucent plastic buttons... // -// Copyright 2001-2025 by Michael Sweet. +// Copyright 2001-2005 by Michael Sweet. +// Copyright 2006-2025 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -25,49 +26,12 @@ #include #include "flstring.h" -// -// Uncomment the following line to restore the old plastic box type -// appearance. -// - -//#define USE_OLD_PLASTIC_BOX -#define USE_OLD_PLASTIC_COLOR - extern const uchar *fl_gray_ramp(); inline Fl_Color shade_color(uchar gc, Fl_Color bc) { -#ifdef USE_OLD_PLASTIC_COLOR return fl_color_average((Fl_Color)gc, bc, 0.75f); -#else - unsigned grgb = Fl::get_color((Fl_Color)gc), - brgb = Fl::get_color(bc); - int red, green, blue, gray; - - - gray = ((grgb >> 24) & 255); - red = gray * ((brgb >> 24) & 255) / 255 + gray * gray / 510; - gray = ((grgb >> 16) & 255); - green = gray * ((brgb >> 16) & 255) / 255 + gray * gray / 510; - gray = ((grgb >> 8) & 255); - blue = gray * ((brgb >> 8) & 255) / 255 + gray * gray / 510; - - if (red > 255) - red = 255; - - if (green > 255) - green = 255; - - if (blue > 255) - blue = 255; - - if (Fl::draw_box_active()) - return fl_rgb_color(red, green, blue); - else - return fl_color_average(FL_GRAY, fl_rgb_color(red, green, blue), 0.75f); -#endif // USE_OLD_PLASTIC_COLOR } - static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { const uchar *g = fl_gray_ramp(); int b = ((int) strlen(c)) / 4 + 1; @@ -87,7 +51,6 @@ static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { } } - static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) { const uchar *g = fl_gray_ramp(); size_t b = strlen(c) / 4 + 1; @@ -141,7 +104,6 @@ static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) } } - static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { const uchar *g = fl_gray_ramp(); int i, j; @@ -267,12 +229,10 @@ static void shade_round(int x, int y, int w, int h, const char *c, Fl_Color bc) } } - void fl_plastic_up_frame(int x, int y, int w, int h, Fl_Color c) { frame_rect(x, y, w, h - 1, "KLDIIJLM", c); } - static void narrow_thin_box(int x, int y, int w, int h, Fl_Color c) { if (h<=0 || w<=0) return; const uchar *g = fl_gray_ramp(); @@ -289,48 +249,33 @@ static void narrow_thin_box(int x, int y, int w, int h, Fl_Color c) { } } - void fl_plastic_thin_up_box(int x, int y, int w, int h, Fl_Color c) { -#ifdef USE_OLD_PLASTIC_BOX - shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c); - fl_plastic_up_frame(x, y, w, h, c); -#else if (w > 4 && h > 4) { shade_rect(x + 1, y + 1, w - 2, h - 3, "RQOQSUWQ", c); frame_rect(x, y, w, h - 1, "IJLM", c); } else { narrow_thin_box(x, y, w, h, c); } -#endif // USE_OLD_PLASTIC_BOX } - void fl_plastic_up_box(int x, int y, int w, int h, Fl_Color c) { -#ifdef USE_OLD_PLASTIC_BOX - shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c); - fl_plastic_up_frame(x, y, w, h, c); -#else if (w > 8 && h > 8) { shade_rect(x + 1, y + 1, w - 2, h - 3, "RVQNOPQRSTUVWVQ", c); frame_rect(x, y, w, h - 1, "IJLM", c); } else { fl_plastic_thin_up_box(x, y, w, h, c); } -#endif // USE_OLD_PLASTIC_BOX } - void fl_plastic_up_round(int x, int y, int w, int h, Fl_Color c) { shade_round(x, y, w, h, "RVQNOPQRSTUVWVQ", c); frame_round(x, y, w, h, "IJLM", c); } - void fl_plastic_down_frame(int x, int y, int w, int h, Fl_Color c) { frame_rect(x, y, w, h - 1, "LLLLTTRR", c); } - void fl_plastic_down_box(int x, int y, int w, int h, Fl_Color c) { if (w > 6 && h > 6) { shade_rect(x + 2, y + 2, w - 4, h - 5, "STUVWWWVT", c); @@ -341,9 +286,7 @@ void fl_plastic_down_box(int x, int y, int w, int h, Fl_Color c) { } } - void fl_plastic_down_round(int x, int y, int w, int h, Fl_Color c) { shade_round(x, y, w, h, "STUVWWWVT", c); frame_round(x, y, w, h, "IJLM", c); } - -- cgit v1.2.3