From 0a7e3a9231f80c5412cc46109db8834d8a43a7b8 Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Wed, 17 Feb 2021 14:37:48 +0100 Subject: [PATCH 1/4] FIX issue #7212: TMathText does not display with high value coordinates --- core/gui/inc/GuiTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/gui/inc/GuiTypes.h b/core/gui/inc/GuiTypes.h index 86cebe4a1da33..c9262074d8f74 100644 --- a/core/gui/inc/GuiTypes.h +++ b/core/gui/inc/GuiTypes.h @@ -365,7 +365,7 @@ struct Rectangle_t { // Atoms used for text cut and paste between windows const Atom_t kPrimarySelection = 1; // magic values, must match the ones const Atom_t kCutBuffer = 9; // in /usr/include/X11/Xatom.h -const Int_t kMaxPixel = 32000; +const Int_t kMaxPixel = 2147483647; // Max value for an int const int kNumCursors = 19; enum ECursor { kBottomLeft, kBottomRight, kTopLeft, kTopRight, From 1cdd2a8e741d4fd02866f2cb9d309c150245faee Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Wed, 17 Feb 2021 15:04:43 +0100 Subject: [PATCH 2/4] Use INT_MAX --- core/gui/inc/GuiTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/gui/inc/GuiTypes.h b/core/gui/inc/GuiTypes.h index c9262074d8f74..f942a9a0cbab6 100644 --- a/core/gui/inc/GuiTypes.h +++ b/core/gui/inc/GuiTypes.h @@ -365,7 +365,7 @@ struct Rectangle_t { // Atoms used for text cut and paste between windows const Atom_t kPrimarySelection = 1; // magic values, must match the ones const Atom_t kCutBuffer = 9; // in /usr/include/X11/Xatom.h -const Int_t kMaxPixel = 2147483647; // Max value for an int +const Int_t kMaxPixel = INT_MAX; // Max value for an int const int kNumCursors = 19; enum ECursor { kBottomLeft, kBottomRight, kTopLeft, kTopRight, From e26493f4b73e509488c6ff0a7120738a47992e4b Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Wed, 17 Feb 2021 15:29:01 +0100 Subject: [PATCH 3/4] add missing include and fix typos --- core/gui/inc/GuiTypes.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/gui/inc/GuiTypes.h b/core/gui/inc/GuiTypes.h index f942a9a0cbab6..2c92f69baf4e1 100644 --- a/core/gui/inc/GuiTypes.h +++ b/core/gui/inc/GuiTypes.h @@ -20,6 +20,7 @@ ////////////////////////////////////////////////////////////////////////// #include "Rtypes.h" +#include // Basic GUI types typedef ULong_t Handle_t; //Generic resource handle @@ -98,7 +99,7 @@ struct SetWindowAttributes_t { Int_t fBitGravity; // one of bit gravity values Int_t fWinGravity; // one of the window gravity values Int_t fBackingStore; // kNotUseful, kWhenMapped, kAlways - ULong_t fBackingPlanes; // planes to be preseved if possible + ULong_t fBackingPlanes; // planes to be preserved if possible ULong_t fBackingPixel; // value to use in restoring planes Bool_t fSaveUnder; // should bits under be saved (popups)? Long_t fEventMask; // set of events that should be saved @@ -173,7 +174,7 @@ const Mask_t kColormapChangeMask = BIT(12); struct Event_t { EGEventType fType; // of event (see EGEventType) Window_t fWindow; // window reported event is relative to - Time_t fTime; // time event event occured in ms + Time_t fTime; // time event event occurred in ms Int_t fX, fY; // pointer x, y coordinates in event window Int_t fXRoot, fYRoot; // coordinates relative to root UInt_t fCode; // key or button code @@ -235,7 +236,7 @@ struct GCValues_t { Int_t fFillRule; // kEvenOddRule, kWindingRule Int_t fArcMode; // kArcChord, kArcPieSlice Pixmap_t fTile; // tile pixmap for tiling operations - Pixmap_t fStipple; // stipple 1 plane pixmap for stipping + Pixmap_t fStipple; // stipple 1 plane pixmap for stippling Int_t fTsXOrigin; // offset for tile or stipple operations Int_t fTsYOrigin; FontH_t fFont; // default text font for text operations From c7c1c33519053d42bd6ae63748930ae004ef8a63 Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Wed, 17 Feb 2021 16:16:58 +0100 Subject: [PATCH 4/4] INT_MAX seems to be very machine dependant. --- core/gui/inc/GuiTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/gui/inc/GuiTypes.h b/core/gui/inc/GuiTypes.h index 2c92f69baf4e1..e10fd4f74ca11 100644 --- a/core/gui/inc/GuiTypes.h +++ b/core/gui/inc/GuiTypes.h @@ -366,7 +366,7 @@ struct Rectangle_t { // Atoms used for text cut and paste between windows const Atom_t kPrimarySelection = 1; // magic values, must match the ones const Atom_t kCutBuffer = 9; // in /usr/include/X11/Xatom.h -const Int_t kMaxPixel = INT_MAX; // Max value for an int +const Int_t kMaxPixel = 2147483647; // Max value for an int const int kNumCursors = 19; enum ECursor { kBottomLeft, kBottomRight, kTopLeft, kTopRight,