summaryrefslogtreecommitdiffstats
path: root/xorg/server/module/rdpMain.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2013-08-01 23:30:23 -0700
committerJay Sorg <jay.sorg@gmail.com>2013-08-01 23:30:23 -0700
commit4865b1dc6b37be40ff47df62dabafa2728c03e1d (patch)
tree9adffc0fadb6c5fefed0f5740d21fb81d7815c97 /xorg/server/module/rdpMain.c
parent6e3b7245aad0a768eecc66d52c4e32a6af8a7280 (diff)
downloadxrdp-proprietary-4865b1dc6b37be40ff47df62dabafa2728c03e1d.tar.gz
xrdp-proprietary-4865b1dc6b37be40ff47df62dabafa2728c03e1d.zip
xorg driver, work on rdpup
Diffstat (limited to 'xorg/server/module/rdpMain.c')
-rw-r--r--xorg/server/module/rdpMain.c36
1 files changed, 32 insertions, 4 deletions
diff --git a/xorg/server/module/rdpMain.c b/xorg/server/module/rdpMain.c
index f68bcef3..f19b06cd 100644
--- a/xorg/server/module/rdpMain.c
+++ b/xorg/server/module/rdpMain.c
@@ -39,6 +39,8 @@ rdp module main
#include "rdp.h"
#include "rdpInput.h"
+#include "rdpDraw.h"
+#include "rdpClientCon.h"
/******************************************************************************/
#define LOG_LEVEL 1
@@ -53,22 +55,43 @@ rdp module main
#define PACKAGE_VERSION_MINOR 0
#define PACKAGE_VERSION_PATCHLEVEL 0
-static int g_initialised = 0;
+static Bool g_initialised = FALSE;
/*****************************************************************************/
static pointer
-xorgxrdpSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
+xorgxrdpSetup(pointer Module, pointer Options,
+ int *ErrorMajor, int *ErrorMinor)
{
LLOGLN(0, ("xorgxrdpSetup:"));
if (!g_initialised)
{
- g_initialised = 1;
+ g_initialised = TRUE;
}
rdpInputInit();
rdpPrivateInit();
return (pointer) 1;
}
+/*****************************************************************************/
+static void
+xorgxrdpTearDown(pointer Module)
+{
+ LLOGLN(0, ("xorgxrdpTearDown:"));
+}
+
+/*****************************************************************************/
+void
+xorgxrdpDownDown(ScreenPtr pScreen)
+{
+ LLOGLN(0, ("xorgxrdpDownDown:"));
+ if (g_initialised)
+ {
+ g_initialised = FALSE;
+ LLOGLN(0, ("xorgxrdpDownDown: 1"));
+ rdpClientConDeinit(rdpGetDevFromScreen(pScreen));
+ }
+}
+
static MODULESETUPPROTO(xorgxrdpSetup);
static XF86ModuleVersionInfo RDPVersRec =
{
@@ -86,4 +109,9 @@ static XF86ModuleVersionInfo RDPVersRec =
{ 0, 0, 0, 0 }
};
-XF86ModuleData xorgxrdpModuleData = { &RDPVersRec, xorgxrdpSetup, NULL };
+_X_EXPORT XF86ModuleData xorgxrdpModuleData =
+{
+ &RDPVersRec,
+ xorgxrdpSetup,
+ xorgxrdpTearDown
+};