GIT_SILENT Update Appstream for new release

(cherry picked from commit a568a58b41)

.flatpak-manifest.json

@@ -0,0 +1,73 @@
+{
+    "id": "org.kde.krfb",
+    "branch": "master",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "6.7",
+    "sdk": "org.kde.Sdk",
+    "command": "krfb",
+    "tags": ["nightly"],
+    "desktop-file-name-suffix": " (Nightly)",
+    "finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland" ],
+    "rename-icon": "krfb",
+    "modules": [
+        {
+            "name": "libgpg-error",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://mirrors.dotsrc.org/gnupg/libgpg-error/libgpg-error-1.47.tar.bz2",
+                    "sha256": "9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1628,
+                        "stable-only": true,
+                        "url-template": "http://mirrors.dotsrc.org/gnupg/libgpg-error/libgpg-error-${version}.tar.bz2"
+                    }
+                }
+            ],
+            "cleanup": [ "/lib/libgpg-error.la" ]
+        },
+        {
+            "name": "libgcrypt",
+            "config-opts": ["--disable-doc"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://dev.gnupg.org/source/libgcrypt.git",
+                    "tag": "libgcrypt-1.10.2",
+                    "commit": "1c5cbacf3d88dded5063e959ee68678ff7d0fa56",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1623,
+                        "stable-only": true,
+                        "tag-template": "libgcrypt-$version"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "libvncserver",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                { "type": "git", "url": "https://github.com/LibVNC/libvncserver", "branch": "LibVNCServer-0.9.14" }
+            ]
+        },
+        {
+            "name": "kpipewire",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [ "-DBUILD_TESTING=OFF" ],
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/plasma/kpipewire.git", "branch": "master" } ]
+        },
+        {
+            "name": "krfb",
+            "buildsystem": "cmake-ninja",
+            "config-opts": ["-DCMAKE_BUILD_TYPE=debug", "-DPLASMA_ENABLED=OFF"],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "."
+                }
+            ]
+        }
+    ]
+}

.flatpak-manifest.json.license

@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0

.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,9 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/flatpak.yml

.kde-ci.yml

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+  'require':
+    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/ki18n': '@latest-kf6'
+    'frameworks/kconfig': '@latest-kf6'
+    'frameworks/kcoreaddons': '@latest-kf6'
+    'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/kdnssd': '@latest-kf6'
+    'frameworks/kdoctools': '@latest-kf6'
+    'frameworks/knotifications': '@latest-kf6'
+    'frameworks/kwallet': '@latest-kf6'
+    'frameworks/kwidgetsaddons': '@latest-kf6'
+    'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/kxmlgui': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
+    'libraries/plasma-wayland-protocols': '@latest-kf6'
+    'plasma/kwayland': '@latest-kf6'
+    'plasma/kpipewire': '@latest-kf6'
+
+Options:
+  require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows']

.reviewboardrc

@@ -1,4 +0,0 @@
-REPOSITORY = "git://anongit.kde.org/krfb"
-REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
-TARGET_PEOPLE = "whiting"
-

CMakeLists.txt

@@ -1,75 +1,114 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16)
 
-project(krfb)
+# KDE Application Version, managed by release script
+set (RELEASE_SERVICE_VERSION_MAJOR "24")
+set (RELEASE_SERVICE_VERSION_MINOR "08")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
+set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-include(FeatureSummary)
-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets X11Extras)
+project(krfb VERSION ${RELEASE_SERVICE_VERSION})
 
-find_package(ECM 1.7.0 NO_MODULE REQUIRED)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(QT_MIN_VERSION 6.5.0)
+set(KF6_MIN_VERSION 6.2.0)
+
+find_package(ECM ${KF6_MIN_VERSION} NO_MODULE REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
+include(ECMSetupVersion)
+include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
+include(FeatureSummary)
+include(CheckIncludeFile)
 
-find_package(KF5 REQUIRED COMPONENTS
+check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
+
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets)
+
+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
     I18n
-    Completion
     Config
     CoreAddons
-    Crash
     DBusAddons
     DNSSD
     DocTools
     Notifications
     Wallet
     WidgetsAddons
+    WindowSystem
     XmlGui
+    StatusNotifierItem
 )
 
 find_package(X11 REQUIRED)
 
+find_package(XCB REQUIRED COMPONENTS
+    XCB
+    RENDER
+    SHAPE
+    XFIXES
+    DAMAGE
+    SHM
+    IMAGE
+)
+
 if(WIN32)
     set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
     set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)
-add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
 
-set(CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    ${CMAKE_MODULE_PATH}
+ecm_set_disabled_deprecation_versions(
+    QT 6.7.0
+    KF 6.4.0
 )
 
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
+
 find_package(LibVNCServer REQUIRED)
 
-if (HAVE_XDAMAGE)
-set(X11_Xdamage_FOUND 1)
-else()
-set(X11_Xdamage_FOUND 0)
+
+option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
+if(NOT DISABLE_PIPEWIRE)
+    find_package(KPipeWire CONFIG REQUIRED)
+    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
+    add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugin")
 endif()
-if (HAVE_XSHM)
-set(X11_XShm_FOUND 1)
-else()
-set(X11_XShm_FOUND 0)
+
+find_package(PlasmaWaylandProtocols 1.5.0)
+
+if(KPipeWire_FOUND AND PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
+    find_package(KWayland REQUIRED)
+    find_package(QtWaylandScanner REQUIRED)
+    find_package(Qt6WaylandClient)
+    find_package(Wayland REQUIRED COMPONENTS Client)
 endif()
 
+ecm_setup_version(PROJECT
+                  VARIABLE_PREFIX KRFB
+                  VERSION_HEADER "krfb_version.h")
+
 include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
 )
 
-if(Q_WS_X11)
-  if(NOT X11_XTest_FOUND)
-    message(FATAL_ERROR "krfb requires the libXtst (http://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

README

@@ -12,8 +12,4 @@ x0rfbserver left. Since version 0.6 it uses libvncserver
 
 Guide to documentation:
 TODO - things to be done
-INSTALL - Very short installation instructions
 NOTES - reasons for various decisions
-DCOP-INTERFACE - short documentation of the DCOP interface
-
-

cmake/modules/FindLibVNCServer.cmake

@@ -38,4 +38,4 @@ ELSE (LIBVNCSERVER_FOUND)
   ENDIF (LIBVNCSERVER_FIND_REQUIRED)
 ENDIF (LIBVNCSERVER_FOUND)
 
-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)

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."
+)

dbus/xdp_dbus_remotedesktop_interface.xml

@@ -0,0 +1,507 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2017-2018 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.RemoteDesktop:
+      @short_description: Remote desktop portal
+
+      The Remote desktop portal allows to create remote desktop sessions.
+
+      This documentation describes version 2 of this interface.
+  -->
+  <interface name="org.freedesktop.portal.RemoteDesktop">
+    <!--
+        CreateSession:
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Create a remote desktop session.
+
+        A remote desktop session is used to allow remote controlling a desktop
+        session.
+
+        A remote desktop session may only be started and stopped with this interface,
+        but you can use the #org.freedesktop.portal.Session object created with this
+        method together with certain methods on the #org.freedesktop.portal.ScreenCast and
+        #org.freedesktop.portal.Clipboard interfaces. Specifically, you can call
+        org.freedesktop.portal.ScreenCast.SelectSources() to also get screen content,
+        and org.freedesktop.portal.ScreenCast.OpenPipeWireRemote() to acquire a file
+        descriptor for a PipeWire remote. See #org.freedesktop.portal.ScreenCast for
+        more information on how to use those methods. To capture clipboard content,
+        you can call org.freedesktop.portal.Clipboard.RequestClipboard(). See
+        #org.freedesktop.portal.Clipboard for more information on the clipboard
+        integration.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the @handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Request documentation for
+              more information about the @handle.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>session_handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the session handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Session documentation for
+              more information about the session handle.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        The following results get returned via the #org.freedesktop.portal.Request::Response signal:
+        <variablelist>
+          <varlistentry>
+            <term>session_handle o</term>
+            <listitem><para>
+              The session handle. An object path for the
+              #org.freedesktop.portal.Session object representing the created
+              session.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="CreateSession">
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        SelectDevices:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Select input devices to remote control.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the @handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Request documentation for
+              more information about the @handle.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>types u</term>
+            <listitem><para>
+              Bitmask of what device types to request remote controlling of.
+              Default is all.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>restore_token s</term>
+            <listitem><para>
+              The token to restore a previous session.
+
+              If the stored session cannot be restored, this value is ignored
+              and the user will be prompted normally. This may happen when, for
+              example, the session contains a monitor or a window that is not
+              available anymore, or when the stored permissions are withdrawn.
+
+              The restore token is invalidated after using it once. To restore
+              the same session again, use the new restore token sent in response
+              to starting this session.
+
+              This option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>persist_mode u</term>
+            <listitem><para>
+              How this session should persist. Default is 0. Accepted values are:
+
+              <simplelist>
+                <member>0: Do not persist (default)</member>
+                <member>1: Permissions persist as long as the application is running</member>
+                <member>2: Permissions persist until explicitly revoked</member>
+              </simplelist>
+
+              If the permission for the session to persist is granted, a restore token will
+              be returned via the #org.freedesktop.portal.Request::Response signal of the
+              start method used to start the session.
+
+              This option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        For available device types, see the AvailableDeviceTypes property.
+    -->
+    <method name="SelectDevices">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        Start:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @parent_window: Identifier for the application window, see <link linkend="parent_window">Common Conventions</link>
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Start the remote desktop session. This will typically result in the portal
+        presenting a dialog letting the user select what to share, including
+        devices and optionally screen content if screen cast sources was
+        selected.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the @handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Request documentation for
+              more information about the @handle.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        The following results get returned via the
+        #org.freedesktop.portal.Request::Response signal:
+        <variablelist>
+          <varlistentry>
+            <term>devices u</term>
+            <listitem><para>
+              A bitmask of the devices selected by the user.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>clipboard_enabled b</term>
+            <listitem><para>
+              A boolean for whether the clipboard was enabled ('true') or not ('false').
+              See the #org.freedesktop.portal.Clipboard documentation for more information.
+              Since version 2.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>restore_token s</term>
+            <listitem><para>
+              The restore token. This token is a single use token that can later
+              be used to restore a session. See
+              org.freedesktop.portal.RemoteDesktop.SelectDevices() for details.
+
+              This response option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        If a screen cast source was selected, the results of the
+        #org.freedesktop.portal.ScreenCast.Start response signal may be
+        included.
+    -->
+    <method name="Start">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="parent_window" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        NotifyPointerMotion:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @dx: Relative movement on the x axis
+        @dy: Relative movement on the y axis
+
+        Notify about a new relative pointer motion event. The (dx, dy) vector
+        represents the new pointer position in the streams logical coordinate
+        space.
+    -->
+    <method name="NotifyPointerMotion">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="d" name="dx" direction="in"/>
+      <arg type="d" name="dy" direction="in"/>
+    </method>
+    <!--
+        NotifyPointerMotionAbsolute:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @stream: The PipeWire stream node the coordinate is relative to
+        @x: Pointer motion x coordinate
+        @y: Pointer motion y coordinate
+
+        Notify about a new absolute pointer motion event. The (x, y) position
+        represents the new pointer position in the streams logical coordinate
+        space (see the logical_size stream property in
+        #org.freedesktop.portal.ScreenCast).
+    -->
+    <method name="NotifyPointerMotionAbsolute">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="u" name="stream" direction="in"/>
+      <arg type="d" name="x" direction="in"/>
+      <arg type="d" name="y" direction="in"/>
+    </method>
+    <!--
+        NotifyPointerButton:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @button: The pointer button was pressed or released
+        @state: The new state of the button
+
+        The pointer button is encoded according to Linux Evdev button codes.
+
+        May only be called if POINTER access was provided after starting the
+        session.
+
+        Available button states:
+        <simplelist>
+          <member>0: Released</member>
+          <member>1: Pressed</member>
+        </simplelist>
+    -->
+    <method name="NotifyPointerButton">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="i" name="button" direction="in"/>
+      <arg type="u" name="state" direction="in"/>
+    </method>
+    <!--
+        NotifyPointerAxis:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @dx: Relative axis movement on the x axis
+        @dy: Relative axis movement on the y axis
+
+        The axis movement from a 'smooth scroll' device, such as a touchpad.
+        When applicable, the size of the motion delta should be equivalent to
+        the motion vector of a pointer motion done using the same advice.
+
+        May only be called if POINTER access was provided after starting the
+        session.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>finish b</term>
+            <listitem><para>
+              If set to true, this is the last axis event in a series, for
+              example as a result of the fingers being lifted from a touchpad
+              after a two-finger scroll.  Default is false.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="NotifyPointerAxis">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="d" name="dx" direction="in"/>
+      <arg type="d" name="dy" direction="in"/>
+    </method>
+    <!--
+        NotifyPointerAxisDiscrete:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @axis: The axis that was scrolled
+        @steps: The number of steps scrolled
+
+        May only be called if POINTER access was provided after starting the
+        session.
+
+        Available axes:
+        <simplelist>
+          <member>0: Vertical scroll</member>
+          <member>1: Horizontal scroll</member>
+        </simplelist>
+    -->
+    <method name="NotifyPointerAxisDiscrete">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="u" name="axis" direction="in"/>
+      <arg type="i" name="steps" direction="in"/>
+    </method>
+    <!--
+        NotifyKeyboardKeycode:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @keycode: Keyboard code that was pressed or released
+        @state: New state of keyboard keycode
+
+        May only be called if KEYBOARD access was provided after starting the
+        session.
+
+        Available keyboard keycode states:
+        <simplelist>
+          <member>0: Released</member>
+          <member>1: Pressed</member>
+        </simplelist>
+    -->
+    <method name="NotifyKeyboardKeycode">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="i" name="keycode" direction="in"/>
+      <arg type="u" name="state" direction="in"/>
+    </method>
+    <!--
+        NotifyKeyboardKeysym:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @keysym: Keyboard symbol that was pressed or released
+        @state: New state of keyboard keysym
+
+        May only be called if KEYBOARD access was provided after starting the
+        session.
+
+        Available keyboard keysym states:
+        <simplelist>
+          <member>0: Released</member>
+          <member>1: Pressed</member>
+        </simplelist>
+    -->
+    <method name="NotifyKeyboardKeysym">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="i" name="keysym" direction="in"/>
+      <arg type="u" name="state" direction="in"/>
+    </method>
+    <!--
+        NotifyTouchDown:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @stream: The PipeWire stream node the coordinate is relative to
+        @slot: Touch slot where touch point appeared
+        @x: Touch down x coordinate
+        @y: Touch down y coordinate
+
+        May only be called if TOUCHSCREEN access was provided after starting the
+        session.
+
+        Notify about a new touch down event. The (x, y) position
+        represents the new touch point position in the streams logical
+        coordinate space (see the logical_size stream property in
+        #org.freedesktop.portal.ScreenCast).
+    -->
+    <method name="NotifyTouchDown">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="u" name="stream" direction="in"/>
+      <arg type="u" name="slot" direction="in"/>
+      <arg type="d" name="x" direction="in"/>
+      <arg type="d" name="y" direction="in"/>
+    </method>
+    <!--
+        NotifyTouchMotion:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @stream: The PipeWire stream node the coordinate is relative to
+        @slot: Touch slot where touch point appeared
+        @x: Touch motion x coordinate
+        @y: Touch motion y coordinate
+
+        May only be called if TOUCHSCREEN access was provided after starting the
+        session.
+
+        Notify about a new touch motion event. The (x, y) position
+        represents where the touch point position in the streams logical
+        coordinate space moved (see the logical_size stream property in
+        #org.freedesktop.portal.ScreenCast).
+    -->
+    <method name="NotifyTouchMotion">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="u" name="stream" direction="in"/>
+      <arg type="u" name="slot" direction="in"/>
+      <arg type="d" name="x" direction="in"/>
+      <arg type="d" name="y" direction="in"/>
+    </method>
+    <!--
+        NotifyTouchUp:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @slot: Touch slot where touch point appeared
+
+        May only be called if TOUCHSCREEN access was provided after starting the
+        session.
+
+        Notify about a new touch up event.
+    -->
+    <method name="NotifyTouchUp">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="u" name="slot" direction="in"/>
+    </method>
+
+    <!--
+        ConnectToEIS:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @fd: A file descriptor to an EIS implementation that can be passed to a libei sender context
+
+        Request a connection to an EIS implementation. The returned handle can
+        be passed to ei_setup_backend_fd() for a libei sender context to
+        complete the connection. All information about available devices and the
+        event flow is subject to libei. Please see the libei documentation for details.
+
+        This method may only be called once per session, where the EIS
+        implementation disconnects the session should be closed.
+
+        This method must be called after #org.freedesktop.portal.RemoteDesktop.Start()
+
+        Once an EIS connection is established, input events must be sent exclusively via
+        the EIS connection. Any events submitted via NotifyPointerMotion,
+        NotifyKeyboardKeycode and other Notify* methods will return an error.
+
+        To see how to pair a PipeWire stream with a libei device region, see the
+        documentation for the mapping_id stream property in
+        #org.freedesktop.portal.RemoteDesktop.Start().
+
+        This method was added in version 2 of this interface.
+    -->
+    <method name="ConnectToEIS">
+      <annotation name="org.gtk.GDBus.C.Name" value="connect_to_eis"/>
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="h" name="fd" direction="out"/>
+    </method>
+
+    <!--
+        AvailableDeviceTypes:
+
+        A bitmask of available source types. Currently defined types are:
+
+        <simplelist>
+          <member>1: KEYBOARD</member>
+          <member>2: POINTER</member>
+          <member>4: TOUCHSCREEN</member>
+        </simplelist>
+    -->
+    <property name="AvailableDeviceTypes" type="u" access="read"/>
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>

dbus/xdp_dbus_screencast_interface.xml

@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2017-2018 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.ScreenCast:
+      @short_description: Screen cast portal
+  -->
+  <interface name="org.freedesktop.portal.ScreenCast">
+    <!--
+        CreateSession:
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Create a screen cast session. A successfully created session can at
+        any time be closed using org.freedesktop.portal.Session::Close, or may
+        at any time be closed by the portal implementation, which will be
+        signalled via org.freedesktop.portal.Session::Closed.
+
+        The following results get returned via the #org.freedesktop.portal.Request::Response signal:
+        <variablelist>
+          <varlistentry>
+            <term>session_handle o</term>
+            <listitem><para>
+              The session handle. An object path for the
+              #org.freedesktop.portal.Session object representing the created
+              session.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="CreateSession">
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        SelectSources:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Configure what the screen cast session should record. This method must
+        be called before starting the session.
+
+        Passing invalid input to this method will cause the session to be
+        closed. An application may only attempt to select sources once per
+        session.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>types u</term>
+            <listitem><para>
+              Bitmask of what types of content to record. Default is MONITOR.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>multiple b</term>
+            <listitem><para>
+              Whether to allow selecting multiple sources. Default is no.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        For available source types, see the AvailableSourceTypes property.
+    -->
+    <method name="SelectSources">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        Start:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @parent_window: Identifier for the application window
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Start the screen cast session. This will typically result the portal
+        presenting a dialog letting the user do the selection set up by
+        SelectSources. An application can only attempt start a session once.
+
+        A screen cast session may only be started after having selected sources
+        using org.freedesktop.portal.ScreenCast::SelectSources.
+
+        The @parent_window identifier must be of the form "x11:$XID" for an X11
+        window. Support for other window systems may be added in the future.
+
+        The following results get returned via the
+        #org.freedesktop.portal.Request::Response signal:
+        <variablelist>
+          <varlistentry>
+            <term>streams a(ua{sv})</term>
+            <listitem><para>
+              An array of PipeWire streams. Each stream consists of a PipeWire
+              node ID (the first element in the tuple, and a Vardict of
+              properties.
+
+              The array will contain a single stream if 'multiple' (see
+              SelectSources) was set to 'false', or at least one stream if
+              'multiple' was set to 'true' as part of the SelectSources method.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        Stream properties include:
+        <variablelist>
+          <varlistentry>
+            <term>position (ii)</term>
+            <listitem><para>
+              A tuple consisting of the position (x, y) in the compositor
+              coordinate space. Note that the position may not be equivalent to a
+              position in a pixel coordinate space. Only available for monitor
+              streams.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>size (ii)</term>
+            <listitem><para>
+              A tuple consisting of (width, height). The size represents the size
+              of the stream as it is displayed in the compositor coordinate
+              space. Note that this size may not be equivalent to a size in a
+              pixel coordinate space. The size may differ from the size of the
+              stream.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="Start">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="parent_window" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+    <!--
+        OpenPipeWireRemote:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @fd: File descriptor of an open PipeWire remote.
+
+        Open a file descriptor to the PipeWire remote where the screen cast
+        streams are available. The file descriptor should be used to create a
+        <classname>pw_remote</classname> object, by using
+        <function>pw_remote_connect_fd</function>. Only the screen cast stream
+        nodes will be available from this PipeWire node.
+    -->
+    <method name="OpenPipeWireRemote">
+      <annotation name="org.gtk.GDBus.C.Name" value="open_pipewire_remote"/>
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="h" name="fd" direction="out"/>
+    </method>
+    <!--
+        AvailableSourceTypes:
+
+        A bitmask of available source types. Currently defined types are:
+
+        <simplelist>
+          <member>1: MONITOR</member>
+          <member>2: WINDOW</member>
+        </simplelist>
+    -->
+    <property name="AvailableSourceTypes" type="u" access="read"/>
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>

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)

doc/index.docbook

@@ -73,7 +73,7 @@ to help you perform a task.
 <para>
 Please report any problems or feature requests to the &kde; mailing
 lists or file a bug at <ulink
-url="http://bugs.kde.org">http://bugs.kde.org</ulink>. 
+url="https://bugs.kde.org">https://bugs.kde.org</ulink>.
 </para>
 </chapter>
 

events/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory(x11)
+
+# Makes sense to use only when PW framebuffer is used
+if (TARGET K::KPipeWire)
+    add_subdirectory(xdp)
+endif()

events/x11/CMakeLists.txt

@@ -0,0 +1,19 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_events_x11_SRCS
+     x11events.cpp
+     x11eventsplugin.cpp
+)
+
+add_library (krfb_events_x11 MODULE ${krfb_events_x11_SRCS})
+
+target_link_libraries (krfb_events_x11
+                       ${X11_XTest_LIB}
+                       KF6::CoreAddons
+                       krfbprivate
+)
+set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)
+
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)

events/x11/x11events.cpp

@@ -0,0 +1,199 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2016 by Oleg Chernovskiy <kanedias@xaker.ru>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "x11events.h"
+
+#include <QApplication>
+#include <QGlobalStatic>
+#include <QtGui/private/qtx11extras_p.h>
+
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+#include <X11/extensions/XTest.h>
+
+enum {
+    LEFTSHIFT = 1,
+    RIGHTSHIFT = 2,
+    ALTGR = 4
+};
+
+class EventData
+{
+public:
+    EventData();
+
+    //keyboard
+    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 = 0;
+    int x = 0;
+    int y = 0;
+
+private:
+    void init();
+};
+
+Q_GLOBAL_STATIC(EventData, data)
+
+EventData::EventData()
+{
+    init();
+}
+
+void EventData::init()
+{
+    buttonMask = 0;
+
+    dpy = QX11Info::display();
+    //initialize keycodes
+    KeySym key, *keymap;
+    int i, j, minkey, maxkey, syms_per_keycode;
+
+    memset(modifiers, -1, sizeof(modifiers));
+
+    XDisplayKeycodes(dpy, &minkey, &maxkey);
+    Q_ASSERT(minkey >= 8);
+    Q_ASSERT(maxkey < 256);
+    keymap = (KeySym *) XGetKeyboardMapping(dpy, minkey,
+                                            (maxkey - minkey + 1),
+                                            &syms_per_keycode);
+    Q_ASSERT(keymap);
+
+    for (i = minkey; i <= maxkey; i++) {
+        for (j = 0; j < syms_per_keycode; j++) {
+            key = keymap[(i-minkey)*syms_per_keycode+j];
+
+            if (key >= ' ' && key < 0x100 && i == XKeysymToKeycode(dpy, key)) {
+                keycodes[key] = i;
+                modifiers[key] = j;
+            }
+        }
+    }
+
+    leftShiftCode = XKeysymToKeycode(dpy, XK_Shift_L);
+    rightShiftCode = XKeysymToKeycode(dpy, XK_Shift_R);
+    altGrCode = XKeysymToKeycode(dpy, XK_Mode_switch);
+
+    XFree((char *)keymap);
+}
+
+/* this function adjusts the modifiers according to mod (as from modifiers) and data->modifierState */
+static void tweakModifiers(signed char mod, bool down)
+{
+    bool isShift = data->modifierState & (LEFTSHIFT | RIGHTSHIFT);
+
+    if (mod < 0) {
+        return;
+    }
+
+    if (isShift && mod != 1) {
+        if (data->modifierState & LEFTSHIFT) {
+            XTestFakeKeyEvent(data->dpy, data->leftShiftCode,
+                              down, CurrentTime);
+        }
+
+        if (data->modifierState & RIGHTSHIFT) {
+            XTestFakeKeyEvent(data->dpy, data->rightShiftCode,
+                              down, CurrentTime);
+        }
+    }
+
+    if (!isShift && mod == 1) {
+        XTestFakeKeyEvent(data->dpy, data->leftShiftCode,
+                          down, CurrentTime);
+    }
+
+    if ((data->modifierState & ALTGR) && mod != 2) {
+        XTestFakeKeyEvent(data->dpy, data->altGrCode,
+                          !down, CurrentTime);
+    }
+
+    if (!(data->modifierState & ALTGR) && mod == 2) {
+        XTestFakeKeyEvent(data->dpy, data->altGrCode,
+                          down, CurrentTime);
+    }
+}
+
+void X11EventHandler::handleKeyboard(bool down, rfbKeySym keySym)
+{
+#define ADJUSTMOD(sym,state) \
+    if(keySym==sym) { if(down) data->modifierState|=state; else data->modifierState&=~state; }
+
+    if (QX11Info::isPlatformX11()) {
+        ADJUSTMOD(XK_Shift_L, LEFTSHIFT);
+        ADJUSTMOD(XK_Shift_R, RIGHTSHIFT);
+        ADJUSTMOD(XK_Mode_switch, ALTGR);
+
+        if (keySym >= ' ' && keySym < 0x100) {
+            KeyCode k;
+
+            if (down) {
+                tweakModifiers(data->modifiers[keySym], True);
+            }
+
+            k = data->keycodes[keySym];
+
+            if (k != NoSymbol) {
+                XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
+            }
+
+            if (down) {
+                tweakModifiers(data->modifiers[keySym], False);
+            }
+        } else {
+            KeyCode k = XKeysymToKeycode(data->dpy, keySym);
+
+            if (k != NoSymbol) {
+                XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
+            }
+        }
+    }
+/*
+    // Wayland platform and pipweire plugin in use
+    if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("pw")) {
+
+    }*/
+}
+
+void X11EventHandler::handlePointer(int buttonMask, int x, int y)
+{
+    if (QX11Info::isPlatformX11()) {
+        XTestFakeMotionEvent(data->dpy, 0, x, y, CurrentTime);
+
+        for (int i = 0; i < 5; i++) {
+            if ((data->buttonMask&(1 << i)) != (buttonMask&(1 << i))) {
+                XTestFakeButtonEvent(data->dpy,
+                                        i + 1,
+                                        (buttonMask&(1 << i)) ? True : False,
+                                        CurrentTime);
+            }
+        }
+
+        data->buttonMask = buttonMask;
+    }
+}

