xserver: Branch 'master'

[GitLab Mirror]

 Xext/dpms.c      |    3 +++
 Xext/saver.c     |    1 +
 dix/dispatch.c   |    1 +
 dix/main.c       |    1 +
 dix/window.c     |    1 +
 include/os.h     |    3 ---
 mi/mieq.c        |    3 +++
 os/WaitFor.c     |    1 +
 os/screensaver.h |   11 +++++++++++
 9 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 811977228bb0e381f8fd7cb844427ef33a245010
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 27 15:28:25 2024 +0100

    os: unexport screen saver timer functions
    
    These functions aren't supposed to be used by drivers, so move them
    out of the public API.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1583>

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 68759a48a..8ac73d819 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -32,6 +32,9 @@ Equipment Corporation.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/screensaver.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 0d3d21110..70edf5d2d 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -36,6 +36,7 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/extensions/saverproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/screensaver.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index f588579bc..0e79f9956 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -114,6 +114,7 @@ Equipment Corporation.
 #include "os/auth.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/screensaver.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"
diff --git a/dix/main.c b/dix/main.c
index 290747c90..7a6e338c5 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -96,6 +96,7 @@ Equipment Corporation.
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/screensaver.h"
 
 #include "scrnintstr.h"
 #include "misc.h"
diff --git a/dix/window.c b/dix/window.c
index f4c8fea47..c091796b9 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -104,6 +104,7 @@ Equipment Corporation.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "os/auth.h"
+#include "os/screensaver.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/include/os.h b/include/os.h
index 50ee2f83f..65b961e8c 100644
--- a/include/os.h
+++ b/include/os.h
@@ -173,9 +173,6 @@ extern _X_EXPORT void TimerCheck(void);
 extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
 extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ );
 
-extern _X_EXPORT void SetScreenSaverTimer(void);
-extern _X_EXPORT void FreeScreenSaverTimer(void);
-
 extern _X_EXPORT void GiveUp(int /*sig */ );
 
 /*
diff --git a/mi/mieq.c b/mi/mieq.c
index c98d46862..4bf570215 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -39,6 +39,9 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/X.h>
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
+
+#include   "os/screensaver.h"
+
 #include   "misc.h"
 #include   "windowstr.h"
 #include   "pixmapstr.h"
diff --git a/os/WaitFor.c b/os/WaitFor.c
index fbafa5ab0..c88cdfcfe 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -66,6 +66,7 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "os/busfault.h"
+#include "os/screensaver.h"
 
 #include "misc.h"
 #include "osdep.h"
diff --git a/os/screensaver.h b/os/screensaver.h
new file mode 100644
index 000000000..c52c42bb4
--- /dev/null
+++ b/os/screensaver.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+#ifndef _XSERVER_OS_SCREENSAVER_H
+#define _XSERVER_OS_SCREENSAVER_H
+
+void SetScreenSaverTimer(void);
+void FreeScreenSaverTimer(void);
+
+#endif /* _XSERVER_OS_SCREENSAVER_H */