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

randr: move private definitons from randrstr.h to randrstr_priv.h 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1291>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-09 20:03:12 +01:00 committed by Marge Bot
parent 6816605e22
commit eda769f34c
20 changed files with 158 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dri3/dri3_request.c
View File

@ -27,6 +27,7 @@
#include "../Xext/syncsdk.h"
#include <protocol-versions.h>
#include <drm_fourcc.h>
#include "randrstr_priv.h"
static Bool
dri3_screen_can_one_point_two(ScreenPtr screen)

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

@ -33,7 +33,7 @@
#include "mipointer.h"
#include "windowstr.h"
#include "inputstr.h"
#include <randrstr.h>
#include "randrstr_priv.h"
#include <X11/extensions/render.h>
#include "xf86cmap.h"

1
hw/xwayland/xwayland-drm-lease.c
View File

@ -31,6 +31,7 @@
#include <xf86drmMode.h>
#endif
#include "randrstr_priv.h"
#include "xwayland-drm-lease.h"
#include "xwayland-screen.h"
#include "xwayland-output.h"

2
hw/xwayland/xwayland-output.c
View File

@ -25,8 +25,8 @@
#include <xwayland-config.h>
#include <randrstr.h>
#include <X11/Xatom.h>
#include "randrstr_priv.h"
#include "xwayland-cvt.h"
#include "xwayland-output.h"

2
present/present_request.c
View File

@ -21,7 +21,7 @@
*/
#include "present_priv.h"
#include "randrstr.h"
#include "randrstr_priv.h"
#include <protocol-versions.h>
static int

2
randr/randr.c
View File

@ -30,7 +30,7 @@
#include <dix-config.h>
#endif
#include "randrstr.h"
#include "randrstr_priv.h"
#include "extinit.h"
/* From render.h */

127
randr/randrstr.h
View File

