From ba7a39d3edb44ba2f6a0768acbf220267a944f77 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 9 Jul 2024 10:30:33 +0200 Subject: [PATCH] (submit/cleanup-damageext) damage: untwist Xinerma handling The diffenciation between Xinerama and single screen version is by tweaking call vectors unncessarily complicated: it the only reason why these are needed in the first place. Finally, it's just about one function, so it's much easier just branching off in ProcDamageCreate() in case of Xinerama is enabled. This also clears the road for further simplification of the dispatcher. Signed-off-by: Enrico Weigelt, metux IT consult --- damageext/damageext.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/damageext/damageext.c b/damageext/damageext.c index 013ddf83c..c0432f904 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -43,7 +43,9 @@ typedef struct { } PanoramiXDamageRes; static RESTYPE XRT_DAMAGE; -static int (*PanoramiXSaveDamageCreate) (ClientPtr); +static int damageUseXinerama = 0; + +static int PanoramiXDamageCreate(ClientPtr client); #endif @@ -302,6 +304,12 @@ ProcDamageCreate(ClientPtr client) int rc; REQUEST(xDamageCreateReq); REQUEST_SIZE_MATCH(xDamageCreateReq); + +#ifdef PANORAMIX + if (damageUseXinerama) + return PanoramiXDamageCreate(client); +#endif + LEGAL_NEW_RESOURCE(stuff->damage, client); doDamageCreate(client, &rc); return rc; @@ -703,14 +711,13 @@ PanoramiXDamageInit(void) if (!XRT_DAMAGE) FatalError("Couldn't Xineramify Damage extension\n"); - PanoramiXSaveDamageCreate = ProcDamageVector[X_DamageCreate]; - ProcDamageVector[X_DamageCreate] = PanoramiXDamageCreate; + damageUseXinerama = 1; } void PanoramiXDamageReset(void) { - ProcDamageVector[X_DamageCreate] = PanoramiXSaveDamageCreate; + damageUseXinerama = 0; } #endif /* PANORAMIX */