SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.arcconfig

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

.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,18 +1,20 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "22")
-set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "3")
-set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
+set (KDE_APPLICATIONS_VERSION_MAJOR "17")
+set (KDE_APPLICATIONS_VERSION_MINOR "12")
+set (KDE_APPLICATIONS_VERSION_MICRO "3")
+set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
-project(krfb VERSION ${RELEASE_SERVICE_VERSION})
+project(krfb VERSION ${KDE_APPLICATIONS_VERSION})
 
-set(QT_MIN_VERSION 5.15.0)
-set(KF5_MIN_VERSION 5.86.0)
+set(QT_MIN_VERSION 5.6.0)
+set(KF5_MIN_VERSION 5.31.0)
+
+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets X11Extras)
 
 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})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
@@ -20,16 +22,15 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
-include(ECMQtDeclareLoggingCategory)
 include(FeatureSummary)
-include(CheckIncludeFile)
 
-check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
+ecm_setup_version(PROJECT
+                  VARIABLE_PREFIX KRFB
+                  VERSION_HEADER "krfb_version.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
@@ -39,7 +40,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Notifications
     Wallet
     WidgetsAddons
-    WindowSystem
     XmlGui
 )
 
@@ -60,86 +60,32 @@ if(WIN32)
     set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)
 
-add_definitions(
-    -DQT_DEPRECATED_WARNINGS
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_STRICT_ITERATORS
-    -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
-)
-
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00)
-
-
+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)
-else()
-  set (HAVE_DMA_BUF FALSE)
-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(doc)
 add_subdirectory(icons)
 
-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/Findgbm.cmake

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

dbus/xdp_dbus_remotedesktop_interface.xml

@@ -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 +0,0 @@
-add_subdirectory(x11)
-
-# Makes sense to use only when PW framebuffer is used
-if (${PipeWire_FOUND})
-    add_subdirectory(xdp)
-endif()

events/x11/CMakeLists.txt

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

events/x11/krfb_events_x11.json

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

events/x11/x11events.cpp

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

events/x11/x11events.h

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

events/x11/x11eventsplugin.cpp

@@ -1,45 +0,0 @@
-/* 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 "x11eventsplugin.h"
-
-#include "x11events.h"
-
-#include <KPluginFactory>
-#include <QX11Info>
-
-K_PLUGIN_FACTORY_WITH_JSON(X11EventsPluginFactory, "krfb_events_x11.json",
-               registerPlugin<X11EventsPlugin>();)
-
-X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
-    : EventsPlugin(parent, args)
-{
-}
-
-EventHandler *X11EventsPlugin::eventHandler()
-{
-    // works only under X11
-    if(!QX11Info::isPlatformX11())
-        return nullptr;
-
-    return new X11EventHandler();
-}
-
-#include "x11eventsplugin.moc"
-

events/x11/x11eventsplugin.h

@@ -1,43 +0,0 @@
-/* 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.
-*/
-
-#ifndef KRFB_EVENTS_X11_X11EVENTSPLUGIN_H
-#define KRFB_EVENTS_X11_X11EVENTSPLUGIN_H
-
-#include "eventsplugin.h"
-
-#include <QWidget>
-
-class EventHandler;
-
-class X11EventsPlugin : public EventsPlugin
-{
-    Q_OBJECT
-public:
-    X11EventsPlugin(QObject *parent, const QVariantList &args);
-    ~X11EventsPlugin() override = default;
-
-    EventHandler *eventHandler() override;
-
-private:
-    Q_DISABLE_COPY(X11EventsPlugin)
-};
-
-
-#endif  // Header guard

events/xdp/CMakeLists.txt

@@ -1,27 +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
-)
-
-install (TARGETS krfb_events_xdp
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events
-)

events/xdp/krfb_events_xdp.json

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

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

events/xdp/xdpevents.h

@@ -1,37 +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.
-*/
-
-#ifndef EVENTS_XDPEVENTS_H
-#define EVENTS_XDPEVENTS_H
-
-#include "../../krfb/events.h"
-
-class XdpEventHandler : public EventHandler
-{
-    Q_OBJECT
-public:
-    void handleKeyboard(bool down, rfbKeySym key) override;
-    void handlePointer(int buttonMask, int x, int y) override;
-};
-
-#endif
-
-

events/xdp/xdpeventsplugin.cpp

@@ -1,43 +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 "xdpeventsplugin.h"
-
-#include "xdpevents.h"
-
-#include <KPluginFactory>
-
-K_PLUGIN_FACTORY_WITH_JSON(XdpEventsPluginFactory, "krfb_events_xdp.json",
-               registerPlugin<XdpEventsPlugin>();)
-
-XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
-    : EventsPlugin(parent, args)
-{
-}
-
-EventHandler *XdpEventsPlugin::eventHandler()
-{
-    // works only under Wayland
-    return new XdpEventHandler();
-}
-
-#include "xdpeventsplugin.moc"
-

events/xdp/xdpeventsplugin.h

@@ -1,46 +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.
-*/
-
-#ifndef KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
-#define KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
-
-#include "eventsplugin.h"
-
-#include <QWidget>
-
-class EventHandler;
-
-class XdpEventsPlugin : public EventsPlugin
-{
-    Q_OBJECT
-public:
-    XdpEventsPlugin(QObject *parent, const QVariantList &args);
-    ~XdpEventsPlugin() override = default;
-
-    EventHandler *eventHandler() override;
-
-private:
-    Q_DISABLE_COPY(XdpEventsPlugin)
-};
-
-
-#endif  // Header guard
-

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 (xcb)
 endif()

framebuffers/pipewire/CMakeLists.txt

@@ -1,63 +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()
-
-install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
-)

