xorg driver, include cleanup

18 files changed, 159 insertions, 65 deletions

diff --git a/xorg/server/module/rdpCopyArea.c b/xorg/server/module/rdpCopyArea.c
index dd32644e..145cb511 100644
--- a/xorg/server/module/rdpCopyArea.c
+++ b/xorg/server/module/rdpCopyArea.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpCopyPlane.c b/xorg/server/module/rdpCopyPlane.c
index 9b89125c..51f67eb3 100644
--- a/xorg/server/module/rdpCopyPlane.c
+++ b/xorg/server/module/rdpCopyPlane.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpFillPolygon.c b/xorg/server/module/rdpFillPolygon.c
index 38043c0b..c9d48a77 100644
--- a/xorg/server/module/rdpFillPolygon.c
+++ b/xorg/server/module/rdpFillPolygon.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpInput.h b/xorg/server/module/rdpInput.h
index 91da3fcb..f41a1025 100644
--- a/xorg/server/module/rdpInput.h
+++ b/xorg/server/module/rdpInput.h
@@ -37,5 +37,7 @@ rdpInputKeyboardEvent(int msg, long param1, long param2,
 int
 rdpInputMouseEvent(int msg, long param1, long param2,
                    long param3, long param4);
+int
+rdpInputInit(void);
 
 #endif
diff --git a/xorg/server/module/rdpMain.c b/xorg/server/module/rdpMain.c
index 713f5549..f68bcef3 100644
--- a/xorg/server/module/rdpMain.c
+++ b/xorg/server/module/rdpMain.c
@@ -38,6 +38,7 @@ rdp module main
 #include <mi.h>
 
 #include "rdp.h"
+#include "rdpInput.h"
 
 /******************************************************************************/
 #define LOG_LEVEL 1
diff --git a/xorg/server/module/rdpPolyArc.c b/xorg/server/module/rdpPolyArc.c
index 63fc699b..126bf48f 100644
--- a/xorg/server/module/rdpPolyArc.c
+++ b/xorg/server/module/rdpPolyArc.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyFillArc.c b/xorg/server/module/rdpPolyFillArc.c
index b53a1131..dc2437d1 100644
--- a/xorg/server/module/rdpPolyFillArc.c
+++ b/xorg/server/module/rdpPolyFillArc.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyFillRect.c b/xorg/server/module/rdpPolyFillRect.c
index dc929f9f..58626514 100644
--- a/xorg/server/module/rdpPolyFillRect.c
+++ b/xorg/server/module/rdpPolyFillRect.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyGlyphBlt.c b/xorg/server/module/rdpPolyGlyphBlt.c
index 5265ed72..44e4b188 100644
--- a/xorg/server/module/rdpPolyGlyphBlt.c
+++ b/xorg/server/module/rdpPolyGlyphBlt.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyPoint.c b/xorg/server/module/rdpPolyPoint.c
index 6c9c77c1..da0231a7 100644
--- a/xorg/server/module/rdpPolyPoint.c
+++ b/xorg/server/module/rdpPolyPoint.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyRectangle.c b/xorg/server/module/rdpPolyRectangle.c
index e80b8178..c52dfcb4 100644
--- a/xorg/server/module/rdpPolyRectangle.c
+++ b/xorg/server/module/rdpPolyRectangle.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolySegment.c b/xorg/server/module/rdpPolySegment.c
index f4a9d40c..31d60121 100644
--- a/xorg/server/module/rdpPolySegment.c
+++ b/xorg/server/module/rdpPolySegment.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyText16.c b/xorg/server/module/rdpPolyText16.c
index b5eac8c5..2fd43b1f 100644
--- a/xorg/server/module/rdpPolyText16.c
+++ b/xorg/server/module/rdpPolyText16.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolyText8.c b/xorg/server/module/rdpPolyText8.c
index 8931a4c1..979a7332 100644
--- a/xorg/server/module/rdpPolyText8.c
+++ b/xorg/server/module/rdpPolyText8.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpPolylines.c b/xorg/server/module/rdpPolylines.c
index b439db28..a86e9fc4 100644
--- a/xorg/server/module/rdpPolylines.c
+++ b/xorg/server/module/rdpPolylines.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/module/rdpRandR.c b/xorg/server/module/rdpRandR.c
index fd080184..2255d33a 100644
--- a/xorg/server/module/rdpRandR.c
+++ b/xorg/server/module/rdpRandR.c
@@ -69,29 +69,8 @@ Bool
 rdpRRSetConfig(ScreenPtr pScreen, Rotation rotateKind, int rate,
                RRScreenSizePtr pSize)
 {
-    ScrnInfoPtr pScrn;
-    rdpPtr dev;
-    rrScrPrivPtr pRRScrPriv;
-    Bool rv;
-
     LLOGLN(0, ("rdpRRSetConfig:"));
-    rv = TRUE;
-    pScrn = xf86Screens[pScreen->myNum];
-    dev = XRDPPTR(pScrn);
-#if 0
-    pRRScrPriv = rrGetScrPriv(pScreen);
-    if (pRRScrPriv != 0)
-    {
-        if (dev->rrSetConfig != 0)
-        {
-            LLOGLN(0, ("rdpRRSetConfig: here"));
-            pRRScrPriv->rrSetConfig = dev->rrSetConfig;
-            rv = pRRScrPriv->rrSetConfig(pScreen, rotateKind, rate, pSize);
-            pRRScrPriv->rrSetConfig = rdpRRSetConfig;
-        }
-    }
-#endif
-    return rv;
+    return TRUE;
 }
 
 /******************************************************************************/
@@ -102,32 +81,15 @@ rdpRRGetInfo(ScreenPtr pScreen, Rotation *pRotations)
     int height;
     ScrnInfoPtr pScrn;
     rdpPtr dev;
-    rrScrPrivPtr pRRScrPriv;
-    Bool rv;
 
     LLOGLN(0, ("rdpRRGetInfo:"));
-    rv = TRUE;
     pScrn = xf86Screens[pScreen->myNum];
     dev = XRDPPTR(pScrn);
-#if 0
-    pRRScrPriv = rrGetScrPriv(pScreen);
-    if (pRRScrPriv != 0)
-    {
-        if (dev->rrGetInfo != 0)
-        {
-            LLOGLN(0, ("rdpRRGetInfo: here"));
-            pRRScrPriv->rrGetInfo = dev->rrGetInfo;
-            rv = pRRScrPriv->rrGetInfo(pScreen, pRotations);
-            pRRScrPriv->rrGetInfo = rdpRRGetInfo;
-        }
-    }
-#else
     *pRotations = RR_Rotate_0;
     width = dev->width;
     height = dev->height;
     rdpRRRegisterSize(pScreen, width, height);
-#endif
-    return rv;
+    return TRUE;
 }
 
 /******************************************************************************/
