diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/X11/extensions/Xfixes.h | 31 | ||||
| -rw-r--r-- | src/Cursor.c | 56 |
4 files changed, 96 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-3-13 Deron Johnson <deron.johnson@sun.com> + + * configure.ac + * include/X11/extensions/Xfixes.h + * src/Cursor.c + Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow + Xfixes Version 4.0: XFixesHideCursor, XFixesShowCursor + 2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 9963aa8..7b7dadc 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n, dnl that 'revision' number appears in Xfixes.h and has to be manually dnl synchronized. dnl -AC_INIT(libXfixes, 3.0.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes) +AC_INIT(libXfixes, 4.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h index 28ca28f..cec1341 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -1,6 +1,26 @@ /* * $XFree86: xc/lib/Xfixes/Xfixes.h,v 1.1 2002/11/30 06:21:45 keithp Exp $ * + * Copyright © 2006 Sun Microsystems + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Sun Microsystems not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Sun Microsystems makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL SUN MICROSYSTEMS 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. + * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -215,6 +235,17 @@ XFixesExpandRegion (Display *dpy, XserverRegion dst, XserverRegion src, #endif /* XFIXES_MAJOR >= 3 */ +#if XFIXES_MAJOR >= 4 +/* Version 4.0 externs */ + +void +XFixesHideCursor (Display *dpy, Window win); + +void +XFixesShowCursor (Display *dpy, Window win); + +#endif /* XFIXES_MAJOR >= 4 */ + _XFUNCPROTOEND #endif /* _XFIXES_H_ */ diff --git a/src/Cursor.c b/src/Cursor.c index ada8a68..cbb3d6b 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -1,6 +1,26 @@ /* * $XFree86: xc/lib/Xfixes/Cursor.c,v 1.1 2002/11/30 06:21:44 keithp Exp $ * + * Copyright © 2006 Sun Microsystems + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Sun Microsystems not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Sun Microsystems makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL SUN MICROSYSTEMS 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. + * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -218,3 +238,39 @@ XFixesChangeCursorByName (Display *dpy, Cursor source, const char *name) UnlockDisplay(dpy); SyncHandle(); } + +void +XFixesHideCursor (Display *dpy, Window win) +{ + XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); + xXFixesHideCursorReq *req; + + XFixesSimpleCheckExtension (dpy, info); + if (info->major_version < 4) + return; + LockDisplay (dpy); + GetReq (XFixesHideCursor, req); + req->reqType = info->codes->major_opcode; + req->xfixesReqType = X_XFixesHideCursor; + req->window = win; + UnlockDisplay (dpy); + SyncHandle (); +} + +void +XFixesShowCursor (Display *dpy, Window win) +{ + XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); + xXFixesShowCursorReq *req; + + XFixesSimpleCheckExtension (dpy, info); + if (info->major_version < 4) + return; + LockDisplay (dpy); + GetReq (XFixesShowCursor, req); + req->reqType = info->codes->major_opcode; + req->xfixesReqType = X_XFixesShowCursor; + req->window = win; + UnlockDisplay (dpy); + SyncHandle (); +} |