summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-01-10 20:42:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-01-10 20:42:02 -0600
commit710a9c7c320fab11ac523662b93140c14e8163a4 (patch)
tree88fc9aeabaf5372bfe6ece2b30ff0538d36f7bb9
parentf6187cc4eb8a8726f5b64f0c640ac8d2355b85eb (diff)
downloadtdenetwork-710a9c7c320fab11ac523662b93140c14e8163a4.tar.gz
tdenetwork-710a9c7c320fab11ac523662b93140c14e8163a4.zip
Use latest libvncserver module for krfb
This relates to Bug 1582 among others
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt5
-rw-r--r--krdc/vnc/rfbproto.h8
-rw-r--r--krfb/CMakeLists.txt4
-rw-r--r--krfb/krfb/CMakeLists.txt5
-rw-r--r--krfb/krfb/rfbcontroller.h4
m---------libtdevnc0
7 files changed, 24 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 4fce771e..2d044c31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "cmake"]
path = cmake
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+[submodule "libtdevnc"]
+ path = libtdevnc
+ url = https://system@scm.trinitydesktop.org/scm/git/libtdevnc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81df9962..857b9ad4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,11 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### tdenetwork directories ####################
+if (BUILD_KRDC OR BUILD_KRFB)
+ set ( BUILD_LIBTDEVNC ON )
+endif (BUILD_KRDC OR BUILD_KRFB)
+
+tde_conditional_add_subdirectory( BUILD_LIBTDEVNC libtdevnc )
tde_conditional_add_subdirectory( BUILD_DCOPRSS dcoprss )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h
index f08fe66a..6cf7c740 100644
--- a/krdc/vnc/rfbproto.h
+++ b/krdc/vnc/rfbproto.h
@@ -306,6 +306,13 @@ typedef struct {
* 0xFFFFFFF0 .. 0xFFFFFFFF -- cross-encoding compression levels.
*/
+/*
+ * Reserved range for TDE:
+ * 0xFFFE0100 - 0xFFFE01FF
+ */
+
+#define rfbEncodingBackground 0xFFFE0125
+
#define rfbEncodingCompressLevel0 0xFFFFFF00
#define rfbEncodingCompressLevel1 0xFFFFFF01
#define rfbEncodingCompressLevel2 0xFFFFFF02
@@ -323,7 +330,6 @@ typedef struct {
#define rfbEncodingPointerPos 0xFFFFFF18
#define rfbEncodingLastRect 0xFFFFFF20
-#define rfbEncodingBackground 0xFFFFFF25
#define rfbEncodingQualityLevel0 0xFFFFFFE0
#define rfbEncodingQualityLevel1 0xFFFFFFE1
diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
index 9be3dcc1..0b9d875b 100644
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -1,5 +1,8 @@
#################################################
#
+# (C) 2015 Timothy Pearson
+# kb9vqf (AT) pearsoncomputing (DOT) net
+#
# (C) 2010-2011 Serghei Amelian
# serghei (DOT) amelian (AT) gmail.com
#
@@ -16,3 +19,4 @@ add_subdirectory( kinetd )
add_subdirectory( krfb )
add_subdirectory( kcm_krfb )
add_subdirectory( krfb_httpd )
+
diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index 4251ebdc..ff9ae20a 100644
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -12,7 +12,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../srvloc
- ${CMAKE_CURRENT_SOURCE_DIR}/../libvncserver
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libtdevnc
+ ${CMAKE_CURRENT_BINARY_DIR}/../../libtdevnc
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
@@ -39,7 +40,7 @@ tde_add_executable( krfb AUTOMOC
rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
LINK
- krfbconfig-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES} ${LIBVNCSERVER_LIBRARIES}
+ krfbconfig-static tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index be1870ae..e5595311 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -32,11 +32,11 @@
#include <tqmutex.h>
#define HAVE_PTHREADS
-#include <rfb/rfb.h>
+#include "rfb/rfb.h"
#include <X11/Xlib.h>
-// #define USE_MODIFIED_BUILTIN_LIBVNCSERVER
+#define USE_MODIFIED_BUILTIN_LIBVNCSERVER
class TQCloseEvent;
diff --git a/libtdevnc b/libtdevnc
new file mode 160000
+Subproject 366c7e7c2122cc4271a2dd65d270ac4175edd5e