diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-15 13:46:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-15 13:46:59 +1000 |
| commit | eaf0b6a4d83d49930d21d5191f335fcac962632e (patch) | |
| tree | b158918ee5a1d9a18fbaa0a12f0807d0828c43a8 /doc | |
| parent | 693e92d4049ee76d074737480f3fc1bb236f4278 (diff) | |
| parent | 23229c7ce5970516b97a1cc12e65257ff65ab9a7 (diff) | |
Merge branch 'master' into input-api
Conflicts:
config/udev.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86Module.h
hw/xfree86/common/xf86Xinput.h
hw/xfree86/os-support/linux/lnx_init.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/xml/Xserver-spec.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/xml/Xserver-spec.xml b/doc/xml/Xserver-spec.xml index ec7f1b77b..62992826f 100644 --- a/doc/xml/Xserver-spec.xml +++ b/doc/xml/Xserver-spec.xml @@ -4831,16 +4831,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: |