diff --git a/Xi/allowev.c b/Xi/allowev.c index 60258747d4..fc883b16d0 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -58,8 +58,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" - -#include "allowev.h" +#include "Xi/handlers.h" /*********************************************************************** * diff --git a/Xi/allowev.h b/Xi/allowev.h deleted file mode 100644 index 4ad0789d4e..0000000000 --- a/Xi/allowev.h +++ /dev/null @@ -1,34 +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 ALLOWEV_H -#define ALLOWEV_H 1 - -int SProcXAllowDeviceEvents(ClientPtr /* client */ - ); - -int ProcXAllowDeviceEvents(ClientPtr /* client */ - ); - -#endif /* ALLOWEV_H */ diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 8a6f55f823..d420d670d7 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" #include "exglobals.h" -#include "chgdctl.h" /*********************************************************************** * diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h deleted file mode 100644 index 9dd93d4b6c..0000000000 --- a/Xi/chgdctl.h +++ /dev/null @@ -1,34 +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 CHGDCTL_H -#define CHGDCTL_H 1 - -int SProcXChangeDeviceControl(ClientPtr /* client */ - ); - -int ProcXChangeDeviceControl(ClientPtr /* client */ - ); - -#endif /* CHGDCTL_H */ diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index 4454bab2d3..3f110d1ea0 100644 --- a/Xi/chgfctl.c +++ b/Xi/chgfctl.c @@ -52,11 +52,11 @@ SOFTWARE. #include -#include "inputstr.h" /* DeviceIntPtr */ #include #include /* control constants */ -#include "chgfctl.h" +#include "include/inputstr.h" /* DeviceIntPtr */ +#include "Xi/handlers.h" #define DO_ALL (-1) diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h deleted file mode 100644 index dd0b35be69..0000000000 --- a/Xi/chgfctl.h +++ /dev/null @@ -1,34 +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 CHGFCTL_H -#define CHGFCTL_H 1 - -int SProcXChangeFeedbackControl(ClientPtr /* client */ - ); - -int ProcXChangeFeedbackControl(ClientPtr /* client */ - ); - -#endif /* CHGFCTL_H */ diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index 8e16c9dea8..f212fd8873 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -52,16 +52,16 @@ SOFTWARE. #include -#include "inputstr.h" /* DeviceIntPtr */ #include #include + +#include "Xi/handlers.h" + +#include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" #include "globals.h" - #include "exevents.h" #include "exglobals.h" - -#include "chgkbd.h" #include "chgptr.h" /*********************************************************************** diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h deleted file mode 100644 index 1e02fd867f..0000000000 --- a/Xi/chgkbd.h +++ /dev/null @@ -1,31 +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 CHGKBD_H -#define CHGKBD_H 1 - -int ProcXChangeKeyboardDevice(ClientPtr /* client */ - ); - -#endif /* CHGKBD_H */ diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 73cc8b4e27..e66fac5bb5 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -56,12 +56,11 @@ SOFTWARE. #include #include "dix/exevents_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "exglobals.h" -#include "chgkmap.h" - /*********************************************************************** * * This procedure swaps the request when the client and diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h deleted file mode 100644 index c14157aa2e..0000000000 --- a/Xi/chgkmap.h +++ /dev/null @@ -1,34 +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 CHGKMAP_H -#define CHGKMAP_H 1 - -int SProcXChangeDeviceKeyMapping(ClientPtr /* client */ - ); - -int ProcXChangeDeviceKeyMapping(ClientPtr /* client */ - ); - -#endif /* CHGKMAP_H */ diff --git a/Xi/chgprop.c b/Xi/chgprop.c index ab1a6b601a..8d39d282ed 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -57,12 +57,12 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" #include "exevents.h" #include "exglobals.h" -#include "chgprop.h" #include "grabdev.h" /*********************************************************************** diff --git a/Xi/chgprop.h b/Xi/chgprop.h deleted file mode 100644 index ffef6d6e20..0000000000 --- a/Xi/chgprop.h +++ /dev/null @@ -1,36 +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 CHGPROP_H -#define CHGPROP_H 1 - -#include - -int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */ - ); - -int ProcXChangeDeviceDontPropagateList(ClientPtr /* client */ - ); - -#endif /* CHGPROP_H */ diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 4ec83d9f95..0f54771311 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -52,16 +52,17 @@ SOFTWARE. #include -#include "inputstr.h" /* DeviceIntPtr */ #include #include + +#include "Xi/handlers.h" + +#include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ - #include "exevents.h" #include "exglobals.h" - #include "chgptr.h" /*********************************************************************** diff --git a/Xi/chgptr.h b/Xi/chgptr.h index d5637f1bb7..767659ceac 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -27,9 +27,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -int ProcXChangePointerDevice(ClientPtr /* client */ - ); - void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */ ); diff --git a/Xi/closedev.c b/Xi/closedev.c index a005d1edfe..ea85020d4b 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -56,14 +56,13 @@ SOFTWARE. #include #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ #include "XIstubs.h" -#include "closedev.h" - /*********************************************************************** * * Clear out event selections and passive grabs from a window for the diff --git a/Xi/closedev.h b/Xi/closedev.h deleted file mode 100644 index 83cf8c10a4..0000000000 --- a/Xi/closedev.h +++ /dev/null @@ -1,31 +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 CLOSEDEV_H -#define CLOSEDEV_H 1 - -int ProcXCloseDevice(ClientPtr /* client */ - ); - -#endif /* CLOSEDEV_H */ diff --git a/Xi/devbell.c b/Xi/devbell.c index bcd2a92070..c6812504a8 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -52,11 +52,12 @@ SOFTWARE. #include -#include "inputstr.h" /* DeviceIntPtr */ #include #include -#include "devbell.h" +#include "inputstr.h" /* DeviceIntPtr */ + +#include "Xi/handlers.h" /*********************************************************************** * diff --git a/Xi/devbell.h b/Xi/devbell.h deleted file mode 100644 index 1cac303804..0000000000 --- a/Xi/devbell.h +++ /dev/null @@ -1,31 +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 DEVBELL_H -#define DEVBELL_H 1 - -int ProcXDeviceBell(ClientPtr /* client */ - ); - -#endif /* DEVBELL_H */ diff --git a/Xi/exevents.c b/Xi/exevents.c index cb9e3bed0a..cc9559b267 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -111,7 +111,6 @@ SOFTWARE. #include "exglobals.h" #include "eventstr.h" #include "scrnintstr.h" -#include "listdev.h" /* for CopySwapXXXClass */ #include "xace.h" #include "xiquerydevice.h" /* For List*Info */ #include "eventstr.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index c62a34044d..8cec697914 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -76,56 +76,9 @@ SOFTWARE. #include "protocol-versions.h" /* modules local to Xi */ -#include "allowev.h" -#include "chgdctl.h" -#include "chgfctl.h" -#include "chgkbd.h" -#include "chgprop.h" -#include "chgptr.h" -#include "closedev.h" -#include "devbell.h" -#include "getbmap.h" -#include "getdctl.h" -#include "getfctl.h" -#include "getfocus.h" -#include "getkmap.h" -#include "getmmap.h" -#include "getprop.h" -#include "getselev.h" -#include "getvers.h" -#include "grabdev.h" -#include "grabdevb.h" -#include "grabdevk.h" -#include "gtmotion.h" -#include "listdev.h" -#include "opendev.h" -#include "queryst.h" -#include "selectev.h" -#include "sendexev.h" -#include "chgkmap.h" -#include "setbmap.h" -#include "setdval.h" -#include "setfocus.h" -#include "setmmap.h" -#include "setmode.h" -#include "ungrdev.h" -#include "ungrdevb.h" -#include "ungrdevk.h" -#include "xiallowev.h" -#include "xiselectev.h" -#include "xigrabdev.h" -#include "xipassivegrab.h" -#include "xisetdevfocus.h" -#include "xiproperty.h" -#include "xichangecursor.h" -#include "xichangehierarchy.h" -#include "xigetclientpointer.h" -#include "xiquerydevice.h" -#include "xiquerypointer.h" -#include "xiqueryversion.h" -#include "xisetclientpointer.h" -#include "xiwarppointer.h" +#include "Xi/handlers.h" #include "xibarriers.h" +#include "xiproperty.h" /* Masks for XI events have to be aligned with core event (partially anyway). * If DeviceButtonMotionMask is != ButtonMotionMask, event delivery diff --git a/Xi/getbmap.c b/Xi/getbmap.c index 3d692c93c0..94b49eeda5 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -57,11 +57,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ -#include "getbmap.h" - /*********************************************************************** * * This procedure gets the button mapping for the specified device. diff --git a/Xi/getbmap.h b/Xi/getbmap.h deleted file mode 100644 index 4c58030b9e..0000000000 --- a/Xi/getbmap.h +++ /dev/null @@ -1,31 +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 GETBMAP_H -#define GETBMAP_H 1 - -int ProcXGetDeviceButtonMapping(ClientPtr /* client */ - ); - -#endif /* GETBMAP_H */ diff --git a/Xi/getdctl.c b/Xi/getdctl.c index 5f5378ad38..5e97f76fb1 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -51,9 +51,9 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ -#include "getdctl.h" static void _writeDeviceResolution(ClientPtr client, ValuatorClassPtr v, x_rpcbuf_t *rpcbuf) diff --git a/Xi/getdctl.h b/Xi/getdctl.h deleted file mode 100644 index 10d446ca7b..0000000000 --- a/Xi/getdctl.h +++ /dev/null @@ -1,31 +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 GETDCTL_H -#define GETDCTL_H 1 - -int ProcXGetDeviceControl(ClientPtr /* client */ - ); - -#endif /* GETDCTL_H */ diff --git a/Xi/getfctl.c b/Xi/getfctl.c index d93845af4e..4d54da1a6f 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -57,11 +57,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ -#include "getfctl.h" - /*********************************************************************** * * This procedure copies KbdFeedbackClass data, swapping if necessary. diff --git a/Xi/getfctl.h b/Xi/getfctl.h deleted file mode 100644 index 8476b3408b..0000000000 --- a/Xi/getfctl.h +++ /dev/null @@ -1,31 +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 GETFCTL_H -#define GETFCTL_H 1 - -int ProcXGetFeedbackControl(ClientPtr /* client */ - ); - -#endif /* GETFCTL_H */ diff --git a/Xi/getfocus.c b/Xi/getfocus.c index 569ea6a777..ff464d4526 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -56,11 +56,11 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ #include "exglobals.h" -#include "getfocus.h" /*********************************************************************** * diff --git a/Xi/getfocus.h b/Xi/getfocus.h deleted file mode 100644 index 66ca9ec894..0000000000 --- a/Xi/getfocus.h +++ /dev/null @@ -1,31 +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 GETFOCUS_H -#define GETFOCUS_H 1 - -int ProcXGetDeviceFocus(ClientPtr /* client */ - ); - -#endif /* GETFOCUS_H */ diff --git a/Xi/getkmap.c b/Xi/getkmap.c index 347bbeff66..2d72c3d6d9 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -57,14 +57,13 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "swaprep.h" #include "xkbsrv.h" #include "xkbstr.h" -#include "getkmap.h" - /*********************************************************************** * * Get the device key mapping. diff --git a/Xi/getkmap.h b/Xi/getkmap.h deleted file mode 100644 index 41d1ae2756..0000000000 --- a/Xi/getkmap.h +++ /dev/null @@ -1,31 +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 GETKMAP_H -#define GETKMAP_H 1 - -int ProcXGetDeviceKeyMapping(ClientPtr /* client */ - ); - -#endif /* GETKMAP_H */ diff --git a/Xi/getmmap.c b/Xi/getmmap.c index 9823bcb99d..3419cf1b48 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -57,11 +57,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ -#include "getmmap.h" - /*********************************************************************** * * Get the device Modifier mapping. diff --git a/Xi/getmmap.h b/Xi/getmmap.h deleted file mode 100644 index 5c28aac738..0000000000 --- a/Xi/getmmap.h +++ /dev/null @@ -1,31 +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 GETMMAP_H -#define GETMMAP_H 1 - -int ProcXGetDeviceModifierMapping(ClientPtr /* client */ - ); - -#endif /* GETMMAP_H */ diff --git a/Xi/getprop.c b/Xi/getprop.c index 6bf5f2bad1..6b26f972f5 100644 --- a/Xi/getprop.c +++ b/Xi/getprop.c @@ -57,6 +57,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structs */ diff --git a/Xi/getprop.h b/Xi/getprop.h index 27c2453712..7f95ed77c9 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -25,12 +25,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETPROP_H #define GETPROP_H 1 -int SProcXGetDeviceDontPropagateList(ClientPtr /* client */ - ); - -int ProcXGetDeviceDontPropagateList(ClientPtr /* client */ - ); - XEventClass *ClassFromMask(XEventClass * /* buf */ , Mask /* mask */ , int /* maskndx */ , diff --git a/Xi/getselev.c b/Xi/getselev.c index 243e91173d..749ec8a585 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -58,12 +58,12 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/resource_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ #include "swaprep.h" #include "getprop.h" -#include "getselev.h" /*********************************************************************** * diff --git a/Xi/getselev.h b/Xi/getselev.h deleted file mode 100644 index 1742ea6f67..0000000000 --- a/Xi/getselev.h +++ /dev/null @@ -1,34 +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 GETSELEV_H -#define GETSELEV_H 1 - -int SProcXGetSelectedExtensionEvents(ClientPtr /* client */ - ); - -int ProcXGetSelectedExtensionEvents(ClientPtr /* client */ - ); - -#endif /* GETSELEV_H */ diff --git a/Xi/getvers.c b/Xi/getvers.c index f8e1e84bc3..d9cda4d345 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -56,12 +56,11 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "exglobals.h" -#include "getvers.h" - XExtensionVersion XIVersion; /*********************************************************************** diff --git a/Xi/getvers.h b/Xi/getvers.h deleted file mode 100644 index 6505042b17..0000000000 --- a/Xi/getvers.h +++ /dev/null @@ -1,34 +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 GETVERS_H -#define GETVERS_H 1 - -int SProcXGetExtensionVersion(ClientPtr /* client */ - ); - -int ProcXGetExtensionVersion(ClientPtr /* client */ - ); - -#endif /* GETVERS_H */ diff --git a/Xi/grabdev.c b/Xi/grabdev.c index 347d2e0c68..1350132592 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 4da33f92a1..d71df5db69 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -25,12 +25,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GRABDEV_H #define GRABDEV_H 1 -int SProcXGrabDevice(ClientPtr /* client */ - ); - -int ProcXGrabDevice(ClientPtr /* client */ - ); - int CreateMaskFromList(ClientPtr /* client */ , XEventClass * /* list */ , int /* count */ , diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index 93a29656a2..cfbfcf5ac8 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -57,12 +57,12 @@ SOFTWARE. #include "dix/exevents_priv.h" #include "dix/input_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "xace.h" #include "grabdev.h" -#include "grabdevb.h" /*********************************************************************** * diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h deleted file mode 100644 index 90683f97e4..0000000000 --- a/Xi/grabdevb.h +++ /dev/null @@ -1,34 +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 GRABDEVB_H -#define GRABDEVB_H 1 - -int SProcXGrabDeviceButton(ClientPtr /* client */ - ); - -int ProcXGrabDeviceButton(ClientPtr /* client */ - ); - -#endif /* GRABDEVB_H */ diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index 4b6f2d8b87..d33717bde2 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -57,12 +57,12 @@ SOFTWARE. #include "dix/exevents_priv.h" #include "dix/input_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "xace.h" #include "grabdev.h" -#include "grabdevk.h" /*********************************************************************** * diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h deleted file mode 100644 index d0164aa5b6..0000000000 --- a/Xi/grabdevk.h +++ /dev/null @@ -1,34 +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 GRABDEVK_H -#define GRABDEVK_H 1 - -int SProcXGrabDeviceKey(ClientPtr /* client */ - ); - -int ProcXGrabDeviceKey(ClientPtr /* client */ - ); - -#endif /* GRABDEVK_H */ diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index 7d81ad5893..a781397d1f 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -58,9 +58,9 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ -#include "gtmotion.h" /*********************************************************************** * diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h deleted file mode 100644 index ffc6ecdc2c..0000000000 --- a/Xi/gtmotion.h +++ /dev/null @@ -1,34 +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 GTMOTION_H -#define GTMOTION_H 1 - -int SProcXGetDeviceMotionEvents(ClientPtr /* client */ - ); - -int ProcXGetDeviceMotionEvents(ClientPtr /* client */ - ); - -#endif /* GTMOTION_H */ diff --git a/Xi/handlers.h b/Xi/handlers.h new file mode 100644 index 0000000000..63733f3a15 --- /dev/null +++ b/Xi/handlers.h @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#ifndef _XSERVER_XI_HANDLERS_H +#define _XSERVER_XI_HANDLERS_H + +#include "include/dix.h" + +int ProcXAllowDeviceEvents(ClientPtr client); +int ProcXChangeDeviceControl(ClientPtr client); +int ProcXChangeDeviceDontPropagateList(ClientPtr client); +int ProcXChangeDeviceKeyMapping(ClientPtr client); +int ProcXChangeDeviceProperty(ClientPtr client); +int ProcXChangeFeedbackControl(ClientPtr client); +int ProcXChangeKeyboardDevice(ClientPtr client); +int ProcXChangePointerDevice(ClientPtr client); +int ProcXCloseDevice(ClientPtr client); +int ProcXDeleteDeviceProperty(ClientPtr client); +int ProcXDeviceBell(ClientPtr client); +int ProcXGetDeviceButtonMapping(ClientPtr client); +int ProcXGetDeviceControl(ClientPtr client); +int ProcXGetDeviceDontPropagateList(ClientPtr client); +int ProcXGetDeviceFocus(ClientPtr client); +int ProcXGetDeviceKeyMapping(ClientPtr client); +int ProcXGetDeviceModifierMapping(ClientPtr client); +int ProcXGetDeviceMotionEvents(ClientPtr client); +int ProcXGetDeviceProperty(ClientPtr client); +int ProcXGetExtensionVersion(ClientPtr client); +int ProcXGetFeedbackControl(ClientPtr client); +int ProcXGetSelectedExtensionEvents(ClientPtr client); +int ProcXGrabDeviceButton(ClientPtr client); +int ProcXGrabDevice(ClientPtr client); +int ProcXGrabDeviceKey(ClientPtr client); +int ProcXIAllowEvents(ClientPtr client); +int ProcXIBarrierReleasePointer(ClientPtr client); +int ProcXIChangeCursor(ClientPtr client); +int ProcXIChangeHierarchy(ClientPtr client); +int ProcXIChangeProperty(ClientPtr client); +int ProcXIDeleteProperty(ClientPtr client); +int ProcXIGetClientPointer(ClientPtr client); +int ProcXIGetFocus(ClientPtr client); +int ProcXIGetProperty(ClientPtr client); +int ProcXIGetSelectedEvents(ClientPtr client); +int ProcXIGrabDevice(ClientPtr client); +int ProcXIListProperties(ClientPtr client); +int ProcXIPassiveGrabDevice(ClientPtr client); +int ProcXIPassiveUngrabDevice(ClientPtr client); +int ProcXIQueryDevice(ClientPtr client); +int ProcXIQueryPointer(ClientPtr client); +int ProcXIQueryVersion(ClientPtr client); +int ProcXISelectEvents(ClientPtr client); +int ProcXISetClientPointer(ClientPtr client); +int ProcXISetFocus(ClientPtr client); +int ProcXIUngrabDevice(ClientPtr client); +int ProcXIWarpPointer(ClientPtr client); +int ProcXListDeviceProperties(ClientPtr client); +int ProcXListInputDevices(ClientPtr client); +int ProcXOpenDevice(ClientPtr client); +int ProcXQueryDeviceState(ClientPtr client); +int ProcXSelectExtensionEvent(ClientPtr client); +int ProcXSendExtensionEvent(ClientPtr client); +int ProcXSetDeviceButtonMapping(ClientPtr client); +int ProcXSetDeviceFocus(ClientPtr client); +int ProcXSetDeviceMode(ClientPtr client); +int ProcXSetDeviceModifierMapping(ClientPtr client); +int ProcXSetDeviceValuators(ClientPtr client); +int ProcXUngrabDeviceButton(ClientPtr client); +int ProcXUngrabDevice(ClientPtr client); +int ProcXUngrabDeviceKey(ClientPtr client); + +int SProcXAllowDeviceEvents(ClientPtr client); +int SProcXChangeDeviceControl(ClientPtr client); +int SProcXChangeDeviceDontPropagateList(ClientPtr client); +int SProcXChangeDeviceKeyMapping(ClientPtr client); +int SProcXChangeDeviceProperty(ClientPtr client); +int SProcXChangeFeedbackControl(ClientPtr client); +int SProcXDeleteDeviceProperty(ClientPtr client); +int SProcXGetDeviceDontPropagateList(ClientPtr client); +int SProcXGetDeviceMotionEvents(ClientPtr client); +int SProcXGetDeviceProperty(ClientPtr client); +int SProcXGetExtensionVersion(ClientPtr client); +int SProcXGetSelectedExtensionEvents(ClientPtr client); +int SProcXGrabDeviceButton(ClientPtr client); +int SProcXGrabDevice(ClientPtr client); +int SProcXGrabDeviceKey(ClientPtr client); +int SProcXIAllowEvents(ClientPtr client); +int SProcXIBarrierReleasePointer(ClientPtr client); +int SProcXIChangeCursor(ClientPtr client); +int SProcXIChangeProperty(ClientPtr client); +int SProcXIDeleteProperty(ClientPtr client); +int SProcXIGetClientPointer(ClientPtr client); +int SProcXIGetFocus(ClientPtr client); +int SProcXIGetProperty(ClientPtr client); +int SProcXIGetSelectedEvents(ClientPtr client); +int SProcXIGrabDevice(ClientPtr client); +int SProcXIListProperties(ClientPtr client); +int SProcXIPassiveGrabDevice(ClientPtr client); +int SProcXIPassiveUngrabDevice(ClientPtr client); +int SProcXIQueryDevice(ClientPtr client); +int SProcXIQueryPointer(ClientPtr client); +int SProcXIQueryVersion(ClientPtr client); +int SProcXISelectEvents(ClientPtr client); +int SProcXISetClientPointer(ClientPtr client); +int SProcXISetFocus(ClientPtr client); +int SProcXIUngrabDevice(ClientPtr client); +int SProcXIWarpPointer(ClientPtr client); +int SProcXSelectExtensionEvent(ClientPtr client); +int SProcXSendExtensionEvent(ClientPtr client); +int SProcXSetDeviceFocus(ClientPtr client); +int SProcXUngrabDeviceButton(ClientPtr client); +int SProcXUngrabDevice(ClientPtr client); +int SProcXUngrabDeviceKey(ClientPtr client); + +#endif /* _XSERVER_XI_HANDLERS_H */ diff --git a/Xi/listdev.c b/Xi/listdev.c index ea3b3ae00a..7a72d8c857 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -60,6 +60,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" @@ -68,7 +69,6 @@ SOFTWARE. #include "xace.h" #include "xkbsrv.h" #include "xkbstr.h" -#include "listdev.h" #define VPC 20 /* Max # valuators per chunk */ diff --git a/Xi/listdev.h b/Xi/listdev.h deleted file mode 100644 index 6be15152f9..0000000000 --- a/Xi/listdev.h +++ /dev/null @@ -1,31 +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 LISTDEV_H -#define LISTDEV_H 1 - -int ProcXListInputDevices(ClientPtr /* client */ - ); - -#endif /* LISTDEV_H */ diff --git a/Xi/opendev.c b/Xi/opendev.c index 6709493900..3916ddab95 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -58,6 +58,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" @@ -65,8 +66,6 @@ SOFTWARE. #include "exglobals.h" #include "exevents.h" -#include "opendev.h" - extern CARD8 event_base[]; /*********************************************************************** diff --git a/Xi/opendev.h b/Xi/opendev.h deleted file mode 100644 index ef06e8cf46..0000000000 --- a/Xi/opendev.h +++ /dev/null @@ -1,31 +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 OPENDEV_H -#define OPENDEV_H 1 - -int ProcXOpenDevice(ClientPtr /* client */ - ); - -#endif /* OPENDEV_H */ diff --git a/Xi/queryst.c b/Xi/queryst.c index c67ece7a32..202ac83a42 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -41,12 +41,12 @@ from The Open Group. #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "xkbsrv.h" #include "xkbstr.h" -#include "queryst.h" /*********************************************************************** * diff --git a/Xi/queryst.h b/Xi/queryst.h deleted file mode 100644 index 43863507b0..0000000000 --- a/Xi/queryst.h +++ /dev/null @@ -1,31 +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 QUERYST_H -#define QUERYST_H 1 - -int ProcXQueryDeviceState(ClientPtr /* client */ - ); - -#endif /* QUERYST_H */ diff --git a/Xi/selectev.c b/Xi/selectev.c index 3f2a3178cb..a1e2ce0245 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -58,12 +58,12 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" #include "grabdev.h" -#include "selectev.h" static int HandleDevicePresenceMask(ClientPtr client, WindowPtr win, diff --git a/Xi/selectev.h b/Xi/selectev.h deleted file mode 100644 index 947a061fe2..0000000000 --- a/Xi/selectev.h +++ /dev/null @@ -1,34 +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 SELECTEV_H -#define SELECTEV_H 1 - -int SProcXSelectExtensionEvent(ClientPtr /* client */ - ); - -int ProcXSelectExtensionEvent(ClientPtr /* client */ - ); - -#endif /* SELECTEV_H */ diff --git a/Xi/sendexev.c b/Xi/sendexev.c index ec03335017..466efddfcf 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -56,12 +56,12 @@ SOFTWARE. #include #include "dix/exevents_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ #include "extnsionst.h" /* EventSwapPtr */ #include "grabdev.h" -#include "sendexev.h" extern int lastEvent; /* Defined in extension.c */ diff --git a/Xi/sendexev.h b/Xi/sendexev.h deleted file mode 100644 index 247b3a5b61..0000000000 --- a/Xi/sendexev.h +++ /dev/null @@ -1,34 +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 SENDEXEV_H -#define SENDEXEV_H 1 - -int SProcXSendExtensionEvent(ClientPtr /* client */ - ); - -int ProcXSendExtensionEvent(ClientPtr /* client */ - ); - -#endif /* SENDEXEV_H */ diff --git a/Xi/setbmap.c b/Xi/setbmap.c index 7707ec8ff7..eb9eb748d8 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -57,10 +57,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "exevents.h" -#include "setbmap.h" /*********************************************************************** * diff --git a/Xi/setbmap.h b/Xi/setbmap.h deleted file mode 100644 index 2204aeebbb..0000000000 --- a/Xi/setbmap.h +++ /dev/null @@ -1,31 +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 SETBMAP_H -#define SETBMAP_H 1 - -int ProcXSetDeviceButtonMapping(ClientPtr /* client */ - ); - -#endif /* SETBMAP_H */ diff --git a/Xi/setdval.c b/Xi/setdval.c index 81e93bc8c5..ffee6688fd 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -58,10 +58,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" -#include "setdval.h" /*********************************************************************** * diff --git a/Xi/setdval.h b/Xi/setdval.h deleted file mode 100644 index cf45cfd2e7..0000000000 --- a/Xi/setdval.h +++ /dev/null @@ -1,31 +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 SETDVAL_H -#define SETDVAL_H 1 - -int ProcXSetDeviceValuators(ClientPtr /* client */ - ); - -#endif /* SETDVAL_H */ diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 6aec8934da..3b82ddb302 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -59,9 +59,9 @@ SOFTWARE. #include "inputstr.h" /* DeviceIntPtr */ #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "exglobals.h" -#include "setfocus.h" /*********************************************************************** * diff --git a/Xi/setfocus.h b/Xi/setfocus.h deleted file mode 100644 index daf48eb411..0000000000 --- a/Xi/setfocus.h +++ /dev/null @@ -1,34 +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 SETFOCUS_H -#define SETFOCUS_H 1 - -int SProcXSetDeviceFocus(ClientPtr /* client */ - ); - -int ProcXSetDeviceFocus(ClientPtr /* client */ - ); - -#endif /* SETFOCUS_H */ diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 9ca2b072ea..0fafe42338 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -58,10 +58,10 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "exevents.h" -#include "setmmap.h" /*********************************************************************** * diff --git a/Xi/setmmap.h b/Xi/setmmap.h deleted file mode 100644 index f1c519b1bf..0000000000 --- a/Xi/setmmap.h +++ /dev/null @@ -1,31 +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 SETMMAP_H -#define SETMMAP_H 1 - -int ProcXSetDeviceModifierMapping(ClientPtr /* client */ - ); - -#endif /* SETMMAP_H */ diff --git a/Xi/setmode.c b/Xi/setmode.c index 48188f0674..cf60325346 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -58,11 +58,11 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" #include "exglobals.h" -#include "setmode.h" /*********************************************************************** * diff --git a/Xi/setmode.h b/Xi/setmode.h deleted file mode 100644 index 92c97db5d7..0000000000 --- a/Xi/setmode.h +++ /dev/null @@ -1,31 +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 SETMODE_H -#define SETMODE_H 1 - -int ProcXSetDeviceMode(ClientPtr /* client */ - ); - -#endif /* SETMODE_H */ diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index a1533c4d5c..e97d350290 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -55,10 +55,10 @@ SOFTWARE. #include #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "ungrdev.h" /*********************************************************************** * diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h deleted file mode 100644 index 963bd3b689..0000000000 --- a/Xi/ungrdev.h +++ /dev/null @@ -1,34 +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 UNGRDEV_H -#define UNGRDEV_H 1 - -int SProcXUngrabDevice(ClientPtr /* client */ - ); - -int ProcXUngrabDevice(ClientPtr /* client */ - ); - -#endif /* UNGRDEV_H */ diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index 1d6795fe8f..cc95754d9c 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -57,11 +57,11 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/dixgrabs_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" -#include "ungrdevb.h" #define AllModifiersMask ( \ ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \ diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h deleted file mode 100644 index 2bb9df2cb9..0000000000 --- a/Xi/ungrdevb.h +++ /dev/null @@ -1,34 +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 UNGRDEVB_H -#define UNGRDEVB_H 1 - -int SProcXUngrabDeviceButton(ClientPtr /* client */ - ); - -int ProcXUngrabDeviceButton(ClientPtr /* client */ - ); - -#endif /* UNGRDEVB_H */ diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index eee36cbd19..b60e29605e 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -57,13 +57,13 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/dixgrabs_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" #include "xkbsrv.h" #include "xkbstr.h" -#include "ungrdevk.h" #define AllModifiersMask ( \ ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \ diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h deleted file mode 100644 index 030b615142..0000000000 --- a/Xi/ungrdevk.h +++ /dev/null @@ -1,34 +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 UNGRDEVK_H -#define UNGRDEVK_H 1 - -int SProcXUngrabDeviceKey(ClientPtr /* client */ - ); - -int ProcXUngrabDeviceKey(ClientPtr /* client */ - ); - -#endif /* UNGRDEVK_H */ diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c index 971e8c7cca..6598726313 100644 --- a/Xi/xiallowev.c +++ b/Xi/xiallowev.c @@ -38,13 +38,13 @@ #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "os/fmt.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "mi.h" #include "eventstr.h" #include "exglobals.h" /* BadDevice */ -#include "xiallowev.h" int _X_COLD SProcXIAllowEvents(ClientPtr client) diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h deleted file mode 100644 index 29c07d32ff..0000000000 --- a/Xi/xiallowev.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer - */ -#ifndef XIALLOWEV_H -#define XIALLOWEV_H 1 - -int ProcXIAllowEvents(ClientPtr client); -int SProcXIAllowEvents(ClientPtr client); - -#endif /* XIALLOWEV_H */ diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 6e1358b818..d0599b0be9 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -49,6 +49,7 @@ #include "dix/resource_priv.h" #include "mi/mi_priv.h" #include "os/bug_priv.h" +#include "Xi/handlers.h" #include "xibarriers.h" #include "scrnintstr.h" diff --git a/Xi/xibarriers.h b/Xi/xibarriers.h index 2de7eb5fdd..112e3990bd 100644 --- a/Xi/xibarriers.h +++ b/Xi/xibarriers.h @@ -34,9 +34,6 @@ XIDestroyPointerBarrier(ClientPtr client, Bool XIBarrierInit(void); void XIBarrierReset(void); -int SProcXIBarrierReleasePointer(ClientPtr client); -int ProcXIBarrierReleasePointer(ClientPtr client); - void XIBarrierNewMasterDevice(ClientPtr client, int deviceid); void XIBarrierRemoveMasterDevice(ClientPtr client, int deviceid); diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c index 2b43a014a8..95866b4826 100644 --- a/Xi/xichangecursor.c +++ b/Xi/xichangecursor.c @@ -38,6 +38,7 @@ #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ @@ -46,7 +47,6 @@ #include "exevents.h" #include "exglobals.h" #include "input.h" -#include "xichangecursor.h" /*********************************************************************** * diff --git a/Xi/xichangecursor.h b/Xi/xichangecursor.h deleted file mode 100644 index 008a03b726..0000000000 --- a/Xi/xichangecursor.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007-2008 Peter Hutterer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer, University of South Australia, NICTA - */ -#ifndef CHDEVCUR_H -#define CHDEVCUR_H 1 - -int SProcXIChangeCursor(ClientPtr /* client */ ); -int ProcXIChangeCursor(ClientPtr /* client */ ); - -#endif /* CHDEVCUR_H */ diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 90b19d9ac3..f8e1d581c7 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -43,6 +43,7 @@ #include "dix/extension_priv.h" #include "dix/input_priv.h" #include "os/bug_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index 7e852fa46b..3c82598998 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -31,8 +31,6 @@ #ifndef CHDEVHIER_H #define CHDEVHIER_H 1 -int ProcXIChangeHierarchy(ClientPtr /* client */ ); - void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]); #endif /* CHDEVHIER_H */ diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c index 6983567bdd..91a8f89f87 100644 --- a/Xi/xigetclientpointer.c +++ b/Xi/xigetclientpointer.c @@ -31,6 +31,7 @@ #include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ @@ -38,7 +39,6 @@ #include "extnsionst.h" #include "exevents.h" #include "exglobals.h" -#include "xigetclientpointer.h" /*********************************************************************** * This procedure allows a client to query another client's client pointer diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h deleted file mode 100644 index 5d08c29e27..0000000000 --- a/Xi/xigetclientpointer.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007-2008 Peter Hutterer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer, University of South Australia, NICTA - */ -#ifndef GETCPTR_H -#define GETCPTR_H 1 - -int SProcXIGetClientPointer(ClientPtr /* client */ ); -int ProcXIGetClientPointer(ClientPtr /* client */ ); - -#endif /* GETCPTR_H */ diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index 6f015c67a2..93158bc105 100644 --- a/Xi/xigrabdev.c +++ b/Xi/xigrabdev.c @@ -38,11 +38,11 @@ #include "dix/exevents_priv.h" #include "dix/inpututils_priv.h" #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" /* BadDevice */ -#include "xigrabdev.h" int _X_COLD SProcXIGrabDevice(ClientPtr client) diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h deleted file mode 100644 index f7d110941c..0000000000 --- a/Xi/xigrabdev.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer - */ -#ifndef XIGRABDEV_H -#define XIGRABDEV_H 1 - -#include - -int ProcXIGrabDevice(ClientPtr client); -int SProcXIGrabDevice(ClientPtr client); - -int ProcXIUngrabDevice(ClientPtr client); -int SProcXIUngrabDevice(ClientPtr client); - -#endif /* XIGRABDEV_H */ diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 921e53b6ba..0aebd05afa 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -39,12 +39,12 @@ #include "dix/exevents_priv.h" #include "dix/inpututils_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "swaprep.h" #include "exglobals.h" /* BadDevice */ -#include "xipassivegrab.h" #include "misc.h" int _X_COLD diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h deleted file mode 100644 index 85754de3b0..0000000000 --- a/Xi/xipassivegrab.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer - */ -#ifndef XIPASSIVEGRAB_H -#define XIPASSIVEGRAB_H 1 - -int SProcXIPassiveUngrabDevice(ClientPtr client); -int ProcXIPassiveUngrabDevice(ClientPtr client); -int ProcXIPassiveGrabDevice(ClientPtr client); -int SProcXIPassiveGrabDevice(ClientPtr client); - -#endif /* XIPASSIVEGRAB_H */ diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 7b18491cdd..13afad47e0 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -37,6 +37,7 @@ #include "dix/extension_priv.h" #include "dix/input_priv.h" #include "dix/rpcbuf_priv.h" +#include "Xi/handlers.h" #include "dix.h" #include "inputstr.h" diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index a4b15790e1..7899e87d1d 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -25,27 +25,6 @@ #ifndef XIPROPERTY_H #define XIPROPERTY_H 1 -int ProcXListDeviceProperties(ClientPtr client); -int ProcXChangeDeviceProperty(ClientPtr client); -int ProcXDeleteDeviceProperty(ClientPtr client); -int ProcXGetDeviceProperty(ClientPtr client); - -/* request swapping */ -int SProcXChangeDeviceProperty(ClientPtr client); -int SProcXDeleteDeviceProperty(ClientPtr client); -int SProcXGetDeviceProperty(ClientPtr client); - -/* XI2 request/reply handling */ -int ProcXIListProperties(ClientPtr client); -int ProcXIChangeProperty(ClientPtr client); -int ProcXIDeleteProperty(ClientPtr client); -int ProcXIGetProperty(ClientPtr client); - -int SProcXIListProperties(ClientPtr client); -int SProcXIChangeProperty(ClientPtr client); -int SProcXIDeleteProperty(ClientPtr client); -int SProcXIGetProperty(ClientPtr client); - void XIResetProperties(void); #endif /* XIPROPERTY_H */ diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index 5a5bbf0e82..26c3ad09fa 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -40,6 +40,7 @@ #include "dix/inpututils_priv.h" #include "dix/rpcbuf_priv.h" #include "os/fmt.h" +#include "Xi/handlers.h" #include "inputstr.h" #include "xkbstr.h" diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h index a3ecb40644..e54f74f5ee 100644 --- a/Xi/xiquerydevice.h +++ b/Xi/xiquerydevice.h @@ -28,8 +28,6 @@ #include -int SProcXIQueryDevice(ClientPtr client); -int ProcXIQueryDevice(ClientPtr client); int SizeDeviceClasses(DeviceIntPtr dev); int GetDeviceUse(DeviceIntPtr dev, uint16_t * attachment); int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo * info, Bool reportState); diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index 2620903d70..76e49d6292 100644 --- a/Xi/xiquerypointer.c +++ b/Xi/xiquerypointer.c @@ -45,6 +45,7 @@ #include "dix/screenint_priv.h" #include "os/fmt.h" #include "Xext/panoramiXsrv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ @@ -53,8 +54,6 @@ #include "scrnintstr.h" #include "xkbsrv.h" -#include "xiquerypointer.h" - /*********************************************************************** * * This procedure allows a client to query the pointer of a device. diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h deleted file mode 100644 index 192c4b759c..0000000000 --- a/Xi/xiquerypointer.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007-2008 Peter Hutterer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer, University of South Australia, NICTA - */ -#ifndef QUERYDP_H -#define QUERYDP_H 1 - -int SProcXIQueryPointer(ClientPtr /* client */ ); -int ProcXIQueryPointer(ClientPtr /* client */ ); - -#endif /* QUERYDP_H */ diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c index b124afdf9b..26568c1541 100644 --- a/Xi/xiqueryversion.c +++ b/Xi/xiqueryversion.c @@ -38,10 +38,10 @@ #include "dix/dix_priv.h" #include "dix/exevents_priv.h" #include "os/fmt.h" +#include "Xi/handlers.h" #include "inputstr.h" #include "exglobals.h" -#include "xiqueryversion.h" #include "misc.h" extern XExtensionVersion XIVersion; /* defined in getvers.c */ diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h deleted file mode 100644 index 0bcfc469e8..0000000000 --- a/Xi/xiqueryversion.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Authors: Peter Hutterer - * - */ -#ifndef QUERYVERSION_H -#define QUERYVERSION_H 1 - -#include - -int SProcXIQueryVersion(ClientPtr client); -int ProcXIQueryVersion(ClientPtr client); - -#endif /* QUERYVERSION_H */ diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index a107e50d06..d07454f979 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -31,10 +31,10 @@ #include "dix/exevents_priv.h" #include "dix/inpututils_priv.h" #include "dix/resource_priv.h" +#include "Xi/handlers.h" #include "dixstruct.h" #include "windowstr.h" -#include "xiselectev.h" /** * Ruleset: diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h deleted file mode 100644 index b6d73fec75..0000000000 --- a/Xi/xiselectev.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2008 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer - */ -#ifndef XISELECTEVENTS_H -#define XISELECTEVENTS_H 1 - -int SProcXISelectEvents(ClientPtr client); -int ProcXISelectEvents(ClientPtr client); -int SProcXIGetSelectedEvents(ClientPtr client); -int ProcXIGetSelectedEvents(ClientPtr client); - -#endif /* _XISELECTEVENTS_H_ */ diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c index 2f8808c93d..901ef4971b 100644 --- a/Xi/xisetclientpointer.c +++ b/Xi/xisetclientpointer.c @@ -34,18 +34,18 @@ #include /* for inputstr.h */ #include /* Request macro */ +#include +#include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include -#include #include "extnsionst.h" #include "exevents.h" #include "exglobals.h" -#include "xisetclientpointer.h" int _X_COLD SProcXISetClientPointer(ClientPtr client) diff --git a/Xi/xisetclientpointer.h b/Xi/xisetclientpointer.h deleted file mode 100644 index b7c867d150..0000000000 --- a/Xi/xisetclientpointer.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007-2008 Peter Hutterer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer, University of South Australia, NICTA - */ -#ifndef SETCPTR_H -#define SETCPTR_H 1 - -int SProcXISetClientPointer(ClientPtr /* client */ ); -int ProcXISetClientPointer(ClientPtr /* client */ ); - -#endif /* SETCPTR_H */ diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c index 68a646353b..a14e6e8b1d 100644 --- a/Xi/xisetdevfocus.c +++ b/Xi/xisetdevfocus.c @@ -34,11 +34,11 @@ #include #include "dix/dix_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "exglobals.h" /* BadDevice */ -#include "xisetdevfocus.h" int _X_COLD SProcXISetFocus(ClientPtr client) diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h deleted file mode 100644 index 909d3bb252..0000000000 --- a/Xi/xisetdevfocus.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2008 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer - */ -#ifndef XISETDEVFOCUS_H -#define XISETDEVFOCUS_H 1 - -int SProcXISetFocus(ClientPtr client); -int ProcXISetFocus(ClientPtr client); - -int SProcXIGetFocus(ClientPtr client); -int ProcXIGetFocus(ClientPtr client); - -#endif /* XISETDEVFOCUS_H */ diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c index 84c2db81b0..90593d1ab5 100644 --- a/Xi/xiwarppointer.c +++ b/Xi/xiwarppointer.c @@ -40,6 +40,7 @@ #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "mi/mipointer_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ @@ -48,7 +49,6 @@ #include "exevents.h" #include "exglobals.h" #include "mipointer.h" /* for miPointerUpdateSprite */ -#include "xiwarppointer.h" /*********************************************************************** * diff --git a/Xi/xiwarppointer.h b/Xi/xiwarppointer.h deleted file mode 100644 index 5fa22ecf90..0000000000 --- a/Xi/xiwarppointer.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007-2008 Peter Hutterer - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Author: Peter Hutterer, University of South Australia, NICTA - */ -#ifndef WARPDEVP_H -#define WARPDEVP_H 1 - -int SProcXIWarpPointer(ClientPtr /* client */ ); -int ProcXIWarpPointer(ClientPtr /* client */ ); - -#endif /* WARPDEVP_H */ diff --git a/dix/getevents.c b/dix/getevents.c index c20049faa1..762d584e66 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -63,7 +63,6 @@ #include "xkbsrv.h" #include "exglobals.h" #include "extnsionst.h" -#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */ /* Number of motion history events to store. */ #define MOTION_HISTORY_SIZE 256 diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c index 1ec1d1a265..9d2ea9ba4f 100644 --- a/test/xi1/protocol-xchangedevicecontrol.c +++ b/test/xi1/protocol-xchangedevicecontrol.c @@ -33,8 +33,10 @@ #include #include #include + +#include "Xi/handlers.h" + #include "inputstr.h" -#include "chgdctl.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c index ca33ec1848..9cbf9ee535 100644 --- a/test/xi2/protocol-xigetclientpointer.c +++ b/test/xi2/protocol-xigetclientpointer.c @@ -33,10 +33,12 @@ #include #include #include + +#include "Xi/handlers.h" + #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xigetclientpointer.h" #include "exevents.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 7b058ff908..2cc6be5fbe 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -44,11 +44,11 @@ #include "dix/exevents_priv.h" #include "miext/extinit_priv.h" /* for XInputExtensionInit */ +#include "Xi/handlers.h" #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xiselectev.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index f794faf5c1..0df932abb2 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -35,11 +35,11 @@ #include #include "dix/exevents_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xipassivegrab.h" #include "exglobals.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c index 0cea3d5fb1..01c2984a90 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -33,6 +33,7 @@ #include #include "miext/extinit_priv.h" +#include "Xi/handlers.h" #include "inputstr.h" #include "exglobals.h" diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c index 99933483cd..a7c0c31daf 100644 --- a/test/xi2/protocol-xiquerypointer.c +++ b/test/xi2/protocol-xiquerypointer.c @@ -33,10 +33,12 @@ #include #include #include + +#include "Xi/handlers.h" + #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xiquerypointer.h" #include "exevents.h" #include "exglobals.h" diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index 55a7f3044a..7725f2a8d1 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -44,10 +44,10 @@ #include "dix/exevents_priv.h" #include "miext/extinit_priv.h" /* for XInputExtensionInit */ +#include "Xi/handlers.h" #include "inputstr.h" #include "scrnintstr.h" -#include "xiqueryversion.h" #include "protocol-common.h" #include "exglobals.h" diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 483bbf89ae..6f32bbad0a 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -54,12 +54,12 @@ #include #include "miext/extinit_priv.h" /* for XInputExtensionInit */ +#include "Xi/handlers.h" #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" #include "exglobals.h" -#include "xiselectev.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index 43313bbab2..cfeb6c31cf 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -41,11 +41,11 @@ #include #include "miext/extinit_priv.h" /* for XInputExtensionInit */ +#include "Xi/handlers.h" #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xisetclientpointer.h" #include "exevents.h" #include "exglobals.h" diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c index 680a94cf2c..6bda0b9408 100644 --- a/test/xi2/protocol-xiwarppointer.c +++ b/test/xi2/protocol-xiwarppointer.c @@ -33,10 +33,12 @@ #include #include #include + +#include "Xi/handlers.h" + #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" -#include "xiwarppointer.h" #include "exevents.h" #include "exglobals.h"