svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

3 files changed, 2 insertions, 33 deletions

diff --git a/xorg-server/doc/Xserver.man.pre b/xorg-server/doc/Xserver.man.pre
index 4926960c2..2fc5541fc 100644
--- a/xorg-server/doc/Xserver.man.pre
+++ b/xorg-server/doc/Xserver.man.pre
@@ -285,14 +285,6 @@ sets the stack space limit of the server to the specified number of kilobytes.
 A value of zero makes the stack size as large as possible.  The default value

 of \-1 leaves the stack space limit unchanged.

 .TP 8

-.B \-logo

-turns on the X Window System logo display in the screen-saver.

-There is currently no way to change this from a client.

-.TP 8

-.B nologo

-turns off the X Window System logo display in the screen-saver.

-There is currently no way to change this from a client.

-.TP 8

 .B \-render 

 .BR default | mono | gray | color

 sets the color allocation policy that will be used by the render extension.

diff --git a/xorg-server/doc/xml/Xserver-spec.xml b/xorg-server/doc/xml/Xserver-spec.xml
index 3bea5e968..1b216ce8d 100644
--- a/xorg-server/doc/xml/Xserver-spec.xml
+++ b/xorg-server/doc/xml/Xserver-spec.xml
@@ -1710,8 +1710,6 @@ Input initialization is a bit complicated.
 It all starts with InitInput(), a routine that you write to call

 AddInputDevice() twice

 (once for pointing device and once for keyboard.)

-You also want to call RegisterKeyboardDevice() and RegisterPointerDevice()

-on them.

 </para>

 <para>

 When you Add the devices, a routine you supply for each device

@@ -1731,8 +1729,6 @@ the pointer is the pointer.
 InitInput is a DDX routine you must write to initialize the

 input subsystem in DDX.

 It must call AddInputDevice() for each device that might generate events.

-In addition, you must register the main keyboard and pointing devices by

-calling RegisterPointerDevice() and RegisterKeyboardDevice().

 </para>

 <para>

 <blockquote><programlisting>

@@ -1755,25 +1751,6 @@ Note also that except for the main keyboard and pointing device,
 an extension is needed to provide for a client interface to a device.

 </para>

 <para>

-<blockquote><programlisting>

-

-	void RegisterPointerDevice(device)

-		DevicePtr device;

-</programlisting></blockquote>

-RegisterPointerDevice is a DIX routine that your DDX code calls that

-makes that device the main pointing device.

-This routine is called once upon initialization and cannot be called again.

-</para>

-<para>

-<blockquote><programlisting>

-

-	void RegisterKeyboardDevice(device)

-		DevicePtr device;

-</programlisting></blockquote>

-RegisterKeyboardDevice makes the given device the main keyboard.

-This routine is called once upon initialization and cannot be called again.

-</para>

-<para>

 The following DIX

 procedures return the specified DevicePtr. They may or may not be useful

 to DDX implementors.

@@ -5163,8 +5140,6 @@ mi and fb implementations.</para>
 	      </row>

 	    </thead>

 	    <tbody>

-<row><entry><function>RegisterKeyboardDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

-<row><entry><function>RegisterPointerDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

 <row><entry><function>RemoveEnabledDevice</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>

 <row><entry><function>ResetCurrentRequest</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>

 <row><entry><function>SaveScreen</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>

diff --git a/xorg-server/doc/xml/dtrace/Makefile.am b/xorg-server/doc/xml/dtrace/Makefile.am
index 946fba7d8..dc6127416 100644
--- a/xorg-server/doc/xml/dtrace/Makefile.am
+++ b/xorg-server/doc/xml/dtrace/Makefile.am
@@ -25,11 +25,13 @@ XML_FILES = Xserver-DTrace.xml
 

 include ../xmlrules.in

 

+if ENABLE_DOCS

 if XSERVER_DTRACE

 doc_DATA = $(BUILT_DOC_FILES)

 else

 noinst_DATA = $(BUILT_DOC_FILES)

 endif

+endif

 

 CLEANFILES = $(CLEAN_DOC_FILES)