events/x11/x11events.h

@@ -0,0 +1,41 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2016 by Oleg Chernovskiy <kanedias@xaker.ru>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVENTS_X11EVENTS_H
+#define EVENTS_X11EVENTS_H
+
+#include "../../krfb/events.h"
+
+class X11EventHandler : public EventHandler
+{
+    Q_OBJECT
+public:
+    explicit X11EventHandler(QObject *parent = nullptr)
+        : EventHandler(parent)
+    {
+    };
+
+    void handleKeyboard(bool down, rfbKeySym key) override;
+    void handlePointer(int buttonMask, int x, int y) override;
+};
+
+#endif
+

events/x11/x11eventsplugin.cpp

@@ -1,6 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
-    @author George Goldberg <george.goldberg@collabora.co.uk>
+   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
@@ -18,28 +17,29 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "qtframebufferplugin.h"
+#include "x11eventsplugin.h"
 
-#include "qtframebuffer.h"
+#include "x11events.h"
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
-			   registerPlugin<QtFrameBufferPlugin>();)
+#include <QtGui/private/qtx11extras_p.h>
 
-QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
-    : FrameBufferPlugin(parent, args)
+K_PLUGIN_CLASS(X11EventsPlugin)
+
+X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
+    : EventsPlugin(parent, args)
 {
 }
 
-QtFrameBufferPlugin::~QtFrameBufferPlugin()
+EventHandler *X11EventsPlugin::eventHandler()
 {
+    // works only under X11
+    if(!QX11Info::isPlatformX11())
+        return nullptr;
+
+    return new X11EventHandler();
 }
 
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
-{
-    return new QtFrameBuffer(id);
-}
-
-#include "qtframebufferplugin.moc"
+#include "x11eventsplugin.moc"
 

events/x11/x11eventsplugin.h

@@ -1,6 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
-    @author George Goldberg <george.goldberg@collabora.co.uk>
+   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
@@ -18,29 +17,26 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
-#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
+#ifndef KRFB_EVENTS_X11_X11EVENTSPLUGIN_H
+#define KRFB_EVENTS_X11_X11EVENTSPLUGIN_H
 
-#include "framebufferplugin.h"
+#include "eventsplugin.h"
 
 #include <QWidget>
 
-class FrameBuffer;
+class EventHandler;
 
-class X11FrameBufferPlugin : public FrameBufferPlugin
+class X11EventsPlugin : public EventsPlugin
 {
     Q_OBJECT
-
 public:
-    X11FrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~X11FrameBufferPlugin();
+    X11EventsPlugin(QObject *parent, const QVariantList &args);
 
-    FrameBuffer *frameBuffer(WId id) override;
+    EventHandler *eventHandler() override;
 
 private:
-    Q_DISABLE_COPY(X11FrameBufferPlugin)
+    Q_DISABLE_COPY(X11EventsPlugin)
 };
 
 
 #endif  // Header guard
-

events/xdp/CMakeLists.txt

@@ -0,0 +1,28 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_events_xdp_SRCS
+     xdpevents.cpp
+     xdpeventsplugin.cpp
+)
+
+qt_add_dbus_interface(
+   krfb_events_xdp_SRCS
+   ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
+   xdp_dbus_remotedesktop_interface
+)
+
+add_library (krfb_events_xdp MODULE ${krfb_events_xdp_SRCS})
+
+target_link_libraries (krfb_events_xdp
+                       KF6::CoreAddons
+                       KF6::I18n
+                       Qt::DBus
+                       krfbprivate
+)
+set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)
+
+install (TARGETS krfb_events_xdp
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events
+)

events/xdp/xdpevents.cpp

@@ -0,0 +1,121 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "xdpevents.h"
+
+#include "rfbservermanager.h"
+#include "xdp_dbus_remotedesktop_interface.h"
+
+#include <linux/input.h>
+
+#include <QApplication>
+#include <QGlobalStatic>
+
+class EventData
+{
+public:
+    EventData();
+
+    //mouse
+    int buttonMask = 0;
+    int x = 0;
+    int y = 0;
+
+    QScopedPointer<OrgFreedesktopPortalRemoteDesktopInterface> dbusXdpRemoteDesktopService;
+
+private:
+    void init();
+};
+
+Q_GLOBAL_STATIC(EventData, data)
+
+EventData::EventData()
+{
+    init();
+}
+
+void EventData::init()
+{
+    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QStringLiteral("org.freedesktop.portal.Desktop"),
+                                      QStringLiteral("/org/freedesktop/portal/desktop"), QDBusConnection::sessionBus()));
+}
+
+void XdpEventHandler::handleKeyboard(bool down, rfbKeySym keySym)
+{
+    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QStringLiteral("session_handle")).value<QDBusObjectPath>();
+    data->dbusXdpRemoteDesktopService->NotifyKeyboardKeysym(sessionHandle, {}, keySym, down);
+}
+
+void XdpEventHandler::handlePointer(int buttonMask, int x, int y)
+{
+    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;
+    }
+
+    if (x != data->x || y != data->y) {
+        data->dbusXdpRemoteDesktopService->NotifyPointerMotionAbsolute(sessionHandle, QVariantMap(), streamNodeId, x, y);
+        data->x = x;
+        data->y = y;
+    }
+
+    if (buttonMask != data->buttonMask) {
+        int i = 0;
+        QList<int> buttons = { BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, 0, 0, 0, 0, BTN_SIDE, BTN_EXTRA };
+        for (auto it = buttons.constBegin(); it != buttons.constEnd(); ++it) {
+            int prevButtonState = (data->buttonMask >> i) & 0x01;
+            int currentButtonState = (buttonMask >> i) & 0x01;
+
+            if (prevButtonState != currentButtonState) {
+                if (*it) {
+                    data->dbusXdpRemoteDesktopService->NotifyPointerButton(sessionHandle, QVariantMap(), *it, buttonMask);
+                } else {
+                    int axis = 0;
+                    int steps = 0;
+                    switch (i) {
+                    case 3:
+                        axis = 0;   // Vertical
+                        steps = -1;
+                        break;
+                    case 4:
+                        axis = 0;   // Vertical
+                        steps = 1;
+                        break;
+                    case 5:
+                        axis = 1;   // Horizontal
+                        steps = -1;
+                        break;
+                    case 6:
+                        axis = 1;   // Horizontal
+                        steps = 1;
+                        break;
+                        }
+
+                    data->dbusXdpRemoteDesktopService->NotifyPointerAxisDiscrete(sessionHandle, QVariantMap(), axis, steps);
+                }
+            }
+            ++i;
+        }
+        data->buttonMask = buttonMask;
+    }
+}

events/xdp/xdpevents.h

@@ -0,0 +1,37 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVENTS_XDPEVENTS_H
+#define EVENTS_XDPEVENTS_H
+
+#include "../../krfb/events.h"
+
+class XdpEventHandler : public EventHandler
+{
+    Q_OBJECT
+public:
+    void handleKeyboard(bool down, rfbKeySym key) override;
+    void handlePointer(int buttonMask, int x, int y) override;
+};
+
+#endif
+
+

events/xdp/xdpeventsplugin.cpp

@@ -0,0 +1,42 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "xdpeventsplugin.h"
+
+#include "xdpevents.h"
+
+#include <KPluginFactory>
+
+K_PLUGIN_CLASS(XdpEventsPlugin)
+
+XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
+    : EventsPlugin(parent, args)
+{
+}
+
+EventHandler *XdpEventsPlugin::eventHandler()
+{
+    // works only under Wayland
+    return new XdpEventHandler();
+}
+
+#include "xdpeventsplugin.moc"
+

events/xdp/xdpeventsplugin.h

