Implemented VNC input for mouse pointer

This implementation has several serious restrictions
What works:
- single clicks
- mouse move

What doesn't, due to FakeInput protocol:
- absolute mouse move
- keyboard

What is not implemented yet but possibly can be:
- drag'n'drop

.gitignore

@@ -1,26 +0,0 @@
-# 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

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

.kde-ci.yml

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

.reviewboardrc

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

CMakeLists.txt

@@ -1,36 +1,22 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 2.8.12)
 
-# KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "22")
-set (RELEASE_SERVICE_VERSION_MINOR "11")
-set (RELEASE_SERVICE_VERSION_MICRO "70")
-set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
+project(krfb)
 
-project(krfb VERSION ${RELEASE_SERVICE_VERSION})
+include(FeatureSummary)
+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets X11Extras)
 
-set(QT_MIN_VERSION 5.15.2)
-set(KF5_MIN_VERSION 5.91.0)
-
-find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
+find_package(ECM 1.7.0 NO_MODULE REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
-include(ECMSetupVersion)
-include(ECMQtDeclareLoggingCategory)
-include(ECMDeprecationSettings)
-include(FeatureSummary)
-include(CheckIncludeFile)
 
-check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
-
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
-
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF5 REQUIRED COMPONENTS
     I18n
+    Completion
     Config
     CoreAddons
     Crash
@@ -40,99 +26,84 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Notifications
     Wallet
     WidgetsAddons
-    WindowSystem
     XmlGui
 )
 
-find_package(X11 REQUIRED)
+find_package(KF5Wayland CONFIG)
+set_package_properties(KF5Wayland PROPERTIES DESCRIPTION "KDE Frameworks Wayland integration package"
+                       URL "https://github.com/KDE/kwayland"
+                       TYPE OPTIONAL
+                       PURPOSE "Required for wayland integration with KWin server"
+                      )
 
-find_package(XCB REQUIRED COMPONENTS
-    XCB
-    RENDER
-    SHAPE
-    XFIXES
-    DAMAGE
-    SHM
-    IMAGE
-)
+find_package(epoxy)
+set_package_properties(epoxy PROPERTIES DESCRIPTION "libepoxy"
+                       URL "http://github.com/anholt/libepoxy"
+                       TYPE OPTIONAL
+                       PURPOSE "OpenGL dispatch library for GBM backend"
+                      )
+
+find_package(Libdrm)
+set_package_properties(Libdrm PROPERTIES DESCRIPTION "Libdrm"
+                       TYPE OPTIONAL
+                       PURPOSE "Required for GBM access to compositor buffers on Wayland"
+                      )
+
+set(HAVE_DRM FALSE)
+if(KF5Wayland_FOUND AND Libdrm_FOUND AND epoxy_FOUND)
+    set(HAVE_DRM TRUE)
+endif()
+
+find_package(gbm)
+set_package_properties(gbm PROPERTIES TYPE OPTIONAL PURPOSE "Required for egl ouput of drm backend.")
+set(HAVE_GBM FALSE)
+if(HAVE_DRM AND gbm_FOUND)
+    set(HAVE_GBM TRUE)
+endif()
+
+
+find_package(X11 REQUIRED)
 
 if(WIN32)
     set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
     set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)
-
-ecm_set_disabled_deprecation_versions(
-    QT 5.15.2
-    KF 5.91
-)
-
+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}
+)
+
 find_package(LibVNCServer REQUIRED)
 
-
-option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
-if(NOT DISABLE_PIPEWIRE)
-    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
-endif()
-add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugin")
-find_package(PlasmaWaylandProtocols 1.5.0)
-
-if(PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
-    find_package(KF5Wayland ${KF5_MIN_VERSION})
-    find_package(QtWaylandScanner REQUIRED)
-    find_package(Qt5WaylandClient)
-    find_package(Qt5XkbCommonSupport)
-    find_package(Wayland REQUIRED COMPONENTS Client)
-endif()
-
-find_package(gbm)
-set_package_properties(gbm PROPERTIES
-    TYPE OPTIONAL
-    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
-)
-
-find_package(EGL)
-set_package_properties(EGL PROPERTIES
-    TYPE OPTIONAL
-    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
-)
-
-find_package(epoxy)
-set_package_properties(epoxy PROPERTIES DESCRIPTION "libepoxy"
-    URL "https://github.com/anholt/libepoxy"
-    TYPE OPTIONAL
-    PURPOSE "Required for dma-buf support in pipewire screencast plugin."
-)
-
-if(EGL_FOUND AND gbm_FOUND AND epoxy_FOUND)
-  set (HAVE_DMA_BUF TRUE)
+if (HAVE_XDAMAGE)
+set(X11_Xdamage_FOUND 1)
 else()
-  set (HAVE_DMA_BUF FALSE)
+set(X11_Xdamage_FOUND 0)
+endif()
+if (HAVE_XSHM)
+set(X11_XShm_FOUND 1)
+else()
+set(X11_XShm_FOUND 0)
 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"
 )
 
-add_subdirectory(events)
+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(krfb)
 add_subdirectory(framebuffers)
+add_subdirectory(events)
 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

