aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/doc/xml/Xserver-spec.xml
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-27 11:49:20 +0000
committermarha <marha@users.sourceforge.net>2010-09-27 11:49:20 +0000
commitf331b3c351021681044b2594d1ec5b49bd8edb47 (patch)
tree3f593072cd3390f173857a4d0484938aed8863c1 /xorg-server/doc/xml/Xserver-spec.xml
parent4e512860d6f0a7644ae3872d91edafa9040f608a (diff)
parent84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (diff)
downloadvcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.gz
vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.bz2
vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/doc/xml/Xserver-spec.xml')
-rw-r--r--xorg-server/doc/xml/Xserver-spec.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/doc/xml/Xserver-spec.xml b/xorg-server/doc/xml/Xserver-spec.xml
index c8168f4f0..3bea5e968 100644
--- a/xorg-server/doc/xml/Xserver-spec.xml
+++ b/xorg-server/doc/xml/Xserver-spec.xml
@@ -4854,16 +4854,16 @@ If the function is called more than once on the same key, all calls must use
the same value for <type>size</type> or the server will abort.</para>
<para>
-To request private space and have the server manage the key, use
+To request per-screen private space in an object, use
<blockquote><programlisting>
- DevPrivateKey dixCreatePrivateKey(DevPrivateType type, unsigned size);
+ Bool dixRegisterScreenPrivateKey(DevScreenPrivateKey key, ScreenPtr pScreen, DevPrivateType type, unsigned size);
</programlisting></blockquote>
The <parameter>type</parameter> and <parameter>size</parameter> arguments are
the same as those to <function>dixRegisterPrivateKey</function> but this
-function allocates a <type>DevPrivateKeyRec</type> and returns a pointer to it
-instead of requiring the caller to pass a pointer to an existing structure.
-The server will free it automatically when the privates system is restarted
-at server reset time.</para>
+function ensures the given <parameter>key</parameter> exists on objects of
+the specified type with distinct storage for the given
+<parameter>pScreen</parameter>. The key is usable on ScreenPrivate variants
+that are otherwise equivalent to the following Private functions.</para>
<para>
To attach a piece of private data to an object, use: