[glpadpainter] use text and marker attributes

Avoid extensive gVirtualX usage in these places
But keep full backward compatibility
In the future one can remove gVirtualX completely

Author: linev

graf3d/gl/inc/TGLFontManager.h

@@ -48,6 +48,7 @@ class TGLFont
    Int_t            fSize;   // free-type face size
    Int_t            fFile;   // free-type file name
    EMode            fMode;   // free-type FTGL class id
+   UInt_t           fTextAlign = 0; // set text align
 
    mutable Int_t    fTrashCount;
 public:
@@ -74,6 +75,8 @@ class TGLFont
    Float_t GetDepth()    const { return fDepth; }
    void    SetDepth(Float_t d) { fDepth = d;    }
 
+   void  SetTextAlign(UInt_t align) { fTextAlign = align; }
+
    // FTGL wrapper functions
    Float_t GetAscent() const;
    Float_t GetDescent() const;

graf3d/gl/inc/TGLPadUtils.h

@@ -110,12 +110,20 @@ class MarkerPainter {
 
    mutable std::vector<TPoint> fCircle;
 
+   Size_t fMarkerSize;
+   Width_t fMarkerWidth;
+   Bool_t fSetMarker = kFALSE;
+
    enum {
       kSmallCirclePts = 80,
       kLargeCirclePts = 150
    };
 
 public:
+   void SetMarkerSizeWidth(Size_t size, Width_t width);
+   Size_t GetMarkerSize() const;
+   Width_t GetMarkerWidth() const;
+
    //Each function draw n markers.
    void DrawDot(UInt_t n, const TPoint *xy)const;
    void DrawPlus(UInt_t n, const TPoint *xy)const;

graf3d/gl/src/TGLFontManager.cxx

@@ -194,69 +194,37 @@ void TGLFont::RenderHelper(const Char *txt, Double_t x, Double_t y, Double_t ang
    */
    const Double_t dx = urx - llx, dy = ury - lly;
    Double_t xc = 0., yc = 0.;
-   const UInt_t align = gVirtualX->GetTextAlign();
 
-   //Here's the nice X11 bullshido: you call gVirtualX->SetTextAlign(11),
+   // if align was not set before - use value from gVirtualX
+   const UInt_t align = fTextAlign ? fTextAlign : gVirtualX->GetTextAlign();
+
+   //Timur: Here's the nice X11 bullshido: you call gVirtualX->SetTextAlign(11),
    //later gVirtualX->GetTextAling() will give you 7. Brilliant!
    //But with Cocoa you'll have 11. As it should be, of course.
+   //Sergey: problem with gVirtualX solved, now all platforms works same way
+
+   const UInt_t hAlign = UInt_t(align / 10);
+   const UInt_t vAlign = UInt_t(align % 10);
+   switch (hAlign) {
+   case 1:
+      xc = 0.5 * dx;
+      break;
+   case 2:
+      break;
+   case 3:
+      xc = -0.5 * dy;
+      break;
+   }
 
-   if (gVirtualX->InheritsFrom("TGCocoa") || true) {
-      const UInt_t hAlign = UInt_t(align / 10);
-      switch (hAlign) {
-      case 1:
-         xc = 0.5 * dx;
-         break;
-      case 2:
-         break;
-      case 3:
-         xc = -0.5 * dy;
-         break;
-      }
-
-      const UInt_t vAlign = UInt_t(align % 10);
-      switch (vAlign) {
-      case 1:
-         yc = 0.5 * dy;
-         break;
-      case 2:
-         break;
-      case 3:
-         yc = -0.5 * dy;
-         break;
-      }
-   } else {
-      switch (align) {
-      case 7:
-         xc += 0.5 * dx;
-         yc += 0.5 * dy;
-         break;
-      case 8:
-         yc += 0.5 * dy;
-         break;
-      case 9:
-         xc -= 0.5 * dx;
-         yc += 0.5 * dy;
-         break;
-      case 4:
-         xc += 0.5 * dx;
-         break;
-      case 5:
-         break;
-      case 6:
-         xc = -0.5 * dx;
-         break;
-      case 1:
-         xc += 0.5 * dx;
-         yc -= 0.5 * dy;
-         break;
-      case 2:
-         yc -= 0.5 * dy;
-         break;
-      case 3:
-         xc -= 0.5 * dx;
-         yc -= 0.5 * dy;
-         break;
-      }
+   switch (vAlign) {
+   case 1:
+      yc = 0.5 * dy;
+      break;
+   case 2:
+      break;
+   case 3:
+      yc = -0.5 * dy;
+      break;
    }
 
    glTranslated(x, y, 0.);

graf3d/gl/src/TGLPadPainter.cxx

@@ -641,9 +641,12 @@ void TGLPadPainter::DrawPolyMarker()
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    glColor4fv(rgba);
 
+
    const Width_t w = TMath::Max(1, Int_t(TAttMarker::GetMarkerLineWidth(GetAttMarker().GetMarkerStyle())));
    glLineWidth(w > fLimits.GetMaxLineWidth() ? fLimits.GetMaxLineWidth() : !w ? 1.f : w);
 
+   fMarker.SetMarkerSizeWidth(GetAttMarker().GetMarkerSize(), w);
+
    const TPoint *xy = &fPoly[0];
    const Style_t markerStyle = TAttMarker::GetMarkerStyleBase(GetAttMarker().GetMarkerStyle());
    const UInt_t n = UInt_t(fPoly.size());
@@ -781,21 +784,23 @@ void TGLPadPainter::DrawTextHelper(Double_t x, Double_t y, const Char *text, ETe
    glMatrixMode(GL_MODELVIEW);
 
    Float_t rgba[4] = {};
-   Rgl::Pad::ExtractRGBA(gVirtualX->GetTextColor(), rgba);
+   Rgl::Pad::ExtractRGBA(GetAttText().GetTextColor(), rgba);
    glColor4fv(rgba);
 
    //10 is the first valid font index.
    //20 is FreeSerifBold, as in TTF.cxx and in TGLFontManager.cxx.
    //shift - is the shift to access "extended" fonts.
    const Int_t shift = TGLFontManager::GetExtendedFontStartIndex();
 
-   Int_t fontIndex = TMath::Max(Short_t(10), gVirtualX->GetTextFont());
+   Int_t fontIndex = TMath::Max(Short_t(10), GetAttText().GetTextFont());
    if (fontIndex / 10 + shift > TGLFontManager::GetFontFileArray()->GetEntries())
       fontIndex = 20 + shift * 10;
    else
       fontIndex += shift * 10;
 
-   fFM.RegisterFont(TMath::Max(Int_t(gVirtualX->GetTextSize()) - 1, 10),//kTexture does not work if size < 10.
+   fF.SetTextAlign(GetAttText().GetTextAlign());
+
+   fFM.RegisterFont(TMath::Max(Int_t(GetAttText().GetTextSize()) - 1, 10),//kTexture does not work if size < 10.
                                TGLFontManager::GetFontNameFromId(fontIndex),
                                TGLFont::kTexture, fF);
    fF.PreRender();
@@ -819,7 +824,7 @@ void TGLPadPainter::DrawText(Double_t x, Double_t y, const char *text, ETextMode
 {
    if (fLocked) return;
 
-   if (!gVirtualX->GetTextSize())
+   if (!GetAttText().GetTextSize())
       return;
 
    DrawTextHelper(x, y, text, mode);
@@ -835,7 +840,7 @@ void TGLPadPainter::DrawText(Double_t x, Double_t y, const wchar_t *text, ETextM
 {
    if (fLocked) return;
 
-   if (!gVirtualX->GetTextSize())
+   if (!GetAttText().GetTextSize())
       return;
 
    DrawTextHelper(x, y, text, mode);