framebuffers/pipewire/krfb_framebuffer_pw.json

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

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(WId winid, 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,61 +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_FACTORY_WITH_JSON(PWFrameBufferPluginFactory, "krfb_framebuffer_pw.json",
-               registerPlugin<PWFrameBufferPlugin>();)
-
-PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
-    : FrameBufferPlugin(parent, args)
-{
-}
-
-
-PWFrameBufferPlugin::~PWFrameBufferPlugin()
-{
-}
-
-FrameBuffer *PWFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
-{
-    //NOTE WId is irrelevant in Wayland
-
-    auto pwfb = new PWFrameBuffer(id);
-    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,45 +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);
-   virtual ~PWFrameBufferPlugin() override;
-
-   FrameBuffer *frameBuffer(WId id, 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()
-    {
-        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()
-    {
-        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}
@@ -28,5 +20,5 @@ target_link_libraries (krfb_framebuffer_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,109 @@
+[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[id]=Framebuffer berbasiskan Qt untuk 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[id]=Qt Framebuffer untuk KRfb
+Name[it]=Framebuffer Qt per KRfb
+Name[kk]=Qt KRfb кадр буфері
+Name[km]=Qt Framebuffer សម្រាប់for KRfb
+Name[ko]=KRfb를 위한 Qt 프레임버퍼
+Name[lt]=Qt Framebufferis skirtas KRfb
+Name[lv]=Qt kadrbuferis priekš KRfb.
+Name[nb]=Qt rammebuffer for KRfb
+Name[nds]=Qt-Bildpuffer för KRfb
+Name[nl]=Qt-framebuffer voor KRfb
+Name[nn]=Qt-framebuffer for KRfb
+Name[pl]=Bufor ramki Qt dla KRfb
+Name[pt]='Framebuffer' do Qt para o KRfb
+Name[pt_BR]=Framebuffer do Qt para o KRfb
+Name[ru]=Буфер экрана Qt для KRfb
+Name[si]=KRfb සඳහා වන Qt රාමුබෆරය
+Name[sk]=Qt Framebuffer pre KRfb
+Name[sl]=Slikovni medpomnilnik Qt za KRFB
+Name[sr]=КуТ‑ов кадробафер за КРФБ
+Name[sr@ijekavian]=КуТ‑ов кадробафер за КРФБ
+Name[sr@ijekavianlatin]=Qt‑ov kadrobafer za KRFB
+Name[sr@latin]=Qt‑ov kadrobafer za KRFB
+Name[sv]=Qt-rambuffert för Krfb
+Name[tr]=KRfb için Qt Çerçeve tamponu
+Name[uk]=Буфер кадрів на Qt для KRfb
+Name[x-test]=xxQt Framebuffer for KRfbxx
+Name[zh_CN]=KRfb 的 Qt 帧缓冲机制
+Name[zh_TW]=Krfb 的 Qt Framebuffer
+Type=Service
+ServiceTypes=krfb/framebuffer
+
+X-KDE-Library=krfb_framebuffer_qt
+X-KDE-PluginInfo-Name=qt
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/qt/krfb_framebuffer_qt.json

@@ -1,17 +1,17 @@
 {
+    "Encoding": "UTF-8",
     "KPlugin": {
         "Description": "Qt based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en les Qt per a 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[de]": "Qt-basierter Framebuffer für KRfb",
         "Description[el]": "Μνήμη ανανέωσης βίντεο με βάση τhn Qt για το KRfb.",
-        "Description[en_GB]": "Qt based Framebuffer for KRfb.",
         "Description[es]": "Framebuffer basado en Qt para KRfb.",
         "Description[et]": "KRfb Qt põhine kaadripuhver",
-        "Description[eu]": "KRfb-rako Qt-n oinarritutako «Framebuffer».",
-        "Description[fi]": "KRfb:n Qt-pohjainen kehyspuskuri.",
+        "Description[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",
@@ -20,18 +20,18 @@
         "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.",
         "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.",
         "Description[nn]": "Qt-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki oparty na Qt dla KRfb.",
+        "Description[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 na osnovi Qt.",
+        "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ı kare arabelleği",
+        "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 的帧缓冲。",
@@ -40,17 +40,16 @@
         "Id": "qt",
         "License": "GPL",
         "Name": "Qt Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» de les Qt per a KRfb",
-        "Name[ca]": "«Framebuffer» de les Qt per al 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[en_GB]": "Qt Framebuffer for KRfb",
         "Name[es]": "Framebuffer de Qt para KRfb",
         "Name[et]": "KRfb Qt kaadripuhver",
-        "Name[eu]": "KRfb-rako Qt «Framebuffer»",
-        "Name[fi]": "KRfb:n Qt-kehyspuskuri",
+        "Name[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",
@@ -64,18 +63,21 @@
         "Name[pt_BR]": "Framebuffer do Qt para o KRfb",
         "Name[ru]": "Буфер кадров Qt для KRfb",
         "Name[sk]": "Qt Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik za KRfb na osnovi Qt",
+        "Name[sl]": "Slikovni medpomnilnik Qt za KRfb",
         "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
         "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB",
         "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB",
         "Name[sr]": "КуТ‑ов кадробафер за КРФБ",
-        "Name[sv]": "QT-rambuffert för Krfb",
-        "Name[tr]": "Krfb için Qt kare arabelleği",
+        "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": "https://www.kde.org"
+        "Website": "http://www.kde.org"
     }
 }

framebuffers/qt/qtframebuffer.cpp

@@ -8,6 +8,7 @@
 */
 
 #include "qtframebuffer.h"
+#include "qtframebuffer.moc"
 
 #include <QTimer>
 #include <QRegion>
@@ -26,10 +27,10 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
     if (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);
@@ -41,7 +42,7 @@ QtFrameBuffer::~QtFrameBuffer()
 {
     if (fb)
         delete [] fb;
-    fb = nullptr;
+    fb = 0;
 }
 
 int QtFrameBuffer::depth()
@@ -104,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(WId id, QObject *parent = nullptr);
+    explicit QtFrameBuffer(WId id, QObject *parent = 0);
 
-    ~QtFrameBuffer() override;
+    ~QtFrameBuffer();
 
     int depth() override;
     int height() override;

framebuffers/qt/qtframebufferplugin.cpp

@@ -36,9 +36,8 @@ QtFrameBufferPlugin::~QtFrameBufferPlugin()
 {
 }
 
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
+FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
 {
-    Q_UNUSED(args);
     return new QtFrameBuffer(id);
 }
 

framebuffers/qt/qtframebufferplugin.h

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

framebuffers/xcb/CMakeLists.txt

@@ -7,14 +7,6 @@ set (krfb_framebuffer_xcb_SRCS
       xcb_framebuffer.cpp
 )
 
-ecm_qt_declare_logging_category(krfb_framebuffer_xcb_SRCS
-    HEADER krfb_fb_xcb_debug.h
-    IDENTIFIER KRFB_FB_XCB
-    CATEGORY_NAME krfb.framebuffer.xcb
-    DESCRIPTION "KRFB XCB framebuffer plugin"
-    EXPORT KRFB
-)
-
 add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
 
 target_link_libraries (krfb_framebuffer_xcb
@@ -32,5 +24,5 @@ target_link_libraries (krfb_framebuffer_xcb
 )
 
 install (TARGETS krfb_framebuffer_xcb
-         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
 )

framebuffers/xcb/krfb_framebuffer_xcb.desktop

@@ -0,0 +1,109 @@
+[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 X11 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[id]=Framebuffer berbasiskan X11 XDamage/XShm untuk 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[id]=Framebuffer X11 untuk 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_xcb
+X-KDE-PluginInfo-Name=xcb
+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/xcb/krfb_framebuffer_xcb.json

@@ -1,17 +1,17 @@
 {
+    "Encoding": "UTF-8",
     "KPlugin": {
         "Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en «XDamage/XShm» de l'X11 per a KRfb.",
-        "Description[ca]": "«Framebuffer» basat en «XDamage/XShm» de l'X11 per al 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[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.",
         "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
         "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver",
-        "Description[eu]": "KRfb-rako «X11 XDamage/XShm»en oinarritutako «Framebuffer».",
-        "Description[fi]": "KRfb:n X11 XDamage/XShm -pohjainen kehyspuskuri.",
+        "Description[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 X11 XDamage/Xshm para XRfb.",
         "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.",
@@ -25,13 +25,13 @@
         "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, na osnovi X11 XDamage/XShm.",
+        "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ı kare arabelleği",
+        "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 的帧缓冲。",
@@ -40,17 +40,16 @@
         "Id": "xcb",
         "License": "GPL",
         "Name": "X11 Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» de l'X11 per a KRfb",
-        "Name[ca]": "«Framebuffer» de l'X11 per al 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[en_GB]": "X11 Framebuffer for KRfb",
         "Name[es]": "Framebuffer X11 para KRfb",
         "Name[et]": "KRfb X11 kaadripuhver",
-        "Name[eu]": "KRfb-rako «X11 Framebuffer»",
-        "Name[fi]": "KRfb:n X11-kehyspuskuri",
+        "Name[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",
@@ -64,18 +63,21 @@
         "Name[pt_BR]": "Framebuffer do X11 para o KRfb",
         "Name[ru]": "Буфер кадров X11 для KRfb",
         "Name[sk]": "X11 Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik za KRfb na osnovi X11",
+        "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 kare arabelleği",
+        "Name[tr]": "KRfb için X11 Çerçeve tamponu",
         "Name[uk]": "Буфер кадрів X11 для KRfb",
         "Name[x-test]": "xxX11 Framebuffer for KRfbxx",
         "Name[zh_CN]": "XRfb 的 X11 帧缓冲",
         "Name[zh_TW]": "KRfb 的 X11 Framebuffer",
+        "ServiceTypes": [
+            "krfb/framebuffer"
+        ],
         "Version": "0.1",
-        "Website": "https://www.kde.org"
+        "Website": "http://www.kde.org"
     }
 }

framebuffers/xcb/xcb_framebuffer.cpp

@@ -8,7 +8,7 @@
 */
 
 #include "xcb_framebuffer.h"
-#include "krfb_fb_xcb_debug.h"
+#include "xcb_framebuffer.moc"
 
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
@@ -24,6 +24,7 @@
 #include <QGuiApplication>
 #include <QScreen>
 #include <QAbstractNativeEventFilter>
+#include <QDebug>
 
 
 class KrfbXCBEventFilter: public QAbstractNativeEventFilter
@@ -32,7 +33,7 @@ public:
     KrfbXCBEventFilter(XCBFrameBuffer *owner);
 
 public:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+    virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
 
 public:
     int xdamageBaseEvent;
@@ -61,14 +62,14 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
                         QX11Info::connection(),
                         XCB_DAMAGE_MAJOR_VERSION,
                         XCB_DAMAGE_MINOR_VERSION),
-                    nullptr);
+                    NULL);
         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:" <<
+        qDebug() << "xcb framebuffer: XDamage extension version:" <<
                xdamage_version->major_version << "." << xdamage_version->minor_version;
 #endif
 
@@ -105,7 +106,7 @@ bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
     if (xdamageBaseEvent == 0) return false;  // no xdamage extension
 
     if (eventType == "xcb_generic_event_t") {
-        auto ev = static_cast<xcb_generic_event_t *>(message);
+        xcb_generic_event_t* 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);
@@ -135,7 +136,7 @@ public:
 
 
 static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
-    xcb_screen_t *screen = nullptr;
+    xcb_screen_t *screen = NULL;
     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)
@@ -150,28 +151,24 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
 {
     d->running = false;
     d->damage = XCB_NONE;
-    d->framebufferImage = nullptr;
-    d->shminfo.shmaddr = nullptr;
+    d->framebufferImage = Q_NULLPTR;
+    d->shminfo.shmaddr = Q_NULLPTR;
     d->shminfo.shmid = XCB_NONE;
     d->shminfo.shmseg = XCB_NONE;
-    d->updateTile = nullptr;
+    d->updateTile = Q_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;
+    this->fb = Q_NULLPTR;
 
     QScreen *primaryScreen = QGuiApplication::primaryScreen();
     if (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()
+        qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
                  << ", geometry: " << primaryScreen->geometry()
-                 << ", device scaling: " << scaleFactor
-                 << ", native size: " << d->area
                  << ", depth: " << primaryScreen->depth();
+        //
+        d->area = primaryScreen->geometry();
     } else {
         qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
         return;
@@ -187,7 +184,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                                         XCB_IMAGE_FORMAT_Z_PIXMAP);
     if (d->framebufferImage) {
 #ifdef _DEBUG
-        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
+        qDebug() << "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;
@@ -210,20 +207,20 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                     d->area.height(),           // height
                     XCB_IMAGE_FORMAT_Z_PIXMAP,  // image format
                     d->rootScreen->root_depth,  // depth
-                    nullptr,                    // base address = 0
+                    NULL,                       // base address = 0
                     (uint32_t)~0,               // bytes = 0xffffffff
-                    nullptr);                   // data = 0
+                    NULL);                      // 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
+            qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
+            qDebug() << "    size: " << d->updateTile->width << "x" << d->updateTile->height
+                     << "(stride: " << d->updateTile->stride << ")";
+            qDebug() << "    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth; // 32, 24
+            qDebug() << "    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data;
+            qDebug() << "    size:  " << d->updateTile->size;
+            qDebug() << "    image byte order = " << d->updateTile->byte_order;  // == 0 .._LSB_FIRST
+            qDebug() << "    image bit order = " << d->updateTile->bit_order;    // == 1 .._MSB_FIRST
+            qDebug() << "    image plane_mask = " << d->updateTile->plane_mask;  // == 16777215 == 0x00FFFFFF
 #endif
 
             // allocate shared memory block only once, make its size large enough
@@ -231,7 +228,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
             // 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->shminfo.shmaddr = (uint8_t *)shmat(d->shminfo.shmid, NULL, 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.
@@ -241,7 +238,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
             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;
+            qDebug() << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
 #endif
 
             // will return 1 on success (yes!)
@@ -259,9 +256,9 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                 // 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
+                shmctl(d->shminfo.shmid, IPC_RMID, 0); // mark shm segment as removed
                 d->x11EvtFilter->xshmAvail = false;
-                d->shminfo.shmaddr = nullptr;
+                d->shminfo.shmaddr = Q_NULLPTR;
                 d->shminfo.shmid = XCB_NONE;
                 d->shminfo.shmseg = XCB_NONE;
                 qWarning() << "xcb framebuffer: ERROR: xcb_image_shm_get() result: " << shmget_res;
@@ -270,14 +267,14 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
             // 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;
+            d->updateTile->data = NULL;
             xcb_image_destroy(d->updateTile);
-            d->updateTile = nullptr;
+            d->updateTile = NULL;
         }
     }
 
 #ifdef _DEBUG
-    qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
+    qDebug() << "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;
@@ -293,7 +290,7 @@ XCBFrameBuffer::~XCBFrameBuffer() {
     //
     if (d->framebufferImage) {
         xcb_image_destroy(d->framebufferImage);
-        fb = nullptr;  // image data was already destroyed by above call
+        fb = Q_NULLPTR;  // image data was already destroyed by above call
     }
     if (d->x11EvtFilter->xshmAvail) {
         // detach shared memory
@@ -302,12 +299,12 @@ XCBFrameBuffer::~XCBFrameBuffer() {
         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
+            shmctl(d->shminfo.shmid, IPC_RMID, 0); // mark shm segment as removed
     }
     // and delete image used for shared mem
     if (d->updateTile) {
-        d->updateTile->base = nullptr;
-        d->updateTile->data = nullptr;
+        d->updateTile->base = NULL;
+        d->updateTile->data = NULL;
         xcb_image_destroy(d->updateTile);
     }
     // we don't use d->x11EvtFilter anymore, can delete it now
@@ -353,7 +350,7 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
     if (!d->framebufferImage) return;
 
     // get information about XCB visual params
-    xcb_visualtype_t *root_visualtype = nullptr;  // visual info
+    xcb_visualtype_t *root_visualtype = NULL;  // visual info
     if (d->rootScreen) {
         xcb_visualid_t root_visual = d->rootScreen->root_visual;
         xcb_depth_iterator_t depth_iter;
@@ -385,52 +382,49 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
     // information about pixels layout
 
     if (root_visualtype) {
+        uint16_t pixelmaxValue = (1 << root_visualtype->bits_per_rgb_value) - 1;
+
 #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",
+               "    blue  mask: %08x\n"
+               "    pixelMaxValue = %d\n",
                (int)root_visualtype->bits_per_rgb_value,
                root_visualtype->red_mask,
                root_visualtype->green_mask,
-               root_visualtype->blue_mask);
+               root_visualtype->blue_mask,
+               (int)pixelmaxValue);
 #endif
 
         // calculate shifts
         format.redShift = 0;
+        format.redMax = pixelmaxValue;
         if (root_visualtype->red_mask) {
             while (!(root_visualtype->red_mask & (1 << format.redShift))) {
                 format.redShift++;
             }
         }
         format.greenShift = 0;
+        format.greenMax = pixelmaxValue;
         if (root_visualtype->green_mask) {
             while (!(root_visualtype->green_mask & (1 << format.greenShift))) {
                 format.greenShift++;
             }
         }
         format.blueShift = 0;
+        format.blueMax = pixelmaxValue;
         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);
+        qDebug() << "    Calculated redShift   =" << (int)format.redShift;
+        qDebug() << "    Calculated greenShift =" << (int)format.greenShift;
+        qDebug() << "    Calculated blueShift  =" << (int)format.blueShift;
 #endif
     } else {
         // some kind of fallback (unlikely code execution will go this way)
@@ -483,10 +477,10 @@ void XCBFrameBuffer::cleanupRects() {
         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;
+            for (int i = 0; i < tiles.size(); i++) {
+                // if current rect has intersection with tiles[i], unite them
+                if (ri.intersects(tiles[i])) {
+                    tiles[i] |= ri;
                     inserted = true;
                     break;
                 }
@@ -504,25 +498,25 @@ void XCBFrameBuffer::cleanupRects() {
 
     // 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());
+    for (int i = 0; i < tiles.size(); i++) {
+        tiles[i].adjust(-30, -30, 30, 30);
+        if (tiles[i].top() < d->area.top()) {
+            tiles[i].setTop(d->area.top());
         }
-        if (tile.bottom() > d->area.bottom()) {
-            tile.setBottom(d->area.bottom());
+        if (tiles[i].bottom() > d->area.bottom()) {
+            tiles[i].setBottom(d->area.bottom());
         }
         //
-        if (tile.left() < d->area.left()) {
-            tile.setLeft(d->area.left());
+        if (tiles[i].left() < d->area.left()) {
+            tiles[i].setLeft(d->area.left());
         }
-        if (tile.right() > d->area.right()) {
-            tile.setRight(d->area.right());
+        if (tiles[i].right() > d->area.right()) {
+            tiles[i].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());
+        tiles[i].moveTo(tiles[i].left() - d->area.left(),
+                        tiles[i].top() - d->area.top());
     }
 }
 
@@ -566,7 +560,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                             0);
 
                 xcb_shm_get_image_reply_t *sgi_reply = xcb_shm_get_image_reply(
-                            QX11Info::connection(), sgi_cookie, nullptr);
+                            QX11Info::connection(), sgi_cookie, NULL);
                 if (sgi_reply) {
                     // create temporary image to get update rect contents into
                     d->updateTile = xcb_image_create_native(
@@ -575,9 +569,9 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                                 r.height(),
                                 XCB_IMAGE_FORMAT_Z_PIXMAP,
                                 d->rootScreen->root_depth,
-                                nullptr,      // base == 0
+                                NULL,         // base == 0
                                 (uint32_t)~0, // bytes == ~0
-                                nullptr);
+                                NULL);
 
                     if (d->updateTile) {
                         d->updateTile->data = d->shminfo.shmaddr;
@@ -594,9 +588,9 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                         }
 
                         // delete temporary image
-                        d->updateTile->data = nullptr;
+                        d->updateTile->data = NULL;
                         xcb_image_destroy(d->updateTile);
-                        d->updateTile = nullptr;
+                        d->updateTile = NULL;
                     }
 
                     free(sgi_reply);
@@ -605,7 +599,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
         } else {
             // not using shared memory
             // will use just xcb_image_get() and copy pixels
-            for (const QRect& r : std::as_const(tiles)) {
+            foreach(const QRect &r, 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(
@@ -682,7 +676,7 @@ void XCBFrameBuffer::stopMonitor() {
 
 
 void XCBFrameBuffer::handleXDamageNotify(xcb_generic_event_t *xevent) {
-    auto xdevt = (xcb_damage_notify_event_t *)xevent;
+    xcb_damage_notify_event_t *xdevt = (xcb_damage_notify_event_t *)xevent;
 
     QRect r((int)xdevt->area.x,     (int)xdevt->area.y,
             (int)xdevt->area.width, (int)xdevt->area.height);

framebuffers/xcb/xcb_framebuffer.h

@@ -22,18 +22,18 @@ class XCBFrameBuffer: public FrameBuffer
 {
     Q_OBJECT
 public:
-    explicit XCBFrameBuffer(WId winid, QObject *parent = nullptr);
-    ~XCBFrameBuffer() override;
+    XCBFrameBuffer(WId winid, QObject *parent = 0);
+    ~XCBFrameBuffer();
 
 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;
+    QList<QRect> modifiedTiles() Q_DECL_OVERRIDE;
+    int  depth() Q_DECL_OVERRIDE;
+    int  height() Q_DECL_OVERRIDE;
+    int  width() Q_DECL_OVERRIDE;
+    int  paddedWidth() Q_DECL_OVERRIDE;
+    void getServerFormat(rfbPixelFormat &format) Q_DECL_OVERRIDE;
+    void startMonitor() Q_DECL_OVERRIDE;
+    void stopMonitor() Q_DECL_OVERRIDE;
 
 public:
     void handleXDamageNotify(xcb_generic_event_t *xevent);

framebuffers/xcb/xcb_framebufferplugin.cpp

@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
- Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+ @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
@@ -37,9 +37,8 @@ XCBFrameBufferPlugin::~XCBFrameBufferPlugin()
 }
 
 
-FrameBuffer *XCBFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
+FrameBuffer *XCBFrameBufferPlugin::frameBuffer(WId id)
 {
-    Q_UNUSED(args);
     return new XCBFrameBuffer(id);
 }
 

framebuffers/xcb/xcb_framebufferplugin.h

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

krfb.kdev4

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

krfb/CMakeLists.txt

@@ -11,8 +11,6 @@ include(GenerateExportHeader)
 set (krfbprivate_SRCS
      framebuffer.cpp
      framebufferplugin.cpp
-     events.cpp
-     eventsplugin.cpp
 )
 
 add_library (krfbprivate
@@ -21,7 +19,6 @@ add_library (krfbprivate
 )
 generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
-
 target_link_libraries (krfbprivate
                        Qt5::Core
                        Qt5::Widgets
@@ -36,14 +33,13 @@ 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 ${KDE_INSTALL_KSERVICETYPES5DIR}
+         DESTINATION ${SERVICETYPES_INSTALL_DIR}
 )
 
 #####################################
@@ -52,9 +48,8 @@ install (FILES
 
 set (krfb_SRCS
      connectiondialog.cpp
-     framebuffermanager.cpp
      events.cpp
-     eventsmanager.cpp
+     framebuffermanager.cpp
      main.cpp
      mainwindow.cpp
      sockethelpers.cpp
@@ -66,19 +61,11 @@ 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
@@ -86,13 +73,8 @@ ki18n_wrap_ui (krfb_UI_SRCS
                    ui/mainwidget.ui
 )
 
-qt5_add_resources(krfb_SRCS
-    krfb.qrc
-)
-
 add_executable (krfb
                      ${krfb_SRCS}
-                     ${krfb_UI_SRCS}
 )
 
 target_link_libraries (krfb
@@ -102,6 +84,7 @@ target_link_libraries (krfb
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
                        Qt5::Network
+                       KF5::Completion
                        KF5::CoreAddons
                        KF5::DBusAddons
                        KF5::DNSSD
@@ -109,7 +92,6 @@ target_link_libraries (krfb
                        KF5::Notifications
                        KF5::Wallet
                        KF5::WidgetsAddons
-                       KF5::WindowSystem
                        KF5::XmlGui
                        ${LIBVNCSERVER_LIBRARIES}
 )
@@ -121,48 +103,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
@@ -170,6 +117,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

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

krfb/events.h

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

krfb/eventsmanager.cpp

@@ -1,108 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
-    @author George Goldberg <george.goldberg@collabora.co.uk>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "eventsmanager.h"
-
-#include "eventsplugin.h"
-#include "krfbconfig.h"
-#include "rfbservermanager.h"
-#include "krfbdebug.h"
-
-#include <QGlobalStatic>
-
-#include <KPluginFactory>
-#include <KPluginMetaData>
-
-#include <QtCore/QSharedPointer>
-
-class EventsManagerStatic
-{
-public:
-    EventsManager instance;
-};
-
-Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)
-
-EventsManager::EventsManager()
-{
-    //qDebug();
-
-    loadPlugins();
-}
-
-EventsManager::~EventsManager()
-{
-    //qDebug();
-}
-
-EventsManager *EventsManager::instance()
-{
-    //qDebug();
-
-    return &eventsManagerStatic->instance;
-}
-
-void EventsManager::loadPlugins()
-{
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(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;
-        }
-
-        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();
-        }
-        unique.insert (data.name());
-    }
-}
-
-QSharedPointer<EventHandler> EventsManager::eventHandler()
-{
-    QMap<QString, EventsPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        QSharedPointer<EventHandler> eventHandler(iter.value()->eventHandler());
-
-        if (eventHandler) {
-            eventHandler->setFrameBufferPlugin(RfbServerManager::instance()->framebuffer());
-            return eventHandler;
-        }
-
-        ++iter;
-    }
-
-    // No valid events plugin found.
-    qCDebug(KRFB) << "No valid event handlers found. returning null.";
-    return QSharedPointer<EventHandler>();
-}

krfb/eventsmanager.h

@@ -1,62 +0,0 @@
-/* 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_EVENTSMANAGER_H
-#define KRFB_EVENTSMANAGER_H
-
-#include "events.h"
-
-#include "krfbprivate_export.h"
-
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
-
-#include <QWidget>
-
-class EventsPlugin;
-class KPluginFactory;
-
-class KRFBPRIVATE_EXPORT EventsManager : public QObject
-{
-    Q_OBJECT
-    friend class EventsManagerStatic;
-
-public:
-    static EventsManager *instance();
-
-    ~EventsManager() override;
-
-    QSharedPointer<EventHandler> eventHandler();
-
-private:
-    Q_DISABLE_COPY(EventsManager)
-
-    EventsManager();
-
-    void loadPlugins();
-
-    QMap<QString, EventsPlugin *> m_plugins;
-    QList<QWeakPointer<EventHandler> > m_eventHandlers;
-};
-
-
-#endif  // Header guard

krfb/eventsplugin.cpp

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

krfb/eventsplugin.h

@@ -1,42 +0,0 @@
-/* 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 LIB_KRFB_EVENTSPLUGIN_H
-#define LIB_KRFB_EVENTSPLUGIN_H
-
-#include "krfbprivate_export.h"
-
-#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 EventHandler *eventHandler() = 0;
-};
-
-#endif  // Header guard
-

krfb/framebuffer.cpp

@@ -9,8 +9,9 @@
 
 #include "framebuffer.h"
 
-#include <config-krfb.h>
-#include <QCursor>
+#include "config-krfb.h"
+
+#include <X11/Xutil.h>
 
 
 FrameBuffer::FrameBuffer(WId id, QObject *parent)
@@ -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(WId id, QObject *parent = nullptr);
+    explicit FrameBuffer(WId id, QObject *parent = 0);
 
-    ~FrameBuffer() override;
+    virtual ~FrameBuffer();
 
     char *data();
 
@@ -42,18 +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:
     WId win;
-    char *fb = nullptr;
+    char *fb;
     QList<QRect> tiles;
 
 private:

krfb/framebuffermanager.cpp

@@ -22,14 +22,15 @@
 
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
-#include "krfbdebug.h"
 
+#include <QDebug>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
+#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 class FrameBufferManagerStatic
 {
@@ -60,7 +61,11 @@ FrameBufferManager *FrameBufferManager::instance()
 
 void FrameBufferManager::loadPlugins()
 {
-    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"));
+    //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();
@@ -70,19 +75,26 @@ void FrameBufferManager::loadPlugins()
         // only load plugins once, even if found multiple times!
         if (unique.contains(data.name()))
             continue;
+        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
 
-        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();
+        if (!factory) {
+            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
         } else {
-            qCDebug(KRFB) << "unable to load plugin for " << data.fileName();
+            qDebug() << "found plugin at " << data.fileName();
+        }
+
+        FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
+        if (plugin) {
+            m_plugins.insert(data.pluginId(), plugin);
+            qDebug() << "Loaded plugin with name " << data.pluginId();
+        } else {
+            qDebug() << "unable to load pluign for " << data.fileName();
         }
         unique.insert (data.name());
     }
 }
 
-QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVariantMap &args)
+QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
 {
     //qDebug();
 
@@ -105,9 +117,9 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVaria
     while (iter != m_plugins.constEnd()) {
 
         if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+            qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
 
-            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id, args));
+            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
 
             if (frameBuffer) {
                 m_frameBuffers.insert(id, frameBuffer.toWeakRef());
@@ -120,6 +132,10 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVaria
     }
 
     // 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,9 +43,9 @@ 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)

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(WId id, 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

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

krfb/krfb-events.json

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

krfb/krfb-framebuffer.desktop

@@ -3,9 +3,11 @@ 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 a 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
@@ -35,9 +37,8 @@ Comment[nl]=Framebuffer-plugins voor KRfb
 Comment[nn]=Framebuffer-tillegg KRfb
 Comment[pa]=KRfb ਲਈ ਫਰੇਮ ਬਫ਼ਰ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczki buforów ramek dla KRfb
-Comment[pt]='Plugins' do 'Framebuffer' para o KRfb
+Comment[pt]='Plugins' de 'framebuffers' para o KRfb
 Comment[pt_BR]=Plugins de framebuffers para o KRfb
-Comment[ro]=Extensii de tampon de cadre pentru KRfb
 Comment[ru]=Модуль буфера кадров для KRfb
 Comment[si]=KRfb සඳහා රාමු බෆර ප්ලගින
 Comment[sk]=Frame Buffer modul pre KRfb
@@ -51,5 +52,5 @@ 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_CN]=KRfb 帧缓冲插件
 Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式

krfb/krfb-framebuffer.json

@@ -1,17 +1,16 @@
 {
     "KPlugin": {
         "Description": "Frame Buffer plugins for KRfb",
-        "Description[ca@valencia]": "Connectors de «Frame Buffer» per a KRfb",
-        "Description[ca]": "Connectors de «Frame Buffer» per al 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[en_GB]": "Frame Buffer plugins for KRfb",
         "Description[es]": "Complementos de framebuffer para KRfb",
         "Description[et]": "KRfb kaadripuhvri pluginad",
-        "Description[eu]": "KRfb-rako «Frame Buffer» pluginak",
-        "Description[fi]": "KRfb:n kehyspuskuriliitännäinen",
+        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
         "Description[fr]": "Modules de tampons d'image pour KRfb",
         "Description[gl]": "Complemento de búfer de fotograma para KRfb",
         "Description[ia]": "Plug-ins de Frame Buffer per KRfb",
@@ -25,7 +24,7 @@
         "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
         "Description[ru]": "Модули буфера кадров для KRfb",
         "Description[sk]": "Frame Buffer modul pre KRfb",
-        "Description[sl]": "Vtičniki vmesnika medpomnilnika za 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",

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>

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
@@ -75,6 +76,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 +99,7 @@ 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[id]=Pengguna Menyetujui Sambungan
 Name[is]=Notandi samþykkir tengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
@@ -136,6 +138,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 +164,7 @@ 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[id]=Pengguna menyetujui sambungan
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
@@ -208,6 +211,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 +234,7 @@ 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[id]=Pengguna Menampik Sambungan
 Name[is]=Notandi hafnar tengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
@@ -269,6 +273,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 +299,7 @@ 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[id]=Pengguna menampik sambungan
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
@@ -341,6 +346,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 +369,7 @@ Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
 Name[hu]=A kapcsolat megszűnt
 Name[ia]=Connexion claudite
-Name[id]=Koneksi Ditutup
+Name[id]=Sambungan Ditutup
 Name[is]=Tengingu lokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
@@ -404,6 +410,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 +437,7 @@ Comment[hne]=कनेक्सन बन्द
 Comment[hr]=Veza prekinuta
 Comment[hu]=A kapcsolat megszűnt
 Comment[ia]=Connexion claudite
-Comment[id]=Koneksi ditutup
+Comment[id]=Sambungan ditutup
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
@@ -480,6 +487,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
@@ -502,7 +510,7 @@ Name[hne]=अवैध पासवर्ड
 Name[hr]=Nevažeća zaporka
 Name[hu]=Érvénytelen jelszó
 Name[ia]=Contrasigno invalide
-Name[id]=Sandi Tidak Absah
+Name[id]=Sandi Tidak Sah
 Name[is]=Ógilt lykilorð
 Name[it]=Password non valida
 Name[ja]=無効なパスワード
@@ -518,7 +526,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 +551,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 
@@ -569,7 +578,7 @@ Comment[hne]=अवैध पासवर्ड
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
 Comment[ia]=Contrasigno invalide
-Comment[id]=Sandi tidak absah
+Comment[id]=Sandi tidak sah
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=無効なパスワード
@@ -589,7 +598,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 +633,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
@@ -644,7 +653,7 @@ 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[id]=Undangan Sandi Tidak Sah
 Name[is]=Ógild lykilorðsboð
 Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
@@ -683,6 +692,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 +711,14 @@ 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 incorrecto. 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[id]=Undangan mengirimkan sebuah sandi tidak sah. Sambungan 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 +763,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 +786,7 @@ 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[id]=Sambungan Baru sedang Tertahan
 Name[is]=Ný tenging á bið
 Name[it]=Nuova connessione in attesa
 Name[ja]=保留中の新しい接続
@@ -813,6 +824,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 +850,7 @@ 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[id]=Sambungan 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 +896,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 +919,7 @@ 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[id]=Sambungan Baru Tersetujui Otomatis
 Name[is]=Ný tenging sjálfvirkt samþykkt
 Name[it]=Nuova connessione accettata automaticamente
 Name[ja]=新しい接続の自動受け入れ
@@ -944,6 +957,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 +983,7 @@ 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[id]=Sambungan baru secara otomatis terpancang
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Nuova connessione stabilita automaticamente
 Comment[ja]=新しい接続を自動的に確立しました
@@ -1015,6 +1029,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 +1052,7 @@ Name[hne]=बहुत अकन कनेक्सन
 Name[hr]=Previše veza
 Name[hu]=Túl sok kapcsolat
 Name[ia]=Nimie connexiones
-Name[id]=Terlalu Banyak Koneksi
+Name[id]=Terlalu Banyak Sambungan
 Name[is]=Of margar tengingar
 Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
@@ -1075,6 +1090,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 +1110,14 @@ 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[id]=Sibuk, sambungan ditampik
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
@@ -1149,6 +1165,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 +1188,7 @@ Name[hne]=अप्रत्यासित कनेक्सन
 Name[hr]=Neočekivana veza
 Name[hu]=Nem várt kapcsolat
 Name[ia]=Connexion impreviste
-Name[id]=Koneksi Tak Terduga
+Name[id]=Sambungan Tak Terduga
 Name[is]=Óvænt Tenging
 Name[it]=Connessione inattesa
 Name[ja]=予期しない接続
@@ -1210,11 +1227,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 +1246,14 @@ 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[id]=Diperoleh sambungan tak terduga, gugurkan
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inattesa, terminata
 Comment[ja]=予期しない接続を受信しました。廃棄します。
@@ -1253,7 +1271,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>

krfb/main-virtualmonitor.cpp

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

krfb/main.cpp

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

krfb/mainwindow.cpp

@@ -18,10 +18,11 @@
 #include <KConfigDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KMessageWidget>
 #include <KStandardAction>
 #include <KActionCollection>
+#include <KLineEdit>
 #include <KNewPasswordDialog>
+#include <KPluginLoader>
 #include <KPluginMetaData>
 
 #include <QIcon>
@@ -31,14 +32,13 @@
 #include <QSizePolicy>
 #include <QVector>
 #include <QSet>
-#include <QNetworkInterface>
-#include <QHostInfo>
+#include <QtNetwork/QNetworkInterface>
 
 
 class TCP: public QWidget, public Ui::TCP
 {
 public:
-    explicit TCP(QWidget *parent = nullptr) : QWidget(parent) {
+    TCP(QWidget *parent = 0) : QWidget(parent) {
         setupUi(this);
     }
 };
@@ -46,28 +46,15 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    explicit Security(QWidget *parent = nullptr) : QWidget(parent) {
+    Security(QWidget *parent = 0) : QWidget(parent) {
         setupUi(this);
-        walletWarning = new KMessageWidget(this);
-        walletWarning->setText(i18n("Storing passwords in config file is insecure!"));
-        walletWarning->setCloseButtonVisible(false);
-        walletWarning->setMessageType(KMessageWidget::Warning);
-        walletWarning->hide();
-        vboxLayout->addWidget(walletWarning);
-
-        // show warning when "noWallet" checkbox is checked
-        QObject::connect(kcfg_noWallet, &QCheckBox::toggled, this, [this] (bool checked) {
-            walletWarning->setVisible(checked);
-        });
     }
-
-    KMessageWidget *walletWarning = nullptr;
 };
 
 class ConfigFramebuffer: public QWidget, public Ui::Framebuffer
 {
 public:
-    ConfigFramebuffer(QWidget *parent = nullptr) : QWidget(parent) {
+    ConfigFramebuffer(QWidget *parent = 0) : QWidget(parent) {
         setupUi(this);
         // hide the line edit with framebuffer string
         kcfg_preferredFrameBufferPlugin->hide();
@@ -82,7 +69,10 @@ public:
     }
 
     void fillFrameBuffersCombo() {
-        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"));
+        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(
+                    QStringLiteral("krfb"), [](const KPluginMetaData & md) {
+            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
+        });
         QSet<QString> unique;
         QVectorIterator<KPluginMetaData> i(plugins);
         i.toBack();
@@ -102,13 +92,13 @@ MainWindow::MainWindow(QWidget *parent)
     setAttribute(Qt::WA_DeleteOnClose, false);
 
     m_passwordEditable = false;
-    m_passwordLineEdit = new QLineEdit(this);
+    m_passwordLineEdit = new KLineEdit(this);
     m_passwordLineEdit->setVisible(false);
     m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
 
-    auto mainWidget = new QWidget;
+    QWidget *mainWidget = new QWidget;
     m_ui.setupUi(mainWidget);
-    m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
+    m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
             InvitationsRfbServer::instance->allowUnattendedAccess());
 
@@ -131,20 +121,16 @@ MainWindow::MainWindow(QWidget *parent)
 
     // Figure out the address
     int port = KrfbConfig::port();
-    const QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
-    for (const QNetworkInterface& interface : interfaceList) {
+    QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
+    foreach(const QNetworkInterface & interface, interfaceList) {
         if(interface.flags() & QNetworkInterface::IsLoopBack)
             continue;
 
         if(interface.flags() & QNetworkInterface::IsRunning &&
-                !interface.addressEntries().isEmpty()) {
-            const QString hostName = QHostInfo::localHostName();
-            const QString ipAddress = interface.addressEntries().constFirst().ip().toString();
-            const QString addressLabelText = hostName.isEmpty()
-                ? QStringLiteral("%1 : %2").arg(ipAddress).arg(port)
-                : QStringLiteral("%1 (%2) : %3").arg(hostName, ipAddress).arg(port);
-            m_ui.addressDisplayLabel->setText(addressLabelText);
-        }
+                !interface.addressEntries().isEmpty())
+            m_ui.addressDisplayLabel->setText(QString("%1 : %2")
+                    .arg(interface.addressEntries().first().ip().toString())
+                    .arg(port));
     }
 
     //Figure out the password
@@ -171,7 +157,7 @@ void MainWindow::editPassword()
 {
     if(m_passwordEditable) {
         m_passwordEditable = false;
-        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
         m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
         InvitationsRfbServer::instance->setDesktopPassword(
                 m_passwordLineEdit->text());
@@ -180,7 +166,7 @@ void MainWindow::editPassword()
         m_passwordLineEdit->setVisible(false);
     } else {
         m_passwordEditable = true;
-        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-save"));
         m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
         m_passwordLineEdit->setText(
                 InvitationsRfbServer::instance->desktopPassword());
@@ -212,7 +198,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
         if(m_passwordEditable) {
             m_passwordEditable = false;
             m_passwordLineEdit->setVisible(false);
-            m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
+            m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
         }
     }
 }
@@ -240,41 +226,26 @@ void MainWindow::aboutUnattendedMode()
 void MainWindow::showConfiguration()
 {
     static QString s_prevFramebufferPlugin;
-    static bool s_prevNoWallet;
     // ^^ needs to be static, because lambda will be called long time
     //    after showConfiguration() ends, so auto variable would go out of scope
     // save previously selected framebuffer plugin config
     s_prevFramebufferPlugin = KrfbConfig::preferredFrameBufferPlugin();
-    s_prevNoWallet = KrfbConfig::noWallet();
 
-    if (KConfigDialog::showDialog(QStringLiteral("settings"))) {
+    if (KConfigDialog::showDialog("settings")) {
         return;
     }
 
-    auto dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
-    dialog->addPage(new TCP, i18n("Network"), QStringLiteral("network-wired"));
-    dialog->addPage(new Security, i18n("Security"), QStringLiteral("security-high"));
-    dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), QStringLiteral("video-display"));
+    KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
+    dialog->addPage(new TCP, i18n("Network"), "network-wired");
+    dialog->addPage(new Security, i18n("Security"), "security-high");
+    dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), "video-display");
     dialog->show();
-    connect(dialog, &KConfigDialog::settingsChanged, this, [this] () {
+    connect(dialog, &KConfigDialog::settingsChanged, [this] () {
         // check if framebuffer plugin config has changed
         if (s_prevFramebufferPlugin != KrfbConfig::preferredFrameBufferPlugin()) {
             KMessageBox::information(this, i18n("To apply framebuffer plugin setting, "
                                                 "you need to restart the program."));
         }
-        // check if kwallet config has changed
-        if (s_prevNoWallet != KrfbConfig::noWallet()) {
-            // try to apply settings immediately
-            if (KrfbConfig::noWallet()) {
-                InvitationsRfbServer::instance->closeKWallet();
-            } else {
-                InvitationsRfbServer::instance->openKWallet();
-                // erase stored passwords from krfbconfig file
-                KConfigGroup securityConfigGroup(KSharedConfig::openConfig(), "Security");
-                securityConfigGroup.deleteEntry("desktopPassword");
-                securityConfigGroup.deleteEntry("unattendedPassword");
-            }
-        }
     });
 }
 
@@ -291,3 +262,5 @@ void MainWindow::saveProperties(KConfigGroup& group)
     group.writeEntry("Visible", isVisible());
     KMainWindow::saveProperties(group);
 }
+
+#include "mainwindow.moc"

krfb/mainwindow.h

@@ -8,22 +8,22 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#ifndef KRFB_MAINWINDOW_H
-#define KRFB_MAINWINDOW_H
+#ifndef MANAGEINVITATIONSDIALOG_H
+#define MANAGEINVITATIONSDIALOG_H
 
 #include "ui_mainwidget.h"
 
 #include <KXmlGuiWindow>
 
-class QLineEdit;
+class KLineEdit;
 
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
 
     public:
-        explicit MainWindow(QWidget *parent = nullptr);
-        ~MainWindow() override;
+        MainWindow(QWidget *parent = 0);
+        ~MainWindow();
 
     public Q_SLOTS:
         void showConfiguration();
@@ -43,7 +43,7 @@ class MainWindow : public KXmlGuiWindow
     private:
         Ui::MainWidget m_ui;
         bool m_passwordEditable;
-        QLineEdit *m_passwordLineEdit = nullptr;
+        KLineEdit *m_passwordLineEdit;
 };
 
 #endif

krfb/org.kde.krfb.appdata.xml

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

krfb/org.kde.krfb.desktop

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

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

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

krfb/rfbclient.cpp

@@ -21,11 +21,11 @@
 #include "connectiondialog.h"
 #include "krfbconfig.h"
 #include "sockethelpers.h"
-#include "eventsmanager.h"
-#include <QSocketNotifier>
+#include "events.h"
+#include <QtCore/QSocketNotifier>
+#include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
-#include "krfbdebug.h"
 
 struct RfbClient::Private
 {
@@ -37,21 +37,18 @@ struct RfbClient::Private
     bool controlEnabled;
     rfbClientPtr client;
     QSocketNotifier *notifier;
-    QSharedPointer<EventHandler> eventHandler;
     QString remoteAddressString;
 };
 
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
     : QObject(parent), d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') +
+    d->remoteAddressString = peerAddress(d->client->sock) + ":" +
                              QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(false);
     connect(d->notifier, &QSocketNotifier::activated, this, &RfbClient::onSocketActivated);
-
-    d->eventHandler = EventsManager::instance()->eventHandler();
 }
 
 RfbClient::~RfbClient()
@@ -113,14 +110,14 @@ rfbClientPtr RfbClient::getRfbClientPtr()
 void RfbClient::handleKeyboardEvent(bool down, rfbKeySym keySym)
 {
     if (d->controlEnabled) {
-        d->eventHandler->handleKeyboard(down, keySym);
+        EventHandler::handleKeyboard(down, keySym);
     }
 }
 
 void RfbClient::handleMouseEvent(int buttonMask, int x, int y)
 {
     if (d->controlEnabled) {
-        d->eventHandler->handlePointer(buttonMask, x, y);
+        EventHandler::handlePointer(buttonMask, x, y);
     }
 }
 
@@ -171,13 +168,8 @@ void RfbClient::update()
 
 PendingRfbClient::PendingRfbClient(rfbClientPtr client, QObject *parent)
     : QObject(parent), m_rfbClient(client)
-    , m_notifier(new QSocketNotifier(client->sock, QSocketNotifier::Read, this))
 {
     m_rfbClient->clientData = this;
-
-    m_notifier->setEnabled(true);
-    connect(m_notifier, &QSocketNotifier::activated,
-            this, &PendingRfbClient::onSocketActivated);
 }
 
 PendingRfbClient::~PendingRfbClient()
@@ -205,7 +197,7 @@ void PendingRfbClient::reject()
     rfbCloseClient(m_rfbClient);
     rfbClientConnectionGone(m_rfbClient);
 
-    Q_EMIT finished(nullptr);
+    Q_EMIT finished(NULL);
     deleteLater();
 }
 
@@ -213,7 +205,7 @@ bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     Q_UNUSED(encryptedPassword);
 
-    return m_rfbClient->screen->authPasswdData == (void*)nullptr;
+    return m_rfbClient->screen->authPasswdData == (void*)0;
 }
 
 bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
@@ -222,49 +214,19 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
         return true;
     }
 
-    char passwd[MAXPWLEN+1]; // +1 to make sure there's a nullptr at the end
+    char passwd[MAXPWLEN];
     unsigned char challenge[CHALLENGESIZE];
 
     memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE);
-    memset(passwd, 0, sizeof(passwd));
+    bzero(passwd, MAXPWLEN);
 
     if (!password.isEmpty()) {
-        strncpy(passwd, password.constData(),
+        strncpy(passwd, password,
                 (MAXPWLEN <= password.size()) ? MAXPWLEN : password.size());
     }
 
     rfbEncryptBytes(challenge, passwd);
-    return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
+    return memcmp(challenge, encryptedPassword, encryptedPassword.size()) == 0;
 }
 
-void PendingRfbClient::onSocketActivated()
-{
-    //Process not only one, but all pending messages.
-    //poll() idea/code copied from vino:
-    // Copyright (C) 2003 Sun Microsystems, Inc.
-    // License: GPL v2 or later
-    struct pollfd pollfd = { m_rfbClient->sock, POLLIN|POLLPRI, 0 };
-
-    while(poll(&pollfd, 1, 0) == 1) {
-        if(m_rfbClient->state == rfbClientRec::RFB_INITIALISATION) {
-            m_notifier->setEnabled(false);
-            //Client is Authenticated
-            processNewClient();
-            break;
-        }
-        rfbProcessClientMessage(m_rfbClient);
-
-        //This is how we handle disconnection.
-        //if rfbProcessClientMessage() finds out that it can't read the socket,
-        //it closes it and sets it to -1. So, we just have to check this here
-        //and call rfbClientConnectionGone() if necessary. This will call
-        //the clientGoneHook which in turn will remove this RfbClient instance
-        //from the server manager and will call deleteLater() to delete it
-        if (m_rfbClient->sock == -1) {
-            qCDebug(KRFB) << "disconnected from socket signal";
-            m_notifier->setEnabled(false);
-            rfbClientConnectionGone(m_rfbClient);
-            break;
-        }
-    }
-}
+#include "rfbclient.moc"

krfb/rfbclient.h

@@ -21,9 +21,7 @@
 #define RFBCLIENT_H
 
 #include "rfb.h"
-#include <QObject>
-
-class QSocketNotifier;
+#include <QtCore/QObject>
 
 class RfbClient : public QObject
 {
@@ -31,8 +29,8 @@ class RfbClient : public QObject
     Q_PROPERTY(bool controlEnabled READ controlEnabled WRITE setControlEnabled NOTIFY controlEnabledChanged)
     Q_PROPERTY(bool onHold READ isOnHold WRITE setOnHold NOTIFY holdStatusChanged)
 public:
-    explicit RfbClient(rfbClientPtr client, QObject *parent = nullptr);
-    ~RfbClient() override;
+    RfbClient(rfbClientPtr client, QObject *parent = 0);
+    virtual ~RfbClient();
 
     /** Returns a name for the client, to be shown to the user */
     virtual QString name() const;
@@ -75,8 +73,8 @@ class PendingRfbClient : public QObject
 {
     Q_OBJECT
 public:
-    explicit PendingRfbClient(rfbClientPtr client, QObject *parent = nullptr);
-    ~PendingRfbClient() override;
+    PendingRfbClient(rfbClientPtr client, QObject *parent = 0);
+    virtual ~PendingRfbClient();
 
 Q_SIGNALS:
     void finished(RfbClient *client);
@@ -99,18 +97,13 @@ protected:
     virtual bool checkPassword(const QByteArray & encryptedPassword);
 
     /** This method checks if the \a encryptedPassword that was sent from the remote
-     * user matches the \a password that you have specified locally to be the password
+     * user matches the \a password that you have specified localy to be the password
      * for this connection. This assumes that the standard VNC authentication mechanism
      * is used. Returns true if the password matches or false otherwise.
      */
     bool vncAuthCheckPassword(const QByteArray & password, const QByteArray & encryptedPassword) const;
 
     rfbClientPtr m_rfbClient;
-
-private:
-    void onSocketActivated();
-
-    QSocketNotifier *const m_notifier;
 };
 
 #endif // RFBCLIENT_H

krfb/rfbserver.cpp

@@ -19,12 +19,10 @@
 */
 #include "rfbserver.h"
 #include "rfbservermanager.h"
-#include "krfbdebug.h"
-#include <QSocketNotifier>
+#include <QtCore/QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
-#include <QPointer>
-#include <QX11Info>
+#include <QDebug>
 
 struct RfbServer::Private
 {
@@ -32,8 +30,7 @@ struct RfbServer::Private
     int listeningPort;
     bool passwordRequired;
     rfbScreenInfoPtr screen;
-    QPointer<QSocketNotifier> ipv4notifier;
-    QPointer<QSocketNotifier> ipv6notifier;
+    QSocketNotifier *notifier;
 };
 
 RfbServer::RfbServer(QObject *parent)
@@ -42,7 +39,8 @@ RfbServer::RfbServer(QObject *parent)
     d->listeningAddress = "0.0.0.0";
     d->listeningPort = 0;
     d->passwordRequired = true;
-    d->screen = nullptr;
+    d->screen = NULL;
+    d->notifier = NULL;
 
     RfbServerManager::instance()->registerServer(this);
 }
@@ -92,7 +90,7 @@ bool RfbServer::start()
     if (!d->screen) {
         d->screen = RfbServerManager::instance()->newScreen();
         if (!d->screen) {
-            qCDebug(KRFB) << "Unable to get rbfserver screen";
+            qDebug() << "Unable to get rbfserver screen";
             return false;
         }
 
@@ -109,7 +107,7 @@ bool RfbServer::start()
     }
 
     if (listeningAddress() != "0.0.0.0") {
-        strncpy(d->screen->thisHost, listeningAddress().constData(), 254);
+        strncpy(d->screen->thisHost, listeningAddress().data(), 254);
     }
 
     if (listeningPort() == 0) {
@@ -117,39 +115,31 @@ bool RfbServer::start()
     }
 
     d->screen->port = listeningPort();
-    d->screen->ipv6port = listeningPort();
 
     // Disable/Enable password checking
     if (passwordRequired()) {
         d->screen->authPasswdData = (void *)1;
     } else {
-        d->screen->authPasswdData = (void *)nullptr;
+        d->screen->authPasswdData = (void *)0;
     }
 
-    qCDebug(KRFB) << "Starting server. Listen port:" << listeningPort()
+    qDebug() << "Starting server. Listen port:" << listeningPort()
              << "Listen Address:" << listeningAddress()
              << "Password enabled:" << passwordRequired();
 
     rfbInitServer(d->screen);
 
     if (!rfbIsActive(d->screen)) {
-        qCDebug(KRFB) << "Failed to start server";
+        qDebug() << "Failed to start server";
         rfbShutdownServer(d->screen, false);
         return false;
     };
 
-    d->ipv4notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
-    connect(d->ipv4notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
-    if (d->screen->listen6Sock > 0) {
-        // we're also listening on additional IPv6 socket, get events from there
-        d->ipv6notifier = new QSocketNotifier(d->screen->listen6Sock, QSocketNotifier::Read, this);
-        connect(d->ipv6notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
-    }
-
-    if (QX11Info::isPlatformX11()) {
-        connect(QApplication::clipboard(), &QClipboard::dataChanged,
-                this, &RfbServer::krfbSendServerCutText);
-    }
+    d->notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
+    d->notifier->setEnabled(true);
+    connect(d->notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    connect(QApplication::clipboard(), &QClipboard::dataChanged,
+            this, &RfbServer::krfbSendServerCutText);
 
     return true;
 }
@@ -158,26 +148,14 @@ void RfbServer::stop()
 {
     if (d->screen) {
         rfbShutdownServer(d->screen, true);
-        for (auto notifier : {d->ipv4notifier, d->ipv6notifier}) {
-            if (notifier) {
-                notifier->setEnabled(false);
-                notifier->deleteLater();
-            }
+        if (d->notifier) {
+            d->notifier->setEnabled(false);
+            d->notifier->deleteLater();
+            d->notifier = NULL;
         }
     }
 }
 
-void RfbServer::updateFrameBuffer(char *fb, int width, int height, int depth)
-{
-    int bpp = depth >> 3;
-
-    if (bpp != 1 && bpp != 2 && bpp != 4) {
-        bpp = 4;
-    }
-
-    rfbNewFramebuffer(d->screen, fb, width, height, 8, 3, bpp);
-}
-
 void RfbServer::updateScreen(const QList<QRect> & modifiedTiles)
 {
     if (d->screen) {
@@ -209,7 +187,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 
     /* Inform all clients about this cursor movement. */
     iterator = rfbGetClientIterator(screen);
-    while ((cl = rfbClientIteratorNext(iterator)) != nullptr) {
+    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
         cl->cursorWasMoved = true;
     }
     rfbReleaseClientIterator(iterator);
@@ -223,7 +201,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 void RfbServer::updateCursorPosition(const QPoint & position)
 {
     if (d->screen) {
-        krfb_rfbSetCursorPosition(d->screen, nullptr, position.x(), position.y());
+        krfb_rfbSetCursorPosition(d->screen, NULL, position.x(), position.y());
     }
 }
 
@@ -254,7 +232,7 @@ void RfbServer::pendingClientFinished(RfbClient *client)
 rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 {
     //qDebug() << "New client";
-    auto server = static_cast<RfbServer*>(cl->screen->screenData);
+    RfbServer *server = static_cast<RfbServer*>(cl->screen->screenData);
 
     PendingRfbClient *pendingClient = server->newClient(cl);
     connect(pendingClient, &PendingRfbClient::finished,
@@ -267,7 +245,7 @@ rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 void RfbServer::clientGoneHook(rfbClientPtr cl)
 {
     //qDebug() << "client gone";
-    auto client = static_cast<RfbClient*>(cl->clientData);
+    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
 
     RfbServerManager::instance()->removeClient(client);
     client->deleteLater();
@@ -276,7 +254,7 @@ void RfbServer::clientGoneHook(rfbClientPtr cl)
 //static
 rfbBool RfbServer::passwordCheck(rfbClientPtr cl, const char *encryptedPassword, int len)
 {
-    auto client = static_cast<PendingRfbClient*>(cl->clientData);
+    PendingRfbClient *client = static_cast<PendingRfbClient*>(cl->clientData);
     Q_ASSERT(client);
     return client->checkPassword(QByteArray::fromRawData(encryptedPassword, len));
 }
@@ -284,14 +262,14 @@ rfbBool RfbServer::passwordCheck(rfbClientPtr cl, const char *encryptedPassword,
 //static
 void RfbServer::keyboardHook(rfbBool down, rfbKeySym keySym, rfbClientPtr cl)
 {
-    auto client = static_cast<RfbClient*>(cl->clientData);
+    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
     client->handleKeyboardEvent(down ? true : false, keySym);
 }
 
 //static
 void RfbServer::pointerHook(int bm, int x, int y, rfbClientPtr cl)
 {
-    auto client = static_cast<RfbClient*>(cl->clientData);
+    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
     client->handleMouseEvent(bm, x, y);
 }
 
@@ -300,3 +278,5 @@ void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
     QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
 }
+
+#include "rfbserver.moc"

krfb/rfbserver.h

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

krfb/rfbservermanager.cpp

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

krfb/rfbservermanager.h

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

krfb/sockethelpers.cpp

@@ -28,35 +28,37 @@
 
 QString peerAddress(int sock)
 {
+
     const int ADDR_SIZE = 50;
-    struct sockaddr sa = {};
+    struct sockaddr sa;
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getpeername(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
-            auto si = (struct sockaddr_in *)&sa;
-            return QString::fromLatin1(inet_ntoa(si->sin_addr));
+            struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+            return QString(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString::fromLatin1(inetbuf);
+            return QString(inetbuf);
         }
 
-        return QStringLiteral("not a network address");
+        return QString("not a network address");
     }
 
-    return QStringLiteral("unable to determine...");
+    return QString("unable to determine...");
 }
 
 unsigned short peerPort(int sock)
 {
-    struct sockaddr sa = {};
+
+    struct sockaddr sa;
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getpeername(sock, &sa, &salen) == 0) {
-        auto si = (struct sockaddr_in *)&sa;
+        struct sockaddr_in *si = (struct sockaddr_in *)&sa;
         return ntohs(si->sin_port);
     }
 
@@ -65,35 +67,37 @@ unsigned short peerPort(int sock)
 
 QString localAddress(int sock)
 {
+
     const int ADDR_SIZE = 50;
-    struct sockaddr sa = {};
+    struct sockaddr sa;
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getsockname(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
-            auto si = (struct sockaddr_in *)&sa;
-            return QString::fromLatin1(inet_ntoa(si->sin_addr));
+            struct sockaddr_in *si = (struct sockaddr_in *)&sa;
+            return QString(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString::fromLatin1(inetbuf);
+            return QString(inetbuf);
         }
 
-        return QStringLiteral("not a network address");
+        return QString("not a network address");
     }
 
-    return QStringLiteral("unable to determine...");
+    return QString("unable to determine...");
 }
 
 unsigned short localPort(int sock)
 {
-    struct sockaddr sa = {};
+
+    struct sockaddr sa;
     socklen_t salen = sizeof(struct sockaddr);
 
     if (getsockname(sock, &sa, &salen) == 0) {
-        auto si = (struct sockaddr_in *)&sa;
+        struct sockaddr_in *si = (struct sockaddr_in *)&sa;
         return ntohs(si->sin_port);
     }
 

krfb/sockethelpers.h

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

krfb/trayicon.cpp

@@ -41,11 +41,11 @@ public:
     virtual ~ClientActions();
 
 private:
-    QMenu *m_menu = nullptr;
-    QAction *m_title = nullptr;
-    QAction *m_disconnectAction = nullptr;
-    QAction *m_enableControlAction = nullptr;
-    QAction *m_separator = nullptr;
+    QMenu *m_menu;
+    QAction *m_title;
+    QAction *m_disconnectAction;
+    QAction *m_enableControlAction;
+    QAction *m_separator;
 };
 
 ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
@@ -68,7 +68,7 @@ ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
         QObject::connect(client, &RfbClient::controlEnabledChanged,
                          m_enableControlAction, &KToggleAction::setChecked);
     } else {
-        m_enableControlAction = nullptr;
+        m_enableControlAction = NULL;
     }
 
     m_separator = m_menu->insertSeparator(before);
@@ -96,7 +96,7 @@ ClientActions::~ClientActions()
 TrayIcon::TrayIcon(QWidget *mainWindow)
     : KStatusNotifierItem(mainWindow)
 {
-    setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
+    setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
 
     setToolTipTitle(i18n("Desktop Sharing - disconnected"));
     setCategory(KStatusNotifierItem::ApplicationStatus);
@@ -113,7 +113,7 @@ TrayIcon::TrayIcon(QWidget *mainWindow)
 void TrayIcon::onClientConnected(RfbClient* client)
 {
     if (m_clientActions.isEmpty()) { //first client connected
-        setIconByName(QStringLiteral("krfb"));
+        setIconByName("krfb");
         setToolTipTitle(i18n("Desktop Sharing - connected with %1", client->name()));
         setStatus(KStatusNotifierItem::Active);
     } else { //Nth client connected, N != 1
@@ -129,7 +129,7 @@ void TrayIcon::onClientDisconnected(RfbClient* client)
     delete actions;
 
     if (m_clientActions.isEmpty()) {
-        setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
+        setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
         setToolTipTitle(i18n("Desktop Sharing - disconnected"));
         setStatus(KStatusNotifierItem::Passive);
     } else if (m_clientActions.size() == 1) { //clients number dropped back to 1
@@ -143,3 +143,5 @@ void TrayIcon::showAbout()
     KHelpMenu menu;
     menu.aboutApplication();
 }
+
+#include "trayicon.moc"

krfb/trayicon.h

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

krfb/ui/configsecurity.ui

@@ -21,13 +21,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_noWallet">
-     <property name="text">
-      <string>Do not store passwords using KDE wallet</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <spacer>
      <property name="orientation">

krfb/ui/configtcp.ui

@@ -10,6 +10,12 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
     <widget class="QCheckBox" name="kcfg_publishService" >
      <property name="text" >
@@ -31,20 +37,14 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout">
-     <property name="leftMargin">
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="topMargin">
-      <number>0</number>
+     <property name="spacing" >
+      <number>6</number>
      </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item row="0" column="0">
+     <item>
       <widget class="QLabel" name="label" >
        <property name="text" >
         <string>Listening port:</string>
@@ -54,7 +54,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item>
       <widget class="QSpinBox" name="kcfg_port" >
        <property name="enabled" >
         <bool>false</bool>
@@ -66,19 +66,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <tabstops>