From d230742ea820a21a3f1ed0c58b5e6d8680b2f2aa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 16 Jun 2009 12:13:16 +1000 Subject: [PATCH] Xi: namespace XI2 files. Some files (notably those merged with MPX before XI2 came along) didn't use a 'xi' prefix. This patch changes all of them to meaningful names. Signed-off-by: Peter Hutterer --- Xi/Makefile.am | 34 ++++++++++++------------- Xi/exevents.c | 2 +- Xi/extinit.c | 16 ++++++------ Xi/{chdevcur.c => xichangecursor.c} | 2 +- Xi/{chdevcur.h => xichangecursor.h} | 0 Xi/{chdevhier.c => xichangehierarchy.c} | 4 +-- Xi/{chdevhier.h => xichangehierarchy.h} | 0 Xi/{getcptr.c => xigetclientpointer.c} | 2 +- Xi/{getcptr.h => xigetclientpointer.h} | 0 Xi/{querydev.c => xiquerydevice.c} | 2 +- Xi/{querydev.h => xiquerydevice.h} | 0 Xi/{querydp.c => xiquerypointer.c} | 2 +- Xi/{querydp.h => xiquerypointer.h} | 0 Xi/{queryversion.c => xiqueryversion.c} | 4 +-- Xi/{queryversion.h => xiqueryversion.h} | 0 Xi/{setcptr.c => xisetclientpointer.c} | 2 +- Xi/{setcptr.h => xisetclientpointer.h} | 0 Xi/{warpdevp.c => xiwarppointer.c} | 2 +- Xi/{warpdevp.h => xiwarppointer.h} | 0 dix/devices.c | 4 +-- dix/eventconvert.c | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) rename Xi/{chdevcur.c => xichangecursor.c} (99%) rename Xi/{chdevcur.h => xichangecursor.h} (100%) rename Xi/{chdevhier.c => xichangehierarchy.c} (99%) rename Xi/{chdevhier.h => xichangehierarchy.h} (100%) rename Xi/{getcptr.c => xigetclientpointer.c} (99%) rename Xi/{getcptr.h => xigetclientpointer.h} (100%) rename Xi/{querydev.c => xiquerydevice.c} (99%) rename Xi/{querydev.h => xiquerydevice.h} (100%) rename Xi/{querydp.c => xiquerypointer.c} (99%) rename Xi/{querydp.h => xiquerypointer.h} (100%) rename Xi/{queryversion.c => xiqueryversion.c} (98%) rename Xi/{queryversion.h => xiqueryversion.h} (100%) rename Xi/{setcptr.c => xisetclientpointer.c} (99%) rename Xi/{setcptr.h => xisetclientpointer.h} (100%) rename Xi/{warpdevp.c => xiwarppointer.c} (99%) rename Xi/{warpdevp.h => xiwarppointer.h} (100%) diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 56404b6eb..69c7886b9 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -5,12 +5,8 @@ AM_CFLAGS = $(DIX_CFLAGS) libXi_la_SOURCES = \ allowev.c \ allowev.h \ - chdevcur.c \ - chdevcur.h \ chgdctl.c \ chgdctl.h \ - chdevhier.c \ - chdevhier.h \ chgfctl.c \ chgfctl.h \ chgkbd.c \ @@ -30,8 +26,6 @@ libXi_la_SOURCES = \ extinit.c \ getbmap.c \ getbmap.h \ - getcptr.c \ - getcptr.h \ getdctl.c \ getdctl.h \ getfctl.c \ @@ -60,12 +54,6 @@ libXi_la_SOURCES = \ listdev.h \ opendev.c \ opendev.h \ - querydev.c \ - querydev.h \ - queryversion.h \ - queryversion.c \ - querydp.c \ - querydp.h \ queryst.c \ queryst.h \ selectev.c \ @@ -74,8 +62,6 @@ libXi_la_SOURCES = \ sendexev.h \ setbmap.c \ setbmap.h \ - setcptr.c \ - setcptr.h \ setdval.c \ setdval.h \ setfocus.c \ @@ -90,19 +76,33 @@ libXi_la_SOURCES = \ ungrdevb.h \ ungrdevk.c \ ungrdevk.h \ - warpdevp.c \ - warpdevp.h \ xiallowev.c \ xiallowev.h \ + xichangecursor.c \ + xichangecursor.h \ + xichangehierarchy.c \ + xichangehierarchy.h \ + xigetclientpointer.c \ + xigetclientpointer.h \ xigrabdev.c \ xigrabdev.h \ xipassivegrab.h \ xipassivegrab.c \ xiproperty.c \ xiproperty.h \ + xiquerydevice.c \ + xiquerydevice.h \ + xiquerypointer.c \ + xiquerypointer.h \ + xiqueryversion.c \ + xiqueryversion.h \ xiselectev.c \ xiselectev.h \ + xisetclientpointer.c \ + xisetclientpointer.h \ xisetdevfocus.c \ - xisetdevfocus.h + xisetdevfocus.h \ + xiwarppointer.c \ + xiwarppointer.h EXTRA_DIST = stubs.c diff --git a/Xi/exevents.c b/Xi/exevents.c index 23d8ee899..24fd11fc0 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -74,7 +74,7 @@ SOFTWARE. #include "scrnintstr.h" #include "listdev.h" /* for CopySwapXXXClass */ #include "xace.h" -#include "querydev.h" /* For List*Info */ +#include "xiquerydevice.h" /* For List*Info */ #include "eventconvert.h" #include diff --git a/Xi/extinit.c b/Xi/extinit.c index 0550bd483..20d49e13b 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -75,9 +75,7 @@ SOFTWARE. /* modules local to Xi */ #include "allowev.h" -#include "chdevcur.h" #include "chgdctl.h" -#include "chdevhier.h" #include "chgfctl.h" #include "chgkbd.h" #include "chgprop.h" @@ -86,7 +84,6 @@ SOFTWARE. #include "devbell.h" #include "getbmap.h" #include "getbmap.h" -#include "getcptr.h" #include "getdctl.h" #include "getfctl.h" #include "getfocus.h" @@ -102,15 +99,11 @@ SOFTWARE. #include "gtmotion.h" #include "listdev.h" #include "opendev.h" -#include "querydp.h" #include "queryst.h" -#include "querydev.h" -#include "queryversion.h" #include "selectev.h" #include "sendexev.h" #include "chgkmap.h" #include "setbmap.h" -#include "setcptr.h" #include "setdval.h" #include "setfocus.h" #include "setmmap.h" @@ -118,13 +111,20 @@ SOFTWARE. #include "ungrdev.h" #include "ungrdevb.h" #include "ungrdevk.h" -#include "warpdevp.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" /* Masks for XI events have to be aligned with core event (partially anyway). diff --git a/Xi/chdevcur.c b/Xi/xichangecursor.c similarity index 99% rename from Xi/chdevcur.c rename to Xi/xichangecursor.c index 9dba78b36..ee2d65d91 100644 --- a/Xi/chdevcur.c +++ b/Xi/xichangecursor.c @@ -45,7 +45,7 @@ #include "exglobals.h" #include "input.h" -#include "chdevcur.h" +#include "xichangecursor.h" /*********************************************************************** * diff --git a/Xi/chdevcur.h b/Xi/xichangecursor.h similarity index 100% rename from Xi/chdevcur.h rename to Xi/xichangecursor.h diff --git a/Xi/chdevhier.c b/Xi/xichangehierarchy.c similarity index 99% rename from Xi/chdevhier.c rename to Xi/xichangehierarchy.c index 3f2bb9377..944bb3017 100644 --- a/Xi/chdevhier.c +++ b/Xi/xichangehierarchy.c @@ -48,11 +48,11 @@ #include "exglobals.h" #include "geext.h" #include "xace.h" -#include "querydev.h" /* for GetDeviceUse */ +#include "xiquerydevice.h" /* for GetDeviceUse */ #include "xkbsrv.h" -#include "chdevhier.h" +#include "xichangehierarchy.h" extern DevPrivateKey XTstDevicePrivateKey; diff --git a/Xi/chdevhier.h b/Xi/xichangehierarchy.h similarity index 100% rename from Xi/chdevhier.h rename to Xi/xichangehierarchy.h diff --git a/Xi/getcptr.c b/Xi/xigetclientpointer.c similarity index 99% rename from Xi/getcptr.c rename to Xi/xigetclientpointer.c index 92fae8244..859d3fd00 100644 --- a/Xi/getcptr.c +++ b/Xi/xigetclientpointer.c @@ -39,7 +39,7 @@ #include "exevents.h" #include "exglobals.h" -#include "getcptr.h" +#include "xigetclientpointer.h" /*********************************************************************** * This procedure allows a client to query another client's client pointer diff --git a/Xi/getcptr.h b/Xi/xigetclientpointer.h similarity index 100% rename from Xi/getcptr.h rename to Xi/xigetclientpointer.h diff --git a/Xi/querydev.c b/Xi/xiquerydevice.c similarity index 99% rename from Xi/querydev.c rename to Xi/xiquerydevice.c index fd5e4635c..07ddfa1cf 100644 --- a/Xi/querydev.c +++ b/Xi/xiquerydevice.c @@ -40,7 +40,7 @@ #include "xserver-properties.h" #include "exevents.h" -#include "querydev.h" +#include "xiquerydevice.h" static int ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info); static int SizeDeviceInfo(DeviceIntPtr dev); diff --git a/Xi/querydev.h b/Xi/xiquerydevice.h similarity index 100% rename from Xi/querydev.h rename to Xi/xiquerydevice.h diff --git a/Xi/querydp.c b/Xi/xiquerypointer.c similarity index 99% rename from Xi/querydp.c rename to Xi/xiquerypointer.c index e5bf98d86..1d00b9e6b 100644 --- a/Xi/querydp.c +++ b/Xi/xiquerypointer.c @@ -49,7 +49,7 @@ #include "panoramiXsrv.h" #endif -#include "querydp.h" +#include "xiquerypointer.h" /*********************************************************************** * diff --git a/Xi/querydp.h b/Xi/xiquerypointer.h similarity index 100% rename from Xi/querydp.h rename to Xi/xiquerypointer.h diff --git a/Xi/queryversion.c b/Xi/xiqueryversion.c similarity index 98% rename from Xi/queryversion.c rename to Xi/xiqueryversion.c index 4d644a955..ae63297da 100644 --- a/Xi/queryversion.c +++ b/Xi/xiqueryversion.c @@ -25,7 +25,7 @@ */ /** - * @file queryversion.c + * @file xiqueryversion.c * Protocol handling for the XIQueryVersion request/reply. */ @@ -42,7 +42,7 @@ #include "exglobals.h" #include "exevents.h" -#include "queryversion.h" +#include "xiqueryversion.h" #include "misc.h" extern XExtensionVersion XIVersion; /* defined in getvers.c */ diff --git a/Xi/queryversion.h b/Xi/xiqueryversion.h similarity index 100% rename from Xi/queryversion.h rename to Xi/xiqueryversion.h diff --git a/Xi/setcptr.c b/Xi/xisetclientpointer.c similarity index 99% rename from Xi/setcptr.c rename to Xi/xisetclientpointer.c index d23b2d860..264807475 100644 --- a/Xi/setcptr.c +++ b/Xi/xisetclientpointer.c @@ -46,7 +46,7 @@ #include "exevents.h" #include "exglobals.h" -#include "setcptr.h" +#include "xisetclientpointer.h" int SProcXISetClientPointer(ClientPtr client) diff --git a/Xi/setcptr.h b/Xi/xisetclientpointer.h similarity index 100% rename from Xi/setcptr.h rename to Xi/xisetclientpointer.h diff --git a/Xi/warpdevp.c b/Xi/xiwarppointer.c similarity index 99% rename from Xi/warpdevp.c rename to Xi/xiwarppointer.c index bb45bdafc..f3acfe468 100644 --- a/Xi/warpdevp.c +++ b/Xi/xiwarppointer.c @@ -46,7 +46,7 @@ #include "mipointer.h" /* for miPointerUpdateSprite */ -#include "warpdevp.h" +#include "xiwarppointer.h" /*********************************************************************** * * This procedure allows a client to warp the pointer of a device. diff --git a/Xi/warpdevp.h b/Xi/xiwarppointer.h similarity index 100% rename from Xi/warpdevp.h rename to Xi/xiwarppointer.h diff --git a/dix/devices.c b/dix/devices.c index 3996ca64a..2b0358875 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -78,11 +78,11 @@ SOFTWARE. #include #include "exglobals.h" #include "exevents.h" -#include "querydev.h" /* for SizeDeviceClasses */ +#include "xiquerydevice.h" /* for SizeDeviceClasses */ #include "xiproperty.h" #include "enterleave.h" /* for EnterWindow() */ #include "xserver-properties.h" -#include "chdevhier.h" /* For XISendDeviceHierarchyEvent */ +#include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */ /** @file * This file handles input device-related stuff. diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 85ddd61f2..ac2b0c310 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -45,7 +45,7 @@ #include "events.h" #include "exglobals.h" #include "eventconvert.h" -#include "querydev.h" +#include "xiquerydevice.h" #include "xkbsrv.h"