Provide new methods in TVirtualPadPainter

linev · linev · commit 73a4c5d86f86 · 2026-03-05T16:26:59.000+01:00
`NewPage()` used only PS to start page

`IsCocoa()` let check if cocoa backend is used,
invoved in several places

`ResizeDrawable()` to change gVirtualX created pixmap

Provide `TGLPadPainter::ClearDrawable()` while now
pad painter API used in painting

Now gVirtualPS usage in TPad minimized only to
Print() method.
diff --git a/core/base/inc/TVirtualPadPainter.h b/core/base/inc/TVirtualPadPainter.h
@@ -79,6 +79,7 @@ class TVirtualPadPainter {
    //Currently, must be implemented only for X11/GDI
    virtual Int_t    CreateDrawable(UInt_t w, UInt_t h) = 0;//gVirtualX->OpenPixmap
    virtual void     ClearDrawable() = 0;//gVirtualX->Clear()
+   virtual Int_t    ResizeDrawable(Int_t /* device */, UInt_t /* w */, UInt_t /* h */) { return 0; } //gVirtualX->ResizePixmap
    virtual void     CopyDrawable(Int_t device, Int_t px, Int_t py) = 0;
    virtual void     DestroyDrawable(Int_t device) = 0;//gVirtualX->CloseWindow
    virtual void     SelectDrawable(Int_t device) = 0;//gVirtualX->SelectWindow
@@ -91,6 +92,7 @@ class TVirtualPadPainter {
    virtual void     InitPainter();
    virtual void     InvalidateCS();
    virtual void     LockPainter();
+   virtual void     NewPage() {}
 
    //Now, drawing primitives.
    virtual void     DrawLine(Double_t x1, Double_t y1, Double_t x2, Double_t y2) = 0;
@@ -124,6 +126,7 @@ class TVirtualPadPainter {
    virtual void     OnPad(TVirtualPad *) {}
 
    virtual Bool_t   IsNative() const { return kFALSE; }
+   virtual Bool_t   IsCocoa() const { return kFALSE; }
 
    static TVirtualPadPainter *PadPainter(Option_t *opt = "");
 
diff --git a/graf2d/gpad/inc/TPadPainter.h b/graf2d/gpad/inc/TPadPainter.h
@@ -74,6 +74,7 @@ class TPadPainter : public TVirtualPadPainter {
    //2. "Off-screen management" part.
    Int_t    CreateDrawable(UInt_t w, UInt_t h) override;
    void     ClearDrawable() override;
+   Int_t    ResizeDrawable(Int_t device, UInt_t w, UInt_t h) override;
    void     CopyDrawable(Int_t device, Int_t px, Int_t py) override;
    void     DestroyDrawable(Int_t device) override;
    void     SelectDrawable(Int_t device) override;
@@ -113,6 +114,9 @@ class TPadPainter : public TVirtualPadPainter {
 
    Bool_t   IsNative() const override { return kTRUE; }
 
+   Bool_t   IsCocoa() const;
+
+
 private:
    //Let's make this clear:
    TPadPainter(const TPadPainter &) = delete;
diff --git a/graf2d/gpad/inc/TPadPainterPS.h b/graf2d/gpad/inc/TPadPainterPS.h
@@ -81,6 +81,8 @@ class TPadPainterPS : public TVirtualPadPainter {
    void     DestroyDrawable(Int_t device) override;
    void     SelectDrawable(Int_t device) override;
 
+   void     NewPage() override;
+
    //TASImage support (noop for a non-gl pad).
    void     DrawPixels(const unsigned char *pixelData, UInt_t width, UInt_t height,
                        Int_t dstX, Int_t dstY, Bool_t enableAlphaBlending) override;
diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx
@@ -741,8 +741,14 @@ void TPad::Clear(Option_t *option)
       getchar();
    }
 
-   if (!gPad->IsBatch() && GetPainter()) GetPainter()->ClearDrawable();
-   if (gVirtualPS && gPad == gPad->GetCanvas()) gVirtualPS->NewPage();
+   auto pp = GetPainter();
+   // If pad painter uses PS, ClearDrawable() start new page
+   if (pp) {
+      if (pp->IsNative())
+         pp->ClearDrawable();
+      else if (this == GetCanvas())
+         pp->NewPage();
+   }
 
    PaintBorder(GetFillColor(), kTRUE);
    fCrosshairPos = 0;
@@ -3199,9 +3205,12 @@ void TPad::GetRangeAxis(Double_t &xmin, Double_t &ymin, Double_t &xmax, Double_t
 
 void TPad::HighLight(Color_t color, Bool_t set)
 {
-   if (gVirtualPS && gVirtualPS->TestBit(kPrintingPS)) return;
+   if (auto pp = GetPainter())
+      if(!pp->IsNative())
+         return;
 
-   if (color <= 0) return;
+   if (color <= 0)
+      return;
 
    AbsCoordinates(kTRUE);
 
@@ -3220,10 +3229,8 @@ void TPad::HighLight(Color_t color, Bool_t set)
       // momentarily such that when DrawClone is called, it is
       // not the right value (for DrawClone). Should be FIXED.
       gROOT->SetSelectedPad(this);
-      if (GetBorderMode()>0) {
-         if (set) PaintBorder(-color, kFALSE);
-         else     PaintBorder(-GetFillColor(), kFALSE);
-      }
+      if (GetBorderMode() > 0)
+         PaintBorder(set ? -color : -GetFillColor(), kFALSE);
    }
 
    AbsCoordinates(kFALSE);
@@ -3811,7 +3818,7 @@ void TPad::PaintBorder(Color_t color, Bool_t /* tops */)
       //With Cocoa we have a transparency. But we also have
       //pixmaps, and if you just paint a new content over the old one
       //with alpha < 1., you'll be able to see the old content.
-      if (pp->IsNative() && gVirtualX->InheritsFrom("TGCocoa"))
+      if (pp->IsNative() && pp->IsCocoa())
          pp->ClearDrawable();
 
       PaintBox(fX1, fY1, fX2, fY2);
@@ -3917,7 +3924,7 @@ void TPad::PaintBorder(Color_t color, Bool_t /* tops */)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-/// Paint a frame border with Postscript.
+/// Paint a frame border with Postscript - no longer used
 
 void TPad::PaintBorderPS(Double_t xl,Double_t yl,Double_t xt,Double_t yt,Int_t bmode,Int_t bsize,Int_t dark,Int_t light)
 {
@@ -4028,7 +4035,9 @@ void TPad::PaintModified()
       TContext ctxt(this, kTRUE);
       if (IsModified() || IsTransparent()) {
          if ((fFillStyle < 3026) && (fFillStyle > 3000)) {
-            if (!gPad->IsBatch() && GetPainter()) GetPainter()->ClearDrawable();
+            auto pp = GetPainter();
+            if (pp && pp->IsNative())
+               pp->ClearDrawable();
          }
          PaintBorder(GetFillColor(), kTRUE);
       }
@@ -4129,7 +4138,7 @@ void TPad::PaintBox(Double_t x1, Double_t y1, Double_t x2, Double_t y2, Option_t
       //ignore this style option when this is the canvas itself
       if (this == fMother) {
          //It's clear, that virtual X checks a style (4000) and will render a hollow rect!
-         if (gVirtualX->InheritsFrom("TGCocoa")) {
+         if (pp->IsCocoa()) {
             style0 = style;
             pp->SetFillStyle(1000);
          }
@@ -5946,9 +5955,10 @@ void TPad::ResizePad(Option_t *option)
    if (gPad->IsBatch())
       fPixmapID = 0;
    else {
-      if (GetPainter()){
-        GetPainter()->SetLineWidth(-1);
-        GetPainter()->SetTextSize(-1);
+      auto pp = GetPainter();
+      if (pp){
+        pp->SetLineWidth(-1);
+        pp->SetTextSize(-1);
       }
       // create or re-create off-screen pixmap
       if (fPixmapID) {
@@ -5972,13 +5982,12 @@ void TPad::ResizePad(Option_t *option)
             h = 10;
          }
          if (fPixmapID == -1) {      // this case is handled via the ctor
-            if (GetPainter()) fPixmapID = GetPainter()->CreateDrawable(w, h);
+            if (pp)
+               fPixmapID = pp->CreateDrawable(w, h);
          } else {
-            if (gVirtualX) {
-               if (gVirtualX->ResizePixmap(fPixmapID, w, h)) {
-                  Resized();
-                  Modified(kTRUE);
-               }
+            if (pp && pp->ResizeDrawable(fPixmapID, w, h)) {
+               Resized();
+               Modified(kTRUE);
             }
          }
       }
diff --git a/graf2d/gpad/src/TPadPainter.cxx b/graf2d/gpad/src/TPadPainter.cxx
@@ -361,6 +361,23 @@ Int_t TPadPainter::CreateDrawable(UInt_t w, UInt_t h)
    return gVirtualX->OpenPixmap(Int_t(w), Int_t(h));
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Resize a gVirtualX Pixmap.
+
+Int_t TPadPainter::ResizeDrawable(Int_t device, UInt_t w, UInt_t h)
+{
+   return gVirtualX->ResizePixmap(device, w, h);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// Returns true when cocoa backend is used
+
+Bool_t TPadPainter::IsCocoa() const
+{
+   return gVirtualX->InheritsFrom("TGCocoa");
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Clear the current gVirtualX window.
diff --git a/graf2d/gpad/src/TPadPainterPS.cxx b/graf2d/gpad/src/TPadPainterPS.cxx
@@ -332,7 +332,7 @@ Int_t TPadPainterPS::CreateDrawable(UInt_t, UInt_t)
 
 
 ////////////////////////////////////////////////////////////////////////////////
-/// Clear the current gVirtualX window - not implemented
+/// Clear the current gVirtualX window - noop for PS
 
 void TPadPainterPS::ClearDrawable()
 {
@@ -362,6 +362,17 @@ void TPadPainterPS::SelectDrawable(Int_t)
 {
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+/// Start new page on PS output
+
+void  TPadPainterPS::NewPage()
+{
+   fPS->NewPage();
+}
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 ///Noop, for non-gl pad TASImage calls gVirtualX->CopyArea.
 
diff --git a/graf3d/gl/inc/TGLPadPainter.h b/graf3d/gl/inc/TGLPadPainter.h
@@ -96,6 +96,7 @@ class TGLPadPainter : public TVirtualPadPainter {
    //2. "Off-screen management" part.
    Int_t    CreateDrawable(UInt_t w, UInt_t h) override;
    void     ClearDrawable() override;
+   Int_t    ResizeDrawable(Int_t device, UInt_t w, UInt_t h) override;
    void     CopyDrawable(Int_t device, Int_t px, Int_t py) override;
    void     DestroyDrawable(Int_t device) override;
    void     SelectDrawable(Int_t device) override;
@@ -135,6 +136,8 @@ class TGLPadPainter : public TVirtualPadPainter {
 
    Bool_t IsNative() const override { return kTRUE; }
 
+   Bool_t   IsCocoa() const override;
+
 private:
 
    //Attention! GL_PROJECTION will become
diff --git a/graf3d/gl/src/TGLPadPainter.cxx b/graf3d/gl/src/TGLPadPainter.cxx
@@ -311,40 +311,58 @@ void TGLPadPainter::SetMarkerSize(Size_t msize)
    gVirtualX->SetMarkerSize(msize);
 }
 
-
-
-
 /*
 "Pixmap" part of TGLPadPainter.
 */
 
 ////////////////////////////////////////////////////////////////////////////////
 ///Not required at the moment.
 
-Int_t TGLPadPainter::CreateDrawable(UInt_t/*w*/, UInt_t/*h*/)
+Int_t TGLPadPainter::CreateDrawable(UInt_t /* w */, UInt_t /* h */)
 {
+   // return gVirtualX->OpenPixmap(Int_t(w), Int_t(h));
    return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-///Not required at the moment.
+/// Resize a gVirtualX Pixmap.
+
+Int_t TGLPadPainter::ResizeDrawable(Int_t device, UInt_t w, UInt_t h)
+{
+   return gVirtualX->ResizePixmap(device, w, h);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Call gVirtualX->ClearWindow()
 
 void TGLPadPainter::ClearDrawable()
 {
+   gVirtualX->ClearWindow();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Returns true when cocoa backend is used
+
+Bool_t TGLPadPainter::IsCocoa() const
+{
+   return gVirtualX->InheritsFrom("TGCocoa");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 ///Not required at the moment.
 
-void TGLPadPainter::CopyDrawable(Int_t /*device*/, Int_t /*px*/, Int_t /*py*/)
+void TGLPadPainter::CopyDrawable(Int_t /* device */, Int_t /* px */, Int_t /* py */)
 {
+   // gVirtualX->CopyPixmap(device, px, py);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 ///Not required at the moment.
 
-void TGLPadPainter::DestroyDrawable(Int_t /*device*/)
+void TGLPadPainter::DestroyDrawable(Int_t /* device */)
 {
+   // gVirtualX->SelectWindow(device);
+   // gVirtualX->ClosePixmap();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
