From e9351ba7e00bc0ad6c14cd8d808933f0435b75d5 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 22 May 2025 16:47:23 +0200 Subject: [PATCH] include: drop obsolete dixevents.h The include has become empty now. Not used by any external drivers, so it can be dropped now. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/xtest.c | 1 - Xi/allowev.c | 1 - Xi/chgptr.c | 1 - Xi/exevents.c | 1 - Xi/extinit.c | 1 - Xi/grabdev.c | 1 - Xi/setfocus.c | 1 - Xi/xibarriers.c | 1 - composite/compint.h | 1 - dix/devices.c | 1 - dix/events.c | 1 - dix/getevents.c | 1 - dix/main.c | 1 - dix/tables.c | 1 - dix/window.c | 1 - hw/xfree86/common/xf86DGA.c | 1 - hw/xfree86/sdksyms.sh | 1 - hw/xquartz/xpr/xprCursor.c | 1 - hw/xwin/winmultiwindowwindow.c | 1 - hw/xwin/winmultiwindowwndproc.c | 1 - include/dixevents.h | 29 ----------------------------- include/meson.build | 1 - xfixes/cursor.c | 1 - 23 files changed, 51 deletions(-) delete mode 100644 include/dixevents.h diff --git a/Xext/xtest.c b/Xext/xtest.c index 11c62252b..6e90e4bee 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -50,7 +50,6 @@ #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" -#include "dixevents.h" #include "sleepuntil.h" #include "xkbsrv.h" #include "xkbstr.h" diff --git a/Xi/allowev.c b/Xi/allowev.c index 0753a033c..7fecef735 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -61,7 +61,6 @@ SOFTWARE. #include "exglobals.h" #include "allowev.h" -#include "dixevents.h" /*********************************************************************** * diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 42d160bf3..4ec83d9f9 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -59,7 +59,6 @@ SOFTWARE. #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include "dixevents.h" #include "exevents.h" #include "exglobals.h" diff --git a/Xi/exevents.c b/Xi/exevents.c index 753172c0e..128414d6b 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -105,7 +105,6 @@ SOFTWARE. #include "extnsionst.h" #include "exglobals.h" #include "eventstr.h" -#include "dixevents.h" /* DeliverFocusedEvent */ #include "scrnintstr.h" #include "listdev.h" /* for CopySwapXXXClass */ #include "xace.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index f6f21f30d..1dad52081 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -65,7 +65,6 @@ SOFTWARE. #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" #include "swaprep.h" diff --git a/Xi/grabdev.c b/Xi/grabdev.c index 9bae237d1..05f1f39f5 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -60,7 +60,6 @@ SOFTWARE. #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" -#include "dixevents.h" /* GrabDevice */ #include "grabdev.h" extern XExtEventInfo EventInfo[]; diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 16f969436..6aec8934d 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -60,7 +60,6 @@ SOFTWARE. #include "dix/dix_priv.h" -#include "dixevents.h" #include "exglobals.h" #include "setfocus.h" diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 6761bcb49..33b2d2f42 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -52,7 +52,6 @@ #include "xibarriers.h" #include "scrnintstr.h" #include "cursorstr.h" -#include "dixevents.h" #include "servermd.h" #include "mipointer.h" #include "inputstr.h" diff --git a/composite/compint.h b/composite/compint.h index cb73c386d..91e33187a 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -61,7 +61,6 @@ #include "dixstruct.h" #include "gcstruct.h" #include "servermd.h" -#include "dixevents.h" #include "globals.h" #include "picturestr.h" #include "extnsionst.h" diff --git a/dix/devices.c b/dix/devices.c index 310364730..e5507e3df 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -77,7 +77,6 @@ SOFTWARE. #include "xace.h" #include "dispatch.h" #include "swaprep.h" -#include "dixevents.h" #include "mipointer.h" #include "eventstr.h" #include "exglobals.h" diff --git a/dix/events.c b/dix/events.c index dc01d7911..68f74c734 100644 --- a/dix/events.c +++ b/dix/events.c @@ -147,7 +147,6 @@ Equipment Corporation. #include "probes.h" #include "exglobals.h" #include "extnsionst.h" -#include "dixevents.h" #include "dispatch.h" #include "dixstruct_priv.h" #include "eventstr.h" diff --git a/dix/getevents.c b/dix/getevents.c index 34014ffbb..a6843a3c5 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -51,7 +51,6 @@ #include "cursorstr.h" #include "dixstruct.h" #include "globals.h" -#include "dixevents.h" #include "mipointer.h" #include "eventstr.h" #include "eventconvert.h" diff --git a/dix/main.c b/dix/main.c index 0c57ba605..777b573ca 100644 --- a/dix/main.c +++ b/dix/main.c @@ -119,7 +119,6 @@ Equipment Corporation. #ifdef XINERAMA #include "panoramiXsrv.h" #else -#include "dixevents.h" /* InitEvents() */ #endif /* XINERAMA */ #ifdef DPMSExtension diff --git a/dix/tables.c b/dix/tables.c index c9b6b2ec6..634018ceb 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -55,7 +55,6 @@ SOFTWARE. #include "extnsionst.h" #include "dixstruct.h" #include "dixstruct_priv.h" -#include "dixevents.h" #include "dispatch.h" #include "swaprep.h" #include "swapreq.h" diff --git a/dix/window.c b/dix/window.c index d606a3e22..207d81ae9 100644 --- a/dix/window.c +++ b/dix/window.c @@ -128,7 +128,6 @@ Equipment Corporation. #include "panoramiX.h" #include "panoramiXsrv.h" #endif /* XINERAMA */ -#include "dixevents.h" #include "globals.h" #ifdef COMPOSITE #include "compint.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 2482530a1..019503425 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -70,7 +70,6 @@ #include "xf86Extensions.h" #include "misc.h" #include "dixstruct.h" -#include "dixevents.h" #include "extnsionst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index 43c45698b..e75d8c08b 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -231,7 +231,6 @@ cat > sdksyms.c << EOF #include "cursorstr.h" #include "dix.h" #include "dixaccess.h" -#include "dixevents.h" #define _FONTPROTO_H #include "dixfont.h" #include "dixfontstr.h" diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index 2e4da6112..babf5b27d 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -48,7 +48,6 @@ #include "windowstr.h" #include "globals.h" #include "servermd.h" -#include "dixevents.h" #include "x-hash.h" typedef struct { diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 24e226c51..9c947afd4 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -37,7 +37,6 @@ #endif #include "win.h" -#include "dixevents.h" #include "winmultiwindowclass.h" #include "winmultiwindowicons.h" diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index edc1c0a03..f480de0fb 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -41,7 +41,6 @@ #include "dix/dix_priv.h" #include "mi/mipointer_priv.h" -#include "dixevents.h" #include "winmultiwindowclass.h" #include "winprefs.h" #include "winmsg.h" diff --git a/include/dixevents.h b/include/dixevents.h deleted file mode 100644 index 2e0a33abe..000000000 --- a/include/dixevents.h +++ /dev/null @@ -1,29 +0,0 @@ -/************************************************************ - -Copyright 1996 by Thomas E. Dickey - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -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 above listed -copyright holder(s) not be used in advertising or publicity pertaining -to distribution of the software without specific, written prior -permission. - -THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD -TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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. - -********************************************************/ - -#ifndef DIXEVENTS_H -#define DIXEVENTS_H - -#endif /* DIXEVENTS_H */ diff --git a/include/meson.build b/include/meson.build index 994b4cfba..abe540857 100644 --- a/include/meson.build +++ b/include/meson.build @@ -458,7 +458,6 @@ if build_xorg 'cursorstr.h', 'dix.h', 'dixaccess.h', - 'dixevents.h', 'dixfont.h', 'dixfontstr.h', 'dixstruct.h', diff --git a/xfixes/cursor.c b/xfixes/cursor.c index a2c4159d1..b01e79cc4 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -51,7 +51,6 @@ #include "xfixesint.h" #include "scrnintstr.h" #include "cursorstr.h" -#include "dixevents.h" #include "servermd.h" #include "mipointer.h" #include "inputstr.h"