From 7bb8bdb1fa2768dc19cf428e0b013ab66191b9e9 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:20:01 +0100
Subject: Fix Fl_{Wayland|Xlib}_{Copy|Image}_Surface_Driver::set_current()

Member function Fl_Cairo_Graphics_Driver::set_cairo() needs be called only to initialize the driver.
Doing it also later undoes the effect of Fl_Widget_Surface::translate() if used
when Fl_Surface_Device::pop_current() calls the overridden Fl_Surface_Device::set_current().
---
 src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx  | 3 ++-
 src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/drivers/Xlib')

diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
index c905dbbad..f60f748f5 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
@@ -78,7 +78,8 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() {
   oldwindow = fl_window;
   fl_window = xid->offscreen();
 #if FLTK_USE_CAIRO
-  ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_);
+  Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
+  if (!dr->cr()) dr->set_cairo(cairo_);
 #endif
 }
 
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
index 2660dcda7..280ad234c 100644
--- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
@@ -82,7 +82,8 @@ void Fl_Xlib_Image_Surface_Driver::set_current() {
   pre_window = fl_window;
   fl_window = offscreen;
 #if FLTK_USE_CAIRO
-  ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_);
+  Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
+  if (!dr->cr()) dr->set_cairo(cairo_);
 #endif
 }
 
-- 
cgit v1.2.3