From 3cbbe7be2cced7aec9c79e81d6259adaa9772208 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:26:46 +0100 Subject: Remove XOR-based code that was unused and incomplete (#673) --- src/fl_overlay.cxx | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx index a4bacb493..2d770d8d0 100644 --- a/src/fl_overlay.cxx +++ b/src/fl_overlay.cxx @@ -1,7 +1,7 @@ // // Overlay support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2023 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 @@ -23,45 +23,16 @@ #include #include -//#define USE_XOR -// unless USE_XOR is defined, this source file is cross-platform - -#ifdef USE_XOR -#include -#endif - static int px,py,pw,ph; -#ifndef USE_XOR #include #include "Fl_Screen_Driver.H" #include static Fl_RGB_Image *s_bgN = 0, *s_bgS = 0, *s_bgE = 0, *s_bgW = 0; static int bgx, bgy, bgw, bgh; -#endif static void draw_current_rect() { -#ifdef USE_XOR -# if defined(FLTK_USE_X11) - GC gc = (GC)fl_graphics_driver->gc(); - XSetFunction(fl_display, gc, GXxor); - XSetForeground(fl_display, gc, 0xffffffff); - XDrawRectangle(fl_display, fl_window, gc, px, py, pw, ph); - XSetFunction(fl_display, gc, GXcopy); -# elif defined(_WIN32) - int old = SetROP2(fl_graphics_driver->gc(), R2_NOT); - fl_rect(px, py, pw, ph); - SetROP2(fl_graphics_driver->gc(), old); -# elif defined(__APPLE__) - // warning: Quartz does not support xor drawing - // Use the Fl_Overlay_Window instead. - fl_color(FL_WHITE); - fl_rect(px, py, pw, ph); -# else -# error unsupported platform -# endif -#else if (s_bgN) { delete s_bgN; s_bgN = 0; } if (s_bgS) { delete s_bgS; s_bgS = 0; } if (s_bgE) { delete s_bgE; s_bgE = 0; } @@ -94,22 +65,13 @@ static void draw_current_rect() { fl_line_style(FL_DOT); fl_graphics_driver->overlay_rect(px, py, pw, ph); fl_line_style(FL_SOLID); -#endif // USE_XOR } static void erase_current_rect() { -#ifdef USE_XOR -# ifdef __APPLE__ // PORTME: Fl_Window_Driver - platform overlay - fl_rect(px, py, pw, ph); -# else - draw_current_rect(); -# endif -#else if (s_bgN) s_bgN->draw(bgx, bgy); if (s_bgS) s_bgS->draw(bgx, (bgy+bgh-1)); if (s_bgW) s_bgW->draw(bgx, bgy); if (s_bgE) s_bgE->draw((bgx+bgw-1), bgy); -#endif } /** -- cgit v1.2.3