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

(submit/miext-extinit) dpms: unexport noDPMSExtension field 

This field isn't used by any drivers, and also better belongs into
the corresponding extension instead of OS adaption layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-02 17:03:29 +02:00
parent 2909832ac8
commit 88489e86b2
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/dpms.c
View File

@ -47,6 +47,8 @@ Equipment Corporation.
#include "windowstr.h" #include "windowstr.h"
#include "protocol-versions.h" #include "protocol-versions.h"
Bool noDPMSExtension = FALSE;
CARD16 DPMSPowerLevel = 0; CARD16 DPMSPowerLevel = 0;
Bool DPMSDisabledSwitch = FALSE; Bool DPMSDisabledSwitch = FALSE;
CARD32 DPMSStandbyTime = -1; CARD32 DPMSStandbyTime = -1;

2
hw/xnest/Args.c
View File

@ -17,6 +17,7 @@ is" without express or implied warranty.
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "include/extinit_priv.h"
#include "os/ddx_priv.h" #include "os/ddx_priv.h"
#include "screenint.h" #include "screenint.h"
@ -24,7 +25,6 @@ is" without express or implied warranty.
#include "misc.h" #include "misc.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "servermd.h" #include "servermd.h"
#include "extinit.h"
#include "xnest-xcb.h" #include "xnest-xcb.h"

4
include/extinit.h
View File

@ -56,10 +56,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef COMPOSITE #ifdef COMPOSITE
extern _X_EXPORT Bool noCompositeExtension; extern _X_EXPORT Bool noCompositeExtension;
#endif #endif
#if defined(DPMSExtension)
extern _X_EXPORT Bool noDPMSExtension;
#endif
#ifdef GLXEXT #ifdef GLXEXT
extern _X_EXPORT Bool noGlxExtension; extern _X_EXPORT Bool noGlxExtension;
#endif #endif

1
include/extinit_priv.h
View File

@ -10,6 +10,7 @@
extern Bool noDamageExtension; extern Bool noDamageExtension;
extern Bool noDbeExtension; extern Bool noDbeExtension;
extern Bool noDPMSExtension;
extern Bool noGEExtension; extern Bool noGEExtension;
void CompositeExtensionInit(void); void CompositeExtensionInit(void);

6
os/utils.c
View File

@ -107,6 +107,7 @@ __stdcall unsigned long GetTickCount(void);
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "include/extinit_priv.h"
#include "os/auth.h" #include "os/auth.h"
#include "os/cmdline.h" #include "os/cmdline.h"
#include "os/ddx_priv.h" #include "os/ddx_priv.h"
@ -119,16 +120,13 @@ __stdcall unsigned long GetTickCount(void);
#include "miinitext.h" #include "miinitext.h"
#include "present.h" #include "present.h"
#include "dixstruct_priv.h" #include "dixstruct_priv.h"
#include "dpmsproc.h"
Bool noTestExtensions; Bool noTestExtensions;
#ifdef COMPOSITE #ifdef COMPOSITE
Bool noCompositeExtension = FALSE; Bool noCompositeExtension = FALSE;
#endif #endif
#ifdef DPMSExtension
#include "dpmsproc.h"
Bool noDPMSExtension = FALSE;
#endif
#ifdef GLXEXT #ifdef GLXEXT
Bool noGlxExtension = FALSE; Bool noGlxExtension = FALSE;
#endif #endif