diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-13 21:11:28 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-07-13 21:11:28 -0700 |
| commit | 90060a7d89e778aeaeb8f312a27a3c104ab852ee (patch) | |
| tree | e441caebb48c91d001906fd39167fcd7c20a0b65 /xorg/server/xrdpdev | |
| parent | 18ed4097bf9391696ba49370a2ac5ad80a2dbe40 (diff) | |
| download | xrdp-proprietary-90060a7d89e778aeaeb8f312a27a3c104ab852ee.tar.gz xrdp-proprietary-90060a7d89e778aeaeb8f312a27a3c104ab852ee.zip | |
work on xorg driver
Diffstat (limited to 'xorg/server/xrdpdev')
| -rw-r--r-- | xorg/server/xrdpdev/xorg.conf | 8 | ||||
| -rw-r--r-- | xorg/server/xrdpdev/xrdpdev.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xorg/server/xrdpdev/xorg.conf b/xorg/server/xrdpdev/xorg.conf index a44c92dd..2d6096fc 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" "off" +EndSection Section "Files" FontPath "/usr/X11R6/lib/X11/fonts/misc/:unscaled" @@ -31,7 +31,7 @@ EndSection Section "InputDevice" Identifier "xrdpKeyboard" - Driver "xrdpkeyb" + Driver "xrdpkeyb" EndSection Section "InputDevice" diff --git a/xorg/server/xrdpdev/xrdpdev.c b/xorg/server/xrdpdev/xrdpdev.c index f4b2807a..ff00c0bd 100644 --- a/xorg/server/xrdpdev/xrdpdev.c +++ b/xorg/server/xrdpdev/xrdpdev.c @@ -531,9 +531,9 @@ _X_EXPORT DriverRec g_DriverRec = /*****************************************************************************/ static pointer -Setup(pointer module, pointer opts, int *errmaj, int *errmin) +xrdpdevSetup(pointer module, pointer opts, int *errmaj, int *errmin) { - LLOGLN(0, ("Setup:")); + LLOGLN(0, ("xrdpdevSetup:")); if (!g_setup_done) { g_setup_done = 1; @@ -554,6 +554,6 @@ Setup(pointer module, pointer opts, int *errmaj, int *errmin) _X_EXPORT XF86ModuleData xrdpdevModuleData = { &g_VersRec, - Setup, + xrdpdevSetup, 0 }; |