@@ -0,0 +1,45 @@
+/*
+   This file is part of the KDE project
+
+   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
+#define KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
+
+#include "eventsplugin.h"
+
+#include <QWidget>
+
+class EventHandler;
+
+class XdpEventsPlugin : public EventsPlugin
+{
+    Q_OBJECT
+public:
+    XdpEventsPlugin(QObject *parent, const QVariantList &args);
+
+    EventHandler *eventHandler() override;
+
+private:
+    Q_DISABLE_COPY(XdpEventsPlugin)
+};
+
+
+#endif  // Header guard
+

framebuffers/CMakeLists.txt

@@ -1,3 +1,7 @@
-add_subdirectory (qt)
-add_subdirectory (x11)
+if (${XCB_DAMAGE_FOUND} AND ${XCB_SHM_FOUND} AND ${XCB_IMAGE_FOUND})
+    add_subdirectory (xcb)
+endif()
 
+if (TARGET K::KPipeWire)
+    add_subdirectory(pipewire)
+endif()

framebuffers/pipewire/CMakeLists.txt

@@ -0,0 +1,72 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_pw_SRCS
+     pw_framebuffer.cpp
+     pw_framebufferplugin.cpp
+
+     screencasting.cpp
+)
+
+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
+)
+
+qt_add_dbus_interface(
+   krfb_framebuffer_pw_SRCS
+   ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_screencast_interface.xml
+   xdp_dbus_screencast_interface
+)
+
+qt_add_dbus_interface(
+   krfb_framebuffer_pw_SRCS
+   ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
+   xdp_dbus_remotedesktop_interface
+)
+
+add_library(krfb_framebuffer_pw
+    MODULE
+    ${krfb_framebuffer_pw_SRCS}
+)
+
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+    ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
+        PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+        BASENAME zkde-screencast-unstable-v1
+    )
+else()
+    qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
+        FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+    )
+endif()
+
+if (KPipeWire_VERSION VERSION_LESS "6.0.80")
+    target_compile_definitions(krfb_framebuffer_pw PRIVATE -DKPIPEWIRE60=1)
+else()
+    target_compile_definitions(krfb_framebuffer_pw PRIVATE -DKPIPEWIRE60=0)
+endif()
+set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
+
+target_link_libraries(krfb_framebuffer_pw
+                      Qt::Core
+                      Qt::Gui
+                      Qt::DBus
+                      KF6::CoreAddons
+                      KF6::ConfigCore
+                      PkgConfig::PipeWire
+                      Plasma::KWaylandClient
+                      Wayland::Client
+                      krfbprivate
+                      K::KPipeWire
+                      K::KPipeWireDmaBuf
+)
+
+set_target_properties(krfb_framebuffer_pw PROPERTIES OUTPUT_NAME pw)
+install (TARGETS krfb_framebuffer_pw
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
+)

framebuffers/pipewire/pipewire.json

@@ -0,0 +1,5 @@
+{
+    "X-KDE-OnlyShowOnQtPlatforms": [
+        "wayland"
+    ]
+}

framebuffers/pipewire/pw_framebuffer.cpp

@@ -0,0 +1,536 @@
+/* This file is part of the KDE project
+   Copyright (C) 2018-2021 Jan Grulich <jgrulich@redhat.com>
+   Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+
+   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 "config-krfb.h"
+
+// system
+#include <sys/mman.h>
+#include <cstring>
+
+// Qt
+#include <QCoreApplication>
+#include <QGuiApplication>
+#include <QScreen>
+#include <QSocketNotifier>
+#include <QDebug>
+#include <QRandomGenerator>
+
+#include <KConfigGroup>
+#include <KSharedConfig>
+
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+
+// pipewire
+#include <climits>
+
+#include "pw_framebuffer.h"
+#include "xdp_dbus_screencast_interface.h"
+#include "xdp_dbus_remotedesktop_interface.h"
+#include "krfb_fb_pipewire_debug.h"
+#include "screencasting.h"
+#include <PipeWireSourceStream>
+#include <DmaBufHandler>
+
+static const int BYTES_PER_PIXEL = 4;
+static const uint MIN_SUPPORTED_XDP_KDE_SC_VERSION = 1;
+
+Q_DECLARE_METATYPE(PWFrameBuffer::Stream);
+Q_DECLARE_METATYPE(PWFrameBuffer::Streams);
+
+const QDBusArgument &operator >> (const QDBusArgument &arg, PWFrameBuffer::Stream &stream)
+{
+    arg.beginStructure();
+    arg >> stream.nodeId;
+
+    arg.beginMap();
+    while (!arg.atEnd()) {
+        QString key;
+        QVariant map;
+        arg.beginMapEntry();
+        arg >> key >> map;
+        arg.endMapEntry();
+        stream.map.insert(key, map);
+    }
+    arg.endMap();
+    arg.endStructure();
+
+    return arg;
+}
+
+/**
+ * @brief The PWFrameBuffer::Private class - private counterpart of PWFramebuffer class. This is the entity where
+ *        whole logic resides, for more info search for "d-pointer pattern" information.
+ */
+class PWFrameBuffer::Private {
+public:
+    Private(PWFrameBuffer *q);
+    ~Private();
+
+private:
+    friend class PWFrameBuffer;
+
+    void initDbus();
+
+    // dbus handling
+    void handleSessionCreated(quint32 code, const QVariantMap &results);
+    void handleDevicesSelected(quint32 code, const QVariantMap &results);
+    void handleSourcesSelected(quint32 code, const QVariantMap &results);
+    void handleRemoteDesktopStarted(quint32 code, const QVariantMap &results);
+    void setVideoSize(const QSize &size);
+
+    // pw handling
+    void handleFrame(const PipeWireFrame &frame);
+
+    // link to public interface
+    PWFrameBuffer *q;
+
+    // requests a session from XDG Desktop Portal
+    // auto-generated and compiled from xdp_dbus_interface.xml file
+    QScopedPointer<OrgFreedesktopPortalScreenCastInterface> dbusXdpScreenCastService;
+    QScopedPointer<OrgFreedesktopPortalRemoteDesktopInterface> dbusXdpRemoteDesktopService;
+
+    // XDP screencast session handle
+    QDBusObjectPath sessionPath;
+
+    // screen geometry holder
+    QSize videoSize;
+
+    // sanity indicator
+    bool isValid = true;
+    std::unique_ptr<PipeWireSourceStream> stream;
+    std::optional<PipeWireCursor> cursor;
+    DmaBufHandler m_dmabufHandler;
+};
+
+PWFrameBuffer::Private::Private(PWFrameBuffer *q)
+    : q(q)
+    , stream(new PipeWireSourceStream(q))
+{
+    QObject::connect(stream.get(), &PipeWireSourceStream::frameReceived, q, [this] (const PipeWireFrame &frame) {
+        handleFrame(frame);
+    });
+}
+
+/**
+ * @brief PWFrameBuffer::Private::initDbus - initialize D-Bus connectivity with XDG Desktop Portal.
+ *        Based on XDG_CURRENT_DESKTOP environment variable it will give us implementation that we need,
+ *        in case of KDE it is xdg-desktop-portal-kde binary.
+ */
+void PWFrameBuffer::Private::initDbus()
+{
+    qInfo() << "Initializing D-Bus connectivity with XDG Desktop Portal";
+    dbusXdpScreenCastService.reset(new OrgFreedesktopPortalScreenCastInterface(QStringLiteral("org.freedesktop.portal.Desktop"),
+                                                                     QStringLiteral("/org/freedesktop/portal/desktop"),
+                                                                     QDBusConnection::sessionBus()));
+    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QStringLiteral("org.freedesktop.portal.Desktop"),
+                                                                     QStringLiteral("/org/freedesktop/portal/desktop"),
+                                                                     QDBusConnection::sessionBus()));
+    auto version = dbusXdpScreenCastService->version();
+    if (version < MIN_SUPPORTED_XDP_KDE_SC_VERSION) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Unsupported XDG Portal screencast interface version:" << version;
+        isValid = false;
+        return;
+    }
+
+    // create session
+    auto sessionParameters = QVariantMap {
+        { QStringLiteral("session_handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) },
+        { QStringLiteral("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) }
+    };
+    auto sessionReply = dbusXdpRemoteDesktopService->CreateSession(sessionParameters);
+    sessionReply.waitForFinished();
+    if (!sessionReply.isValid()) {
+        qWarning("Couldn't initialize XDP-KDE screencast session");
+        isValid = false;
+        return;
+    }
+
+    qInfo() << "DBus session created: " << sessionReply.value().path();
+    QDBusConnection::sessionBus().connect(QString(),
+                                          sessionReply.value().path(),
+                                          QStringLiteral("org.freedesktop.portal.Request"),
+                                          QStringLiteral("Response"),
+                                          this->q,
+                                          SLOT(handleXdpSessionCreated(uint, QVariantMap)));
+}
+
+void PWFrameBuffer::handleXdpSessionCreated(quint32 code, const QVariantMap &results)
+{
+    d->handleSessionCreated(code, results);
+}
+
+/**
+ * @brief PWFrameBuffer::Private::handleSessionCreated - handle creation of ScreenCast session.
+ *        XDG Portal answers with session path if it was able to successfully create the screencast.
+ *
+ * @param code return code for dbus call. Zero is success, non-zero means error
+ * @param results map with results of call.
+ */
+void PWFrameBuffer::Private::handleSessionCreated(quint32 code, const QVariantMap &results)
+{
+    if (code != 0) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to create session: " << code;
+        isValid = false;
+        return;
+    }
+
+    sessionPath = QDBusObjectPath(results.value(QStringLiteral("session_handle")).toString());
+
+    // select sources for the session
+    auto selectionOptions = QVariantMap {
+        // We have to specify it's an uint, otherwise xdg-desktop-portal will not forward it to backend implementation
+        { QStringLiteral("types"), QVariant::fromValue<uint>(7) }, // request all (KeyBoard, Pointer, TouchScreen)
+        { QStringLiteral("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) },
+        { QStringLiteral("persist_mode"), QVariant::fromValue<uint>(2) }, // Persist permission until explicitly revoked by user
+    };
+
+    KConfigGroup stateConfig = KSharedConfig::openStateConfig()->group(QStringLiteral("XdgPortal"));
+    const QString restoreToken = stateConfig.readEntry(QStringLiteral("RestoreToken"), QString());
+    if (!restoreToken.isEmpty()) {
+        selectionOptions[QStringLiteral("restore_token")] = restoreToken;
+    }
+
+    auto selectorReply = dbusXdpRemoteDesktopService->SelectDevices(sessionPath, selectionOptions);
+    selectorReply.waitForFinished();
+    if (!selectorReply.isValid()) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Couldn't select devices for the remote-desktop session";
+        isValid = false;
+        return;
+    }
+    QDBusConnection::sessionBus().connect(QString(),
+                                          selectorReply.value().path(),
+                                          QStringLiteral("org.freedesktop.portal.Request"),
+                                          QStringLiteral("Response"),
+                                          this->q,
+                                          SLOT(handleXdpDevicesSelected(uint, QVariantMap)));
+}
+
+void PWFrameBuffer::handleXdpDevicesSelected(quint32 code, const QVariantMap &results)
+{
+    d->handleDevicesSelected(code, results);
+}
+
+/**
+ * @brief PWFrameBuffer::Private::handleDevicesCreated - handle selection of devices we want to use for remote desktop
+ *
+ * @param code return code for dbus call. Zero is success, non-zero means error
+ * @param results map with results of call.
+ */
+void PWFrameBuffer::Private::handleDevicesSelected(quint32 code, const QVariantMap &results)
+{
+    Q_UNUSED(results)
+    if (code != 0) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to select devices: " << code;
+        isValid = false;
+        return;
+    }
+
+    // select sources for the session
+    auto selectionOptions = QVariantMap {
+        { QStringLiteral("types"), QVariant::fromValue<uint>(1) }, // only MONITOR is supported
+        { QStringLiteral("multiple"), false },
+        { QStringLiteral("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) }
+    };
+    auto selectorReply = dbusXdpScreenCastService->SelectSources(sessionPath, selectionOptions);
+    selectorReply.waitForFinished();
+    if (!selectorReply.isValid()) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Couldn't select sources for the screen-casting session";
+        isValid = false;
+        return;
+    }
+    QDBusConnection::sessionBus().connect(QString(),
+                                          selectorReply.value().path(),
+                                          QStringLiteral("org.freedesktop.portal.Request"),
+                                          QStringLiteral("Response"),
+                                          this->q,
+                                          SLOT(handleXdpSourcesSelected(uint, QVariantMap)));
+}
+
+void PWFrameBuffer::handleXdpSourcesSelected(quint32 code, const QVariantMap &results)
+{
+    d->handleSourcesSelected(code, results);
+}
+
+/**
+ * @brief PWFrameBuffer::Private::handleSourcesSelected - handle Screencast sources selection.
+ *        XDG Portal shows a dialog at this point which allows you to select monitor from the list.
+ *        This function is called after you make a selection.
+ *
+ * @param code return code for dbus call. Zero is success, non-zero means error
+ * @param results map with results of call.
+ */
+void PWFrameBuffer::Private::handleSourcesSelected(quint32 code, const QVariantMap &)
+{
+    if (code != 0) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to select sources: " << code;
+        isValid = false;
+        return;
+    }
+
+    // start session
+    auto startParameters = QVariantMap {
+        { QStringLiteral("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) }
+    };
+    auto startReply = dbusXdpRemoteDesktopService->Start(sessionPath, QString(), startParameters);
+    startReply.waitForFinished();
+    QDBusConnection::sessionBus().connect(QString(),
+                                          startReply.value().path(),
+                                          QStringLiteral("org.freedesktop.portal.Request"),
+                                          QStringLiteral("Response"),
+                                          this->q,
+                                          SLOT(handleXdpRemoteDesktopStarted(uint, QVariantMap)));
+}
+
+
+void PWFrameBuffer::handleXdpRemoteDesktopStarted(quint32 code, const QVariantMap &results)
+{
+    d->handleRemoteDesktopStarted(code, results);
+}
+
+/**
+ * @brief PWFrameBuffer::Private::handleScreencastStarted - handle Screencast start.
+ *        At this point there shall be ready pipewire stream to consume.
+ *
+ * @param code return code for dbus call. Zero is success, non-zero means error
+ * @param results map with results of call.
+ */
+void PWFrameBuffer::Private::handleRemoteDesktopStarted(quint32 code, const QVariantMap &results)
+{
+    if (code != 0) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to start screencast: " << code;
+        isValid = false;
+        return;
+    }
+
+    if (results.value(QStringLiteral("devices")).toUInt() == 0) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "No devices were granted" << results;
+        isValid = false;
+        return;
+    }
+
+    // there should be only one stream
+    const Streams streams = qdbus_cast<Streams>(results.value(QStringLiteral("streams")));
+    if (streams.isEmpty()) {
+        // maybe we should check deeper with qdbus_cast but this suffices for now
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to get screencast streams";
+        isValid = false;
+        return;
+    }
+
+    auto streamReply = dbusXdpScreenCastService->OpenPipeWireRemote(sessionPath, QVariantMap());
+    streamReply.waitForFinished();
+    if (!streamReply.isValid()) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Couldn't open pipewire remote for the screen-casting session";
+        isValid = false;
+        return;
+    }
+
+    QDBusUnixFileDescriptor pipewireFd = streamReply.value();
+    if (!pipewireFd.isValid()) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Couldn't get pipewire connection file descriptor";
+        isValid = false;
+        return;
+    }
+
+    if (!stream->createStream(streams.first().nodeId, pipewireFd.takeFileDescriptor())) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Couldn't create the pipewire stream";
+        isValid = false;
+        return;
+    }
+
+    // save restore token
+    KConfigGroup stateConfig = KSharedConfig::openStateConfig()->group(QStringLiteral("XdgPortal"));
+    stateConfig.writeEntry(QStringLiteral("RestoreToken"), results[QStringLiteral("restore_token")].toString());
+}
+
+void PWFrameBuffer::Private::handleFrame(const PipeWireFrame &frame)
+{
+    cursor = frame.cursor;
+
+#if KPIPEWIRE60
+    if (!frame.dmabuf && !frame.image) {
+#else
+    if (!frame.dmabuf && !frame.dataFrame) {
+#endif
+        qCDebug(KRFB_FB_PIPEWIRE) << "Got empty buffer. The buffer possibly carried only "
+                                     "information about the mouse cursor.";
+        return;
+    }
+
+#if KPIPEWIRE60
+    if (frame.image) {
+        memcpy(q->fb, frame.image->constBits(), frame.image->sizeInBytes());
+        setVideoSize(frame.image->size());
+    }
+#else
+    if (frame.dataFrame) {
+        // FIXME: Assuming stride == width * 4, not sure to which extent this holds
+        setVideoSize(frame.dataFrame->size);
+        memcpy(q->fb, frame.dataFrame->data, frame.dataFrame->size.width() * frame.dataFrame->stride);
+    }
+#endif
+    else if (frame.dmabuf) {
+        // FIXME: Assuming stride == width * 4, not sure to which extent this holds
+        const QSize size = { frame.dmabuf->width, frame.dmabuf->height };
+        setVideoSize(size);
+        QImage src(reinterpret_cast<uchar*>(q->fb), size.width(), size.height(), QImage::Format_RGB32);
+        if (!m_dmabufHandler.downloadFrame(src, frame)) {
+            stream->renegotiateModifierFailed(frame.format, frame.dmabuf->modifier);
+            qCDebug(KRFB_FB_PIPEWIRE) << "Failed to download frame.";
+            return;
+        }
+    } else {
+        qCDebug(KRFB_FB_PIPEWIRE) << "Unknown kind of frame";
+    }
+
+    if (auto damage = frame.damage) {
+        for (const auto &rect : *damage) {
+            q->tiles.append(rect);
+        }
+    } else {
+        q->tiles.append(QRect(0, 0, videoSize.width(), videoSize.height()));
+    }
+}
+
+void PWFrameBuffer::Private::setVideoSize(const QSize &size)
+{
+    if (q->fb && videoSize == size) {
+        return;
+    }
+
+    free(q->fb);
+    q->fb = static_cast<char*>(malloc(size.width() * size.height() * BYTES_PER_PIXEL));
+    if (!q->fb) {
+        qCWarning(KRFB_FB_PIPEWIRE) << "Failed to allocate buffer";
+        isValid = false;
+        return;
+    }
+    videoSize = size;
+
+    Q_EMIT q->frameBufferChanged();
+}
+
+PWFrameBuffer::Private::~Private()
+{
+}
+
+PWFrameBuffer::PWFrameBuffer(QObject *parent)
+    : FrameBuffer (parent),
+      d(new Private(this))
+{
+}
+
+PWFrameBuffer::~PWFrameBuffer()
+{
+    free(fb);
+    fb = nullptr;
+}
+
+void PWFrameBuffer::initDBus()
+{
+    d->initDbus();
+}
+
+void PWFrameBuffer::startVirtualMonitor(const QString& name, const QSize& resolution, qreal dpr)
+{
+    d->videoSize = resolution * dpr;
+    using namespace KWayland::Client;
+    auto connection = ConnectionThread::fromApplication(this);
+    if (!connection) {
+        qWarning() << "Failed getting Wayland connection from QPA";
+        QCoreApplication::exit(1);
+        return;
+    }
+
+    auto registry = new Registry(this);
+    connect(registry, &KWayland::Client::Registry::interfaceAnnounced, this, [this, registry, name, dpr, resolution] (const QByteArray &interfaceName, quint32 wlname, quint32 version) {
+        if (interfaceName != "zkde_screencast_unstable_v1")
+            return;
+
+        auto screencasting = new Screencasting(registry, wlname, version, this);
+        auto r = screencasting->createVirtualMonitorStream(name, resolution, dpr, Screencasting::Metadata);
+        connect(r, &ScreencastingStream::created, this, [this] (quint32 nodeId) {
+            d->stream->createStream(nodeId, 0);
+        });
+    });
+    registry->create(connection);
+    registry->setup();
+}
+
+int PWFrameBuffer::depth()
+{
+    return 32;
+}
+
+int PWFrameBuffer::height()
+{
+    if (!d->videoSize.isValid()) {
+        return 0;
+    }
+    return d->videoSize.height();
+}
+
+int PWFrameBuffer::width()
+{
+    if (!d->videoSize.isValid()) {
+        return 0;
+    }
+    return d->videoSize.width();
+}
+
+int PWFrameBuffer::paddedWidth()
+{
+    return width() * 4;
+}
+
+void PWFrameBuffer::getServerFormat(rfbPixelFormat &format)
+{
+    format.bitsPerPixel = 32;
+    format.depth = 32;
+    format.trueColour = true;
+    format.bigEndian = false;
+}
+
+void PWFrameBuffer::startMonitor()
+{
+
+}
+
+void PWFrameBuffer::stopMonitor()
+{
+
+}
+
+QVariant PWFrameBuffer::customProperty(const QString &property) const
+{
+    if (property == QLatin1String("stream_node_id")) {
+        return QVariant::fromValue<uint>(d->stream->nodeId());
+    } if (property == QLatin1String("session_handle")) {
+        return QVariant::fromValue<QDBusObjectPath>(d->sessionPath);
+    }
+
+    return FrameBuffer::customProperty(property);
+}
+
+bool PWFrameBuffer::isValid() const
+{
+    return d->isValid;
+}
+
+QPoint PWFrameBuffer::cursorPosition()
+{
+    const auto cursor = d->cursor;
+    if (cursor) {
+        return cursor->position;
+    } else {
+        return {};
+    }
+}

framebuffers/pipewire/pw_framebuffer.h

@@ -0,0 +1,63 @@
+/* This file is part of the KDE project
+   Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+   Copyright (C) 2018-2020 Jan Grulich <jgrulich@redhat.com>
+
+   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.
+*/
+#ifndef KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
+#define KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
+
+#include "framebuffer.h"
+#include <QWidget>
+#include <QVariantMap>
+
+/**
+ * @brief The PWFrameBuffer class - framebuffer implementation based on XDG Desktop Portal ScreenCast interface.
+ *        The design relies heavily on a presence of XDG D-Bus service and PipeWire daemon.
+ *
+ * @author Oleg Chernovskiy <kanedias@xaker.ru>
+ */
+class PWFrameBuffer: public FrameBuffer
+{
+    Q_OBJECT
+public:
+    using Stream = struct {
+        uint nodeId;
+        QVariantMap map;
+    };
+    using Streams = QList<Stream>;
+
+    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;
+    int  paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;
+    QPoint cursorPosition() override;
+
+    QVariant customProperty(const QString &property) const override;
+
+    bool isValid() const;
+
+private Q_SLOTS:
+    void handleXdpSessionCreated(quint32 code, const QVariantMap &results);
+    void handleXdpDevicesSelected(quint32 code, const QVariantMap &results);
+    void handleXdpSourcesSelected(quint32 code, const QVariantMap &results);
+    void handleXdpRemoteDesktopStarted(quint32 code, const QVariantMap &results);
+
+private:
+    class Private;
+    const QScopedPointer<Private> d;
+};
+
+#endif

framebuffers/pipewire/pw_framebufferplugin.cpp

@@ -0,0 +1,53 @@
+/* This file is part of the KDE project
+   Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+
+ 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.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+
+#include "pw_framebufferplugin.h"
+#include "pw_framebuffer.h"
+#include <KPluginFactory>
+
+K_PLUGIN_CLASS_WITH_JSON(PWFrameBufferPlugin, "pipewire.json")
+
+PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
+    : FrameBufferPlugin(parent, args)
+{
+}
+
+
+FrameBuffer *PWFrameBufferPlugin::frameBuffer(const QVariantMap &args)
+{
+    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()) {
+        delete pwfb;
+        return nullptr;
+    }
+
+    return pwfb;
+}
+
+#include "pw_framebufferplugin.moc"

framebuffers/pipewire/pw_framebufferplugin.h

@@ -0,0 +1,42 @@
+ /* This file is part of the KDE project
+    Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+
+  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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KRFB_FRAMEBUFFER_PW_PWFRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_PW_PWFRAMEBUFFERPLUGIN_H
+
+
+#include "framebufferplugin.h"
+
+class FrameBuffer;
+
+class PWFrameBufferPlugin: public FrameBufferPlugin
+{
+   Q_OBJECT
+
+public:
+   PWFrameBufferPlugin(QObject *parent, const QVariantList &args);
+
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;
+
+private:
+   Q_DISABLE_COPY(PWFrameBufferPlugin)
+};
+
+
+#endif  // Header guard

framebuffers/pipewire/screencasting.cpp

@@ -0,0 +1,117 @@
+/*
+    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"
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
+#include "qwayland-zkde-screencast-unstable-v1.h"
+#else
+#include "qwayland-screencast.h"
+#endif
+#include <KWayland/Client/registry.h>
+#include <QDebug>
+#include <QRect>
+#include <QPointer>
+
+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::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,75 @@
+/*
+    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 <QList>
+#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 *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

@@ -1,24 +0,0 @@
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set (krfb_framebuffer_qt_SRCS
-     qtframebuffer.cpp
-     qtframebufferplugin.cpp
-)
-
-add_library(krfb_framebuffer_qt
- MODULE 
-                 ${krfb_framebuffer_qt_SRCS}
-)
-
-target_link_libraries (krfb_framebuffer_qt
-                       Qt5::Core
-                       Qt5::Gui
-                       KF5::CoreAddons
-                       krfbprivate
-)
-
-install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
-)

framebuffers/qt/krfb_framebuffer_qt.desktop

@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=Qt based Framebuffer for KRfb.
-Comment[ast]=Esquema Qt de buffer pa KRfb
-Comment[bg]=Основан на Qt фреймбуфер за KRfb.
-Comment[bs]=Kadrobafer za KRfb na osnovu Qt.
-Comment[ca]=«Framebuffer» basat en les Qt per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en les Qt per al KRfb.
-Comment[cs]=Framebuffer založený na Qt pro KRfb.
-Comment[da]=Qt-baseret framebuffer til KRfb.
-Comment[de]=Qt-basierter Framebuffer für KRfb
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το Qt για το KRfb.
-Comment[en_GB]=Qt based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en Qt para KRfb.
-Comment[et]=KRfb Qt põhine kaadripuhver
-Comment[eu]=Qt-n oinarritutako KRfb-ren irteerako bideoa
-Comment[fi]=QT-perustainen Kehyspuskuri KRfb:lle
-Comment[fr]=Sortie vidéo fondée sur Qt pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar Qt.
-Comment[gl]=Framebuffer baseado en Qt para KRfb.
-Comment[hr]=Međuspremnik okvira baziran na Qt-u za KRfb.
-Comment[hu]=Qt-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur Qt per KRfb
-Comment[it]=Framebuffer basato su Qt per KRfb.
-Comment[kk]=Qt негіздеген KRfb-нің кадр буфері.
-Comment[km]=Framebuffer មាន​មូលដ្ឋាន​លើ Qt សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 Qt 기반 프레임버퍼.
-Comment[lt]=Qt pagrindu veikiantis Framebuffer skirtas KRfb.
-Comment[lv]=Qt balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Qt-basert rammebuffer for KRfb.
-Comment[nds]=Op Qt opbuut Bildpuffer för KRfb
-Comment[nl]=Op Qt gebaseerd framebuffer voor KRfb.
-Comment[nn]=Qt basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie Qt dla KRfb.
-Comment[pt]='Framebuffer' baseado no Qt para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no Qt para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе Qt.
-Comment[si]=KRfb සඳහා Qt මත පදනම් වූ රාමු බෆරය
-Comment[sk]=Framebuffer založený na Qt pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na Qt
-Comment[sr]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sv]=Qt-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için Qt temelli Çerçeve tamponu.
-Comment[uk]=Заснований на Qt буфер кадрів для KRfb.
-Comment[x-test]=xxQt based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 Qt 的 KRfb 帧缓冲机制
-Comment[zh_TW]=KRfb 的 Qt-based Framebuffer
-Name=Qt Framebuffer for KRfb
-Name[ast]=Esquema Qt de buffer pa KRfb
-Name[bg]=Qt фреймбуфер за KRfb
-Name[bs]=Qt-ov kadrobafer za KRFB
-Name[ca]=«Framebuffer» de les Qt per al KRfb.
-Name[ca@valencia]=«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 Framebuffer for KRfb
-Name[en_GB]=Qt Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo Qt para KRfb
-Name[et]=KRfb Qt kaadripuhver
-Name[eu]=KRfb-ren Qt-ko irteerako bideoa
-Name[fi]=QT-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo Qt pour Krfb
-Name[ga]=Maolán fráma Qt le haghaidh KRfb
-Name[gl]=Framebuffer de Qt para KRfb
-Name[hr]=Qt Framebuffer za KRfb
-Name[hu]=Qt framebuffer a Krfb-hez
-Name[ia]=Framebuffer Qt per KRfb
-Name[it]=Framebuffer Qt per KRfb
-Name[kk]=Qt KRfb кадр буфері
-Name[km]=Qt Framebuffer សម្រាប់for KRfb
-Name[ko]=KRfb를 위한 Qt 프레임버퍼
-Name[lt]=Qt Framebufferis skirtas KRfb
-Name[lv]=Qt kadrbuferis priekš KRfb.
-Name[nb]=Qt rammebuffer for KRfb
-Name[nds]=Qt-Bildpuffer för KRfb
-Name[nl]=Qt-framebuffer voor KRfb
-Name[nn]=Qt-framebuffer 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[si]=KRfb සඳහා වන Qt රාමුබෆරය
-Name[sk]=Qt Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik Qt za KRFB
-Name[sr]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavian]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavianlatin]=Qt‑ov kadrobafer za KRFB
-Name[sr@latin]=Qt‑ov kadrobafer za KRFB
-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
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_qt
-X-KDE-PluginInfo-Name=qt
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/qt/krfb_framebuffer_qt.json

@@ -1,72 +0,0 @@
-{
-    "Encoding": "UTF-8", 
-    "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[es]": "Framebuffer basado en Qt para KRfb.", 
-        "Description[et]": "KRfb Qt põhine kaadripuhver", 
-        "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle", 
-        "Description[gl]": "Framebuffer baseado en Qt para KRfb.", 
-        "Description[ia]": "Framebuffer basate sur Qt per KRfb", 
-        "Description[it]": "Framebuffer basato su Qt per KRfb.", 
-        "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.", 
-        "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.", 
-        "Description[pl]": "Bufor ramki na podstawie 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[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[ast]": "Framebuffer Qt pa 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[es]": "Framebuffer de Qt para KRfb", 
-        "Name[et]": "KRfb Qt kaadripuhver", 
-        "Name[fi]": "QT-kehyspuskuri KRfb:lle", 
-        "Name[gl]": "Framebuffer de Qt para KRfb", 
-        "Name[ia]": "Framebuffer Qt per KRfb", 
-        "Name[it]": "Framebuffer Qt per KRfb", 
-        "Name[ko]": "KRfb용 Qt 프레임버퍼", 
-        "Name[nl]": "Qt-framebuffer voor 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]": "X11-rambuffert för Krfb", 
-        "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": "http://www.kde.org"
-    }
-}

framebuffers/qt/qtframebuffer.cpp

@@ -1,115 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   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 2 of the License, or (at your option) any later version.
-*/
-
-#include "qtframebuffer.h"
-#include "qtframebuffer.moc"
-
-#include <QTimer>
-#include <QRegion>
-#include <QPixmap>
-#include <QBitmap>
-
-
-const int UPDATE_TIME = 500;
-
-QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
-    : FrameBuffer(id, parent)
-{
-    fbImage = QPixmap::grabWindow(win).toImage();
-    fb = new char[fbImage.byteCount()];
-    t = new QTimer(this);
-    connect(t, &QTimer::timeout, this, &QtFrameBuffer::updateFrameBuffer);
-}
-
-
-QtFrameBuffer::~QtFrameBuffer()
-{
-    delete [] fb;
-    fb = 0;
-}
-
-int QtFrameBuffer::depth()
-{
-    return fbImage.depth();
-}
-
-int QtFrameBuffer::height()
-{
-    return fbImage.height();
-}
-
-int QtFrameBuffer::width()
-{
-    return fbImage.width();
-}
-
-void QtFrameBuffer::getServerFormat(rfbPixelFormat &format)
-{
-    format.bitsPerPixel = 32;
-    format.depth = 32;
-    format.trueColour = true;
-
-    format.bigEndian = false;
-    format.redShift = 16;
-    format.greenShift = 8;
-    format.blueShift = 0;
-    format.redMax   = 0xff;
-    format.greenMax = 0xff;
-    format.blueMax  = 0xff;
-}
-
-void QtFrameBuffer::updateFrameBuffer()
-{
-    QImage img = QPixmap::grabWindow(win).toImage();
-#if 0 // This is actually slower than updating the whole desktop...
-    QSize imgSize = img.size();
-
-
-    // verify what part of the image need to be marked as changed
-    // fbImage is the previous version of the image,
-    // img is the current one
-
-    QImage map(imgSize, QImage::Format_Mono);
-    map.fill(0);
-
-    for (int x = 0; x < imgSize.width(); x++) {
-        for (int y = 0; y < imgSize.height(); y++) {
-            if (img.pixel(x, y) != fbImage.pixel(x, y)) {
-                map.setPixel(x, y, 1);
-            }
-        }
-    }
-
-    QRegion r(QBitmap::fromImage(map));
-    tiles = tiles + r.rects();
-
-#else
-    tiles.append(img.rect());
-#endif
-
-    memcpy(fb, (const char *)img.bits(), img.byteCount());
-    fbImage = img;
-
-}
-
-int QtFrameBuffer::paddedWidth()
-{
-    return fbImage.width() * 4;
-}
-
-void QtFrameBuffer::startMonitor()
-{
-    t->start(UPDATE_TIME);
-}
-
-void QtFrameBuffer::stopMonitor()
-{
-    t->stop();
-}
-

framebuffers/qt/qtframebuffer.h

@@ -1,44 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   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 2 of the License, or (at your option) any later version.
-*/
-
-#ifndef KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
-#define KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
-
-#include <QImage>
-#include "framebuffer.h"
-
-class QTimer;
-/**
-    @author Alessandro Praduroux <pradu@pradu.it>
-*/
-class QtFrameBuffer : public FrameBuffer
-{
-    Q_OBJECT
-public:
-    explicit QtFrameBuffer(WId id, QObject *parent = 0);
-
-    ~QtFrameBuffer();
-
-    int depth() override;
-    int height() override;
-    int width() override;
-    int paddedWidth() override;
-    void getServerFormat(rfbPixelFormat &format) override;
-    void startMonitor() override;
-    void stopMonitor() override;
-
-public Q_SLOTS:
-    void updateFrameBuffer();
-
-private:
-    QImage fbImage;
-    QTimer *t;
-};
-
-#endif

framebuffers/x11/CMakeLists.txt

@@ -1,27 +0,0 @@
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set (krfb_framebuffer_x11_SRCS
-     x11framebuffer.cpp
-     x11framebufferplugin.cpp
-)
-
-add_library(krfb_framebuffer_x11
- MODULE 
-                 ${krfb_framebuffer_x11_SRCS}
-)
-
-target_link_libraries (krfb_framebuffer_x11
-                       Qt5::Core
-                       Qt5::Gui
-                       ${X11_X11_LIB}
-                       ${X11_Xdamage_LIB}
-                       ${X11_Xext_LIB}
-                       KF5::CoreAddons
-                       krfbprivate
-)
-
-install (TARGETS krfb_framebuffer_x11
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
-)

framebuffers/x11/krfb_framebuffer_x11.desktop

@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
-Comment[bg]=Основан на X11 XDamage/XShm фреймбуфер за KRfb.
-Comment[bs]=X11 XDamage/XShm baziran framebafer za KRfb.
-Comment[ca]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
-Comment[cs]=Framebuffer založený na X11 XDamage/XShm pro KRfb.
-Comment[da]=X11 XDamage/XShm-baseret framebuffer til KRfb.
-Comment[de]=X11 XDamage/XShm-basierter Framebuffer für KRfb.
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το X11 XDamage/XShm για το KRfb.
-Comment[en_GB]=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en X11 Damage/XShm para KRfb.
-Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver
-Comment[eu]=X11 XDamage/XShm  oinarritutako KRfb-ren irteerako bideoa.
-Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
-Comment[fr]=Sortie vidéo fondée sur X11 « XDamage / XShm » pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar X11 XDamage/XShm
-Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
-Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
-Comment[hu]=X11 XDamage/XShm-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur X11 XDamage/XShm per KRfb.
-Comment[it]=Framebuffer basato su XDamage/XShm di X11 per KRfb.
-Comment[kk]=X11 XDamage/XShm негіздеген KRfb кадр буфері.
-Comment[km]=X11 XDamage/XShm based Framebuffer សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 X11 XDamage/XShm 기반 프레임버퍼.
-Comment[lt]=X11 XDamage/XShm paremtas Framebuffer skirtas KRfb.
-Comment[lv]=X11 XDamage/XShm balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Rammebuffer for KRfb basert på X11 XDamage/XShm.
-Comment[nds]=Op X11-XDamage/-XShm opbuut Bildpuffer för KRfb
-Comment[nl]=Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.
-Comment[nn]=X11 XDamage/XShm basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.
-Comment[pt]='Framebuffer' baseado no XDamage/XShm do X11 para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no XDamage/XShm do X11 para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе X11 XDamage/XShm
-Comment[si]=KRfb සඳහා වන රාමු බෆරය මත පදනම් වූ X11 XDamage/XShm.
-Comment[sk]=Framebuffer založený na X11 XDamage/XShm pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na X11 XDamage/XShm
-Comment[sr]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sv]=X11 XDamage/XShm-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için X11 XDamage/XShm temelli Çerçeve Tamponu.
-Comment[uk]=Заснований на XDamage/XShm X11 буфер кадрів для KRfb.
-Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 X11 XDamage/XShm 扩展的 KRfb 帧缓冲机制。
-Comment[zh_TW]=KRfb 的 X11 XDamage/XShm based Framebuffer
-Name=X11 Framebuffer for KRfb
-Name[ast]=Buffer de X11 pa KRfb
-Name[bg]=X11 фреймбуфер за KRfb
-Name[bs]=X11 frame bafer za KRfb
-Name[ca]=«Framebuffer» del X11 per al KRfb.
-Name[ca@valencia]=«Framebuffer» del 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 Framebuffer for KRfb
-Name[en_GB]=X11 Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo X11 para KRfb
-Name[et]=KRfb X11 kaadripuhver
-Name[eu]=KRfb-ren X11-ko irteerako bideoa
-Name[fi]=X11-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo X11 pour Krfb
-Name[ga]=Maolán fráma X11 le haghaidh KRfb
-Name[gl]=Framebuffer de X11 para KRfb
-Name[hr]=Međuspremnik okvira X11 za KRfb
-Name[hu]=X11 framebuffer a Krfb-hez
-Name[ia]=Framebuffer X11 per KRfb
-Name[it]=Framebuffer X11 per KRfb
-Name[kk]=X11 KRfb кадр буфері
-Name[km]=X11 Framebuffer សម្រាប់ KRfb
-Name[ko]=KRfb를 위한 X11 프레임버퍼
-Name[lt]=X11 Framebuffer skirtas KRfb
-Name[lv]=X11 kadrbuferis priekš KRfb
-Name[nb]=X11 rammebuffer for KRfb
-Name[nds]=X11-Bildpuffer för KRfb
-Name[nl]=X11 framebuffer voor KRfb
-Name[nn]=X11-framebuffer 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[si]=KRfb සඳහා X11 රාමු බෆරය
-Name[sk]=X11 Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik X11 za KRFB
-Name[sr]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavian]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavianlatin]=X11 kadrobafer za KRFB.
-Name[sr@latin]=X11 kadrobafer za KRFB.
-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]=KRfb 的 X11 帧缓冲机制
-Name[zh_TW]=KRfb 的 X11 Framebuffer
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_x11
-X-KDE-PluginInfo-Name=x11
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/x11/krfb_framebuffer_x11.json

@@ -1,71 +0,0 @@
-{
-    "Encoding": "UTF-8", 
-    "KPlugin": {
-        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.", 
-        "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.", 
-        "Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del 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[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.", 
-        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver", 
-        "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.", 
-        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.", 
-        "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per 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[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[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": "x11", 
-        "License": "GPL", 
-        "Name": "X11 Framebuffer for KRfb", 
-        "Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.", 
-        "Name[ca]": "«Framebuffer» del X11 per al KRfb.", 
-        "Name[cs]": "X11 Framebuffer pro KRfb", 
-        "Name[da]": "X11-framebuffer til KRfb", 
-        "Name[de]": "X11-Framebuffer für KRfb", 
-        "Name[es]": "Framebuffer X11 para KRfb", 
-        "Name[et]": "KRfb X11 kaadripuhver", 
-        "Name[fi]": "X11-kehyspuskuri KRfb:lle", 
-        "Name[gl]": "Framebuffer de X11 para KRfb", 
-        "Name[ia]": "Framebuffer X11 per KRfb", 
-        "Name[it]": "Framebuffer X11 per KRfb", 
-        "Name[ko]": "KRfb용 X11 프레임버퍼", 
-        "Name[nl]": "X11 framebuffer voor 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[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": "http://www.kde.org"
-    }
-}

framebuffers/x11/x11framebuffer.cpp

