From bca7e7a0238505d2c350265b57e5a1e59c7b1ec1 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Sat, 13 Jul 2013 14:07:01 -0700
Subject: [PATCH] xorg, work on driver

---
 xorg/server/module/Makefile   | 2 +-
 xorg/server/readme.txt        | 2 +-
 xorg/server/xrdpdev/Makefile  | 3 +--
 xorg/server/xrdpdev/xorg.conf | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xorg/server/module/Makefile b/xorg/server/module/Makefile
index cb2439fa..f2442c82 100644
--- a/xorg/server/module/Makefile
+++ b/xorg/server/module/Makefile
@@ -5,7 +5,7 @@ rdpPolyRectangle.o rdpPolyArc.o rdpFillPolygon.o rdpPolyFillRect.o \
 rdpPolyFillArc.o rdpPolyText8.o rdpPolyText16.o rdpImageText8.o \
 rdpImageText16.o rdpImageGlyphBlt.o rdpPolyGlyphBlt.o rdpPushPixels.o
 
-CFLAGS = -O2 -Wall -I/usr/include/xorg -I/usr/include/pixman-1
+CFLAGS = -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1
 
 LDFLAGS =
 
diff --git a/xorg/server/readme.txt b/xorg/server/readme.txt
index f9380ef7..3c607e85 100644
--- a/xorg/server/readme.txt
+++ b/xorg/server/readme.txt
@@ -7,5 +7,5 @@ to run it
 create /etc/X11/xrdp
 copy xorg.conf into it
 
-Xorg -config xrdp/xorg.conf -logfile /tmp/Xjay.log :10
+Xorg -config xrdp/xorg.conf -logfile /tmp/Xjay.log -novtswitch -sharevts -noreset :10
 
diff --git a/xorg/server/xrdpdev/Makefile b/xorg/server/xrdpdev/Makefile
index 1e97b94f..1c680268 100644
--- a/xorg/server/xrdpdev/Makefile
+++ b/xorg/server/xrdpdev/Makefile
@@ -1,7 +1,7 @@
 
 OBJS = xrdpdev.o
 
-CFLAGS = -O2 -Wall -I/usr/include/xorg -I/usr/include/pixman-1 -I../module
+CFLAGS = -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1 -I../module
 
 LDFLAGS =
 
@@ -14,4 +14,3 @@ xrdpdev_drv.so: $(OBJS) Makefile
 
 clean:
 	rm -f $(OBJS) xrdpdev_drv.so
-
diff --git a/xorg/server/xrdpdev/xorg.conf b/xorg/server/xrdpdev/xorg.conf
index 9cda5d4d..a44c92dd 100644
--- a/xorg/server/xrdpdev/xorg.conf
+++ b/xorg/server/xrdpdev/xorg.conf
@@ -6,9 +6,9 @@ Section "ServerLayout"
     InputDevice "xrdpKeyboard" "CoreKeyboard"
 EndSection
 
-Section "ServerFlags"
-    Option "DontVTSwitch" "on"
-EndSection
+#Section "ServerFlags"
+#    Option "DontVTSwitch" "on"
+#EndSection
 
 Section "Files"
     FontPath "/usr/X11R6/lib/X11/fonts/misc/:unscaled"
@@ -51,7 +51,7 @@ Section "Monitor"
 EndSection
 
 Section "Device"
-    Identifier	"Video Card (xrdpdev)"
+    Identifier "Video Card (xrdpdev)"
     Driver "xrdpdev"
 EndSection