@@ -1,128 +0,0 @@
-{
-    "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

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

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/FindLibdrm.cmake

@@ -0,0 +1,126 @@
+#.rst:
+# FindLibdrm
+# -------
+#
+# Try to find libdrm on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Libdrm_FOUND``
+#     True if (the requested version of) libdrm is available
+# ``Libdrm_VERSION``
+#     The version of libdrm
+# ``Libdrm_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Libdrm::Libdrm``
+#     target
+# ``Libdrm_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Libdrm_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Libdrm_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Libdrm::Libdrm``
+#     The libdrm library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindLibdrm.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 FindLibdrm.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_Libdrm QUIET libdrm)
+
+    set(Libdrm_DEFINITIONS ${PKG_Libdrm_CFLAGS_OTHER})
+    set(Libdrm_VERSION ${PKG_Libdrm_VERSION})
+
+    find_path(Libdrm_INCLUDE_DIR
+        NAMES
+            xf86drm.h
+        HINTS
+            ${PKG_Libdrm_INCLUDE_DIRS}
+    )
+    find_library(Libdrm_LIBRARY
+        NAMES
+            drm
+        HINTS
+            ${PKG_Libdrm_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Libdrm
+        FOUND_VAR
+            Libdrm_FOUND
+        REQUIRED_VARS
+            Libdrm_LIBRARY
+            Libdrm_INCLUDE_DIR
+        VERSION_VAR
+            Libdrm_VERSION
+    )
+
+    if(Libdrm_FOUND AND NOT TARGET Libdrm::Libdrm)
+        add_library(Libdrm::Libdrm UNKNOWN IMPORTED)
+        set_target_properties(Libdrm::Libdrm PROPERTIES
+            IMPORTED_LOCATION "${Libdrm_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${Libdrm_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/libdrm"
+        )
+    endif()
+
+    mark_as_advanced(Libdrm_LIBRARY Libdrm_INCLUDE_DIR)
+
+    # compatibility variables
+    set(Libdrm_LIBRARIES ${Libdrm_LIBRARY})
+    set(Libdrm_INCLUDE_DIRS ${Libdrm_INCLUDE_DIR})
+    set(Libdrm_VERSION_STRING ${Libdrm_VERSION})
+
+else()
+    message(STATUS "FindLibdrm.cmake cannot find libdrm on Windows systems.")
+    set(Libdrm_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(Libdrm PROPERTIES
+    URL "https://wiki.freedesktop.org/dri/"
+    DESCRIPTION "Userspace interface to kernel DRM services."
+)

cmake/modules/Findepoxy.cmake

@@ -0,0 +1,56 @@
+# - Try to find libepoxy
+# Once done this will define
+#
+#  epoxy_FOUND        - System has libepoxy
+#  epoxy_LIBRARY      - The libepoxy library
+#  epoxy_INCLUDE_DIR  - The libepoxy include dir
+#  epoxy_DEFINITIONS  - Compiler switches required for using libepoxy
+#  epoxy_HAS_GLX      - Whether GLX support is available
+
+# Copyright (c) 2014 Fredrik Höglund <fredrik@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+if (NOT WIN32)
+  find_package(PkgConfig)
+  pkg_check_modules(PKG_epoxy QUIET epoxy)
+
+  set(epoxy_DEFINITIONS ${PKG_epoxy_CFLAGS})
+
+  find_path(epoxy_INCLUDE_DIR NAMES epoxy/gl.h HINTS ${PKG_epoxy_INCLUDEDIR} ${PKG_epoxy_INCLUDE_DIRS})
+  find_library(epoxy_LIBRARY  NAMES epoxy      HINTS ${PKG_epoxy_LIBDIR} ${PKG_epoxy_LIBRARY_DIRS})
+  find_file(epoxy_GLX_HEADER NAMES epoxy/glx.h HINTS ${epoxy_INCLUDE_DIR})
+
+  if (epoxy_GLX_HEADER STREQUAL "epoxy_GLX_HEADER-NOTFOUND")
+    set(epoxy_HAS_GLX FALSE CACHE BOOL "whether glx is available")
+  else ()
+    set(epoxy_HAS_GLX TRUE CACHE BOOL "whether glx is available")
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(epoxy DEFAULT_MSG epoxy_LIBRARY epoxy_INCLUDE_DIR)
+
+  mark_as_advanced(epoxy_INCLUDE_DIR epoxy_LIBRARY epoxy_HAS_GLX)
+endif()

cmake/modules/Findgbm.cmake

@@ -30,10 +30,31 @@
 # 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>
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #=============================================================================
 
 if(CMAKE_VERSION VERSION_LESS 2.8.12)
@@ -99,6 +120,6 @@ endif()
 
 include(FeatureSummary)
 set_package_properties(gbm PROPERTIES
-    URL "https://www.mesa3d.org"
+    URL "http://www.mesa3d.org"
     DESCRIPTION "Mesa gbm library."
 )

dbus/xdp_dbus_remotedesktop_interface.xml

@@ -1,374 +0,0 @@
-<?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 1 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. It can also be used together with a screen cast session (see
-        org.freedesktop.portal.ScreenCast), but may only be started and stopped
-        with this interface.
-        To also get a screen content, call the
-        #org.freedesktop.ScreenCast.SelectSources with the
-        #org.freedesktop.Session object created with this method.
-        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>type u</term>
-            <listitem><para>
-              Bitmask of what device types to request remote controlling of.
-              Default is all.
-            </para></listitem>
-          </varlistentry>
-        </variablelist>
-        For available source 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>
-        </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 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="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>
-    <!--
-        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

@@ -1,186 +0,0 @@
-<?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 ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR krfb)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/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="https://bugs.kde.org">https://bugs.kde.org</ulink>.
+url="http://bugs.kde.org">http://bugs.kde.org</ulink>. 
 </para>
 </chapter>
 

events/CMakeLists.txt

@@ -1,6 +1,4 @@
-add_subdirectory(x11)
-
-# Makes sense to use only when PW framebuffer is used
-if (${PipeWire_FOUND})
-    add_subdirectory(xdp)
+add_subdirectory (x11)
+if(HAVE_GBM)
+    add_subdirectory (fakeinput)
 endif()

events/fakeinput/CMakeLists.txt

@@ -0,0 +1,25 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_events_gbm_SRCS
+     fakeinputevents.cpp
+     fakeinputeventsplugin.cpp
+)
+
+add_library(krfb_events_fakeinput
+ MODULE
+                 ${krfb_events_gbm_SRCS}
+)
+
+target_link_libraries (krfb_events_fakeinput
+                       ${GBM_XTest_LIB}
+                       KF5::CoreAddons
+                       KF5::WaylandClient
+                       KF5::I18n
+                       krfbprivate
+)
+
+install (TARGETS krfb_events_fakeinput
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+)

events/fakeinput/fakeinputevents.cpp

@@ -0,0 +1,118 @@
+/*
+   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 "fakeinputevents.h"
+// Qt
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QGlobalStatic>
+// KDE
+#include <KLocalizedString>
+// KWayland
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/fakeinput.h>
+
+class EventData
+{
+public:
+    EventData() = default;
+
+    //mouse
+    int buttonMask = 0;
+    int oldX = 0;
+    int oldY = 0;
+};
+
+FakeInputEventHandler::FakeInputEventHandler()
+    : EventHandler(), m_eventData(new EventData())
+{
+    initWaylandConnection();
+}
+
+void FakeInputEventHandler::initWaylandConnection()
+{
+    using namespace KWayland::Client;
+    ConnectionThread *conn = ConnectionThread::fromApplication(this);
+    Registry *registry = new Registry(this);
+    registry->create(conn);
+    connect(registry, &Registry::fakeInputAnnounced, this,
+        [this, registry] (qint32 name, qint32 version) {
+            m_interface = registry->createFakeInput(name, version, this);
+        }
+    );
+    registry->setup();
+}
+
+void FakeInputEventHandler::authIfNeeded()
+{
+    if (!m_authRequested) {
+        m_interface->authenticate(i18n("Krfb"), i18n("Remote VNC input"));
+        m_authRequested = true;
+    }
+}
+
+void FakeInputEventHandler::handleKeyboard(bool down, rfbKeySym keySym)
+{
+    if (!m_interface)
+        return;
+
+    authIfNeeded();
+
+    // TODO: implement button handling
+    // both in FakeInput interface and here
+    Q_UNUSED(down)
+    Q_UNUSED(keySym)
+}
+
+void FakeInputEventHandler::handlePointer(int buttonMask, int x, int y)
+{
+    if (!m_interface)
+        return;
+
+    authIfNeeded();
+
+    int oldMask = m_eventData->buttonMask;
+    int oldX = m_eventData->oldX;
+    int oldY = m_eventData->oldY;
+
+    if (!(oldMask & 1) && buttonMask & 1) { // single left click
+        m_interface->requestPointerButtonClick(Qt::LeftButton);
+    }
+    if (!(oldMask & 2) && buttonMask & 2) { // single right click
+        m_interface->requestPointerButtonClick(Qt::RightButton);
+    }
+    if (!(oldMask & 4) && buttonMask & 4) { // single middle click
+        m_interface->requestPointerButtonClick(Qt::MiddleButton);
+    }
+    if (!(oldMask & 8) && buttonMask & 8) { // wheel up
+        m_interface->requestPointerAxis(Qt::Vertical, +10);
+    }
+    if (!(oldMask & 16) && buttonMask & 16) { // wheel down
+        m_interface->requestPointerAxis(Qt::Vertical, -10);
+    }
+
+    if (oldX != x || oldY != y) {
+        m_interface->requestPointerMove(QSizeF(x - oldX, y - oldY));
+    }
+
+    m_eventData->buttonMask = buttonMask;
+}

events/fakeinput/fakeinputevents.h

@@ -0,0 +1,54 @@
+/*
+   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_GBMEVENTS_H
+#define EVENTS_GBMEVENTS_H
+
+#include "../../krfb/events.h"
+
+#include <QScopedPointer>
+
+namespace KWayland
+{
+namespace Client
+{
+class FakeInput;
+}
+}
+
+class EventData;
+
+class FakeInputEventHandler : public EventHandler
+{
+public:
+    FakeInputEventHandler();
+    virtual void handleKeyboard(bool down, rfbKeySym key);
+    virtual void handlePointer(int buttonMask, int x, int y);
+private:
+    void initWaylandConnection();
+    void authIfNeeded();
+
+    QScopedPointer<EventData> m_eventData;
+    KWayland::Client::FakeInput *m_interface = nullptr;
+    bool m_authRequested = false;
+};
+
+#endif

events/fakeinput/fakeinputeventsplugin.cpp

@@ -1,7 +1,6 @@
-/*
-   This file is part of the KDE project
+/* This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   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
@@ -19,24 +18,24 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "xdpeventsplugin.h"
+#include "fakeinputeventsplugin.h"
 
-#include "xdpevents.h"
+#include "fakeinputevents.h"
 
 #include <KPluginFactory>
 
-K_PLUGIN_CLASS(XdpEventsPlugin)
+K_PLUGIN_FACTORY_WITH_JSON(FakeInputEventsPluginFactory, "krfb_events_fakeinput.json",
+               registerPlugin<FakeInputEventsPlugin>();)
 
-XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
+FakeInputEventsPlugin::FakeInputEventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)
 {
 }
 
-EventHandler *XdpEventsPlugin::eventHandler()
+EventHandler *FakeInputEventsPlugin::eventHandler()
 {
     // works only under Wayland
-    return new XdpEventHandler();
+    return new FakeInputEventHandler();
 }
 
-#include "xdpeventsplugin.moc"
-
+#include "fakeinputeventsplugin.moc"

events/fakeinput/fakeinputeventsplugin.h

@@ -1,7 +1,6 @@
-/*
-   This file is part of the KDE project
+/* This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   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
@@ -19,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
-#define KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
+#ifndef KRFB_EVENTS_GBM_GBMEVENTSPLUGIN_H
+#define KRFB_EVENTS_GBM_GBMEVENTSPLUGIN_H
 
 #include "eventsplugin.h"
 
@@ -28,18 +27,19 @@
 
 class EventHandler;
 
-class XdpEventsPlugin : public EventsPlugin
+class FakeInputEventsPlugin : public EventsPlugin
 {
     Q_OBJECT
+
 public:
-    XdpEventsPlugin(QObject *parent, const QVariantList &args);
+    FakeInputEventsPlugin(QObject *parent, const QVariantList &args);
+    virtual ~FakeInputEventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 
 private:
-    Q_DISABLE_COPY(XdpEventsPlugin)
+    Q_DISABLE_COPY(FakeInputEventsPlugin)
 };
 
 
 #endif  // Header guard
-

events/fakeinput/krfb_events_fakeinput.desktop

@@ -0,0 +1,17 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=KWin FakeInput based event handler for KRfb
+Comment[ru]=Обработчик событий для KRfb на базе интерфейса FakeInput KWin
+Comment[x-test]=KWin FakeInput based event handler for KRfbxx
+Name=KWin FakeInput based event handler for KRfb
+Name[ru]=Обработчик событий для KRfb на базе интерфейса FakeInput KWin
+Name[x-test]=xxKWin FakeInput based event handler for KRfbxx
+Type=Service
+ServiceTypes=krfb/events
+
+X-KDE-Library=krfb_events_fakeinput
+X-KDE-PluginInfo-Name=fakeinput
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true

events/fakeinput/krfb_events_fakeinput.json

@@ -0,0 +1,17 @@
+{
+    "Encoding": "UTF-8",
+    "KPlugin": {
+        "Description": "KWin FakeInput based event handler for KRfb",
+        "Description[x-test]": "xxKWin FakeInput based event handler for KRfbxx",
+        "EnabledByDefault": true,
+        "Id": "fakeinput",
+        "License": "GPL",
+        "Name": "KWin FakeInput Event handler for KRfb",
+        "Name[x-test]": "xxKWin FakeInput Event handler for KRfbxx",
+        "ServiceTypes": [
+            "krfb/events"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}

events/x11/CMakeLists.txt

@@ -7,13 +7,17 @@ set (krfb_events_x11_SRCS
      x11eventsplugin.cpp
 )
 
-add_library (krfb_events_x11 MODULE ${krfb_events_x11_SRCS})
+add_library(krfb_events_x11
+ MODULE
+                 ${krfb_events_x11_SRCS}
+)
 
 target_link_libraries (krfb_events_x11
                        ${X11_XTest_LIB}
                        KF5::CoreAddons
                        krfbprivate
 )
-set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)
 
-install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)
+install (TARGETS krfb_events_x11
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+)

events/x11/krfb_events_x11.desktop

@@ -0,0 +1,17 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=X11 XFakeInput based event handler for KRfb
+Comment[ru]=Обработчик событий для KRfb на базе XFakeInput
+Comment[x-test]=xxX11 XFakeInput based event handler for KRfbxx
+Name=X11 XFakeInput based event handler for KRfb
+Name[ru]=Обработчик событий для KRfb на базе XFakeInput
+Name[x-test]=xxX11 XFakeInput based event handler for KRfbxx
+Type=Service
+ServiceTypes=krfb/events
+
+X-KDE-Library=krfb_events_x11
+X-KDE-PluginInfo-Name=x11
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true

events/x11/krfb_events_x11.json

@@ -0,0 +1,17 @@
+{
+    "Encoding": "UTF-8",
+    "KPlugin": {
+        "Description": "X11 XFakeInput based event handler for KRfb",
+        "Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx",
+        "EnabledByDefault": true,
+        "Id": "x11",
+        "License": "GPL",
+        "Name": "X11 Event handler for KRfb",
+        "Name[x-test]": "xxX11 Event handler for KRfbxx",
+        "ServiceTypes": [
+            "krfb/events"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}

events/x11/x11events.cpp

@@ -1,7 +1,7 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2016 by Oleg Chernovskiy <kanedias@xaker.ru>
+   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
@@ -30,8 +30,6 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XTest.h>
 
-#include <QX11Info>
-
 enum {
     LEFTSHIFT = 1,
     RIGHTSHIFT = 2,
@@ -44,18 +42,16 @@ 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;
+    Display *dpy;
+    signed char modifiers[0x100];
+    KeyCode keycodes[0x100];
+    KeyCode leftShiftCode;
+    KeyCode rightShiftCode;
+    KeyCode altGrCode;
+    char modifierState;
 
     //mouse
-    int buttonMask = 0;
-    int x = 0;
-    int y = 0;
+    int buttonMask;
 
 private:
     void init();
@@ -70,9 +66,9 @@ EventData::EventData()
 
 void EventData::init()
 {
+    dpy = QX11Info::display();
     buttonMask = 0;
 
-    dpy = QX11Info::display();
     //initialize keycodes
     KeySym key, *keymap;
     int i, j, minkey, maxkey, syms_per_keycode;
@@ -147,64 +143,58 @@ 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);
+    ADJUSTMOD(XK_Shift_L, LEFTSHIFT);
+    ADJUSTMOD(XK_Shift_R, RIGHTSHIFT);
+    ADJUSTMOD(XK_Mode_switch, ALTGR);
 
-        if (keySym >= ' ' && keySym < 0x100) {
-            KeyCode k;
+    if (keySym >= ' ' && keySym < 0x100) {
+        KeyCode k;
 
-            if (down) {
-                tweakModifiers(data->modifiers[keySym], True);
-            }
+        if (down) {
+            tweakModifiers(data->modifiers[keySym], True);
+        }
 
-            k = data->keycodes[keySym];
+        k = data->keycodes[keySym];
 
-            if (k != NoSymbol) {
-                XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
-            }
+        if (k != NoSymbol) {
+            XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
+        }
 
-            if (down) {
-                tweakModifiers(data->modifiers[keySym], False);
-            }
-        } else {
-            KeyCode k = XKeysymToKeycode(data->dpy, keySym);
+        if (down) {
+            tweakModifiers(data->modifiers[keySym], False);
+        }
+    } else {
+        KeyCode k = XKeysymToKeycode(data->dpy, keySym);
 
-            if (k != NoSymbol) {
-                XTestFakeKeyEvent(data->dpy, k, down, CurrentTime);
-            }
+        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()) {
-        QDesktopWidget *desktopWidget = QApplication::desktop();
+    QDesktopWidget *desktopWidget = QApplication::desktop();
 
-        int screen = desktopWidget->screenNumber();
+    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;
+    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;
 }
+
+#include "x11events.moc"
+

events/x11/x11events.h

@@ -33,9 +33,8 @@ public:
     {
     };
 
-    void handleKeyboard(bool down, rfbKeySym key) override;
-    void handlePointer(int buttonMask, int x, int y) override;
+    virtual void handleKeyboard(bool down, rfbKeySym key);
+    virtual void handlePointer(int buttonMask, int x, int y);
 };
 
 #endif
-

events/x11/x11eventsplugin.cpp

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

events/x11/x11eventsplugin.h

@@ -29,8 +29,10 @@ class EventHandler;
 class X11EventsPlugin : public EventsPlugin
 {
     Q_OBJECT
+
 public:
     X11EventsPlugin(QObject *parent, const QVariantList &args);
+    virtual ~X11EventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 
@@ -40,3 +42,4 @@ private:
 
 
 #endif  // Header guard
+

events/xdp/CMakeLists.txt

@@ -1,28 +0,0 @@
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set (krfb_events_xdp_SRCS
-     xdpevents.cpp
-     xdpeventsplugin.cpp
-)
-
-qt5_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
-                       KF5::CoreAddons
-                       KF5::I18n
-                       Qt5::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

@@ -1,124 +0,0 @@
-/*
-   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 <QDesktopWidget>
-#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)
-{
-    // TODO: implement button handling
-    // both in FakeInput interface and here
-    Q_UNUSED(down)
-    Q_UNUSED(keySym)
-}
-
-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;
-        QVector<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;
-    }
-}

framebuffers/CMakeLists.txt

@@ -1,9 +1,5 @@
 add_subdirectory (qt)
-
-if (${XCB_DAMAGE_FOUND} AND ${XCB_SHM_FOUND} AND ${XCB_IMAGE_FOUND})
-    add_subdirectory (xcb)
-endif()
-
-if (${PipeWire_FOUND})
-    add_subdirectory(pipewire)
+add_subdirectory (x11)
+if(HAVE_GBM)
+    add_subdirectory (gbm)
 endif()

framebuffers/gbm/CMakeLists.txt

@@ -0,0 +1,29 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_gbm_SRCS
+     logging.cpp
+     gbmframebuffer.cpp
+     gbmframebufferplugin.cpp
+)
+
+add_library(krfb_framebuffer_gbm
+ MODULE
+                 ${krfb_framebuffer_gbm_SRCS}
+)
+
+target_link_libraries (krfb_framebuffer_gbm
+                       Qt5::Core
+                       Qt5::Gui
+                       KF5::CoreAddons
+                       KF5::WaylandClient
+                       ${epoxy_LIBRARY}
+                       Libdrm::Libdrm
+                       gbm::gbm
+                       krfbprivate
+)
+
+install (TARGETS krfb_framebuffer_gbm
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+)

framebuffers/gbm/gbmframebuffer.cpp

@@ -0,0 +1,330 @@
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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 "gbmframebuffer.h"
+#include "logging.h"
+#include "gbmframebuffer.moc"
+// KWayland
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/remote_access.h>
+// Qt
+#include <QApplication>
+#include <QScreen>
+#include <QtCore/QThread>
+// system
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <libdrm/drm_mode.h>
+
+static QString formatGLError(GLenum err)
+{
+    switch(err) {
+    case GL_NO_ERROR:          return QStringLiteral("GL_NO_ERROR");
+    case GL_INVALID_ENUM:      return QStringLiteral("GL_INVALID_ENUM");
+    case GL_INVALID_VALUE:     return QStringLiteral("GL_INVALID_VALUE");
+    case GL_INVALID_OPERATION: return QStringLiteral("GL_INVALID_OPERATION");
+    case GL_STACK_OVERFLOW:    return QStringLiteral("GL_STACK_OVERFLOW");
+    case GL_STACK_UNDERFLOW:   return QStringLiteral("GL_STACK_UNDERFLOW");
+    case GL_OUT_OF_MEMORY:     return QStringLiteral("GL_OUT_OF_MEMORY");
+    default: return QLatin1String("0x") + QString::number(err, 16);
+    }
+}
+
+GbmFrameBuffer::GbmFrameBuffer(WId id, QObject *parent)
+    : FrameBuffer(id, parent)
+{
+
+    // TODO: check out the case when new resolution was applied on KWin side
+    // TODO: check possibility of multi-screen configuration
+    QSize size = QApplication::screens().first()->size();
+    m_img = new QImage(size, QImage::Format_ARGB32);
+    fb = reinterpret_cast<char*>(m_img->bits());
+
+    // open DRM device
+    setupDrm();
+
+    // get EGL client extensions
+    initClientEglExtensions();
+
+    // initialize EGL context and display
+    initEgl();
+
+    // get KWin connection
+    initWaylandConnection();
+}
+
+void GbmFrameBuffer::setupDrm()
+{
+    m_drmFd = open("/dev/dri/card0", O_RDWR);
+    m_gbmDevice = gbm_create_device(m_drmFd);
+    if(!m_gbmDevice) {
+        qCCritical(KRFB_GBM) << "Cannot create GBM device:" << strerror(errno);
+        m_valid = false;
+        return;
+    }
+}
+
+// cloned from KWin AbstractEglBackend
+void GbmFrameBuffer::initClientEglExtensions()
+{
+    if(!m_valid)
+        return;
+
+    // Get the list of client extensions
+    const char* clientExtensionsCString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+    const QByteArray clientExtensionsString = QByteArray::fromRawData(clientExtensionsCString, qstrlen(clientExtensionsCString));
+    if (clientExtensionsString.isEmpty()) {
+        // If eglQueryString() returned NULL, the implementation doesn't support
+        // EGL_EXT_client_extensions. Expect an EGL_BAD_DISPLAY error.
+        qCCritical(KRFB_GBM) << "No client extensions defined!" << formatGLError(eglGetError());
+        m_valid = false;
+    }
+
+    m_egl.extensions = clientExtensionsString.split(' ');
+}
+
+void GbmFrameBuffer::initEgl()
+{
+    if(!m_valid)
+        return;
+
+    // Use eglGetPlatformDisplayEXT() to get the display pointer
+    // if the implementation supports it.
+    if (!m_egl.extensions.contains(QByteArrayLiteral("EGL_EXT_platform_base")) ||
+            !m_egl.extensions.contains(QByteArrayLiteral("EGL_MESA_platform_gbm"))) {
+        qCCritical(KRFB_GBM) << "One of required EGL extensions is missing";
+        m_valid = false;
+        return;
+    }
+
+    m_egl.display = eglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, m_gbmDevice, nullptr);
+    if (m_egl.display == EGL_NO_DISPLAY) {
+        qCCritical(KRFB_GBM) << "Error during obtaining EGL display:" << formatGLError(eglGetError());
+        m_valid = false;
+        return;
+    }
+
+    EGLint major, minor;
+    if (eglInitialize(m_egl.display, &major, &minor) == EGL_FALSE) {
+        qCCritical(KRFB_GBM) << "Error during eglInitialize:" << formatGLError(eglGetError());
+        m_valid = false;
+        return;
+    }
+
+    if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE) {
+        qCCritical(KRFB_GBM) << "bind OpenGL API failed";
+        m_valid = false;
+        return;
+    }
+    qCDebug(KRFB_GBM) << "Egl Initialize succeeded";
+    qCDebug(KRFB_GBM) << QString("EGL version: %1.%2").arg(major).arg(minor);
+
+    m_egl.context = eglCreateContext(m_egl.display, nullptr, EGL_NO_CONTEXT, nullptr);
+    if(m_egl.context == EGL_NO_CONTEXT) {
+        qCCritical(KRFB_GBM) << "Couldn't create EGL context:" << formatGLError(eglGetError());
+        m_valid = false;
+    }
+}
+
+void GbmFrameBuffer::initWaylandConnection()
+{
+    if(!m_valid)
+        return;
+
+    using namespace KWayland::Client;
+    ConnectionThread *conn = ConnectionThread::fromApplication(this);
+    if(!conn) { // trying to instantiate wayland not having a wayland platform?
+        m_valid = false;
+        return;
+    }
+
+    // what do we do if server dies?
+    // since we use foreign connection, the whole application will be disconnected,
+    // not only plugin, let's assume application will die anyway
+
+    Registry *registry = new Registry(this);
+    registry->create(conn);
+    connect(registry, &Registry::remoteAccessManagerAnnounced, this,
+        [this, registry] (qint32 name, qint32 version) {
+            m_interface = registry->createRemoteAccessManager(name, version, this);
+            connect(m_interface, &RemoteAccessManager::bufferReady, this, &GbmFrameBuffer::obtainBuffer);
+        }
+    );
+    registry->setup();
+}
+
+void GbmFrameBuffer::obtainBuffer(KWayland::Client::RemoteBuffer *rbuf)
+{
+    using namespace KWayland::Client;
+    connect(rbuf, &RemoteBuffer::paramsObtained, this,
+        [this, rbuf] (qint32 fd, quint32 width, quint32 height, quint32 stride, quint32 format) {
+            updateHandle(fd, width, height, stride, format);
+            // deleteLater() is not working due to QTBUG-18434 (or similar)
+            // TODO: try with Qt 5.8.0
+            delete rbuf;
+        }
+    );
+}
+
+void GbmFrameBuffer::updateHandle(qint32 gbmHandle, quint32 width, quint32 height, quint32 stride, quint32 format)
+{
+    qCDebug(KRFB_GBM) << QString("Incoming GBM fd %1, %2x%3, stride %4, fourcc 0x%5")
+        .arg(gbmHandle).arg(width).arg(height).arg(stride).arg(QString::number(format, 16));
+
+    if(!gbm_device_is_format_supported(m_gbmDevice, format, GBM_BO_USE_SCANOUT)) {
+        qCCritical(KRFB_GBM) << "GBM format is not supported by device!";
+        return;
+    }
+
+    if(this->width() != (int) width || this->height() != (int) height) {
+        qCCritical(KRFB_GBM) << QString("Size of GBM buffer (%3x%4) is not equal to expected (%1x%2)!")
+            .arg(this->width()).arg(this->height()).arg(width).arg(height);
+        return;
+    }
+
+    // import GBM buffer that was passed from KWin
+    gbm_import_fd_data importInfo = {gbmHandle, width, height, stride, format};
+    gbm_bo *imported = gbm_bo_import(m_gbmDevice, GBM_BO_IMPORT_FD, &importInfo, GBM_BO_USE_SCANOUT);
+    if(!imported) {
+        qCCritical(KRFB_GBM) << "Cannot import passed GBM fd:" << strerror(errno);
+        return;
+    }
+
+    // bind context to render thread
+    eglMakeCurrent(m_egl.display, EGL_NO_SURFACE, EGL_NO_SURFACE, m_egl.context);
+
+    // create EGL image from imported BO
+    EGLImageKHR image = eglCreateImageKHR(m_egl.display, NULL, EGL_NATIVE_PIXMAP_KHR, imported, NULL);
+    if (image == EGL_NO_IMAGE_KHR) {
+        qCCritical(KRFB_GBM) << "Error creating EGLImageKHR" << formatGLError(glGetError());
+        return;
+    }
+    // create GL 2D texture for framebuffer
+    GLuint texture;
+    glGenTextures(1, &texture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
+
+    // bind framebuffer to copy pixels from
+    GLuint framebuffer;
+    glGenFramebuffers(1, &framebuffer);
+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
+    const GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_FRAMEBUFFER_COMPLETE) {
+        qCCritical(KRFB_GBM) << "glCheckFramebufferStatus failed:" << formatGLError(glGetError());
+        glDeleteTextures(1, &texture);
+        glDeleteFramebuffers(1, &framebuffer);
+        eglDestroyImageKHR(m_egl.display, image);
+        return;
+    }
+
+    glViewport(0, 0, width, height);
+    glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, m_img->bits());
+    tiles.append(m_img->rect());
+
+    // unbind all
+    glDeleteTextures(1, &texture);
+    glDeleteFramebuffers(1, &framebuffer);
+    eglDestroyImageKHR(m_egl.display, image);
+
+    // from this point buffer object can be safely freed
+    close(gbmHandle);
+}
+
+GbmFrameBuffer::~GbmFrameBuffer()
+{
+    fb = nullptr;
+
+    delete m_img;
+    m_img = nullptr;
+
+    if(m_egl.context != EGL_NO_CONTEXT) {
+        eglDestroyContext(m_egl.display, m_egl.context);
+    }
+
+    if(m_gbmDevice) {
+        gbm_device_destroy(m_gbmDevice);
+    }
+
+    if(m_drmFd) {
+        close(m_drmFd);
+    }
+}
+
+int GbmFrameBuffer::depth()
+{
+    return m_img->depth();
+}
+
+int GbmFrameBuffer::height()
+{
+    return m_img->height();
+}
+
+int GbmFrameBuffer::width()
+{
+    return m_img->width();
+}
+
+void GbmFrameBuffer::getServerFormat(rfbPixelFormat &format)
+{
+    format.bitsPerPixel = 32;
+    format.depth = 32;
+    format.trueColour = true;
+
+    format.bigEndian = false;
+
+    // GL images have different shift
+    format.redShift = 0;
+    format.greenShift = 8;
+    format.blueShift = 16;
+    format.redMax   = 0xff;
+    format.greenMax = 0xff;
+    format.blueMax  = 0xff;
+}
+
+void GbmFrameBuffer::updateFrameBuffer()
+{
+    // do nothing
+}
+
+int GbmFrameBuffer::paddedWidth()
+{
+    return m_img->bytesPerLine();
+}
+
+void GbmFrameBuffer::startMonitor()
+{
+    // not needed - we get events as a signals from Wayland interface
+    // no other updates are possible
+}
+
+void GbmFrameBuffer::stopMonitor()
+{
+
+}

framebuffers/gbm/gbmframebuffer.h

@@ -0,0 +1,85 @@
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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_GBM_GBMFRAMEBUFFER_H
+#define KRFB_FRAMEBUFFER_GBM_GBMFRAMEBUFFER_H
+
+#include "framebuffer.h"
+// Qt
+#include <QImage>
+// system
+#include <gbm.h>
+#include <epoxy/egl.h>
+#include <epoxy/gl.h>
+
+namespace KWayland
+{
+namespace Client
+{
+class RemoteAccessManager;
+class RemoteBuffer;
+}
+}
+
+/**
+    @author Oleg Chernovskiy <adonai@xaker.ru>
+*/
+class GbmFrameBuffer : public FrameBuffer
+{
+    Q_OBJECT
+public:
+    explicit GbmFrameBuffer(WId id, QObject *parent = 0);
+
+    ~GbmFrameBuffer();
+
+    int depth() override;
+    int height() override;
+    int width() override;
+    int paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;
+    inline bool isValid() { return m_valid; };
+
+public Q_SLOTS:
+    void updateFrameBuffer();
+
+private:
+    void initWaylandConnection();
+    void setupDrm();
+    void initClientEglExtensions();
+    void initEgl();
+    void obtainBuffer(KWayland::Client::RemoteBuffer *rbuf);
+    void updateHandle(qint32 gbmHandle, quint32 width, quint32 height, quint32 stride, quint32 format);
+
+    qint32 m_drmFd = 0; // for GBM buffer mmap
+    gbm_device *m_gbmDevice = nullptr; // for passed GBM buffer retrieval
+    struct {
+        QList<QByteArray> extensions;
+        EGLDisplay display = EGL_NO_DISPLAY;
+        EGLContext context = EGL_NO_CONTEXT;
+    } m_egl;
+
+    KWayland::Client::RemoteAccessManager *m_interface = nullptr;
+    QImage *m_img;
+
+    bool m_valid = true;
+};
+
+#endif

framebuffers/gbm/gbmframebufferplugin.cpp

@@ -0,0 +1,50 @@
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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 "gbmframebufferplugin.h"
+
+#include "gbmframebuffer.h"
+
+#include <KPluginFactory>
+
+K_PLUGIN_FACTORY_WITH_JSON(GbmFrameBufferPluginFactory, "krfb_framebuffer_gbm.json",
+               registerPlugin<GbmFrameBufferPlugin>();)
+
+GbmFrameBufferPlugin::GbmFrameBufferPlugin(QObject *parent, const QVariantList &args)
+    : FrameBufferPlugin(parent, args)
+{
+}
+
+GbmFrameBufferPlugin::~GbmFrameBufferPlugin()
+{
+}
+
+FrameBuffer *GbmFrameBufferPlugin::frameBuffer(WId id)
+{
+    auto p = new GbmFrameBuffer(id);
+    if (!p->isValid()) {
+        delete p;
+        return nullptr;
+    }
+
+    return p;
+}
+
+#include "gbmframebufferplugin.moc"
+

framebuffers/gbm/gbmframebufferplugin.h

@@ -0,0 +1,45 @@
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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_GBM_GBMFRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_GBM_GBMFRAMEBUFFERPLUGIN_H
+
+#include "framebufferplugin.h"
+
+#include <QWidget>
+
+class FrameBuffer;
+
+class GbmFrameBufferPlugin : public FrameBufferPlugin
+{
+    Q_OBJECT
+
+public:
+    GbmFrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~GbmFrameBufferPlugin();
+
+    FrameBuffer *frameBuffer(WId id) override;
+
+private:
+    Q_DISABLE_COPY(GbmFrameBufferPlugin)
+};
+
+
+#endif  // Header guard
+

framebuffers/gbm/krfb_framebuffer_gbm.json

@@ -0,0 +1,62 @@
+{
+    "Encoding": "UTF-8",
+    "KPlugin": {
+        "Description": "GBM based Framebuffer for KRfb.",
+        "Description[ca@valencia]": "«Framebuffer» basat en GBM per al KRfb.",
+        "Description[ca]": "«Framebuffer» basat en GBM per al KRfb.",
+        "Description[cs]": "Framebuffer založený na GBM pro KRfb.",
+        "Description[de]": "GBM-basierter Framebuffer für KRfb",
+        "Description[es]": "Framebuffer basado en GBM para KRfb.",
+        "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
+        "Description[gl]": "Framebuffer baseado en GBM para KRfb.",
+        "Description[it]": "Framebuffer basato su GBM per KRfb.",
+        "Description[ko]": "KRfb용 GBM 기반 프레임버퍼입니다.",
+        "Description[nl]": "Op GBM gebaseerd framebuffer voor KRfb.",
+        "Description[pl]": "Bufor ramki na podstawie GBM dla KRfb.",
+        "Description[pt]": "'Framebuffer' baseado no GBM para o KRfb.",
+        "Description[pt_BR]": "Framebuffer baseado no GBM para o KRfb.",
+        "Description[sk]": "Framebuffer založený na GBM pre KRfb.",
+        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na GBM",
+        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у",
+        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu GBM‑u",
+        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu GBM‑u",
+        "Description[sr]": "Кадробафер за КРФБ на основу КуТ‑у",
+        "Description[sv]": "X11-rambuffert för Krfb.",
+        "Description[uk]": "Заснований на GBM буфер кадрів для KRfb.",
+        "Description[x-test]": "xxGBM based Framebuffer for KRfb.xx",
+        "Description[zh_CN]": "KRfb 的基于 GBM 的帧缓冲。",
+        "EnabledByDefault": true,
+        "Id": "gbm",
+        "License": "GPL",
+        "Name": "GBM Framebuffer for KRfb",
+        "Name[ast]": "Framebuffer GBM pa KRfb",
+        "Name[ca@valencia]": "«Framebuffer» GBM per al KRfb.",
+        "Name[ca]": "«Framebuffer» GBM per al KRfb.",
+        "Name[cs]": "GBM Framebuffer pro KRfb",
+        "Name[de]": "GBM-Framebuffer für KRfb",
+        "Name[es]": "Framebuffer de GBM para KRfb",
+        "Name[fi]": "QT-kehyspuskuri KRfb:lle",
+        "Name[gl]": "Framebuffer de GBM para KRfb",
+        "Name[it]": "Framebuffer GBM per KRfb",
+        "Name[ko]": "KRfb용 GBM 프레임버퍼",
+        "Name[nl]": "GBM-framebuffer voor KRfb",
+        "Name[pl]": "Bufor ramki GBM dla KRfb",
+        "Name[pt]": "'Framebuffer' do GBM para o KRfb",
+        "Name[pt_BR]": "Framebuffer do GBM para o KRfb",
+        "Name[sk]": "GBM Framebuffer pre KRfb",
+        "Name[sl]": "Slikovni medpomnilnik GBM za KRfb",
+        "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
+        "Name[sr@ijekavianlatin]": "GBM‑ov kadrobafer za KRFB",
+        "Name[sr@latin]": "GBM‑ov kadrobafer za KRFB",
+        "Name[sr]": "КуТ‑ов кадробафер за КРФБ",
+        "Name[sv]": "X11-rambuffert för Krfb",
+        "Name[uk]": "Буфер кадрів на GBM для KRfb",
+        "Name[x-test]": "xxGBM Framebuffer for KRfbxx",
+        "Name[zh_CN]": "KRfb 的 GBM 帧缓冲",
+        "ServiceTypes": [
+            "krfb/framebuffer"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}

framebuffers/gbm/logging.cpp

@@ -0,0 +1,21 @@
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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 "logging.h"
+Q_LOGGING_CATEGORY(KRFB_GBM, "krfb-gbm", QtCriticalMsg)

framebuffers/gbm/logging.h

@@ -1,12 +1,10 @@
-/*
-   This file is part of the KDE project
-
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+/* This file is part of the KDE project
+   Copyright (C) 2016 Oleg Chernovskiy <adonai@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.
+   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
@@ -19,19 +17,10 @@
    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;
-};
+#ifndef KRFB_FRAMEBUFFER_GBM_LOGGING
+#define KRFB_FRAMEBUFFER_GBM_LOGGING
+#include <QDebug>
+#include <QLoggingCategory>
 
+Q_DECLARE_LOGGING_CATEGORY(KRFB_GBM)
 #endif
-
-

framebuffers/pipewire/CMakeLists.txt

@@ -1,64 +0,0 @@
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set (krfb_framebuffer_pw_SRCS
-     pw_framebuffer.cpp
-     pw_framebufferplugin.cpp
-
-     screencasting.cpp
-)
-
-ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
-    PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
-    BASENAME zkde-screencast-unstable-v1
-)
-
-ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
-    HEADER krfb_fb_pipewire_debug.h
-    IDENTIFIER KRFB_FB_PIPEWIRE
-    CATEGORY_NAME krfb.framebuffer.pipewire
-    DESCRIPTION "KRFB PipeWire framebuffer plugin"
-    EXPORT KRFB
-)
-
-qt5_add_dbus_interface(
-   krfb_framebuffer_pw_SRCS
-   ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_screencast_interface.xml
-   xdp_dbus_screencast_interface
-)
-
-qt5_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}
-)
-set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
-
-target_link_libraries(krfb_framebuffer_pw
-                      Qt5::Core
-                      Qt5::Gui
-                      Qt5::DBus
-                      KF5::CoreAddons
-                      KF5::WaylandClient
-                      Wayland::Client
-                      krfbprivate
-                      PkgConfig::PipeWire
-)
-
-if (HAVE_DMA_BUF)
-    target_link_libraries(krfb_framebuffer_pw
-                          ${epoxy_LIBRARIES}
-                          gbm::gbm
-    )
-endif()
-
-set_target_properties(krfb_framebuffer_pw PROPERTIES OUTPUT_NAME pw)
-install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
-)

framebuffers/pipewire/pw_framebuffer.h

@@ -1,63 +0,0 @@
-/* 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, QVariantMap results);
-    void handleXdpDevicesSelected(quint32 code, QVariantMap results);
-    void handleXdpSourcesSelected(quint32 code, QVariantMap results);
-    void handleXdpRemoteDesktopStarted(quint32 code, QVariantMap results);
-
-private:
-    class Private;
-    const QScopedPointer<Private> d;
-};
-
-#endif

framebuffers/pipewire/pw_framebufferplugin.cpp

@@ -1,53 +0,0 @@
-/* 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(PWFrameBufferPlugin)
-
-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

@@ -1,44 +0,0 @@
- /* 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"
-#include <QWidget>
-
-
-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

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

framebuffers/pipewire/screencasting.h

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

framebuffers/qt/CMakeLists.txt

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

framebuffers/qt/krfb_framebuffer_qt.desktop

@@ -0,0 +1,107 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Qt based Framebuffer for KRfb.
+Comment[ast]=Búfer de cuadros basáu en Qt 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]=Búfer de cuadros Qt 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

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

framebuffers/qt/qtframebuffer.cpp

@@ -8,31 +8,29 @@
 */
 
 #include "qtframebuffer.h"
+#include "qtframebuffer.moc"
 
 #include <QTimer>
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QScreen>
-#include <qpa/qplatformnativeinterface.h>
+
 
 const int UPDATE_TIME = 500;
 
-QtFrameBuffer::QtFrameBuffer(QObject *parent)
-    : FrameBuffer(parent)
+QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
+    : FrameBuffer(id, parent)
 {
     QScreen *screen = QGuiApplication::primaryScreen();
-    QPlatformNativeInterface* native = qApp->platformNativeInterface();
-
     if (screen) {
-        win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), screen));
         primaryScreen = screen;
         fbImage = screen->grabWindow(win).toImage();
-        fb = new char[fbImage.sizeInBytes()];
+        fb = new char[fbImage.byteCount()];
     } else {
-        fb = nullptr;
-        primaryScreen = nullptr;
+        fb = Q_NULLPTR;
+        primaryScreen = Q_NULLPTR;
     }
 
     t = new QTimer(this);
@@ -44,7 +42,7 @@ QtFrameBuffer::~QtFrameBuffer()
 {
     if (fb)
         delete [] fb;
-    fb = nullptr;
+    fb = 0;
 }
 
 int QtFrameBuffer::depth()
@@ -107,7 +105,7 @@ void QtFrameBuffer::updateFrameBuffer()
     tiles.append(img.rect());
 #endif
 
-    memcpy(fb, img.bits(), static_cast<size_t>(img.sizeInBytes()));
+    memcpy(fb, (const char *)img.bits(), img.byteCount());
     fbImage = img;
 
 }

