Skip to content

[asimage/asutils] fix linkage problem, fully separate X11-specific methods #23902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linev wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[asimage/asutils] fix linkage problem, fully separate X11-specific methods #23902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33e801c
[asimage] introduce internal ASVisualHolder
linev Oct 29, 2026
1b895da
[asimage] use new batch visual in several operations
linev Oct 29, 2026
2171f47
[asimage] use holder to preserve font manager
linev Oct 29, 2026
01cdc45
[asimage] use new holder in most of drawing operations
linev Oct 29, 2026
489b762
[asimage] use new holder in all other not-deprecated methods
linev Oct 29, 2026
73e4a71
[asimg] use InitVisual only in deprecated methods
linev Oct 29, 2026
49d9769
[asimage] remove all global fgVisual-related pointer
linev Oct 29, 2026
aa8dd5e
[asutils] move ASVisual holder inside GetX11Visual method
linev Oct 29, 2026
79f7467
[asutils] move all libAfterImage calls to ASImage
linev Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions graf2d/asimage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImageUtils
Gpad
)


if(asimage)

target_link_libraries(ASImageUtils PRIVATE libAfterImage)

target_link_libraries(ASImageUtils PUBLIC ASImage)

ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui
Expand Down
16 changes: 9 additions & 7 deletions graf2d/asimage/inc/TASImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,22 @@ friend class TASUtils; // to implement gVirtualX-specific methods
Bool_t fIsGray; ///<! kTRUE if image is gray
static THashTable *fgPlugList; ///<! hash table containing loaded plugins

static ASVisual *fgVisual; ///< pointer to visual structure
static ASVisual *fgBatchVisual; ///< pointer to "batch" visual structure
static Bool_t fgInit; ///< global flag to init afterimage only once
static Bool_t fgBatch; ///< global flag to signal if batch mode is active ie fgVisual->dpy was set to nullptr

EImageFileTypes GetFileType(const char *ext);
void MapFileTypes(EImageFileTypes &type, UInt_t &astype, Bool_t toas = kTRUE);
void MapQuality(EImageQuality &quality, UInt_t &asquality, Bool_t toas = kTRUE);

static ASVisual *InitVisual(Bool_t plain = kFALSE);
static ASVisual *InitVisual();
Bool_t InitImage(const char *caller);

void FromGradient(struct ASGradient *as_gradient, UInt_t width, UInt_t height);

static struct ASVisual *CreateX11Visual(Display_t display, Int_t screen, Int_t depth, Visual_t visual, Colormap_t cmap);
static void DestroyVisual(struct ASVisual *visual);
static Pixmap_t ASImage2Pixmap(struct ASVisual *visual, Window_t root_window, ASImage *image);
static ASImage *Pixmap2ASImage(struct ASVisual *visual, Window_t wid, Int_t x, Int_t y, UInt_t width, UInt_t height);
static ASImage *Picture2ASImage(struct ASVisual *visual, Pixmap_t pxm, Pixmap_t mask, UInt_t width, UInt_t height);
static void ASImage2Drawable(struct ASVisual *visual, ASImage *image, Drawable_t wid, GContext_t gc, Int_t xsrc, Int_t ysrc, Int_t x, Int_t y, UInt_t width, UInt_t height);

public:
TASImage();
TASImage(UInt_t w, UInt_t h);
Expand Down Expand Up @@ -218,7 +220,7 @@ friend class TASUtils; // to implement gVirtualX-specific methods
void SetPaletteEnabled(Bool_t on = kTRUE) override; // *TOGGLE*
void SavePrimitive(std::ostream &out, Option_t *option = "") override;

static const ASVisual *GetVisual();
static const ASVisual * R__DEPRECATED(7,00, "No longer provided") GetVisual();
static UInt_t AlphaBlend(UInt_t bot, UInt_t top);
static void Image2Drawable(ASImage *im, Drawable_t wid, Int_t x, Int_t y, Int_t xsrc = 0, Int_t ysrc = 0, UInt_t wsrc = 0, UInt_t hsrc = 0, Option_t *opt = "");

Expand Down
3 changes: 3 additions & 0 deletions graf2d/asimage/inc/TASUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
class TImage;

class TASUtils {

static struct ASVisual *GetX11Visual();

public:
static Pixmap_t GetPixmap(TImage *timg);
static Pixmap_t GetMask(TImage *timg);
Expand Down
Loading
Loading