From 94c375e2ae10039a7b62d0582c65e7cbc1c04314 Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 3 Mar 2007 10:39:18 +0000 Subject: [PATCH] Import libXext version 1.0.3 --- lib/libXext/ChangeLog | 420 +++++++++++++++++++++++++++--------- lib/libXext/Makefile.am | 9 +- lib/libXext/autogen.sh | 12 ++ lib/libXext/config.h.in | 9 + lib/libXext/configure.ac | 2 +- lib/libXext/man/Makefile.am | 8 +- lib/libXext/man/XShape.man | 2 +- lib/libXext/man/XShm.man | 202 +++++++++++++++++ lib/libXext/man/Xmbuf.man | 8 +- 9 files changed, 561 insertions(+), 111 deletions(-) create mode 100644 lib/libXext/autogen.sh create mode 100644 lib/libXext/man/XShm.man diff --git a/lib/libXext/ChangeLog b/lib/libXext/ChangeLog index 0cab85ced..71e0481d4 100644 --- a/lib/libXext/ChangeLog +++ b/lib/libXext/ChangeLog @@ -1,151 +1,365 @@ -2006-08-26 David Nusinow +commit 8d8a6ac4012c2bd5bfd037e42f69f5b2b111433d +Author: Alan Coopersmith +Date: Thu Jan 25 18:28:21 2007 -0800 - * man/DBE.man: - * man/XShape.man: - * man/XcupGetReservedColormapEntries.man: - * man/XcupQueryVersion.man: - * man/XcupStoreColors.man: - * man/XdbeAllocateBackBufferName.man: - * man/XdbeBeginIdiom.man: - * man/XdbeDeallocateBackBufferName.man: - * man/XdbeEndIdiom.man: - * man/XdbeFreeVisualInfo.man: - * man/XdbeGetBackBufferAttributes.man: - * man/XdbeGetVisualInfo.man: - * man/XdbeQueryExtension.man: - * man/XdbeSwapBuffers.man: - * man/Xevi.man: - * man/Xmbuf.man: - Fix various manpages that didn't have their section generated from - __libmansuffix__. + Version bump: 1.0.3 -2006-04-26 Adam Jackson +commit 6856538d6dec00795f492262eb4f730735eff8d1 +Author: Alan Coopersmith +Date: Thu Jan 25 18:23:14 2007 -0800 - * configure.ac: - Bump to 1.0.1 + Replace static ChangeLog with dist-hook to generate from git log -2006-04-02 Adam Jackson +commit 5243b3f7d462a06ec245b28ed007d5b4c85651ee +Author: Alan Coopersmith +Date: Tue Oct 24 17:22:34 2006 -0700 - * src/Xdbe.c: - Coverity #575: Plug a leak on the error path. + Man page spelling/typo fixes - * src/XEVI.c: - Coverity #929: Additional defensive NULL check. +commit 0bf51bc7ba7c0b6f2540503491b9ec104c1c22d1 +Merge: ee11d4d... a82d7b9... +Author: Alan Coopersmith +Date: Tue Oct 24 17:14:45 2006 -0700 -2006-02-12 Alan Coopersmith + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXext - * man/Makefile.am: - Bug #5628 - Shadow pages not created correctly when MANDIR & MANSUFFIX don't match. +commit ee11d4d2098dfcb711d1ca9825256bd4625e91bb +Author: Alan Coopersmith +Date: Tue Oct 24 17:14:32 2006 -0700 -2005-12-14 Kevin E. Martin + Add XShm.man and aliases to Makefile.am - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 50bb4abe86635c8bb26ad643d4402f109e03a7d0 +Author: Sam Lau +Date: Tue Oct 24 17:14:02 2006 -0700 -2005-12-06 Kevin E. Martin + Sun bug 4985712: man pages needed for MIT-SHM extension functions + + - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit 6b50588e63ba02cb08a9465a1c30127f726c9ce2 +Author: Alan Coopersmith +Date: Tue Oct 24 17:11:48 2006 -0700 -2005-12-03 Kevin E. Martin + Add *~ to .gitignore to skip over emacs/patch backup files - * configure.ac: - Update package version number for X11R7 RC3 release. +commit a82d7b9481ffb2dc62e490fb48e72219099d8b40 +Author: Adam Jackson +Date: Fri Oct 13 16:10:28 2006 -0400 -2005-12-02 Kevin E. Martin + Bump to 1.0.2 - * configure.ac: - * src/Makefile.am: - Add check and cflags for malloc(0) returning NULL. +commit 1faa250b670e735bc4a8674ca4fa9df66626fb33 +Author: David Nusinow +Date: Sat Aug 26 18:25:16 2006 +0000 -2005-11-19 Kevin E. Martin + Fix various manpages that didn't have their section generated from + __libmansuffix__. - * xext.pc.in: - Update pkgconfig files to separate library build-time dependencies - from application build-time dependencies. +commit 9606f8ba35c568a5e9300bd9e3e2d217279c3d09 +Author: Alan Coopersmith +Date: Thu Jul 13 14:58:53 2006 -0700 -2005-11-09 Kevin E. Martin + renamed: .cvsignore -> .gitignore - * configure.ac: - Update package version number for X11R7 RC2 release. +commit 16889772a59ae778e1e8ec9c110d18c1acd38674 +Author: Adam Jackson +Date: Thu Apr 27 00:10:14 2006 +0000 -2005-11-01 Kevin E. Martin + Bump to 1.0.1 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. +commit 01e915b2775b78d461c873bac1b2787985196a5f +Author: Adam Jackson +Date: Mon Apr 3 00:55:03 2006 +0000 -2005-10-18 Kevin E. Martin + Coverity #929: Additional defensive NULL check. - * configure.ac: - Update package version number for RC1 release. +commit 1225f28f6ef0712c9adf52edd8b1a3205bbc76b2 +Author: Adam Jackson +Date: Mon Apr 3 00:51:20 2006 +0000 -2005-10-12 Kevin E. Martin + Coverity #575: Plug a leak on the error path. - * man/Makefile.am: - Add .shadows.DONE to CLEANFILES to pass distcheck +commit bd0bcd84be01052d9d1ebd075f459113ac96e9de +Author: Alan Coopersmith +Date: Sun Feb 12 18:19:21 2006 +0000 -2005-10-11 Alan Coopersmith + Bug #5628 Shadow pages + not created correctly when MANDIR & MANSUFFIX don't match. - * man/Makefile.am: - * configure.ac - Set up cpp pre-processing of man pages - Add shadow man pages for man pages that document multiple functions. +commit 33b0f4398ee48a7ec57748573871a48793dd49d9 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:29 2005 +0000 -2005-07-08 Keith Packard + Update package version number for final X11R7 release candidate. - * .cvsignore: - * man/.cvsignore: - * src/.cvsignore: - * src/Makefile.am: - Add .cvsignore files - Switch _la_CFLAGS for AM_CFLAGS to clean up directory +commit 9c6b36858dc722e8aa63afc6ad10e1378d81f9cb +Author: Kevin E Martin +Date: Tue Dec 6 22:48:43 2005 +0000 -2005-06-28 Alan Coopersmith + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - * man/Makefile.am (man3_MANS): - Add man pages for DPMS Extension calls in libXext. (Converted to - man page format by Sun doc teams based on DPMS specification docs.) - -2005-05-22 Alan Coopersmith +commit d885a4e61b8571cf7fe2b226f203b18f16de5cc1 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:43 2005 +0000 - * man/Makefile.am (man3_MANS): Change man pages to long file names + Update package version number for X11R7 RC3 release. -2005-01-29 Daniel Stone +commit f472f2feebab449d9eddd920d4313c2f37c82c41 +Author: Kevin E Martin +Date: Sat Dec 3 04:41:49 2005 +0000 - * XSync.c (wire_to_event): - Sync from X.Org HEAD -- add explicit cast to prevent warning. + Add check and cflags for malloc(0) returning NULL. -2004-11-22 Carl Worth +commit a290a2dd0022398dd70acf965bc0d9a590a71a40 +Author: Alan Coopersmith +Date: Mon Nov 28 22:03:05 2005 +0000 - * configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong - place for automake-1.9, and it was set to the default value - anyway). + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) -2004-09-19 Carlos Romero +commit 59ac6be6490072bd562d5f4447f01a5a080cf5f9 +Author: Kevin E Martin +Date: Sat Nov 19 07:15:41 2005 +0000 - * man/Makefile.am: - Include man pages in EXTRA_DIST. + Update pkgconfig files to separate library build-time dependencies from + application build-time dependencies, and update package deps to work + with separate build roots. -2004-04-13 Warren Turkal +commit d17efabf719888d7895e6cee7ff06d7ccb013676 +Author: Kevin E Martin +Date: Wed Nov 9 21:19:12 2005 +0000 - * ImUtil.h is not in the public API and is not used in any other parts - of the x packages that I can see + Update package version number for X11R7 RC2 release. -2004-04-12 Daniel Stone +commit 81bbc01afbb1c5cfb466ced2d11930ed15c942aa +Author: Kevin E Martin +Date: Tue Nov 1 15:11:51 2005 +0000 - * XSync.c: - Merge from X11R6.7 - do explicit casting. + Update pkgcheck dependencies to work with separate build roots. - * Bump version to 6.4.3 for xlibs 1.0.1. +commit 954f6a876e909a80490934b44ffc7656bb16e87a +Author: Kevin E Martin +Date: Wed Oct 19 02:48:10 2005 +0000 -2004-02-03 Jim Gettys + Update package version number for RC1 release. - * AUTHORS needed lots of research to get the authors documented +commit 31dcfdc277cef24b62ca328df9d0e9556b86fff2 +Author: Alan Coopersmith +Date: Tue Oct 18 00:00:08 2005 +0000 -2004-01-15 Daniel Stone - * Tagging release 6.4.2 for the first freedesktop.org clientside lib - release. + Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to + work better with BSD make -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. +commit ba4c273726718bbb6e7aabb9607f08cf1ac0faeb +Author: Alan Coopersmith +Date: Mon Oct 17 21:13:15 2005 +0000 + + Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a + suffix rule (reported by Matthieu Herrb) + +commit 3482953f137322896027b1bfa3dae09064270ff0 +Author: Alan Coopersmith +Date: Thu Oct 13 04:25:46 2005 +0000 + + Add generated man pages to .cvsignores + +commit 3a57856605a30b29d770571d6c734a5560215aa6 +Author: Kevin E Martin +Date: Wed Oct 12 14:04:00 2005 +0000 + + Add .shadows.DONE to CLEANFILES to pass distcheck + +commit 1c34ea842fdece6b1a8c8666c2e7fc2b803ffd89 +Author: Alan Coopersmith +Date: Tue Oct 11 23:05:30 2005 +0000 + + configure.ac Set up cpp pre-processing of man pages Add shadow man pages + for man pages that document multiple functions. + +commit 2751dbddbea70b8732081f0ad63b1b0d6791447c +Author: Alan Coopersmith +Date: Sat Sep 24 00:59:00 2005 +0000 + + Fix function prototypes to match dpms.h + +commit 78c1c4533bcbe7f4af0d700e6b7442824048e0af +Author: Alan Coopersmith +Date: Sat Jul 30 21:07:25 2005 +0000 + + Add prototypes of Xalloc/free functions. + Export ImUtil.h to match modular tree install. + Define SVR4 to 1 to avoid warning about redefining to different values. + Include missing headers to clear more compiler warnings. + +commit bc50fc0cb028ed21f919a55a2f6b82aad38d0e07 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:51 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit beb3c2e2d2122198043034b789c5ea8857fb1c10 +Author: Kevin E Martin +Date: Sat Jul 23 18:09:40 2005 +0000 + + Modify modular libs to use Xregion.h instead of region.h + +commit 5413d41389ce8dc1b93039b557385bf6e7477cf8 +Author: Kevin E Martin +Date: Sat Jul 23 18:06:16 2005 +0000 + + lib/Xrender/Picture.c Change region.h to Xregion.h and modify internal + references to include . + +commit df6e6114ddef0f7facd8417f1a78ceca25cf9cb6 +Author: Daniel Stone +Date: Sat Jul 16 07:04:25 2005 +0000 + + Set Xext soversion to 6.4.0 per default. + +commit 4b8f4b7e6085a34d081a3c9057d34fa6f8030125 +Author: Alan Coopersmith +Date: Fri Jul 15 17:17:10 2005 +0000 + + Set .so versions correctly for Solaris and recent OpenBSD releases + +commit 4f16d4cf4ddac8709e0ab6612239287c9469c753 +Author: Keith Packard +Date: Sat Jul 9 06:17:03 2005 +0000 + + Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory + +commit 1533ef4bfd436df164979ff5e79491edbb086d94 +Author: Alan Coopersmith +Date: Tue Jun 28 23:32:40 2005 +0000 + + Add man pages for DPMS Extension calls in libXext. (Converted to man page + format by Sun doc teams based on DPMS specification docs.) + +commit 8d8d049eca980869cc1df5e48f992e8a8de2e49b +Author: Alan Coopersmith +Date: Tue Jun 28 23:21:40 2005 +0000 + + Add man pages for DPMS Extension calls in libXext. (Converted to man page + format by Sun doc teams based on DPMS specification docs.) + +commit f4c9f37c88bf2e08d57abc2c1ecf31fb7223cb02 +Author: Alan Coopersmith +Date: Sun May 22 19:05:11 2005 +0000 + + Convert man pages to long file names in lib/X11, lib/Xt, & lib/Xext + +commit 1706d249d70a5045530ec9aee5ac9c51e00a7f93 +Author: Adam Jackson +Date: Thu May 19 00:22:32 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit f8bdfbae1846ea01877cedd7ea836eaa289ecbe6 +Author: Adam Jackson +Date: Thu May 19 00:10:07 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit dc7cb253ba14b78ef0f863995bd0fc5a6a0ee017 +Author: Søren Sandmann Pedersen +Date: Wed May 18 18:52:39 2005 +0000 + + - Link Xext to /lib/Xext/src rather than /lib/Xext + - Conditionally include config.h in Xext source + - Remove unnecessary include of ImUtil.h from XShm.c + +commit 279e13a6a36bfeb3c8aa4272fdd6d4bcef9723a6 +Author: Søren Sandmann Pedersen +Date: Wed May 18 18:50:58 2005 +0000 + + Add man/Makefile.am and src/Makefile.am + +commit 3dde0d733cad58f01c3d667d7e6bc0dd6ca40608 +Author: Søren Sandmann Pedersen +Date: Wed May 18 18:50:23 2005 +0000 + + - Add build system for Xext + +commit d7dfac923b491ade943977e6949e40794bdc722f +Author: Alexander Gottwald +Date: Fri Feb 18 12:29:55 2005 +0000 + + Bugzilla #2570 (https://bugs.freedesktop.org/show_bug.cgi?id=2570) + attachment #1930 (https://bugs.freedesktop.org/attachment.cgi?id=1930): + fixes build of libXext on mingw + +commit f6ae96f7a0d7cd5f36536b030563369801a1faba +Author: Alan Coopersmith +Date: Sat Jan 22 05:12:08 2005 +0000 + + Add man pages for TOG-CUP extension functions. (Converted to man page + format by Sun based on TOG-CUP specification docs.) + +commit 989a1ba0ea890190988b86b4570376cd07ed49ea +Author: Adam Jackson +Date: Fri Sep 24 03:46:28 2004 +0000 + + Bug #1434: Convert lib/Xext to ANSI function prototypes (Jeff Muizelaar). + +commit 6a810dfc8f3797a833539c3092bc585a25995192 +Author: Egbert Eich +Date: Fri Apr 23 18:43:41 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit b3efb5deb1d9450351760545960d6cea63425ebe +Author: Egbert Eich +Date: Sun Mar 14 08:32:07 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit b0aeb370a60a2034a92957278e110fadbabfc042 +Author: Egbert Eich +Date: Wed Mar 3 12:11:28 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 0e02a1b3add5b25b9668bc28136ca4ccca92ace8 +Author: Egbert Eich +Date: Thu Feb 26 13:35:33 2004 +0000 + + readding XFree86's cvs IDs + +commit 40996c108cd47b63e433f39b32435401fd429d7f +Author: Egbert Eich +Date: Thu Feb 26 09:22:42 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 1d27856035fac5f390ad1e475f4a7f9082792899 +Author: Kaleb Keithley +Date: Thu Dec 4 22:01:36 2003 +0000 + + XFree86 4.3.99.901 (RC 1) + +commit c0ca603fd38f805d5f53490ec6fb8b5e7f813954 +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:09 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 6b0dceb5b6027c98e478467576cf61aee1d87074 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:48 2003 +0000 + + XFree86 4.3.0.1 + +commit 0d3d2607404af7f6e059fab64caea39dc34e391e +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:38 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/lib/libXext/Makefile.am b/lib/libXext/Makefile.am index 79c5a9d84..0ee00952d 100644 --- a/lib/libXext/Makefile.am +++ b/lib/libXext/Makefile.am @@ -3,4 +3,11 @@ SUBDIRS = man src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xext.pc -EXTRA_DIST=xext.pc.in +EXTRA_DIST=xext.pc.in ChangeLog autogen.sh +MAINTAINERCLEANFILES=ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + diff --git a/lib/libXext/autogen.sh b/lib/libXext/autogen.sh new file mode 100644 index 000000000..904cd6746 --- /dev/null +++ b/lib/libXext/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/lib/libXext/config.h.in b/lib/libXext/config.h.in index 09ee04cec..14da6e208 100644 --- a/lib/libXext/config.h.in +++ b/lib/libXext/config.h.in @@ -48,6 +48,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/lib/libXext/configure.ac b/lib/libXext/configure.ac index 18b2b17bf..bb595e623 100644 --- a/lib/libXext/configure.ac +++ b/lib/libXext/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([libXext], - 1.0.2, + 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXext) diff --git a/lib/libXext/man/Makefile.am b/lib/libXext/man/Makefile.am index fab78865b..20f333c38 100644 --- a/lib/libXext/man/Makefile.am +++ b/lib/libXext/man/Makefile.am @@ -14,6 +14,7 @@ libman_PRE = \ DPMSQueryExtension.man \ DPMSSetTimeouts.man \ XShape.man \ + XShm.man \ XcupGetReservedColormapEntries.man \ XcupQueryVersion.man \ XcupStoreColors.man \ @@ -31,11 +32,13 @@ libman_PRE = \ XShape_man_aliases = XShapeQueryExtension XShapeQueryVersion XShapeCombineRegion XShapeCombineRectangles XShapeCombineMask XShapeCombineShape XShapeOffsetShape XShapeQueryExtents XShapeSelectInput XShapeInputSelected XShapeGetRectangles +XShm_man_aliases = XShmQueryExtension XShmQueryVersion XShmPixmapFormat XShmAttach XShmDetach XShmCreateImage XShmPutImage XShmGetImage XShmCreatePixmap XShmGetEventBase + Xmbuf_man_aliases = XmbufQueryExtension XmbufGetVersion XmbufCreateBuffers XmbufDestroyBuffers XmbufDisplayBuffers XmbufGetWindowAttributes XmbufChangeWindowAttributes XmbufGetBufferAttributes XmbufChangeBufferAttributes XmbufGetScreenInfo XmbufCreateStereoWindow Xevi_man_aliases = XeviQueryVersion XeviGetVisualInfo XeviQueryExtension -all_aliases = $(XShape_man_aliases) $(Xmbuf_man_aliases) $(Xevi_man_aliases) +all_aliases = $(XShape_man_aliases) $(XShm_man_aliases) $(Xmbuf_man_aliases) $(Xevi_man_aliases) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(all_aliases:=.@LIB_MAN_SUFFIX@) @@ -52,6 +55,9 @@ shadows.DONE: (for i in $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \ echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $$i; \ done) + (for i in $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \ + echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $$i; \ + done) (for i in $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $$i; \ done) diff --git a/lib/libXext/man/XShape.man b/lib/libXext/man/XShape.man index 9cf28a112..408e24adb 100644 --- a/lib/libXext/man/XShape.man +++ b/lib/libXext/man/XShape.man @@ -133,7 +133,7 @@ XRectangle *XShapeGetRectangles ( typedef struct { int type; /\(** of event */ unsigned long serial; /\(** # of last request processed by server */ - Bool send_event; /\(** true if this came frome a SendEvent request */ + Bool send_event; /\(** true if this came from a SendEvent request */ Display *display; /\(** Display the event was read from */ Window window; /\(** window of event */ int kind; /\(** ShapeBounding or ShapeClip */ diff --git a/lib/libXext/man/XShm.man b/lib/libXext/man/XShm.man new file mode 100644 index 000000000..2961e44f2 --- /dev/null +++ b/lib/libXext/man/XShm.man @@ -0,0 +1,202 @@ +.\" Copyright (c) 1991 X Consortium +.\" +.\" 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 furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice 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 X CONSORTIUM 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. +.\" +.\" Except as contained in this notice, the name of the X Consortium shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from the +.\" X Consortium. +.\" +.\" Copyright 2006 Sun Microsystems, Inc. All Rights Reserved +.\" +.\" 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 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 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. +.\" +.\" Except as contained in this notice, the names of the copyright holders +.\" shall not be used in advertising or otherwise to promote the sale, use +.\" or other dealings in this Software without prior written authorization +.\" from said copyright holders. +.\" +.\" X Window System is a trademark of The Open Group. +.\" +.de ZN +.ie t \fB\^\\$1\^\fR\\$2 +.el \fI\^\\$1\^\fP\\$2 +.. +.TH XShm __libmansuffix__ __xorgversion__ "X FUNCTIONS" +.SH NAME +XShmQueryExtension, XShmQueryVersion, XShmPixmapFormat, XShmAttach, XShmDetach +XShmCreateImage, XShmPutImage, XShmGetImage, XShmCreatePixmap, XShmGetEventBase - X Shared Memory extension functions +.SH SYNTAX +.nf +.LP +\&#include +\&#include +\&#include +\&#include +.LP +Bool XShmQueryExtension( + Display *display); +.LP +Bool XShmQueryVersion( + Display *display; + int *major, *minor; + Bool *pixmaps); +.LP +Status XShmPixmapFormat( + Display *display); +.LP +Status XShmAttach( + Display *display; + XShmSegmentInfo *shminfo); +.LP +Status XShmDetach( + Display *display; + XShmSegmentInfo *shminfo); + +.LP +XImage *XShmCreateImage ( + Display *display; + Visual *visual; + unsigned int depth, width, height; + int format; + char *data; + XShmSegmentInfo *shminfo); +.LP +Status XShmPutImage( + Display *display; + Drawable d; + GC gc; + XImage *image; + int src_x, src_y, dest_x, dest_y; + unsigned int width, height; + bool send_event); +.LP +Status XShmGetImage ( + Display *display; + Drawable d; + XImage *image; + int x, y; + unsigned long plane_mask); +.LP +Pixmap XShmCreatePixmap( + Display *display; + Drawable d; + char *data; + XShmSegmentInfo *shminfo; + unsigned int width, height, depth); +.LP +Status XShmGetEventBase( + Display *display); +.LP + +.fi +.SH STRUCTURES +.nf +.ta 3i +\fIEvents:\fP +typedef struct { + int type; /\\(* of event */ + unsigned long serial; /\\(* # of last request processed by server*/ + Bool send_event; /\\(* true if this came from a SendEvent request*/ + Display *display; /\\(* Display the event was read from */ + Drawable drawable; /\\(* drawable of request */ + int major_code; /\\(* ShmReqCode */ + int minor_code; /\\(* X_ShmPutImage */ + ShmSeg shmseg; /\\(* the ShmSeg used in the request*/ + unsigned long offset; /\\(* the offset into ShmSeg used in the request*/ +} XShmCompletionEvent; +.LP +\fIa structure of type XShmSegmentInfo :\fP + +typedef struct { + ShmSeg shmseg; /\\(* resource id */ + int shmid; /\\(* kernel id */ + char *shmaddr; /\\(* address in client */ + Bool readOnly; /\\(* how the server should attach it */ +} XShmSegmentInfo; + +.SH DESCRIPTION +.PP +.PP +.ZN XShmQueryExtension +checks to see if the shared memory extensions are available for the +specified display. +.PP +.ZN XShmQueryVersion +returns the version numbers of the extension implementation. Shared +memory pixmaps are supported if the pixmaps argument returns true. +.PP +.ZN XShmAttach +tells the server to attach to your shared memory segment. If all goes +well, you will get a non-zero status, back and your XImage is ready +for use. +.PP +.ZN XShmDetach +tells the server to detach from your shared memory segment. +.PP +.ZN XShmPutImage +combines an image in memory with a shape of the specified drawable. If +XYBitmap format is used, the depth must be one, or a ``BadMatch'' +error results. The foreground pixel in the GC defines the source for +the one bits in the image, and the background pixel defines the source +for the zero bits. For XYPixmap and ZPixmap, the depth must match the +depth of the drawable, or a ``BadMatch'' error results. +.PP +.ZN XShmGetImage +reads image data into a shared memory XImage where display is the +display of interest, drawable is the source drawable, image is the +destination XImage, x and y are offsets within the drawable, and +plane_mask defines which planes are to be read. +.PP +.ZN XShmCreateImage +allocates the memory needed for an XImage structure for the specified +display but does not allocate space for the image itself. +.PP +.ZN XShmPixmapFormat +gets the format for the server. If your application can deal with the +server pixmap data format, a shared memory segment and shminfo +structure are created. +.PP +.ZN XShmCreatePixmap +points to a pixmap which you can manipulate in all of the usual ways, +with the added bonus of being able to edit its contents directly +through the shared memory segment. +.PP +.ZN XShmGetEventBase +gets the completion event value. +.PP +.SH SEE ALSO +\fIMIT-SHM - The MIT Shared Memory Extension \fP diff --git a/lib/libXext/man/Xmbuf.man b/lib/libXext/man/Xmbuf.man index c4b26b47d..ec720275e 100644 --- a/lib/libXext/man/Xmbuf.man +++ b/lib/libXext/man/Xmbuf.man @@ -132,7 +132,7 @@ Window XmbufCreateStereoWindow( typedef struct { int type; /\(** of event */ unsigned long serial; /\(** # of last request processed by server */ - int send_event; /\(** true if this came frome a SendEvent request */ + int send_event; /\(** true if this came from a SendEvent request */ Display *display; /\(** Display the event was read from */ Multibuffer buffer; /\(** buffer of event */ int state; /\(** see Clobbered constants above */ @@ -141,7 +141,7 @@ typedef struct { typedef struct { int type; /\(** of event */ unsigned long serial; /\(** # of last request processed by server */ - int send_event; /\(** true if this came frome a SendEvent request */ + int send_event; /\(** true if this came from a SendEvent request */ Display *display; /\(** Display the event was read from */ Multibuffer buffer; /\(** buffer of event */ } XmbufUpdateNotifyEvent; @@ -176,7 +176,7 @@ typedef struct { .LP \fIPer-screen buffer info (there will be lists of them):\fP typedef struct { - VisualID visualid; /\(** visual usuable at this depth */ + VisualID visualid; /\(** visual usable at this depth */ int max_buffers; /\(** most buffers for this visual */ int depth; /\(** depth of buffers to be created */ } XmbufBufferInfo; @@ -231,7 +231,7 @@ with the given window. displays the indicated buffers their appropriate windows within max_delay milliseconds after min_delay milliseconds have passed. -No two buffers may be associated with the same window or else a Matc +No two buffers may be associated with the same window or else a Match error is generated. .PP .ZN XmbufGetWindowAttributes