From 868ab9696fb51628afac1ea10f7df6a27907a089 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:52:21 +0100 Subject: Rename class Fl_Display_Cairo_Graphics_Driver to Fl_X11_Cairo_Graphics_Driver --- .../Cairo/Fl_Display_Cairo_Graphics_Driver.H | 37 ------------- .../Cairo/Fl_Display_Cairo_Graphics_Driver.cxx | 64 ---------------------- src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.H | 37 +++++++++++++ src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.cxx | 64 ++++++++++++++++++++++ 4 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H delete mode 100644 src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx create mode 100644 src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.H create mode 100644 src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.cxx (limited to 'src/drivers/Cairo') diff --git a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H deleted file mode 100644 index 7c514b1cf..000000000 --- a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H +++ /dev/null @@ -1,37 +0,0 @@ -// -// Support for using Cairo to draw into X11 windows for the Fast Light Tool Kit (FLTK). -// -// Copyright 2022 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 -// file is missing or damaged, see the license at: -// -// https://www.fltk.org/COPYING.php -// -// Please see the following page on how to report bugs and issues: -// -// https://www.fltk.org/bugs.php -// - -/* \file - Declaration of class Fl_Display_Cairo_Graphics_Driver. -*/ - -#ifndef FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H -# define FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H - -#include "Fl_Cairo_Graphics_Driver.H" - -class Fl_Display_Cairo_Graphics_Driver : public Fl_Cairo_Graphics_Driver { -private: - static void *gc_; -public: - void scale(float f) FL_OVERRIDE; - float scale() {return Fl_Graphics_Driver::scale();} - void gc(void *value) FL_OVERRIDE; - void* gc() FL_OVERRIDE; - void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; - }; - -#endif // FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H diff --git a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx deleted file mode 100644 index 02df902d8..000000000 --- a/src/drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx +++ /dev/null @@ -1,64 +0,0 @@ -// -// Support for using Cairo to draw into X11 windows for the Fast Light Tool Kit (FLTK). -// -// Copyright 2022 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 -// file is missing or damaged, see the license at: -// -// https://www.fltk.org/COPYING.php -// -// Please see the following page on how to report bugs and issues: -// -// https://www.fltk.org/bugs.php -// - -/* \file - Implementation of class Fl_Display_Cairo_Graphics_Driver . -*/ - -#include "Fl_Display_Cairo_Graphics_Driver.H" -#include -#include -#include -#include - - -void *Fl_Display_Cairo_Graphics_Driver::gc_ = NULL; -GC fl_gc; - - -ulong fl_xpixel(uchar r,uchar g,uchar b) { - return 0; -} -ulong fl_xpixel(Fl_Color i) { - return 0; -} - - -void Fl_Display_Cairo_Graphics_Driver::scale(float f) { - Fl_Graphics_Driver::scale(f); - if (cairo_) { - cairo_restore(cairo_); - cairo_save(cairo_); - cairo_scale(cairo_, f, f); - cairo_translate(cairo_, 0.5, 0.5); - } -} - - -void Fl_Display_Cairo_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { - XCopyArea(fl_display, pixmap, fl_window, (GC)Fl_Graphics_Driver::default_driver().gc(), int(srcx*scale()), int(srcy*scale()), int(w*scale()), int(h*scale()), int(x*scale()), int(y*scale())); -} - - -void Fl_Display_Cairo_Graphics_Driver::gc(void *value) { - gc_ = value; - fl_gc = (GC)gc_; -} - - -void *Fl_Display_Cairo_Graphics_Driver::gc() { - return gc_; -} diff --git a/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.H new file mode 100644 index 000000000..3ac7ca88a --- /dev/null +++ b/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.H @@ -0,0 +1,37 @@ +// +// Support for using Cairo to draw into X11 windows for the Fast Light Tool Kit (FLTK). +// +// Copyright 2022-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 +// file is missing or damaged, see the license at: +// +// https://www.fltk.org/COPYING.php +// +// Please see the following page on how to report bugs and issues: +// +// https://www.fltk.org/bugs.php +// + +/* \file + Declaration of class Fl_X11_Cairo_Graphics_Driver. +*/ + +#ifndef FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H +# define FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H + +#include "Fl_Cairo_Graphics_Driver.H" + +class Fl_X11_Cairo_Graphics_Driver : public Fl_Cairo_Graphics_Driver { +private: + static void *gc_; +public: + void scale(float f) FL_OVERRIDE; + float scale() {return Fl_Graphics_Driver::scale();} + void gc(void *value) FL_OVERRIDE; + void* gc() FL_OVERRIDE; + void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE; + }; + +#endif // FL_DISPLAY_CAIRO_GRAPHICS_DRIVER_H diff --git a/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.cxx new file mode 100644 index 000000000..d673c3dfa --- /dev/null +++ b/src/drivers/Cairo/Fl_X11_Cairo_Graphics_Driver.cxx @@ -0,0 +1,64 @@ +// +// Support for using Cairo to draw into X11 windows for the Fast Light Tool Kit (FLTK). +// +// Copyright 2022-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 +// file is missing or damaged, see the license at: +// +// https://www.fltk.org/COPYING.php +// +// Please see the following page on how to report bugs and issues: +// +// https://www.fltk.org/bugs.php +// + +/* \file + Implementation of class Fl_X11_Cairo_Graphics_Driver. +*/ + +#include "Fl_X11_Cairo_Graphics_Driver.H" +#include +#include +#include +#include + + +void *Fl_X11_Cairo_Graphics_Driver::gc_ = NULL; +GC fl_gc; + + +ulong fl_xpixel(uchar r,uchar g,uchar b) { + return 0; +} +ulong fl_xpixel(Fl_Color i) { + return 0; +} + + +void Fl_X11_Cairo_Graphics_Driver::scale(float f) { + Fl_Graphics_Driver::scale(f); + if (cairo_) { + cairo_restore(cairo_); + cairo_save(cairo_); + cairo_scale(cairo_, f, f); + cairo_translate(cairo_, 0.5, 0.5); + } +} + + +void Fl_X11_Cairo_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { + XCopyArea(fl_display, pixmap, fl_window, (GC)Fl_Graphics_Driver::default_driver().gc(), int(srcx*scale()), int(srcy*scale()), int(w*scale()), int(h*scale()), int(x*scale()), int(y*scale())); +} + + +void Fl_X11_Cairo_Graphics_Driver::gc(void *value) { + gc_ = value; + fl_gc = (GC)gc_; +} + + +void *Fl_X11_Cairo_Graphics_Driver::gc() { + return gc_; +} -- cgit v1.2.3