Browse Source

Use latest libvncserver module for krfb

This relates to Bug 1582 among others
pull/1/head
Timothy Pearson 4 years ago
parent
commit
710a9c7c32
7 changed files with 25 additions and 5 deletions
  1. 3
    0
      .gitmodules
  2. 5
    0
      CMakeLists.txt
  3. 7
    1
      krdc/vnc/rfbproto.h
  4. 4
    0
      krfb/CMakeLists.txt
  5. 3
    2
      krfb/krfb/CMakeLists.txt
  6. 2
    2
      krfb/krfb/rfbcontroller.h
  7. 1
    0
      libtdevnc

+ 3
- 0
.gitmodules View File

@@ -4,3 +4,6 @@
4 4
 [submodule "cmake"]
5 5
 	path = cmake
6 6
 	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
7
+[submodule "libtdevnc"]
8
+	path = libtdevnc
9
+	url = https://system@scm.trinitydesktop.org/scm/git/libtdevnc

+ 5
- 0
CMakeLists.txt View File

@@ -144,6 +144,11 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
144 144
 
145 145
 ##### tdenetwork directories ####################
146 146
 
147
+if (BUILD_KRDC OR BUILD_KRFB)
148
+  set ( BUILD_LIBTDEVNC ON )
149
+endif (BUILD_KRDC OR BUILD_KRFB)
150
+
151
+tde_conditional_add_subdirectory( BUILD_LIBTDEVNC libtdevnc )
147 152
 tde_conditional_add_subdirectory( BUILD_DCOPRSS dcoprss )
148 153
 tde_conditional_add_subdirectory( BUILD_DOC doc )
149 154
 tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )

+ 7
- 1
krdc/vnc/rfbproto.h View File

@@ -306,6 +306,13 @@ typedef struct {
306 306
  *   0xFFFFFFF0 .. 0xFFFFFFFF -- cross-encoding compression levels.
307 307
  */
308 308
 
309
+/*
310
+ * Reserved range for TDE:
311
+ * 0xFFFE0100 - 0xFFFE01FF
312
+ */
313
+
314
+#define rfbEncodingBackground      0xFFFE0125
315
+
309 316
 #define rfbEncodingCompressLevel0  0xFFFFFF00
310 317
 #define rfbEncodingCompressLevel1  0xFFFFFF01
311 318
 #define rfbEncodingCompressLevel2  0xFFFFFF02
@@ -323,7 +330,6 @@ typedef struct {
323 330
 #define rfbEncodingPointerPos      0xFFFFFF18
324 331
 
325 332
 #define rfbEncodingLastRect        0xFFFFFF20
326
-#define rfbEncodingBackground      0xFFFFFF25
327 333
 
328 334
 #define rfbEncodingQualityLevel0   0xFFFFFFE0
329 335
 #define rfbEncodingQualityLevel1   0xFFFFFFE1

+ 4
- 0
krfb/CMakeLists.txt View File

@@ -1,5 +1,8 @@
1 1
 #################################################
2 2
 #
3
+#  (C) 2015 Timothy Pearson
4
+#  kb9vqf (AT) pearsoncomputing (DOT) net
5
+#
3 6
 #  (C) 2010-2011 Serghei Amelian
4 7
 #  serghei (DOT) amelian (AT) gmail.com
5 8
 #
@@ -16,3 +19,4 @@ add_subdirectory( kinetd )
16 19
 add_subdirectory( krfb )
17 20
 add_subdirectory( kcm_krfb )
18 21
 add_subdirectory( krfb_httpd )
22
+

+ 3
- 2
krfb/krfb/CMakeLists.txt View File

@@ -12,7 +12,8 @@
12 12
 include_directories(
13 13
   ${CMAKE_CURRENT_BINARY_DIR}
14 14
   ${CMAKE_CURRENT_SOURCE_DIR}/../srvloc
15
-  ${CMAKE_CURRENT_SOURCE_DIR}/../libvncserver
15
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../libtdevnc
16
+  ${CMAKE_CURRENT_BINARY_DIR}/../../libtdevnc
16 17
   ${CMAKE_BINARY_DIR}
17 18
   ${TDE_INCLUDE_DIR}
18 19
   ${TQT_INCLUDE_DIRS}
@@ -39,7 +40,7 @@ tde_add_executable( krfb AUTOMOC
39 40
     rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
40 41
     krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
41 42
   LINK
42
-    krfbconfig-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES} ${LIBVNCSERVER_LIBRARIES}
43
+    krfbconfig-static tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
43 44
   DESTINATION ${BIN_INSTALL_DIR}
44 45
 )
45 46
 

+ 2
- 2
krfb/krfb/rfbcontroller.h View File

@@ -32,11 +32,11 @@
32 32
 #include <tqmutex.h>
33 33
 
34 34
 #define HAVE_PTHREADS
35
-#include <rfb/rfb.h>
35
+#include "rfb/rfb.h"
36 36
 
37 37
 #include <X11/Xlib.h>
38 38
 
39
-// #define USE_MODIFIED_BUILTIN_LIBVNCSERVER
39
+#define USE_MODIFIED_BUILTIN_LIBVNCSERVER
40 40
 
41 41
 
42 42
 class TQCloseEvent;

+ 1
- 0
libtdevnc

@@ -0,0 +1 @@
1
+Subproject commit 366c7e7c2122cc4271a2dd65d270ac4175edd5e4

Loading…
Cancel
Save