framebuffers/qt/qtframebuffer.h

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

framebuffers/qt/qtframebufferplugin.cpp

@@ -23,18 +23,27 @@
 #include "qtframebuffer.h"
 
 #include <KPluginFactory>
+#include <QX11Info>
 
-K_PLUGIN_CLASS(QtFrameBufferPlugin)
+K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
+               registerPlugin<QtFrameBufferPlugin>();)
 
 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
 {
 }
 
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(const QVariantMap &args)
+QtFrameBufferPlugin::~QtFrameBufferPlugin()
 {
-    Q_UNUSED(args);
-    return new QtFrameBuffer;
+}
+
+FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
+{
+    // works only under X11
+    if(!QX11Info::isPlatformX11())
+        return nullptr;
+
+    return new QtFrameBuffer(id);
 }
 
 #include "qtframebufferplugin.moc"

framebuffers/qt/qtframebufferplugin.h

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

framebuffers/x11/CMakeLists.txt

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,107 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=X11 XDamage/XShm based Framebuffer for KRfb.
+Comment[ast]=Búfer de cuadros basáu en XDamage/XShm de X11 pa KRfb.
+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]=Búfer de cuadros 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

@@ -0,0 +1,81 @@
+{
+    "Encoding": "UTF-8",
+    "KPlugin": {
+        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
+        "Description[ast]": "Búfer de cuadros basáu en XDamage/XShm de X11 pa 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[el]": "Μνήμη ανανέωσης βίντεο με βάση το X11 XDamage/XShm για το 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[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
+        "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[nn]": "X11 XDamage/XShm-basert biletbuffer for KRfb.",
+        "Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.",
+        "Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.",
+        "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.",
+        "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm",
+        "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.",
+        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na X11 XDamage/XShm",
+        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
+        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
+        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
+        "Description[sr]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
+        "Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.",
+        "Description[tr]": "KRfb için X11 XDamage/XShm tabanlı Çerçeve tamponu.",
+        "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.",
+        "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx",
+        "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。",
+        "Description[zh_TW]": "KRfb 的 X11 XDamage/XShm based Framebuffer",
+        "EnabledByDefault": true,
+        "Id": "x11",
+        "License": "GPL",
+        "Name": "X11 Framebuffer for KRfb",
+        "Name[ast]": "Búfer de cuadros de X11 pa 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[el]": "Μνήμη ανανέωσης βίντεο X11 για το KRfb.",
+        "Name[es]": "Framebuffer X11 para KRfb",
+        "Name[et]": "KRfb X11 kaadripuhver",
+        "Name[fi]": "X11-kehyspuskuri KRfb:lle",
+        "Name[fr]": "Tampon d'images X11 pour KRfb",
+        "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[nn]": "X11-biletbuffer for KRfb",
+        "Name[pl]": "Bufor ramki X11 dla KRfb",
+        "Name[pt]": "'Framebuffer' do X11 para o KRfb",
+        "Name[pt_BR]": "Framebuffer do X11 para o KRfb",
+        "Name[ru]": "Буфер кадров X11 для KRfb",
+        "Name[sk]": "X11 Framebuffer pre KRfb",
+        "Name[sl]": "Slikovni medpomnilnik X11 za KRfb",
+        "Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.",
+        "Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.",
+        "Name[sr@latin]": "X11 kadrobafer za KRFB.",
+        "Name[sr]": "Икс11 кадробафер за КРФБ.",
+        "Name[sv]": "X11-rambuffert för Krfb",
+        "Name[tr]": "KRfb için X11 Çerçeve tamponu",
+        "Name[uk]": "Буфер кадрів X11 для KRfb",
+        "Name[x-test]": "xxX11 Framebuffer for KRfbxx",
+        "Name[zh_CN]": "XRfb 的 X11 帧缓冲",
+        "Name[zh_TW]": "KRfb 的 X11 Framebuffer",
+        "ServiceTypes": [
+            "krfb/framebuffer"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}

framebuffers/x11/x11framebuffer.cpp

@@ -0,0 +1,389 @@
+/* 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

@@ -0,0 +1,63 @@
+/* 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/x11/x11framebufferplugin.cpp

@@ -0,0 +1,50 @@
+/* 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 "x11framebufferplugin.h"
+
+#include "x11framebuffer.h"
+
+#include <KPluginFactory>
+#include <QX11Info>
+
+K_PLUGIN_FACTORY_WITH_JSON(X11FrameBufferPluginFactory, "krfb_framebuffer_x11.json",
+               registerPlugin<X11FrameBufferPlugin>();)
+
+X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)
+    : FrameBufferPlugin(parent, args)
+{
+}
+
+X11FrameBufferPlugin::~X11FrameBufferPlugin()
+{
+}
+
+FrameBuffer *X11FrameBufferPlugin::frameBuffer(WId id)
+{
+    // works only under X11
+    if(!QX11Info::isPlatformX11())
+        return nullptr;
+
+    return new X11FrameBuffer(id);
+}
+
+#include "x11framebufferplugin.moc"
+

framebuffers/x11/x11framebufferplugin.h

@@ -0,0 +1,46 @@
+/* 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.
+*/
+
+#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
+#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
+
+#include "framebufferplugin.h"
+
+#include <QWidget>
+
+class FrameBuffer;
+
+class X11FrameBufferPlugin : public FrameBufferPlugin
+{
+    Q_OBJECT
+
+public:
+    X11FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~X11FrameBufferPlugin();
+
+    FrameBuffer *frameBuffer(WId id) override;
+
+private:
+    Q_DISABLE_COPY(X11FrameBufferPlugin)
+};
+
+
+#endif  // Header guard
+

framebuffers/xcb/CMakeLists.txt

@@ -1,38 +0,0 @@
-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
-                       Qt5::Core
-                       Qt5::Gui
-                       Qt::GuiPrivate
-                       XCB::XCB
-                       XCB::RENDER
-                       XCB::SHAPE
-                       XCB::XFIXES
-                       XCB::DAMAGE
-                       XCB::SHM
-                       XCB::IMAGE
-                       KF5::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_framebuffer.cpp

@@ -1,694 +0,0 @@
-/* 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 <QX11Info>
-#include <QApplication>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QAbstractNativeEventFilter>
-#include <qpa/qplatformnativeinterface.h>
-
-
-class KrfbXCBEventFilter: public QAbstractNativeEventFilter
-{
-public:
-    KrfbXCBEventFilter(XCBFrameBuffer *owner);
-
-public:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *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, long *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

@@ -1,48 +0,0 @@
-/* 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

@@ -1,39 +0,0 @@
-/* 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(XCBFrameBufferPlugin)
-
-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

@@ -1,44 +0,0 @@
- /* 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

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

krfb.kdev4

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

krfb/CMakeLists.txt

@@ -21,7 +21,6 @@ add_library (krfbprivate
 )
 generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
-
 target_link_libraries (krfbprivate
                        Qt5::Core
                        Qt5::Widgets
@@ -36,10 +35,16 @@ set_target_properties (krfbprivate PROPERTIES
 )
 
 install (TARGETS krfbprivate
-         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
          LIBRARY NAMELINK_SKIP
 )
 
+install (FILES
+         krfb-framebuffer.desktop
+         krfb-events.desktop
+         DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
 #####################################
 # Second target: krfb - the app
 # itself.
@@ -47,7 +52,6 @@ install (TARGETS krfbprivate
 set (krfb_SRCS
      connectiondialog.cpp
      framebuffermanager.cpp
-     events.cpp
      eventsmanager.cpp
      main.cpp
      mainwindow.cpp
@@ -60,33 +64,19 @@ set (krfb_SRCS
      invitationsrfbclient.cpp
 )
 
-ecm_qt_declare_logging_category(krfb_SRCS
-    HEADER krfbdebug.h
-    IDENTIFIER KRFB
-    CATEGORY_NAME krfb.krfb
-    DESCRIPTION "KRFB Application"
-    EXPORT KRFB
-)
-
 kconfig_add_kcfg_files (krfb_SRCS
                      krfbconfig.kcfgc
 )
 
-ki18n_wrap_ui (krfb_UI_SRCS
+ki18n_wrap_ui (krfb_SRCS
                    ui/configtcp.ui
                    ui/configsecurity.ui
-                   ui/configframebuffer.ui
                    ui/connectionwidget.ui
                    ui/mainwidget.ui
 )
 
-qt5_add_resources(krfb_SRCS
-    krfb.qrc
-)
-
 add_executable (krfb
                      ${krfb_SRCS}
-                     ${krfb_UI_SRCS}
 )
 
 target_link_libraries (krfb
@@ -96,6 +86,7 @@ target_link_libraries (krfb
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
                        Qt5::Network
+                       KF5::Completion
                        KF5::CoreAddons
                        KF5::DBusAddons
                        KF5::DNSSD
@@ -103,7 +94,6 @@ target_link_libraries (krfb
                        KF5::Notifications
                        KF5::Wallet
                        KF5::WidgetsAddons
-                       KF5::WindowSystem
                        KF5::XmlGui
                        ${LIBVNCSERVER_LIBRARIES}
 )
@@ -115,48 +105,13 @@ if (X11_XTest_FOUND)
 endif (X11_XTest_FOUND)
 
 install (TARGETS krfb
-         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-#################################
-kconfig_add_kcfg_files (krfbvm_SRCS
-                     krfbconfig.kcfgc
-)
-
-ecm_qt_declare_logging_category(krfbvm_SRCS
-    HEADER krfbdebug.h
-    IDENTIFIER KRFB
-    CATEGORY_NAME krfb.krfb
-    DESCRIPTION "KRFB Application"
-    EXPORT KRFB
-)
-
-add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb_UI_SRCS}
-                                   rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
-target_link_libraries(krfb-virtualmonitor
-                      krfbprivate
-                      Qt5::Gui
-                      Qt5::Network
-                      KF5::ConfigGui
-                      KF5::CoreAddons
-                      KF5::I18n
-                      KF5::Notifications
-                      KF5::WindowSystem
-)
-
-install (TARGETS krfb-virtualmonitor
-         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-configure_file(org.kde.krfb.virtualmonitor.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop @ONLY)
-install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop
-         DESTINATION ${KDE_INSTALL_APPDIR}
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 ########### install files ###############
 
 install (PROGRAMS org.kde.krfb.desktop
-         DESTINATION ${KDE_INSTALL_APPDIR}
+         DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
 install(FILES org.kde.krfb.appdata.xml
@@ -164,6 +119,6 @@ install(FILES org.kde.krfb.appdata.xml
 )
 
 install (FILES krfb.notifyrc
-         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
+         DESTINATION ${DATA_INSTALL_DIR}/krfb
 )
 

krfb/config-krfb.h.cmake

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

krfb/connectiondialog.cpp

@@ -37,9 +37,9 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowTitle(i18n("New Connection"));
-    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    auto mainWidget = new QWidget(this);
-    auto mainLayout = new QVBoxLayout;
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QWidget *mainWidget = new QWidget(this);
+    QVBoxLayout *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(QStringLiteral("krfb")).pixmap(128));
+    m_ui.pixmapLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
 
     KGuiItem accept = KStandardGuiItem::ok();
     accept.setText(i18n("Accept Connection"));
@@ -80,3 +80,7 @@ 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:
-    explicit ConnectionDialog(QWidget *parent);
-    ~ConnectionDialog() override {};
+    ConnectionDialog(QWidget *parent);
+    ~ConnectionDialog() {};
 
     void setAllowRemoteControl(bool b);
     bool allowRemoteControl();
@@ -59,7 +59,7 @@ class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget
 {
     Q_OBJECT
 public:
-    explicit InvitationsConnectionDialog(QWidget *parent);
+    InvitationsConnectionDialog(QWidget *parent);
     void setRemoteHost(const QString & host);
 };
 

krfb/events.cpp

@@ -29,12 +29,4 @@ EventHandler::EventHandler(QObject *parent)
 {
 }
 
-void EventHandler::setFrameBufferPlugin(const QSharedPointer<FrameBuffer> &frameBuffer)
-{
-    fb = frameBuffer;
-}
-
-QSharedPointer<FrameBuffer> EventHandler::frameBuffer()
-{
-    return fb;
-}
+#include "events.moc"

krfb/events.h

@@ -25,7 +25,6 @@
 #ifndef EVENTS_H
 #define EVENTS_H
 
-#include "framebuffer.h"
 #include "rfb.h"
 #include "krfbprivate_export.h"
 
@@ -36,15 +35,9 @@ class KRFBPRIVATE_EXPORT EventHandler : public QObject
     Q_OBJECT
 public:
     explicit EventHandler(QObject *parent = nullptr);
-    ~EventHandler() override = default;
+    virtual ~EventHandler() = 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

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

krfb/eventsmanager.h

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

krfb/eventsplugin.cpp

@@ -1,4 +1,3 @@
-
 /* This file is part of the KDE project
    Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
 
@@ -30,3 +29,7 @@ EventsPlugin::EventsPlugin(QObject *parent, const QVariantList &)
 EventsPlugin::~EventsPlugin()
 {
 }
+
+
+#include "eventsplugin.moc"
+

krfb/eventsplugin.h

@@ -26,14 +26,16 @@
 #include <QtCore/QVariantList>
 #include <QWidget>
 
+
 class EventHandler;
 
 class KRFBPRIVATE_EXPORT EventsPlugin : public QObject
 {
     Q_OBJECT
+
 public:
     EventsPlugin(QObject *parent, const QVariantList &args);
-    ~EventsPlugin() override;
+    virtual ~EventsPlugin();
 
     virtual EventHandler *eventHandler() = 0;
 };

krfb/framebuffer.cpp

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

krfb/framebuffer.h

@@ -14,10 +14,9 @@
 
 #include "krfbprivate_export.h"
 
-#include <QObject>
-#include <QRect>
-#include <QList>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtCore/QList>
 #include <QWidget>
 
 
@@ -29,9 +28,9 @@ class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
     Q_OBJECT
 public:
-    explicit FrameBuffer(QObject *parent = nullptr);
+    explicit FrameBuffer(WId id, QObject *parent = 0);
 
-    ~FrameBuffer() override;
+    virtual ~FrameBuffer();
 
     char *data();
 
@@ -42,17 +41,12 @@ 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:
-    char *fb = nullptr;
+    WId win;
+    char *fb;
     QList<QRect> tiles;
 
 private:

krfb/framebuffermanager.cpp

@@ -22,13 +22,15 @@
 
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
-#include "krfbdebug.h"
 
+#include <QDebug>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
+#include <KPluginLoader>
 #include <KPluginMetaData>
 
+#include <QtCore/QSharedPointer>
 
 class FrameBufferManagerStatic
 {
@@ -40,29 +42,62 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {
-    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
-    for (const KPluginMetaData &data : plugins) {
-        const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
-        if (result.plugin) {
-            m_plugins.insert(data.pluginId(), result.plugin);
-            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
-        } else {
-            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
-        }
-    }
+    //qDebug();
+
+    loadPlugins();
 }
 
 FrameBufferManager::~FrameBufferManager()
 {
+    //qDebug();
 }
 
 FrameBufferManager *FrameBufferManager::instance()
 {
+    //qDebug();
+
     return &frameBufferManagerStatic->instance;
 }
 
-QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVariantMap &args)
+void FrameBufferManager::loadPlugins()
 {
+    //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 plugin 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);
@@ -77,20 +112,30 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVaria
     }
 
     // We don't already have that frame buffer.
-    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
-        if (it.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+    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));
 
-            QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(args));
             if (frameBuffer) {
                 m_frameBuffers.insert(id, frameBuffer.toWeakRef());
 
                 return frameBuffer;
             }
         }
+
+        ++iter;
     }
 
     // No valid framebuffer plugin found.
-    qCDebug(KRFB) << "No valid framebuffer found. returning null.";
+    qDebug() << "No valid framebuffer found. returning null.";
     return QSharedPointer<FrameBuffer>();
 }
+
+
+#include "framebuffermanager.moc"
+

krfb/framebuffermanager.h

@@ -25,10 +25,10 @@
 
 #include "krfbprivate_export.h"
 
-#include <QMap>
-#include <QObject>
-#include <QSharedPointer>
-#include <QWeakPointer>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QWeakPointer>
 
 #include <QWidget>
 
@@ -43,15 +43,17 @@ class KRFBPRIVATE_EXPORT FrameBufferManager : public QObject
 public:
     static FrameBufferManager *instance();
 
-    ~FrameBufferManager() override;
+    virtual ~FrameBufferManager();
 
-    QSharedPointer<FrameBuffer> frameBuffer(WId id, const QVariantMap &args);
+    QSharedPointer<FrameBuffer> frameBuffer(WId id);
 
 private:
     Q_DISABLE_COPY(FrameBufferManager)
 
     FrameBufferManager();
 
+    void loadPlugins();
+
     QMap<QString, FrameBufferPlugin *> m_plugins;
     QMap<WId, QWeakPointer<FrameBuffer> > m_frameBuffers;
 };

krfb/framebufferplugin.cpp

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

krfb/framebufferplugin.h

@@ -23,7 +23,7 @@
 
 #include "krfbprivate_export.h"
 
-#include <QVariantList>
+#include <QtCore/QVariantList>
 #include <QWidget>
 
 
@@ -34,10 +34,10 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
     Q_OBJECT
 
 public:
-    explicit FrameBufferPlugin(QObject *parent, const QVariantList &args);
-    ~FrameBufferPlugin() override;
+    FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    virtual ~FrameBufferPlugin();
 
-    virtual FrameBuffer *frameBuffer(const QVariantMap &args) = 0;
+    virtual FrameBuffer *frameBuffer(WId id) = 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 <QSocketNotifier>
+#include <QDebug>
+#include <QtCore/QSocketNotifier>
 #include <poll.h>
 #include <KConfigGroup>
 
@@ -41,7 +41,7 @@ struct PendingInvitationsRfbClient::Private
     {}
 
     rfbClientPtr client;
-    QSocketNotifier *notifier = nullptr;
+    QSocketNotifier *notifier;
     bool askOnConnect;
 };
 
@@ -52,6 +52,10 @@ 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()
@@ -61,21 +65,21 @@ PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
 
 void PendingInvitationsRfbClient::processNewClient()
 {
-    QString host = peerAddress(m_rfbClient->sock) + QLatin1Char(':') + QString::number(peerPort(m_rfbClient->sock));
+    QString host = peerAddress(m_rfbClient->sock) + ":" + QString::number(peerPort(m_rfbClient->sock));
 
     if (d->askOnConnect == false) {
 
-        KNotification::event(QStringLiteral("NewConnectionAutoAccepted"),
+        KNotification::event("NewConnectionAutoAccepted",
                              i18n("Accepted connection from %1", host));
         accept(new InvitationsRfbClient(m_rfbClient, parent()));
 
     } else {
 
-        KNotification::event(QStringLiteral("NewConnectionOnHold"),
+        KNotification::event("NewConnectionOnHold",
                             i18n("Received connection from %1, on hold (waiting for confirmation)",
                                 host));
 
-        auto dialog = new InvitationsConnectionDialog(nullptr);
+        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(0);
         dialog->setRemoteHost(host);
         dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
@@ -86,9 +90,43 @@ 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)
 {
-    qCDebug(KRFB) << "about to start authentication";
+    QByteArray password ;
+    qDebug() << "about to start autentication";
 
     if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
             InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
@@ -104,10 +142,12 @@ bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPass
 
 void PendingInvitationsRfbClient::dialogAccepted()
 {
-    auto dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
+    InvitationsConnectionDialog *dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
     Q_ASSERT(dialog);
 
-    auto client = new InvitationsRfbClient(m_rfbClient, parent());
+    InvitationsRfbClient *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:
-    explicit InvitationsRfbClient(rfbClientPtr client, QObject* parent = nullptr)
+    InvitationsRfbClient(rfbClientPtr client, QObject* parent = 0)
         : RfbClient(client, parent) {}
 };
 
@@ -32,11 +32,12 @@ class PendingInvitationsRfbClient : public PendingRfbClient
 {
     Q_OBJECT
 public:
-    explicit PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr);
-    ~PendingInvitationsRfbClient() override;
+    PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = 0);
+    virtual ~PendingInvitationsRfbClient();
 
 protected Q_SLOTS:
     void processNewClient() override;
+    virtual void onSocketActivated();
     bool checkPassword(const QByteArray & encryptedPassword) override;
 
 private Q_SLOTS:

krfb/invitationsrfbserver.cpp

@@ -21,29 +21,21 @@
 #include "invitationsrfbserver.h"
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
-#include "krfbdebug.h"
-#include <QTimer>
+#include "rfbservermanager.h"
+#include <QtCore/QTimer>
 #include <QApplication>
-#include <QHostInfo>
-#include <QRandomGenerator>
+#include <QtNetwork/QHostInfo>
+#include <QDebug>
 
 #include <KLocalizedString>
 #include <KUser>
+#include <KRandom>
 #include <KStringHandler>
 #include <KWallet/KWallet>
 
-#include <kdnssd_version.h>
-#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
-#include <KDNSSD/PublicService>
-#else
-#include <DNSSD/PublicService>
-#endif
-
+#include <dnssd/publicservice.h>
 using KWallet::Wallet;
 
-// used for KWallet folder name
-static const QString s_krfbFolderName(QStringLiteral("krfb"));
-
 //static
 InvitationsRfbServer *InvitationsRfbServer::instance;
 
@@ -55,17 +47,22 @@ void InvitationsRfbServer::init()
             i18n("%1@%2 (shared desktop)",
                 KUser().loginName(),
                 QHostInfo::localHostName()),
-            QStringLiteral("_rfb._tcp"),
+            "_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->openKWallet();
+      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);
+      }
     }
 }
 
@@ -77,9 +74,6 @@ 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
@@ -90,9 +84,6 @@ 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
@@ -120,15 +111,12 @@ 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) + QLatin1Char('-') + readableRandomString(3);
-    m_unattendedPassword = readableRandomString(4) + QLatin1Char('-') + readableRandomString(3);
+    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
+    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
     KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
     m_allowUnattendedAccess = krfbConfig.readEntry(
             "allowUnattendedAccess", QVariant(false)).toBool();
@@ -136,12 +124,27 @@ InvitationsRfbServer::InvitationsRfbServer()
 
 InvitationsRfbServer::~InvitationsRfbServer()
 {
-    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();
+    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);
     }
 }
 
@@ -150,51 +153,36 @@ 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 (opened && m_wallet->hasFolder(s_krfbFolderName) && m_wallet->setFolder(s_krfbFolderName) ) {
-        if (m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword) == 0 &&
+        if(m_wallet->readPassword("desktopSharingPassword", desktopPassword)==0 &&
                 !desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
-            Q_EMIT passwordChanged(m_desktopPassword);
+            emit passwordChanged(m_desktopPassword);
         }
 
-        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword) == 0 &&
+        if(m_wallet->readPassword("unattendedAccessPassword", unattendedPassword)==0 &&
                 !unattendedPassword.isEmpty()) {
             m_unattendedPassword = unattendedPassword;
         }
 
     } else {
 
-        qCDebug(KRFB) << "Could not open KWallet, Falling back to config file";
+        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;
-            Q_EMIT passwordChanged(m_desktopPassword);
+            emit passwordChanged(m_desktopPassword);
         }
 
         unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
@@ -212,7 +200,7 @@ QString InvitationsRfbServer::readableRandomString(int length)
 {
     QString str;
     while (length) {
-        int r = QRandomGenerator::global()->bounded(62);
+        int r = KRandom::random() % 62;
         r += 48;
         if (r > 57) {
             r += 7;
@@ -230,36 +218,10 @@ QString InvitationsRfbServer::readableRandomString(int length)
                 (c == '0')) {
             continue;
         }
-        str += QLatin1Char(c);
+        str += c;
         length--;
     }
     return str;
 }
 
-// one place to deal with all security configuration
-void InvitationsRfbServer::saveSecuritySettings()
-{
-    KConfigGroup secConfigGroup(KSharedConfig::openConfig(), "Security");
-    secConfigGroup.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
-    if (KrfbConfig::noWallet()) {
-        // save passwords in config file only if not using kwallet integration
-        secConfigGroup.writeEntry("desktopPassword", KStringHandler::obscure(m_desktopPassword));
-        secConfigGroup.writeEntry("unattendedPassword", KStringHandler::obscure(m_unattendedPassword));
-    } else {
-        // using KWallet, erase possibly stored passwords from krfbrc file
-        secConfigGroup.deleteEntry("desktopPassword");
-        secConfigGroup.deleteEntry("unattendedPassword");
-        // update passwords in kwallet
-        if (m_wallet && m_wallet->isOpen()) {
-            if (!m_wallet->hasFolder(s_krfbFolderName)) {
-                m_wallet->createFolder(s_krfbFolderName);
-            }
-            if (m_wallet->currentFolder() != s_krfbFolderName) {
-                m_wallet->setFolder(s_krfbFolderName);
-            }
-            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
-            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
-        }
-    }
-    KrfbConfig::self()->save();
-}
+#include "invitationsrfbserver.moc"

krfb/invitationsrfbserver.h

@@ -50,24 +50,21 @@ public Q_SLOTS:
     bool start() override;
     void stop() override;
     void toggleUnattendedAccess(bool allow);
-    void openKWallet();
-    void closeKWallet();
-    void saveSecuritySettings();
 
 protected:
     InvitationsRfbServer();
-    ~InvitationsRfbServer() override;
+    virtual ~InvitationsRfbServer();
     PendingRfbClient* newClient(rfbClientPtr client) override;
 
 private Q_SLOTS:
     void walletOpened(bool);
 
 private:
-    KDNSSD::PublicService *m_publicService = nullptr;
+    KDNSSD::PublicService *m_publicService;
     bool m_allowUnattendedAccess;
     QString m_desktopPassword;
     QString m_unattendedPassword;
-    KWallet::Wallet *m_wallet = nullptr;
+    KWallet::Wallet *m_wallet;
 
     QString readableRandomString(int);
     Q_DISABLE_COPY(InvitationsRfbServer)

krfb/krfb-events.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=krfb/events
+
+Comment=Event plugins for KRfb
+Comment[ru]=Модули обработки событий для Krfb
+Comment[x-test]=xxEvent plugins for KRfbxx

krfb/krfb-events.json

@@ -0,0 +1,7 @@
+{
+    "KPlugin": {
+        "Description": "Events plugins for KRfb",
+        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx"
+    },
+    "X-KDE-ServiceType": "krfb/events"
+}

krfb/krfb-framebuffer.desktop

@@ -0,0 +1,55 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=krfb/framebuffer
+
+Comment=Frame Buffer plugins for KRfb
+Comment[ast]=Complementos del búfer de cuadros 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

@@ -0,0 +1,39 @@
+{
+    "KPlugin": {
+        "Description": "Frame Buffer plugins for KRfb",
+        "Description[ast]": "Complementos del búfer de cuadros pa 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[el]": "Πρόσθετα μνήμης ανανέωσης βίντεο καρέ για το KRfb",
+        "Description[es]": "Complementos de framebuffer para KRfb",
+        "Description[et]": "KRfb kaadripuhvri pluginad",
+        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
+        "Description[fr]": "Modules de tampons d'image pour 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[nn]": "Biletbuffer-tillegg KRfb",
+        "Description[pl]": "Wtyczki buforów ramek dla KRfb",
+        "Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",
+        "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
+        "Description[ru]": "Модули буфера кадров для KRfb",
+        "Description[sk]": "Frame Buffer modul pre KRfb",
+        "Description[sl]": "Vstavki slikovnih medpomnilnikov za KRfb",
+        "Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ",
+        "Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB",
+        "Description[sr@latin]": "Priključci kadrobafera za KRFB",
+        "Description[sr]": "Прикључци кадробафера за КРФБ",
+        "Description[sv]": "Insticksprogram med rambuffert för Krfb",
+        "Description[tr]": "KRfb için Çerçeve Tamponu eklentileri",
+        "Description[uk]": "Додатки буфера кадрів для KRfb",
+        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx",
+        "Description[zh_CN]": "KRfb 的帧缓冲插件",
+        "Description[zh_TW]": "KRfb 的 Frame Buffer 外掛程式"
+    },
+    "X-KDE-ServiceType": "krfb/framebuffer"
+}

krfb/krfb.kcfg

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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"/>
+<!DOCTYPE kcfg SYSTEM
+    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
+<kcfg>
+  <kcfgfile />
   <group name="MainWindow">
     <entry name="startMinimized" type="Bool">
     <label>Start minimized</label>
@@ -47,7 +46,7 @@
   <group name="FrameBuffer">
     <entry name="preferredFrameBufferPlugin" type="String">
       <label>Preferred Frame Buffer Plugin</label>
-      <default>xcb</default>
+      <default>qt</default>
     </entry>
   </group>
 </kcfg>

krfb/krfb.notifyrc

@@ -3,6 +3,7 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
+Comment[ast]=Compartición d'escritoriu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
@@ -29,7 +30,6 @@ 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]=デスクトップ共有
@@ -75,6 +75,7 @@ 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ó
@@ -97,7 +98,6 @@ 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]=ユーザが接続を許可
@@ -136,6 +136,7 @@ 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
@@ -161,7 +162,6 @@ 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]=ユーザが接続を許可
@@ -208,6 +208,7 @@ 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ó
@@ -230,7 +231,6 @@ 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]=ユーザが接続を拒否
@@ -269,6 +269,7 @@ 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
@@ -294,7 +295,6 @@ 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]=ユーザが接続を拒否
@@ -341,6 +341,7 @@ Action=Popup
 [Event/ConnectionClosed]
 Name=Connection Closed
 Name[ar]=الاتصال أغلق
+Name[ast]=Conexón zarrada
 Name[bg]=Връзката е прекъсната
 Name[bs]=Konekcija zatvorena
 Name[ca]=Connexió tancada
@@ -363,7 +364,6 @@ 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]=接続切断
@@ -404,6 +404,7 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
+Comment[ast]=Zarróse la conexón
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -430,7 +431,6 @@ 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]=接続が閉じられました
@@ -480,6 +480,7 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
+Name[ast]=Contraseña non válida
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -496,13 +497,12 @@ Name[eu]=Baliogabeko pasahitza
 Name[fi]=Virheellinen salasana
 Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
-Name[gl]=O contrasinal é incorrecto
+Name[gl]=O contrasinal non é válido
 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]=無効なパスワード
@@ -518,7 +518,7 @@ Name[nds]=Leeg Passwoort
 Name[nl]=Ongeldig wachtwoord
 Name[nn]=Ugyldig passord
 Name[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Name[pl]=Nieprawidłowe hasło
+Name[pl]=Błędne hasło
 Name[pt]=Senha Inválida
 Name[pt_BR]=Senha inválida
 Name[ro]=Parolă nevalidă
@@ -543,6 +543,7 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
+Comment[ast]=La contraseña nun ye válida
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -562,14 +563,13 @@ Comment[eu]=Baliogabeko pasahitza
 Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
 Comment[ga]=Focal faire neamhbhailí
-Comment[gl]=Este contrasinal é incorrecto
+Comment[gl]=Este contrasinal non é válido
 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]=無効なパスワード
@@ -589,7 +589,7 @@ Comment[nl]=Ongeldig wachtwoord
 Comment[nn]=Passordet var ugyldig
 Comment[oc]=Mot de pas invalid
 Comment[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Comment[pl]=Nieprawidłowe hasło
+Comment[pl]=Błędne hasło
 Comment[pt]=A senha é inválida
 Comment[pt_BR]=Senha inválida
 Comment[ro]=Parolă nevalidă
@@ -624,8 +624,8 @@ Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
-Name[ca]=Contrasenya no vàlida de les invitacions
-Name[ca@valencia]=Contrasenya no vàlida de les invitacions
+Name[ca]=Contrasenya de les invitacions no vàlides
+Name[ca@valencia]=Contrasenya de les invitacions no vàlides
 Name[cs]=Neplatné hesla výzev
 Name[da]=Ugyldige adgangskodeinvitationer
 Name[de]=Ungültiges Einladungs-Passwort
@@ -638,13 +638,12 @@ 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 incorrecto
+Name[gl]=O contrasinal de convidado non válido
 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]=招待に対する無効なパスワード
@@ -683,6 +682,7 @@ 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]=La parte invitada unvió una contraseña non válida. Refugóse la conexón.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -701,14 +701,13 @@ 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 incorrecto. Rexeitouse a conexión.
+Comment[gl]=A parte convidada envioulle un contrasinal non válido. A conexión foi rexeitada.
 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]=招待された人が無効なパスワードを送ってきました。接続を拒否しました。
@@ -753,6 +752,7 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
+Name[ast]=Conexón nueva n'espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
 Name[ca]=Connexió nova en espera
@@ -775,7 +775,6 @@ 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]=保留中の新しい接続
@@ -813,6 +812,7 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
+Comment[ast]=Solicitóse la conexón, l'usuariu ha aceutar
 Comment[bg]=Поискана е връзка, следва потребителят да приеме
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
@@ -838,7 +838,6 @@ 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]=接続が要求されています。ユーザが許可しなければなりません。
@@ -884,6 +883,7 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
+Name[ast]=Conexón nueva auto-aceutada
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -906,7 +906,6 @@ 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]=新しい接続の自動受け入れ
@@ -944,6 +943,7 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
+Comment[ast]=Afitóse automáticamente la conexón nueva
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
@@ -969,7 +969,6 @@ 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]=新しい接続を自動的に確立しました
@@ -1015,6 +1014,7 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
+Name[ast]=Milenta conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1037,7 +1037,6 @@ 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]=多すぎる接続
@@ -1075,6 +1074,7 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
+Comment[ast]=Ocupáu, refugóse la conexón
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1094,14 +1094,13 @@ 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, rexeitouse a conexión.
+Comment[gl]=Ocupado; a conexión foi rexeitada
 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]=ビジーです、接続を拒否しました
@@ -1149,6 +1148,7 @@ 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
@@ -1171,7 +1171,6 @@ 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]=予期しない接続
@@ -1210,11 +1209,12 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
+Comment[ast]=Recibióse una conexón inesperada, albortando
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini
-Comment[ca]=S'ha rebut una connexió inesperada, s'està interrompent
-Comment[ca@valencia]=S'ha rebut una connexió inesperada, s'està interrompent
+Comment[ca]=S'ha rebut una connexió inesperada, avortant
+Comment[ca@valencia]=S'ha rebut una connexió inesperada, avortant
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
 Comment[da]=Modtog uventet forbindelse, afbrød
@@ -1228,14 +1228,13 @@ 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; interrómpese
+Comment[gl]=Recibiuse unha conexión non agardada; cancélase
 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]=予期しない接続を受信しました。廃棄します。
@@ -1253,7 +1252,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; cancelar
+Comment[pt_BR]=Conexão recebida inesperadamente; abortar
 Comment[ro]=Conexiune neașteptată recepționată, abandonare
 Comment[ru]=Получено неожиданное соединение. Отключение
 Comment[si]=බලාපොරොත්තු රහිත සබඳතාවක් ලැබිනි, පිටවෙමින්

krfb/krfb.qrc

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

krfb/krfb_rfb_handler.client

@@ -0,0 +1,7 @@
+[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

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