@@ -1,389 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   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 2 of the License, or (at your option) any later version.
-*/
-
-#include "x11framebuffer.h"
-#include "x11framebuffer.moc"
-
-#include <config-krfb.h>
-
-#include <QX11Info>
-#include <QApplication>
-#include <QDesktopWidget>
-
-#include <QDebug>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
-#ifdef HAVE_XSHM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-#endif
-
-class X11FrameBuffer::P
-{
-
-public:
-#ifdef HAVE_XDAMAGE
-    Damage damage;
-#endif
-#ifdef HAVE_XSHM
-    XShmSegmentInfo shminfo;
-#endif
-
-    XImage *framebufferImage;
-    XImage *updateTile;
-    EvWidget *ev;
-    bool useShm;
-    int xdamageBaseEvent;
-    bool running;
-};
-
-X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
-    : FrameBuffer(id, parent), d(new X11FrameBuffer::P)
-{
-#ifdef HAVE_XSHM
-    d->useShm = XShmQueryExtension(QX11Info::display());
-    //qDebug() << "shm: " << d->useShm;
-#else
-    d->useShm = false;
-#endif
-    d->running = false;
-    d->framebufferImage = XGetImage(QX11Info::display(),
-                                    id,
-                                    0,
-                                    0,
-                                    QApplication::desktop()->width(), //arg, must get a widget ???
-                                    QApplication::desktop()->height(),
-                                    AllPlanes,
-                                    ZPixmap);
-
-    if (d->useShm) {
-#ifdef HAVE_XSHM
-        d->updateTile = XShmCreateImage(QX11Info::display(),
-                                        DefaultVisual(QX11Info::display(), 0),
-                                        d->framebufferImage->bits_per_pixel,
-                                        ZPixmap,
-                                        NULL,
-                                        &d->shminfo,
-                                        32,
-                                        32);
-        d->shminfo.shmid = shmget(IPC_PRIVATE,
-                                  d->updateTile->bytes_per_line * d->updateTile->height,
-                                  IPC_CREAT | 0777);
-
-        d->shminfo.shmaddr = d->updateTile->data = (char *)
-                             shmat(d->shminfo.shmid, 0, 0);
-        d->shminfo.readOnly = False;
-
-        XShmAttach(QX11Info::display(), &d->shminfo);
-#endif
-    } else {
-        ;
-    }
-
-    qDebug() << "Got image. bpp: " << d->framebufferImage->bits_per_pixel
-             << ", depth: " << d->framebufferImage->depth
-             << ", padded width: " << d->framebufferImage->bytes_per_line
-             << " (sent: " << d->framebufferImage->width * 4 << ")"
-             << endl;
-
-    fb = d->framebufferImage->data;
-#ifdef HAVE_XDAMAGE
-    d->ev = new EvWidget(this);
-    qApp->installX11EventFilter(d->ev);
-#endif
-}
-
-
-X11FrameBuffer::~X11FrameBuffer()
-{
-    XDestroyImage(d->framebufferImage);
-#ifdef HAVE_XDAMAGE
-    qApp->removeX11EventFilter(d->ev);
-#endif
-#ifdef HAVE_XSHM
-    XShmDetach(QX11Info::display(), &d->shminfo);
-    XDestroyImage(d->updateTile);
-    shmdt(d->shminfo.shmaddr);
-    shmctl(d->shminfo.shmid, IPC_RMID, 0);
-#endif
-    delete d;
-    fb = 0; // already deleted by XDestroyImage
-}
-
-
-int X11FrameBuffer::depth()
-{
-    return d->framebufferImage->depth;
-}
-
-int X11FrameBuffer::height()
-{
-    return d->framebufferImage->height;
-}
-
-int X11FrameBuffer::width()
-{
-    return d->framebufferImage->width;
-}
-
-int X11FrameBuffer::paddedWidth()
-{
-    return d->framebufferImage->bytes_per_line;
-}
-
-void X11FrameBuffer::getServerFormat(rfbPixelFormat &format)
-{
-    format.bitsPerPixel = d->framebufferImage->bits_per_pixel;
-    format.depth = d->framebufferImage->depth;
-    format.trueColour = true;
-    format.bigEndian = ((d->framebufferImage->bitmap_bit_order == MSBFirst) ? true : false);
-
-    if (format.bitsPerPixel == 8) {
-        format.redShift = 0;
-        format.greenShift = 3;
-        format.blueShift = 6;
-        format.redMax   = 7;
-        format.greenMax = 7;
-        format.blueMax  = 3;
-    } else {
-        format.redShift = 0;
-
-        if (d->framebufferImage->red_mask)
-            while (!(d->framebufferImage->red_mask & (1 << format.redShift))) {
-                format.redShift++;
-            }
-
-        format.greenShift = 0;
-
-        if (d->framebufferImage->green_mask)
-            while (!(d->framebufferImage->green_mask & (1 << format.greenShift))) {
-                format.greenShift++;
-            }
-
-        format.blueShift = 0;
-
-        if (d->framebufferImage->blue_mask)
-            while (!(d->framebufferImage->blue_mask & (1 << format.blueShift))) {
-                format.blueShift++;
-            }
-
-        format.redMax   = d->framebufferImage->red_mask   >> format.redShift;
-        format.greenMax = d->framebufferImage->green_mask >> format.greenShift;
-        format.blueMax  = d->framebufferImage->blue_mask  >> format.blueShift;
-    }
-}
-
-void X11FrameBuffer::handleXDamage(XEvent *event)
-{
-#ifdef HAVE_XDAMAGE
-    XDamageNotifyEvent *dev = (XDamageNotifyEvent *)event;
-    QRect r(dev->area.x, dev->area.y, dev->area.width, dev->area.height);
-    tiles.append(r);
-
-    /*if (!dev->more) {
-        XDamageSubtract(QX11Info::display(),d->damage, None, None);
-    }*/
-#endif
-}
-
-
-void X11FrameBuffer::cleanupRects()
-{
-
-    QList<QRect> cpy = tiles;
-    bool inserted = false;
-    tiles.clear();
-//     //qDebug() << "before cleanup: " << cpy.size();
-    foreach(const QRect & r, cpy) {
-        if (tiles.size() > 0) {
-            for (int i = 0; i < tiles.size(); i++) {
-                //             //qDebug() << r << tiles[i];
-                if (r.intersects(tiles[i])) {
-                    tiles[i] |= r;
-                    inserted = true;
-                    break;
-                    //                 //qDebug() << "merged into " << tiles[i];
-                }
-            }
-
-            if (!inserted) {
-                tiles.append(r);
-                //             //qDebug() << "appended " << r;
-            }
-        } else {
-            //         //qDebug() << "appended " << r;
-            tiles.append(r);
-        }
-    }
-
-    for (int i = 0; i < tiles.size(); i++) {
-        tiles[i].adjust(-30, -30, 30, 30);
-
-        if (tiles[i].top() < 0) {
-            tiles[i].setTop(0);
-        }
-
-        if (tiles[i].left() < 0) {
-            tiles[i].setLeft(0);
-        }
-
-        if (tiles[i].bottom() > d->framebufferImage->height) {
-            tiles[i].setBottom(d->framebufferImage->height);
-        }
-
-        if (tiles[i].right() > d->framebufferImage->width) {
-            tiles[i].setRight(d->framebufferImage->width);
-        }
-    }
-
-//     //qDebug() << "after cleanup: " << tiles.size();
-}
-
-void X11FrameBuffer::acquireEvents()
-{
-
-    XEvent ev;
-
-#ifdef HAVE_XDAMAGE
-    while (XCheckTypedEvent(QX11Info::display(), d->xdamageBaseEvent + XDamageNotify, &ev)) {
-        handleXDamage(&ev);
-    }
-
-    XDamageSubtract(QX11Info::display(), d->damage, None, None);
-#endif
-}
-
-QList< QRect > X11FrameBuffer::modifiedTiles()
-{
-    QList<QRect> ret;
-
-    if (!d->running) {
-        return ret;
-    }
-
-    qApp->processEvents(); // try to make sure every damage event goes trough;
-    cleanupRects();
-    QRect gl;
-
-    //d->useShm = false;
-    if (tiles.size()  > 0) {
-        if (d->useShm) {
-#ifdef HAVE_XSHM
-
-            foreach(const QRect & r, tiles) {
-//                 //qDebug() << r;
-                gl |= r;
-                int y = r.y();
-                int x = r.x();
-
-                while (x < r.right()) {
-                    while (y < r.bottom()) {
-                        if (y + d->updateTile->height > d->framebufferImage->height) {
-                            y = d->framebufferImage->height - d->updateTile->height;
-                        }
-
-                        if (x + d->updateTile->width > d->framebufferImage->width) {
-                            x = d->framebufferImage->width - d->updateTile->width;
-                        }
-
-//                         //qDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
-                        XShmGetImage(QX11Info::display(), win, d->updateTile, x, y, AllPlanes);
-                        int pxsize =  d->framebufferImage->bits_per_pixel / 8;
-                        char *dest = fb + ((d->framebufferImage->bytes_per_line * y) + (x * pxsize));
-                        char *src = d->updateTile->data;
-
-                        for (int i = 0; i < d->updateTile->height; i++) {
-                            memcpy(dest, src, d->updateTile->bytes_per_line);
-                            dest += d->framebufferImage->bytes_per_line;
-                            src += d->updateTile->bytes_per_line;
-                        }
-
-                        y += d->updateTile->height;
-                    }
-
-                    x += d->updateTile->width;
-                    y = r.y();
-                }
-            }
-#endif
-        } else {
-            foreach(const QRect & r, tiles) {
-                XGetSubImage(QX11Info::display(),
-                             win,
-                             r.left(),
-                             r.top(),
-                             r.width(),
-                             r.height(),
-                             AllPlanes,
-                             ZPixmap,
-                             d->framebufferImage,
-                             r.left(),
-                             r.top()
-                            );
-            }
-        }
-    }
-
-//     //qDebug() << "tot: " << gl;
-//     //qDebug() << tiles.size();
-    ret = tiles;
-    tiles.clear();
-    return ret;
-}
-
-void X11FrameBuffer::startMonitor()
-{
-    d->running = true;
-#ifdef HAVE_XDAMAGE
-    d->damage = XDamageCreate(QX11Info::display(), win, XDamageReportRawRectangles);
-    XDamageSubtract(QX11Info::display(), d->damage, None, None);
-#endif
-}
-
-void X11FrameBuffer::stopMonitor()
-{
-    d->running = false;
-#ifdef HAVE_XDAMAGE
-    XDamageDestroy(QX11Info::display(), d->damage);
-#endif
-}
-
-
-
-EvWidget::EvWidget(X11FrameBuffer *x11fb)
-    : QWidget(0), fb(x11fb)
-{
-#ifdef HAVE_XDAMAGE
-    int er;
-    XDamageQueryExtension(QX11Info::display(), &xdamageBaseEvent, &er);
-#endif
-}
-
-bool EvWidget::x11Event(XEvent *event)
-{
-#ifdef HAVE_XDAMAGE
-
-    if (event->type == xdamageBaseEvent + XDamageNotify) {
-        fb->handleXDamage(event);
-        return true;
-    }
-
-#endif
-    return false;
-}
-
-
-

framebuffers/x11/x11framebuffer.h

@@ -1,63 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   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 2 of the License, or (at your option) any later version.
-*/
-#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
-#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
-
-#include <framebuffer.h>
-#include <QWidget>
-
-class X11FrameBuffer;
-typedef union _XEvent XEvent;
-
-class EvWidget: public QWidget
-{
-    Q_OBJECT
-
-public:
-    EvWidget(X11FrameBuffer *x11fb);
-
-protected:
-    bool x11Event(XEvent *event);
-
-private:
-    X11FrameBuffer *fb;
-    int xdamageBaseEvent;
-};
-
-/**
-    @author Alessandro Praduroux <pradu@pradu.it>
-*/
-class X11FrameBuffer : public FrameBuffer
-{
-    Q_OBJECT
-public:
-    X11FrameBuffer(WId id, QObject *parent = 0);
-
-    ~X11FrameBuffer();
-
-    QList<QRect> modifiedTiles() override;
-    int depth() override;
-    int height() override;
-    int width() override;
-    int paddedWidth() override;
-    void getServerFormat(rfbPixelFormat &format) override;
-    void startMonitor() override;
-    void stopMonitor() override;
-
-
-    void handleXDamage(XEvent *event);
-private:
-    void cleanupRects();
-    void acquireEvents();
-
-    class P;
-    P *const d;
-};
-
-#endif

framebuffers/xcb/CMakeLists.txt

@@ -0,0 +1,38 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_xcb_SRCS
+      xcb_framebufferplugin.cpp
+      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
+                       Qt::Core
+                       Qt::Gui
+                       Qt::GuiPrivate
+                       XCB::XCB
+                       XCB::RENDER
+                       XCB::SHAPE
+                       XCB::XFIXES
+                       XCB::DAMAGE
+                       XCB::SHM
+                       XCB::IMAGE
+                       KF6::CoreAddons
+                       krfbprivate
+)
+
+set_target_properties(krfb_framebuffer_xcb PROPERTIES OUTPUT_NAME xcb)
+install (TARGETS krfb_framebuffer_xcb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
+)

framebuffers/xcb/xcb.json

@@ -0,0 +1,6 @@
+{
+    "X-KDE-OnlyShowOnQtPlatforms": [
+        "xcb"
+    ]
+}
+

framebuffers/xcb/xcb_framebuffer.cpp

@@ -0,0 +1,693 @@
+/* This file is part of the KDE project
+   Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+
+   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 2 of the License, or (at your option) any later version.
+*/
+
+#include "xcb_framebuffer.h"
+#include "krfb_fb_xcb_debug.h"
+
+#include <xcb/xproto.h>
+#include <xcb/damage.h>
+#include <xcb/shm.h>
+#include <xcb/xcb_image.h>
+
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
+#include <QApplication>
+#include <QGuiApplication>
+#include <QScreen>
+#include <QAbstractNativeEventFilter>
+#include <qpa/qplatformnativeinterface.h>
+#include <QtGui/private/qtx11extras_p.h>
+
+class KrfbXCBEventFilter: public QAbstractNativeEventFilter
+{
+public:
+    KrfbXCBEventFilter(XCBFrameBuffer *owner);
+
+public:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+
+public:
+    int xdamageBaseEvent;
+    int xdamageBaseError;
+    int xshmBaseEvent;
+    int xshmBaseError;
+    bool xshmAvail;
+    XCBFrameBuffer *fb_owner;
+};
+
+
+
+KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
+    xdamageBaseEvent(0), xdamageBaseError(0),
+    xshmBaseEvent(0), xshmBaseError(0), xshmAvail(false),
+    fb_owner(owner)
+{
+    const xcb_query_extension_reply_t *xdamage_data = xcb_get_extension_data(
+                QX11Info::connection(), &xcb_damage_id);
+    if (xdamage_data) {
+        // also query extension version!
+        // ATTENTION: if we don't do that, xcb_damage_create() will always FAIL!
+        xcb_damage_query_version_reply_t *xdamage_version = xcb_damage_query_version_reply(
+                    QX11Info::connection(),
+                    xcb_damage_query_version(
+                        QX11Info::connection(),
+                        XCB_DAMAGE_MAJOR_VERSION,
+                        XCB_DAMAGE_MINOR_VERSION),
+                    nullptr);
+        if (!xdamage_version) {
+            qWarning() << "xcb framebuffer: ERROR: Failed to get XDamage extension version!\n";
+            return;
+        }
+
+#ifdef _DEBUG
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XDamage extension version:" <<
+               xdamage_version->major_version << "." << xdamage_version->minor_version;
+#endif
+
+        free(xdamage_version);
+
+        xdamageBaseEvent = xdamage_data->first_event;
+        xdamageBaseError = xdamage_data->first_error;
+
+        // XShm presence is optional. If it is present, all image getting
+        // operations will be faster, without XShm it will only be slower.
+        const xcb_query_extension_reply_t *xshm_data = xcb_get_extension_data(
+                    QX11Info::connection(), &xcb_shm_id);
+        if (xshm_data) {
+            xshmAvail = true;
+            xshmBaseEvent = xshm_data->first_event;
+            xshmBaseError = xshm_data->first_error;
+        } else {
+            xshmAvail = false;
+            qWarning() << "xcb framebuffer: WARNING: XSHM extension not available!";
+        }
+    } else {
+        // if there is no xdamage available, this plugin can be considered useless anyway.
+        // you can use just qt framebuffer plugin instead...
+        qWarning() << "xcb framebuffer: ERROR: no XDamage extension available. I am useless.";
+        qWarning() << "xcb framebuffer:        use qt framebuffer plugin instead.";
+    }
+}
+
+
+bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
+                                           void *message, qintptr *result) {
+    Q_UNUSED(result);  // "result" is only used on windows
+
+    if (xdamageBaseEvent == 0) return false;  // no xdamage extension
+
+    if (eventType == "xcb_generic_event_t") {
+        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);
+            return true;  // filter out this event, stop its processing
+        }
+    }
+
+    // continue event processing
+    return false;
+}
+
+
+class XCBFrameBuffer::P {
+public:
+    xcb_damage_damage_t     damage;
+    xcb_shm_segment_info_t  shminfo;
+    xcb_screen_t           *rootScreen;   // X screen info (all monitors)
+    xcb_image_t            *framebufferImage;
+    xcb_image_t            *updateTile;
+
+    KrfbXCBEventFilter     *x11EvtFilter;
+
+    bool                    running;
+
+    QRect                   area;  // capture area, primary monitor coordinates
+    WId                     win;
+};
+
+
+static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
+    xcb_screen_t *screen = nullptr;
+    xcb_screen_iterator_t screens_iter = xcb_setup_roots_iterator(xcb_get_setup(conn));
+    for (; screens_iter.rem; --screen_num, xcb_screen_next(&screens_iter))
+        if (screen_num == 0)
+            screen = screens_iter.data;
+    return screen;
+}
+
+
+
+XCBFrameBuffer::XCBFrameBuffer(QObject *parent):
+    FrameBuffer(parent), d(new XCBFrameBuffer::P)
+{
+    d->running = false;
+    d->damage = XCB_NONE;
+    d->framebufferImage = nullptr;
+    d->shminfo.shmaddr = nullptr;
+    d->shminfo.shmid = XCB_NONE;
+    d->shminfo.shmseg = XCB_NONE;
+    d->updateTile = nullptr;
+    d->area.setRect(0, 0, 0, 0);
+    d->x11EvtFilter = new KrfbXCBEventFilter(this);
+    d->rootScreen = get_xcb_screen(QX11Info::connection(), QX11Info::appScreen());
+
+    this->fb = nullptr;
+
+    QScreen *primaryScreen = QGuiApplication::primaryScreen();
+    if (primaryScreen) {
+        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();
+    } else {
+        qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
+        return;
+    }
+
+    d->framebufferImage = xcb_image_get(QX11Info::connection(),
+                                        d->win,
+                                        d->area.left(),
+                                        d->area.top(),
+                                        d->area.width(),
+                                        d->area.height(),
+                                        0xFFFFFFFF, // == Xlib: AllPlanes ((unsigned long)~0L)
+                                        XCB_IMAGE_FORMAT_Z_PIXMAP);
+    if (d->framebufferImage) {
+#ifdef _DEBUG
+        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;
+#endif
+        this->fb = (char *)d->framebufferImage->data;
+    } else {
+        qWarning() << "xcb framebuffer: ERROR: Failed to get primary screen image!";
+        return;
+    }
+
+    // all XShm operations should take place only if Xshm extension was loaded
+    if (d->x11EvtFilter->xshmAvail) {
+        // Create xcb_image_t structure, but do not automatically allocate memory
+        // for image data storage - it will be allocated as shared memory.
+        // "If base == 0 and bytes == ~0 and data == 0, no storage will be auto-allocated."
+        // Width and height of the image = size of the capture area.
+        d->updateTile = xcb_image_create_native(
+                    QX11Info::connection(),
+                    d->area.width(),            // width
+                    d->area.height(),           // height
+                    XCB_IMAGE_FORMAT_Z_PIXMAP,  // image format
+                    d->rootScreen->root_depth,  // depth
+                    nullptr,                    // base address = 0
+                    (uint32_t)~0,               // bytes = 0xffffffff
+                    nullptr);                   // data = 0
+        if (d->updateTile) {
+#ifdef _DEBUG
+            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
+            // to fit whole capture area (d->area rect)
+            // so, we get as many bytes as needed for image (updateTile->size)
+            d->shminfo.shmid = shmget(IPC_PRIVATE, d->updateTile->size, IPC_CREAT | 0777);
+            // attached shared memory address is stored both in shminfo structure and in xcb_image_t->data
+            d->shminfo.shmaddr = (uint8_t *)shmat(d->shminfo.shmid, nullptr, 0);
+            d->updateTile->data = d->shminfo.shmaddr;
+            // we keep updateTile->base == NULL here, so xcb_image_destroy() will not attempt
+            // to free this block, just in case.
+
+            // attach this shm segment also to X server
+            d->shminfo.shmseg = xcb_generate_id(QX11Info::connection());
+            xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
+
+#ifdef _DEBUG
+            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(),
+                        d->win,
+                        d->updateTile,
+                        d->shminfo,
+                        d->area.left(), // x
+                        d->area.top(),  // y (size taken from image structure itself)?
+                        0xFFFFFFFF);
+
+            if (shmget_res == 0) {
+                // error! shared mem not working?
+                // will not use shared mem! detach and cleanup
+                xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg);
+                shmdt(d->shminfo.shmaddr);
+                shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
+                d->x11EvtFilter->xshmAvail = false;
+                d->shminfo.shmaddr = nullptr;
+                d->shminfo.shmid = XCB_NONE;
+                d->shminfo.shmseg = XCB_NONE;
+                qWarning() << "xcb framebuffer: ERROR: xcb_image_shm_get() result: " << shmget_res;
+            }
+
+            // image is freed, and recreated again for every new damage rectangle
+            // data was allocated manually and points to shared mem;
+            // tell xcb_image_destroy() do not free image data
+            d->updateTile->data = nullptr;
+            xcb_image_destroy(d->updateTile);
+            d->updateTile = nullptr;
+        }
+    }
+
+#ifdef _DEBUG
+    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;
+#endif
+
+    QCoreApplication::instance()->installNativeEventFilter(d->x11EvtFilter);
+}
+
+
+XCBFrameBuffer::~XCBFrameBuffer() {
+    // first - uninstall x11 event filter
+    QCoreApplication::instance()->removeNativeEventFilter(d->x11EvtFilter);
+    //
+    if (d->framebufferImage) {
+        xcb_image_destroy(d->framebufferImage);
+        fb = nullptr;  // image data was already destroyed by above call
+    }
+    if (d->x11EvtFilter->xshmAvail) {
+        // detach shared memory
+        if (d->shminfo.shmseg != XCB_NONE)
+            xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg); // detach from X server
+        if (d->shminfo.shmaddr)
+            shmdt(d->shminfo.shmaddr); // detach addr from our address space
+        if (d->shminfo.shmid != XCB_NONE)
+            shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
+    }
+    // and delete image used for shared mem
+    if (d->updateTile) {
+        d->updateTile->base = nullptr;
+        d->updateTile->data = nullptr;
+        xcb_image_destroy(d->updateTile);
+    }
+    // we don't use d->x11EvtFilter anymore, can delete it now
+    if (d->x11EvtFilter) {
+        delete d->x11EvtFilter;
+    }
+    delete d;
+}
+
+
+int XCBFrameBuffer::depth() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->depth;
+    }
+    return 0;
+}
+
+
+int XCBFrameBuffer::height() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->height;
+    }
+    return 0;
+}
+
+
+int XCBFrameBuffer::width() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->width;
+    }
+    return 0;
+}
+
+int XCBFrameBuffer::paddedWidth() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->stride;
+    }
+    return 0;
+}
+
+
+void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
+    if (!d->framebufferImage) return;
+
+    // get information about XCB visual params
+    xcb_visualtype_t *root_visualtype = nullptr;  // visual info
+    if (d->rootScreen) {
+        xcb_visualid_t root_visual = d->rootScreen->root_visual;
+        xcb_depth_iterator_t depth_iter;
+        // To get the xcb_visualtype_t structure, it's a bit less easy.
+        // You have to get the xcb_screen_t structure that you want, get its
+        // root_visual member, then iterate over the xcb_depth_t's and the
+        // xcb_visualtype_t's, and compare the xcb_visualid_t of these
+        // xcb_visualtype_ts: with root_visual
+        depth_iter = xcb_screen_allowed_depths_iterator(d->rootScreen);
+        for (; depth_iter.rem; xcb_depth_next(&depth_iter)) {
+            xcb_visualtype_iterator_t visual_iter;
+            visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
+            for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) {
+                if (root_visual == visual_iter.data->visual_id) {
+                    root_visualtype = visual_iter.data;
+                    break;
+                }
+            }
+        }
+    }
+
+
+    // fill in format common info
+    format.bitsPerPixel = d->framebufferImage->bpp;
+    format.depth = d->framebufferImage->depth;
+    format.trueColour = true;  // not using color palettes
+    format.bigEndian = false;  // always false for ZPIXMAP format!
+
+    // information about pixels layout
+
+    if (root_visualtype) {
+#ifdef _DEBUG
+        qDebug("xcb framebuffer: Got info about root visual:\n"
+               "    bits per rgb value: %d\n"
+               "    red   mask: %08x\n"
+               "    green mask: %08x\n"
+               "    blue  mask: %08x\n",
+               (int)root_visualtype->bits_per_rgb_value,
+               root_visualtype->red_mask,
+               root_visualtype->green_mask,
+               root_visualtype->blue_mask);
+#endif
+
+        // calculate shifts
+        format.redShift = 0;
+        if (root_visualtype->red_mask) {
+            while (!(root_visualtype->red_mask & (1 << format.redShift))) {
+                format.redShift++;
+            }
+        }
+        format.greenShift = 0;
+        if (root_visualtype->green_mask) {
+            while (!(root_visualtype->green_mask & (1 << format.greenShift))) {
+                format.greenShift++;
+            }
+        }
+        format.blueShift = 0;
+        if (root_visualtype->blue_mask) {
+            while (!(root_visualtype->blue_mask & (1 << format.blueShift))) {
+                format.blueShift++;
+            }
+        }
+
+        // calculate pixel max value.
+        // NOTE: bits_per_rgb_value is unreliable, thus should be avoided.
+        format.redMax   = root_visualtype->red_mask >> format.redShift;
+        format.greenMax = root_visualtype->green_mask >> format.greenShift;
+        format.blueMax  = root_visualtype->blue_mask >> format.blueShift;
+
+#ifdef _DEBUG
+        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 {
+        // some kind of fallback (unlikely code execution will go this way)
+        // idea taken from qt framefuffer sources
+        if (format.bitsPerPixel == 8) {
+            format.redShift   = 0;
+            format.greenShift = 3;
+            format.blueShift  = 6;
+            format.redMax   = 7;
+            format.greenMax = 7;
+            format.blueMax  = 3;
+        } else if (format.bitsPerPixel == 16) {
+            // TODO: 16 bits per pixel format ??
+            // what format of pixels does X server use for 16-bpp?
+        } else if (format.bitsPerPixel == 32) {
+            format.redMax   = 0xff;
+            format.greenMax = 0xff;
+            format.blueMax  = 0xff;
+            if (format.bigEndian) {
+                format.redShift   = 0;
+                format.greenShift = 8;
+                format.blueShift  = 16;
+            } else {
+                format.redShift   = 16;
+                format.greenShift = 8;
+                format.blueShift  = 0;
+            }
+        }
+    }
+}
+
+
+/**
+ * This function contents was taken from X11 framebuffer source code.
+ * It simply several intersecting rectangles into one bigger rect.
+ * Non-intersecting rects are treated as different rects and exist
+ * separately in this->tiles QList.
+ */
+void XCBFrameBuffer::cleanupRects() {
+    QList<QRect> cpy = tiles;
+    bool inserted = false;
+    tiles.clear();
+
+    QListIterator<QRect> iter(cpy);
+    while (iter.hasNext()) {
+        const QRect &r = iter.next();
+        // skip rects not intersecting with primary monitor
+        if (!r.intersects(d->area)) continue;
+        // only take intersection of this rect with primary monitor rect
+        QRect ri = r.intersected(d->area);
+
+        if (tiles.size() > 0) {
+            for (auto &tile : tiles) {
+                // if current rect has intersection with tile, unite them
+                if (ri.intersects(tile)) {
+                    tile |= ri;
+                    inserted = true;
+                    break;
+                }
+            }
+
+            if (!inserted) {
+                // else, append to list as different rect
+                tiles.append(ri);
+            }
+        } else {
+            // tiles list is empty, append first item
+            tiles.append(ri);
+        }
+    }
+
+    // increase all rectangles size by 30 pixels each side.
+    // limit coordinates to primary monitor boundaries.
+    for (auto &tile : tiles) {
+        tile.adjust(-30, -30, 30, 30);
+        if (tile.top() < d->area.top()) {
+            tile.setTop(d->area.top());
+        }
+        if (tile.bottom() > d->area.bottom()) {
+            tile.setBottom(d->area.bottom());
+        }
+        //
+        if (tile.left() < d->area.left()) {
+            tile.setLeft(d->area.left());
+        }
+        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
+        tile.moveTo(tile.left() - d->area.left(),
+                    tile.top() - d->area.top());
+    }
+}
+
+
+/**
+ * This function is called by RfbServerManager::updateScreens()
+ * approximately every 50ms (!!), driven by QTimer to get all
+ * modified rectangles on the screen
+ */
+QList<QRect> XCBFrameBuffer::modifiedTiles() {
+    QList<QRect> ret;
+    if (!d->running) {
+        return ret;
+    }
+
+    cleanupRects();
+
+    if (tiles.size() > 0) {
+        if (d->x11EvtFilter->xshmAvail) {
+
+            // loop over all damage rectangles gathered up to this time
+            QListIterator<QRect> iter(tiles);
+            //foreach(const QRect &r, tiles) {
+            while (iter.hasNext()) {
+                const QRect &r = iter.next();
+
+                // get image data into shared memory segment
+                // now rects are positioned relative to framebufferImage,
+                // but we need to get image from the whole screen, so
+                // translate whe coordinates
+                xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
+                            QX11Info::connection(),
+                            d->win,
+                            d->area.left() + r.left(),
+                            d->area.top()  + r.top(),
+                            r.width(),
+                            r.height(),
+                            0xFFFFFFFF,
+                            XCB_IMAGE_FORMAT_Z_PIXMAP,
+                            d->shminfo.shmseg,
+                            0);
+
+                xcb_shm_get_image_reply_t *sgi_reply = xcb_shm_get_image_reply(
+                            QX11Info::connection(), sgi_cookie, nullptr);
+                if (sgi_reply) {
+                    // create temporary image to get update rect contents into
+                    d->updateTile = xcb_image_create_native(
+                                QX11Info::connection(),
+                                r.width(),
+                                r.height(),
+                                XCB_IMAGE_FORMAT_Z_PIXMAP,
+                                d->rootScreen->root_depth,
+                                nullptr,      // base == 0
+                                (uint32_t)~0, // bytes == ~0
+                                nullptr);
+
+                    if (d->updateTile) {
+                        d->updateTile->data = d->shminfo.shmaddr;
+
+                        // copy pixels from this damage rectangle image
+                        // to our total framebuffer image
+                        int pxsize =  d->framebufferImage->bpp / 8;
+                        char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
+                        char *src = (char *)d->updateTile->data;
+                        for (int i = 0; i < d->updateTile->height; i++) {
+                            memcpy(dest, src, d->updateTile->stride);  // copy whole row of pixels
+                            dest += d->framebufferImage->stride;
+                            src += d->updateTile->stride;
+                        }
+
+                        // delete temporary image
+                        d->updateTile->data = nullptr;
+                        xcb_image_destroy(d->updateTile);
+                        d->updateTile = nullptr;
+                    }
+
+                    free(sgi_reply);
+                }
+            } // foreach
+        } else {
+            // not using shared memory
+            // will use just xcb_image_get() and copy pixels
+            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(),
+                            d->win,
+                            r.left(),
+                            r.top(),
+                            r.width(),
+                            r.height(),
+                            0xFFFFFFFF, // AllPlanes
+                            XCB_IMAGE_FORMAT_Z_PIXMAP);
+                // manually copy pixels
+                int pxsize =  d->framebufferImage->bpp / 8;
+                char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
+                char *src = (char *)damagedImage->data;
+                // loop every row in damaged image
+                for (int i = 0; i < damagedImage->height; i++) {
+                    // copy whole row of pixels from src image to dest
+                    memcpy(dest, src, damagedImage->stride);
+                    dest += d->framebufferImage->stride;  // move 1 row down in dest
+                    src += damagedImage->stride;          // move 1 row down in src
+                }
+                //
+                xcb_image_destroy(damagedImage);
+            }
+        }
+    } // if (tiles.size() > 0)
+
+    ret = tiles;
+    tiles.clear();
+    // ^^ If we clear here all our known "damage areas", then we can also clear
+    //    damaged area for xdamage? No, we don't need to in our case
+    //    (XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES report mode)
+    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+
+    return ret;
+}
+
+
+void XCBFrameBuffer::startMonitor() {
+    if (d->running) return;
+
+    d->running = true;
+    d->damage = xcb_generate_id(QX11Info::connection());
+    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
+    // RAW rectangles are reported. every time some area of the screen
+    // was changed, we get only that rectangle
+    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+}
+
+
+void XCBFrameBuffer::stopMonitor() {
+    if (!d->running) return;
+    d->running = false;
+    xcb_damage_destroy(QX11Info::connection(), d->damage);
+}
+
+
+// void XCBFrameBuffer::acquireEvents() {} // this function was totally unused
+// in X11 framebuffer, but it was the only function where XDamageSubtract() was called?
+// Also it had a blocking event loop like:
+//
+//     XEvent ev;
+//     while (XCheckTypedEvent(QX11Info::display(), d->xdamageBaseEvent + XDamageNotify, &ev)) {
+//         handleXDamage(&ev);
+//     }
+//     XDamageSubtract(QX11Info::display(), d->damage, None, None);
+//
+// This loop takes all available Xdamage events from queue, and ends if there are no
+// more such events in input queue.
+
+
+void XCBFrameBuffer::handleXDamageNotify(xcb_generic_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);
+    this->tiles.append(r);
+}
+

