[PATCH 04/15] xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API break)

Alan Coopersmith alan.coopersmith at oracle.com
Tue Apr 10 08:43:42 PDT 2012


On 04/10/12 07:47 AM, Dave Airlie wrote:
> Instead of passing an index, pass the actual ScreenPtr. This allows
> more moving towards not abusing xf86Screens + screenInfo.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>

This should include the matching doc update:

diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index 2b11828..a5b3449 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -688,14 +688,14 @@ The DIX BlockHandler() iterates through the Screens,  for
 its BlockHandler.  A BlockHandler is declared thus:
 <blockquote>
 <programlisting>
-       void xxxBlockHandler(nscreen, pbdata, pptv, pReadmask)
-               int nscreen;
+       void xxxBlockHandler(pScreen, pbdata, pptv, pReadmask)
+               ScreenPtr pScreen;
                pointer pbdata;
                struct timeval ** pptv;
                pointer pReadmask;
 </programlisting>
 </blockquote>
-The arguments are the index of the Screen,  the blockData field
+The arguments are the pointer to the Screen,  the blockData field
 of the Screen,  and the arguments to the DIX BlockHandler().
 </para>
 <para>
@@ -721,14 +721,14 @@ The DIX WakeupHandler() calls each Screen's
 WakeupHandler.  A WakeupHandler is declared thus:
 <blockquote>
 <programlisting>
-       void xxxWakeupHandler(nscreen, pbdata, err, pReadmask)
-               int nscreen;
+       void xxxWakeupHandler(pScreen, pbdata, err, pReadmask)
+               ScreenPtr pScreen;
                pointer pbdata;
                unsigned long result;
                pointer pReadmask;
 </programlisting>
 </blockquote>
-The arguments are the index of the Screen,  the blockData field
+The arguments are the pointer to the Screen,  the blockData field
 of the Screen,  and the arguments to the DIX WakeupHandler().
 </para>
 <para>


(Yes, we need to ansify the function prototypes in that doc still.
 Just one of the many areas we fail at server-side API docs.)


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc


More information about the xorg-devel mailing list