From 92e9176defdc4adc6b1b964644b5765f46adf832 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 15 May 2025 21:06:45 +0200 Subject: [PATCH] randr: replace RRPropertyValueRec by PropertyValueRec Use the new PropertyValueRec instead of RRPropertyValueRec. The old name is aliased to the new one, so external drivers still compile. Signed-off-by: Enrico Weigelt, metux IT consult --- .../drivers/modesetting/drmmode_display.c | 2 +- hw/xfree86/modes/xf86Crtc.h | 4 ++-- hw/xfree86/modes/xf86RandR12.c | 4 ++-- randr/randrstr.h | 18 +++++++----------- randr/rrcrtc.c | 4 ++-- randr/rrproperty.c | 16 ++++++++-------- randr/rrproviderproperty.c | 10 +++++----- 7 files changed, 27 insertions(+), 31 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index f28c3596b..c9d5e75d8 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -3169,7 +3169,7 @@ drmmode_output_create_resources(xf86OutputPtr output) static Bool drmmode_output_set_property(xf86OutputPtr output, Atom property, - RRPropertyValuePtr value) + PropertyValuePtr value) { drmmode_output_private_ptr drmmode_output = output->driver_private; drmmode_ptr drmmode = drmmode_output->drmmode; diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index 1eeda5665..92ea7019c 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -509,7 +509,7 @@ typedef struct _xf86OutputFuncs { */ Bool (*set_property) (xf86OutputPtr output, - Atom property, RRPropertyValuePtr value); + Atom property, PropertyValuePtr value); #endif #ifdef RANDR_13_INTERFACE /** @@ -668,7 +668,7 @@ typedef struct _xf86ProviderFuncs { */ Bool (*set_property) (ScrnInfoPtr scrn, - Atom property, RRPropertyValuePtr value); + Atom property, PropertyValuePtr value); /** * Callback to get an updated property value diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index 1de8f576c..96c71d182 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -1524,7 +1524,7 @@ xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize) { static Bool xf86RandR12OutputSetProperty(ScreenPtr pScreen, RROutputPtr randr_output, - Atom property, RRPropertyValuePtr value) + Atom property, PropertyValuePtr value) { xf86OutputPtr output = randr_output->devPrivate; @@ -2144,7 +2144,7 @@ xf86RandR14ProviderSetOffloadSink(ScreenPtr pScreen, static Bool xf86RandR14ProviderSetProperty(ScreenPtr pScreen, RRProviderPtr randr_provider, - Atom property, RRPropertyValuePtr value) + Atom property, PropertyValuePtr value) { ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); diff --git a/randr/randrstr.h b/randr/randrstr.h index 658edc453..842860e94 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -42,6 +42,7 @@ #include "scrnintstr.h" #include "windowstr.h" #include "pixmapstr.h" +#include "property_value.h" #include "extnsionst.h" #include "servermd.h" #include "rrtransform.h" @@ -71,7 +72,8 @@ typedef XID RRLease; #define RRModeName(pMode) ((char *) (pMode + 1)) typedef struct _rrMode RRModeRec, *RRModePtr; -typedef struct _rrPropertyValue RRPropertyValueRec, *RRPropertyValuePtr; +typedef PropertyValueRec RRPropertyValueRec; // deprecated +typedef PropertyValuePtr RRPropertyValuePtr; // deprecated typedef struct _rrProperty RRPropertyRec, *RRPropertyPtr; typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr; typedef struct _rrOutput RROutputRec, *RROutputPtr; @@ -86,13 +88,6 @@ struct _rrMode { ScreenPtr userScreen; }; -struct _rrPropertyValue { - Atom type; /* ignored by server */ - short format; /* format of data for swapping - 8,16,32 */ - long size; /* size of data in (format/8) bytes */ - void *data; /* private to client */ -}; - struct _rrProperty { RRPropertyPtr next; ATOM propertyName; @@ -101,7 +96,8 @@ struct _rrProperty { Bool immutable; int num_valid; INT32 *valid_values; - RRPropertyValueRec current, pending; + PropertyValueRec current; + PropertyValueRec pending; }; struct _rrCrtc { @@ -224,7 +220,7 @@ typedef Bool (*RRCrtcGetGammaProcPtr) (ScreenPtr pScreen, RRCrtcPtr crtc); typedef Bool (*RROutputSetPropertyProcPtr) (ScreenPtr pScreen, RROutputPtr output, Atom property, - RRPropertyValuePtr value); + PropertyValuePtr value); typedef Bool (*RROutputValidateModeProcPtr) (ScreenPtr pScreen, RROutputPtr output, @@ -253,7 +249,7 @@ typedef Bool (*RRProviderGetPropertyProcPtr) (ScreenPtr pScreen, typedef Bool (*RRProviderSetPropertyProcPtr) (ScreenPtr pScreen, RRProviderPtr provider, Atom property, - RRPropertyValuePtr value); + PropertyValuePtr value); typedef Bool (*RRGetInfoProcPtr) (ScreenPtr pScreen, Rotation * rotations); typedef Bool (*RRCloseScreenProcPtr) (ScreenPtr pscreen); diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 78c2baef8..50cccdaaa 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -459,7 +459,7 @@ rrGetPixmapSharingSyncProp(int numOutputs, RROutputPtr * outputs) /* If one output doesn't want sync, no sync */ for (o = 0; o < numOutputs; o++) { - RRPropertyValuePtr val; + PropertyValuePtr val; if ((val = RRGetOutputProperty(outputs[o], syncProp, TRUE)) && val->data) { @@ -715,7 +715,7 @@ rrCheckEmulated(RROutputPtr output) { const char *emulStr = XRANDR_EMULATION_PROP; Atom emulProp; - RRPropertyValuePtr val; + PropertyValuePtr val; emulProp = MakeAtom(emulStr, strlen(emulStr), FALSE); if (emulProp == None) diff --git a/randr/rrproperty.c b/randr/rrproperty.c index dd491e626..23d0a3687 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -97,7 +97,7 @@ RRDeleteAllOutputProperties(RROutputPtr output) } static void -RRInitOutputPropertyValue(RRPropertyValuePtr property_value) +RRInitOutputPropertyValue(PropertyValuePtr property_value) { property_value->type = None; property_value->format = 0; @@ -137,7 +137,7 @@ RRDeleteOutputProperty(RROutputPtr output, Atom property) } static void -RRNoticePropertyChange(RROutputPtr output, Atom property, RRPropertyValuePtr value) +RRNoticePropertyChange(RROutputPtr output, Atom property, PropertyValuePtr value) { const char *non_desktop_str = RR_PROPERTY_NON_DESKTOP; Atom non_desktop_prop = MakeAtom(non_desktop_str, strlen(non_desktop_str), FALSE); @@ -168,8 +168,8 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type, rrScrPrivPtr pScrPriv = rrGetScrPriv(output->pScreen); int size_in_bytes; unsigned long total_len; - RRPropertyValuePtr prop_value; - RRPropertyValueRec new_value; + PropertyValuePtr prop_value; + PropertyValueRec new_value; Bool add = FALSE; size_in_bytes = format >> 3; @@ -282,8 +282,8 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type, Bool RRPostPendingProperties(RROutputPtr output) { - RRPropertyValuePtr pending_value; - RRPropertyValuePtr current_value; + PropertyValuePtr pending_value; + PropertyValuePtr current_value; RRPropertyPtr property; Bool ret = TRUE; @@ -330,7 +330,7 @@ RRQueryOutputProperty(RROutputPtr output, Atom property) return NULL; } -RRPropertyValuePtr +PropertyValuePtr RRGetOutputProperty(RROutputPtr output, Atom property, Bool pending) { RRPropertyPtr prop = RRQueryOutputProperty(output, property); @@ -621,7 +621,7 @@ ProcRRGetOutputProperty(ClientPtr client) { REQUEST(xRRGetOutputPropertyReq); RRPropertyPtr prop, *prev; - RRPropertyValuePtr prop_value; + PropertyValuePtr prop_value; unsigned long n, len, ind; RROutputPtr output; char *extra = NULL; diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c index dfaf95667..6ee198b87 100644 --- a/randr/rrproviderproperty.c +++ b/randr/rrproviderproperty.c @@ -84,7 +84,7 @@ RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop) } static void -RRInitProviderPropertyValue(RRPropertyValuePtr property_value) +RRInitProviderPropertyValue(PropertyValuePtr property_value) { property_value->type = None; property_value->format = 0; @@ -135,8 +135,8 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type, int size_in_bytes; int total_size; unsigned long total_len; - RRPropertyValuePtr prop_value; - RRPropertyValueRec new_value; + PropertyValuePtr prop_value; + PropertyValueRec new_value; Bool add = FALSE; size_in_bytes = format >> 3; @@ -256,7 +256,7 @@ RRQueryProviderProperty(RRProviderPtr provider, Atom property) return NULL; } -RRPropertyValuePtr +PropertyValuePtr RRGetProviderProperty(RRProviderPtr provider, Atom property, Bool pending) { RRPropertyPtr prop = RRQueryProviderProperty(provider, property); @@ -528,7 +528,7 @@ ProcRRGetProviderProperty(ClientPtr client) { REQUEST(xRRGetProviderPropertyReq); RRPropertyPtr prop, *prev; - RRPropertyValuePtr prop_value; + PropertyValuePtr prop_value; unsigned long n, len, ind; RRProviderPtr provider; xRRGetProviderPropertyReply reply = {