framebuffers/xcb/xcb_framebuffer.h

@@ -0,0 +1,48 @@
+/* This file is part of the KDE project
+   Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+
+   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 2 of the License, or (at your option) any later version.
+*/
+#ifndef KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
+#define KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
+
+#include "framebuffer.h"
+#include <QWidget>
+#include <xcb/xcb.h>
+
+
+
+/**
+    @author Alexey Min <alexey.min@gmail.com>
+*/
+class XCBFrameBuffer: public FrameBuffer
+{
+    Q_OBJECT
+public:
+    explicit XCBFrameBuffer(QObject *parent = nullptr);
+    ~XCBFrameBuffer() override;
+
+public:
+    QList<QRect> modifiedTiles() override;
+    int  depth() override;
+    int  height() override;
+    int  width() override;
+    int  paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;
+
+public:
+    void handleXDamageNotify(xcb_generic_event_t *xevent);
+
+private:
+    void cleanupRects();
+
+    class P;
+    P *const d;
+};
+
+#endif

framebuffers/xcb/xcb_framebufferplugin.cpp

@@ -0,0 +1,39 @@
+/* This file is part of the KDE project
+ Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+
+ 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 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+
+#include "xcb_framebufferplugin.h"
+#include "xcb_framebuffer.h"
+#include <KPluginFactory>
+
+K_PLUGIN_CLASS_WITH_JSON(XCBFrameBufferPlugin, "xcb.json")
+
+XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args)
+    : FrameBufferPlugin(parent, args)
+{
+}
+
+FrameBuffer *XCBFrameBufferPlugin::frameBuffer(const QVariantMap &args)
+{
+    Q_UNUSED(args);
+    return new XCBFrameBuffer;
+}
+
+#include "xcb_framebufferplugin.moc"
+

framebuffers/xcb/xcb_framebufferplugin.h

@@ -0,0 +1,44 @@
+ /* This file is part of the KDE project
+  @author Alexey Min <alexey.min@gmail.com>
+
+  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 2 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KRFB_FRAMEBUFFER_XCB_XCBFRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_XCB_XCBFRAMEBUFFERPLUGIN_H
+
+
+#include "framebufferplugin.h"
+#include <QWidget>
+
+
+class FrameBuffer;
+
+class XCBFrameBufferPlugin: public FrameBufferPlugin
+{
+   Q_OBJECT
+
+public:
+   XCBFrameBufferPlugin(QObject *parent, const QVariantList &args);
+
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;
+
+private:
+   Q_DISABLE_COPY(XCBFrameBufferPlugin)
+};
+
+
+#endif  // Header guard

icons/CMakeLists.txt

@@ -0,0 +1,4 @@
+ecm_install_icons(ICONS
+    sc-apps-krfb.svgz
+    48-apps-krfb.png
+DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )

krfb.kdev4

@@ -1,3 +0,0 @@
-[Project]
-Manager=KDevCMakeManager
-Name=krfb

krfb/CMakeLists.txt

@@ -11,6 +11,8 @@ include(GenerateExportHeader)
 set (krfbprivate_SRCS
      framebuffer.cpp
      framebufferplugin.cpp
+     events.cpp
+     eventsplugin.cpp
 )
 
 add_library (krfbprivate
@@ -19,10 +21,11 @@ add_library (krfbprivate
 )
 generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
+
 target_link_libraries (krfbprivate
-                       Qt5::Core
-                       Qt5::Widgets
-                       Qt5::X11Extras
+                       Qt::Core
+                       Qt::Widgets
+                       Qt::GuiPrivate
                        ${X11_X11_LIB}
                        ${LIBVNCSERVER_LIBRARIES}
 )
@@ -33,23 +36,19 @@ 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
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
 #####################################
 # Second target: krfb - the app
 # itself.
 
 set (krfb_SRCS
      connectiondialog.cpp
-     events.cpp
      framebuffermanager.cpp
+     events.cpp
+     eventsmanager.cpp
      main.cpp
      mainwindow.cpp
      sockethelpers.cpp
@@ -61,38 +60,52 @@ 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
                    ui/connectionwidget.ui
                    ui/mainwidget.ui
 )
 
+qt_add_resources(krfb_SRCS
+    krfb.qrc
+)
+
 add_executable (krfb
                      ${krfb_SRCS}
+                     ${krfb_UI_SRCS}
 )
 
 target_link_libraries (krfb
                        krfbprivate
-                       vncserver
                        ${JPEG_LIBRARIES}
                        ${X11_Xext_LIB}
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
-                       Qt5::Network
-                       KF5::Completion
-                       KF5::CoreAddons
-                       KF5::DBusAddons
-                       KF5::DNSSD
-                       KF5::I18n
-                       KF5::Notifications
-                       KF5::Wallet
-                       KF5::WidgetsAddons
-                       KF5::XmlGui
+                       Qt::Network
+                       KF6::CoreAddons
+                       KF6::DBusAddons
+                       KF6::DNSSD
+                       KF6::I18n
+                       KF6::Notifications
+                       KF6::Wallet
+                       KF6::WidgetsAddons
+                       KF6::WindowSystem
+                       KF6::XmlGui
+                       KF6::StatusNotifierItem
                        ${LIBVNCSERVER_LIBRARIES}
 )
 
@@ -103,16 +116,55 @@ 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
+                      Qt::Gui
+                      Qt::Network
+                      KF6::ConfigGui
+                      KF6::CoreAddons
+                      KF6::I18n
+                      KF6::Notifications
+                      KF6::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
+        DESTINATION ${KDE_INSTALL_METAINFODIR}
 )
 
 install (FILES krfb.notifyrc
-         DESTINATION ${DATA_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
 )
- 
+

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);
@@ -55,7 +55,7 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     m_connectWidget = new QWidget(this);
     m_ui.setupUi(m_connectWidget);
 
-    m_ui.pixmapLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
+    m_ui.pixmapLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
 
     KGuiItem accept = KStandardGuiItem::ok();
     accept.setText(i18n("Accept Connection"));
@@ -80,7 +80,3 @@ void InvitationsConnectionDialog::setRemoteHost(const QString &host)
 {
     m_ui.remoteHost->setText(host);
 }
-
-//**********
-
-#include "connectiondialog.moc"

krfb/connectiondialog.h

@@ -29,8 +29,8 @@ template <typename UI>
 class ConnectionDialog : public QDialog
 {
 public:
-    ConnectionDialog(QWidget *parent);
-    ~ConnectionDialog() {};
+    explicit ConnectionDialog(QWidget *parent);
+    ~ConnectionDialog() override {};
 
     void setAllowRemoteControl(bool b);
     bool allowRemoteControl();
@@ -59,7 +59,7 @@ class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget
 {
     Q_OBJECT
 public:
-    InvitationsConnectionDialog(QWidget *parent);
+    explicit InvitationsConnectionDialog(QWidget *parent);
     void setRemoteHost(const QString & host);
 };
 

krfb/events.cpp

@@ -24,177 +24,17 @@
 
 #include "events.h"
 
-#include <QApplication>
-#include <QX11Info>
-#include <QDesktopWidget>
-#include <QGlobalStatic>
-
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XTest.h>
-
-enum {
-    LEFTSHIFT = 1,
-    RIGHTSHIFT = 2,
-    ALTGR = 4
-};
-
-class EventData
+EventHandler::EventHandler(QObject *parent)
+    : QObject(parent)
 {
-public:
-    EventData();
-
-    //keyboard
-    Display *dpy;
-    signed char modifiers[0x100];
-    KeyCode keycodes[0x100];
-    KeyCode leftShiftCode;
-    KeyCode rightShiftCode;
-    KeyCode altGrCode;
-    char modifierState;
-
-    //mouse
-    int buttonMask;
-
-private:
-    void init();
-};
-
-Q_GLOBAL_STATIC(EventData, data)
-
-EventData::EventData()
-{
-    init();
 }
 
-void EventData::init()
+void EventHandler::setFrameBufferPlugin(const QSharedPointer<FrameBuffer> &frameBuffer)
 {
-    dpy = QX11Info::display();
-    buttonMask = 0;
-
-    //initialize keycodes
-    KeySym key, *keymap;
-    int i, j, minkey, maxkey, syms_per_keycode;
-
-    memset(modifiers, -1, sizeof(modifiers));
-
-    XDisplayKeycodes(dpy, &minkey, &maxkey);
-    Q_ASSERT(minkey >= 8);
-    Q_ASSERT(maxkey < 256);
-    keymap = (KeySym *) XGetKeyboardMapping(dpy, minkey,
-                                            (maxkey - minkey + 1),
-                                            &syms_per_keycode);
-    Q_ASSERT(keymap);
-
-    for (i = minkey; i <= maxkey; i++) {
-        for (j = 0; j < syms_per_keycode; j++) {
-            key = keymap[(i-minkey)*syms_per_keycode+j];
-
-            if (key >= ' ' && key < 0x100 && i == XKeysymToKeycode(dpy, key)) {
-                keycodes[key] = i;
-                modifiers[key] = j;
-            }
-        }
-    }
-
-    leftShiftCode = XKeysymToKeycode(dpy, XK_Shift_L);
-    rightShiftCode = XKeysymToKeycode(dpy, XK_Shift_R);
-    altGrCode = XKeysymToKeycode(dpy, XK_Mode_switch);
-
-    XFree((char *)keymap);
+    fb = frameBuffer;
 }
 
-/* this function adjusts the modifiers according to mod (as from modifiers) and data->modifierState */
-static void tweakModifiers(signed char mod, bool down)
+QSharedPointer<FrameBuffer> EventHandler::frameBuffer()
 {
-    bool isShift = data->modifierState & (LEFTSHIFT | RIGHTSHIFT);
-
-    if (mod < 0) {
-        return;
-    }
-
-    if (isShift && mod != 1) {
-        if (data->modifierState & LEFTSHIFT) {
-            XTestFakeKeyEvent(data->dpy, data->leftShiftCode,
-                              down, CurrentTime);
-        }
-
-        if (data->modifierState & RIGHTSHIFT) {
-            XTestFakeKeyEvent(data->dpy, data->rightShiftCode,
-                              down, CurrentTime);
-        }
-    }
-
-    if (!isShift && mod == 1) {
-        XTestFakeKeyEvent(data->dpy, data->leftShiftCode,
-                          down, CurrentTime);
-    }
-
-    if ((data->modifierState & ALTGR) && mod != 2) {
-        XTestFakeKeyEvent(data->dpy, data->altGrCode,
-                          !down, CurrentTime);
-    }
-
-    if (!(data->modifierState & ALTGR) && mod == 2) {
-        XTestFakeKeyEvent(data->dpy, data->altGrCode,
-                          down, CurrentTime);
-    }
-}
-
-void EventHandler::handleKeyboard(bool down, rfbKeySym keySym)
-{
-#define ADJUSTMOD(sym,state) \
-    if(keySym==sym) { if(down) data->modifierState|=state; else data->modifierState&=~state; }
-
-    ADJUSTMOD(XK_Shift_L, LEFTSHIFT);
-    ADJUSTMOD(XK_Shift_R, RIGHTSHIFT);
-    ADJUSTMOD(XK_Mode_switch, ALTGR);
-
-    if (keySym >= ' ' && keySym < 0x100) {
-        KeyCode k;
-
-        if (down) {
-            tweakModifiers(data->modifiers[keySym], True);
-        }
-
-        k = data->keycodes[keySym];
-
-        if (k != NoSymbol) {
-            XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
-        }
-
-        if (down) {
-            tweakModifiers(data->modifiers[keySym], False);
-        }
-    } else {
-        KeyCode k = XKeysymToKeycode(data->dpy, keySym);
-
-        if (k != NoSymbol) {
-            XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
-        }
-    }
-}
-
-void EventHandler::handlePointer(int buttonMask, int x, int y)
-{
-    QDesktopWidget *desktopWidget = QApplication::desktop();
-
-    int screen = desktopWidget->screenNumber();
-
-    if (screen < 0) {
-        screen = 0;
-    }
-
-    XTestFakeMotionEvent(data->dpy, screen, x, y, CurrentTime);
-
-    for (int i = 0; i < 5; i++) {
-        if ((data->buttonMask&(1 << i)) != (buttonMask&(1 << i))) {
-            XTestFakeButtonEvent(data->dpy,
-                                 i + 1,
-                                 (buttonMask&(1 << i)) ? True : False,
-                                 CurrentTime);
-        }
-    }
-
-    data->buttonMask = buttonMask;
+    return fb;
 }

krfb/events.h

@@ -25,13 +25,26 @@
 #ifndef EVENTS_H
 #define EVENTS_H
 
+#include "framebuffer.h"
 #include "rfb.h"
+#include "krfbprivate_export.h"
 
-class EventHandler
+#include <QObject>
+
+class KRFBPRIVATE_EXPORT EventHandler : public QObject
 {
+    Q_OBJECT
 public:
-    static void handleKeyboard(bool down, rfbKeySym key);
-    static void handlePointer(int buttonMask, int x, int y);
+    explicit EventHandler(QObject *parent = nullptr);
+    ~EventHandler() override = default;
+    virtual void handleKeyboard(bool down, rfbKeySym key) = 0;
+    virtual void handlePointer(int buttonMask, int x, int y) = 0;
+
+    void setFrameBufferPlugin(const QSharedPointer<FrameBuffer> &frameBuffer);
+    QSharedPointer<FrameBuffer> frameBuffer();
+private:
+    // Used to track framebuffer plugin which we need for xdp event plugin
+    QSharedPointer<FrameBuffer> fb;
 };
 
 #endif

krfb/eventsmanager.cpp

