Xext: geext: drop obsolete geext.h

This header has now become obsolete. There're also no external consumers
(drivers, etc) left, so it now finally can be dropped entirely.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/dpms.c

@@ -32,7 +32,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 
 #include "os/screensaver.h"
-#include "Xext/geext.h"
+#include "Xext/geext_priv.h"
 
 #include "misc.h"
 #include "os.h"

Xext/geext.c

@@ -24,10 +24,13 @@
  */
 
 #include <dix-config.h>
-#include "windowstr.h"
-#include <X11/extensions/ge.h>
 
-#include "geext.h"
+#include <X11/extensions/ge.h>
+#include <X11/extensions/geproto.h>
+
+#include "Xext/geext_priv.h"
+
+#include "windowstr.h"
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 

Xext/geext.h

@@ -1,41 +0,0 @@
-/*
-
-Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
-
-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.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the author shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the author.
-
-*/
-#ifndef _GEEXT_H_
-#define _GEEXT_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/geproto.h>
-
-/* Interface for other extensions */
-extern _X_EXPORT void GERegisterExtension(int extension,
-                                          void (*ev_dispatch) (xGenericEvent
-                                                               *from,
-                                                               xGenericEvent
-                                                               *to));
-
-#endif                          /* _GEEXT_H_ */

Xext/geext_priv.h

@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XORG_GEEXT_PRIV_H
+
+#include <X11/Xproto.h>
+
+typedef void (*XorgGESwapProcPtr) (xGenericEvent *from, xGenericEvent *to);
+
+/*
+ * Register generic event extension dispatch handler
+ *
+ * @param extension base opcode
+ * @param event swap handler function
+ */
+void GERegisterExtension(int extension, XorgGESwapProcPtr swap_handler);
+
+#endif /* _XORG_GEEXT_PRIV_H */

Xext/meson.build

@@ -9,7 +9,6 @@ srcs_xext = [
 ]
 
 hdrs_xext = [
-    'geext.h',
     'syncsdk.h',
 ]
 

Xi/extinit.c

@@ -60,11 +60,11 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "Xext/geext_priv.h"
 
 #include "inputstr.h"
 #include "gcstruct.h"           /* pointer for extnsionst.h */
 #include "extnsionst.h"         /* extension entry   */
-#include "geext.h"              /* extension interfaces for ge */
 #include "dixevents.h"
 #include "extinit_priv.h"
 #include "exglobals.h"

hw/xfree86/sdksyms.sh

@@ -53,7 +53,6 @@ cat > sdksyms.c << EOF
 #include "xvdix.h"
 #include "xvmcext.h"
 #endif
-#include "geext.h"
 #ifdef MITSHM
 #include "shmint.h"
 #endif

present/present_event.c

@@ -21,7 +21,7 @@
  */
 #include <dix-config.h>
 
-#include "Xext/geext.h"
+#include "Xext/geext_priv.h"
 
 #include "present_priv.h"