Port framebuffers away from deprecated QDesktopWidget

Use QPlatformNativeInterface to get the WId instead

.arcconfig

@@ -1,3 +0,0 @@
-{
-  "phabricator.uri" : "https://phabricator.kde.org/"
-}

.gitignore

@@ -0,0 +1,26 @@
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+/build*/
+.cmake/
+CMakeLists.txt.user*
+*.unc-backup*
+.clang-format
+/compile_commands.json
+.clangd
+.cache
+.idea
+/cmake-build*

.gitlab-ci.yml

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml

.kde-ci.yml

@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+  'require':
+    'frameworks/extra-cmake-modules': '@stable'
+    'frameworks/ki18n': '@stable'
+    'frameworks/kconfig': '@stable'
+    'frameworks/kcoreaddons': '@stable'
+    'frameworks/kcrash': '@stable'
+    'frameworks/kdbusaddons': '@stable'
+    'frameworks/kdnssd': '@stable'
+    'frameworks/kdoctools': '@stable'
+    'frameworks/knotifications': '@stable'
+    'frameworks/kwallet': '@stable'
+    'frameworks/kwidgetsaddons': '@stable'
+    'frameworks/kwindowsystem': '@stable'
+    'frameworks/kxmlgui': '@stable'
+    'frameworks/kwayland': '@stable'
+    'libraries/plasma-wayland-protocols': '@latest' # can be switched to @stable when 1.5.0 is released

CMakeLists.txt

@@ -1,15 +1,15 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "1")
+set (RELEASE_SERVICE_VERSION_MAJOR "22")
+set (RELEASE_SERVICE_VERSION_MINOR "11")
+set (RELEASE_SERVICE_VERSION_MICRO "70")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})
 
-set(QT_MIN_VERSION 5.6.0)
-set(KF5_MIN_VERSION 5.31.0)
+set(QT_MIN_VERSION 5.15.2)
+set(KF5_MIN_VERSION 5.91.0)
 
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
@@ -20,6 +20,8 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
+include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
 include(FeatureSummary)
 include(CheckIncludeFile)
 
@@ -29,7 +31,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extr
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     I18n
-    Completion
     Config
     CoreAddons
     Crash
@@ -60,29 +61,56 @@ if(WIN32)
     set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)
 
-add_definitions(
-    -DQT_DEPRECATED_WARNINGS
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x050600
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_STRICT_ITERATORS
-    -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+    KF 5.91
 )
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
 
 find_package(LibVNCServer REQUIRED)
 
