diff options
Diffstat (limited to 'dix/grabs.c')
| -rw-r--r-- | dix/grabs.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/dix/grabs.c b/dix/grabs.c index bebbd3bec..7a9fbcdb5 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */ #include "X.h" #include "misc.h" @@ -65,7 +65,6 @@ SOFTWARE. #define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) GrabPtr -#if NeedFunctionPrototypes CreateGrab( int client, DeviceIntPtr device, @@ -78,21 +77,6 @@ CreateGrab( KeyCode keybut, /* key or button */ WindowPtr confineTo, CursorPtr cursor) -#else -CreateGrab(client, device, window, eventMask, ownerEvents, keyboardMode, - pointerMode, modDevice, modifiers, type, keybut, confineTo, cursor) - int client; - DeviceIntPtr device; - WindowPtr window; - Mask eventMask; - Bool ownerEvents, keyboardMode, pointerMode; - DeviceIntPtr modDevice; - unsigned short modifiers; - int type; - KeyCode keybut; /* key or button */ - WindowPtr confineTo; - CursorPtr cursor; -#endif { GrabPtr grab; @@ -125,12 +109,7 @@ CreateGrab(client, device, window, eventMask, ownerEvents, keyboardMode, } static void -#if NeedFunctionPrototypes FreeGrab(GrabPtr pGrab) -#else -FreeGrab(pGrab) - GrabPtr pGrab; -#endif { if (pGrab->modifiersDetail.pMask != NULL) xfree(pGrab->modifiersDetail.pMask); @@ -173,13 +152,7 @@ DeletePassiveGrab(value, id) } static Mask * -#if NeedFunctionPrototypes DeleteDetailFromMask(Mask *pDetailMask, unsigned short detail) -#else -DeleteDetailFromMask(pDetailMask, detail) - Mask *pDetailMask; - unsigned short detail; -#endif { register Mask *mask; register int i; @@ -199,16 +172,10 @@ DeleteDetailFromMask(pDetailMask, detail) } static Bool -#if NeedFunctionPrototypes IsInGrabMask( DetailRec firstDetail, DetailRec secondDetail, unsigned short exception) -#else -IsInGrabMask(firstDetail, secondDetail, exception) - DetailRec firstDetail, secondDetail; - unsigned short exception; -#endif { if (firstDetail.exact == exception) { @@ -227,15 +194,10 @@ IsInGrabMask(firstDetail, secondDetail, exception) } static Bool -#if NeedFunctionPrototypes IdenticalExactDetails( unsigned short firstExact, unsigned short secondExact, unsigned short exception) -#else -IdenticalExactDetails(firstExact, secondExact, exception) - unsigned short firstExact, secondExact, exception; -#endif { if ((firstExact == exception) || (secondExact == exception)) return FALSE; @@ -247,16 +209,10 @@ IdenticalExactDetails(firstExact, secondExact, exception) } static Bool -#if NeedFunctionPrototypes DetailSupersedesSecond( DetailRec firstDetail, DetailRec secondDetail, unsigned short exception) -#else -DetailSupersedesSecond(firstDetail, secondDetail, exception) - DetailRec firstDetail, secondDetail; - unsigned short exception; -#endif { if (IsInGrabMask(firstDetail, secondDetail, exception)) return TRUE; @@ -269,12 +225,7 @@ DetailSupersedesSecond(firstDetail, secondDetail, exception) } static Bool -#if NeedFunctionPrototypes GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab) -#else -GrabSupersedesSecond(pFirstGrab, pSecondGrab) - GrabPtr pFirstGrab, pSecondGrab; -#endif { if (!DetailSupersedesSecond(pFirstGrab->modifiersDetail, pSecondGrab->modifiersDetail, |