@@ -0,0 +1,76 @@
+/* This file is part of the KDE project
+   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
+    @author George Goldberg <george.goldberg@collabora.co.uk>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "eventsmanager.h"
+
+#include "eventsplugin.h"
+#include "krfbconfig.h"
+#include "rfbservermanager.h"
+#include "krfbdebug.h"
+
+#include <QGlobalStatic>
+
+#include <KPluginFactory>
+#include <KPluginMetaData>
+
+
+class EventsManagerStatic
+{
+public:
+    EventsManager instance;
+};
+
+Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)
+
+EventsManager::EventsManager()
+{
+    const QList<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() = default;
+
+EventsManager *EventsManager::instance()
+{
+    return &eventsManagerStatic->instance;
+}
+
+QSharedPointer<EventHandler> EventsManager::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;
+        }
+    }
+
+    // No valid events plugin found.
+    qCDebug(KRFB) << "No valid event handlers found. returning null.";
+    return QSharedPointer<EventHandler>();
+}

krfb/eventsmanager.h

@@ -18,28 +18,43 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "x11framebufferplugin.h"
+#ifndef KRFB_EVENTSMANAGER_H
+#define KRFB_EVENTSMANAGER_H
 
-#include "x11framebuffer.h"
+#include "events.h"
 
-#include <KPluginFactory>
+#include "krfbprivate_export.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(X11FrameBufferPluginFactory, "krfb_framebuffer_x11.json",
-			   registerPlugin<X11FrameBufferPlugin>();)
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QWeakPointer>
 
-X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)
-    : FrameBufferPlugin(parent, args)
+#include <QWidget>
+
+class EventsPlugin;
+class KPluginFactory;
+
+class KRFBPRIVATE_EXPORT EventsManager : public QObject
 {
-}
+    Q_OBJECT
+    friend class EventsManagerStatic;
 
-X11FrameBufferPlugin::~X11FrameBufferPlugin()
-{
-}
+public:
+    static EventsManager *instance();
 
-FrameBuffer *X11FrameBufferPlugin::frameBuffer(WId id)
-{
-    return new X11FrameBuffer(id);
-}
+    ~EventsManager() override;
 
-#include "x11framebufferplugin.moc"
+    QSharedPointer<EventHandler> eventHandler();
 
+private:
+    Q_DISABLE_COPY(EventsManager)
+
+    EventsManager();
+
+    QMap<QString, EventsPlugin *> m_plugins;
+    QList<QWeakPointer<EventHandler> > m_eventHandlers;
+};
+
+
+#endif  // Header guard

krfb/eventsplugin.cpp

@@ -0,0 +1,32 @@
+
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
+
+   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 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "eventsplugin.h"
+
+#include "events.h"
+
+EventsPlugin::EventsPlugin(QObject *parent, const QVariantList &)
+    : QObject(parent)
+{
+}
+
+EventsPlugin::~EventsPlugin()
+{
+}

krfb/eventsplugin.h

@@ -18,29 +18,25 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFERPLUGIN_H
-#define KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFERPLUGIN_H
+#ifndef LIB_KRFB_EVENTSPLUGIN_H
+#define LIB_KRFB_EVENTSPLUGIN_H
 
-#include "framebufferplugin.h"
+#include "krfbprivate_export.h"
 
+#include <QtCore/QVariantList>
 #include <QWidget>
 
-class FrameBuffer;
+class EventHandler;
 
-class QtFrameBufferPlugin : public FrameBufferPlugin
+class KRFBPRIVATE_EXPORT EventsPlugin : public QObject
 {
     Q_OBJECT
-
 public:
-    QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~QtFrameBufferPlugin();
+    EventsPlugin(QObject *parent, const QVariantList &args);
+    ~EventsPlugin() override;
 
-    FrameBuffer *frameBuffer(WId id) override;
-
-private:
-    Q_DISABLE_COPY(QtFrameBufferPlugin)
+    virtual EventHandler *eventHandler() = 0;
 };
 
-
 #endif  // Header guard
 

krfb/framebuffer.cpp

@@ -9,13 +9,12 @@
 
 #include "framebuffer.h"
 
-#include "config-krfb.h"
-
-#include <X11/Xutil.h>
+#include <config-krfb.h>
+#include <QCursor>
 
 
-FrameBuffer::FrameBuffer(WId id, QObject *parent)
-    : QObject(parent), win(id)
+FrameBuffer::FrameBuffer(QObject *parent)
+    : QObject(parent)
 {
 }
 
@@ -50,6 +49,12 @@ void FrameBuffer::getServerFormat(rfbPixelFormat &)
 {
 }
 
+QVariant FrameBuffer::customProperty(const QString &property) const
+{
+    Q_UNUSED(property)
+    return QVariant();
+}
+
 int FrameBuffer::depth()
 {
     return 32;
@@ -68,6 +73,7 @@ void FrameBuffer::stopMonitor()
 {
 }
 
-
-#include "framebuffer.moc"
-
+QPoint FrameBuffer::cursorPosition()
+{
+    return QCursor::pos();
+}

krfb/framebuffer.h

@@ -14,9 +14,10 @@
 
 #include "krfbprivate_export.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QList>
+#include <QObject>
+#include <QRect>
+#include <QList>
+#include <QVariant>
 #include <QWidget>
 
 
@@ -28,9 +29,9 @@ class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
     Q_OBJECT
 public:
-    explicit FrameBuffer(WId id, QObject *parent = 0);
+    explicit FrameBuffer(QObject *parent = nullptr);
 
-    virtual ~FrameBuffer();
+    ~FrameBuffer() override;
 
     char *data();
 
@@ -41,12 +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,14 @@
 
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
 
-#include <QDebug>
+#include <QGuiApplication>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QtCore/QSharedPointer>
 
 class FrameBufferManagerStatic
 {
@@ -42,62 +41,32 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {
-    //qDebug();
-
-    loadPlugins();
+    const auto platformFilter = [] (const KPluginMetaData &pluginData) {
+        return pluginData.value(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms"), QStringList()).contains(QGuiApplication::platformName());
+    };
+    const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), platformFilter, 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()) {
-	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();
-	} 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);
@@ -111,31 +80,25 @@ 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));
-
-            if (frameBuffer) {
-                m_frameBuffers.insert(id, frameBuffer.toWeakRef());
-
-                return frameBuffer;
-            }
+    if (auto preferredPlugin = m_plugins.value(KrfbConfig::preferredFrameBufferPlugin())) {
+        if (auto frameBuffer = QSharedPointer<FrameBuffer>(preferredPlugin->frameBuffer(args))) {
+            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+            m_frameBuffers.insert(id, frameBuffer.toWeakRef());
+            return frameBuffer;
         }
+    }
 
-        ++iter;
+    // We don't already have that frame buffer.
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(args));
+        if (frameBuffer) {
+            qCDebug(KRFB) << "Using FrameBuffer:" << it.key();
+            m_frameBuffers.insert(id, frameBuffer.toWeakRef());
+            return frameBuffer;
+        }
     }
 
     // No valid framebuffer plugin found.
-    qDebug() << "No valid framebuffer found. returning null.";
+    qCDebug(KRFB) << "No valid framebuffer found. returning null.";
     return QSharedPointer<FrameBuffer>();
 }
-
-
-#include "framebuffermanager.moc"
-

krfb/framebuffermanager.h

@@ -25,10 +25,10 @@
 
 #include "krfbprivate_export.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QWeakPointer>
 
 #include <QWidget>
 
@@ -43,17 +43,15 @@ class KRFBPRIVATE_EXPORT FrameBufferManager : public QObject
 public:
     static FrameBufferManager *instance();
 
-    virtual ~FrameBufferManager();
+    ~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.cpp

@@ -30,7 +30,3 @@ FrameBufferPlugin::FrameBufferPlugin(QObject *parent, const QVariantList &)
 FrameBufferPlugin::~FrameBufferPlugin()
 {
 }
-
-
-#include "framebufferplugin.moc"
-

krfb/framebufferplugin.h

@@ -23,7 +23,7 @@
 
 #include "krfbprivate_export.h"
 
-#include <QtCore/QVariantList>
+#include <QVariantList>
 #include <QWidget>
 
 
@@ -34,10 +34,10 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
     Q_OBJECT
 
 public:
-    FrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~FrameBufferPlugin();
+    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,12 +24,12 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "connectiondialog.h"
+#include "krfbdebug.h"
 
 #include <KNotification>
 #include <KLocalizedString>
 
-#include <QDebug>
-#include <QtCore/QSocketNotifier>
+#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()
@@ -65,21 +61,21 @@ PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
 
 void PendingInvitationsRfbClient::processNewClient()
 {
-    QString host = peerAddress(m_rfbClient->sock) + ":" + QString::number(peerPort(m_rfbClient->sock));
+    QString host = peerAddress(m_rfbClient->sock) + QLatin1Char(':') + QString::number(peerPort(m_rfbClient->sock));
 
     if (d->askOnConnect == false) {
 
-        KNotification::event("NewConnectionAutoAccepted",
+        KNotification::event(QStringLiteral("NewConnectionAutoAccepted"),
                              i18n("Accepted connection from %1", host));
         accept(new InvitationsRfbClient(m_rfbClient, parent()));
 
     } else {
 
-        KNotification::event("NewConnectionOnHold",
+        KNotification::event(QStringLiteral("NewConnectionOnHold"),
                             i18n("Received connection from %1, on hold (waiting for confirmation)",
                                 host));
 
-        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(0);
+        auto dialog = new InvitationsConnectionDialog(nullptr);
         dialog->setRemoteHost(host);
         dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
@@ -90,43 +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)
 {
-    QByteArray password ;
-    qDebug() << "about to start autentication";
+    qCDebug(KRFB) << "about to start authentication";
 
     if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
             InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
@@ -142,12 +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);
 }
-
-#include "invitationsrfbclient.moc"

krfb/invitationsrfbclient.h

@@ -23,7 +23,7 @@
 class InvitationsRfbClient : public RfbClient
 {
 public:
-    InvitationsRfbClient(rfbClientPtr client, QObject* parent = 0)
+    explicit InvitationsRfbClient(rfbClientPtr client, QObject* parent = nullptr)
         : RfbClient(client, parent) {}
 };
 
@@ -32,12 +32,11 @@ class PendingInvitationsRfbClient : public PendingRfbClient
 {
     Q_OBJECT
 public:
-    PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~PendingInvitationsRfbClient();
+    explicit PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~PendingInvitationsRfbClient() override;
 
 protected Q_SLOTS:
     void processNewClient() override;
-    virtual void onSocketActivated();
     bool checkPassword(const QByteArray & encryptedPassword) override;
 
 private Q_SLOTS:

krfb/invitationsrfbserver.cpp

@@ -21,21 +21,24 @@
 #include "invitationsrfbserver.h"
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
-#include "rfbservermanager.h"
-#include <QtCore/QTimer>
+#include "krfbdebug.h"
+#include <QTimer>
 #include <QApplication>
-#include <QtNetwork/QHostInfo>
-#include <QDebug>
+#include <QHostInfo>
+#include <QRandomGenerator>
 
 #include <KLocalizedString>
 #include <KUser>
-#include <KRandom>
 #include <KStringHandler>
-#include <KWallet/KWallet>
+#include <KWallet>
+
+#include <KDNSSD/PublicService>
 
-#include <dnssd/publicservice.h>
 using KWallet::Wallet;
 
+// used for KWallet folder name
+static const QString s_krfbFolderName(QStringLiteral("krfb"));
+
 //static
 InvitationsRfbServer *InvitationsRfbServer::instance;
 
@@ -47,22 +50,17 @@ void InvitationsRfbServer::init()
             i18n("%1@%2 (shared desktop)",
                 KUser().loginName(),
                 QHostInfo::localHostName()),
-            "_rfb._tcp",
+            QStringLiteral("_rfb._tcp"),
             KrfbConfig::port());
     instance->setListeningAddress("0.0.0.0");
     instance->setListeningPort(KrfbConfig::port());
     instance->setPasswordRequired(true);
 
+    instance->m_wallet = nullptr;
     if (KrfbConfig::noWallet()) {
-      instance->walletOpened(false);
-    }
-    else {
-      instance->m_wallet = Wallet::openWallet(
-              Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
-      if(instance->m_wallet) {
-          connect(instance->m_wallet, &KWallet::Wallet::walletOpened,
-                  instance, &InvitationsRfbServer::walletOpened);
-      }
+        instance->readPasswordFromConfig();
+    } else {
+        instance->openKWallet();
     }
 }
 
@@ -74,6 +72,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
@@ -84,6 +85,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
@@ -111,40 +115,28 @@ 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()
 {
-    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
+    m_desktopPassword = readableRandomString(4) + QLatin1Char('-') + readableRandomString(3);
+    m_unattendedPassword = readableRandomString(4) + QLatin1Char('-') + readableRandomString(3);
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),QStringLiteral("Security"));
     m_allowUnattendedAccess = krfbConfig.readEntry(
             "allowUnattendedAccess", QVariant(false)).toBool();
 }
 
 InvitationsRfbServer::~InvitationsRfbServer()
 {
-    stop();
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
-    krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
-    if(!KrfbConfig::noWallet()) {
-      if (m_wallet && m_wallet->isOpen()) {
-         if( (m_wallet->currentFolder()=="krfb") ||
-                 ((m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb")) &&
-                    m_wallet->setFolder("krfb")) ) {
-
-             m_wallet->writePassword("desktopSharingPassword",m_desktopPassword);
-             m_wallet->writePassword("unattendedAccessPassword",m_unattendedPassword);
-         }
-       }
-
-    } else {
-        krfbConfig.writeEntry("desktopPassword",
-                KStringHandler::obscure(m_desktopPassword));
-        krfbConfig.writeEntry("unattendedPassword",
-                KStringHandler::obscure(m_unattendedPassword));
-        krfbConfig.writeEntry("allowUnattendedAccess",
-                m_allowUnattendedAccess);
+    InvitationsRfbServer::stop();  // calling virtual funcs in destructor is bad
+    saveSecuritySettings();
+    // ^^ also saves passwords in kwallet,
+    //    do it before closing kwallet
+    if (!KrfbConfig::noWallet() && m_wallet) {
+        closeKWallet();
     }
 }
 
@@ -153,44 +145,44 @@ PendingRfbClient* InvitationsRfbServer::newClient(rfbClientPtr client)
     return new PendingInvitationsRfbClient(client, this);
 }
 
+void InvitationsRfbServer::openKWallet()
+{
+    m_wallet = Wallet::openWallet(Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
+    if (m_wallet) {
+        connect(instance->m_wallet, &KWallet::Wallet::walletOpened,
+                this, &InvitationsRfbServer::walletOpened);
+    }
+}
+
+void InvitationsRfbServer::closeKWallet()
+{
+    if (m_wallet && m_wallet->isOpen()) {
+        delete m_wallet; // closes the wallet
+        m_wallet = nullptr;
+    }
+}
+
 void InvitationsRfbServer::walletOpened(bool opened)
 {
     QString desktopPassword;
     QString unattendedPassword;
     Q_ASSERT(m_wallet);
-    if( opened &&
-            ( m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb") ) &&
-            m_wallet->setFolder("krfb") ) {
 
-        if(m_wallet->readPassword("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("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";
-        KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
-
-        desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
-                "desktopPassword", QString()));
-        if(!desktopPassword.isEmpty()) {
-            m_desktopPassword = desktopPassword;
-            emit passwordChanged(m_desktopPassword);
-        }
-
-        unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
-                "unattendedPassword", QString()));
-        if(!unattendedPassword.isEmpty()) {
-            m_unattendedPassword = unattendedPassword;
-        }
-
+        qCDebug(KRFB) << "Could not open KWallet, Falling back to config file";
+        readPasswordFromConfig();
     }
 }
 
@@ -200,7 +192,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;
@@ -218,10 +210,56 @@ QString InvitationsRfbServer::readableRandomString(int length)
                 (c == '0')) {
             continue;
         }
-        str += c;
+        str += QLatin1Char(c);
         length--;
     }
     return str;
 }
 
-#include "invitationsrfbserver.moc"
+// one place to deal with all security configuration
+void InvitationsRfbServer::saveSecuritySettings()
+{
+    KConfigGroup secConfigGroup(KSharedConfig::openConfig(), QStringLiteral("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();
+}
+
+void InvitationsRfbServer::readPasswordFromConfig()
+{
+        QString desktopPassword;
+        QString unattendedPassword;
+        KConfigGroup krfbConfig(KSharedConfig::openConfig(),QStringLiteral("Security"));
+
+        desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
+                "desktopPassword", QString()));
+        if(!desktopPassword.isEmpty()) {
+            m_desktopPassword = desktopPassword;
+            Q_EMIT passwordChanged(m_desktopPassword);
+        }
+
+        unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
+                "unattendedPassword", QString()));
+        if(!unattendedPassword.isEmpty()) {
+            m_unattendedPassword = unattendedPassword;
+        }
+}

krfb/invitationsrfbserver.h

@@ -50,23 +50,27 @@ public Q_SLOTS:
     bool start() override;
     void stop() override;
     void toggleUnattendedAccess(bool allow);
+    void openKWallet();
+    void closeKWallet();
+    void saveSecuritySettings();
 
 protected:
     InvitationsRfbServer();
-    virtual ~InvitationsRfbServer();
+    ~InvitationsRfbServer() override;
     PendingRfbClient* newClient(rfbClientPtr client) override;
 
 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);
+    void readPasswordFromConfig();
     Q_DISABLE_COPY(InvitationsRfbServer)
 };
 

krfb/krfb-framebuffer.desktop

@@ -1,55 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/framebuffer
-
-Comment=Frame Buffer plugins for KRfb
-Comment[ast]=Complementu de buffer pa 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]=Engadido de frame buffer 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[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' de 'framebuffers' 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,34 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Frame Buffer plugins for KRfb", 
-        "Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.", 
-        "Description[ca]": "Connectors de «framebuffer» per al KRfb.", 
-        "Description[cs]": "Moduly Frame bufferu pro KRfb", 
-        "Description[da]": "Framebuffer-plugins til KRfb", 
-        "Description[de]": "Framebuffer-Module für KRfb", 
-        "Description[es]": "Complementos de framebuffer para KRfb", 
-        "Description[et]": "KRfb kaadripuhvri pluginad", 
-        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb", 
-        "Description[gl]": "Engadido de frame buffer para KRfb", 
-        "Description[ia]": "Plug-ins de Frame Buffer per KRfb", 
-        "Description[it]": "Estensioni del framebuffer per KRfb", 
-        "Description[ko]": "KRfb 프레임버퍼 플러그인", 
-        "Description[nl]": "Framebuffer-plugins voor 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[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.kcfg

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM
-    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-<kcfg>
-  <kcfgfile />
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name="krfbrc"/>
   <group name="MainWindow">
     <entry name="startMinimized" type="Bool">
     <label>Start minimized</label>
@@ -46,7 +47,7 @@
   <group name="FrameBuffer">
     <entry name="preferredFrameBufferPlugin" type="String">
       <label>Preferred Frame Buffer Plugin</label>
-      <default>x11</default>
+      <default>xcb</default>
     </entry>
   </group>
 </kcfg>

krfb/krfb.notifyrc

@@ -3,7 +3,6 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Escritoriu compartíu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
@@ -30,13 +29,15 @@ Comment[hne]=डेस्कटाप साझेदारी
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
 Comment[ia]=Compartir de scriptorio
+Comment[id]=Desktop Sharing
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione del desktop
 Comment[ja]=デスクトップ共有
+Comment[ka]=სამუშაო მაგიდის გაზიარება
 Comment[kk]=Үстелді ортақтастыру
 Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
 Comment[ko]=데스크톱 공유
-Comment[lt]=Dalinimasis darbalaukiu
+Comment[lt]=Darbalaukio bendrinimas
 Comment[lv]=Darbvirsmas koplietošana
 Comment[mk]=Делење на работната површина
 Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
@@ -75,7 +76,6 @@ Comment[zh_TW]=桌面分享
 [Event/UserAcceptsConnection]
 Name=User Accepts Connection
 Name[ar]=المستخدم يقبل الاتصال
-Name[ast]=L'usuariu aceuta la conexón
 Name[bg]=Потребителят приема връзката
 Name[bs]=Korisnik prihvata vezu
 Name[ca]=L'usuari accepta la connexió
@@ -93,14 +93,17 @@ Name[fi]=Käyttäjä hyväksyy yhteyden
 Name[fr]=L'utilisateur accepte la connexion
 Name[ga]=Glacann an tÚsáideoir Le Ceangal
 Name[gl]=O usuario acepta a conexión
+Name[he]=המשתמש מאשר חיבור
 Name[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
 Name[hne]=कमइया हर कनेक्सन स्वीकारा
 Name[hr]=Korisnik prihvaća vezu
 Name[hu]=A felhasználó engedélyezi a csatlakozást
 Name[ia]=Usator da acceptation a connexion
+Name[id]=Pengguna Menyetujui Koneksi
 Name[is]=Notandi samþykkir tengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
+Name[ka]=მომხმარებელი დაეთანხმა მიერთებას
 Name[kk]=Пайдаланушы қосылымды қабылдайды
 Name[km]=អ្នក​ប្រើ​ទទួល​យក​ការ​ត​ភ្ជាប់
 Name[ko]=사용자가 연결을 수락함
@@ -136,7 +139,6 @@ Name[zh_TW]=使用者接受連線
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
 Comment[ar]=المستخدم يقبل الاتصال
-Comment[ast]=L'usuariu aceuta la conexón
 Comment[bg]=Потребителят приема връзката
 Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 Comment[bs]=Korisnik prihvata vezu
@@ -156,15 +158,17 @@ Comment[fi]=Käyttäjä hyväksyy yhteyden
 Comment[fr]=L'utilisateur accepte la connexion
 Comment[ga]=Glacann úsáideoir le ceangal
 Comment[gl]=O usuario acepta a conexión
-Comment[he]=המשתמש מקבל את החיבור
+Comment[he]=המשתמש מאשר את החיבור
 Comment[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
 Comment[hne]=कमइया हर कनेक्सन स्वीकारा
 Comment[hr]=Korisnik prihvaća vezu
 Comment[hu]=A felhasználó engedélyezi a csatlakozást
 Comment[ia]=Usator da acceptation a connexion
+Comment[id]=Pengguna menyetujui koneksi
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
+Comment[ka]=მომხმარებელი დაეთანხმა მიერთებას
 Comment[kk]=Пайдаланушы қосылымды қабылдайды
 Comment[km]=អ្នក​ប្រើ​ទទួល​យក​ការ​ត​ភ្ជាប់
 Comment[ko]=사용자가 연결을 수락함
@@ -208,7 +212,6 @@ Action=Popup
 [Event/UserRefusesConnection]
 Name=User Refuses Connection
 Name[ar]=المستخدم يرفض الاتصال
-Name[ast]=L'usuariu refuga la conexón
 Name[bg]=Потребителят отказва връзката
 Name[bs]=Korisnik odbija vezu
 Name[ca]=L'usuari refusa la connexió
@@ -226,14 +229,17 @@ Name[fi]=Käyttäjä hylkää yhteyden
 Name[fr]=L'utilisateur refuse la connexion
 Name[ga]=Diúltaíonn an tÚsáideoir Le Ceangal
 Name[gl]=O usuario rexeita a conexión
+Name[he]=המשתמש מסרב לחיבור
 Name[hi]=उपयोक्ता ने कनेक्शन अस्वीकारा
 Name[hne]=कमइया हर कनेक्सन अस्वीकारा
 Name[hr]=Korisnik odbija vezu
 Name[hu]=A felhasználó elutasítja a csatlakozást
 Name[ia]=Usator refuta connexion
+Name[id]=Pengguna Menampik Koneksi
 Name[is]=Notandi hafnar tengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
+Name[ka]=მომხმარებელმა უარყო მიერთებას
 Name[kk]=Пайдаланушы қосылымдан бас тартады
 Name[km]=អ្នក​ប្រើ​បដិសេធ​ការ​ត​ភ្ជាប់
 Name[ko]=사용자가 연결을 거부함
@@ -269,7 +275,6 @@ Name[zh_TW]=使用者拒絕連線
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
 Comment[ar]=المستخدم يرفض الاتصال
-Comment[ast]=L'usuariu refuga la conexón
 Comment[bg]=Потребителят отказва връзката
 Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Comment[bs]=Korisnik odbija vezu
@@ -295,9 +300,11 @@ Comment[hne]=कमइया हर कनेक्सन अस्वीका
 Comment[hr]=Korisnik odbija vezu
 Comment[hu]=A felhasználó elutasítja a csatlakozást
 Comment[ia]=Usator refuta connexion
+Comment[id]=Pengguna menampik koneksi
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
+Comment[ka]=მომხმარებელმა უარყო მიერთებას
 Comment[kk]=Пайдаланушы қосылымды қабылдамайды
 Comment[km]=អ្នក​ប្រើ​បដិសេធ​ការ​ត​ភ្ជាប់
 Comment[ko]=사용자가 연결을 거부함
@@ -341,7 +348,6 @@ Action=Popup
 [Event/ConnectionClosed]
 Name=Connection Closed
 Name[ar]=الاتصال أغلق
-Name[ast]=Conexón zarrada
 Name[bg]=Връзката е прекъсната
 Name[bs]=Konekcija zatvorena
 Name[ca]=Connexió tancada
@@ -358,15 +364,18 @@ Name[eu]=Konexioa itxi da
 Name[fi]=Yhteys suljettu
 Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
-Name[gl]=Conexión fechada
+Name[gl]=Conexión pechada
+Name[he]=החיבור נסגר
 Name[hi]=कनेक्शन बन्द
 Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
 Name[hu]=A kapcsolat megszűnt
 Name[ia]=Connexion claudite
+Name[id]=Koneksi Ditutup
 Name[is]=Tengingu lokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
+Name[ka]=კავშირი დაიხურა
 Name[kk]=Қосылымдан жабылды
 Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Name[ko]=연결이 닫힘
@@ -404,7 +413,6 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
-Comment[ast]=Conexón zarrada
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -424,16 +432,18 @@ Comment[eu]=Konexioa itxi da
 Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion fermée
 Comment[ga]=Ceangal dúnta
-Comment[gl]=A conexión está fechada
+Comment[gl]=A conexión está pechada
 Comment[he]=החיבור נסגר
 Comment[hi]=कनेक्शन बन्द
 Comment[hne]=कनेक्सन बन्द
 Comment[hr]=Veza prekinuta
 Comment[hu]=A kapcsolat megszűnt
 Comment[ia]=Connexion claudite
+Comment[id]=Koneksi ditutup
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
+Comment[ka]=კავშირი დახურულია
 Comment[kk]=Қосылым жабылды
 Comment[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Comment[ko]=연결이 닫힘
@@ -480,7 +490,6 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
-Name[ast]=Contraseña incorreuta
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -497,15 +506,18 @@ Name[eu]=Baliogabeko pasahitza
 Name[fi]=Virheellinen salasana
 Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
-Name[gl]=O contrasinal non é válido
+Name[gl]=O contrasinal é incorrecto
+Name[he]=סיסמה שגויה
 Name[hi]=अवैध पासवर्ड
 Name[hne]=अवैध पासवर्ड
 Name[hr]=Nevažeća zaporka
 Name[hu]=Érvénytelen jelszó
 Name[ia]=Contrasigno invalide
+Name[id]=Sandi Tidak Absah
 Name[is]=Ógilt lykilorð
 Name[it]=Password non valida
 Name[ja]=無効なパスワード
+Name[ka]=არასწორი პაროლი
 Name[kk]=Жарамсыз паролі
 Name[km]=ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Name[ko]=잘못된 암호
@@ -518,7 +530,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ă
@@ -543,7 +555,6 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
-Comment[ast]=Contraseña incorreuta
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -563,16 +574,18 @@ Comment[eu]=Baliogabeko pasahitza
 Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
 Comment[ga]=Focal faire neamhbhailí
-Comment[gl]=Este contrasinal non é válido
+Comment[gl]=Este contrasinal é incorrecto
 Comment[he]=הסיסמה שגויה
 Comment[hi]=अवैध पासवर्ड
 Comment[hne]=अवैध पासवर्ड
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
 Comment[ia]=Contrasigno invalide
+Comment[id]=Sandi tidak absah
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=無効なパスワード
+Comment[ka]=არასწორი პაროლი
 Comment[kk]=Паролі дұрыс емес
 Comment[km]=ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Comment[ko]=잘못된 암호
@@ -589,7 +602,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ă
@@ -622,11 +635,10 @@ Action=Popup
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
-Name[ast]=Contraseñas d'invitaciones incorreutes
 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
@@ -639,15 +651,18 @@ Name[eu]=Gonbitearen pasahitza baliogabea
 Name[fi]=Virheellinen salasana kutsuun
 Name[fr]=Invitations de mots de passe non valables
 Name[ga]=Cuirí Neamhbhailí Focal Faire
-Name[gl]=O contrasinal de convidado non válido
+Name[gl]=O contrasinal de convidado incorrecto
+Name[he]=סיסמה שגויה להזמנות
 Name[hi]=अवैध पासवर्ड निमंत्रण
 Name[hne]=अवैध पासवर्ड निमंत्रन
 Name[hr]=Pozivnice s nevažećim zaporkama
 Name[hu]=Érvénytelen jelszavas meghívó
 Name[ia]=Invitationes de contrasigno invalide
+Name[id]=Undangan Sandi Tidak Absah
 Name[is]=Ógild lykilorðsboð
 Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
+Name[ka]=არასწორი პაროლის მოსაწვევები
 Name[kk]=Жарамсыз паролімен шақыру
 Name[km]=ការ​អញ្ជើញ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Name[ko]=잘못된 암호 초대장
@@ -679,11 +694,10 @@ Name[ug]=ئىناۋەتسىز ئىم تەكلىپلىرى
 Name[uk]=Запрошення з некоректними паролями
 Name[x-test]=xxInvalid Password Invitationsxx
 Name[zh_CN]=无效密码邀请
-Name[zh_TW]=不合法的密碼邀請
+Name[zh_TW]=無效的密碼邀請
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
 Comment[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال.
-Comment[ast]=L'invitáu unvió una contraseña incorreuta. Conexón refugada.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -702,16 +716,18 @@ Comment[eu]=Gonbidatutako parekoak baliogabeko pasahitza bidali du. Konexioa uka
 Comment[fi]=Kutsuttu taho lähetti virheellisen salasanan. Yhteys hylättiin.
 Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion refusée.
 Comment[ga]=Sheol an duine le cuireadh focal faire neamhbhailí. Diúltaíodh an ceangal.
-Comment[gl]=A parte convidada envioulle un contrasinal non válido. A conexión foi rexeitada.
+Comment[gl]=A parte convidada envioulle un contrasinal incorrecto. Rexeitouse a conexión.
 Comment[he]=הצד המוזמן שלח סיסמה שגויה. החיבור נדחה.
 Comment[hi]=निमंत्रित पार्टी ने अवैध पासवर्ड भेजा. कनेक्शन अस्वीकृत.
 Comment[hne]=निमंत्रित पार्टी हर अवैध पासवर्ड भेजिस. कनेक्सन अस्वीकृत.
 Comment[hr]=Stranka koju ste pozvali je poslala nevažeću šifru. Veza odbijena.
 Comment[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozási kérés elutasítva.
 Comment[ia]=Le partita invitate inviava un contrasigno invalide. Connexion refusate.
+Comment[id]=Undangan mengirimkan sebuah sandi tidak absah. Koneksi ditampik.
 Comment[is]=Boðinn aðili sendi ógilt lykilorð. Tengingu hafnað
 Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が無効なパスワードを送ってきました。接続を拒否しました。
+Comment[ka]=მოწვეული მხრის გამოგზავნილი პაროლი არასწორია. კავშირი უარყოფილია.
 Comment[kk]=Шқырылған жақ дұрыс емес парольді жіберді. Қосылымдан бас тартылды..
 Comment[km]=ភាគី​ដែល​បាន​អញ្ជើញ បាន​ផ្ញើ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។ ការ​តភ្ជាប់​ត្រូវ​បាន​បដិសេធ ។
 Comment[ko]=초대한 사람이 잘못된 암호를 보냈습니다. 연결이 잘못되었습니다.
@@ -753,7 +769,6 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
-Name[ast]=Conexón nueva a la espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
 Name[ca]=Connexió nova en espera
@@ -771,14 +786,17 @@ Name[fi]=Uusi yhteys odottaa
 Name[fr]=Nouvelle connexion en attente
 Name[ga]=Ceangal Nua Ag Fanacht
 Name[gl]=Nova conexión en espera
+Name[he]=חיבור חדש בהמתנה
 Name[hi]=नया कनेक्शन होल्ड पर रखा
 Name[hne]=नवा कनेक्सन होल्ड मं रखा
 Name[hr]=Nova veza na čekanju
 Name[hu]=Új kapcsolat tartva
 Name[ia]=Nove connexion in pausa
+Name[id]=Koneksi Baru sedang Tertahan
 Name[is]=Ný tenging á bið
 Name[it]=Nuova connessione in attesa
 Name[ja]=保留中の新しい接続
+Name[ka]=ახალი შეერთება შეჩერებულია
 Name[kk]=Жаңа қосылым күтілуде
 Name[km]=ការ​តភ្ជាប់​ថ្មី កំពុង​ស្ថិត​នៅ​ក្នុង​ការ​រង់ចាំ
 Name[ko]=새 연결 대기 중
@@ -813,7 +831,6 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
-Comment[ast]=Conexón solicitada, l'usuario tien d'aceutala
 Comment[bg]=Поискана е връзка, следва потребителят да приеме
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
@@ -833,15 +850,17 @@ Comment[fi]=Pyydettiin yhteyttä, käyttäjän tulee hyväksyä
 Comment[fr]=Connexion demandée. L'utilisateur doit accepter
 Comment[ga]=Ceangal iarrtha; ní mór don úsáideoir glacadh leis
 Comment[gl]=Pediuse a conexión; o usuario debe aceptar
-Comment[he]=נתבקש חיבור, על המשתמש לקבלו
+Comment[he]=התבקש חיבור, על המשתמש לאשרו
 Comment[hi]=कनेक्शन निवेदित. उपयोक्ता को स्वीकार होना चाहिए
 Comment[hne]=कनेक्सन निवेदित. कमइया ल स्वीकार होना चाही
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
 Comment[hu]=Csatlakozási kérés, a felhasználónak el kell fogadnia
 Comment[ia]=Connexion requirite, usator debe dar acceptation
+Comment[id]=Koneksi diminta, pengguna harus menyetujui
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザが許可しなければなりません。
+Comment[ka]=მიერთება მოთხოვნილია. მომხმარებელი მას უნდა დაეთანხმოს
 Comment[kk]=Қосылым сұралды, пайдаланушы жауап беруге тиіс
 Comment[km]=បាន​ស្នើ​ការ​ត​ភ្ជាប់​​ អ្នក​ប្រើ​ត្រូវ​តែ​ទទួល​យក
 Comment[ko]=연결 요청됨, 사용자가 수락해야 함
@@ -884,7 +903,6 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
-Name[ast]=Conexón nueva aceutada automáticamente
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -902,14 +920,17 @@ Name[fi]=Uusi yhteys hyväksyttiin automaattisesti
 Name[fr]=Nouvelle connexion acceptée automatiquement
 Name[ga]=Ceangal nua bunaithe go huathoibríoch
 Name[gl]=Nova conexión aceptada automaticamente
+Name[he]=חיבור חדש אושר אוטומטית
 Name[hi]=नय कनेक्शन स्वचालित स्वीकारा
 Name[hne]=नय कनेक्सन अपने अपन स्वीकारा
 Name[hr]=Nova veza automatski prihvaćena
 Name[hu]=Új kapcsolat automatikusan engedélyezve
 Name[ia]=Nove connexion con acceptation automatic
+Name[id]=Koneksi Baru Tersetujui Otomatis
 Name[is]=Ný tenging sjálfvirkt samþykkt
 Name[it]=Nuova connessione accettata automaticamente
 Name[ja]=新しい接続の自動受け入れ
+Name[ka]=ახალი მიერთება ავტომატურად მიღებულია
 Name[kk]=Жаңа қосылым автоқабылданды
 Name[km]=បាន​ទទួល​យក​ការ​តភ្ជាប់​ថ្មី​ដោយ​ស្វ័យ​ប្រវត្តិ
 Name[ko]=새 연결 자동 수락
@@ -944,12 +965,11 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
-Comment[ast]=Conexón nueva afitada automáticamente
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
 Comment[ca]=Connexió nova establerta automàticament
-Comment[ca@valencia]=Connexió nova establerta automàticament
+Comment[ca@valencia]=Connexió nova establida automàticament
 Comment[cs]=Automaticky navázáno nové spojení
 Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
 Comment[da]=Ny forbindelse automatisk etableret
@@ -964,15 +984,17 @@ Comment[fi]=Uusi yhteys muodostettiin automaattisesti
 Comment[fr]=Nouvelle connexion établie automatiquement
 Comment[ga]=Ceangal nua bunaithe go huathoibríoch
 Comment[gl]=Estabeleceuse automaticamente unha conexión nova
-Comment[he]=נוצר חיבור חדש באופן אוטומטי
+Comment[he]=חיבור חדש נוצר אוטומטית
 Comment[hi]=नया कनेक्शन स्वचलित स्थापित
 Comment[hne]=नवा कनेक्सन अपने अपन स्थापित
 Comment[hr]=Nova veza automatski prihvaćena
 Comment[hu]=Automatikusan létrejött egy új kapcsolat
 Comment[ia]=Nove connexion establite automaticamente
+Comment[id]=Koneksi baru secara otomatis terpancang
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Nuova connessione stabilita automaticamente
 Comment[ja]=新しい接続を自動的に確立しました
+Comment[ka]=ახალი მიერთება ავტომატურად დამყარებულია
 Comment[kk]=Жаңа қосылым автоматты түрде орнатылды
 Comment[km]=បាន​បង្កើត​ការ​ត​ភ្ជាប់​ថ្មី​ដោយ​ស្វ័យ​ប្រវត្តិ
 Comment[ko]=새 연결이 자동으로 성립됨
@@ -1015,7 +1037,6 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
-Name[ast]=Abondes conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1033,14 +1054,17 @@ Name[fi]=Liikaa yhteyksiä
 Name[fr]=Trop de connexions
 Name[ga]=An Iomarca Ceangal
 Name[gl]=Demasiadas conexións
+Name[he]=יותר מדי חיבורים
 Name[hi]=बहुत सारे कनेक्शन
 Name[hne]=बहुत अकन कनेक्सन
 Name[hr]=Previše veza
 Name[hu]=Túl sok kapcsolat
 Name[ia]=Nimie connexiones
+Name[id]=Terlalu Banyak Koneksi
 Name[is]=Of margar tengingar
 Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
+Name[ka]=მეტისმეტად ბევრი მიერთება
 Name[kk]=Тым көп қосылым
 Name[km]=ការ​តភ្ជាប់​ច្រើន​ពេក
 Name[ko]=너무 많은 연결
@@ -1075,7 +1099,6 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
-Comment[ast]=Ocupáu, conexón refugada
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1095,16 +1118,18 @@ Comment[eu]=Lanpetuta, konexioa ukatu da
 Comment[fi]=Varattu, yhteys hylättiin
 Comment[fr]=Occupé. Connexion refusée
 Comment[ga]=Gnóthach; ceangal diúltaithe
-Comment[gl]=Ocupado; a conexión foi rexeitada
+Comment[gl]=Ocupado, rexeitouse a conexión.
 Comment[he]=תפוס, החיבור נדחה
 Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
 Comment[hne]=व्यस्त, कनेक्सन अस्वीकृत
 Comment[hr]=Zauzeto, veza odbijena
 Comment[hu]=A csatlakozási kérés elutasítva túlterhelés miatt
 Comment[ia]=Occupate, connexion refusate
+Comment[id]=Sibuk, koneksi ditampik
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
+Comment[ka]=დაკავებულია, დაკავშირება უარყოფილია
 Comment[kk]=Бос емес, қосылым болмады
 Comment[km]=រវល់ បដិសេធ​ការ​ត​ភ្ជាប់
 Comment[ko]=바쁨, 연결 거부됨
@@ -1149,7 +1174,6 @@ Action=Popup
 [Event/UnexpectedConnection]
 Name=Unexpected Connection
 Name[ar]=الاتصال غير متوقّع
-Name[ast]=Conexón inesperada
 Name[bg]=Неочаквана връзка
 Name[bs]=Neočekivana veza
 Name[ca]=Connexió inesperada
@@ -1167,14 +1191,17 @@ Name[fi]=Odottamaton yhteys
 Name[fr]=Connexion inattendue
 Name[ga]=Ceangal Gan Choinne
 Name[gl]=Conexión non agardada
+Name[he]=חיבור בלתי צפוי
 Name[hi]=अप्रत्याशित कनेक्शन
 Name[hne]=अप्रत्यासित कनेक्सन
 Name[hr]=Neočekivana veza
 Name[hu]=Nem várt kapcsolat
 Name[ia]=Connexion impreviste
+Name[id]=Koneksi Tak Terduga
 Name[is]=Óvænt Tenging
 Name[it]=Connessione inattesa
 Name[ja]=予期しない接続
+Name[ka]=მოულოდნელი შეერთება
 Name[kk]=Күтпеген қосылым
 Name[km]=ការ​តភ្ជាប់​ដែល​មិន​បាន​រំពឹង​ទុក
 Name[ko]=예상하지 않은 연결
@@ -1210,12 +1237,11 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
-Comment[ast]=Recibióse conexón inesperada, albortando
 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
@@ -1229,16 +1255,18 @@ Comment[eu]=Ustekabeko konexioa jaso da, abortatzen
 Comment[fi]=Vastaanotettiin odottamaton yhteys, lopeta
 Comment[fr]=Connexion inattendue reçue. Annulation
 Comment[ga]=Fuarthas ceangal gan choinne, á thobscor
-Comment[gl]=Recibiuse unha conexión non agardada; cancélase
-Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
+Comment[gl]=Recibiuse unha conexión non agardada; interrómpese
+Comment[he]=התקבל חיבור בלתי צפוי, בוטל
 Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
 Comment[hne]=अप्रत्यासित कनेक्सन प्राप्त. छोड़ा
 Comment[hr]=Primio sam neočekivanu vezu, prekid
 Comment[hu]=Nem várt csatlakozási kérés érkezett, megszakítás
 Comment[ia]=On recipeva connexion impreviste, aborta
+Comment[id]=Diperoleh koneksi tak terduga, gugurkan
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inattesa, terminata
 Comment[ja]=予期しない接続を受信しました。廃棄します。
+Comment[ka]=მიღებულია მოულოდნელი მიერთება. გაუქმდება
 Comment[kk]=Күтпеген қосылым ұсынысы, доғарылды
 Comment[km]=បាន​ទទួល​យក​ការ​តភ្ជាប់​ដែល​មិន​បាន​រំពឹង​ទុក ​បោះបង់
 Comment[ko]=예상하지 않은 연결을 받았습니다, 중지합니다
@@ -1253,7 +1281,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.qrc

@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/kxmlgui5/krfb">
+        <file>krfbui.rc</file>
+    </qresource>
+</RCC>

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/krfbui.rc

@@ -0,0 +1,7 @@
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="krfb" version="0">
+
+<MenuBar>
+</MenuBar>
+
+</gui>

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

@@ -19,25 +19,24 @@
 #include "trayicon.h"
 #include "invitationsrfbserver.h"
 #include "krfbconfig.h"
+#include "krfb_version.h"
+#include "krfbdebug.h"
 
 #include <KAboutData>
 #include <KDBusService>
 #include <KLocalizedString>
 #include <KMessageBox>
+#include <KWindowSystem>
 
-#include <QDebug>
 #include <QPixmap>
 #include <qwindowdefs.h>
-#include <QX11Info>
+#include <QtGui/private/qtx11extras_p.h>
 
-#include <signal.h>
+#include <csignal>
 #include <X11/extensions/XTest.h>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 
-static const char KRFB_VERSION[] = "5.0";
-static const char description[] = I18N_NOOP("VNC-compatible server to share "
-                                  "KDE desktops");
 
 static bool checkX11Capabilities()
 {
@@ -46,7 +45,7 @@ static bool checkX11Capabilities()
                                  &majorv, &minorv);
 
     if ((!r) || (((majorv * 1000) + minorv) < 2002)) {
-        KMessageBox::error(0,
+        KMessageBox::error(nullptr,
                            i18n("Your X11 Server does not support the required XTest extension "
                                 "version 2.2. Sharing your desktop is not possible."),
                            i18n("Desktop Sharing Error"));
@@ -56,17 +55,46 @@ static bool checkX11Capabilities()
     return true;
 }
 
+static void checkOldX11PluginConfig() {
+    if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("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();
+            qCDebug(KRFB) << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
+        }
+    }
+}
+
+static void checkWaylandPluginConfig()
+{
+    if (KrfbConfig::preferredFrameBufferPlugin() != QStringLiteral("pw")) {
+        qWarning() << "Wayland: Detected invalid configuration: "
+                    "preferredFrameBufferPlugin is not pipewire: "
+                   << KrfbConfig::preferredFrameBufferPlugin();
+        KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
+                    QStringLiteral("preferredFrameBufferPlugin"));
+        if (config_item) {
+            config_item->setProperty(QStringLiteral("pw"));
+            KrfbConfig::self()->save();
+            qCDebug(KRFB) << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
+        }
+    }
+}
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
     KLocalizedString::setApplicationDomain("krfb");
 
-    KAboutData aboutData("krfb",
-			 i18n("Desktop Sharing"),
-			 KRFB_VERSION,
-                         i18n(description),
-			 KAboutLicense::GPL,
+    KAboutData aboutData(QStringLiteral("krfb"),
+                         i18n("Desktop Sharing"),
+                         QStringLiteral(KRFB_VERSION_STRING),
+                         i18n("VNC-compatible server to share desktops"),
+                         KAboutLicense::GPL,
                          i18n("(c) 2009-2010, Collabora Ltd.\n"
                                "(c) 2007, Alessandro Praduroux\n"
                                "(c) 2001-2003, Tim Jansen\n"
@@ -76,12 +104,12 @@ int main(int argc, char *argv[])
                                "(c) 1999, AT&T Laboratories Boston\n"));
     aboutData.addAuthor(i18n("George Goldberg"),
                         i18n("Telepathy tubes support"),
-                        "george.goldberg@collabora.co.uk");
+                        QStringLiteral("george.goldberg@collabora.co.uk"));
     aboutData.addAuthor(i18n("George Kiagiadakis"),
                         QString(),
-                        "george.kiagiadakis@collabora.co.uk");
-    aboutData.addAuthor(i18n("Alessandro Praduroux"), i18n("KDE4 porting"), "pradu@pradu.it");
-    aboutData.addAuthor(i18n("Tim Jansen"), i18n("Original author"), "tim@tjansen.de");
+                        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"),
@@ -91,21 +119,35 @@ int main(int argc, char *argv[])
     aboutData.addCredit(i18n("AT&T Laboratories Boston"),
                         i18n("original VNC encoders and "
                               "protocol design"));
-    QCommandLineParser parser;
     KAboutData::setApplicationData(aboutData);
-    parser.addVersionOption();
-    parser.addHelpOption();
+
+    QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
+    const QCommandLineOption nodialogOption(QStringList{ QStringLiteral("nodialog") }, i18n("Do not show the invitations management dialog at startup"));
+    parser.addOption(nodialogOption);
+
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
     KDBusService service(KDBusService::Unique, &app);
 
-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("nodialog"), i18n("Do not show the invitations management dialog at startup")));
-
     app.setQuitOnLastWindowClosed(false);
 
-    if (!checkX11Capabilities()) {
+    if (KWindowSystem::isPlatformX11()) {
+        if (!checkX11Capabilities()) {
+            return 1;
+        }
+
+        // upgrade the configuration
+        checkOldX11PluginConfig();
+    } else if (KWindowSystem::isPlatformWayland()) {
+        // check that default plugin in Wayland is PipeWire
+        checkWaylandPluginConfig();
+    } else {
+        KMessageBox::error(nullptr,
+                           i18n("Desktop Sharing is not running under an X11 Server or Wayland.\n"
+                                "Other display servers are currently not supported."),
+                           i18n("Desktop Sharing Error"));
         return 1;
     }
 
@@ -116,18 +158,27 @@ 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)) {
         mainWindow.restore(1, false);
-    } else if (!parser.isSet("nodialog")) {
+    } else if (!parser.isSet(nodialogOption)) {
         mainWindow.show();
     }
 
     sigset_t sigs;
     sigemptyset(&sigs);
     sigaddset(&sigs, SIGPIPE);
-    sigprocmask(SIG_BLOCK, &sigs, 0);
+    sigprocmask(SIG_BLOCK, &sigs, nullptr);
 
     return app.exec();
 }

krfb/mainwindow.cpp

@@ -13,24 +13,32 @@
 #include "krfbconfig.h"
 #include "ui_configtcp.h"
 #include "ui_configsecurity.h"
+#include "ui_configframebuffer.h"
 
 #include <KConfigDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
+#include <KMessageWidget>
 #include <KStandardAction>
 #include <KActionCollection>
-#include <KLineEdit>
 #include <KNewPasswordDialog>
+#include <KPluginMetaData>
 
 #include <QIcon>
 #include <QWidget>
+#include <QLineEdit>
+#include <QComboBox>
 #include <QSizePolicy>
-#include <QtNetwork/QNetworkInterface>
+#include <QList>
+#include <QSet>
+#include <QNetworkInterface>
+#include <QHostInfo>
+#include <QMessageBox>
 
 class TCP: public QWidget, public Ui::TCP
 {
 public:
-    TCP(QWidget *parent = 0) : QWidget(parent) {
+    explicit TCP(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
     }
 };
@@ -38,8 +46,46 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = 0) : 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!"));
+        walletWarning->setCloseButtonVisible(false);
+        walletWarning->setMessageType(KMessageWidget::Warning);
+        walletWarning->hide();
+        vboxLayout->addWidget(walletWarning);
+
+        // show warning when "noWallet" checkbox is checked
+        QObject::connect(kcfg_noWallet, &QCheckBox::toggled, this, [this] (bool checked) {
+            walletWarning->setVisible(checked);
+        });
+    }
+
+    KMessageWidget *walletWarning = nullptr;
+};
+
+class ConfigFramebuffer: public QWidget, public Ui::Framebuffer
+{
+public:
+    ConfigFramebuffer(QWidget *parent = nullptr) : QWidget(parent) {
+        setupUi(this);
+        // hide the line edit with framebuffer string
+        kcfg_preferredFrameBufferPlugin->hide();
+        // fill drop-down combo with a list of real existing plugins
+        this->fillFrameBuffersCombo();
+        // initialize combo with currently configured framebuffer plugin
+        cb_preferredFrameBufferPlugin->setCurrentText(KrfbConfig::preferredFrameBufferPlugin());
+        // connect signals between combo<->lineedit
+        // if we change selection in combo, lineedit is updated
+        QObject::connect(cb_preferredFrameBufferPlugin, &QComboBox::currentTextChanged,
+                         kcfg_preferredFrameBufferPlugin, &QLineEdit::setText);
+    }
+
+    void fillFrameBuffersCombo() {
+        const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+        for (const KPluginMetaData &metadata : plugins) {
+            cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
+        }
     }
 };
 
@@ -50,13 +96,13 @@ 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("krfb").pixmap(128));
+    m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
             InvitationsRfbServer::instance->allowUnattendedAccess());
 
@@ -79,24 +125,28 @@ MainWindow::MainWindow(QWidget *parent)
 
     // Figure out the address
     int port = KrfbConfig::port();
-    QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
-    foreach(const QNetworkInterface & interface, interfaceList) {
+    const QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface& interface : interfaceList) {
         if(interface.flags() & QNetworkInterface::IsLoopBack)
             continue;
 
         if(interface.flags() & QNetworkInterface::IsRunning &&
-                !interface.addressEntries().isEmpty())
-            m_ui.addressDisplayLabel->setText(QString("%1 : %2")
-                    .arg(interface.addressEntries().first().ip().toString())
-                    .arg(port));
+                !interface.addressEntries().isEmpty()) {
+            const QString hostName = QHostInfo::localHostName();
+            const QString ipAddress = interface.addressEntries().constFirst().ip().toString();
+            const QString addressLabelText = hostName.isEmpty()
+                ? QStringLiteral("%1 : %2").arg(ipAddress).arg(port)
+                : QStringLiteral("%1 (%2) : %3").arg(hostName, ipAddress).arg(port);
+            m_ui.addressDisplayLabel->setText(addressLabelText);
+        }
     }
 
     //Figure out the password
     m_ui.passwordDisplayLabel->setText(
             InvitationsRfbServer::instance->desktopPassword());
 
-    KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection());
-    KStandardAction::preferences(this, SLOT(showConfiguration()), actionCollection());
+    KStandardAction::quit(QCoreApplication::instance(), &QCoreApplication::quit, actionCollection());
+    KStandardAction::preferences(this, &MainWindow::showConfiguration, actionCollection());
 
     setupGUI();
 
@@ -115,7 +165,7 @@ void MainWindow::editPassword()
 {
     if(m_passwordEditable) {
         m_passwordEditable = false;
-        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
         InvitationsRfbServer::instance->setDesktopPassword(
                 m_passwordLineEdit->text());
@@ -124,7 +174,7 @@ void MainWindow::editPassword()
         m_passwordLineEdit->setVisible(false);
     } else {
         m_passwordEditable = true;
-        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-save"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
         m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
         m_passwordLineEdit->setText(
                 InvitationsRfbServer::instance->desktopPassword());
@@ -156,7 +206,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
         if(m_passwordEditable) {
             m_passwordEditable = false;
             m_passwordLineEdit->setVisible(false);
-            m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
+            m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         }
     }
 }
@@ -169,28 +219,57 @@ 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()
 {
-    if (KConfigDialog::showDialog("settings")) {
+    static QString s_prevFramebufferPlugin;
+    static bool s_prevNoWallet;
+    // ^^ needs to be static, because lambda will be called long time
+    //    after showConfiguration() ends, so auto variable would go out of scope
+    // save previously selected framebuffer plugin config
+    s_prevFramebufferPlugin = KrfbConfig::preferredFrameBufferPlugin();
+    s_prevNoWallet = KrfbConfig::noWallet();
+
+    if (KConfigDialog::showDialog(QStringLiteral("settings"))) {
         return;
     }
 
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
-    dialog->addPage(new TCP, i18n("Network"), "network-workgroup");
-    dialog->addPage(new Security, i18n("Security"), "security-high");
+    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"));
     dialog->show();
+    connect(dialog, &KConfigDialog::settingsChanged, this, [this] () {
+        // check if framebuffer plugin config has changed
+        if (s_prevFramebufferPlugin != KrfbConfig::preferredFrameBufferPlugin()) {
+            KMessageBox::information(this, i18n("To apply framebuffer plugin setting, "
+                                                "you need to restart the program."));
+        }
+        // check if kwallet config has changed
+        if (s_prevNoWallet != KrfbConfig::noWallet()) {
+            // try to apply settings immediately
+            if (KrfbConfig::noWallet()) {
+                InvitationsRfbServer::instance->closeKWallet();
+            } else {
+                InvitationsRfbServer::instance->openKWallet();
+                // erase stored passwords from krfbconfig file
+                KConfigGroup securityConfigGroup(KSharedConfig::openConfig(), QStringLiteral("Security"));
+                securityConfigGroup.deleteEntry("desktopPassword");
+                securityConfigGroup.deleteEntry("unattendedPassword");
+            }
+        }
+    });
 }
 
 void MainWindow::readProperties(const KConfigGroup& group)
@@ -206,5 +285,3 @@ void MainWindow::saveProperties(KConfigGroup& group)
     group.writeEntry("Visible", isVisible());
     KMainWindow::saveProperties(group);
 }
-
-#include "mainwindow.moc"

krfb/mainwindow.h

@@ -8,22 +8,22 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#ifndef MANAGEINVITATIONSDIALOG_H
-#define MANAGEINVITATIONSDIALOG_H
+#ifndef KRFB_MAINWINDOW_H
+#define KRFB_MAINWINDOW_H
 
 #include "ui_mainwidget.h"
 
 #include <KXmlGuiWindow>
 
-class KLineEdit;
+class QLineEdit;
 
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
 
     public:
-        MainWindow(QWidget *parent = 0);
-        ~MainWindow();
+        explicit MainWindow(QWidget *parent = nullptr);
+        ~MainWindow() override;
 
     public Q_SLOTS:
         void showConfiguration();
@@ -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

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>org.kde.krfb.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Krfb</name>
+  <name xml:lang="ar">كرفب</name>
+  <name xml:lang="ast">Krfb</name>
+  <name xml:lang="bg">Krfb</name>
+  <name xml:lang="ca">Krfb</name>
+  <name xml:lang="ca-valencia">Krfb</name>
+  <name xml:lang="cs">Krfb</name>
+  <name xml:lang="da">Krfb</name>
+  <name xml:lang="de">Krfb</name>
+  <name xml:lang="el">Krfb</name>
+  <name xml:lang="en-GB">Krfb</name>
+  <name xml:lang="eo">Krfb</name>
+  <name xml:lang="es">Krfb</name>
+  <name xml:lang="et">Krfb</name>
+  <name xml:lang="eu">Krfb</name>
+  <name xml:lang="fi">Krfb</name>
+  <name xml:lang="fr">Krfb</name>
+  <name xml:lang="gl">Krfb</name>
+  <name xml:lang="he">Krfb</name>
+  <name xml:lang="hu">Krfb</name>
+  <name xml:lang="ia">Krfb</name>
+  <name xml:lang="id">Krfb</name>
+  <name xml:lang="it">Krfb</name>
+  <name xml:lang="ka">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>
+  <name xml:lang="sr">КРФБ</name>
+  <name xml:lang="sr-Latn">KRFB</name>
+  <name xml:lang="sr-ijekavian">КРФБ</name>
+  <name xml:lang="sr-ijekavianlatin">KRFB</name>
+  <name xml:lang="sv">Krfb</name>
+  <name xml:lang="tr">Krfb</name>
+  <name xml:lang="uk">Krfb</name>
+  <name xml:lang="x-test">xxKrfbxx</name>
+  <name xml:lang="zh-CN">Krfb</name>
+  <name xml:lang="zh-TW">Krfb</name>
+  <summary>Share your desktop to another computer via VNC</summary>
+  <summary xml:lang="ar">مشاركة سطح مكتبك مع حاسوب آخر بواسطة VNC</summary>
+  <summary xml:lang="bg">Споделяне на работния плот на друг компютър чрез 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="eo">Kundividu vian labortablon al alia komputilo per 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="gl">Comparte o teu escritorio con outro computador por VNC</summary>
+  <summary xml:lang="he">שיתוף שולחן העבודה שלך עם מחשב אחר דרך VNC</summary>
+  <summary xml:lang="hu">Ossza meg asztalát egy másik számítógéppel VNC-n keresztül</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="ka">სამუშაო მაგიდის გაზიარება Krfb-სთან ერთად 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>
+  <summary xml:lang="zh-TW">透過 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="ar">مشاركة سطح المكتب كرْفب هو تطبيق خادم يسمح لك بمشاركة جلستك الحالية مع مستخدم على جهاز آخر، والذي يمكنه استخدام عميل VNC لعرض سطح المكتب أو حتى التحكم فيه.</p>
+    <p xml:lang="bg">Krfb Desktop Sharing е сървърно приложение, което ви позволява да споделяте текущата си сесия с потребител на друга машина, който може да използва VNC клиент, за да преглежда или дори да управлява работния плот.</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>
+    <p xml:lang="en-GB">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="eo">Krfb Desktop Sharing estas servila aplikaĵo, kiu ebligas al vi kunhavigi vian aktualan seancon kun uzanto sur alia maŝino, kiu povas uzi VNC-klienton por rigardi aŭ eĉ kontroli la labortablon.</p>
+    <p xml:lang="es">Krfb para compartir el escritorio es una aplicación de servidor que le permite compartir su sesión actual con un usuario de otra máquina, que puede usar un cliente VNC para ver e incluso controlar su escritorio.</p>
+    <p xml:lang="et">Krfb töölaua jagamine on serverirakendus, mis võimaldab jagada aktiivset seanssi mõne teise masina taga istuva kasutajaga, kes saab VNC kliendi kaudu töölauda näha või isegi juhtida.</p>
+    <p xml:lang="eu">Krfb Mahaigaina Partekatzea zerbitzari aplikazio bat da zure uneko saioa beste makina batean dagoen erabiltzaile batekin partekatzen uzten dizuna. Beste makinan VNC bezeroa erabil dezake zure mahaigaina ikusi edo baita kontrolatzeko ere.</p>
+    <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="he">שיתוף שולחן העבודה Krfb הוא יישום שרת שמאפשר לך לשתף את ההפעלה הנוכחית שלך עם משתמש במכונה אחרת שיש להם גישה ללוח VNC לטובת צפייה ואפילו שליטה בשולחן העבודה.</p>
+    <p xml:lang="hu">A Krfb asztalmegosztás egy kiszolgáló alkalmazás, amely lehetővé teszi, hogy megossza az aktuális munkamenetet egy másik gépen lévő felhasználóval, aki egy VNC kliens segítségével megtekintheti vagy akár irányíthatja az asztalt.</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="ka">Krfb სამუშაო მაგიდის გაზიარება აპლიკაციის სერვერია, რომელიც თქვენი მიმდინარე სესიის სხვა მომხმარებლისთვის, რომელსაც VNC კლიენტი აქვს, გაზიარების და კონტროლის გადაცემის საშუალებას გაძლევთ.</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>
+    <p xml:lang="sr">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
+    <p xml:lang="sr-Latn">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="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ı; 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>
+    <p xml:lang="zh-TW">Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 用戶端檢視、甚至控制您的桌面。</p>
+  </description>
+  <url type="homepage">https://userbase.kde.org/Krfb</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=krfb</url>
+  <url type="donation">https://www.kde.org/community/donations</url>
+  <url type="help">https://docs.kde.org/?application=krfb</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Sharing desktop with Krfb</caption>
+      <caption xml:lang="ar">مشاركة سطح المكتب باستخدام كرفب</caption>
+      <caption xml:lang="bg">Споделяне на работното място с 1Krfb</caption>
+      <caption xml:lang="ca">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>
+      <caption xml:lang="el">Κοινή χρήση επιφάνειας εργασίας με το Krfb</caption>
+      <caption xml:lang="en-GB">Sharing desktop with Krfb</caption>
+      <caption xml:lang="eo">Kundividante labortablon per Krfb</caption>
+      <caption xml:lang="es">Compartiendo el escritorio con Krfb</caption>
+      <caption xml:lang="et">Töölaua jagamine Krfb abil</caption>
+      <caption xml:lang="eu">Mahaigaina Krfb-ren bidez partekatzea</caption>
+      <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="he">שיתוף שולחן העבודה עם Krfb</caption>
+      <caption xml:lang="hu">Asztalmegosztás a Krfb-vel</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="ka">სამუშაო მაგიდის გაზიარება 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>
+      <caption xml:lang="zh-TW">使用 Krfb 分享桌面</caption>
+      <image>https://cdn.kde.org/screenshots/krfb/krfb.png</image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>krfb</binary>
+  </provides>
+  <project_group>KDE</project_group>
+  <releases>
+    <release version="24.08.3" date="2024-11-07"/>
+    <release version="24.08.2" date="2024-10-10"/>
+    <release version="24.08.1" date="2024-09-12"/>
+    <release version="24.08.0" date="2024-08-22"/>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
+    <release version="24.05.0" date="2024-05-23"/>
+    <release version="24.02.2" date="2024-04-11"/>
+    <release version="24.02.1" date="2024-03-21"/>
+    <release version="24.02.0" date="2024-02-28"/>
+    <release version="23.08.5" date="2024-02-15"/>
+  </releases>
+</component>

krfb/org.kde.krfb.desktop

@@ -1,13 +1,13 @@
 # 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
 Terminal=false
 Name=Krfb
-Name[ar]=Krfb
+Name[ar]=كرفب
 Name[ast]=Krfb
 Name[bg]=Krfb
 Name[bn]=কে-আর-এফ-বি
@@ -34,9 +34,11 @@ Name[hne]=केआरएफबी
 Name[hr]=Krfb
 Name[hu]=Krfb
 Name[ia]=Krfb
+Name[id]=Krfb
 Name[is]=Krfb
 Name[it]=Krfb
 Name[ja]=Krfb
+Name[ka]=Krfb
 Name[kk]=Krfb
 Name[km]=Krfb
 Name[ko]=Krfb
@@ -74,75 +76,117 @@ Name[x-test]=xxKrfbxx
 Name[zh_CN]=Krfb
 Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
-GenericName=Desktop Sharing
-GenericName[ar]=مشاركة سطح المكتب
-GenericName[ast]=Escritoriu compartíu
-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[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]=桌面分享
-Categories=Qt;KDE;System;Network;RemoteAccess;
+GenericName=Desktop Sharing (VNC)
+GenericName[ar]=مشاركة سطح المكتب (VNC)
+GenericName[bg]=Споделяне на работния плот (VNC)
+GenericName[ca]=Compartició de l'escriptori (VNC)
+GenericName[ca@valencia]=Compartiu 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[eo]=Kunhavigo de Labortablo (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[gl]=Compartir o escritorio (VNC)
+GenericName[he]=שיתוף שולחנות עבודה (VNC)
+GenericName[hu]=Munkaasztal-megosztás (VNC)
+GenericName[ia]=Compartir de scriptorio (VNC)
+GenericName[it]=Condivisione del desktop (VNC)
+GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC).
+GenericName[ko]=데스크톱 공유(VNC)
+GenericName[lt]=Darbalaukio bendrinimas (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)
+GenericName[zh_TW]=桌面分享 (VNC)
+Comment=Desktop Sharing
+Comment[af]=Werkskerm Deeling
+Comment[ar]=مشاركة سطح المكتب
+Comment[bg]=Споделяне на работния плот
+Comment[bn]=ডেস্কটপ ভাগাভাগি
+Comment[br]=Rannañ ar vurev
+Comment[bs]=Dijeljenje radne površine
+Comment[ca]=Compartir l'escriptori
+Comment[ca@valencia]=Compartir l'escriptori
+Comment[cs]=Sdílení pracovní plochy
+Comment[cy]=Rhannu Penbwrdd
+Comment[da]=Skrivebordsdeling
+Comment[de]=Arbeitsflächen-Freigabe
+Comment[el]=Κοινή χρήση επιφάνειας εργασίας
+Comment[en_GB]=Desktop Sharing
+Comment[eo]=Tabula komunigado
+Comment[es]=Escritorio compartido
+Comment[et]=Töölaua jagamine
+Comment[eu]=Mahaigaina partekatzea
+Comment[fi]=Työpöydän jakaminen
+Comment[fr]=Partage de bureaux
+Comment[ga]=Roinnt Deisce
+Comment[gl]=Compartición do escritorio
+Comment[he]=שיתוף שולחנות עבודה
+Comment[hi]=डेस्कटॉप साझेदारी
+Comment[hne]=डेस्कटाप साझेदारी
+Comment[hr]=Dijeljenje radne površine
+Comment[hu]=Munkaasztal-megosztás
+Comment[ia]=Compartir de scriptorio
+Comment[id]=Desktop Sharing
+Comment[is]=Skjáborðamiðlun
+Comment[it]=Condivisione del desktop
+Comment[ja]=デスクトップ共有
+Comment[ka]=სამუშაო მაგიდის გაზიარება
+Comment[kk]=Үстелді ортақтастыру
+Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
+Comment[ko]=데스크톱 공유
+Comment[lt]=Darbalaukio bendrinimas
+Comment[lv]=Darbvirsmas koplietošana
+Comment[mk]=Делење на работната површина
+Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
+Comment[mr]=डेस्कटॉप शेअरींग
+Comment[ms]=Perkongsian Ruang Kerja
+Comment[nb]=Delte skrivebord
+Comment[nds]=Schriefdisch-Freegaav
+Comment[nl]=Bureaublad delen
+Comment[nn]=Skrivebordsdeling
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
+Comment[pl]=Współdzielenie pulpitu
+Comment[pt]=Partilha do Ecrã
+Comment[pt_BR]=Compartilhamento do ambiente de trabalho
+Comment[ro]=Partajare birou
+Comment[ru]=Параметры общего рабочего стола
+Comment[si]=වැඩතල හවුල්
+Comment[sk]=Zdieľanie pracovnej plochy
+Comment[sl]=Souporaba namizja
+Comment[sr]=Дељење површи
+Comment[sr@ijekavian]=Дијељење површи
+Comment[sr@ijekavianlatin]=Dijeljenje površi
+Comment[sr@latin]=Deljenje površi
+Comment[sv]=Dela ut skrivbordet
+Comment[ta]=பணிமேடை பகிர்வு
+Comment[tg]=Истифодаи Муштараки Мизи Корӣ
+Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
+Comment[tr]=Masaüstü Paylaşımı
+Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
+Comment[uk]=Спільні стільниці
+Comment[xh]=Ulwahlulelano lwe Desktop
+Comment[x-test]=xxDesktop Sharingxx
+Comment[zh_CN]=桌面共享
+Comment[zh_HK]=桌面分享
+Comment[zh_TW]=桌面分享
+Categories=Qt;KDE;Network;RemoteAccess;
 X-DBUS-ServiceName=org.kde.krfb
+X-KDE-Wayland-Interfaces=org_kde_kwin_fake_input,org_kde_kwin_remote_access_manager

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

@@ -0,0 +1,80 @@
+# KDE Config File
+[Desktop Entry]
+Type=Application
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
+Icon=krfb
+Terminal=false
+Name=KRFBs Virtual Monitor
+Name[ar]=شاشة افتراضية لكرفب
+Name[bg]=Виртуален монитор на KRFB
+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[eo]=Virtuala Monitoro de KRFB
+Name[es]=Monitor virtual de KRFB
+Name[eu]=KRFBren alegiazko monitorea
+Name[fi]=KRFB:n virtuaalinäyttö
+Name[fr]=Moniteur virtuel « Krfb »
+Name[gl]=Monitor virtual de KRFB
+Name[he]=הצג הווירטואלי של KRFB
+Name[hu]=KRFB virtuális monitor
+Name[ia]=Virtual Monitor de KRFB
+Name[it]=Monitor virtuale di KRFB
+Name[ka]=KRFB-ის ვირტუალური ეკრანი
+Name[ko]=KRFBs 가상 모니터
+Name[lt]=KRFBs virtualus monitorius
+Name[nl]=Virtuele monitor van KRFB
+Name[nn]=KRFBs virtuell skjerm
+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 虚拟监视器
+Name[zh_TW]=KRFBs 虛擬螢幕
+Comment=Remote Virtual Monitor
+Comment[ar]=شاشة افتراضية بعيدة
+Comment[bg]=Отдалечен виртуален монитор
+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[eo]=Fora Virtuala Monitoro
+Comment[es]=Monitor virtual remoto
+Comment[eu]=Urruneko alegiazko monitorea
+Comment[fi]=Virtuaalinen etänäyttö
+Comment[fr]=Moniteur virtuel distant
+Comment[gl]=Monitor virtual remoto
+Comment[he]=צג וירטואלי מרוחק
+Comment[hu]=Távoli virtuális monitor
+Comment[ia]=Monitor Virtual Remote
+Comment[it]=Monitor virtuale remoto
+Comment[ka]=დაშორებული ვირტუალური ეკრანი
+Comment[ko]=원격 가상 모니터
+Comment[lt]=Nuotolinis virtualus monitorius
+Comment[nl]=Virtual Monitor op afstand
+Comment[nn]=Virtuell skjerm for ekstern ressurs
+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]=远程虚拟监视器
+Comment[zh_TW]=遠端虛擬螢幕
+NoDisplay=true
+X-KDE-Wayland-Interfaces=zkde_screencast_unstable_v1

krfb/rfbclient.cpp

@@ -21,11 +21,11 @@
 #include "connectiondialog.h"
 #include "krfbconfig.h"
 #include "sockethelpers.h"
-#include "events.h"
-#include <QtCore/QSocketNotifier>
-#include <QDebug>
+#include "eventsmanager.h"
+#include <QSocketNotifier>
 #include <poll.h>
 #include <strings.h> //for bzero()
+#include "krfbdebug.h"
 
 struct RfbClient::Private
 {
@@ -37,18 +37,21 @@ struct RfbClient::Private
     bool controlEnabled;
     rfbClientPtr client;
     QSocketNotifier *notifier;
+    QSharedPointer<EventHandler> eventHandler;
     QString remoteAddressString;
 };
 
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
     : QObject(parent), d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + ":" +
+    d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') +
                              QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(false);
     connect(d->notifier, &QSocketNotifier::activated, this, &RfbClient::onSocketActivated);
+
+    d->eventHandler = EventsManager::instance()->eventHandler();
 }
 
 RfbClient::~RfbClient()
@@ -110,14 +113,14 @@ rfbClientPtr RfbClient::getRfbClientPtr()
 void RfbClient::handleKeyboardEvent(bool down, rfbKeySym keySym)
 {
     if (d->controlEnabled) {
-        EventHandler::handleKeyboard(down, keySym);
+        d->eventHandler->handleKeyboard(down, keySym);
     }
 }
 
 void RfbClient::handleMouseEvent(int buttonMask, int x, int y)
 {
     if (d->controlEnabled) {
-        EventHandler::handlePointer(buttonMask, x, y);
+        d->eventHandler->handlePointer(buttonMask, x, y);
     }
 }
 
@@ -168,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()
@@ -197,7 +205,7 @@ void PendingRfbClient::reject()
     rfbCloseClient(m_rfbClient);
     rfbClientConnectionGone(m_rfbClient);
 
-    Q_EMIT finished(NULL);
+    Q_EMIT finished(nullptr);
     deleteLater();
 }
 
@@ -205,7 +213,7 @@ bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     Q_UNUSED(encryptedPassword);
 
-    return m_rfbClient->screen->authPasswdData == (void*)0;
+    return m_rfbClient->screen->authPasswdData == (void*)nullptr;
 }
 
 bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
@@ -214,19 +222,49 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
         return true;
     }
 
-    char passwd[MAXPWLEN];
+    char passwd[MAXPWLEN+1]; // +1 to make sure there's a nullptr at the end
     unsigned char challenge[CHALLENGESIZE];
 
     memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE);
-    bzero(passwd, MAXPWLEN);
+    memset(passwd, 0, sizeof(passwd));
 
     if (!password.isEmpty()) {
-        strncpy(passwd, password,
+        strncpy(passwd, password.constData(),
                 (MAXPWLEN <= password.size()) ? MAXPWLEN : password.size());
     }
 
     rfbEncryptBytes(challenge, passwd);
-    return memcmp(challenge, encryptedPassword, encryptedPassword.size()) == 0;
+    return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
 }
 
-#include "rfbclient.moc"
+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

@@ -21,7 +21,9 @@
 #define RFBCLIENT_H
 
 #include "rfb.h"
-#include <QtCore/QObject>
+#include <QObject>
+
+class QSocketNotifier;
 
 class RfbClient : public QObject
 {
@@ -29,8 +31,8 @@ class RfbClient : public QObject
     Q_PROPERTY(bool controlEnabled READ controlEnabled WRITE setControlEnabled NOTIFY controlEnabledChanged)
     Q_PROPERTY(bool onHold READ isOnHold WRITE setOnHold NOTIFY holdStatusChanged)
 public:
-    RfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~RfbClient();
+    explicit RfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~RfbClient() override;
 
     /** Returns a name for the client, to be shown to the user */
     virtual QString name() const;