diff --git a/xorg/server/module/rdpSetSpans.c b/xorg/server/module/rdpSetSpans.c
index 1bd9ed80..130306d3 100644
--- a/xorg/server/module/rdpSetSpans.c
+++ b/xorg/server/module/rdpSetSpans.c
@@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* this should be before all X11 .h files */
+#include <xorg-server.h>
+
+/* all driver need this */
+#include <xf86.h>
+#include <xf86_OSproc.h>
+
 #include "rdp.h"
 #include "rdpDraw.h"
 
diff --git a/xorg/server/xrdpkeyb/rdpKeyboard.c b/xorg/server/xrdpkeyb/rdpKeyboard.c
index 33894d88..572dc24d 100644
--- a/xorg/server/xrdpkeyb/rdpKeyboard.c
+++ b/xorg/server/xrdpkeyb/rdpKeyboard.c
@@ -55,13 +55,6 @@ static int g_tab_down = 0;
    above *_down vars */
 static int g_scroll_lock_down = 0;
 
-/* if 1, a keystroke is done every minute, down, then up */
-#define XRDPKB_TEST 0
-
-#if XRDPKB_TEST
-static OsTimerPtr g_timer = 0;
-#endif
-
 /******************************************************************************/
 #define LOG_LEVEL 1
 #define LLOGLN(_level, _args) \
@@ -517,21 +510,6 @@ rdpInputKeyboard(int msg, long param1, long param2, long param3, long param4)
     return 0;
 }
 
-#if XRDPKB_TEST
-/******************************************************************************/
-static CARD32
-rdpDeferredUpdateCallback(OsTimerPtr timer, CARD32 now, pointer arg)
-{
-    LLOGLN(0, ("rdpDeferredUpdateCallback:"));
-
-    rdpEnqueueKey(KeyPress, 115);
-    rdpEnqueueKey(KeyRelease, 115);
-
-    g_timer = TimerSet(g_timer, 0, 1000, rdpDeferredUpdateCallback, 0);
-    return 0;
-}
-#endif
-
 /******************************************************************************/
 void
 rdpkeybDeviceInit(DeviceIntPtr pDevice, KeySymsPtr pKeySyms, CARD8 *pModMap)
@@ -637,9 +615,6 @@ rdpkeybControl(DeviceIntPtr device, int what)
                                      rdpkeybChangeKeyboardControl);
             g_keyboard = device;
             rdpRegisterInputCallback(0, rdpInputKeyboard);
-#if XRDPKB_TEST
-            g_timer = TimerSet(g_timer, 0, 1000, rdpDeferredUpdateCallback, 0);
-#endif
             break;
         case DEVICE_ON:
             pDev->on = 1;