@ -65,11 +65,6 @@ typedef XID RRCrtc;
typedef XID RRProvider;
typedef XID RRLease;
extern int RREventBase, RRErrorBase;
extern int (*ProcRandrVector[RRNumberRequests]) (ClientPtr);
extern int (*SProcRandrVector[RRNumberRequests]) (ClientPtr);
/*
* Modeline for a monitor. Name follows directly after this struct
*/
@ -467,65 +462,8 @@ typedef struct _RRClient {
/* RRTimesRec times[0]; */
} RRClientRec, *RRClientPtr;
extern RESTYPE RRClientType, RREventType; /* resource types for event masks */
extern DevPrivateKeyRec RRClientPrivateKeyRec;
#define RRClientPrivateKey (&RRClientPrivateKeyRec)
extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType, RRLeaseType;
#define VERIFY_RR_OUTPUT(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RROutputType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_CRTC(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRCrtcType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_MODE(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRModeType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_PROVIDER(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRProviderType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_LEASE(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRLeaseType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define GetRRClient(pClient) ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))
#define rrClientPriv(pClient) RRClientPtr pRRClient = GetRRClient(pClient)
#ifdef RANDR_12_INTERFACE
/*
* Set the range of sizes for the screen
@ -686,7 +624,6 @@ extern _X_EXPORT void
* the driver calls this whenever it has updated the mode
*/
extern _X_EXPORT Bool
RRCrtcNotify(RRCrtcPtr crtc,
RRModePtr mode,
int x,
@ -701,7 +638,6 @@ extern _X_EXPORT void
* Request that the Crtc be reconfigured
*/
extern _X_EXPORT Bool
RRCrtcSet(RRCrtcPtr crtc,
RRModePtr mode,
int x,
@ -768,7 +704,6 @@ extern _X_EXPORT void
*/
extern _X_EXPORT int
RRCrtcTransformSet(RRCrtcPtr crtc,
PictTransformPtr transform,
struct pict_f_transform *f_transform,
@ -827,23 +762,10 @@ extern _X_EXPORT int
extern _X_EXPORT int
ProcRRGetCrtcTransform(ClientPtr client);
int
ProcRRGetPanning(ClientPtr client);
int
ProcRRSetPanning(ClientPtr client);
void
RRConstrainCursorHarder(DeviceIntPtr, ScreenPtr, int, int *, int *);
/* rrdispatch.c */
extern _X_EXPORT Bool
RRClientKnowsRates(ClientPtr pClient);
/* rrlease.c */
void
RRDeliverLeaseEvent(ClientPtr client, WindowPtr window);
extern _X_EXPORT void
RRLeaseTerminated(RRLeasePtr lease);
@ -856,12 +778,6 @@ RRCrtcIsLeased(RRCrtcPtr crtc);
extern _X_EXPORT Bool
RROutputIsLeased(RROutputPtr output);
void
RRTerminateLease(RRLeasePtr lease);
Bool
RRLeaseInit(void);
/* rrmode.c */
/*
* Find, and if necessary, create a mode
@ -931,7 +847,6 @@ extern _X_EXPORT Bool
RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones);
extern _X_EXPORT Bool
RROutputSetModes(RROutputPtr output,
RRModePtr * modes, int numModes, int numPreferred);
@ -1005,13 +920,11 @@ extern _X_EXPORT Bool
RRPostPendingProperties(RROutputPtr output);
extern _X_EXPORT int
RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
int format, int mode, unsigned long len,
const void *value, Bool sendevent, Bool pending);
extern _X_EXPORT int
RRConfigureOutputProperty(RROutputPtr output, Atom property,
Bool pending, Bool range, Bool immutable,
int num_values, const INT32 *values);
@ -1116,51 +1029,13 @@ ProcRRChangeProviderProperty(ClientPtr client);
extern _X_EXPORT int
ProcRRDeleteProviderProperty(ClientPtr client);
/* rrxinerama.c */
#ifdef XINERAMA
extern _X_EXPORT void
RRXineramaExtensionInit(void);
#endif
void
RRMonitorInit(ScreenPtr screen);
Bool
RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, int *nmon_ret);
int
RRMonitorCountList(ScreenPtr screen);
void
RRMonitorFreeList(RRMonitorPtr monitors, int nmon);
void
RRMonitorClose(ScreenPtr screen);
RRMonitorPtr
RRMonitorAlloc(int noutput);
int
RRMonitorAdd(ClientPtr client, ScreenPtr screen, RRMonitorPtr monitor);
void
RRMonitorFree(RRMonitorPtr monitor);
int
ProcRRGetMonitors(ClientPtr client);
int
ProcRRSetMonitor(ClientPtr client);
int
ProcRRDeleteMonitor(ClientPtr client);
int
ProcRRCreateLease(ClientPtr client);
int
ProcRRFreeLease(ClientPtr client);
#endif /* _RANDRSTR_H_ */
/*

139
randr/randrstr_priv.h Normal file
View File

@ -0,0 +1,139 @@
/*
* Copyright © 2000 Compaq Computer Corporation
* Copyright © 2002 Hewlett-Packard Company
* Copyright © 2006 Intel Corporation
* Copyright © 2008 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that copyright
* notice and this permission notice appear in supporting documentation, and
* that the name of the copyright holders not be used in advertising or
* publicity pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no representations
* about the suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
* Author: Jim Gettys, Hewlett-Packard Company, Inc.
* Keith Packard, Intel Corporation
*/
#ifndef _XSERVER_RANDRSTR_PRIV_H_
#define _XSERVER_RANDRSTR_PRIV_H_
#include "randrstr.h"
extern int RREventBase, RRErrorBase;
extern int (*ProcRandrVector[RRNumberRequests]) (ClientPtr);
extern int (*SProcRandrVector[RRNumberRequests]) (ClientPtr);
extern RESTYPE RRClientType, RREventType; /* resource types for event masks */
extern DevPrivateKeyRec RRClientPrivateKeyRec;
#define RRClientPrivateKey (&RRClientPrivateKeyRec)
#define VERIFY_RR_OUTPUT(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RROutputType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_CRTC(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRCrtcType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_MODE(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRModeType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_PROVIDER(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRProviderType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define VERIFY_RR_LEASE(id, ptr, a)\
{\
int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRLeaseType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
return rc;\
}\
}
#define GetRRClient(pClient) ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))
#define rrClientPriv(pClient) RRClientPtr pRRClient = GetRRClient(pClient)
int ProcRRGetPanning(ClientPtr client);
int ProcRRSetPanning(ClientPtr client);
void RRConstrainCursorHarder(DeviceIntPtr, ScreenPtr, int, int *, int *);
/* rrlease.c */
void RRDeliverLeaseEvent(ClientPtr client, WindowPtr window);
void RRTerminateLease(RRLeasePtr lease);
Bool RRLeaseInit(void);
/* rrprovider.c */
#define PRIME_SYNC_PROP "PRIME Synchronization"
void RRMonitorInit(ScreenPtr screen);
Bool RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, int *nmon_ret);
int RRMonitorCountList(ScreenPtr screen);
void RRMonitorFreeList(RRMonitorPtr monitors, int nmon);
void RRMonitorClose(ScreenPtr screen);
RRMonitorPtr RRMonitorAlloc(int noutput);
int RRMonitorAdd(ClientPtr client, ScreenPtr screen, RRMonitorPtr monitor);
void RRMonitorFree(RRMonitorPtr monitor);
int ProcRRGetMonitors(ClientPtr client);
int ProcRRSetMonitor(ClientPtr client);
int ProcRRDeleteMonitor(ClientPtr client);
int ProcRRCreateLease(ClientPtr client);
int ProcRRFreeLease(ClientPtr client);
#endif /* _XSERVER_RANDRSTR_PRIV_H_ */

2
randr/rrcrtc.c
View File

@ -21,7 +21,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "swaprep.h"
#include "mipointer.h"

2
randr/rrdispatch.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "protocol-versions.h"
Bool

2
randr/rrlease.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "swaprep.h"
#include <unistd.h>

2
randr/rrmode.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
RESTYPE RRModeType;

2
randr/rrmonitor.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "swaprep.h"
static Atom

2
randr/rroutput.c
View File

@ -21,7 +21,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include <X11/Xatom.h>
RESTYPE RROutputType;

2
randr/rrproperty.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "propertyst.h"
#include "swaprep.h"
#include <X11/Xatom.h>

2
randr/rrprovider.c
View File

@ -23,7 +23,7 @@
* Authors: Dave Airlie
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "swaprep.h"
#include <X11/Xatom.h>

2
randr/rrproviderproperty.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "propertyst.h"
#include "swaprep.h"

2
randr/rrscreen.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
static CARD16
RR10CurrentSizeID(ScreenPtr pScreen);

2
randr/rrsdispatch.c
View File

@ -20,7 +20,7 @@
* OF THIS SOFTWARE.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
static int _X_COLD
SProcRRQueryVersion(ClientPtr client)

2
randr/rrxinerama.c
View File

@ -68,7 +68,7 @@
* David Thomas <davtom@dream.org.uk>.
*/
#include "randrstr.h"
#include "randrstr_priv.h"
#include "swaprep.h"
#include <X11/extensions/panoramiXproto.h>
#include "protocol-versions.h"