@@ -73,8 +75,8 @@ class PendingRfbClient : public QObject
 {
     Q_OBJECT
 public:
-    PendingRfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~PendingRfbClient();
+    explicit PendingRfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~PendingRfbClient() override;
 
 Q_SIGNALS:
     void finished(RfbClient *client);
@@ -97,13 +99,18 @@ protected:
     virtual bool checkPassword(const QByteArray & encryptedPassword);
 
     /** This method checks if the \a encryptedPassword that was sent from the remote
-     * user matches the \a password that you have specified localy to be the password
+     * user matches the \a password that you have specified locally to be the password
      * for this connection. This assumes that the standard VNC authentication mechanism
      * is used. Returns true if the password matches or false otherwise.
      */
     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,10 +19,12 @@
 */
 #include "rfbserver.h"
 #include "rfbservermanager.h"
-#include <QtCore/QSocketNotifier>
+#include "krfbdebug.h"
+#include <QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
-#include <QDebug>
+#include <QPointer>
+#include <QtGui/private/qtx11extras_p.h>
 
 struct RfbServer::Private
 {
@@ -30,7 +32,8 @@ struct RfbServer::Private
     int listeningPort;
     bool passwordRequired;
     rfbScreenInfoPtr screen;
-    QSocketNotifier *notifier;
+    QPointer<QSocketNotifier> ipv4notifier;
+    QPointer<QSocketNotifier> ipv6notifier;
 };
 
 RfbServer::RfbServer(QObject *parent)
@@ -39,8 +42,7 @@ RfbServer::RfbServer(QObject *parent)
     d->listeningAddress = "0.0.0.0";
     d->listeningPort = 0;
     d->passwordRequired = true;
-    d->screen = NULL;
-    d->notifier = NULL;
+    d->screen = nullptr;
 
     RfbServerManager::instance()->registerServer(this);
 }
