Browse Source

Use latest libvncserver module for krfb

This relates to Bug 1582 among others
pull/1/head
Timothy Pearson 5 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 @@
[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

+ 5
- 0
CMakeLists.txt View File

@@ -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 )


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

@@ -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


+ 4
- 0
krfb/CMakeLists.txt View File

@@ -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 )


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

@@ -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}
)



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

@@ -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;


+ 1
- 0
libtdevnc

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

Loading…
Cancel
Save