frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-15 21:06:45 +02:00
parent e2901cd496
commit 92e9176def
7 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -3169,7 +3169,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
static Bool static Bool
drmmode_output_set_property(xf86OutputPtr output, Atom property, drmmode_output_set_property(xf86OutputPtr output, Atom property,
RRPropertyValuePtr value) PropertyValuePtr value)
{ {
drmmode_output_private_ptr drmmode_output = output->driver_private; drmmode_output_private_ptr drmmode_output = output->driver_private;
drmmode_ptr drmmode = drmmode_output->drmmode; drmmode_ptr drmmode = drmmode_output->drmmode;

4
hw/xfree86/modes/xf86Crtc.h
View File

@ -509,7 +509,7 @@ typedef struct _xf86OutputFuncs {
*/ */
Bool Bool
(*set_property) (xf86OutputPtr output, (*set_property) (xf86OutputPtr output,
Atom property, RRPropertyValuePtr value); Atom property, PropertyValuePtr value);
#endif #endif
#ifdef RANDR_13_INTERFACE #ifdef RANDR_13_INTERFACE
/** /**
@ -668,7 +668,7 @@ typedef struct _xf86ProviderFuncs {
*/ */
Bool Bool
(*set_property) (ScrnInfoPtr scrn, (*set_property) (ScrnInfoPtr scrn,
Atom property, RRPropertyValuePtr value); Atom property, PropertyValuePtr value);
/** /**
* Callback to get an updated property value * Callback to get an updated property value

4
hw/xfree86/modes/xf86RandR12.c
View File

@ -1524,7 +1524,7 @@ xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize) {
static Bool static Bool
xf86RandR12OutputSetProperty(ScreenPtr pScreen, xf86RandR12OutputSetProperty(ScreenPtr pScreen,
RROutputPtr randr_output, RROutputPtr randr_output,
Atom property, RRPropertyValuePtr value) Atom property, PropertyValuePtr value)
{ {
xf86OutputPtr output = randr_output->devPrivate; xf86OutputPtr output = randr_output->devPrivate;
@ -2144,7 +2144,7 @@ xf86RandR14ProviderSetOffloadSink(ScreenPtr pScreen,
static Bool static Bool
xf86RandR14ProviderSetProperty(ScreenPtr pScreen, xf86RandR14ProviderSetProperty(ScreenPtr pScreen,
RRProviderPtr randr_provider, RRProviderPtr randr_provider,
Atom property, RRPropertyValuePtr value) Atom property, PropertyValuePtr value)
{ {
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

18
randr/randrstr.h
View File

@ -42,6 +42,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include "pixmapstr.h" #include "pixmapstr.h"
#include "property_value.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "servermd.h" #include "servermd.h"
#include "rrtransform.h" #include "rrtransform.h"
@ -71,7 +72,8 @@ typedef XID RRLease;
#define RRModeName(pMode) ((char *) (pMode + 1)) #define RRModeName(pMode) ((char *) (pMode + 1))
typedef struct _rrMode RRModeRec, *RRModePtr; 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 _rrProperty RRPropertyRec, *RRPropertyPtr;
typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr; typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr;
typedef struct _rrOutput RROutputRec, *RROutputPtr; typedef struct _rrOutput RROutputRec, *RROutputPtr;
@ -86,13 +88,6 @@ struct _rrMode {
ScreenPtr userScreen; 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 { struct _rrProperty {
RRPropertyPtr next; RRPropertyPtr next;
ATOM propertyName; ATOM propertyName;
@ -101,7 +96,8 @@ struct _rrProperty {
Bool immutable; Bool immutable;
int num_valid; int num_valid;
INT32 *valid_values; INT32 *valid_values;
RRPropertyValueRec current, pending; PropertyValueRec current;
PropertyValueRec pending;
}; };
struct _rrCrtc { struct _rrCrtc {
@ -224,7 +220,7 @@ typedef Bool (*RRCrtcGetGammaProcPtr) (ScreenPtr pScreen, RRCrtcPtr crtc);
typedef Bool (*RROutputSetPropertyProcPtr) (ScreenPtr pScreen, typedef Bool (*RROutputSetPropertyProcPtr) (ScreenPtr pScreen,
RROutputPtr output, RROutputPtr output,
Atom property, Atom property,
RRPropertyValuePtr value); PropertyValuePtr value);
typedef Bool (*RROutputValidateModeProcPtr) (ScreenPtr pScreen, typedef Bool (*RROutputValidateModeProcPtr) (ScreenPtr pScreen,
RROutputPtr output, RROutputPtr output,
@ -253,7 +249,7 @@ typedef Bool (*RRProviderGetPropertyProcPtr) (ScreenPtr pScreen,
typedef Bool (*RRProviderSetPropertyProcPtr) (ScreenPtr pScreen, typedef Bool (*RRProviderSetPropertyProcPtr) (ScreenPtr pScreen,
RRProviderPtr provider, RRProviderPtr provider,
Atom property, Atom property,
RRPropertyValuePtr value); PropertyValuePtr value);
typedef Bool (*RRGetInfoProcPtr) (ScreenPtr pScreen, Rotation * rotations); typedef Bool (*RRGetInfoProcPtr) (ScreenPtr pScreen, Rotation * rotations);
typedef Bool (*RRCloseScreenProcPtr) (ScreenPtr pscreen); typedef Bool (*RRCloseScreenProcPtr) (ScreenPtr pscreen);

4
randr/rrcrtc.c
View File

@ -459,7 +459,7 @@ rrGetPixmapSharingSyncProp(int numOutputs, RROutputPtr * outputs)
/* If one output doesn't want sync, no sync */ /* If one output doesn't want sync, no sync */
for (o = 0; o < numOutputs; o++) { for (o = 0; o < numOutputs; o++) {
RRPropertyValuePtr val; PropertyValuePtr val;
if ((val = RRGetOutputProperty(outputs[o], syncProp, TRUE)) && if ((val = RRGetOutputProperty(outputs[o], syncProp, TRUE)) &&
val->data) { val->data) {
@ -715,7 +715,7 @@ rrCheckEmulated(RROutputPtr output)
{ {
const char *emulStr = XRANDR_EMULATION_PROP; const char *emulStr = XRANDR_EMULATION_PROP;
Atom emulProp; Atom emulProp;
RRPropertyValuePtr val; PropertyValuePtr val;
emulProp = MakeAtom(emulStr, strlen(emulStr), FALSE); emulProp = MakeAtom(emulStr, strlen(emulStr), FALSE);
if (emulProp == None) if (emulProp == None)

16
randr/rrproperty.c
View File

@ -97,7 +97,7 @@ RRDeleteAllOutputProperties(RROutputPtr output)
} }
static void static void
RRInitOutputPropertyValue(RRPropertyValuePtr property_value) RRInitOutputPropertyValue(PropertyValuePtr property_value)
{ {
property_value->type = None; property_value->type = None;
property_value->format = 0; property_value->format = 0;
@ -137,7 +137,7 @@ RRDeleteOutputProperty(RROutputPtr output, Atom property)
} }
static void 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; const char *non_desktop_str = RR_PROPERTY_NON_DESKTOP;
Atom non_desktop_prop = MakeAtom(non_desktop_str, strlen(non_desktop_str), FALSE); 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); rrScrPrivPtr pScrPriv = rrGetScrPriv(output->pScreen);
int size_in_bytes; int size_in_bytes;
unsigned long total_len; unsigned long total_len;
RRPropertyValuePtr prop_value; PropertyValuePtr prop_value;
RRPropertyValueRec new_value; PropertyValueRec new_value;
Bool add = FALSE; Bool add = FALSE;
size_in_bytes = format >> 3; size_in_bytes = format >> 3;
@ -282,8 +282,8 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
Bool Bool
RRPostPendingProperties(RROutputPtr output) RRPostPendingProperties(RROutputPtr output)
{ {
RRPropertyValuePtr pending_value; PropertyValuePtr pending_value;
RRPropertyValuePtr current_value; PropertyValuePtr current_value;
RRPropertyPtr property; RRPropertyPtr property;
Bool ret = TRUE; Bool ret = TRUE;
@ -330,7 +330,7 @@ RRQueryOutputProperty(RROutputPtr output, Atom property)
return NULL; return NULL;
} }
RRPropertyValuePtr PropertyValuePtr
RRGetOutputProperty(RROutputPtr output, Atom property, Bool pending) RRGetOutputProperty(RROutputPtr output, Atom property, Bool pending)
{ {
RRPropertyPtr prop = RRQueryOutputProperty(output, property); RRPropertyPtr prop = RRQueryOutputProperty(output, property);
@ -621,7 +621,7 @@ ProcRRGetOutputProperty(ClientPtr client)
{ {
REQUEST(xRRGetOutputPropertyReq); REQUEST(xRRGetOutputPropertyReq);
RRPropertyPtr prop, *prev; RRPropertyPtr prop, *prev;
RRPropertyValuePtr prop_value; PropertyValuePtr prop_value;
unsigned long n, len, ind; unsigned long n, len, ind;
RROutputPtr output; RROutputPtr output;
char *extra = NULL; char *extra = NULL;

10
randr/rrproviderproperty.c
View File

@ -84,7 +84,7 @@ RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop)
} }
static void static void
RRInitProviderPropertyValue(RRPropertyValuePtr property_value) RRInitProviderPropertyValue(PropertyValuePtr property_value)
{ {
property_value->type = None; property_value->type = None;
property_value->format = 0; property_value->format = 0;
@ -135,8 +135,8 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
int size_in_bytes; int size_in_bytes;
int total_size; int total_size;
unsigned long total_len; unsigned long total_len;
RRPropertyValuePtr prop_value; PropertyValuePtr prop_value;
RRPropertyValueRec new_value; PropertyValueRec new_value;
Bool add = FALSE; Bool add = FALSE;
size_in_bytes = format >> 3; size_in_bytes = format >> 3;
@ -256,7 +256,7 @@ RRQueryProviderProperty(RRProviderPtr provider, Atom property)
return NULL; return NULL;
} }
RRPropertyValuePtr PropertyValuePtr
RRGetProviderProperty(RRProviderPtr provider, Atom property, Bool pending) RRGetProviderProperty(RRProviderPtr provider, Atom property, Bool pending)
{ {
RRPropertyPtr prop = RRQueryProviderProperty(provider, property); RRPropertyPtr prop = RRQueryProviderProperty(provider, property);
@ -528,7 +528,7 @@ ProcRRGetProviderProperty(ClientPtr client)
{ {
REQUEST(xRRGetProviderPropertyReq); REQUEST(xRRGetProviderPropertyReq);
RRPropertyPtr prop, *prev; RRPropertyPtr prop, *prev;
RRPropertyValuePtr prop_value; PropertyValuePtr prop_value;
unsigned long n, len, ind; unsigned long n, len, ind;
RRProviderPtr provider; RRProviderPtr provider;
xRRGetProviderPropertyReply reply = { xRRGetProviderPropertyReply reply = {