@@ -90,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;
         }
 
@@ -107,7 +109,7 @@ bool RfbServer::start()
     }
 
     if (listeningAddress() != "0.0.0.0") {
-        strncpy(d->screen->thisHost, listeningAddress().data(), 254);
+        strncpy(d->screen->thisHost, listeningAddress().constData(), 254);
     }
 
     if (listeningPort() == 0) {
@@ -115,31 +117,39 @@ bool RfbServer::start()
     }
 
     d->screen->port = listeningPort();
+    d->screen->ipv6port = listeningPort();
 
     // Disable/Enable password checking
     if (passwordRequired()) {
         d->screen->authPasswdData = (void *)1;
     } else {
-        d->screen->authPasswdData = (void *)0;
+        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;
     };
 
-    d->notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
-    d->notifier->setEnabled(true);
-    connect(d->notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
-    connect(QApplication::clipboard(), &QClipboard::dataChanged,
-            this, &RfbServer::krfbSendServerCutText);
+    d->ipv4notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
+    connect(d->ipv4notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    if (d->screen->listen6Sock > 0) {
+        // we're also listening on additional IPv6 socket, get events from there
+        d->ipv6notifier = new QSocketNotifier(d->screen->listen6Sock, QSocketNotifier::Read, this);
+        connect(d->ipv6notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    }
+
+    if (QX11Info::isPlatformX11()) {
+        connect(QApplication::clipboard(), &QClipboard::dataChanged,
+                this, &RfbServer::krfbSendServerCutText);
+    }
 
     return true;
 }
@@ -148,14 +158,26 @@ void RfbServer::stop()
 {
     if (d->screen) {
         rfbShutdownServer(d->screen, true);
-        if (d->notifier) {
-            d->notifier->setEnabled(false);
-            d->notifier->deleteLater();
-            d->notifier = NULL;
+        for (auto notifier : {d->ipv4notifier, d->ipv6notifier}) {
+            if (notifier) {
+                notifier->setEnabled(false);
+                notifier->deleteLater();
+            }
         }
     }
 }
 
+void RfbServer::updateFrameBuffer(char *fb, int width, int height, int depth)
+{
+    int bpp = depth >> 3;
+
+    if (bpp != 1 && bpp != 2 && bpp != 4) {
+        bpp = 4;
+    }
+
+    rfbNewFramebuffer(d->screen, fb, width, height, 8, 3, bpp);
+}
+
 void RfbServer::updateScreen(const QList<QRect> & modifiedTiles)
 {
     if (d->screen) {
@@ -187,7 +209,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 
     /* Inform all clients about this cursor movement. */
     iterator = rfbGetClientIterator(screen);
-    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
+    while ((cl = rfbClientIteratorNext(iterator)) != nullptr) {
         cl->cursorWasMoved = true;
     }
     rfbReleaseClientIterator(iterator);
@@ -201,7 +223,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 void RfbServer::updateCursorPosition(const QPoint & position)
 {
     if (d->screen) {
-        krfb_rfbSetCursorPosition(d->screen, NULL, position.x(), position.y());
+        krfb_rfbSetCursorPosition(d->screen, nullptr, position.x(), position.y());
     }
 }
 
@@ -232,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,
@@ -245,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();
@@ -254,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));
 }
@@ -262,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);
 }
 
@@ -278,5 +300,3 @@ void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
     QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
 }
-
-#include "rfbserver.moc"

krfb/rfbserver.h

@@ -22,14 +22,14 @@
 
 #include "rfb.h"
 #include "rfbclient.h"
-#include <QtCore/QRect>
+#include <QRect>
 
 class RfbServer : public QObject
 {
     Q_OBJECT
 public:
-    RfbServer(QObject *parent = 0);
-    virtual ~RfbServer();
+    explicit RfbServer(QObject *parent = nullptr);
+    ~RfbServer() override;
 
     QByteArray listeningAddress() const;
     int listeningPort() const;
@@ -43,6 +43,7 @@ public Q_SLOTS:
     virtual bool start();
     virtual void stop();
 
+    void updateFrameBuffer(char *fb, int width, int height, int depth);
     void updateScreen(const QList<QRect> & modifiedTiles);
     void updateCursorPosition(const QPoint & position);
 

krfb/rfbservermanager.cpp

@@ -20,20 +20,23 @@
 */
 #include "rfbservermanager.h"
 #include "rfbserver.h"
-#include "framebuffer.h"
 #include "framebuffermanager.h"
 #include "sockethelpers.h"
 #include "krfbconfig.h"
-#include <QtCore/QTimer>
+#include "krfbdebug.h"
+#include <QTimer>
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QGlobalStatic>
-#include <QtNetwork/QHostInfo>
-#include <QDebug>
+#include <QHostInfo>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <KLocalizedString>
 #include <KUser>
 #include <KNotification>
+#include <KWindowSystem>
+#include <chrono>
+
+using namespace std::chrono_literals;
 
 static const char *cur =
     "                   "
@@ -90,7 +93,6 @@ RfbServerManager* RfbServerManager::instance()
     return &s_instance->server;
 }
 
-
 struct RfbServerManager::Private
 {
     QSharedPointer<FrameBuffer> fb;
@@ -113,26 +115,47 @@ RfbServerManager::~RfbServerManager()
     delete d;
 }
 
+QSharedPointer<FrameBuffer> RfbServerManager::framebuffer() const
+{
+    return d->fb;
+}
+
+QVariantMap RfbServerManager::s_pluginArgs;
+
 void RfbServerManager::init()
 {
     //qDebug();
+    WId rootWindow = 0;
 
-    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
+    if (KWindowSystem::isPlatformX11()) {
+        QPlatformNativeInterface* native = qApp->platformNativeInterface();
+        rootWindow = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), QGuiApplication::primaryScreen()));
+    }
+
+    d->fb = FrameBufferManager::instance()->frameBuffer(rootWindow, s_pluginArgs);
     d->myCursor = rfbMakeXCursor(19, 19, (char *) cur, (char *) mask);
     d->myCursor->cleanup = false;
-    d->desktopName = QString("%1@%2 (shared desktop)") //FIXME check if we can use utf8
+    d->desktopName = QStringLiteral("%1@%2 (shared desktop)") //FIXME check if we can use utf8
                         .arg(KUser().loginName(),QHostInfo::localHostName()).toLatin1();
 
+    connect(d->fb.data(), &FrameBuffer::frameBufferChanged, this, &RfbServerManager::updateFrameBuffer);
     connect(&d->rfbUpdateTimer, &QTimer::timeout, this, &RfbServerManager::updateScreens);
     connect(qApp, &QApplication::aboutToQuit, this, &RfbServerManager::cleanup);
 }
 
+void RfbServerManager::updateFrameBuffer()
+{
+    for (RfbServer *server : std::as_const(d->servers)) {
+        server->updateFrameBuffer(d->fb->data(), d->fb->width(), d->fb->height(), d->fb->depth());
+    }
+}
+
 void RfbServerManager::updateScreens()
 {
     QList<QRect> rects = d->fb->modifiedTiles();
-    QPoint currentCursorPos = QCursor::pos();
+    const QPoint currentCursorPos = d->fb->cursorPosition();
 
-    Q_FOREACH(RfbServer *server, d->servers) {
+    for (RfbServer* server : std::as_const(d->servers)) {
         server->updateScreen(rects);
         server->updateCursorPosition(currentCursorPos);
     }
@@ -140,8 +163,8 @@ void RfbServerManager::updateScreens()
     //update() might disconnect some of the clients, which will synchronously
     //call the removeClient() method and will change d->clients, so we need
     //to copy the set here to avoid problems.
-    QSet<RfbClient*> clients = d->clients;
-    Q_FOREACH(RfbClient *client, clients) {
+    const QSet<RfbClient*> clients = d->clients;
+    for (RfbClient* client : clients) {
         client->update();
     }
 }
@@ -151,10 +174,8 @@ void RfbServerManager::cleanup()
     //qDebug();
 
     //copy because d->servers is going to be modified while we delete the servers
-    QSet<RfbServer*> servers = d->servers;
-    Q_FOREACH(RfbServer *server, servers) {
-        delete server;
-    }
+    const QSet<RfbServer*> servers = d->servers;
+    qDeleteAll(servers);
 
     Q_ASSERT(d->servers.isEmpty());
     Q_ASSERT(d->clients.isEmpty());
@@ -176,7 +197,7 @@ void RfbServerManager::unregisterServer(RfbServer* server)
 
 rfbScreenInfoPtr RfbServerManager::newScreen()
 {
-    rfbScreenInfoPtr screen = NULL;
+    rfbScreenInfoPtr screen = nullptr;
 
     if (!d->fb.isNull()) {
         int w = d->fb->width();
@@ -190,13 +211,12 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
 
         //qDebug() << "bpp: " << bpp;
 
-        rfbLogEnable(0);
+        rfbLogEnable(KRFB().isDebugEnabled());
 
-        screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+        screen = rfbGetScreen(nullptr, nullptr, w, h, 8, 3, bpp);
         screen->paddedWidthInBytes = d->fb->paddedWidth();
         d->fb->getServerFormat(screen->serverFormat);
         screen->frameBuffer = d->fb->data();
-
         screen->desktopName = d->desktopName.constData();
         screen->cursor = d->myCursor;
     }
@@ -209,11 +229,11 @@ 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);
 
-    KNotification::event("UserAcceptsConnection",
+    KNotification::event(QStringLiteral("UserAcceptsConnection"),
                          i18n("The remote user %1 is now connected.", cc->name()));
 
     Q_EMIT clientConnected(cc);
@@ -228,9 +248,7 @@ void RfbServerManager::removeClient(RfbClient* cc)
         d->rfbUpdateTimer.stop();
     }
 
-    KNotification::event("ConnectionClosed", i18n("The remote user %1 disconnected.", cc->name()));
+    KNotification::event(QStringLiteral("ConnectionClosed"), i18n("The remote user %1 disconnected.", cc->name()));
 
     Q_EMIT clientDisconnected(cc);
 }
-
-#include "rfbservermanager.moc"

krfb/rfbservermanager.h

@@ -21,7 +21,9 @@
 #define RFBSERVERMANAGER_H
 
 #include "rfb.h"
-#include <QtCore/QObject>
+#include "framebuffer.h"
+#include <QObject>
+#include <QVariantMap>
 
 class RfbClient;
 struct RfbServerManagerStatic;
@@ -33,12 +35,15 @@ class RfbServerManager : public QObject
 public:
     static RfbServerManager *instance();
 
+    QSharedPointer<FrameBuffer> framebuffer() const;
+    static QVariantMap s_pluginArgs;
 Q_SIGNALS:
     void clientConnected(RfbClient *cc);
     void clientDisconnected(RfbClient *cc);
 
 private Q_SLOTS:
     void init();
+    void updateFrameBuffer();
     void updateScreens();
     void cleanup();
 
@@ -52,7 +57,7 @@ private:
     void removeClient(RfbClient *cc);
 
     RfbServerManager();
-    virtual ~RfbServerManager();
+    ~RfbServerManager() override;
     Q_DISABLE_COPY(RfbServerManager)
 
     friend class RfbServer;

krfb/sockethelpers.cpp

@@ -28,37 +28,35 @@
 
 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;
-            return QString(inet_ntoa(si->sin_addr));
+            auto si = (struct sockaddr_in *)&sa;
+            return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString(inetbuf);
+            return QString::fromLatin1(inetbuf);
         }
 
-        return QString("not a network address");
+        return QStringLiteral("not a network address");
     }
 
-    return QString("unable to determine...");
+    return QStringLiteral("unable to determine...");
 }
 
 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,37 +65,35 @@ 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;
-            return QString(inet_ntoa(si->sin_addr));
+            auto si = (struct sockaddr_in *)&sa;
+            return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString(inetbuf);
+            return QString::fromLatin1(inetbuf);
         }
 
-        return QString("not a network address");
+        return QStringLiteral("not a network address");
     }
 
-    return QString("unable to determine...");
+    return QStringLiteral("unable to determine...");
 }
 
 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/sockethelpers.h

@@ -20,7 +20,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <QtCore/QString>
+#ifndef SOCKETHELPERS_H
+#define SOCKETHELPERS_H
+
+#include <QString>
 
 QString peerAddress(int sock);
 unsigned short peerPort(int sock);
@@ -28,3 +31,4 @@ unsigned short peerPort(int sock);
 QString localAddress(int sock);
 unsigned short localPort(int sock);
 
+#endif

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)
@@ -68,7 +68,7 @@ ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
         QObject::connect(client, &RfbClient::controlEnabledChanged,
                          m_enableControlAction, &KToggleAction::setChecked);
     } else {
-        m_enableControlAction = NULL;
+        m_enableControlAction = nullptr;
     }
 
     m_separator = m_menu->insertSeparator(before);
@@ -96,7 +96,7 @@ ClientActions::~ClientActions()
 TrayIcon::TrayIcon(QWidget *mainWindow)
     : KStatusNotifierItem(mainWindow)
 {
-    setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
+    setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
 
     setToolTipTitle(i18n("Desktop Sharing - disconnected"));
     setCategory(KStatusNotifierItem::ApplicationStatus);
@@ -106,14 +106,14 @@ TrayIcon::TrayIcon(QWidget *mainWindow)
     connect(RfbServerManager::instance(), &RfbServerManager::clientDisconnected,
             this, &TrayIcon::onClientDisconnected);
 
-    m_aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), this);
+    m_aboutAction = KStandardAction::aboutApp(this, &TrayIcon::showAbout, this);
     contextMenu()->addAction(m_aboutAction);
 }
 
 void TrayIcon::onClientConnected(RfbClient* client)
 {
     if (m_clientActions.isEmpty()) { //first client connected
-        setIconByName("krfb");
+        setIconByName(QStringLiteral("krfb"));
         setToolTipTitle(i18n("Desktop Sharing - connected with %1", client->name()));
         setStatus(KStatusNotifierItem::Active);
     } else { //Nth client connected, N != 1
@@ -129,7 +129,7 @@ void TrayIcon::onClientDisconnected(RfbClient* client)
     delete actions;
 
     if (m_clientActions.isEmpty()) {
-        setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
+        setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
         setToolTipTitle(i18n("Desktop Sharing - disconnected"));
         setStatus(KStatusNotifierItem::Passive);
     } else if (m_clientActions.size() == 1) { //clients number dropped back to 1
@@ -143,5 +143,3 @@ void TrayIcon::showAbout()
     KHelpMenu menu;
     menu.aboutApplication();
 }
-
-#include "trayicon.moc"

krfb/trayicon.h

@@ -18,6 +18,8 @@
 #ifndef TRAYICON_H
 #define TRAYICON_H
 
+#include <QHash>
+
 #include <KStatusNotifierItem>
 
 class RfbClient;
@@ -32,7 +34,7 @@ class TrayIcon : public KStatusNotifierItem
 {
     Q_OBJECT
 public:
-    TrayIcon(QWidget *mainWindow);
+    explicit TrayIcon(QWidget *mainWindow);
 
 public Q_SLOTS:
     void onClientConnected(RfbClient *client);

krfb/ui/configframebuffer.ui

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Framebuffer</class>
+ <widget class="QWidget" name="Framebuffer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>418</width>
+    <height>186</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Framebuffer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Preferred frameb&amp;uffer plugin:</string>
+       </property>
+       <property name="buddy">
+        <cstring>cb_preferredFrameBufferPlugin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cb_preferredFrameBufferPlugin">
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="kcfg_preferredFrameBufferPlugin"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="helpText">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When using x11, &lt;span style=&quot; font-weight:600;&quot;&gt;xcb&lt;/span&gt; plugin should be preferred, because it is more performant.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;qt&lt;/span&gt; plugin is a safe fallback, if for some reason others don't work. But also it is very slow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="margin">
+      <number>5</number>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::NoTextInteraction</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>63</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>cb_preferredFrameBufferPlugin</tabstop>
+  <tabstop>kcfg_preferredFrameBufferPlugin</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>