summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-07-24 20:47:53 -0700
committerJay Sorg <jay.sorg@gmail.com>2012-07-24 20:47:53 -0700
commit90bf3f8171a57ba01d3e7fcbb32d1456335c3d00 (patch)
tree97ed9f41c5454bbba3c598fa91e281ed8d235ca5
parent87ab0218e2af4828a0e9c854afc37eb413a7b4fb (diff)
downloadxrdp-proprietary-90bf3f8171a57ba01d3e7fcbb32d1456335c3d00.tar.gz
xrdp-proprietary-90bf3f8171a57ba01d3e7fcbb32d1456335c3d00.zip
chansrv: started work on rail channel
-rw-r--r--sesman/chansrv/Makefile.am4
-rw-r--r--sesman/chansrv/rail.c27
-rw-r--r--sesman/chansrv/rail.h22
-rw-r--r--sesman/chansrv/xcommon.c27
-rw-r--r--sesman/chansrv/xcommon.h34
5 files changed, 113 insertions, 1 deletions
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index 5c6a4d35..0beb7f0a 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -28,7 +28,9 @@ xrdp_chansrv_SOURCES = \
chansrv.c \
sound.c \
clipboard.c \
- devredir.c
+ devredir.c \
+ rail.c \
+ xcommon.c
xrdp_chansrv_LDFLAGS = \
$(EXTRA_FLAGS)
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
new file mode 100644
index 00000000..fd480dc1
--- /dev/null
+++ b/sesman/chansrv/rail.c
@@ -0,0 +1,27 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2012
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ window manager info
+ http://www.freedesktop.org/wiki/Specifications/wm-spec
+*/
+
+#include <X11/Xlib.h>
+#include "rail.h"
+#include "xcommon.h"
+#include "log.h"
diff --git a/sesman/chansrv/rail.h b/sesman/chansrv/rail.h
new file mode 100644
index 00000000..58cce7b7
--- /dev/null
+++ b/sesman/chansrv/rail.h
@@ -0,0 +1,22 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2012
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _RAIL_H_
+#define _RAIL_H_
+
+#endif
diff --git a/sesman/chansrv/xcommon.c b/sesman/chansrv/xcommon.c
new file mode 100644
index 00000000..2e36d8ea
--- /dev/null
+++ b/sesman/chansrv/xcommon.c
@@ -0,0 +1,27 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2012
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <X11/Xlib.h>
+#include "arch.h"
+#include "parse.h"
+#include "os_calls.h"
+#include "chansrv.h"
+#include "log.h"
+#include "clipboard.h"
+#include "rail.h"
+
diff --git a/sesman/chansrv/xcommon.h b/sesman/chansrv/xcommon.h
new file mode 100644
index 00000000..54a74dac
--- /dev/null
+++ b/sesman/chansrv/xcommon.h
@@ -0,0 +1,34 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2012
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(XCOMMON_H)
+#define XCOMMON_H
+
+#include "arch.h"
+#include "parse.h"
+
+int APP_CC
+xcommon_init(void);
+int APP_CC
+xcommon_get_local_time(void);
+int APP_CC
+xcommon_get_wait_objs(tbus* objs, int* count, int* timeout);
+int APP_CC
+xcommon_check_wait_objs(void);
+
+#endif