summaryrefslogtreecommitdiffstats
path: root/xorg/server
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2013-07-14 13:44:17 -0700
committerJay Sorg <jay.sorg@gmail.com>2013-07-14 13:44:17 -0700
commitd53588b683a3d2ad4db43ff4564b31187d9455e6 (patch)
treef56552c03c9f81c77ed7cfca57f82af50789900f /xorg/server
parentbe53b52102c02ffed43d89b082ecf7bf2e612416 (diff)
downloadxrdp-proprietary-d53588b683a3d2ad4db43ff4564b31187d9455e6.tar.gz
xrdp-proprietary-d53588b683a3d2ad4db43ff4564b31187d9455e6.zip
xorg driver, fix for older xorg-server and added some notes
Diffstat (limited to 'xorg/server')
-rw-r--r--xorg/server/readme.txt8
-rw-r--r--xorg/server/xrdpdev/xrdpdev.c4
2 files changed, 12 insertions, 0 deletions
diff --git a/xorg/server/readme.txt b/xorg/server/readme.txt
index 6fc3aca6..11e81e1e 100644
--- a/xorg/server/readme.txt
+++ b/xorg/server/readme.txt
@@ -16,3 +16,11 @@ copy xrdpkeyb_drv.so to /usr/lib/xorg/modules/input
strat xserver like this
Xorg -modulepath /usr/lib/xorg/modules -config xrdp/xorg.conf -logfile /tmp/Xjay.log -novtswitch -sharevts -noreset -nohwaccess -ac :10
+older Xorg don't have -nohwaccess so you need to run Xorg as root
+or do something like this.
+
+sudo rm /dev/tty0
+sudo mknod -m 666 /dev/vc/7 c 7 7
+
+sudo mkdir /dev/vc/
+sudo mknod -m 666 /dev/tty0 c 4 0 \ No newline at end of file
diff --git a/xorg/server/xrdpdev/xrdpdev.c b/xorg/server/xrdpdev/xrdpdev.c
index ff00c0bd..e68b6cb5 100644
--- a/xorg/server/xrdpdev/xrdpdev.c
+++ b/xorg/server/xrdpdev/xrdpdev.c
@@ -491,6 +491,10 @@ rdpAvailableOptions(int chipid, int busid)
return 0;
}
+#ifndef HW_SKIP_CONSOLE
+#define HW_SKIP_CONSOLE 4
+#endif
+
/*****************************************************************************/
static Bool
rdpDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)