-find_package(PipeWire)
-set_package_properties(PipeWire PROPERTIES
+
+option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
+if(NOT DISABLE_PIPEWIRE)
+    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
+endif()
+add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugin")
+find_package(PlasmaWaylandProtocols 1.5.0)
+
+if(PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
+    find_package(KF5Wayland ${KF5_MIN_VERSION})
+    find_package(QtWaylandScanner REQUIRED)
+    find_package(Qt5WaylandClient)
+    find_package(Qt5XkbCommonSupport)
+    find_package(Wayland REQUIRED COMPONENTS Client)
+endif()
+
+find_package(gbm)
+set_package_properties(gbm PROPERTIES
     TYPE OPTIONAL
-    PURPOSE "Required for pipewire screencast plugin"
+    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
 )
 
+find_package(EGL)
+set_package_properties(EGL PROPERTIES
+    TYPE OPTIONAL
+    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
+)
+
+find_package(epoxy)
+set_package_properties(epoxy PROPERTIES DESCRIPTION "libepoxy"
+    URL "https://github.com/anholt/libepoxy"
+    TYPE OPTIONAL
+    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
+)
+
+if(EGL_FOUND AND gbm_FOUND AND epoxy_FOUND)
+  set (HAVE_DMA_BUF TRUE)
+else()
+  set (HAVE_DMA_BUF FALSE)
+endif()
+
 ecm_setup_version(PROJECT
                   VARIABLE_PREFIX KRFB
                   VERSION_HEADER "krfb_version.h")
@@ -92,16 +120,19 @@ include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
 )
 
-if(Q_WS_X11)
-  if(NOT X11_XTest_FOUND)
-    message(FATAL_ERROR "krfb requires the libXtst (https://xorg.freedesktop.org) to be built")
-  endif(NOT X11_XTest_FOUND)
-endif(Q_WS_X11)
-
 add_subdirectory(events)
 add_subdirectory(krfb)
 add_subdirectory(framebuffers)
 add_subdirectory(doc)
 add_subdirectory(icons)
 
+ki18n_install(po)
+kdoctools_install(po)
+
+ecm_qt_install_logging_categories(
+    EXPORT KRFB
+    FILE krfb.categories
+    DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
+
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

CMakePresets.json

@@ -0,0 +1,128 @@
+{
+    "version": 2,
+    "configurePresets": [
+        {
+            "name": "dev",
+            "displayName": "Build as debug",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "asan",
+            "displayName": "Build with Asan support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-asan",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "ECM_ENABLE_SANITIZERS" : "'address;undefined'",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "dev-clang",
+            "displayName": "dev-clang",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-clang",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            },
+            "environment": {
+                "CXX": "clang++",
+                "CCACHE_DISABLE": "ON"
+            }
+        },
+        {
+            "name": "unity",
+            "displayName": "Build with CMake unity support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-unity",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"CMAKE_UNITY_BUILD": "ON",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "release",
+            "displayName": "Build as release mode.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "profile",
+            "displayName": "profile",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-profile",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "clazy",
+            "displayName": "clazy",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-clazy",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            },
+            "environment": {
+                "CXX": "clazy",
+                "CCACHE_DISABLE": "ON"
+            }
+        }
+
+    ],
+    "buildPresets": [
+        {
+            "name": "dev",
+            "configurePreset": "dev"
+        },
+        {
+            "name": "release",
+            "configurePreset": "release"
+        },
+        {
+            "name": "dev-clang",
+            "configurePreset": "dev-clang"
+        },
+        {
+            "name": "asan",
+            "configurePreset": "asan"
+        },
+        {
+            "name": "unity",
+            "configurePreset": "unity"
+        },
+        {
+            "name": "clazy",
+            "configurePreset": "clazy",
+            "environment": {
+                "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
+                "CCACHE_DISABLE" : "ON"
+            }
+        }
+    ],
+    "testPresets": [
+    { 
+      "name": "dev",
+      "configurePreset": "dev",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": false}
+    },
+    { 
+      "name": "asan",
+      "configurePreset": "asan",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": true}
+    }
+    ]
+}

CMakePresets.json.license

@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021 Laurent Montel <montel@kde.org>
+# SPDX-License-Identifier: BSD-3-Clause

cmake/modules/FindPipeWire.cmake

@@ -1,122 +0,0 @@
-#.rst:
-# FindPipeWire
-# -------
-#
-# Try to find PipeWire on a Unix system.
-#
-# This will define the following variables:
-#
-# ``PipeWire_FOUND``
-#     True if (the requested version of) PipeWire is available
-# ``PipeWire_VERSION``
-#     The version of PipeWire
-# ``PipeWire_LIBRARIES``
-#     This can be passed to target_link_libraries() instead of the ``PipeWire::PipeWire``
-#     target
-# ``PipeWire_INCLUDE_DIRS``
-#     This should be passed to target_include_directories() if the target is not
-#     used for linking
-# ``PipeWire_DEFINITIONS``
-#     This should be passed to target_compile_options() if the target is not
-#     used for linking
-#
-# If ``PipeWire_FOUND`` is TRUE, it will also define the following imported target:
-#
-# ``PipeWire::PipeWire``
-#     The PipeWire library
-#
-# In general we recommend using the imported target, as it is easier to use.
-# Bear in mind, however, that if the target is in the link interface of an
-# exported library, it must be made available by the package config file.
-
-#=============================================================================
-# Copyright 2014 Alex Merry <alex.merry@kde.org>
-# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
-# Copyright 2018-2020 Jan Grulich <jgrulich@redhat.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-# Use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-find_package(PkgConfig QUIET)
-
-pkg_search_module(PKG_PipeWire QUIET libpipewire-0.3 libpipewire-0.2)
-pkg_search_module(PKG_Spa QUIET libspa-0.2 libspa-0.1)
-
-set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS}" "${PKG_Spa_CFLAGS}")
-set(PipeWire_VERSION "${PKG_PipeWire_VERSION}")
-
-find_path(PipeWire_INCLUDE_DIRS
-    NAMES
-        pipewire/pipewire.h
-    HINTS
-        ${PKG_PipeWire_INCLUDE_DIRS}
-        ${PKG_PipeWire_INCLUDE_DIRS}/pipewire-0.3
-)
-
-find_path(Spa_INCLUDE_DIRS
-    NAMES
-        spa/param/props.h
-    HINTS
-        ${PKG_Spa_INCLUDE_DIRS}
-        ${PKG_Spa_INCLUDE_DIRS}/spa-0.2
-)
-
-find_library(PipeWire_LIBRARIES
-    NAMES
-        pipewire-0.3
-        pipewire-0.2
-    HINTS
-        ${PKG_PipeWire_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PipeWire
-    FOUND_VAR
-        PipeWire_FOUND
-    REQUIRED_VARS
-        PipeWire_LIBRARIES
-        PipeWire_INCLUDE_DIRS
-        Spa_INCLUDE_DIRS
-    VERSION_VAR
-        PipeWire_VERSION
-)
-
-if(PipeWire_FOUND AND NOT TARGET PipeWire::PipeWire)
-    add_library(PipeWire::PipeWire UNKNOWN IMPORTED)
-    set_target_properties(PipeWire::PipeWire PROPERTIES
-        IMPORTED_LOCATION "${PipeWire_LIBRARIES}"
-        INTERFACE_COMPILE_OPTIONS "${PipeWire_DEFINITIONS}"
-        INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS};${Spa_INCLUDE_DIRS}"
-    )
-endif()
-
-mark_as_advanced(PipeWire_LIBRARIES PipeWire_INCLUDE_DIRS)
-
-include(FeatureSummary)
-set_package_properties(PipeWire PROPERTIES
-    URL "https://www.pipewire.org"
-    DESCRIPTION "PipeWire - multimedia processing"
-)

cmake/modules/Findgbm.cmake

@@ -0,0 +1,104 @@
+#.rst:
+# Findgbm
+# -------
+#
+# Try to find gbm on a Unix system.
+#
+# This will define the following variables:
+#
+# ``gbm_FOUND``
+#     True if (the requested version of) gbm is available
+# ``gbm_VERSION``
+#     The version of gbm
+# ``gbm_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``gbm::gbm``
+#     target
+# ``gbm_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``gbm_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``gbm_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``gbm::gbm``
+#     The gbm library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kde.org>
+# SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by Findgbm.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use Findgbm.cmake")
+endif()
+
+if(NOT WIN32)
+    # Use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PKG_gbm QUIET gbm)
+
+    set(gbm_DEFINITIONS ${PKG_gbm_CFLAGS_OTHER})
+    set(gbm_VERSION ${PKG_gbm_VERSION})
+
+    find_path(gbm_INCLUDE_DIR
+        NAMES
+            gbm.h
+        HINTS
+            ${PKG_gbm_INCLUDE_DIRS}
+    )
+    find_library(gbm_LIBRARY
+        NAMES
+            gbm
+        HINTS
+            ${PKG_gbm_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(gbm
+        FOUND_VAR
+            gbm_FOUND
+        REQUIRED_VARS
+            gbm_LIBRARY
+            gbm_INCLUDE_DIR
+        VERSION_VAR
+            gbm_VERSION
+    )
+
+    if(gbm_FOUND AND NOT TARGET gbm::gbm)
+        add_library(gbm::gbm UNKNOWN IMPORTED)
+        set_target_properties(gbm::gbm PROPERTIES
+            IMPORTED_LOCATION "${gbm_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${gbm_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${gbm_INCLUDE_DIR}"
+        )
+    endif()
+
+    mark_as_advanced(gbm_LIBRARY gbm_INCLUDE_DIR)
+
+    # compatibility variables
+    set(gbm_LIBRARIES ${gbm_LIBRARY})
+    set(gbm_INCLUDE_DIRS ${gbm_INCLUDE_DIR})
+    set(gbm_VERSION_STRING ${gbm_VERSION})
+
+else()
+    message(STATUS "Findgbm.cmake cannot find gbm on Windows systems.")
+    set(gbm_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(gbm PROPERTIES
+    URL "https://www.mesa3d.org"
+    DESCRIPTION "Mesa gbm library."
+)

doc/CMakeLists.txt

@@ -1,2 +1,2 @@
 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR krfb)

events/x11/CMakeLists.txt

@@ -14,5 +14,6 @@ target_link_libraries (krfb_events_x11
                        KF5::CoreAddons
                        krfbprivate
 )
+set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)
 
-install (TARGETS krfb_events_x11 DESTINATION ${PLUGIN_INSTALL_DIR}/krfb)
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)

events/x11/krfb_events_x11.desktop

@@ -1,61 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=X11 XFakeInput based event handler for KRfb
-Comment[ca]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
-Comment[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
-Comment[de]=Ereignis-Modul basierend auf X11 XFakeInput für KRfb
-Comment[el]=Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb
-Comment[en_GB]=X11 XFakeInput based event handler for KRfb
-Comment[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb
-Comment[et]=KRfb X11 XFakeInput'i põhine sündmuste käitleja
-Comment[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
-Comment[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
-Comment[fr]=Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb
-Comment[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
-Comment[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
-Comment[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러
-Comment[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb
-Comment[nn]=X11 XFakeInput-basert hendingshandtering for KRfb
-Comment[pl]=Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb
-Comment[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb
-Comment[pt_BR]=Manipulador de eventos baseado no XFakeInput do X11 para o KRfb
-Comment[sk]=X11 Spracovateľ udalostí založený na XFakeInput pre KRfb
-Comment[sv]=Händelsehanterare för Krfb baserad på X11 XFakeInput
-Comment[uk]=Обробник подій для KRfb на основі XFakeInput X11
-Comment[x-test]=xxX11 XFakeInput based event handler for KRfbxx
-Comment[zh_CN]=基于 X11 XFakeInput 的 KRfb 事件处理器
-Comment[zh_TW]=KRfb 基於 X11 XFakeInput 的事件處理器
-Name=X11 XFakeInput based event handler for KRfb
-Name[ca]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
-Name[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
-Name[de]=Ereignis-Modul basierend auf X11 XFakeInput für KRfb
-Name[el]=Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb
-Name[en_GB]=X11 XFakeInput based event handler for KRfb
-Name[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb
-Name[et]=KRfb X11 XFakeInput'i põhine sündmuste käitleja
-Name[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
-Name[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
-Name[fr]=Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb
-Name[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
-Name[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
-Name[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러
-Name[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb
-Name[nn]=X11 XFakeInput-basert hendingshandtering for KRfb
-Name[pl]=Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb
-Name[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb
-Name[pt_BR]=Manipulador de eventos baseado no XFakeInput do X11 para o KRfb
-Name[sk]=X11 Spracovateľ udalostí založený na XFakeInput pre KRfb
-Name[sv]=Händelsehanterare för Krfb baserad på X11 XFakeInput
-Name[uk]=Обробник подій для KRfb на основі XFakeInput X11
-Name[x-test]=xxX11 XFakeInput based event handler for KRfbxx
-Name[zh_CN]=基于 X11 XFakeInput 的 KRfb 事件处理器
-Name[zh_TW]=KRfb 基於 X11 XFakeInput 的事件處理器
-Type=Service
-ServiceTypes=krfb/events
-
-X-KDE-Library=krfb_events_x11
-X-KDE-PluginInfo-Name=x11
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=https://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true

events/x11/krfb_events_x11.json

@@ -1,63 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "X11 XFakeInput based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb",
-        "Description[ca]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb",
-        "Description[de]": "Ereignis-Modul basierend auf X11 XFakeInput für KRfb",
-        "Description[el]": "Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb",
-        "Description[en_GB]": "X11 XFakeInput based event handler for KRfb",
-        "Description[es]": "Gestor de eventos basado en XFakeInput de X11 para KRfb",
-        "Description[et]": "KRfb X11 XFakeInput'i põhine sündmuste käitleja",
-        "Description[eu]": "KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea",
-        "Description[fi]": "KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä",
-        "Description[fr]": "Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb",
-        "Description[gl]": "Xestor de eventos para KRfb baseado no XFakeInput de X11",
-        "Description[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb",
-        "Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러",
-        "Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb",
-        "Description[nn]": "X11 XFakeInput-basert hendingshandtering for KRfb",
-        "Description[pl]": "Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb",
-        "Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb",
-        "Description[pt_BR]": "Manipulador de eventos baseado no XFakeInput do X11 para o KRfb",
-        "Description[sk]": "X11 Spracovateľ udalostí založený na XFakeInput pre KRfb",
-        "Description[sv]": "Händelsehanterare för KRfb baserad på X11 XFakeInput",
-        "Description[uk]": "Обробник подій для KRfb на основі XFakeInput X11",
-        "Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx",
-        "Description[zh_CN]": "基于 X11 XFakeInput 的 KRfb 事件处理器",
-        "Description[zh_TW]": "KRfb 基於 X11 XFakeInput 的事件處理器",
-        "EnabledByDefault": true,
-        "Id": "x11",
-        "License": "GPL",
-        "Name": "X11 Event handler for KRfb",
-        "Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per al KRfb",
-        "Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb",
-        "Name[de]": "Ereignis-Modul basierend auf X11 für KRfb",
-        "Name[el]": "Χειριστής γεγονότων X11 για το KRfb",
-        "Name[en_GB]": "X11 Event handler for KRfb",
-        "Name[es]": "Gestor de eventos de X11 para KRfb",
-        "Name[et]": "KRfb X11 sündmuste käitleja",
-        "Name[eu]": "KRfb-rako X11 gertaera maneiatzailea",
-        "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä",
-        "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb",
-        "Name[gl]": "Xestor de eventos de X11 para KRfb",
-        "Name[it]": "Gestore eventi X11 per KRfb",
-        "Name[ko]": "KRfb X11 이벤트 핸들러",
-        "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb",
-        "Name[nn]": "X11-hendingshandsamar for KRfb",
-        "Name[pl]": "Obsługa wydarzeń X11 dla KRfb",
-        "Name[pt]": "Tratamento de eventos do X11 para o KRfb",
-        "Name[pt_BR]": "Manipulador de eventos do X11 para o KRfb",
-        "Name[sk]": "X11 Obsluha udalostí pre KRfb",
-        "Name[sv]": "X11-händelsehanterare för Krfb",
-        "Name[uk]": "Обробник подій для KRfb на основі X11",
-        "Name[x-test]": "xxX11 Event handler for KRfbxx",
-        "Name[zh_CN]": "X11 KRfb 事件处理器",
-        "Name[zh_TW]": "KRfb 的 X11 事件處理器",
-        "ServiceTypes": [
-            "krfb/events"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

events/x11/x11events.cpp

@@ -44,18 +44,18 @@ public:
     EventData();
 
     //keyboard
-    Display *dpy;
-    signed char modifiers[0x100];
-    KeyCode keycodes[0x100];
-    KeyCode leftShiftCode;
-    KeyCode rightShiftCode;
-    KeyCode altGrCode;
-    char modifierState;
+    Display *dpy = nullptr;
+    signed char modifiers[0x100] = {};
+    KeyCode keycodes[0x100] = {};
+    KeyCode leftShiftCode = 0;
+    KeyCode rightShiftCode = 0;
+    KeyCode altGrCode = 0;
+    char modifierState = 0;
 
     //mouse
-    int buttonMask;
-    int x;
-    int y;
+    int buttonMask = 0;
+    int x = 0;
+    int y = 0;
 
 private:
     void init();

events/x11/x11eventsplugin.cpp

@@ -24,8 +24,7 @@
 #include <KPluginFactory>
 #include <QX11Info>
 
-K_PLUGIN_FACTORY_WITH_JSON(X11EventsPluginFactory, "krfb_events_x11.json",
-               registerPlugin<X11EventsPlugin>();)
+K_PLUGIN_CLASS(X11EventsPlugin)
 
 X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)

events/x11/x11eventsplugin.h

@@ -31,7 +31,6 @@ class X11EventsPlugin : public EventsPlugin
     Q_OBJECT
 public:
     X11EventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~X11EventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 

events/xdp/CMakeLists.txt

@@ -21,7 +21,8 @@ target_link_libraries (krfb_events_xdp
                        Qt5::DBus
                        krfbprivate
 )
+set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)
 
 install (TARGETS krfb_events_xdp
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events
 )

events/xdp/krfb_events_xdp.desktop

@@ -1,62 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=Xdg-desktop-portal based event handler for KRfb
-Comment[ca]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
-Comment[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
-Comment[de]=Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb
-Comment[el]=Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb
-Comment[en_GB]=Xdg-desktop-portal based event handler for KRfb
-Comment[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb
-Comment[et]=KRfb Xdg-desktop-portal'i põhine sündmuste käitleja
-Comment[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
-Comment[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
-Comment[fr]=Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb
-Comment[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
-Comment[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
-Comment[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러
-Comment[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb
-Comment[nn]=Xdg-desktop-portal-basert hendingshandtering for KRfb
-Comment[pl]=Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb
-Comment[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb
-Comment[pt_BR]=Manipulador de eventos baseado no xdg-desktop-portal para o KRfb
-Comment[sk]=Obsluha udalostí založená na Xdg-desktop-portal pre KRfb
-Comment[sv]=Händelsehanterare för Krfb baserad på xdg-desktop-portal
-Comment[uk]=Обробник подій для KRfb на основі Xdg-desktop-portal
-Comment[x-test]=xxXdg-desktop-portal based event handler for KRfbxx
-Comment[zh_CN]=基于 xdg-desktop-portal 的 KRfb 事件处理器
-Comment[zh_TW]=KRfb 基於 Xdg-desktop-portal 的事件處理器
-Name=Xdg-desktop-portal based event handler for KRfb
-Name[ca]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
-Name[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
-Name[de]=Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb
-Name[el]=Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb
-Name[en_GB]=Xdg-desktop-portal based event handler for KRfb
-Name[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb
-Name[et]=KRfb Xdg-desktop-portal'i põhine sündmuste käitleja
-Name[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
-Name[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
-Name[fr]=Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb
-Name[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
-Name[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
-Name[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러
-Name[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb
-Name[nn]=Xdg-desktop-portal-basert hendingshandtering for KRfb
-Name[pl]=Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb
-Name[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb
-Name[pt_BR]=Manipulador de eventos baseado no xdg-desktop-portal para o KRfb
-Name[sk]=Obsluha udalostí založená na Xdg-desktop-portal pre KRfb
-Name[sv]=Händelsehanterare för Krfb baserad på xdg-desktop-portal
-Name[uk]=Обробник подій для KRfb на основі Xdg-desktop-portal
-Name[x-test]=xxXdg-desktop-portal based event handler for KRfbxx
-Name[zh_CN]=基于 xdg-desktop-portal 的 KRfb 事件处理器
-Name[zh_TW]=KRfb 基於 Xdg-desktop-portal 的事件處理器
-Type=Service
-ServiceTypes=krfb/events
-
-X-KDE-Library=krfb_events_xdp
-X-KDE-PluginInfo-Name=xdp
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=https://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-

events/xdp/krfb_events_xdp.json

@@ -1,63 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "Xdg-desktop-portal based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb",
-        "Description[ca]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb",
-        "Description[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",
-        "Description[el]": "Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb",
-        "Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb",
-        "Description[es]": "Gestor de eventos basado en Xdg-desktop-portal para KRfb",
-        "Description[et]": "KRfb Xdg-desktop-portal'i põhine sündmuste käitleja",
-        "Description[eu]": "KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea",
-        "Description[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
-        "Description[fr]": "Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb",
-        "Description[gl]": "Xestor de eventos para KRfb baseado en Xdg-desktop-portal",
-        "Description[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb",
-        "Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러",
-        "Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb",
-        "Description[nn]": "Xdg-desktop-portal-basert hendingshandtering for KRfb",
-        "Description[pl]": "Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb",
-        "Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb",
-        "Description[pt_BR]": "Manipulador de eventos baseado no xdg-desktop-portal para o KRfb",
-        "Description[sk]": "Obsluha udalostí založená na Xdg-desktop-portal pre KRfb",
-        "Description[sv]": "Händelsehanterare för KRfb baserad på xdg-desktop-portal",
-        "Description[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
-        "Description[x-test]": "xxXdg-desktop-portal based event handler for KRfbxx",
-        "Description[zh_CN]": "基于 xdg-desktop-portal 的 KRfb 事件处理器",
-        "Description[zh_TW]": "KRfb 基於 Xdg-desktop-portal 的事件處理器",
-        "EnabledByDefault": true,
-        "Id": "xdp",
-        "License": "GPL",
-        "Name": "Xdg-desktop-portal Event handler for KRfb",
-        "Name[ca@valencia]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb",
-        "Name[ca]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb",
-        "Name[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb",
-        "Name[el]": "Χειριστής γεγονότων xdg-desktop-portal για το KRfb",
-        "Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb",
-        "Name[es]": "Gestor de eventos de Xdg-desktop-portal para KRfb",
-        "Name[et]": "KRfb Xdg-desktop-portal'i sündmuste käitleja",
-        "Name[eu]": "KRfb-rako «xdg-desktop-portal» gertaera maneiatzailea",
-        "Name[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
-        "Name[fr]": "Gestionnaire d'évènements Xdg-desktop-portal pour KRfb",
-        "Name[gl]": "Xestor de eventos de Xdg-desktop-portal para KRfb",
-        "Name[it]": "Gestore eventi xdg-desktop-portal per KRfb",
-        "Name[ko]": "KRfb  Xdg-desktop-portal 이벤트 핸들러",
-        "Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb",
-        "Name[nn]": "Xdg-desktop-portal-hendingshandtering for KRfb",
-        "Name[pl]": "Obsługa wydarzeń Xdg-desktop-portal dla KRfb",
-        "Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb",
-        "Name[pt_BR]": "Manipulador de eventos xdg-desktop-portal para o KRfb",
-        "Name[sk]": "Xdg-desktop-portal Obsluha udalostí pre KRfb",
-        "Name[sv]": "Xdg-desktop-portal händelsehanterare för Krfb",
-        "Name[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
-        "Name[x-test]": "xxXdg-desktop-portal Event handler for KRfbxx",
-        "Name[zh_CN]": "xdg-desktop-portal KRfb 事件处理器",
-        "Name[zh_TW]": "KRfb 的 Xdg-desktop-portal 事件處理器",
-        "ServiceTypes": [
-            "krfb/events"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

events/xdp/xdpevents.cpp

@@ -36,9 +36,9 @@ public:
     EventData();
 
     //mouse
-    int buttonMask;
-    int x;
-    int y;
+    int buttonMask = 0;
+    int x = 0;
+    int y = 0;
 
     QScopedPointer<OrgFreedesktopPortalRemoteDesktopInterface> dbusXdpRemoteDesktopService;
 
@@ -55,10 +55,8 @@ EventData::EventData()
 
 void EventData::init()
 {
-    buttonMask = 0;
-
-    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QLatin1String("org.freedesktop.portal.Desktop"),
-                                      QLatin1String("/org/freedesktop/portal/desktop"), QDBusConnection::sessionBus()));
+    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QStringLiteral("org.freedesktop.portal.Desktop"),
+                                      QStringLiteral("/org/freedesktop/portal/desktop"), QDBusConnection::sessionBus()));
 }
 
 void XdpEventHandler::handleKeyboard(bool down, rfbKeySym keySym)
@@ -71,8 +69,8 @@ void XdpEventHandler::handleKeyboard(bool down, rfbKeySym keySym)
 
 void XdpEventHandler::handlePointer(int buttonMask, int x, int y)
 {
-    const uint streamNodeId = frameBuffer()->customProperty(QLatin1String("stream_node_id")).toUInt();
-    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QLatin1String("session_handle")).value<QDBusObjectPath>();
+    const uint streamNodeId = frameBuffer()->customProperty(QStringLiteral("stream_node_id")).toUInt();
+    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QStringLiteral("session_handle")).value<QDBusObjectPath>();
 
     if (streamNodeId == 0 || sessionHandle.path().isEmpty()) {
         return;

events/xdp/xdpeventsplugin.cpp

@@ -25,8 +25,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(XdpEventsPluginFactory, "krfb_events_xdp.json",
-               registerPlugin<XdpEventsPlugin>();)
+K_PLUGIN_CLASS(XdpEventsPlugin)
 
 XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)

events/xdp/xdpeventsplugin.h

@@ -33,7 +33,6 @@ class XdpEventsPlugin : public EventsPlugin
     Q_OBJECT
 public:
     XdpEventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~XdpEventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 

framebuffers/pipewire/CMakeLists.txt

@@ -5,6 +5,21 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}
 set (krfb_framebuffer_pw_SRCS
      pw_framebuffer.cpp
      pw_framebufferplugin.cpp
+
+     screencasting.cpp
+)
+
+ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
+    PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+    BASENAME zkde-screencast-unstable-v1
+)
+
+ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
+    HEADER krfb_fb_pipewire_debug.h
+    IDENTIFIER KRFB_FB_PIPEWIRE
+    CATEGORY_NAME krfb.framebuffer.pipewire
+    DESCRIPTION "KRFB PipeWire framebuffer plugin"
+    EXPORT KRFB
 )
 
 qt5_add_dbus_interface(
@@ -23,16 +38,27 @@ add_library(krfb_framebuffer_pw
     MODULE
     ${krfb_framebuffer_pw_SRCS}
 )
+set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
 
-target_link_libraries (krfb_framebuffer_pw
-                       Qt5::Core
-                       Qt5::Gui
-                       Qt5::DBus
-                       KF5::CoreAddons
-                       krfbprivate
-                       PipeWire::PipeWire
+target_link_libraries(krfb_framebuffer_pw
+                      Qt5::Core
+                      Qt5::Gui
+                      Qt5::DBus
+                      KF5::CoreAddons
+                      KF5::WaylandClient
+                      Wayland::Client
+                      krfbprivate
+                      PkgConfig::PipeWire
 )
 
+if (HAVE_DMA_BUF)
+    target_link_libraries(krfb_framebuffer_pw
+                          ${epoxy_LIBRARIES}
+                          gbm::gbm
+    )
+endif()
+
+set_target_properties(krfb_framebuffer_pw PROPERTIES OUTPUT_NAME pw)
 install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )

framebuffers/pipewire/krfb_framebuffer_pw.json

@@ -1,67 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "PipeWire based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en el PipeWire per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.",
-        "Description[cs]": "Framebuffer založený na Pipe pro KRfb.",
-        "Description[de]": "PipeWire-basierter Framebuffer für KRfb.",
-        "Description[el]": "Μνήμη ανανέωσης με βάση το pipewire για το KRfb.",
-        "Description[en_GB]": "PipeWire based Framebuffer for KRfb.",
-        "Description[es]": "Framebuffer basado en PipeWire para KRfb.",
-        "Description[et]": "KRfb PipeWire põhine kaadripuhver",
-        "Description[eu]": "KRfb-rako «PipeWire»n oinarritutako «Framebuffer».",
-        "Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.",
-        "Description[fr]": "Tampon d'images utilisant PipeWire pour KRfb.",
-        "Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.",
-        "Description[it]": "Framebuffer basato su PipeWire per KRfb.",
-        "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.",
-        "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.",
-        "Description[nn]": "PipeWire-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki oparty na PipeWire dla KRfb.",
-        "Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.",
-        "Description[pt_BR]": "Framebuffer baseado no PipeWire para o KRfb.",
-        "Description[ru]": "Буфер кадров для KRfb на базе Framebuffer",
-        "Description[sk]": "Framebuffer založený na PipeWire pre KRfb.",
-        "Description[sv]": "Rambuffert för Krfb baserad på PipeWire",
-        "Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.",
-        "Description[x-test]": "xxPipeWire based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "基于 PipeWire 的 KRfb 帧缓冲机制。",
-        "Description[zh_TW]": "KRfb 基於 PipeWire 的 Framebuffer。",
-        "EnabledByDefault": true,
-        "Id": "pw",
-        "License": "GPL3",
-        "Name": "PipeWire Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» del PipeWire per al KRfb",
-        "Name[ca]": "«Framebuffer» del PipeWire per al KRfb",
-        "Name[cs]": "PipeWire Framebuffer pro KRfb",
-        "Name[de]": "PipeWire-Framebuffer für KRfb",
-        "Name[el]": "Μνήμη ανανέωσης pipewire για το KRfb",
-        "Name[en_GB]": "PipeWire Framebuffer for KRfb",
-        "Name[es]": "Framebuffer de PipeWire para KRfb",
-        "Name[et]": "KRfb PipeWire kaadripuhver",
-        "Name[eu]": "KRfb-rako «PipeWire Framebuffer»",
-        "Name[fi]": "KRfb:n PipeWire-kehyspuskuri",
-        "Name[fr]": "Tampon d'images PipeWire pour KRfb",
-        "Name[gl]": "Búfer de fotograma de PipeWire para KRfb",
-        "Name[it]": "Framebuffer PipeWire per KRfb",
-        "Name[ko]": "KRfb용 PipeWire 프레임버퍼",
-        "Name[nl]": "PipeWire-framebuffer voor KRfb",
-        "Name[nn]": "PipeWire-biletbuffer for KRfb",
-        "Name[pl]": "Wtyczki buforów ramek PipeWire dla KRfb",
-        "Name[pt]": "'Framebuffer' do PipeWire para o KRfb",
-        "Name[pt_BR]": "Framebuffer PipeWire para o KRfb",
-        "Name[ru]": "Буфер кадров PipeWire для KRfb",
-        "Name[sk]": "PipeWire Framebuffer pre KRfb",
-        "Name[sv]": "PipeWire-rambuffert för Krfb",
-        "Name[uk]": "Буфер кадрів PipeWire для KRfb",
-        "Name[x-test]": "xxPipeWire Framebuffer for KRfbxx",
-        "Name[zh_CN]": "KRfb 的 PipeWire 帧缓冲机制",
-        "Name[zh_TW]": "KRfb 的 PipeWire Framebuffer",
-        "ServiceTypes": [
-            "krfb/framebuffer"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

framebuffers/pipewire/pw_framebuffer.h

@@ -24,15 +24,18 @@ class PWFrameBuffer: public FrameBuffer
 {
     Q_OBJECT
 public:
-    typedef struct {
+    using Stream = struct {
         uint nodeId;
         QVariantMap map;
-    } Stream;
-    typedef QList<Stream> Streams;
+    };
+    using Streams = QList<Stream>;
 
-    PWFrameBuffer(WId winid, QObject *parent = nullptr);
+    PWFrameBuffer(QObject *parent = nullptr);
     virtual ~PWFrameBuffer() override;
 
+    void initDBus();
+    void startVirtualMonitor(const QString &name, const QSize &resolution, qreal dpr);
+
     int  depth() override;
     int  height() override;
     int  width() override;
@@ -40,6 +43,7 @@ public:
     void getServerFormat(rfbPixelFormat &format) override;
     void startMonitor() override;
     void stopMonitor() override;
+    QPoint cursorPosition() override;
 
     QVariant customProperty(const QString &property) const override;
 

framebuffers/pipewire/pw_framebufferplugin.cpp

@@ -22,9 +22,7 @@
 #include "pw_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(PWFrameBufferPluginFactory, "krfb_framebuffer_pw.json",
-               registerPlugin<PWFrameBufferPlugin>();)
+K_PLUGIN_CLASS(PWFrameBufferPlugin)
 
 PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
@@ -32,14 +30,16 @@ PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &ar
 }
 
 
-PWFrameBufferPlugin::~PWFrameBufferPlugin()
+FrameBuffer *PWFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-
-FrameBuffer *PWFrameBufferPlugin::frameBuffer(WId id)
-{
-    auto pwfb = new PWFrameBuffer(id);
+    auto pwfb = new PWFrameBuffer;
+    if (args.contains(QLatin1String("name"))) {
+        pwfb->startVirtualMonitor(args[QStringLiteral("name")].toString(), args[QStringLiteral("resolution")].toSize(), args[QStringLiteral("scale")].toDouble());
+    } else {
+        // D-Bus is most important in XDG-Desktop-Portals init chain, no toys for us if something is wrong with XDP
+        // PipeWire connectivity is initialized after D-Bus session is started
+        pwfb->initDBus();
+    }
 
     // sanity check for dbus/wayland/pipewire errors
     if (!pwfb->isValid()) {

framebuffers/pipewire/pw_framebufferplugin.h

@@ -33,9 +33,8 @@ class PWFrameBufferPlugin: public FrameBufferPlugin
 
 public:
    PWFrameBufferPlugin(QObject *parent, const QVariantList &args);
-   virtual ~PWFrameBufferPlugin() override;
 
-   FrameBuffer *frameBuffer(WId id) override;
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;
 
 private:
    Q_DISABLE_COPY(PWFrameBufferPlugin)

framebuffers/pipewire/screencasting.cpp

@@ -0,0 +1,136 @@
+/*
+    SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
+
+    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+*/
+
+#include "screencasting.h"
+#include "qwayland-zkde-screencast-unstable-v1.h"
+#include <KWayland/Client/output.h>
+#include <KWayland/Client/plasmawindowmanagement.h>
+#include <KWayland/Client/registry.h>
+#include <QDebug>
+#include <QRect>
+
+using namespace KWayland::Client;
+
+class ScreencastingStreamPrivate : public QtWayland::zkde_screencast_stream_unstable_v1
+{
+public:
+    ScreencastingStreamPrivate(ScreencastingStream *q)
+        : q(q)
+    {
+    }
+    ~ScreencastingStreamPrivate() override
+    {
+        close();
+        q->deleteLater();
+    }
+
+    void zkde_screencast_stream_unstable_v1_created(uint32_t node) override
+    {
+        m_nodeId = node;
+        Q_EMIT q->created(node);
+    }
+
+    void zkde_screencast_stream_unstable_v1_closed() override
+    {
+        Q_EMIT q->closed();
+    }
+
+    void zkde_screencast_stream_unstable_v1_failed(const QString &error) override
+    {
+        Q_EMIT q->failed(error);
+    }
+
+    uint m_nodeId = 0;
+    QPointer<ScreencastingStream> q;
+};
+
+ScreencastingStream::ScreencastingStream(QObject *parent)
+    : QObject(parent)
+    , d(new ScreencastingStreamPrivate(this))
+{
+}
+
+ScreencastingStream::~ScreencastingStream() = default;
+
+quint32 ScreencastingStream::nodeId() const
+{
+    return d->m_nodeId;
+}
+
+class ScreencastingPrivate : public QtWayland::zkde_screencast_unstable_v1
+{
+public:
+    ScreencastingPrivate(Registry *registry, int id, int version, Screencasting *q)
+        : QtWayland::zkde_screencast_unstable_v1(*registry, id, version)
+        , q(q)
+    {
+    }
+
+    ScreencastingPrivate(::zkde_screencast_unstable_v1 *screencasting, Screencasting *q)
+        : QtWayland::zkde_screencast_unstable_v1(screencasting)
+        , q(q)
+    {
+    }
+
+    ~ScreencastingPrivate() override
+    {
+        destroy();
+    }
+
+    Screencasting *const q;
+};
+
+Screencasting::Screencasting(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Screencasting::Screencasting(Registry *registry, int id, int version, QObject *parent)
+    : QObject(parent)
+    , d(new ScreencastingPrivate(registry, id, version, this))
+{
+}
+
+Screencasting::~Screencasting() = default;
+
+ScreencastingStream *Screencasting::createOutputStream(Output *output, CursorMode mode)
+{
+    auto stream = new ScreencastingStream(this);
+    stream->setObjectName(output->model());
+    stream->d->init(d->stream_output(*output, mode));
+    return stream;
+}
+
+ScreencastingStream *Screencasting::createWindowStream(PlasmaWindow *window, CursorMode mode)
+{
+    auto stream = createWindowStream(QString::fromUtf8(window->uuid()), mode);
+    stream->setObjectName(window->appId());
+    return stream;
+}
+
+ScreencastingStream *Screencasting::createWindowStream(const QString &uuid, CursorMode mode)
+{
+    auto stream = new ScreencastingStream(this);
+    stream->d->init(d->stream_window(uuid, mode));
+    return stream;
+}
+
+ScreencastingStream * Screencasting::createVirtualMonitorStream(const QString& name, const QSize& resolution, qreal dpr, Screencasting::CursorMode mode)
+{
+    auto stream = new ScreencastingStream(this);
+    stream->d->init(d->stream_virtual_output(name, resolution.width(), resolution.height(), wl_fixed_from_double(dpr), mode));
+    return stream;
+}
+
+void Screencasting::setup(::zkde_screencast_unstable_v1 *screencasting)
+{
+    d.reset(new ScreencastingPrivate(screencasting, this));
+}
+
+void Screencasting::destroy()
+{
+    d.reset(nullptr);
+}

framebuffers/pipewire/screencasting.h

@@ -0,0 +1,78 @@
+/*
+    SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
+
+    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+*/
+
+#pragma once
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QVector>
+#include <optional>
+
+struct zkde_screencast_unstable_v1;
+
+namespace KWayland
+{
+namespace Client
+{
+class PlasmaWindow;
+class Registry;
+class Output;
+}
+}
+
+class ScreencastingPrivate;
+class ScreencastingSourcePrivate;
+class ScreencastingStreamPrivate;
+class ScreencastingStream : public QObject
+{
+    Q_OBJECT
+public:
+    ScreencastingStream(QObject *parent);
+    ~ScreencastingStream() override;
+
+    quint32 nodeId() const;
+
+Q_SIGNALS:
+    void created(quint32 nodeid);
+    void failed(const QString &error);
+    void closed();
+
+private:
+    friend class Screencasting;
+    QScopedPointer<ScreencastingStreamPrivate> d;
+};
+
+class Screencasting : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Screencasting(QObject *parent = nullptr);
+    explicit Screencasting(KWayland::Client::Registry *registry, int id, int version, QObject *parent = nullptr);
+    ~Screencasting() override;
+
+    enum CursorMode {
+        Hidden = 1,
+        Embedded = 2,
+        Metadata = 4,
+    };
+    Q_ENUM(CursorMode)
+
+    ScreencastingStream *createOutputStream(KWayland::Client::Output *output, CursorMode mode);
+    ScreencastingStream *createWindowStream(KWayland::Client::PlasmaWindow *window, CursorMode mode);
+    ScreencastingStream *createWindowStream(const QString &uuid, CursorMode mode);
+    ScreencastingStream *createVirtualMonitorStream(const QString &name, const QSize &resolution, qreal dpr, CursorMode mode);
+
+    void setup(zkde_screencast_unstable_v1 *screencasting);
+    void destroy();
+
+Q_SIGNALS:
+    void initialized();
+    void removed();
+    void sourcesChanged();
+
+private:
+    QScopedPointer<ScreencastingPrivate> d;
+};

framebuffers/qt/CMakeLists.txt

@@ -7,6 +7,14 @@ set (krfb_framebuffer_qt_SRCS
      qtframebufferplugin.cpp
 )
 
+ecm_qt_declare_logging_category(krfb_framebuffer_qt_SRCS
+    HEADER krfb_fb_qt_debug.h
+    IDENTIFIER KRFB_FB_QT
+    CATEGORY_NAME krfb.framebuffer.qt
+    DESCRIPTION "KRFB Qt framebuffer plugin"
+    EXPORT KRFB
+)
+
 add_library(krfb_framebuffer_qt
  MODULE 
                  ${krfb_framebuffer_qt_SRCS}
@@ -16,9 +24,11 @@ target_link_libraries (krfb_framebuffer_qt
                        Qt5::Core
                        Qt5::Gui
                        KF5::CoreAddons
+                       Qt::GuiPrivate
                        krfbprivate
 )
 
+set_target_properties(krfb_framebuffer_qt PROPERTIES OUTPUT_NAME qt)
 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )

framebuffers/qt/krfb_framebuffer_qt.json

@@ -1,84 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Qt based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en les Qt per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en les Qt per al KRfb.",
-        "Description[cs]": "Framebuffer založený na Qt pro KRfb.",
-        "Description[da]": "Qt-baseret framebuffer til KRfb.",
-        "Description[de]": "Qt-basierter Framebuffer für KRfb.",
-        "Description[el]": "Μνήμη ανανέωσης βίντεο με βάση τhn Qt για το KRfb.",
-        "Description[en_GB]": "Qt based Framebuffer for KRfb.",
-        "Description[es]": "Framebuffer basado en Qt para KRfb.",
-        "Description[et]": "KRfb Qt põhine kaadripuhver",
-        "Description[eu]": "KRfb-rako Qt-n oinarritutako «Framebuffer».",
-        "Description[fi]": "KRfb:n Qt-pohjainen kehyspuskuri.",
-        "Description[fr]": "Tampon d'images utilisant Qt pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en Qt para KRfb.",
-        "Description[ia]": "Framebuffer basate sur Qt per KRfb",
-        "Description[id]": "Framebuffer berbasiskan Qt untuk KRfb.",
-        "Description[it]": "Framebuffer basato su Qt per KRfb.",
-        "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.",
-        "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.",
-        "Description[nn]": "Qt-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki oparty na Qt dla KRfb.",
-        "Description[pt]": "'Framebuffer' baseado no Qt para o KRfb.",
-        "Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.",
-        "Description[ru]": "Буфер кадров для KRfb на базе Qt",
-        "Description[sk]": "Framebuffer založený na Qt pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na Qt",
-        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у",
-        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu Qt‑u",
-        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu Qt‑u",
-        "Description[sr]": "Кадробафер за КРФБ на основу КуТ‑у",
-        "Description[sv]": "X11-rambuffert för Krfb.",
-        "Description[tr]": "KRfb için Qt tabanlı Çerçeve tamponu.",
-        "Description[uk]": "Заснований на Qt буфер кадрів для KRfb.",
-        "Description[x-test]": "xxQt based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。",
-        "Description[zh_TW]": "KRfb 的 Qt-based Framebuffer",
-        "EnabledByDefault": true,
-        "Id": "qt",
-        "License": "GPL",
-        "Name": "Qt Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» de les Qt per al KRfb.",
-        "Name[ca]": "«Framebuffer» de les Qt per al KRfb.",
-        "Name[cs]": "Qt Framebuffer pro KRfb",
-        "Name[da]": "Qt-framebuffer til KRfb",
-        "Name[de]": "Qt-Framebuffer für KRfb",
-        "Name[el]": "Μνήμη ανανέωσης βίντεο Qt για το KRfb",
-        "Name[en_GB]": "Qt Framebuffer for KRfb",
-        "Name[es]": "Framebuffer de Qt para KRfb",
-        "Name[et]": "KRfb Qt kaadripuhver",
-        "Name[eu]": "KRfb-rako Qt «Framebuffer»",
-        "Name[fi]": "KRfb:n Qt-kehyspuskuri",
-        "Name[fr]": "Tampon d'images Qt pour KRfb",
-        "Name[gl]": "Framebuffer de Qt para KRfb",
-        "Name[ia]": "Framebuffer Qt per KRfb",
-        "Name[id]": "Qt Framebuffer untuk KRfb",
-        "Name[it]": "Framebuffer Qt per KRfb",
-        "Name[ko]": "KRfb용 Qt 프레임버퍼",
-        "Name[nl]": "Qt-framebuffer voor KRfb",
-        "Name[nn]": "Qt-biletbuffer for KRfb",
-        "Name[pl]": "Bufor ramki Qt dla KRfb",
-        "Name[pt]": "'Framebuffer' do Qt para o KRfb",
-        "Name[pt_BR]": "Framebuffer do Qt para o KRfb",
-        "Name[ru]": "Буфер кадров Qt для KRfb",
-        "Name[sk]": "Qt Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik Qt za KRfb",
-        "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
-        "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB",
-        "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB",
-        "Name[sr]": "КуТ‑ов кадробафер за КРФБ",
-        "Name[sv]": "QT-rambuffert för Krfb",
-        "Name[tr]": "KRfb için Qt Çerçeve tamponu",
-        "Name[uk]": "Буфер кадрів на Qt для KRfb",
-        "Name[x-test]": "xxQt Framebuffer for KRfbxx",
-        "Name[zh_CN]": "KRfb 的 Qt 帧缓冲",
-        "Name[zh_TW]": "Krfb 的 Qt Framebuffer",
-        "ServiceTypes": [
-            "krfb/framebuffer"
-        ],
-        "Version": "0.1",
-        "Website": "https://www.kde.org"
-    }
-}

framebuffers/qt/qtframebuffer.cpp

@@ -13,24 +13,23 @@
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
-#include <QGuiApplication>
+#include <QApplication>
 #include <QScreen>
-
+#include <qpa/qplatformnativeinterface.h>
 
 const int UPDATE_TIME = 500;
 
-QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
-    : FrameBuffer(id, parent)
+QtFrameBuffer::QtFrameBuffer(QObject *parent)
+    : FrameBuffer(parent)
 {
     QScreen *screen = QGuiApplication::primaryScreen();
+    QPlatformNativeInterface* native = qApp->platformNativeInterface();
+
     if (screen) {
+        win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), screen));
         primaryScreen = screen;
         fbImage = screen->grabWindow(win).toImage();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
         fb = new char[fbImage.sizeInBytes()];
-#else
-        fb = new char[fbImage.byteCount()];
-#endif
     } else {
         fb = nullptr;
         primaryScreen = nullptr;
@@ -108,11 +107,7 @@ void QtFrameBuffer::updateFrameBuffer()
     tiles.append(img.rect());
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
     memcpy(fb, img.bits(), static_cast<size_t>(img.sizeInBytes()));
-#else
-    memcpy(fb, img.bits(), img.byteCount());
-#endif
     fbImage = img;
 
 }

framebuffers/qt/qtframebuffer.h

@@ -22,7 +22,7 @@ class QtFrameBuffer : public FrameBuffer
 {
     Q_OBJECT
 public:
-    explicit QtFrameBuffer(WId id, QObject *parent = nullptr);
+    explicit QtFrameBuffer(QObject *parent = nullptr);
 
     ~QtFrameBuffer() override;
 
@@ -38,6 +38,7 @@ public Q_SLOTS:
     void updateFrameBuffer();
 
 private:
+    WId win;
     QImage fbImage;
     QTimer *t;
     QScreen *primaryScreen;

framebuffers/qt/qtframebufferplugin.cpp

@@ -24,21 +24,17 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
-			   registerPlugin<QtFrameBufferPlugin>();)
+K_PLUGIN_CLASS(QtFrameBufferPlugin)
 
 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
 {
 }
 
-QtFrameBufferPlugin::~QtFrameBufferPlugin()
+FrameBuffer *QtFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
-{
-    return new QtFrameBuffer(id);
+    Q_UNUSED(args);
+    return new QtFrameBuffer;
 }
 
 #include "qtframebufferplugin.moc"

framebuffers/qt/qtframebufferplugin.h

@@ -33,9 +33,8 @@ class QtFrameBufferPlugin : public FrameBufferPlugin
 
 public:
     QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
-    ~QtFrameBufferPlugin() override;
 
-    FrameBuffer *frameBuffer(WId id) override;
+    FrameBuffer *frameBuffer(const QVariantMap &args) override;
 
 private:
     Q_DISABLE_COPY(QtFrameBufferPlugin)

framebuffers/xcb/CMakeLists.txt

@@ -7,11 +7,20 @@ set (krfb_framebuffer_xcb_SRCS
       xcb_framebuffer.cpp
 )
 
+ecm_qt_declare_logging_category(krfb_framebuffer_xcb_SRCS
+    HEADER krfb_fb_xcb_debug.h
+    IDENTIFIER KRFB_FB_XCB
+    CATEGORY_NAME krfb.framebuffer.xcb
+    DESCRIPTION "KRFB XCB framebuffer plugin"
+    EXPORT KRFB
+)
+
 add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
 
 target_link_libraries (krfb_framebuffer_xcb
                        Qt5::Core
                        Qt5::Gui
+                       Qt::GuiPrivate
                        XCB::XCB
                        XCB::RENDER
                        XCB::SHAPE
@@ -23,6 +32,7 @@ target_link_libraries (krfb_framebuffer_xcb
                        krfbprivate
 )
 
+set_target_properties(krfb_framebuffer_xcb PROPERTIES OUTPUT_NAME xcb)
 install (TARGETS krfb_framebuffer_xcb
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )

framebuffers/xcb/krfb_framebuffer_xcb.json

@@ -1,84 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShm de l'X11 per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en XDamage/XShm de l'X11 per al KRfb.",
-        "Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.",
-        "Description[da]": "X11 XDamage/XShm-baseret framebuffer til KRfb.",
-        "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.",
-        "Description[el]": "Μνήμη ανανέωσης βίντεο με βάση το X11 XDamage/XShm για το KRfb.",
-        "Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.",
-        "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
-        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver",
-        "Description[eu]": "KRfb-rako «X11 XDamage/XShm»en oinarritutako «Framebuffer».",
-        "Description[fi]": "KRfb:n X11 XDamage/XShm -pohjainen kehyspuskuri.",
-        "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en X11 XDamage/Xshm para XRfb.",
-        "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.",
-        "Description[id]": "Framebuffer berbasiskan X11 XDamage/XShm untuk KRfb.",
-        "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.",
-        "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.",
-        "Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.",
-        "Description[nn]": "X11 XDamage/XShm-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.",
-        "Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.",
-        "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.",
-        "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm",
-        "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na X11 XDamage/XShm",
-        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
-        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
-        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
-        "Description[sr]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
-        "Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.",
-        "Description[tr]": "KRfb için X11 XDamage/XShm tabanlı Çerçeve tamponu.",
-        "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.",
-        "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。",
-        "Description[zh_TW]": "KRfb 的 X11 XDamage/XShm based Framebuffer",
-        "EnabledByDefault": true,
-        "Id": "xcb",
-        "License": "GPL",
-        "Name": "X11 Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» de l'X11 per al KRfb.",
-        "Name[ca]": "«Framebuffer» de l'X11 per al KRfb.",
-        "Name[cs]": "X11 Framebuffer pro KRfb",
-        "Name[da]": "X11-framebuffer til KRfb",
-        "Name[de]": "X11-Framebuffer für KRfb",
-        "Name[el]": "Μνήμη ανανέωσης βίντεο X11 για το KRfb.",
-        "Name[en_GB]": "X11 Framebuffer for KRfb",
-        "Name[es]": "Framebuffer X11 para KRfb",
-        "Name[et]": "KRfb X11 kaadripuhver",
-        "Name[eu]": "KRfb-rako «X11 Framebuffer»",
-        "Name[fi]": "KRfb:n X11-kehyspuskuri",
-        "Name[fr]": "Tampon d'images X11 pour KRfb",
-        "Name[gl]": "Framebuffer de X11 para KRfb",
-        "Name[ia]": "Framebuffer X11 per KRfb",
-        "Name[id]": "Framebuffer X11 untuk KRfb",
-        "Name[it]": "Framebuffer X11 per KRfb",
-        "Name[ko]": "KRfb용 X11 프레임버퍼",
-        "Name[nl]": "X11 framebuffer voor KRfb",
-        "Name[nn]": "X11-biletbuffer for KRfb",
-        "Name[pl]": "Bufor ramki X11 dla KRfb",
-        "Name[pt]": "'Framebuffer' do X11 para o KRfb",
-        "Name[pt_BR]": "Framebuffer do X11 para o KRfb",
-        "Name[ru]": "Буфер кадров X11 для KRfb",
-        "Name[sk]": "X11 Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik X11 za KRfb",
-        "Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.",
-        "Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.",
-        "Name[sr@latin]": "X11 kadrobafer za KRFB.",
-        "Name[sr]": "Икс11 кадробафер за КРФБ.",
-        "Name[sv]": "X11-rambuffert för Krfb",
-        "Name[tr]": "KRfb için X11 Çerçeve tamponu",
-        "Name[uk]": "Буфер кадрів X11 для KRfb",
-        "Name[x-test]": "xxX11 Framebuffer for KRfbxx",
-        "Name[zh_CN]": "XRfb 的 X11 帧缓冲",
-        "Name[zh_TW]": "KRfb 的 X11 Framebuffer",
-        "ServiceTypes": [
-            "krfb/framebuffer"
-        ],
-        "Version": "0.1",
-        "Website": "https://www.kde.org"
-    }
-}

framebuffers/xcb/xcb_framebuffer.cpp

@@ -8,8 +8,8 @@
 */
 
 #include "xcb_framebuffer.h"
+#include "krfb_fb_xcb_debug.h"
 
-#include <xcb/xcb.h>
 #include <xcb/xproto.h>
 #include <xcb/damage.h>
 #include <xcb/shm.h>
@@ -19,11 +19,11 @@
 #include <sys/shm.h>
 
 #include <QX11Info>
-#include <QCoreApplication>
+#include <QApplication>
 #include <QGuiApplication>
 #include <QScreen>
 #include <QAbstractNativeEventFilter>
-#include <QDebug>
+#include <qpa/qplatformnativeinterface.h>
 
 
 class KrfbXCBEventFilter: public QAbstractNativeEventFilter
@@ -68,7 +68,7 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
         }
 
 #ifdef _DEBUG
-        qDebug() << "xcb framebuffer: XDamage extension version:" <<
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XDamage extension version:" <<
                xdamage_version->major_version << "." << xdamage_version->minor_version;
 #endif
 
@@ -105,7 +105,7 @@ bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
     if (xdamageBaseEvent == 0) return false;  // no xdamage extension
 
     if (eventType == "xcb_generic_event_t") {
-        xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message);
+        auto ev = static_cast<xcb_generic_event_t *>(message);
         if ((ev->response_type & 0x7F) == (xdamageBaseEvent + XCB_DAMAGE_NOTIFY)) {
             // this is xdamage notification
             this->fb_owner->handleXDamageNotify(ev);
@@ -131,6 +131,7 @@ public:
     bool                    running;
 
     QRect                   area;  // capture area, primary monitor coordinates
+    WId                     win;
 };
 
 
@@ -145,8 +146,8 @@ static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
 
 
 
-XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
-    FrameBuffer(winid, parent), d(new XCBFrameBuffer::P)
+XCBFrameBuffer::XCBFrameBuffer(QObject *parent):
+    FrameBuffer(parent), d(new XCBFrameBuffer::P)
 {
     d->running = false;
     d->damage = XCB_NONE;
@@ -163,18 +164,24 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
 
     QScreen *primaryScreen = QGuiApplication::primaryScreen();
     if (primaryScreen) {
-        qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
+        QPlatformNativeInterface* native = qApp->platformNativeInterface();
+        d->win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), primaryScreen));
+        qreal scaleFactor = primaryScreen->devicePixelRatio();
+        d->area = { primaryScreen->geometry().topLeft() * scaleFactor,
+                    primaryScreen->geometry().bottomRight() * scaleFactor };
+
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
                  << ", geometry: " << primaryScreen->geometry()
+                 << ", device scaling: " << scaleFactor
+                 << ", native size: " << d->area
                  << ", depth: " << primaryScreen->depth();
-        //
-        d->area = primaryScreen->geometry();
     } else {
         qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
         return;
     }
 
     d->framebufferImage = xcb_image_get(QX11Info::connection(),
-                                        this->win,
+                                        d->win,
                                         d->area.left(),
                                         d->area.top(),
                                         d->area.width(),
@@ -183,7 +190,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                                         XCB_IMAGE_FORMAT_Z_PIXMAP);
     if (d->framebufferImage) {
 #ifdef _DEBUG
-        qDebug() << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
                  << ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
                  << ", depth: " << d->framebufferImage->depth
                  << ", padded width: " << d->framebufferImage->stride;
@@ -211,15 +218,15 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                     nullptr);                   // data = 0
         if (d->updateTile) {
 #ifdef _DEBUG
-            qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
-            qDebug() << "    size: " << d->updateTile->width << "x" << d->updateTile->height
-                     << "(stride: " << d->updateTile->stride << ")";
-            qDebug() << "    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth; // 32, 24
-            qDebug() << "    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data;
-            qDebug() << "    size:  " << d->updateTile->size;
-            qDebug() << "    image byte order = " << d->updateTile->byte_order;  // == 0 .._LSB_FIRST
-            qDebug() << "    image bit order = " << d->updateTile->bit_order;    // == 1 .._MSB_FIRST
-            qDebug() << "    image plane_mask = " << d->updateTile->plane_mask;  // == 16777215 == 0x00FFFFFF
+            qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Successfully created new empty image in native format"
+                << "\n    size: " << d->updateTile->width << "x" << d->updateTile->height
+                    << "(stride: " << d->updateTile->stride << ")"
+                << "\n    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth // 32, 24
+                << "\n    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data
+                << "\n    size:  " << d->updateTile->size
+                << "\n    image byte order = " << d->updateTile->byte_order   // == 0 .._LSB_FIRST
+                << "\n    image bit order = " << d->updateTile->bit_order     // == 1 .._MSB_FIRST
+                << "\n    image plane_mask = " << d->updateTile->plane_mask;  // == 16777215 == 0x00FFFFFF
 #endif
 
             // allocate shared memory block only once, make its size large enough
@@ -237,13 +244,13 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
             xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
 
 #ifdef _DEBUG
-            qDebug() << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
+            qCDebug(KRFB_FB_XCB) << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
 #endif
 
             // will return 1 on success (yes!)
             int shmget_res = xcb_image_shm_get(
                         QX11Info::connection(),
-                        this->win,
+                        d->win,
                         d->updateTile,
                         d->shminfo,
                         d->area.left(), // x
@@ -273,7 +280,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
     }
 
 #ifdef _DEBUG
-    qDebug() << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
+    qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
              << ", xshm base error = " << d->x11EvtFilter->xdamageBaseError
              << ", xdamage base event = " << d->x11EvtFilter->xdamageBaseEvent
              << ", xdamage base error = " << d->x11EvtFilter->xdamageBaseError;
@@ -420,10 +427,12 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
         format.blueMax  = root_visualtype->blue_mask >> format.blueShift;
 
 #ifdef _DEBUG
-        qDebug() << "    Calculated redShift   =" << (int)format.redShift;
-        qDebug() << "    Calculated greenShift =" << (int)format.greenShift;
-        qDebug() << "    Calculated blueShift  =" << (int)format.blueShift;
-        qDebug(     "    Calculated max values: R%d G%d B%d",
+        qCDebug(KRFB_FB_XCB,
+            "    Calculated redShift   = %d\n"
+            "    Calculated greenShift = %d\n"
+            "    Calculated blueShift  = %d\n"
+            "    Calculated max values: R%d G%d B%d",
+               format.redShift, format.greenShift, format.blueShift
                format.redMax, format.greenMax, format.blueMax);
 #endif
     } else {
@@ -477,10 +486,10 @@ void XCBFrameBuffer::cleanupRects() {
         QRect ri = r.intersected(d->area);
 
         if (tiles.size() > 0) {
-            for (int i = 0; i < tiles.size(); i++) {
-                // if current rect has intersection with tiles[i], unite them
-                if (ri.intersects(tiles[i])) {
-                    tiles[i] |= ri;
+            for (auto &tile : tiles) {
+                // if current rect has intersection with tile, unite them
+                if (ri.intersects(tile)) {
+                    tile |= ri;
                     inserted = true;
                     break;
                 }
@@ -498,25 +507,25 @@ void XCBFrameBuffer::cleanupRects() {
 
     // increase all rectangles size by 30 pixels each side.
     // limit coordinates to primary monitor boundaries.
-    for (int i = 0; i < tiles.size(); i++) {
-        tiles[i].adjust(-30, -30, 30, 30);
-        if (tiles[i].top() < d->area.top()) {
-            tiles[i].setTop(d->area.top());
+    for (auto &tile : tiles) {
+        tile.adjust(-30, -30, 30, 30);
+        if (tile.top() < d->area.top()) {
+            tile.setTop(d->area.top());
         }
-        if (tiles[i].bottom() > d->area.bottom()) {
-            tiles[i].setBottom(d->area.bottom());
+        if (tile.bottom() > d->area.bottom()) {
+            tile.setBottom(d->area.bottom());
         }
         //
-        if (tiles[i].left() < d->area.left()) {
-            tiles[i].setLeft(d->area.left());
+        if (tile.left() < d->area.left()) {
+            tile.setLeft(d->area.left());
         }
-        if (tiles[i].right() > d->area.right()) {
-            tiles[i].setRight(d->area.right());
+        if (tile.right() > d->area.right()) {
+            tile.setRight(d->area.right());
         }
         // move update rects so that they are positioned relative to
         //   framebuffer image, not whole screen
-        tiles[i].moveTo(tiles[i].left() - d->area.left(),
-                        tiles[i].top() - d->area.top());
+        tile.moveTo(tile.left() - d->area.left(),
+                    tile.top() - d->area.top());
     }
 }
 
@@ -549,7 +558,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                 // translate whe coordinates
                 xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
                             QX11Info::connection(),
-                            this->win,
+                            d->win,
                             d->area.left() + r.left(),
                             d->area.top()  + r.top(),
                             r.width(),
@@ -599,12 +608,12 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
         } else {
             // not using shared memory
             // will use just xcb_image_get() and copy pixels
-            for (const QRect& r : qAsConst(tiles)) {
+            for (const QRect& r : std::as_const(tiles)) {
                 // I did not find XGetSubImage() analog in XCB!!
                 // need function that copies pixels from one image to another
                 xcb_image_t *damagedImage = xcb_image_get(
                             QX11Info::connection(),
-                            this->win,
+                            d->win,
                             r.left(),
                             r.top(),
                             r.width(),
@@ -644,7 +653,7 @@ void XCBFrameBuffer::startMonitor() {
 
     d->running = true;
     d->damage = xcb_generate_id(QX11Info::connection());
-    xcb_damage_create(QX11Info::connection(), d->damage, this->win,
+    xcb_damage_create(QX11Info::connection(), d->damage, d->win,
             XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
 
     // (currently) we do not call xcb_damage_subtract() EVER, because
@@ -676,7 +685,7 @@ void XCBFrameBuffer::stopMonitor() {
 
 
 void XCBFrameBuffer::handleXDamageNotify(xcb_generic_event_t *xevent) {
-    xcb_damage_notify_event_t *xdevt = (xcb_damage_notify_event_t *)xevent;
+    auto xdevt = (xcb_damage_notify_event_t *)xevent;
 
     QRect r((int)xdevt->area.x,     (int)xdevt->area.y,
             (int)xdevt->area.width, (int)xdevt->area.height);

framebuffers/xcb/xcb_framebuffer.h

@@ -22,7 +22,7 @@ class XCBFrameBuffer: public FrameBuffer
 {
     Q_OBJECT
 public:
-    explicit XCBFrameBuffer(WId winid, QObject *parent = nullptr);
+    explicit XCBFrameBuffer(QObject *parent = nullptr);
     ~XCBFrameBuffer() override;
 
 public:

framebuffers/xcb/xcb_framebufferplugin.cpp

@@ -22,24 +22,17 @@
 #include "xcb_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(XCBFrameBufferPluginFactory, "krfb_framebuffer_xcb.json",
-               registerPlugin<XCBFrameBufferPlugin>();)
+K_PLUGIN_CLASS(XCBFrameBufferPlugin)
 
 XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
 {
 }
 
-
-XCBFrameBufferPlugin::~XCBFrameBufferPlugin()
+FrameBuffer *XCBFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-
-FrameBuffer *XCBFrameBufferPlugin::frameBuffer(WId id)
-{
-    return new XCBFrameBuffer(id);
+    Q_UNUSED(args);
+    return new XCBFrameBuffer;
 }
 
 #include "xcb_framebufferplugin.moc"

framebuffers/xcb/xcb_framebufferplugin.h

@@ -33,9 +33,8 @@ class XCBFrameBufferPlugin: public FrameBufferPlugin
 
 public:
    XCBFrameBufferPlugin(QObject *parent, const QVariantList &args);
-   ~XCBFrameBufferPlugin() override;
 
-   FrameBuffer *frameBuffer(WId id) override;
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;
 
 private:
    Q_DISABLE_COPY(XCBFrameBufferPlugin)

krfb/CMakeLists.txt

@@ -36,16 +36,10 @@ set_target_properties (krfbprivate PROPERTIES
 )
 
 install (TARGETS krfbprivate
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
          LIBRARY NAMELINK_SKIP
 )
 
-install (FILES
-         krfb-framebuffer.desktop
-         krfb-events.desktop
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
 #####################################
 # Second target: krfb - the app
 # itself.
@@ -66,11 +60,19 @@ set (krfb_SRCS
      invitationsrfbclient.cpp
 )
 
+ecm_qt_declare_logging_category(krfb_SRCS
+    HEADER krfbdebug.h
+    IDENTIFIER KRFB
+    CATEGORY_NAME krfb.krfb
+    DESCRIPTION "KRFB Application"
+    EXPORT KRFB
+)
+
 kconfig_add_kcfg_files (krfb_SRCS
                      krfbconfig.kcfgc
 )
 
-ki18n_wrap_ui (krfb_SRCS
+ki18n_wrap_ui (krfb_UI_SRCS
                    ui/configtcp.ui
                    ui/configsecurity.ui
                    ui/configframebuffer.ui
@@ -84,6 +86,7 @@ qt5_add_resources(krfb_SRCS
 
 add_executable (krfb
                      ${krfb_SRCS}
+                     ${krfb_UI_SRCS}
 )
 
 target_link_libraries (krfb
@@ -93,7 +96,6 @@ target_link_libraries (krfb
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
                        Qt5::Network
-                       KF5::Completion
                        KF5::CoreAddons
                        KF5::DBusAddons
                        KF5::DNSSD
@@ -113,13 +115,48 @@ if (X11_XTest_FOUND)
 endif (X11_XTest_FOUND)
 
 install (TARGETS krfb
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+#################################
+kconfig_add_kcfg_files (krfbvm_SRCS
+                     krfbconfig.kcfgc
+)
+
+ecm_qt_declare_logging_category(krfbvm_SRCS
+    HEADER krfbdebug.h
+    IDENTIFIER KRFB
+    CATEGORY_NAME krfb.krfb
+    DESCRIPTION "KRFB Application"
+    EXPORT KRFB
+)
+
+add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb_UI_SRCS}
+                                   rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
+target_link_libraries(krfb-virtualmonitor
+                      krfbprivate
+                      Qt5::Gui
+                      Qt5::Network
+                      KF5::ConfigGui
+                      KF5::CoreAddons
+                      KF5::I18n
+                      KF5::Notifications
+                      KF5::WindowSystem
+)
+
+install (TARGETS krfb-virtualmonitor
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+configure_file(org.kde.krfb.virtualmonitor.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop @ONLY)
+install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )
 
 ########### install files ###############
 
 install (PROGRAMS org.kde.krfb.desktop
-         DESTINATION ${XDG_APPS_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )
 
 install(FILES org.kde.krfb.appdata.xml
@@ -127,6 +164,6 @@ install(FILES org.kde.krfb.appdata.xml
 )
 
 install (FILES krfb.notifyrc
-         DESTINATION ${DATA_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
 )
 

krfb/config-krfb.h.cmake

@@ -9,3 +9,6 @@
 
 /* Define if XShm is available */
 #cmakedefine HAVE_XSHM 1
+
+/* Define if DMA-BUF support is available */
+#cmakedefine01 HAVE_DMA_BUF

krfb/connectiondialog.cpp

@@ -37,9 +37,9 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowTitle(i18n("New Connection"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    auto mainWidget = new QWidget(this);
+    auto mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);

krfb/events.h

@@ -36,7 +36,7 @@ class KRFBPRIVATE_EXPORT EventHandler : public QObject
     Q_OBJECT
 public:
     explicit EventHandler(QObject *parent = nullptr);
-    virtual ~EventHandler() = default;
+    ~EventHandler() override = default;
     virtual void handleKeyboard(bool down, rfbKeySym key) = 0;
     virtual void handlePointer(int buttonMask, int x, int y) = 0;
 

krfb/eventsmanager.cpp

@@ -23,15 +23,13 @@
 #include "eventsplugin.h"
 #include "krfbconfig.h"
 #include "rfbservermanager.h"
+#include "krfbdebug.h"
 
-#include <QDebug>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QtCore/QSharedPointer>
 
 class EventsManagerStatic
 {
@@ -43,76 +41,36 @@ Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)
 
 EventsManager::EventsManager()
 {
-    //qDebug();
-
-    loadPlugins();
+    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
+        const KPluginFactory::Result<EventsPlugin> result = KPluginFactory::instantiatePlugin<EventsPlugin>(data);
+        if (result.plugin) {
+            m_plugins.insert(data.pluginId(), result.plugin);
+            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
+        } else {
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
+        }
+    }
 }
 
-EventsManager::~EventsManager()
-{
-    //qDebug();
-}
+EventsManager::~EventsManager() = default;
 
 EventsManager *EventsManager::instance()
 {
-    //qDebug();
-
     return &eventsManagerStatic->instance;
 }
 
-void EventsManager::loadPlugins()
-{
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/events"));
-        });
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-    KPluginMetaData data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name()))
-            continue;
-        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
-
-        if (!factory) {
-            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
-            continue;
-        } else {
-            qDebug() << "found plugin at " << data.fileName();
-        }
-
-        EventsPlugin *plugin = factory->create<EventsPlugin>(this);
-        if (plugin) {
-            m_plugins.insert(data.pluginId(), plugin);
-            qDebug() << "Loaded plugin with name " << data.pluginId();
-        } else {
-            qDebug() << "unable to load plugin for " << data.fileName();
-        }
-        unique.insert (data.name());
-    }
-}
-
 QSharedPointer<EventHandler> EventsManager::eventHandler()
 {
-    QMap<QString, EventsPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        QSharedPointer<EventHandler> eventHandler(iter.value()->eventHandler());
-
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<EventHandler> eventHandler(it.value()->eventHandler());
         if (eventHandler) {
             eventHandler->setFrameBufferPlugin(RfbServerManager::instance()->framebuffer());
             return eventHandler;
         }
-
-        ++iter;
     }
 
     // No valid events plugin found.
-    qDebug() << "No valid event handlers found. returning null.";
+    qCDebug(KRFB) << "No valid event handlers found. returning null.";
     return QSharedPointer<EventHandler>();
 }

krfb/eventsmanager.h

@@ -43,7 +43,7 @@ class KRFBPRIVATE_EXPORT EventsManager : public QObject
 public:
     static EventsManager *instance();
 
-    virtual ~EventsManager();
+    ~EventsManager() override;
 
     QSharedPointer<EventHandler> eventHandler();
 
@@ -52,8 +52,6 @@ private:
 
     EventsManager();
 
-    void loadPlugins();
-
     QMap<QString, EventsPlugin *> m_plugins;
     QList<QWeakPointer<EventHandler> > m_eventHandlers;
 };

krfb/eventsplugin.h

@@ -33,7 +33,7 @@ class KRFBPRIVATE_EXPORT EventsPlugin : public QObject
     Q_OBJECT
 public:
     EventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~EventsPlugin();
+    ~EventsPlugin() override;
 
     virtual EventHandler *eventHandler() = 0;
 };

krfb/framebuffer.cpp

@@ -10,12 +10,11 @@
 #include "framebuffer.h"
 
 #include <config-krfb.h>
-
-#include <X11/Xutil.h>
+#include <QCursor>
 
 
-FrameBuffer::FrameBuffer(WId id, QObject *parent)
-    : QObject(parent), win(id)
+FrameBuffer::FrameBuffer(QObject *parent)
+    : QObject(parent)
 {
 }
 
@@ -73,3 +72,8 @@ void FrameBuffer::startMonitor()
 void FrameBuffer::stopMonitor()
 {
 }
+
+QPoint FrameBuffer::cursorPosition()
+{
+    return QCursor::pos();
+}

krfb/framebuffer.h

@@ -29,7 +29,7 @@ class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
     Q_OBJECT
 public:
-    explicit FrameBuffer(WId id, QObject *parent = nullptr);
+    explicit FrameBuffer(QObject *parent = nullptr);
 
     ~FrameBuffer() override;
 
@@ -42,16 +42,17 @@ public:
     virtual int depth();
     virtual void startMonitor();
     virtual void stopMonitor();
+    virtual QPoint cursorPosition();
 
     virtual void getServerFormat(rfbPixelFormat &format);
 
     virtual QVariant customProperty(const QString &property) const;
+
 Q_SIGNALS:
     void frameBufferChanged();
 
 protected:
-    WId win;
-    char *fb;
+    char *fb = nullptr;
     QList<QRect> tiles;
 
 private:

krfb/framebuffermanager.cpp

@@ -22,15 +22,13 @@
 
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
 
-#include <QDebug>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QSharedPointer>
 
 class FrameBufferManagerStatic
 {
@@ -42,63 +40,29 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {
-    //qDebug();
-
-    loadPlugins();
+    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
+        const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
+        if (result.plugin) {
+            m_plugins.insert(data.pluginId(), result.plugin);
+            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
+        } else {
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
+        }
+    }
 }
 
 FrameBufferManager::~FrameBufferManager()
 {
-    //qDebug();
 }
 
 FrameBufferManager *FrameBufferManager::instance()
 {
-    //qDebug();
-
     return &frameBufferManagerStatic->instance;
 }
 
-void FrameBufferManager::loadPlugins()
+QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVariantMap &args)
 {
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-        const KPluginMetaData &data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name()))
-            continue;
-        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
-
-        if (!factory) {
-            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
-            continue;
-        } else {
-            qDebug() << "found plugin at " << data.fileName();
-        }
-
-        FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
-        if (plugin) {
-            m_plugins.insert(data.pluginId(), plugin);
-            qDebug() << "Loaded plugin with name " << data.pluginId();
-        } else {
-            qDebug() << "unable to load pluign for " << data.fileName();
-        }
-        unique.insert (data.name());
-    }
-}
-
-QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
-{
-    //qDebug();
-
     // See if there is still an existing framebuffer to this WId.
     if (m_frameBuffers.contains(id)) {
         QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);
@@ -113,26 +77,20 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
     }
 
     // We don't already have that frame buffer.
-    QMap<QString, FrameBufferPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
-
-            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        if (it.key() == KrfbConfig::preferredFrameBufferPlugin()) {
+            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
 
+            QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(args));
             if (frameBuffer) {
                 m_frameBuffers.insert(id, frameBuffer.toWeakRef());
 
                 return frameBuffer;
             }
         }
-
-        ++iter;
     }
 
     // No valid framebuffer plugin found.
-    qDebug() << "No valid framebuffer found. returning null.";
+    qCDebug(KRFB) << "No valid framebuffer found. returning null.";
     return QSharedPointer<FrameBuffer>();
 }

krfb/framebuffermanager.h

@@ -45,15 +45,13 @@ public:
 
     ~FrameBufferManager() override;
 
-    QSharedPointer<FrameBuffer> frameBuffer(WId id);
+    QSharedPointer<FrameBuffer> frameBuffer(WId id, const QVariantMap &args);
 
 private:
     Q_DISABLE_COPY(FrameBufferManager)
 
     FrameBufferManager();
 
-    void loadPlugins();
-
     QMap<QString, FrameBufferPlugin *> m_plugins;
     QMap<WId, QWeakPointer<FrameBuffer> > m_frameBuffers;
 };

krfb/framebufferplugin.h

@@ -34,10 +34,10 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
     Q_OBJECT
 
 public:
-    FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    explicit FrameBufferPlugin(QObject *parent, const QVariantList &args);
     ~FrameBufferPlugin() override;
 
-    virtual FrameBuffer *frameBuffer(WId id) = 0;
+    virtual FrameBuffer *frameBuffer(const QVariantMap &args) = 0;
 };
 
 #endif  // Header guard

krfb/invitationsrfbclient.cpp

@@ -24,11 +24,11 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "connectiondialog.h"
+#include "krfbdebug.h"
 
 #include <KNotification>
 #include <KLocalizedString>
 
-#include <QDebug>
 #include <QSocketNotifier>
 #include <poll.h>
 #include <KConfigGroup>
@@ -41,7 +41,7 @@ struct PendingInvitationsRfbClient::Private
     {}
 
     rfbClientPtr client;
-    QSocketNotifier *notifier;
+    QSocketNotifier *notifier = nullptr;
     bool askOnConnect;
 };
 
@@ -52,10 +52,6 @@ PendingInvitationsRfbClient::PendingInvitationsRfbClient(rfbClientPtr client, QO
     d(new Private(client))
 {
     d->client->clientGoneHook = clientGoneHookNoop;
-    d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
-    d->notifier->setEnabled(true);
-    connect(d->notifier, &QSocketNotifier::activated,
-            this, &PendingInvitationsRfbClient::onSocketActivated);
 }
 
 PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
@@ -79,7 +75,7 @@ void PendingInvitationsRfbClient::processNewClient()
                             i18n("Received connection from %1, on hold (waiting for confirmation)",
                                 host));
 
-        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(nullptr);
+        auto dialog = new InvitationsConnectionDialog(nullptr);
         dialog->setRemoteHost(host);
         dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
@@ -90,42 +86,9 @@ void PendingInvitationsRfbClient::processNewClient()
     }
 }
 
-void PendingInvitationsRfbClient::onSocketActivated()
-{
-    //Process not only one, but all pending messages.
-    //poll() idea/code copied from vino:
-    // Copyright (C) 2003 Sun Microsystems, Inc.
-    // License: GPL v2 or later
-    struct pollfd pollfd = { d->client->sock, POLLIN|POLLPRI, 0 };
-
-    while(poll(&pollfd, 1, 0) == 1) {
-
-        if(d->client->state == rfbClientRec::RFB_INITIALISATION) {
-            d->notifier->setEnabled(false);
-            //Client is Authenticated
-            processNewClient();
-            break;
-        }
-        rfbProcessClientMessage(d->client);
-
-        //This is how we handle disconnection.
-        //if rfbProcessClientMessage() finds out that it can't read the socket,
-        //it closes it and sets it to -1. So, we just have to check this here
-        //and call rfbClientConnectionGone() if necessary. This will call
-        //the clientGoneHook which in turn will remove this RfbClient instance
-        //from the server manager and will call deleteLater() to delete it
-        if (d->client->sock == -1) {
-            qDebug() << "disconnected from socket signal";
-            d->notifier->setEnabled(false);
-            rfbClientConnectionGone(d->client);
-            break;
-        }
-    }
-}
-
 bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
-    qDebug() << "about to start authentication";
+    qCDebug(KRFB) << "about to start authentication";
 
     if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
             InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
@@ -141,10 +104,10 @@ bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPass
 
 void PendingInvitationsRfbClient::dialogAccepted()
 {
-    InvitationsConnectionDialog *dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
+    auto dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
     Q_ASSERT(dialog);
 
-    InvitationsRfbClient *client = new InvitationsRfbClient(m_rfbClient, parent());
+    auto client = new InvitationsRfbClient(m_rfbClient, parent());
     client->setControlEnabled(dialog->allowRemoteControl());
     accept(client);
 }

krfb/invitationsrfbclient.h

@@ -37,7 +37,6 @@ public:
 
 protected Q_SLOTS:
     void processNewClient() override;
-    virtual void onSocketActivated();
     bool checkPassword(const QByteArray & encryptedPassword) override;
 
 private Q_SLOTS:

krfb/invitationsrfbserver.cpp

@@ -21,21 +21,29 @@
 #include "invitationsrfbserver.h"
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
-#include "rfbservermanager.h"
+#include "krfbdebug.h"
 #include <QTimer>
 #include <QApplication>
 #include <QHostInfo>
-#include <QDebug>
+#include <QRandomGenerator>
 
 #include <KLocalizedString>
 #include <KUser>
-#include <KRandom>
 #include <KStringHandler>
 #include <KWallet/KWallet>
 
-#include <dnssd/publicservice.h>
+#include <kdnssd_version.h>
+#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
+#include <KDNSSD/PublicService>
+#else
+#include <DNSSD/PublicService>
+#endif
+
 using KWallet::Wallet;
 
+// used for KWallet folder name
+static const QString s_krfbFolderName(QStringLiteral("krfb"));
+
 //static
 InvitationsRfbServer *InvitationsRfbServer::instance;
 
@@ -69,6 +77,9 @@ const QString& InvitationsRfbServer::desktopPassword() const
 void InvitationsRfbServer::setDesktopPassword(const QString& password)
 {
     m_desktopPassword = password;
+    // this is called from GUI every time desktop password is edited.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 const QString& InvitationsRfbServer::unattendedPassword() const
@@ -79,6 +90,9 @@ const QString& InvitationsRfbServer::unattendedPassword() const
 void InvitationsRfbServer::setUnattendedPassword(const QString& password)
 {
     m_unattendedPassword = password;
+    // this is called from GUI every time unattended password is edited.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 bool InvitationsRfbServer::allowUnattendedAccess() const
@@ -106,6 +120,9 @@ void InvitationsRfbServer::stop()
 void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
 {
     m_allowUnattendedAccess = allow;
+    // this is called from GUI every time unattended access is toggled.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 InvitationsRfbServer::InvitationsRfbServer()
@@ -120,19 +137,11 @@ InvitationsRfbServer::InvitationsRfbServer()
 InvitationsRfbServer::~InvitationsRfbServer()
 {
     InvitationsRfbServer::stop();  // calling virtual funcs in destructor is bad
-
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(), "Security");
-    krfbConfig.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
-
+    saveSecuritySettings();
+    // ^^ also saves passwords in kwallet,
+    //    do it before closing kwallet
     if (!KrfbConfig::noWallet() && m_wallet) {
         closeKWallet();
-    } else {
-        krfbConfig.writeEntry("desktopPassword",
-                KStringHandler::obscure(m_desktopPassword));
-        krfbConfig.writeEntry("unattendedPassword",
-                KStringHandler::obscure(m_unattendedPassword));
-        krfbConfig.writeEntry("allowUnattendedAccess",
-                m_allowUnattendedAccess);
     }
 }
 
@@ -153,13 +162,6 @@ void InvitationsRfbServer::openKWallet()
 void InvitationsRfbServer::closeKWallet()
 {
     if (m_wallet && m_wallet->isOpen()) {
-        const QString krfbFolderName = QStringLiteral("krfb");
-        if ((m_wallet->currentFolder() == krfbFolderName) ||
-                ((m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName)) &&
-                m_wallet->setFolder(krfbFolderName)) ) {
-            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
-            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
-        }
         delete m_wallet; // closes the wallet
         m_wallet = nullptr;
     }
@@ -170,32 +172,29 @@ void InvitationsRfbServer::walletOpened(bool opened)
     QString desktopPassword;
     QString unattendedPassword;
     Q_ASSERT(m_wallet);
-    const QString krfbFolderName = QStringLiteral("krfb");
-    if( opened &&
-            ( m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName) ) &&
-            m_wallet->setFolder(krfbFolderName) ) {
 
-        if(m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword)==0 &&
+    if (opened && m_wallet->hasFolder(s_krfbFolderName) && m_wallet->setFolder(s_krfbFolderName) ) {
+        if (m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword) == 0 &&
                 !desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
-            emit passwordChanged(m_desktopPassword);
+            Q_EMIT passwordChanged(m_desktopPassword);
         }
 
-        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword)==0 &&
+        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword) == 0 &&
                 !unattendedPassword.isEmpty()) {
             m_unattendedPassword = unattendedPassword;
         }
 
     } else {
 
-        qDebug() << "Could not open KWallet, Falling back to config file";
+        qCDebug(KRFB) << "Could not open KWallet, Falling back to config file";
         KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
 
         desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
                 "desktopPassword", QString()));
         if(!desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
-            emit passwordChanged(m_desktopPassword);
+            Q_EMIT passwordChanged(m_desktopPassword);
         }
 
         unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
@@ -213,7 +212,7 @@ QString InvitationsRfbServer::readableRandomString(int length)
 {
     QString str;
     while (length) {
-        int r = KRandom::random() % 62;
+        int r = QRandomGenerator::global()->bounded(62);
         r += 48;
         if (r > 57) {
             r += 7;
@@ -236,3 +235,31 @@ QString InvitationsRfbServer::readableRandomString(int length)
     }
     return str;
 }
+
+// one place to deal with all security configuration
+void InvitationsRfbServer::saveSecuritySettings()
+{
+    KConfigGroup secConfigGroup(KSharedConfig::openConfig(), "Security");
+    secConfigGroup.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
+    if (KrfbConfig::noWallet()) {
+        // save passwords in config file only if not using kwallet integration
+        secConfigGroup.writeEntry("desktopPassword", KStringHandler::obscure(m_desktopPassword));
+        secConfigGroup.writeEntry("unattendedPassword", KStringHandler::obscure(m_unattendedPassword));
+    } else {
+        // using KWallet, erase possibly stored passwords from krfbrc file
+        secConfigGroup.deleteEntry("desktopPassword");
+        secConfigGroup.deleteEntry("unattendedPassword");
+        // update passwords in kwallet
+        if (m_wallet && m_wallet->isOpen()) {
+            if (!m_wallet->hasFolder(s_krfbFolderName)) {
+                m_wallet->createFolder(s_krfbFolderName);
+            }
+            if (m_wallet->currentFolder() != s_krfbFolderName) {
+                m_wallet->setFolder(s_krfbFolderName);
+            }
+            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
+            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
+        }
+    }
+    KrfbConfig::self()->save();
+}

krfb/invitationsrfbserver.h

@@ -52,6 +52,7 @@ public Q_SLOTS:
     void toggleUnattendedAccess(bool allow);
     void openKWallet();
     void closeKWallet();
+    void saveSecuritySettings();
 
 protected:
     InvitationsRfbServer();
@@ -62,11 +63,11 @@ private Q_SLOTS:
     void walletOpened(bool);
 
 private:
-    KDNSSD::PublicService *m_publicService;
+    KDNSSD::PublicService *m_publicService = nullptr;
     bool m_allowUnattendedAccess;
     QString m_desktopPassword;
     QString m_unattendedPassword;
-    KWallet::Wallet *m_wallet;
+    KWallet::Wallet *m_wallet = nullptr;
 
     QString readableRandomString(int);
     Q_DISABLE_COPY(InvitationsRfbServer)

krfb/krfb-events.desktop

@@ -1,31 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/events
-
-Comment=Event plugins for KRfb
-Comment[ca]=Connectors d'esdeveniments per al KRfb.
-Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb.
-Comment[cs]=Moduly událostí pro KRfb
-Comment[de]=Ereignis-Module für KRfb
-Comment[el]=Πρόσθετα γεγονότων για το KRfb
-Comment[en_GB]=Event plugins for KRfb
-Comment[es]=Complementos de eventos para KRfb
-Comment[et]=KRfb sündmuste pluginad
-Comment[eu]=KRfb-rako gertaeren pluginak
-Comment[fi]=KRfb:n tapahtumaliitännäinen
-Comment[fr]=Modules externes d'événements pour Krfb
-Comment[gl]=Complementos de eventos para KRfb
-Comment[it]=Estensioni degli eventi per KRfb
-Comment[ko]=KRfb 이벤트 플러그인
-Comment[nl]=Plug-ins voor gebeurtenis voor KRfb
-Comment[nn]=Hendingstillegg for KRfb
-Comment[pl]=Wtyczki wydarzeń dla KRfb
-Comment[pt]='Plugins' de eventos para o KRfb
-Comment[pt_BR]=Plugins de evento para o KRfb
-Comment[sk]=Doplnky udalostí pre KRfb
-Comment[sv]=Händelseinsticksprogram för Krfb
-Comment[uk]=Додатки обробки подій для KRfb
-Comment[x-test]=xxEvent plugins for KRfbxx
-Comment[zh_CN]=KRfb 事件插件
-Comment[zh_TW]=KRfb 的事件外掛程式
-

krfb/krfb-events.json

@@ -1,31 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Events plugins for KRfb",
-        "Description[ca@valencia]": "Connectors d'esdeveniments per al KRfb.",
-        "Description[ca]": "Connectors d'esdeveniments per al KRfb.",
-        "Description[cs]": "Moduly událostí pro KRfb",
-        "Description[de]": "Ereignis-Module für KRfb",
-        "Description[el]": "Πρόσθετα γεγονότων για το KRfb",
-        "Description[en_GB]": "Events plugins for KRfb",
-        "Description[es]": "Complementos de eventos para KRfb",
-        "Description[et]": "KRfb sündmuste pluginad",
-        "Description[eu]": "KRfb-rako gertaeren pluginak",
-        "Description[fi]": "KRfb:n tapahtumaliitännäinen",
-        "Description[fr]": "Modules externes d'évènements pour KRfb",
-        "Description[gl]": "Complementos de eventos para KRfb",
-        "Description[it]": "Estensioni degli eventi per KRfb",
-        "Description[ko]": "KRfb 이벤트 플러그인",
-        "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb",
-        "Description[nn]": "Hendingstillegg for KRfb",
-        "Description[pl]": "Wtyczki wydarzeń dla KRfb",
-        "Description[pt]": "'Plugins' de eventos para o KRfb",
-        "Description[pt_BR]": "Plugins de evento para o KRfb",
-        "Description[sk]": "Doplnky udalostí pre KRfb",
-        "Description[sv]": "Händelseinsticksprogram för Krfb",
-        "Description[uk]": "Додатки обробки подій для KRfb",
-        "Description[x-test]": "xxEvents plugins for KRfbxx",
-        "Description[zh_CN]": "KRfb 事件插件",
-        "Description[zh_TW]": "KRfb 的事件外掛程式"
-    },
-    "X-KDE-ServiceType": "krfb/events"
-}

krfb/krfb-framebuffer.desktop

@@ -1,55 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/framebuffer
-
-Comment=Frame Buffer plugins for KRfb
-Comment[bg]=Приставки за фреймбуфер за KRfb
-Comment[bs]=Priključci framebafera za KRfb
-Comment[ca]=Connectors de «framebuffer» per al KRfb.
-Comment[ca@valencia]=Connectors de «framebuffer» per al KRfb.
-Comment[cs]=Moduly Frame bufferu pro KRfb
-Comment[da]=Framebuffer-plugins til KRfb
-Comment[de]=Framebuffer-Module für KRfb
-Comment[el]=Πρόσθετα μνήμης εξόδου βίντεο καρέ για το KRfb
-Comment[en_GB]=Frame Buffer plugins for KRfb
-Comment[es]=Complementos de memoria intermedia de vídeo para KRfb
-Comment[et]=KRfb kaadripuhvri plugin
-Comment[eu]=Irteerako bideoaren pluginak KRfb-rentzako
-Comment[fi]=Kehyspuskuriliitännäinen kohteelle KRfb
-Comment[fr]=Modules externes de sortie vidéo pour Krfb
-Comment[ga]=Breiseáin Mhaoláin Fráma le haghaidh KRfb
-Comment[gl]=Complementos de búfer de fotograma para KRfb
-Comment[hr]=Priključci za međuspremnike okvira za KRfb
-Comment[hu]=Framebuffer bővítmények a Krfb-hez
-Comment[ia]=Plug-ins de Frame Buffer per KRfb
-Comment[id]=Plugin Frame Buffer untuk KRfb
-Comment[it]=Estensioni del framebuffer per KRfb
-Comment[ja]=KRfb の フレームバッファプラグイン
-Comment[kk]=KRfb кадр буфер плагині
-Comment[km]=កម្មវិធី​ជំនួយ​ Frame Buffer សម្រាប់ KRfb
-Comment[ko]=KRfb 프레임버퍼 플러그인
-Comment[lt]=Frame Buffer papildiniai skirti KRfb
-Comment[lv]=Kadru bufera sprudņi priekš KRfb
-Comment[nb]=Rammebuffer-programtillegg for KRfb
-Comment[nds]=Bildpuffer-Modulen för KRfb
-Comment[nl]=Framebuffer-plugins voor KRfb
-Comment[nn]=Framebuffer-tillegg KRfb
-Comment[pa]=KRfb ਲਈ ਫਰੇਮ ਬਫ਼ਰ ਪਲੱਗਇਨ
-Comment[pl]=Wtyczki buforów ramek dla KRfb
-Comment[pt]='Plugins' do 'Framebuffer' para o KRfb
-Comment[pt_BR]=Plugins de framebuffers para o KRfb
-Comment[ru]=Модуль буфера кадров для KRfb
-Comment[si]=KRfb සඳහා රාමු බෆර ප්ලගින
-Comment[sk]=Frame Buffer modul pre KRfb
-Comment[sl]=Vstavki slikovnih medpomnilnikov za KRFB
-Comment[sr]=Прикључци кадробафера за КРФБ
-Comment[sr@ijekavian]=Прикључци кадробафера за КРФБ
-Comment[sr@ijekavianlatin]=Priključci kadrobafera za KRFB
-Comment[sr@latin]=Priključci kadrobafera za KRFB
-Comment[sv]=Insticksprogram med rambuffert för Krfb
-Comment[th]=ส่วนเสริมของ KRfb สำหรับจัดการเฟรมบัฟเฟอร์
-Comment[tr]=KRfb için Çerçeve Tamponu eklentileri
-Comment[uk]=Додатки буфера кадрів для KRfb
-Comment[x-test]=xxFrame Buffer plugins for KRfbxx
-Comment[zh_CN]=KRfb 的帧缓冲插件
-Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式

krfb/krfb-framebuffer.json

@@ -1,41 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Frame Buffer plugins for KRfb",
-        "Description[ca@valencia]": "Connectors de «Frame Buffer» per al KRfb.",
-        "Description[ca]": "Connectors de «Frame Buffer» per al KRfb.",
-        "Description[cs]": "Moduly Frame bufferu pro KRfb",
-        "Description[da]": "Framebuffer-plugins til KRfb",
-        "Description[de]": "Framebuffer-Module für KRfb",
-        "Description[el]": "Πρόσθετα μνήμης ανανέωσης βίντεο καρέ για το KRfb",
-        "Description[en_GB]": "Frame Buffer plugins for KRfb",
-        "Description[es]": "Complementos de framebuffer para KRfb",
-        "Description[et]": "KRfb kaadripuhvri pluginad",
-        "Description[eu]": "KRfb-rako «Frame Buffer» pluginak",
-        "Description[fi]": "KRfb:n kehyspuskuriliitännäinen",
-        "Description[fr]": "Modules de tampons d'image pour KRfb",
-        "Description[gl]": "Complemento de búfer de fotograma para KRfb",
-        "Description[ia]": "Plug-ins de Frame Buffer per KRfb",
-        "Description[id]": "Plugin Frame Buffer untuk KRfb",
-        "Description[it]": "Estensioni del framebuffer per KRfb",
-        "Description[ko]": "KRfb 프레임버퍼 플러그인",
-        "Description[nl]": "Framebuffer-plugins voor KRfb",
-        "Description[nn]": "Biletbuffer-tillegg KRfb",
-        "Description[pl]": "Wtyczki buforów ramek dla KRfb",
-        "Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",
-        "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
-        "Description[ru]": "Модули буфера кадров для KRfb",
-        "Description[sk]": "Frame Buffer modul pre KRfb",
-        "Description[sl]": "Vstavki slikovnih medpomnilnikov za KRfb",
-        "Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ",
-        "Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB",
-        "Description[sr@latin]": "Priključci kadrobafera za KRFB",
-        "Description[sr]": "Прикључци кадробафера за КРФБ",
-        "Description[sv]": "Insticksprogram med rambuffert för Krfb",
-        "Description[tr]": "KRfb için Çerçeve Tamponu eklentileri",
-        "Description[uk]": "Додатки буфера кадрів для KRfb",
-        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx",
-        "Description[zh_CN]": "KRfb 的帧缓冲插件",
-        "Description[zh_TW]": "KRfb 的 Frame Buffer 外掛程式"
-    },
-    "X-KDE-ServiceType": "krfb/framebuffer"
-}

krfb/krfb.notifyrc

@@ -518,7 +518,7 @@ Name[nds]=Leeg Passwoort
 Name[nl]=Ongeldig wachtwoord
 Name[nn]=Ugyldig passord
 Name[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Name[pl]=Błędne hasło
+Name[pl]=Nieprawidłowe hasło
 Name[pt]=Senha Inválida
 Name[pt_BR]=Senha inválida
 Name[ro]=Parolă nevalidă
@@ -589,7 +589,7 @@ Comment[nl]=Ongeldig wachtwoord
 Comment[nn]=Passordet var ugyldig
 Comment[oc]=Mot de pas invalid
 Comment[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Comment[pl]=Błędne hasło
+Comment[pl]=Nieprawidłowe hasło
 Comment[pt]=A senha é inválida
 Comment[pt_BR]=Senha inválida
 Comment[ro]=Parolă nevalidă
@@ -624,8 +624,8 @@ Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
-Name[ca]=Contrasenya de les invitacions no vàlides
-Name[ca@valencia]=Contrasenya de les invitacions no vàlides
+Name[ca]=Contrasenya no vàlida de les invitacions
+Name[ca@valencia]=Contrasenya no vàlida de les invitacions
 Name[cs]=Neplatné hesla výzev
 Name[da]=Ugyldige adgangskodeinvitationer
 Name[de]=Ungültiges Einladungs-Passwort
@@ -1213,8 +1213,8 @@ Comment[ar]=استقبال اتصال غير متوقع، إنهاء
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini
-Comment[ca]=S'ha rebut una connexió inesperada, avortant
-Comment[ca@valencia]=S'ha rebut una connexió inesperada, avortant
+Comment[ca]=S'ha rebut una connexió inesperada, s'està interrompent
+Comment[ca@valencia]=S'ha rebut una connexió inesperada, s'està interrompent
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
 Comment[da]=Modtog uventet forbindelse, afbrød
@@ -1253,7 +1253,7 @@ Comment[nl]=Ontving een onverwachte verbinding, afgebroken
 Comment[nn]=Fekk ei uventa tilkopling, så avbryt no
 Comment[pl]=Otrzymano niespodziewane połączenie. Przerwane.
 Comment[pt]=Foi recebida uma ligação inesperada, pelo que foi interrompida
-Comment[pt_BR]=Conexão recebida inesperadamente; abortar
+Comment[pt_BR]=Conexão recebida inesperadamente; cancelar
 Comment[ro]=Conexiune neașteptată recepționată, abandonare
 Comment[ru]=Получено неожиданное соединение. Отключение
 Comment[si]=බලාපොරොත්තු රහිත සබඳතාවක් ලැබිනි, පිටවෙමින්

krfb/krfb_rfb_handler.client

@@ -1,7 +0,0 @@
-[org.freedesktop.Telepathy.Client]
-Interfaces=org.freedesktop.Telepathy.Client.Handler;
-
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamTube
-org.freedesktop.Telepathy.Channel.Type.StreamTube.Service s=rfb
-org.freedesktop.Telepathy.Channel.Requested b=true

krfb/main-virtualmonitor.cpp

@@ -0,0 +1,175 @@
+/* This file is part of the KDE project
+   Copyright (C) 2021 Aleix Pol Gonzalez <aleixpol@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+*/
+
+#include <QApplication>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
+#include <QDebug>
+#include <QTimer>
+#include <KNotification>
+#include <KLocalizedString>
+#include <KWindowSystem>
+#include <KAboutData>
+#include "sockethelpers.h"
+#include "krfb_version.h"
+#include "rfbserver.h"
+#include <signal.h>
+#include "rfbservermanager.h"
+
+class VirtualMonitorRfbClient : public RfbClient
+{
+public:
+    explicit VirtualMonitorRfbClient(rfbClientPtr client, QObject *parent = nullptr)
+        : RfbClient(client, parent)
+    {}
+};
+
+class PendingVirtualMonitorRfbClient : public PendingRfbClient
+{
+public:
+    explicit PendingVirtualMonitorRfbClient(rfbClientPtr client, QObject *parent = nullptr)
+        : PendingRfbClient(client, parent)
+    {}
+    ~PendingVirtualMonitorRfbClient() override {}
+
+    static QByteArray password;
+
+protected:
+    void processNewClient() override {
+        qDebug() << "new client!";
+        const QString host = peerAddress(m_rfbClient->sock) + QLatin1Char(':') + QString::number(peerPort(m_rfbClient->sock));
+
+        KNotification::event(QStringLiteral("NewConnectionAutoAccepted"),
+                            i18n("Creating a Virtual Monitor from %1", host));
+    }
+    bool checkPassword(const QByteArray & encryptedPassword) override {
+        bool b = vncAuthCheckPassword(password, encryptedPassword);
+        if (b) {
+            QTimer::singleShot(0, this, [this] {
+                accept(new VirtualMonitorRfbClient(m_rfbClient, parent()));
+            });
+        }
+        return b;
+    }
+};
+
+QByteArray PendingVirtualMonitorRfbClient::password;
+
+class VirtualMonitorRfbServer : public RfbServer
+{
+public:
+    PendingRfbClient *newClient(rfbClientPtr client) override {
+        qDebug() << "new client request";
+        return new PendingVirtualMonitorRfbClient(client, this);
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    KLocalizedString::setApplicationDomain("krfb");
+
+    KAboutData aboutData(QStringLiteral("krfb-virtualmonitor"),
+                         i18n("Remote Virtual Monitor"),
+                         QStringLiteral(KRFB_VERSION_STRING),
+                         i18n("Offer a Virtual Monitor that can be accessed remotely"),
+                         KAboutLicense::GPL,
+                         i18n("(c) 2009-2010, Collabora Ltd.\n"
+                               "(c) 2007, Alessandro Praduroux\n"
+                               "(c) 2001-2003, Tim Jansen\n"
+                               "(c) 2001, Johannes E. Schindelin\n"
+                               "(c) 2000-2001, Const Kaplinsky\n"
+                               "(c) 2000, Tridia Corporation\n"
+                               "(c) 1999, AT&T Laboratories Boston\n"));
+    aboutData.addAuthor(QStringLiteral("Aleix Pol i Gonzalez"), i18n("Virtual Monitor implementation"), QStringLiteral("aleixpol@kde.org"));
+    aboutData.addAuthor(i18n("George Kiagiadakis"), QString(), QStringLiteral("george.kiagiadakis@collabora.co.uk"));
+    aboutData.addAuthor(i18n("Alessandro Praduroux"), i18n("KDE4 porting"), QStringLiteral("pradu@pradu.it"));
+    aboutData.addAuthor(i18n("Tim Jansen"), i18n("Original author"), QStringLiteral("tim@tjansen.de"));
+    aboutData.addCredit(i18n("Johannes E. Schindelin"),
+                        i18n("libvncserver"));
+    aboutData.addCredit(i18n("Const Kaplinsky"),
+                        i18n("TightVNC encoder"));
+    aboutData.addCredit(i18n("Tridia Corporation"),
+                        i18n("ZLib encoder"));
+    aboutData.addCredit(i18n("AT&T Laboratories Boston"),
+                        i18n("original VNC encoders and "
+                              "protocol design"));
+    KAboutData::setApplicationData(aboutData);
+
+    QCommandLineParser parser;
+    aboutData.setupCommandLine(&parser);
+    const QCommandLineOption resolutionOption({ QStringLiteral("resolution") }, i18n("Logical resolution of the new monitor"), i18n("resolution"));
+    parser.addOption(resolutionOption);
+    const QCommandLineOption nameOption({ QStringLiteral("name") }, i18n("Name of the monitor"), i18n("name"));
+    parser.addOption(nameOption);
+    const QCommandLineOption passwordOption({ QStringLiteral("password") }, i18n("Password for the client to connect to it"), i18n("password"));
+    parser.addOption(passwordOption);
+    const QCommandLineOption scaleOption({ QStringLiteral("scale") }, i18n("The device-pixel-ratio of the device, the scaling factor"), i18n("dpr"), QStringLiteral("1"));
+    parser.addOption(scaleOption);
+    const QCommandLineOption portOption({ QStringLiteral("port") }, i18n("The port we will be listening to"), i18n("number"), QStringLiteral("9999"));
+    parser.addOption(portOption);
+
+    parser.process(app);
+    aboutData.processCommandLine(&parser);
+
+    app.setQuitOnLastWindowClosed(false);
+
+    if (!KWindowSystem::isPlatformWayland()) {
+        qCritical() << "Virtual Monitors are only supported on Wayland";
+        return 1;
+    }
+    if (!parser.isSet(nameOption)) {
+        qCritical() << "error: please define --name";
+        return 2;
+    } else {
+        if (!parser.isSet(passwordOption)) {
+            qCritical() << "error: please define --password";
+            return 3;
+        }
+        if (!parser.isSet(resolutionOption)) {
+            qCritical() << "error: please define --resolution";
+            return 4;
+        }
+    }
+    if (!parser.isSet(portOption)) {
+        qCritical() << "error: please define --port";
+        return 5;
+    }
+    const QString res = parser.value(resolutionOption);
+    const auto resSplit = res.split(QLatin1Char('x'));
+    if (resSplit.size() != 2) {
+        qCritical() << "error: the resolution should be formatted as WIDTHxHEIGHT (e.g. --resolution 1920x1080)";
+        return 6;
+    }
+
+
+    if (parser.isSet(nameOption)) {
+        RfbServerManager::s_pluginArgs = {
+            { QStringLiteral("name"), parser.value(nameOption) },
+            { QStringLiteral("resolution"), QSize(resSplit[0].toInt(), resSplit[1].toInt()) },
+            { QStringLiteral("scale"), parser.value(scaleOption).toDouble() },
+        };
+    }
+
+    VirtualMonitorRfbServer server;
+    server.setPasswordRequired(true);
+    server.setListeningPort(parser.value(portOption).toInt());
+    PendingVirtualMonitorRfbClient::password = parser.value(passwordOption).toUtf8();
+
+    sigset_t sigs;
+    sigemptyset(&sigs);
+    sigaddset(&sigs, SIGPIPE);
+    sigprocmask(SIG_BLOCK, &sigs, nullptr);
+    if (!server.start()) {
+        return 1;
+    }
+
+    return app.exec();
+}

krfb/main.cpp

@@ -20,6 +20,7 @@
 #include "invitationsrfbserver.h"
 #include "krfbconfig.h"
 #include "krfb_version.h"
+#include "krfbdebug.h"
 
 #include <KAboutData>
 #include <KDBusService>
@@ -27,19 +28,16 @@
 #include <KMessageBox>
 #include <KWindowSystem>
 
-#include <QDebug>
 #include <QPixmap>
 #include <qwindowdefs.h>
 #include <QX11Info>
 
-#include <signal.h>
+#include <csignal>
 #include <X11/extensions/XTest.h>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 
 
-static const char description[] = I18N_NOOP("VNC-compatible server to share "
-                                  "desktops");
 static bool checkX11Capabilities()
 {
     int bp1, bp2, majorv, minorv;
@@ -59,13 +57,13 @@ static bool checkX11Capabilities()
 
 static void checkOldX11PluginConfig() {
     if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("x11")) {
-        qDebug() << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
+        qCDebug(KRFB) << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
         KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
                     QStringLiteral("preferredFrameBufferPlugin"));
         if (config_item) {
             config_item->setProperty(QStringLiteral("xcb"));
             KrfbConfig::self()->save();
-            qDebug() << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
+            qCDebug(KRFB) << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
         }
     }
 }
@@ -81,7 +79,7 @@ static void checkWaylandPluginConfig()
         if (config_item) {
             config_item->setProperty(QStringLiteral("pw"));
             KrfbConfig::self()->save();
-            qDebug() << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
+            qCDebug(KRFB) << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
         }
     }
 }
@@ -95,7 +93,7 @@ int main(int argc, char *argv[])
     KAboutData aboutData(QStringLiteral("krfb"),
                          i18n("Desktop Sharing"),
                          QStringLiteral(KRFB_VERSION_STRING),
-                         i18n(description),
+                         i18n("VNC-compatible server to share desktops"),
                          KAboutLicense::GPL,
                          i18n("(c) 2009-2010, Collabora Ltd.\n"
                                "(c) 2007, Alessandro Praduroux\n"
@@ -160,6 +158,15 @@ int main(int argc, char *argv[])
     MainWindow mainWindow;
     TrayIcon trayicon(&mainWindow);
 
+    QObject::connect(&service, &KDBusService::activateRequested, &mainWindow, [&mainWindow](const QStringList & /*arguments*/, const QString & /*workdir*/) {
+        if (!mainWindow.isVisible()) {
+            mainWindow.setVisible(true);
+        } else {
+            KWindowSystem::updateStartupId(mainWindow.windowHandle());
+            KWindowSystem::activateWindow(mainWindow.windowHandle());
+        }
+    });
+
     if (KrfbConfig::startMinimized()) {
       mainWindow.hide();
     } else if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {

krfb/mainwindow.cpp

@@ -21,9 +21,7 @@
 #include <KMessageWidget>
 #include <KStandardAction>
 #include <KActionCollection>
-#include <KLineEdit>
 #include <KNewPasswordDialog>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
 #include <QIcon>
@@ -35,12 +33,12 @@
 #include <QSet>
 #include <QNetworkInterface>
 #include <QHostInfo>
-
+#include <QMessageBox>
 
 class TCP: public QWidget, public Ui::TCP
 {
 public:
-    TCP(QWidget *parent = nullptr) : QWidget(parent) {
+    explicit TCP(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
     }
 };
@@ -48,7 +46,7 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = nullptr) : QWidget(parent) {
+    explicit Security(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
         walletWarning = new KMessageWidget(this);
         walletWarning->setText(i18n("Storing passwords in config file is insecure!"));
@@ -84,18 +82,9 @@ public:
     }
 
     void fillFrameBuffersCombo() {
-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(
-                    QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
-        QSet<QString> unique;
-        QVectorIterator<KPluginMetaData> i(plugins);
-        i.toBack();
-        while (i.hasPrevious()) {
-            const KPluginMetaData &metadata = i.previous();
-            if (unique.contains(metadata.pluginId())) continue;
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+        for (const KPluginMetaData &metadata : plugins) {
             cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
-            unique.insert(metadata.pluginId());
         }
     }
 };
@@ -107,11 +96,11 @@ MainWindow::MainWindow(QWidget *parent)
     setAttribute(Qt::WA_DeleteOnClose, false);
 
     m_passwordEditable = false;
-    m_passwordLineEdit = new KLineEdit(this);
+    m_passwordLineEdit = new QLineEdit(this);
     m_passwordLineEdit->setVisible(false);
     m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
 
-    QWidget *mainWidget = new QWidget;
+    auto mainWidget = new QWidget;
     m_ui.setupUi(mainWidget);
     m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
@@ -230,16 +219,16 @@ void MainWindow::passwordChanged(const QString& password)
 
 void MainWindow::aboutConnectionAddress()
 {
-    KMessageBox::about(this,
-            i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+            i18n("KDE Desktop Sharing"),
+            i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."));
 }
 
 void MainWindow::aboutUnattendedMode()
 {
-    KMessageBox::about(this,
-            i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+            i18n("KDE Desktop Sharing"),
+            i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."));
 }
 
 void MainWindow::showConfiguration()
@@ -256,7 +245,7 @@ void MainWindow::showConfiguration()
         return;
     }
 
-    KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
+    auto dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
     dialog->addPage(new TCP, i18n("Network"), QStringLiteral("network-wired"));
     dialog->addPage(new Security, i18n("Security"), QStringLiteral("security-high"));
     dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), QStringLiteral("video-display"));

krfb/mainwindow.h

@@ -15,7 +15,7 @@
 
 #include <KXmlGuiWindow>
 
-class KLineEdit;
+class QLineEdit;
 
 class MainWindow : public KXmlGuiWindow
 {
@@ -43,7 +43,7 @@ class MainWindow : public KXmlGuiWindow
     private:
         Ui::MainWidget m_ui;
         bool m_passwordEditable;
-        KLineEdit *m_passwordLineEdit;
+        QLineEdit *m_passwordLineEdit = nullptr;
 };
 
 #endif

krfb/org.kde.krfb.appdata.xml

@@ -22,9 +22,11 @@
   <name xml:lang="it">Krfb</name>
   <name xml:lang="ko">Krfb</name>
   <name xml:lang="nl">Krfb</name>
+  <name xml:lang="nn">Krfb</name>
   <name xml:lang="pl">Krfb</name>
   <name xml:lang="pt">Krfb</name>
   <name xml:lang="pt-BR">Krfb</name>
+  <name xml:lang="ro">Krfb</name>
   <name xml:lang="ru">Krfb</name>
   <name xml:lang="sk">Krfb</name>
   <name xml:lang="sl">Krfb</name>
@@ -38,45 +40,41 @@
   <name xml:lang="x-test">xxKrfbxx</name>
   <name xml:lang="zh-CN">Krfb</name>
   <name xml:lang="zh-TW">Krfb</name>
-  <summary>Desktop sharing</summary>
-  <summary xml:lang="ca">Compartició de l'escriptori</summary>
-  <summary xml:lang="ca-valencia">Compartició de l'escriptori</summary>
-  <summary xml:lang="cs">Sdílení pracovní plochy</summary>
-  <summary xml:lang="da">Skrivebordsdeling</summary>
-  <summary xml:lang="de">Freigabe der Arbeitsfläche</summary>
-  <summary xml:lang="el">Κοινή χρήση επιφάνειας εργασίας</summary>
-  <summary xml:lang="en-GB">Desktop sharing</summary>
-  <summary xml:lang="es">Compartir el escritorio</summary>
-  <summary xml:lang="et">Töölaua jagamine</summary>
-  <summary xml:lang="eu">Mahaigaina partekatzea</summary>
-  <summary xml:lang="fi">Työpöydän jako</summary>
-  <summary xml:lang="fr">Partage de bureau</summary>
-  <summary xml:lang="gl">Compartición do escritorio</summary>
-  <summary xml:lang="ia">Compartir de scriptorio</summary>
-  <summary xml:lang="id">Desktop sharing</summary>
-  <summary xml:lang="it">Condivisione del desktop</summary>
-  <summary xml:lang="ko">데스크톱 공유</summary>
-  <summary xml:lang="nl">Bureaublad delen</summary>
-  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
-  <summary xml:lang="pt">Partilha do ecrã</summary>
-  <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
-  <summary xml:lang="ru">Общий рабочий стол</summary>
-  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
-  <summary xml:lang="sl">Souporaba namizja</summary>
-  <summary xml:lang="sr">Дељење површи</summary>
-  <summary xml:lang="sr-Latn">Deljenje površi</summary>
-  <summary xml:lang="sr-ijekavian">Дељење површи</summary>
-  <summary xml:lang="sr-ijekavianlatin">Deljenje površi</summary>
-  <summary xml:lang="sv">Skrivbordsdelning</summary>
-  <summary xml:lang="tr">Masaüstü paylaşımı</summary>
-  <summary xml:lang="uk">Спільне користування стільницею</summary>
-  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
-  <summary xml:lang="zh-CN">桌面共享</summary>
-  <summary xml:lang="zh-TW">桌面分享</summary>
+  <summary>Share your desktop to another computer via VNC</summary>
+  <summary xml:lang="ca">Comparteix l'escriptori amb un altre ordinador a través de VNC</summary>
+  <summary xml:lang="ca-valencia">Compartix l'escriptori amb un altre ordinador a través de VNC</summary>
+  <summary xml:lang="cs">Sdílejte své pracovní prostředí na jiný počítač pomocí VNC</summary>
+  <summary xml:lang="da">Del dit skrivebord til en anden computer via VNC</summary>
+  <summary xml:lang="de">Verbindung Ihrer Arbeitsfläche zu anderen Rechnern über VNC</summary>
+  <summary xml:lang="el">Μοιραστείτε την επιφάνεια εργασίας σας με άλλον υπολογιστή μέσω VNC</summary>
+  <summary xml:lang="en-GB">Share your desktop to another computer via VNC</summary>
+  <summary xml:lang="es">Compartir su escritorio con otro equipo usando VNC</summary>
+  <summary xml:lang="et">Oma töölaua jagamine VNC kaudu teise arvutisse</summary>
+  <summary xml:lang="eu">Partekatu zure mahaigaina beste ordenagailu batekin VNC erabiliz</summary>
+  <summary xml:lang="fi">Jaa työpöytä toiselle koneelle VNC:n kautta</summary>
+  <summary xml:lang="fr">Partager votre bureau avec un autre ordinateur grâce à « VNC »</summary>
+  <summary xml:lang="ia">Compartir tu scriptorio a un altere computator via VNC</summary>
+  <summary xml:lang="id">Bagikan desktopmu ke komputer lainnya via VNC</summary>
+  <summary xml:lang="it">Condividi il desktop con un altro computer tramite VNC</summary>
+  <summary xml:lang="ko">내 데스크톱을 VNC로 다른 컴퓨터와 공유</summary>
+  <summary xml:lang="nl">Uw bureaublad delen naar een andere computer via VNC</summary>
+  <summary xml:lang="nn">Del skrivebordet med ei anna maskin via VNC</summary>
+  <summary xml:lang="pl">Udostępnij swój pulpit innemu komputerowi przez VNC</summary>
+  <summary xml:lang="pt">Partilhar o seu ecrã com outro computador por VNC</summary>
+  <summary xml:lang="pt-BR">Compartilhar sua área de trabalho com outro computador via VNC</summary>
+  <summary xml:lang="ro">Partajați-vă biroul cu alt calculator prin VNC</summary>
+  <summary xml:lang="ru">Предоставление другому компьютеру доступа к рабочему столу с помощью VNC</summary>
+  <summary xml:lang="sk">Zdieľajte vašu plochu s iným počítačom cez VNC</summary>
+  <summary xml:lang="sl">Deli namizje z drugim računalnikom prek VNC</summary>
+  <summary xml:lang="sv">Dela ditt skrivbord med en annan dator via VNC</summary>
+  <summary xml:lang="tr">Masaüstünüzü başka bir bilgisayara VNC aracılığıyla paylaşın</summary>
+  <summary xml:lang="uk">Надайте вашу стільницю у спільне користування з іншим комп'ютером за допомогою VNC</summary>
+  <summary xml:lang="x-test">xxShare your desktop to another computer via VNCxx</summary>
+  <summary xml:lang="zh-CN">通过 VNC 分享您的桌面到另一台电脑</summary>
   <description>
     <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
-    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
-    <p xml:lang="ca-valencia">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
+    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
+    <p xml:lang="ca-valencia">Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
     <p xml:lang="da">Krfb-skrivebordsdeling er et serverprogram der giver dig mulighed for at dele din nuværende session med en bruger på en anden maskine som kan bruge en VNC-klient til at vise eller endda styrer skrivebordet.</p>
     <p xml:lang="de">Krfb ist eine Serveranwendung, welche die gemeinsame Benutzung der aktuellen Sitzung mit einem Benutzer auf einem anderen Rechner ermöglicht, der mit Hilfe eines VNC-Programms den Bildschirminhalt sehen oder sogar die Arbeitsfläche bedienen kann.</p>
     <p xml:lang="el">Η κοινή χρήση επιφάνειας εργασίας Krfb είναι μια εφαρμογή εξυπηρετητή που σας επιτρέπει να μοιράζεστε την τρέχουσα συνεδρία σας με έναν χρήστη σε άλλο μηχάνημα, ο οποίος μπορεί να χρησιμοποιεί έναν πελάτη VNC για να παρακολουθεί ή και να ελέγχει την επιφάνεια εργασίας σας.</p>
@@ -87,13 +85,16 @@
     <p xml:lang="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
     <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
     <p xml:lang="gl">Krfb é unha aplicación de servidor que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="ia">Krfb Desktop Sharing es un application de servitor que te permitte compartir tu session currente con un usator sur un altere machina,le qual pote usar un cliente VNC per vider o anque controlar le scriptorio.</p>
     <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
     <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
     <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 프로그램입니다.</p>
     <p xml:lang="nl">Bureaublad delen is een server-applicatie die u in staat stelt uw huidige sessie te delen met een gebruiker op een andere machine, die een VNC-client kan gebruiken om uw bureaublad te bekijken of zelfs te besturen.</p>
+    <p xml:lang="nn">Krfb skrivebordsdeling er eit tenar­program som lèt deg dela skrivebords­økta di med ein brukar på ei anna maskin. Vedkommande kan så bruka ein VNC-klient for å sjå og eventuelt òg styra økta.</p>
     <p xml:lang="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
     <p xml:lang="pt">A Partilha de Ecrã Krfb é uma aplicação de servidor que lhe permite partilhar a sua sessão actual com um utilizador noutra máquina, o qual poderá usar um cliente de VNC para ver ou mesmo controlar o ambiente de trabalho.</p>
     <p xml:lang="pt-BR">Krfb Desktop Sharing é um aplicativo de servidor que lhe permite compartilhar a sua sessão atual com um usuário em outra máquina, que poderá usar um cliente de VNC para ver ou mesmo controlar a máquina.</p>
+    <p xml:lang="ro">Partajarea Biroului Krfb e o aplicație-server ce vă permite să partajați sesiunea actuală cu un utilizator de pe altă mașină, care poate folosi un client VNC pentru a vedea sau chiar controla biroul.</p>
     <p xml:lang="ru">Krfb является сервером, который позволяет вам предоставлять доступ к своему текущему сеансу пользователю на другом компьютере, который использует клиент VNC для просмотра или управления вашим рабочим столом.</p>
     <p xml:lang="sk">Krfb je serverová aplikácia, ktorá vám umožní zdieľať vaše aktuálne sedenie s používateľom na inom stroji, ktorý môže používať VNC klienta na pripojenie alebo ovládanie stanice.</p>
     <p xml:lang="sl">Souporaba namizja Krfb je strežniški program, ki vam dovoli, da delite vašo trenutno sejo z uporabnikom na drugem računalniku, ki ima odjemalec VNC. Uporabnik lahko gleda ali celo nadzira namizje.</p>
@@ -102,7 +103,7 @@
     <p xml:lang="sr-ijekavian">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
     <p xml:lang="sr-ijekavianlatin">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
     <p xml:lang="sv">Krfb-skrivbordsdelning är ett serverprogram som gör det möjligt att dela aktuell session med en användare på en annan dator, som kan använda en VNC-klient för att betrakta eller till och med kontrollera skrivbordet.</p>
-    <p xml:lang="tr">Krfb Masaüstü Paylaşımı, mevcut oturumu masaüstünü görüntülemek veya kontrol etmek için, VNC istemcisi kullanan başka bir makinedeki, kullanıcıyla paylaşmanızı sağlayan bir sunucu uygulamasıdır.</p>
+    <p xml:lang="tr">Krfb Masaüstü Paylaşımı; geçerli oturumunuzu, başka bir makinedeki bir kullanıcıyla paylaşmanıza izin veren bir sunucu uygulamasıdır. Kullanıcılar, bir VNC istemcisi ile masaüstünüzü görüntüleyebilir ve hatta denetleyebilirler.</p>
     <p xml:lang="uk">Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.</p>
     <p xml:lang="x-test">xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx</p>
     <p xml:lang="zh-CN">Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。</p>
@@ -116,7 +117,7 @@
     <screenshot type="default">
       <caption>Sharing desktop with Krfb</caption>
       <caption xml:lang="ca">Compartint l'escriptori amb el Krfb</caption>
-      <caption xml:lang="ca-valencia">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="ca-valencia">Compartint l'escriptori amb Krfb</caption>
       <caption xml:lang="cs">Sdílím pracovní plochu pomocí Krfb</caption>
       <caption xml:lang="da">Deler skrivebord med Krfb</caption>
       <caption xml:lang="de">Freigabe der Arbeitsfläche mit Krfb</caption>
@@ -128,16 +129,21 @@
       <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
       <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
       <caption xml:lang="gl">Compartindo o escritorio con Krfb</caption>
+      <caption xml:lang="ia">Compartir scriptorio con Krfb</caption>
       <caption xml:lang="id">Berbagi desktop dengan Krfb</caption>
       <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
       <caption xml:lang="ko">Krfb로 데스크톱 공유</caption>
       <caption xml:lang="nl">Bureaublad delen met Krfb</caption>
+      <caption xml:lang="nn">Skrivebordsdeling med Krfb</caption>
       <caption xml:lang="pl">Udostępnienie pulpitu przy użyciu Krfb</caption>
       <caption xml:lang="pt">Partilha do ecrã com o Krfb</caption>
       <caption xml:lang="pt-BR">Compartilhando a área de trabalho com o Krfb</caption>
+      <caption xml:lang="ro">Partajarea biroului cu Krfb</caption>
       <caption xml:lang="ru">Общий доступ к рабочему столу с использованием Krfb</caption>
       <caption xml:lang="sk">Zdieľanie pracovnej plochy s Krfb</caption>
+      <caption xml:lang="sl">Deljenje namizij s Krfb</caption>
       <caption xml:lang="sv">Dela skrivbord med Krfb</caption>
+      <caption xml:lang="tr">Krfb ile masaüstü paylaşımı</caption>
       <caption xml:lang="uk">Спільне використання стільниці за допомогою Krfb</caption>
       <caption xml:lang="x-test">xxSharing desktop with Krfbxx</caption>
       <caption xml:lang="zh-CN">使用 Krfb 共享桌面</caption>
@@ -150,9 +156,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <release version="20.04.1" date="2020-05-14"/>
-    <release version="20.04.0" date="2020-04-23"/>
-    <release version="19.12.3" date="2020-03-05"/>
-    <release version="19.12.2" date="2020-02-06"/>
+    <release version="22.04.3" date="2022-07-07"/>
+    <release version="22.04.2" date="2022-06-09"/>
+    <release version="22.04.1" date="2022-05-12"/>
+    <release version="22.04.0" date="2022-04-21"/>
   </releases>
 </component>

krfb/org.kde.krfb.desktop

@@ -1,7 +1,7 @@
 # KDE Config File
 [Desktop Entry]
 Type=Application
-Exec=krfb -qwindowtitle %c %i
+Exec=krfb -qwindowtitle %c
 Icon=krfb
 X-DBUS-StartupType=Unique
 X-DocPath=krfb/index.html
@@ -74,76 +74,36 @@ Name[x-test]=xxKrfbxx
 Name[zh_CN]=Krfb
 Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
-GenericName=Desktop Sharing
-GenericName[ar]=مشاركة سطح المكتب
-GenericName[bg]=Споделяне на работния плот
-GenericName[bn]=ডেস্কটপ ভাগাভাগি
-GenericName[br]=Rannañ ar vurev
-GenericName[bs]=Dijeljenje radne površine
-GenericName[ca]=Compartir l'escriptori
-GenericName[ca@valencia]=Compartir l'escriptori
-GenericName[cs]=Sdílení pracovní plochy
-GenericName[cy]=Rhannu Penbwrdd
-GenericName[da]=Skrivebordsdeling
-GenericName[de]=Arbeitsfläche freigeben
-GenericName[el]=Κοινή χρήση επιφάνειας εργασίας
-GenericName[en_GB]=Desktop Sharing
-GenericName[eo]=Tabula komunigado
-GenericName[es]=Escritorio compartido
-GenericName[et]=Töölaua jagamine
-GenericName[eu]=Mahaigaina partekatzea
-GenericName[fa]=اشتراک رومیزی
-GenericName[fi]=Työpöydän jakaminen
-GenericName[fr]=Partage de bureaux
-GenericName[ga]=Roinnt Deisce
-GenericName[gl]=Compartimento de escritorio
-GenericName[he]=שיתוף שולחנות עבודה
-GenericName[hi]=डेस्कटॉप साझेदारी
-GenericName[hne]=डेस्कटाप साझेदारी
-GenericName[hr]=Dijeljenje radne površine
-GenericName[hu]=Munkaasztal-megosztás
-GenericName[ia]=Compartir de scriptorio
-GenericName[id]=Desktop Sharing
-GenericName[is]=Skjáborðsmiðlun
-GenericName[it]=Condivisione del desktop
-GenericName[ja]=デスクトップ共有
-GenericName[kk]=Үстелді ортақтастыру
-GenericName[km]=ការ​ចែក​រំលែក​ផ្ទៃ​តុ
-GenericName[ko]=데스크톱 공유
-GenericName[lt]=Dalinimasis darbalaukiu
-GenericName[lv]=Darbvirsmas koplietošana
-GenericName[ml]=പണിയിടം പങ്കുവെക്കല്‍
-GenericName[mr]=डेस्कटॉप शेअरींग
-GenericName[nb]=Delte skrivebord
-GenericName[nds]=Schriefdisch-Freegaav
-GenericName[ne]=डेस्कटप साझेदारी
-GenericName[nl]=Bureaublad delen
-GenericName[nn]=Skrivebordsdeling
-GenericName[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
-GenericName[pl]=Współdzielenie pulpitu
-GenericName[pt]=Partilha do Ecrã
-GenericName[pt_BR]=Compartilhamento de ambiente de trabalho
-GenericName[ro]=Partajare birou
-GenericName[ru]=Общий рабочий стол
-GenericName[si]=වැඩතල හවුල්
-GenericName[sk]=Zdieľanie pracovnej plochy
-GenericName[sl]=Souporaba namizja
-GenericName[sr]=Дељење површи
-GenericName[sr@ijekavian]=Дијељење површи
-GenericName[sr@ijekavianlatin]=Dijeljenje površi
-GenericName[sr@latin]=Deljenje površi
-GenericName[sv]=Dela ut skrivbordet
-GenericName[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-GenericName[tr]=Masaüstü Paylaşımı
-GenericName[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
-GenericName[uk]=Спільні стільниці
-GenericName[uz]=Ish stoli bilan boʻlishish
-GenericName[uz@cyrillic]=Иш столи билан бўлишиш
-GenericName[vi]=Chia sẻ màn hình nền
-GenericName[x-test]=xxDesktop Sharingxx
-GenericName[zh_CN]=桌面共享
-GenericName[zh_HK]=桌面分享
-GenericName[zh_TW]=桌面分享
+GenericName=Desktop Sharing (VNC)
+GenericName[ca]=Compartició de l'escriptori (VNC)
+GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
+GenericName[cs]=Sdílení pracovní plochy (VNC)
+GenericName[da]=Skrivebordsdeling (VNC)
+GenericName[de]=Arbeitsflächen-Freigabe (VNC)
+GenericName[el]=Κοινή χρήση επιφάνειας εργασίας (VNC)
+GenericName[en_GB]=Desktop Sharing (VNC)
+GenericName[es]=Escritorio compartido (VNC)
+GenericName[et]=Töölaua jagamine (VNC)
+GenericName[eu]=Mahaigaina partekatzea (VNC)
+GenericName[fi]=Työpöydän jakaminen (VNC)
+GenericName[fr]=Partage de bureaux (VNC)
+GenericName[ia]=Compartir de scriptorio (VNC)
+GenericName[it]=Condivisione del desktop (VNC)
+GenericName[ko]=데스크톱 공유(VNC)
+GenericName[nl]=Bureaublad delen (VNC)
+GenericName[nn]=Skrivebordsdeling (VNC)
+GenericName[pl]=Współdzielenie pulpitu (VNC)
+GenericName[pt]=Partilha do Ecrã (VNC)
+GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
+GenericName[ro]=Partajare birou (VNC)
+GenericName[ru]=Совместный доступ к рабочему столу (VNC)
+GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
+GenericName[sl]=Souporaba namizja (VNC)
+GenericName[sv]=Skrivbordsdelning (VNC)
+GenericName[tr]=Masaüstü Paylaşımı (VNC)
+GenericName[uk]=Спільні стільниці (VNC)
+GenericName[x-test]=xxDesktop Sharing (VNC)xx
+GenericName[zh_CN]=桌面共享 (VNC)
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب

krfb/org.kde.krfb.virtualmonitor.desktop.cmake

@@ -0,0 +1,58 @@
+# KDE Config File
+[Desktop Entry]
+Type=Application
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
+Icon=krfb
+Terminal=false
+Name=KRFBs Virtual Monitor
+Name[ca]=Monitor virtual del Krfb
+Name[ca@valencia]=Monitor virtual de Krfb
+Name[cs]=Virtuální monitor KRFB
+Name[el]=Εικονική οθόνη του KRFB
+Name[en_GB]=KRFBs Virtual Monitor
+Name[es]=Monitor virtual de KRFB
+Name[fi]=KRFB:n virtuaalinäyttö
+Name[fr]=Moniteur virtuel « Krfb »
+Name[ia]=Virtual Monitor de KRFB
+Name[it]=Monitor virtuale di KRFB
+Name[ko]=KRFBs 가상 모니터
+Name[nl]=Virtuele monitor van KRFB
+Name[pl]=Monitor wirtualny KRFB
+Name[pt]=Monitor Virtual do KRFB
+Name[pt_BR]=Monitor virtual do KRFB
+Name[ro]=Monitor virtual KRFB
+Name[ru]=Виртуальный монитор KRFB
+Name[sk]=Virtuálny monitor KRFB
+Name[sl]=Navidezni monitor KRFB
+Name[sv]=Krfb:s virtuella bildskärm
+Name[tr]=KRFB Sanal Monitörü
+Name[uk]=Віртуальний монітор KRFB
+Name[x-test]=xxKRFBs Virtual Monitorxx
+Name[zh_CN]=KRBs 虚拟监视器
+Comment=Remote Virtual Monitor
+Comment[ca]=Monitor virtual remot
+Comment[ca@valencia]=Monitor virtual remot
+Comment[cs]=Vzdálený virtuální monitor
+Comment[el]=Απομακρυσμένη εικονική οθόνη
+Comment[en_GB]=Remote Virtual Monitor
+Comment[es]=Monitor virtual remoto
+Comment[fi]=Virtuaalinen etänäyttö
+Comment[fr]=Moniteur virtuel distant
+Comment[ia]=Monitor Virtual Remote
+Comment[it]=Monitor virtuale remoto
+Comment[ko]=원격 가상 모니터
+Comment[nl]=Virtual Monitor op afstand
+Comment[pl]=Zdalny monitor wirtualny
+Comment[pt]=Monitor Virtual Remoto
+Comment[pt_BR]=Monitor virtual remoto
+Comment[ro]=Monitor virtual distant
+Comment[ru]=Удалённый виртуальный монитор
+Comment[sk]=Vzdialený virtuálny monitor
+Comment[sl]=Oddaljeni navidezni monitor
+Comment[sv]=Virtuell fjärrbildskärm
+Comment[tr]=Uzak Sanal Monitör
+Comment[uk]=Віддалений віртуальний монітор
+Comment[x-test]=xxRemote Virtual Monitorxx
+Comment[zh_CN]=远程虚拟监视器
+NoDisplay=true
+X-KDE-Wayland-Interfaces=zkde_screencast_unstable_v1

krfb/rfbclient.cpp

@@ -23,9 +23,9 @@
 #include "sockethelpers.h"
 #include "eventsmanager.h"
 #include <QSocketNotifier>
-#include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
+#include "krfbdebug.h"
 
 struct RfbClient::Private
 {
@@ -171,8 +171,13 @@ void RfbClient::update()
 
 PendingRfbClient::PendingRfbClient(rfbClientPtr client, QObject *parent)
     : QObject(parent), m_rfbClient(client)
+    , m_notifier(new QSocketNotifier(client->sock, QSocketNotifier::Read, this))
 {
     m_rfbClient->clientData = this;
+
+    m_notifier->setEnabled(true);
+    connect(m_notifier, &QSocketNotifier::activated,
+            this, &PendingRfbClient::onSocketActivated);
 }
 
 PendingRfbClient::~PendingRfbClient()
@@ -231,3 +236,35 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
     rfbEncryptBytes(challenge, passwd);
     return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
 }
+
+void PendingRfbClient::onSocketActivated()
+{
+    //Process not only one, but all pending messages.
+    //poll() idea/code copied from vino:
+    // Copyright (C) 2003 Sun Microsystems, Inc.
+    // License: GPL v2 or later
+    struct pollfd pollfd = { m_rfbClient->sock, POLLIN|POLLPRI, 0 };
+
+    while(poll(&pollfd, 1, 0) == 1) {
+        if(m_rfbClient->state == rfbClientRec::RFB_INITIALISATION) {
+            m_notifier->setEnabled(false);
+            //Client is Authenticated
+            processNewClient();
+            break;
+        }
+        rfbProcessClientMessage(m_rfbClient);
+
+        //This is how we handle disconnection.
+        //if rfbProcessClientMessage() finds out that it can't read the socket,
+        //it closes it and sets it to -1. So, we just have to check this here
+        //and call rfbClientConnectionGone() if necessary. This will call
+        //the clientGoneHook which in turn will remove this RfbClient instance
+        //from the server manager and will call deleteLater() to delete it
+        if (m_rfbClient->sock == -1) {
+            qCDebug(KRFB) << "disconnected from socket signal";
+            m_notifier->setEnabled(false);
+            rfbClientConnectionGone(m_rfbClient);
+            break;
+        }
+    }
+}

krfb/rfbclient.h

@@ -23,6 +23,8 @@
 #include "rfb.h"
 #include <QObject>
 
+class QSocketNotifier;
+
 class RfbClient : public QObject
 {
     Q_OBJECT
@@ -104,6 +106,11 @@ protected:
     bool vncAuthCheckPassword(const QByteArray & password, const QByteArray & encryptedPassword) const;
 
     rfbClientPtr m_rfbClient;
+
+private:
+    void onSocketActivated();
+
+    QSocketNotifier *const m_notifier;
 };
 
 #endif // RFBCLIENT_H

krfb/rfbserver.cpp

@@ -19,11 +19,11 @@
 */
 #include "rfbserver.h"
 #include "rfbservermanager.h"
+#include "krfbdebug.h"
 #include <QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
 #include <QPointer>
-#include <QDebug>
 #include <QX11Info>
 
 struct RfbServer::Private
@@ -92,7 +92,7 @@ bool RfbServer::start()
     if (!d->screen) {
         d->screen = RfbServerManager::instance()->newScreen();
         if (!d->screen) {
-            qDebug() << "Unable to get rbfserver screen";
+            qCDebug(KRFB) << "Unable to get rbfserver screen";
             return false;
         }
 
@@ -117,6 +117,7 @@ bool RfbServer::start()
     }
 
     d->screen->port = listeningPort();
+    d->screen->ipv6port = listeningPort();
 
     // Disable/Enable password checking
     if (passwordRequired()) {
@@ -125,14 +126,14 @@ bool RfbServer::start()
         d->screen->authPasswdData = (void *)nullptr;
     }
 
-    qDebug() << "Starting server. Listen port:" << listeningPort()
+    qCDebug(KRFB) << "Starting server. Listen port:" << listeningPort()
              << "Listen Address:" << listeningAddress()
              << "Password enabled:" << passwordRequired();
 
     rfbInitServer(d->screen);
 
     if (!rfbIsActive(d->screen)) {
-        qDebug() << "Failed to start server";
+        qCDebug(KRFB) << "Failed to start server";
         rfbShutdownServer(d->screen, false);
         return false;
     };
@@ -253,7 +254,7 @@ void RfbServer::pendingClientFinished(RfbClient *client)
 rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 {
     //qDebug() << "New client";
-    RfbServer *server = static_cast<RfbServer*>(cl->screen->screenData);
+    auto server = static_cast<RfbServer*>(cl->screen->screenData);
 
     PendingRfbClient *pendingClient = server->newClient(cl);
     connect(pendingClient, &PendingRfbClient::finished,
@@ -266,7 +267,7 @@ rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 void RfbServer::clientGoneHook(rfbClientPtr cl)
 {
     //qDebug() << "client gone";
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    auto client = static_cast<RfbClient*>(cl->clientData);
 
     RfbServerManager::instance()->removeClient(client);
     client->deleteLater();
@@ -275,7 +276,7 @@ void RfbServer::clientGoneHook(rfbClientPtr cl)
 //static
 rfbBool RfbServer::passwordCheck(rfbClientPtr cl, const char *encryptedPassword, int len)
 {
-    PendingRfbClient *client = static_cast<PendingRfbClient*>(cl->clientData);
+    auto client = static_cast<PendingRfbClient*>(cl->clientData);
     Q_ASSERT(client);
     return client->checkPassword(QByteArray::fromRawData(encryptedPassword, len));
 }
@@ -283,14 +284,14 @@ rfbBool RfbServer::passwordCheck(rfbClientPtr cl, const char *encryptedPassword,
 //static
 void RfbServer::keyboardHook(rfbBool down, rfbKeySym keySym, rfbClientPtr cl)
 {
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    auto client = static_cast<RfbClient*>(cl->clientData);
     client->handleKeyboardEvent(down ? true : false, keySym);
 }
 
 //static
 void RfbServer::pointerHook(int bm, int x, int y, rfbClientPtr cl)
 {
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    auto client = static_cast<RfbClient*>(cl->clientData);
     client->handleMouseEvent(bm, x, y);
 }
 

krfb/rfbservermanager.cpp

@@ -20,20 +20,22 @@
 */
 #include "rfbservermanager.h"
 #include "rfbserver.h"
-#include "framebuffer.h"
 #include "framebuffermanager.h"
 #include "sockethelpers.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
 #include <QTimer>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QGlobalStatic>
 #include <QHostInfo>
-#include <QDebug>
 
 #include <KLocalizedString>
 #include <KUser>
 #include <KNotification>
+#include <chrono>
+
+using namespace std::chrono_literals;
 
 static const char *cur =
     "                   "
@@ -117,11 +119,12 @@ QSharedPointer<FrameBuffer> RfbServerManager::framebuffer() const
     return d->fb;
 }
 
+QVariantMap RfbServerManager::s_pluginArgs;
+
 void RfbServerManager::init()
 {
     //qDebug();
-
-    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
+    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId(), s_pluginArgs);
     d->myCursor = rfbMakeXCursor(19, 19, (char *) cur, (char *) mask);
     d->myCursor->cleanup = false;
     d->desktopName = QStringLiteral("%1@%2 (shared desktop)") //FIXME check if we can use utf8
@@ -134,7 +137,7 @@ void RfbServerManager::init()
 
 void RfbServerManager::updateFrameBuffer()
 {
-    Q_FOREACH(RfbServer *server, d->servers) {
+    for (RfbServer *server : std::as_const(d->servers)) {
         server->updateFrameBuffer(d->fb->data(), d->fb->width(), d->fb->height(), d->fb->depth());
     }
 }
@@ -142,9 +145,9 @@ void RfbServerManager::updateFrameBuffer()
 void RfbServerManager::updateScreens()
 {
     QList<QRect> rects = d->fb->modifiedTiles();
-    QPoint currentCursorPos = QCursor::pos();
+    const QPoint currentCursorPos = d->fb->cursorPosition();
 
-    for (RfbServer* server : qAsConst(d->servers)) {
+    for (RfbServer* server : std::as_const(d->servers)) {
         server->updateScreen(rects);
         server->updateCursorPosition(currentCursorPos);
     }
@@ -200,7 +203,7 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
 
         //qDebug() << "bpp: " << bpp;
 
-        rfbLogEnable(0);
+        rfbLogEnable(KRFB().isDebugEnabled());
 
         screen = rfbGetScreen(nullptr, nullptr, w, h, 8, 3, bpp);
         screen->paddedWidthInBytes = d->fb->paddedWidth();
@@ -218,7 +221,7 @@ void RfbServerManager::addClient(RfbClient* cc)
     if (d->clients.size() == 0) {
         //qDebug() << "Starting framebuffer monitor";
         d->fb->startMonitor();
-        d->rfbUpdateTimer.start(50);
+        d->rfbUpdateTimer.start(50ms);
     }
     d->clients.insert(cc);
 

krfb/rfbservermanager.h

@@ -23,6 +23,7 @@
 #include "rfb.h"
 #include "framebuffer.h"
 #include <QObject>
+#include <QVariantMap>
 
 class RfbClient;
 struct RfbServerManagerStatic;
@@ -35,6 +36,7 @@ public:
     static RfbServerManager *instance();
 
     QSharedPointer<FrameBuffer> framebuffer() const;
+    static QVariantMap s_pluginArgs;
 Q_SIGNALS:
     void clientConnected(RfbClient *cc);
     void clientDisconnected(RfbClient *cc);

krfb/sockethelpers.cpp

@@ -28,14 +28,13 @@
 
 QString peerAddress(int sock)
 {
-
     const int ADDR_SIZE = 50;
-    struct sockaddr sa;
+    struct sockaddr sa = {};
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getpeername(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
-            struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+            auto si = (struct sockaddr_in *)&sa;
             return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
@@ -53,12 +52,11 @@ QString peerAddress(int sock)
 
 unsigned short peerPort(int sock)
 {
-
-    struct sockaddr sa;
+    struct sockaddr sa = {};
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getpeername(sock, &sa, &salen) == 0) {
-        struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+        auto si = (struct sockaddr_in *)&sa;
         return ntohs(si->sin_port);
     }
 
@@ -67,14 +65,13 @@ unsigned short peerPort(int sock)
 
 QString localAddress(int sock)
 {
-
     const int ADDR_SIZE = 50;
-    struct sockaddr sa;
+    struct sockaddr sa = {};
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getsockname(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
-            struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+            auto si = (struct sockaddr_in *)&sa;
             return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
@@ -92,12 +89,11 @@ QString localAddress(int sock)
 
 unsigned short localPort(int sock)
 {
-
-    struct sockaddr sa;
+    struct sockaddr sa = {};
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getsockname(sock, &sa, &salen) == 0) {
-        struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+        auto si = (struct sockaddr_in *)&sa;
         return ntohs(si->sin_port);
     }
 

krfb/trayicon.cpp

@@ -41,11 +41,11 @@ public:
     virtual ~ClientActions();
 
 private:
-    QMenu *m_menu;
-    QAction *m_title;
-    QAction *m_disconnectAction;
-    QAction *m_enableControlAction;
-    QAction *m_separator;
+    QMenu *m_menu = nullptr;
+    QAction *m_title = nullptr;
+    QAction *m_disconnectAction = nullptr;
+    QAction *m_enableControlAction = nullptr;
+    QAction *m_separator = nullptr;
 };
 
 ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)