From 800d37edcb42e6e3abb1d7b8e102d182ee5127c5 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 5 Dec 2025 12:16:08 +0100
Subject: [PATCH] xfree86: common: move enum ActionEvent to private header

Not needed by any driver - only use as parameter to xf86ProcessActionEvent(),
which already is private.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/action_priv.h | 19 +++++++++++++++++++
 hw/xfree86/common/xf86Events.c  |  1 +
 hw/xfree86/common/xf86_priv.h   |  1 -
 hw/xfree86/common/xf86str.h     | 10 ----------
 hw/xfree86/xkb/xkbKillSrv.c     |  1 +
 hw/xfree86/xkb/xkbPrivate.c     |  1 +
 hw/xfree86/xkb/xkbVT.c          |  1 +
 7 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 hw/xfree86/common/action_priv.h

diff --git a/hw/xfree86/common/action_priv.h b/hw/xfree86/common/action_priv.h
new file mode 100644
index 0000000000..978616bff8
--- /dev/null
+++ b/hw/xfree86/common/action_priv.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef __XSERVER_XFREE86_ACTION_PRIV_H
+#define __XSERVER_XFREE86_ACTION_PRIV_H
+
+typedef enum {
+    ACTION_TERMINATE          = 0,    /* Terminate Server */
+    ACTION_NEXT_MODE          = 10,   /* Switch to next video mode */
+    ACTION_PREV_MODE,
+    ACTION_SWITCHSCREEN       = 100,  /* VT switch */
+    ACTION_SWITCHSCREEN_NEXT,
+    ACTION_SWITCHSCREEN_PREV,
+} ActionEvent;
+
+void xf86ProcessActionEvent(ActionEvent action, void *arg);
+
+#endif /* __XSERVER_XFREE86_ACTION_PRIV_H */
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 903c3f11f6..0340ea203c 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -64,6 +64,7 @@
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "include/property.h"
+#include "hw/xfree86/common/action_priv.h"
 #include "mi/mi_priv.h"
 #include "os/log_priv.h"
 
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index c661771fc0..bb62ee986c 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -62,7 +62,6 @@ void xf86InitOrigins(void);
 
 /* xf86Events.c */
 InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, void *data);
-void xf86ProcessActionEvent(ActionEvent action, void *arg);
 Bool xf86VTOwner(void);
 void xf86VTEnter(void);
 void xf86VTLeave(void);
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index d410e411a1..12d6214310 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -762,14 +762,4 @@ typedef void (*InputHandlerProc) (int fd, void *data);
 #define MF_CLEAR_DTR       1
 #define MF_CLEAR_RTS       2
 
-/* Action Events */
-typedef enum {
-    ACTION_TERMINATE = 0,       /* Terminate Server */
-    ACTION_NEXT_MODE = 10,      /* Switch to next video mode */
-    ACTION_PREV_MODE,
-    ACTION_SWITCHSCREEN = 100,  /* VT switch */
-    ACTION_SWITCHSCREEN_NEXT,
-    ACTION_SWITCHSCREEN_PREV,
-} ActionEvent;
-
 #endif                          /* _XF86STR_H */
diff --git a/hw/xfree86/xkb/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c
index 2f5f34697d..23d6c178bb 100644
--- a/hw/xfree86/xkb/xkbKillSrv.c
+++ b/hw/xfree86/xkb/xkbKillSrv.c
@@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include <X11/extensions/XI.h>
 
+#include "hw/xfree86/common/action_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"
diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c
index 287007b472..1a3da3be69 100644
--- a/hw/xfree86/xkb/xkbPrivate.c
+++ b/hw/xfree86/xkb/xkbPrivate.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+#include "hw/xfree86/common/action_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "windowstr.h"
diff --git a/hw/xfree86/xkb/xkbVT.c b/hw/xfree86/xkb/xkbVT.c
index 0cb58cfac1..8ef21e6ad8 100644
--- a/hw/xfree86/xkb/xkbVT.c
+++ b/hw/xfree86/xkb/xkbVT.c
@@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include <X11/extensions/XI.h>
 
+#include "hw/xfree86/common/action_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"