GIT_SILENT Sync po/docbooks with svn

(cherry picked from commit 6fb016892e)

.arcconfig

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

.flatpak-manifest.json

@@ -0,0 +1,100 @@
+{
+    "id": "org.kde.krfb",
+    "branch": "master",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "6.10",
+    "sdk": "org.kde.Sdk",
+    "command": "krfb",
+    "tags": [
+        "nightly"
+    ],
+    "desktop-file-name-suffix": " (Nightly)",
+    "finish-args": [
+        "--share=ipc",
+        "--socket=fallback-x11",
+        "--socket=wayland"
+    ],
+    "rename-icon": "krfb",
+    "modules": [
+        {
+            "name": "libgpg-error",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.61.tar.bz2",
+                    "sha256": "7a85413f2bc354f4f8aa832b718af122e48965e9e0eb9012ee659c13c6385c93",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1628,
+                        "stable-only": true,
+                        "url-template": "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${version}.tar.bz2"
+                    }
+                }
+            ],
+            "cleanup": [
+                "/lib/libgpg-error.la"
+            ]
+        },
+        {
+            "name": "libgcrypt",
+            "config-opts": [
+                "--disable-doc"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.12.2.tar.bz2",
+                    "sha256": "7ce33c2492221a0436f96a8500215e9f3e3dcb5fd26a757cd415e7a843babd5e",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1623,
+                        "stable-only": true,
+                        "url-template": "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$version.tar.bz2"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "libvncserver",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/LibVNC/libvncserver",
+                    "branch": "LibVNCServer-0.9.14"
+                }
+            ]
+        },
+        {
+            "name": "kpipewire",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DBUILD_TESTING=OFF"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://invent.kde.org/plasma/kpipewire.git",
+                    "branch": "master"
+                }
+            ]
+        },
+        {
+            "name": "krfb",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_BUILD_TYPE=debug",
+                "-DPLASMA_ENABLED=OFF"
+            ],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "."
+                }
+            ]
+        }
+    ]
+}

.flatpak-manifest.json.license

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

.gitignore

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

.gitlab-ci.yml

@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/linux-qt6-next.yml
+      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/flatpak.yml
+      - /gitlab-templates/xml-lint.yml
+      - /gitlab-templates/yaml-lint.yml

.kde-ci.yml

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

CMakeLists.txt

@@ -1,17 +1,17 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "08")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MAJOR "26")
+set (RELEASE_SERVICE_VERSION_MINOR "07")
+set (RELEASE_SERVICE_VERSION_MICRO "70")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})
 
-set(QT_MIN_VERSION 5.10.0)
-set(KF5_MIN_VERSION 5.31.0)
+set(QT_MIN_VERSION 6.5.0)
+set(KF6_MIN_VERSION 6.2.0)
 
-find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
+find_package(ECM ${KF6_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
@@ -20,19 +20,29 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
+include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
 include(FeatureSummary)
 include(CheckIncludeFile)
 
+include(KDEClangFormat)
+include(KDEGitCommitHooks)
+
+# add clang-format target for all our real source files
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
+kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+
 check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
-
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets)
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+    find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+endif()
+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
     I18n
-    Completion
     Config
     CoreAddons
-    Crash
     DBusAddons
     DNSSD
     DocTools
@@ -41,6 +51,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     WidgetsAddons
     WindowSystem
     XmlGui
+    StatusNotifierItem
+    Crash
 )
 
 find_package(X11 REQUIRED)
@@ -60,28 +72,31 @@ if(WIN32)
     set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)
 
-add_definitions(
-    -DQT_DEPRECATED_WARNINGS
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x050600
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_STRICT_ITERATORS
-    -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+ecm_set_disabled_deprecation_versions(
+    QT 6.7.0
+    KF 6.5.0
 )
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
 
-find_package(LibVNCServer REQUIRED)
+find_package(LibVNCServer 0.9.14 REQUIRED)
 
-find_package(PipeWire)
-set_package_properties(PipeWire PROPERTIES
-    TYPE OPTIONAL
-    PURPOSE "Required for pipewire screencast plugin"
-)
+
+option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
+if(NOT DISABLE_PIPEWIRE)
+    find_package(KPipeWire CONFIG REQUIRED)
+    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
+    add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugin")
+endif()
+
+find_package(PlasmaWaylandProtocols 1.5.0)
+
+if(KPipeWire_FOUND AND PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
+    find_package(KWayland REQUIRED)
+    find_package(QtWaylandScanner REQUIRED)
+    find_package(Qt6WaylandClient)
+    find_package(Wayland REQUIRED COMPONENTS Client)
+endif()
 
 ecm_setup_version(PROJECT
                   VARIABLE_PREFIX KRFB
@@ -92,16 +107,19 @@ include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
 )
 
-if(Q_WS_X11)
-  if(NOT X11_XTest_FOUND)
-    message(FATAL_ERROR "krfb requires the libXtst (https://xorg.freedesktop.org) to be built")
-  endif(NOT X11_XTest_FOUND)
-endif(Q_WS_X11)
-
 add_subdirectory(events)
 add_subdirectory(krfb)
 add_subdirectory(framebuffers)
 add_subdirectory(doc)
 add_subdirectory(icons)
 
+ki18n_install(po)
+kdoctools_install(po)
+
+ecm_qt_install_logging_categories(
+    EXPORT KRFB
+    FILE krfb.categories
+    DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
+
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

CMakePresets.json

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

CMakePresets.json.license

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

LICENSES/BSD-3-Clause.txt

@@ -0,0 +1,26 @@
+Copyright (c) <year> <owner>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/CC0-1.0.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

LICENSES/GPL-2.0-or-later.txt

@@ -0,0 +1,311 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software
+is covered by the GNU Lesser General Public License instead.) You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for this service if you
+wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of
+the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or
+for a fee, you must give the recipients all the rights that you have. You
+must make sure that they, too, receive or can get the source code. And you
+must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If
+the software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or translated
+into another language. (Hereinafter, translation is included without limitation
+in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program
+is not restricted, and the output from the Program is covered only if its
+contents constitute a work based on the Program (independent of having been
+made by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source code
+as you receive it, in any medium, provided that you conspicuously and appropriately
+publish on each copy an appropriate copyright notice and disclaimer of warranty;
+keep intact all the notices that refer to this License and to the absence
+of any warranty; and give any other recipients of the Program a copy of this
+License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all
+of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or
+in part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print
+such an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License,
+and its terms, do not apply to those sections when you distribute them as
+separate works. But when you distribute the same sections as part of a whole
+which is a work based on the Program, the distribution of the whole must be
+on the terms of this License, whose permissions for other licensees extend
+to the entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise
+the right to control the distribution of derivative or collective works based
+on the Program.
+
+In addition, mere aggregation of another work not based on the Program with
+the Program (or with a work based on the Program) on a volume of a storage
+or distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section
+2) in object code or executable form under the terms of Sections 1 and 2 above
+provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code,
+which must be distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for noncommercial
+distribution and only if you received the program in object code or executable
+form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable. However, as a special exception, the source code distributed
+need not include anything that is normally distributed (in either source or
+binary form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component itself
+accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with
+the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except
+as expressly provided under this License. Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses terminated
+so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed
+it. However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the Program
+(or any work based on the Program), you indicate your acceptance of this License
+to do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor
+to copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of
+the rights granted herein. You are not responsible for enforcing compliance
+by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement
+or for any other reason (not limited to patent issues), conditions are imposed
+on you (whether by court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the conditions of
+this License. If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations, then as
+a consequence you may not distribute the Program at all. For example, if a
+patent license would not permit royalty-free redistribution of the Program
+by all those who receive copies directly or indirectly through you, then the
+only way you could satisfy both it and this License would be to refrain entirely
+from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents
+or other property right claims or to contest validity of any such claims;
+this section has the sole purpose of protecting the integrity of the free
+software distribution system, which is implemented by public license practices.
+Many people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit geographical
+distribution limitation excluding those countries, so that distribution is
+permitted only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of
+the General Public License from time to time. Such new versions will be similar
+in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that version
+or of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of this License, you may choose
+any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing and reuse
+of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
+OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
+OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+one line to give the program's name and an idea of what it does. Copyright
+(C) yyyy name of author
+
+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; if not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how
+to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when
+it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software,
+and you are welcome to redistribute it under certain conditions; type `show
+c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may be
+called something other than `show w' and `show c'; they could even be mouse-clicks
+or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary. Here
+is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
+(which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice

LICENSES/GPL-3.0-or-later.txt

@@ -0,0 +1,604 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and
+other kinds of works.
+
+The licenses for most software and other practical works are designed to take
+away your freedom to share and change the works. By contrast, the GNU General
+Public License is intended to guarantee your freedom to share and change all
+versions of a program--to make sure it remains free software for all its users.
+We, the Free Software Foundation, use the GNU General Public License for most
+of our software; it applies also to any other work released this way by its
+authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for them if you wish), that
+you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs, and that you know you
+can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights
+or asking you to surrender the rights. Therefore, you have certain responsibilities
+if you distribute copies of the software, or if you modify it: responsibilities
+to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or
+for a fee, you must pass on to the recipients the same freedoms that you received.
+You must make sure that they, too, receive or can get the source code. And
+you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert
+copyright on the software, and (2) offer you this License giving you legal
+permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that
+there is no warranty for this free software. For both users' and authors'
+sake, the GPL requires that modified versions be marked as changed, so that
+their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified
+versions of the software inside them, although the manufacturer can do so.
+This is fundamentally incompatible with the aim of protecting users' freedom
+to change the software. The systematic pattern of such abuse occurs in the
+area of products for individuals to use, which is precisely where it is most
+unacceptable. Therefore, we have designed this version of the GPL to prohibit
+the practice for those products. If such problems arise substantially in other
+domains, we stand ready to extend this provision to those domains in future
+versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States
+should not allow patents to restrict development and use of software on general-purpose
+computers, but in those that do, we wish to avoid the special danger that
+patents applied to a free program could make it effectively proprietary. To
+prevent this, the GPL assures that patents cannot be used to render the program
+non-free.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works,
+such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License.
+Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals
+or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in
+a fashion requiring copyright permission, other than the making of an exact
+copy. The resulting work is called a “modified version” of the earlier work
+or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the
+Program.
+
+To “propagate” a work means to do anything with it that, without permission,
+would make you directly or secondarily liable for infringement under applicable
+copyright law, except executing it on a computer or modifying a private copy.
+Propagation includes copying, distribution (with or without modification),
+making available to the public, and in some countries other activities as
+well.
+
+To “convey” a work means any kind of propagation that enables other parties
+to make or receive copies. Mere interaction with a user through a computer
+network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices” to the
+extent that it includes a convenient and prominently visible feature that
+(1) displays an appropriate copyright notice, and (2) tells the user that
+there is no warranty for the work (except to the extent that warranties are
+provided), that licensees may convey the work under this License, and how
+to view a copy of this License. If the interface presents a list of user commands
+or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The “source code” for a work means the preferred form of the work for making
+modifications to it. “Object code” means any non-source form of a work.
+
+A “Standard Interface” means an interface that either is an official standard
+defined by a recognized standards body, or, in the case of interfaces specified
+for a particular programming language, one that is widely used among developers
+working in that language.
+
+The “System Libraries” of an executable work include anything, other than
+the work as a whole, that (a) is included in the normal form of packaging
+a Major Component, but which is not part of that Major Component, and (b)
+serves only to enable use of the work with that Major Component, or to implement
+a Standard Interface for which an implementation is available to the public
+in source code form. A “Major Component”, in this context, means a major essential
+component (kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to produce
+the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all the source
+code needed to generate, install, and (for an executable work) run the object
+code and to modify the work, including scripts to control those activities.
+However, it does not include the work's System Libraries, or general-purpose
+tools or generally available free programs which are used unmodified in performing
+those activities but which are not part of the work. For example, Corresponding
+Source includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically linked
+subprograms that the work is specifically designed to require, such as by
+intimate data communication or control flow between those subprograms and
+other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate
+automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright
+on the Program, and are irrevocable provided the stated conditions are met.
+This License explicitly affirms your unlimited permission to run the unmodified
+Program. The output from running a covered work is covered by this License
+only if the output, given its content, constitutes a covered work. This License
+acknowledges your rights of fair use or other equivalent, as provided by copyright
+law.
+
+You may make, run and propagate covered works that you do not convey, without
+conditions so long as your license otherwise remains in force. You may convey
+covered works to others for the sole purpose of having them make modifications
+exclusively for you, or provide you with facilities for running those works,
+provided that you comply with the terms of this License in conveying all material
+for which you do not control copyright. Those thus making or running the covered
+works for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of your copyrighted
+material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions
+stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure
+under any applicable law fulfilling obligations under article 11 of the WIPO
+copyright treaty adopted on 20 December 1996, or similar laws prohibiting
+or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention
+of technological measures to the extent such circumvention is effected by
+exercising rights under this License with respect to the covered work, and
+you disclaim any intention to limit operation or modification of the work
+as a means of enforcing, against the work's users, your or third parties'
+legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive
+it, in any medium, provided that you conspicuously and appropriately publish
+on each copy an appropriate copyright notice; keep intact all notices stating
+that this License and any non-permissive terms added in accord with section
+7 apply to the code; keep intact all notices of the absence of any warranty;
+and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you
+may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce
+it from the Program, in the form of source code under the terms of section
+4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified it, and
+giving a relevant date.
+
+b) The work must carry prominent notices stating that it is released under
+this License and any conditions added under section 7. This requirement modifies
+the requirement in section 4 to “keep intact all notices”.
+
+c) You must license the entire work, as a whole, under this License to anyone
+who comes into possession of a copy. This License will therefore apply, along
+with any applicable section 7 additional terms, to the whole of the work,
+and all its parts, regardless of how they are packaged. This License gives
+no permission to license the work in any other way, but it does not invalidate
+such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display Appropriate
+Legal Notices; however, if the Program has interactive interfaces that do
+not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works,
+which are not by their nature extensions of the covered work, and which are
+not combined with it such as to form a larger program, in or on a volume of
+a storage or distribution medium, is called an “aggregate” if the compilation
+and its resulting copyright are not used to limit the access or legal rights
+of the compilation's users beyond what the individual works permit. Inclusion
+of a covered work in an aggregate does not cause this License to apply to
+the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections
+4 and 5, provided that you also convey the machine-readable Corresponding
+Source under the terms of this License, in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product (including
+a physical distribution medium), accompanied by the Corresponding Source fixed
+on a durable physical medium customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product (including
+a physical distribution medium), accompanied by a written offer, valid for
+at least three years and valid for as long as you offer spare parts or customer
+support for that product model, to give anyone who possesses the object code
+either (1) a copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical medium customarily
+used for software interchange, for a price no more than your reasonable cost
+of physically performing this conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source. This alternative is allowed only
+occasionally and noncommercially, and only if you received the object code
+with such an offer, in accord with subsection 6b.
+
+d) Convey the object code by offering access from a designated place (gratis
+or for a charge), and offer equivalent access to the Corresponding Source
+in the same way through the same place at no further charge. You need not
+require recipients to copy the Corresponding Source along with the object
+code. If the place to copy the object code is a network server, the Corresponding
+Source may be on a different server (operated by you or a third party) that
+supports equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source. Regardless
+of what server hosts the Corresponding Source, you remain obligated to ensure
+that it is available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided you inform
+other peers where the object code and Corresponding Source of the work are
+being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from
+the Corresponding Source as a System Library, need not be included in conveying
+the object code work.
+
+A “User Product” is either (1) a “consumer product”, which means any tangible
+personal property which is normally used for personal, family, or household
+purposes, or (2) anything designed or sold for incorporation into a dwelling.
+In determining whether a product is a consumer product, doubtful cases shall
+be resolved in favor of coverage. For a particular product received by a particular
+user, “normally used” refers to a typical or common use of that class of product,
+regardless of the status of the particular user or of the way in which the
+particular user actually uses, or expects or is expected to use, the product.
+A product is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent the
+only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods, procedures,
+authorization keys, or other information required to install and execute modified
+versions of a covered work in that User Product from a modified version of
+its Corresponding Source. The information must suffice to ensure that the
+continued functioning of the modified object code is in no case prevented
+or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically
+for use in, a User Product, and the conveying occurs as part of a transaction
+in which the right of possession and use of the User Product is transferred
+to the recipient in perpetuity or for a fixed term (regardless of how the
+transaction is characterized), the Corresponding Source conveyed under this
+section must be accompanied by the Installation Information. But this requirement
+does not apply if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has been installed
+in ROM).
+
+The requirement to provide Installation Information does not include a requirement
+to continue to provide support service, warranty, or updates for a work that
+has been modified or installed by the recipient, or for the User Product in
+which it has been modified or installed. Access to a network may be denied
+when the modification itself materially and adversely affects the operation
+of the network or violates the rules and protocols for communication across
+the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord
+with this section must be in a format that is publicly documented (and with
+an implementation available to the public in source code form), and must require
+no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+“Additional permissions” are terms that supplement the terms of this License
+by making exceptions from one or more of its conditions. Additional permissions
+that are applicable to the entire Program shall be treated as though they
+were included in this License, to the extent that they are valid under applicable
+law. If additional permissions apply only to part of the Program, that part
+may be used separately under those permissions, but the entire Program remains
+governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any
+additional permissions from that copy, or from any part of it. (Additional
+permissions may be written to require their own removal in certain cases when
+you modify the work.) You may place additional permissions on material, added
+by you to a covered work, for which you have or can give appropriate copyright
+permission.
+
+Notwithstanding any other provision of this License, for material you add
+to a covered work, you may (if authorized by the copyright holders of that
+material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the terms of
+sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices displayed
+by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or requiring
+that modified versions of such material be marked in reasonable ways as different
+from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or authors
+of the material; or
+
+e) Declining to grant rights under trademark law for use of some trade names,
+trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with contractual
+assumptions of liability to the recipient, for any liability that these contractual
+assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions”
+within the meaning of section 10. If the Program as you received it, or any
+part of it, contains a notice stating that it is governed by this License
+along with a term that is a further restriction, you may remove that term.
+If a license document contains a further restriction but permits relicensing
+or conveying under this License, you may add to a covered work material governed
+by the terms of that license document, provided that the further restriction
+does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place,
+in the relevant source files, a statement of the additional terms that apply
+to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form
+of a separately written license, or stated as exceptions; the above requirements
+apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided
+under this License. Any attempt otherwise to propagate or modify it is void,
+and will automatically terminate your rights under this License (including
+any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from
+a particular copyright holder is reinstated (a) provisionally, unless and
+until the copyright holder explicitly and finally terminates your license,
+and (b) permanently, if the copyright holder fails to notify you of the violation
+by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently
+if the copyright holder notifies you of the violation by some reasonable means,
+this is the first time you have received notice of violation of this License
+(for any work) from that copyright holder, and you cure the violation prior
+to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses
+of parties who have received copies or rights from you under this License.
+If your rights have been terminated and not permanently reinstated, you do
+not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy
+of the Program. Ancillary propagation of a covered work occurring solely as
+a consequence of using peer-to-peer transmission to receive a copy likewise
+does not require acceptance. However, nothing other than this License grants
+you permission to propagate or modify any covered work. These actions infringe
+copyright if you do not accept this License. Therefore, by modifying or propagating
+a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives
+a license from the original licensors, to run, modify and propagate that work,
+subject to this License. You are not responsible for enforcing compliance
+by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an organization,
+or substantially all assets of one, or subdividing an organization, or merging
+organizations. If propagation of a covered work results from an entity transaction,
+each party to that transaction who receives a copy of the work also receives
+whatever licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the Corresponding
+Source of the work from the predecessor in interest, if the predecessor has
+it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights
+granted or affirmed under this License. For example, you may not impose a
+license fee, royalty, or other charge for exercise of rights granted under
+this License, and you may not initiate litigation (including a cross-claim
+or counterclaim in a lawsuit) alleging that any patent claim is infringed
+by making, using, selling, offering for sale, or importing the Program or
+any portion of it.
+
+11. Patents.
+A “contributor” is a copyright holder who authorizes use under this License
+of the Program or a work on which the Program is based. The work thus licensed
+is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims owned or controlled
+by the contributor, whether already acquired or hereafter acquired, that would
+be infringed by some manner, permitted by this License, of making, using,
+or selling its contributor version, but do not include claims that would be
+infringed only as a consequence of further modification of the contributor
+version. For purposes of this definition, “control” includes the right to
+grant patent sublicenses in a manner consistent with the requirements of this
+License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+license under the contributor's essential patent claims, to make, use, sell,
+offer for sale, import and otherwise run, modify and propagate the contents
+of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express agreement
+or commitment, however denominated, not to enforce a patent (such as an express
+permission to practice a patent or covenant not to sue for patent infringement).
+To “grant” such a patent license to a party means to make such an agreement
+or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the
+Corresponding Source of the work is not available for anyone to copy, free
+of charge and under the terms of this License, through a publicly available
+network server or other readily accessible means, then you must either (1)
+cause the Corresponding Source to be so available, or (2) arrange to deprive
+yourself of the benefit of the patent license for this particular work, or
+(3) arrange, in a manner consistent with the requirements of this License,
+to extend the patent license to downstream recipients. “Knowingly relying”
+means you have actual knowledge that, but for the patent license, your conveying
+the covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that country
+that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement,
+you convey, or propagate by procuring conveyance of, a covered work, and grant
+a patent license to some of the parties receiving the covered work authorizing
+them to use, propagate, modify or convey a specific copy of the covered work,
+then the patent license you grant is automatically extended to all recipients
+of the covered work and works based on it.
+
+A patent license is “discriminatory” if it does not include within the scope
+of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+of one or more of the rights that are specifically granted under this License.
+You may not convey a covered work if you are a party to an arrangement with
+a third party that is in the business of distributing software, under which
+you make payment to the third party based on the extent of your activity of
+conveying the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by you
+(or copies made from those copies), or (b) primarily for and in connection
+with specific products or compilations that contain the covered work, unless
+you entered into that arrangement, or that patent license was granted, prior
+to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied
+license or other defenses to infringement that may otherwise be available
+to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise)
+that contradict the conditions of this License, they do not excuse you from
+the conditions of this License. If you cannot convey a covered work so as
+to satisfy simultaneously your obligations under this License and any other
+pertinent obligations, then as a consequence you may not convey it at all.
+For example, if you agree to terms that obligate you to collect a royalty
+for further conveying from those to whom you convey the Program, the only
+way you could satisfy both those terms and this License would be to refrain
+entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have permission to
+link or combine any covered work with a work licensed under version 3 of the
+GNU Affero General Public License into a single combined work, and to convey
+the resulting work. The terms of this License will continue to apply to the
+part which is the covered work, but the special requirements of the GNU Affero
+General Public License, section 13, concerning interaction through a network
+will apply to the combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the
+GNU General Public License from time to time. Such new versions will be similar
+in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+that a certain numbered version of the GNU General Public License “or any
+later version” applies to it, you have the option of following the terms and
+conditions either of that numbered version or of any later version published
+by the Free Software Foundation. If the Program does not specify a version
+number of the GNU General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of
+the GNU General Public License can be used, that proxy's public statement
+of acceptance of a version permanently authorizes you to choose that version
+for the Program.
+
+Later license versions may give you additional or different permissions. However,
+no additional obligations are imposed on any author or copyright holder as
+a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
+PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
+AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
+USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided above cannot
+be given local legal effect according to their terms, reviewing courts shall
+apply local law that most closely approximates an absolute waiver of all civil
+liability in connection with the Program, unless a warranty or assumption
+of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively state the exclusion
+of warranty; and each file should have at least the “copyright” line and a
+pointer to where the full notice is found.
+
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
+
+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.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like
+this when it starts in an interactive mode:
+
+     <program>  Copyright (C) <year>  <name of author>
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it under certain
+conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands might
+be different; for a GUI interface, you would use an “about box”.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a “copyright disclaimer” for the program, if necessary. For
+more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General Public
+License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSES/LGPL-2.1-only.txt

@@ -0,0 +1,462 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts as
+the successor of the GNU Library Public License, version 2, hence the version
+number 2.1.]
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public Licenses are intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.
+
+This license, the Lesser General Public License, applies to some specially
+designated software packages--typically libraries--of the Free Software Foundation
+and other authors who decide to use it. You can use it too, but we suggest
+you first think carefully about whether this license or the ordinary General
+Public License is the better strategy to use in any particular case, based
+on the explanations below.
+
+When we speak of free software, we are referring to freedom of use, not price.
+Our General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for this service if you
+wish); that you receive source code or can get it if you want it; that you
+can change the software and use pieces of it in new free programs; and that
+you are informed that you can do these things.
+
+To protect your rights, we need to make restrictions that forbid distributors
+to deny you these rights or to ask you to surrender these rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of
+the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for
+a fee, you must give the recipients all the rights that we gave you. You must
+make sure that they, too, receive or can get the source code. If you link
+other code with the library, you must provide complete object files to the
+recipients, so that they can relink them with the library after making changes
+to the library and recompiling it. And you must show them these terms so they
+know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the library,
+and (2) we offer you this license, which gives you legal permission to copy,
+distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that there is no
+warranty for the free library. Also, if the library is modified by someone
+else and passed on, the recipients should know that what they have is not
+the original version, so that the original author's reputation will not be
+affected by problems that might be introduced by others.
+
+Finally, software patents pose a constant threat to the existence of any free
+program. We wish to make sure that a company cannot effectively restrict the
+users of a free program by obtaining a restrictive license from a patent holder.
+Therefore, we insist that any patent license obtained for a version of the
+library must be consistent with the full freedom of use specified in this
+license.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU
+General Public License. This license, the GNU Lesser General Public License,
+applies to certain designated libraries, and is quite different from the ordinary
+General Public License. We use this license for certain libraries in order
+to permit linking those libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using a shared
+library, the combination of the two is legally speaking a combined work, a
+derivative of the original library. The ordinary General Public License therefore
+permits such linking only if the entire combination fits its criteria of freedom.
+The Lesser General Public License permits more lax criteria for linking other
+code with the library.
+
+We call this license the "Lesser" General Public License because it does Less
+to protect the user's freedom than the ordinary General Public License. It
+also provides other free software developers Less of an advantage over competing
+non-free programs. These disadvantages are the reason we use the ordinary
+General Public License for many libraries. However, the Lesser license provides
+advantages in certain special circumstances.
+
+For example, on rare occasions, there may be a special need to encourage the
+widest possible use of a certain library, so that it becomes a de-facto standard.
+To achieve this, non-free programs must be allowed to use the library. A more
+frequent case is that a free library does the same job as widely used non-free
+libraries. In this case, there is little to gain by limiting the free library
+to free software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free programs
+enables a greater number of people to use a large body of free software. For
+example, permission to use the GNU C Library in non-free programs enables
+many more people to use the whole GNU operating system, as well as its variant,
+the GNU/Linux operating system.
+
+Although the Lesser General Public License is Less protective of the users'
+freedom, it does ensure that the user of a program that is linked with the
+Library has the freedom and the wherewithal to run that program using a modified
+version of the Library.
+
+The precise terms and conditions for copying, distribution and modification
+follow. Pay close attention to the difference between a "work based on the
+library" and a "work that uses the library". The former contains code derived
+from the library, whereas the latter must be combined with the library in
+order to run.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License Agreement applies to any software library or other program
+which contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Lesser General
+Public License (also called "this License"). Each licensee is addressed as
+"you".
+
+A "library" means a collection of software functions and/or data prepared
+so as to be conveniently linked with application programs (which use some
+of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has
+been distributed under these terms. A "work based on the Library" means either
+the Library or any derivative work under copyright law: that is to say, a
+work containing the Library or a portion of it, either verbatim or with modifications
+and/or translated straightforwardly into another language. (Hereinafter, translation
+is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications
+to it. For a library, complete source code means all the source code for all
+modules it contains, plus any associated interface definition files, plus
+the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running a program
+using the Library is not restricted, and output from such a program is covered
+only if its contents constitute a work based on the Library (independent of
+the use of the Library in a tool for writing it). Whether that is true depends
+on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and disclaimer
+of warranty; keep intact all the notices that refer to this License and to
+the absence of any warranty; and distribute a copy of this License along with
+the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it,
+thus forming a work based on the Library, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all
+of these conditions:
+
+     a) The modified work must itself be a software library.
+
+b) You must cause the files modified to carry prominent notices stating that
+you changed the files and the date of any change.
+
+c) You must cause the whole of the work to be licensed at no charge to all
+third parties under the terms of this License.
+
+d) If a facility in the modified Library refers to a function or a table of
+data to be supplied by an application program that uses the facility, other
+than as an argument passed when the facility is invoked, then you must make
+a good faith effort to ensure that, in the event an application does not supply
+such function or table, the facility still operates, and performs whatever
+part of its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has a purpose
+that is entirely well-defined independent of the application. Therefore, Subsection
+2d requires that any application-supplied function or table used by this function
+must be optional: if the application does not supply it, the square root function
+must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Library, and can be reasonably
+considered independent and separate works in themselves, then this License,
+and its terms, do not apply to those sections when you distribute them as
+separate works. But when you distribute the same sections as part of a whole
+which is a work based on the Library, the distribution of the whole must be
+on the terms of this License, whose permissions for other licensees extend
+to the entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise
+the right to control the distribution of derivative or collective works based
+on the Library.
+
+In addition, mere aggregation of another work not based on the Library with
+the Library (or with a work based on the Library) on a volume of a storage
+or distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License
+instead of this License to a given copy of the Library. To do this, you must
+alter all the notices that refer to this License, so that they refer to the
+ordinary GNU General Public License, version 2, instead of to this License.
+(If a newer version than version 2 of the ordinary GNU General Public License
+has appeared, then you can specify that version instead if you wish.) Do not
+make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy,
+so the ordinary GNU General Public License applies to all subsequent copies
+and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library
+into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of
+it, under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you accompany it with the complete corresponding
+machine-readable source code, which must be distributed under the terms of
+Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated
+place, then offering equivalent access to copy the source code from the same
+place satisfies the requirement to distribute the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but
+is designed to work with the Library by being compiled or linked with it,
+is called a "work that uses the Library". Such a work, in isolation, is not
+a derivative work of the Library, and therefore falls outside the scope of
+this License.
+
+However, linking a "work that uses the Library" with the Library creates an
+executable that is a derivative of the Library (because it contains portions
+of the Library), rather than a "work that uses the library". The executable
+is therefore covered by this License. Section 6 states terms for distribution
+of such executables.
+
+When a "work that uses the Library" uses material from a header file that
+is part of the Library, the object code for the work may be a derivative work
+of the Library even though the source code is not. Whether this is true is
+especially significant if the work can be linked without the Library, or if
+the work is itself a library. The threshold for this to be true is not precisely
+defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts
+and accessors, and small macros and small inline functions (ten lines or less
+in length), then the use of the object file is unrestricted, regardless of
+whether it is legally a derivative work. (Executables containing this object
+code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute
+the object code for the work under the terms of Section 6. Any executables
+containing that work also fall under Section 6, whether or not they are linked
+directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or link a "work
+that uses the Library" with the Library to produce a work containing portions
+of the Library, and distribute that work under terms of your choice, provided
+that the terms permit modification of the work for the customer's own use
+and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library
+is used in it and that the Library and its use are covered by this License.
+You must supply a copy of this License. If the work during execution displays
+copyright notices, you must include the copyright notice for the Library among
+them, as well as a reference directing the user to the copy of this License.
+Also, you must do one of these things:
+
+a) Accompany the work with the complete corresponding machine-readable source
+code for the Library including whatever changes were used in the work (which
+must be distributed under Sections 1 and 2 above); and, if the work is an
+executable linked with the Library, with the complete machine-readable "work
+that uses the Library", as object code and/or source code, so that the user
+can modify the Library and then relink to produce a modified executable containing
+the modified Library. (It is understood that the user who changes the contents
+of definitions files in the Library will not necessarily be able to recompile
+the application to use the modified definitions.)
+
+b) Use a suitable shared library mechanism for linking with the Library. A
+suitable mechanism is one that (1) uses at run time a copy of the library
+already present on the user's computer system, rather than copying library
+functions into the executable, and (2) will operate properly with a modified
+version of the library, if the user installs one, as long as the modified
+version is interface-compatible with the version that the work was made with.
+
+c) Accompany the work with a written offer, valid for at least three years,
+to give the same user the materials specified in Subsection 6a, above, for
+a charge no more than the cost of performing this distribution.
+
+d) If distribution of the work is made by offering access to copy from a designated
+place, offer equivalent access to copy the above specified materials from
+the same place.
+
+e) Verify that the user has already received a copy of these materials or
+that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the Library" must
+include any data and utility programs needed for reproducing the executable
+from it. However, as a special exception, the materials to be distributed
+need not include anything that is normally distributed (in either source or
+binary form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component itself
+accompanies the executable.
+
+It may happen that this requirement contradicts the license restrictions of
+other proprietary libraries that do not normally accompany the operating system.
+Such a contradiction means you cannot use both them and the Library together
+in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side
+in a single library together with other library facilities not covered by
+this License, and distribute such a combined library, provided that the separate
+distribution of the work based on the Library and of the other library facilities
+is otherwise permitted, and provided that you do these two things:
+
+a) Accompany the combined library with a copy of the same work based on the
+Library, uncombined with any other library facilities. This must be distributed
+under the terms of the Sections above.
+
+b) Give prominent notice with the combined library of the fact that part of
+it is a work based on the Library, and explaining where to find the accompanying
+uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute the Library
+except as expressly provided under this License. Any attempt otherwise to
+copy, modify, sublicense, link with, or distribute the Library is void, and
+will automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will not
+have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed
+it. However, nothing else grants you permission to modify or distribute the
+Library or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the Library
+(or any work based on the Library), you indicate your acceptance of this License
+to do so, and all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library),
+the recipient automatically receives a license from the original licensor
+to copy, distribute, link with or modify the Library subject to these terms
+and conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties with this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement
+or for any other reason (not limited to patent issues), conditions are imposed
+on you (whether by court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the conditions of
+this License. If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations, then as
+a consequence you may not distribute the Library at all. For example, if a
+patent license would not permit royalty-free redistribution of the Library
+by all those who receive copies directly or indirectly through you, then the
+only way you could satisfy both it and this License would be to refrain entirely
+from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents
+or other property right claims or to contest validity of any such claims;
+this section has the sole purpose of protecting the integrity of the free
+software distribution system which is implemented by public license practices.
+Many people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Library under this License may add an explicit geographical
+distribution limitation excluding those countries, so that distribution is
+permitted only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of
+the Lesser General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that version
+or of any later version published by the Free Software Foundation. If the
+Library does not specify a license version number, you may choose any version
+ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs
+whose distribution conditions are incompatible with these, write to the author
+to ask for permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make exceptions
+for this. Our decision will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
+THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
+OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
+OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Libraries
+
+If you develop a new library, and you want it to be of the greatest possible
+use to the public, we recommend making it free software that everyone can
+redistribute and change. You can do so by permitting redistribution under
+these terms (or, alternatively, under the terms of the ordinary General Public
+License).
+
+To apply these terms, attach the following notices to the library. It is safest
+to attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the "copyright"
+line and a pointer to where the full notice is found.
+
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
+
+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.1 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, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA Also add information
+on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the library, if necessary. Here
+is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in
+the library `Frob' (a library for tweaking knobs) written
+by James Random Hacker.
+
+signature of Ty Coon, 1 April 1990
+Ty Coon, President of Vice
+That's all there is to it!

LICENSES/LGPL-3.0-only.txt

@@ -0,0 +1,144 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms
+and conditions of version 3 of the GNU General Public License, supplemented
+by the additional permissions listed below.
+
+0. Additional Definitions.
+
+As used herein, "this License" refers to version 3 of the GNU Lesser General
+Public License, and the "GNU GPL" refers to version 3 of the GNU General Public
+License.
+
+"The Library" refers to a covered work governed by this License, other than
+an Application or a Combined Work as defined below.
+
+An "Application" is any work that makes use of an interface provided by the
+Library, but which is not otherwise based on the Library. Defining a subclass
+of a class defined by the Library is deemed a mode of using an interface provided
+by the Library.
+
+A "Combined Work" is a work produced by combining or linking an Application
+with the Library.  The particular version of the Library with which the Combined
+Work was made is also called the "Linked Version".
+
+The "Minimal Corresponding Source" for a Combined Work means the Corresponding
+Source for the Combined Work, excluding any source code for portions of the
+Combined Work that, considered in isolation, are based on the Application,
+and not on the Linked Version.
+
+The "Corresponding Application Code" for a Combined Work means the object
+code and/or source code for the Application, including any data and utility
+programs needed for reproducing the Combined Work from the Application, but
+excluding the System Libraries of the Combined Work.
+
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this License without
+being bound by section 3 of the GNU GPL.
+
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications, a facility
+refers to a function or data to be supplied by an Application that uses the
+facility (other than as an argument passed when the facility is invoked),
+then you may convey a copy of the modified version:
+
+a) under this License, provided that you make a good faith effort to ensure
+that, in the event an Application does not supply the function or data, the
+facility still operates, and performs whatever part of its purpose remains
+meaningful, or
+
+b) under the GNU GPL, with none of the additional permissions of this License
+applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material from a header
+file that is part of the Library.  You may convey such object code under terms
+of your choice, provided that, if the incorporated material is not limited
+to numerical parameters, data structure layouts and accessors, or small macros,
+inline functions and templates (ten or fewer lines in length), you do both
+of the following:
+
+a) Give prominent notice with each copy of the object code that the Library
+is used in it and that the Library and its use are covered by this License.
+
+b) Accompany the object code with a copy of the GNU GPL and this license document.
+
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that, taken together,
+effectively do not restrict modification of the portions of the Library contained
+in the Combined Work and reverse engineering for debugging such modifications,
+if you also do each of the following:
+
+a) Give prominent notice with each copy of the Combined Work that the Library
+is used in it and that the Library and its use are covered by this License.
+
+b) Accompany the Combined Work with a copy of the GNU GPL and this license
+document.
+
+c) For a Combined Work that displays copyright notices during execution, include
+the copyright notice for the Library among these notices, as well as a reference
+directing the user to the copies of the GNU GPL and this license document.
+
+     d) Do one of the following:
+
+0) Convey the Minimal Corresponding Source under the terms of this License,
+and the Corresponding Application Code in a form suitable for, and under terms
+that permit, the user to recombine or relink the Application with a modified
+version of the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+
+1) Use a suitable shared library mechanism for linking with the Library. 
+A suitable mechanism is one that (a) uses at run time a copy of the Library
+already present on the user's computer system, and (b) will operate properly
+with a modified version of the Library that is interface-compatible with the
+Linked Version.
+
+e) Provide Installation Information, but only if you would otherwise be required
+to provide such information under section 6 of the GNU GPL, and only to the
+extent that such information is necessary to install and execute a modified
+version of the Combined Work produced by recombining or relinking the Application
+with a modified version of the Linked Version. (If you use option 4d0, the
+Installation Information must accompany the Minimal Corresponding Source and
+Corresponding Application Code. If you use option 4d1, you must provide the
+Installation Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+
+5. Combined Libraries.
+You may place library facilities that are a work based on the Library side
+by side in a single library together with other library facilities that are
+not Applications and are not covered by this License, and convey such a combined
+library under terms of your choice, if you do both of the following:
+
+a) Accompany the combined library with a copy of the same work based on the
+Library, uncombined with any other library facilities, conveyed under the
+terms of this License.
+
+b) Give prominent notice with the combined library that part of it is a work
+based on the Library, and explaining where to find the accompanying uncombined
+form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions of the
+GNU Lesser General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you
+received it specifies that a certain numbered version of the GNU Lesser General
+Public License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that published version or of
+any later version published by the Free Software Foundation. If the Library
+as you received it does not specify a version number of the GNU Lesser General
+Public License, you may choose any version of the GNU Lesser General Public
+License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether
+future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is permanent
+authorization for you to choose that version for the Library.

LICENSES/LicenseRef-KDE-Accepted-LGPL.txt

@@ -0,0 +1,12 @@
+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 3 of the license or (at your option) any later version
+that is accepted by the membership of KDE e.V. (or its successor
+approved by the membership of KDE e.V.), which shall act as a
+proxy as defined in Section 6 of version 3 of the license.
+
+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.

NOTES

@@ -1,7 +1,7 @@
 Comments on various aspects of KRfb:
 
 - KRfb has been designed for three use cases:
-  * a user who needs help from an administrator or friend. The adminstrator can 
+  * a user who needs help from an administrator or friend. The administrator can 
     connect to the user and change settings and so on while both are talking
     on the telephone or using VoIP.
   * a user who wants to show something to a friend, so he lets his friend
@@ -12,7 +12,7 @@ Comments on various aspects of KRfb:
   so KRfb is pre-configured for them. Case 3 is for advanced users and
   therefore a little bit more difficult to configure.
 - design goal of KRfb is to make it as easy to use as possible. I tried to
-  limit functionality whereever possible.
+  limit functionality wherever possible.
 - the new-connection-dialog is extra large and has the pixmap on the left
   side to capture the attention of the user before allowing a connection.
 - the RFBController class is a mess. The interactions between the threaded, 

README

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

cmake/modules/FindLibVNCServer.cmake

@@ -1,41 +0,0 @@
-# cmake macro to test LIBVNCSERVER LIB
-
-# Copyright (c) 2006, Alessandro Praduroux <pradu@pradu.it>
-# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-INCLUDE(CheckStructHasMember)
-
-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-    # Already in cache, be silent
-    SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-
-FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
-
-FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
-
-# libvncserver and libvncclient are in the same package, so it does
-# not make sense to add a new cmake script for finding libvncclient.
-# instead just find the libvncclient also in this file.
-FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
-FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
-
-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-   SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
-   CHECK_STRUCT_HAS_MEMBER("struct _rfbClient" GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-
-IF (LIBVNCSERVER_FOUND)
-  IF (NOT LIBVNCSERVER_FIND_QUIETLY)
-    MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
-  ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
-ELSE (LIBVNCSERVER_FOUND)
-  IF (LIBVNCSERVER_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).")
-  ENDIF (LIBVNCSERVER_FIND_REQUIRED)
-ENDIF (LIBVNCSERVER_FOUND)
-
-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)

cmake/modules/FindPipeWire.cmake

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

cmake/modules/Findgbm.cmake

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

dbus/xdp_dbus_remotedesktop_interface.xml

@@ -1,14 +1,17 @@
 <?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/>.
 -->
@@ -17,22 +20,34 @@
   <!--
       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.
+
+      This documentation describes version 2 of this interface.
   -->
   <interface name="org.freedesktop.portal.RemoteDesktop">
     <!--
         CreateSession:
         @options: Vardict with optional further information
         @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
         Create a remote desktop session.
+
         A remote desktop session is used to allow remote controlling a desktop
-        session. 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.
+        session.
+
+        A remote desktop session may only be started and stopped with this interface,
+        but you can use the #org.freedesktop.portal.Session object created with this
+        method together with certain methods on the #org.freedesktop.portal.ScreenCast and
+        #org.freedesktop.portal.Clipboard interfaces. Specifically, you can call
+        org.freedesktop.portal.ScreenCast.SelectSources() to also get screen content,
+        and org.freedesktop.portal.ScreenCast.OpenPipeWireRemote() to acquire a file
+        descriptor for a PipeWire remote. See #org.freedesktop.portal.ScreenCast for
+        more information on how to use those methods. To capture clipboard content,
+        you can call org.freedesktop.portal.Clipboard.RequestClipboard(). See
+        #org.freedesktop.portal.Clipboard for more information on the clipboard
+        integration.
+
         Supported keys in the @options vardict include:
         <variablelist>
           <varlistentry>
@@ -75,7 +90,9 @@
         @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>
@@ -87,14 +104,50 @@
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term>type u</term>
+            <term>types u</term>
             <listitem><para>
               Bitmask of what device types to request remote controlling of.
               Default is all.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term>restore_token s</term>
+            <listitem><para>
+              The token to restore a previous session.
+
+              If the stored session cannot be restored, this value is ignored
+              and the user will be prompted normally. This may happen when, for
+              example, the session contains a monitor or a window that is not
+              available anymore, or when the stored permissions are withdrawn.
+
+              The restore token is invalidated after using it once. To restore
+              the same session again, use the new restore token sent in response
+              to starting this session.
+
+              This option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>persist_mode u</term>
+            <listitem><para>
+              How this session should persist. Default is 0. Accepted values are:
+
+              <simplelist>
+                <member>0: Do not persist (default)</member>
+                <member>1: Permissions persist as long as the application is running</member>
+                <member>2: Permissions persist until explicitly revoked</member>
+              </simplelist>
+
+              If the permission for the session to persist is granted, a restore token will
+              be returned via the #org.freedesktop.portal.Request::Response signal of the
+              start method used to start the session.
+
+              This option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
         </variablelist>
-        For available source types, see the AvailableDeviceTypes property.
+
+        For available device types, see the AvailableDeviceTypes property.
     -->
     <method name="SelectDevices">
       <arg type="o" name="session_handle" direction="in"/>
@@ -108,10 +161,12 @@
         @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>
@@ -123,6 +178,7 @@
             </para></listitem>
           </varlistentry>
         </variablelist>
+
         The following results get returned via the
         #org.freedesktop.portal.Request::Response signal:
         <variablelist>
@@ -132,7 +188,26 @@
               A bitmask of the devices selected by the user.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term>clipboard_enabled b</term>
+            <listitem><para>
+              A boolean for whether the clipboard was enabled ('true') or not ('false').
+              See the #org.freedesktop.portal.Clipboard documentation for more information.
+              Since version 2.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>restore_token s</term>
+            <listitem><para>
+              The restore token. This token is a single use token that can later
+              be used to restore a session. See
+              org.freedesktop.portal.RemoteDesktop.SelectDevices() for details.
+
+              This response option was added in version 2 of this interface.
+            </para></listitem>
+          </varlistentry>
         </variablelist>
+
         If a screen cast source was selected, the results of the
         #org.freedesktop.portal.ScreenCast.Start response signal may be
         included.
@@ -150,6 +225,7 @@
         @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.
@@ -168,6 +244,7 @@
         @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
@@ -187,9 +264,12 @@
         @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>
@@ -209,11 +289,14 @@
         @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>
@@ -239,8 +322,10 @@
         @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>
@@ -259,10 +344,12 @@
         @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
+        @state: New state of keyboard keycode
+
         May only be called if KEYBOARD access was provided after starting the
         session.
-        Available keyboard keysym states:
+
+        Available keyboard keycode states:
         <simplelist>
           <member>0: Released</member>
           <member>1: Pressed</member>
@@ -281,8 +368,10 @@
         @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>
@@ -304,8 +393,10 @@
         @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
@@ -328,8 +419,10 @@
         @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
@@ -349,8 +442,10 @@
         @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">
@@ -359,9 +454,47 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
       <arg type="u" name="slot" direction="in"/>
     </method>
+
+    <!--
+        ConnectToEIS:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @options: Vardict with optional further information
+        @fd: A file descriptor to an EIS implementation that can be passed to a libei sender context
+
+        Request a connection to an EIS implementation. The returned handle can
+        be passed to ei_setup_backend_fd() for a libei sender context to
+        complete the connection. All information about available devices and the
+        event flow is subject to libei. Please see the libei documentation for details.
+
+        This method may only be called once per session, where the EIS
+        implementation disconnects the session should be closed.
+
+        This method must be called after #org.freedesktop.portal.RemoteDesktop.Start()
+
+        Once an EIS connection is established, input events must be sent exclusively via
+        the EIS connection. Any events submitted via NotifyPointerMotion,
+        NotifyKeyboardKeycode and other Notify* methods will return an error.
+
+        To see how to pair a PipeWire stream with a libei device region, see the
+        documentation for the mapping_id stream property in
+        #org.freedesktop.portal.RemoteDesktop.Start().
+
+        This method was added in version 2 of this interface.
+    -->
+    <method name="ConnectToEIS">
+      <annotation name="org.gtk.GDBus.C.Name" value="connect_to_eis"/>
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="h" name="fd" direction="out"/>
+    </method>
+
     <!--
         AvailableDeviceTypes:
+
         A bitmask of available source types. Currently defined types are:
+
         <simplelist>
           <member>1: KEYBOARD</member>
           <member>2: POINTER</member>

doc/CMakeLists.txt

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

events/CMakeLists.txt

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

events/x11/CMakeLists.txt

@@ -11,8 +11,9 @@ add_library (krfb_events_x11 MODULE ${krfb_events_x11_SRCS})
 
 target_link_libraries (krfb_events_x11
                        ${X11_XTest_LIB}
-                       KF5::CoreAddons
+                       KF6::CoreAddons
                        krfbprivate
 )
+set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)
 
-install (TARGETS krfb_events_x11 DESTINATION ${PLUGIN_INSTALL_DIR}/krfb)
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events)

events/x11/krfb_events_x11.desktop

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

events/x11/krfb_events_x11.json

@@ -1,67 +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 al 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[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb",
-        "Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러",
-        "Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb",
-        "Description[nn]": "X11 XFakeInput-basert hendingshandtering for KRfb",
-        "Description[pl]": "Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb",
-        "Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb",
-        "Description[pt_BR]": "Manipulador de eventos baseado no XFakeInput do X11 para o KRfb",
-        "Description[sk]": "X11 Spracovateľ udalostí založený na XFakeInput pre KRfb",
-        "Description[sl]": "Upravljavec dogodkov za KRfb na osnovi X11 XFakeInput",
-        "Description[sv]": "Händelsehanterare för KRfb baserad på X11 XFakeInput",
-        "Description[uk]": "Обробник подій для KRfb на основі XFakeInput X11",
-        "Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx",
-        "Description[zh_CN]": "基于 X11 XFakeInput 的 KRfb 事件处理器",
-        "Description[zh_TW]": "KRfb 基於 X11 XFakeInput 的事件處理器",
-        "EnabledByDefault": true,
-        "Id": "x11",
-        "License": "GPL",
-        "Name": "X11 Event handler for KRfb",
-        "Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per al KRfb",
-        "Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb",
-        "Name[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[it]": "Gestore eventi X11 per KRfb",
-        "Name[ko]": "KRfb X11 이벤트 핸들러",
-        "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb",
-        "Name[nn]": "X11-hendingshandsamar for KRfb",
-        "Name[pl]": "Obsługa wydarzeń X11 dla KRfb",
-        "Name[pt]": "Tratamento de eventos do X11 para o KRfb",
-        "Name[pt_BR]": "Manipulador de eventos do X11 para o KRfb",
-        "Name[sk]": "X11 Obsluha udalostí pre KRfb",
-        "Name[sl]": "Upravljavec dogodkov za KRfb na osnovi X11",
-        "Name[sv]": "X11-händelsehanterare för Krfb",
-        "Name[uk]": "Обробник подій для KRfb на основі X11",
-        "Name[x-test]": "xxX11 Event handler for KRfbxx",
-        "Name[zh_CN]": "X11 KRfb 事件处理器",
-        "Name[zh_TW]": "KRfb 的 X11 事件處理器",
-        "ServiceTypes": [
-            "krfb/events"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

events/x11/x11events.cpp

@@ -1,41 +1,25 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2016 by Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "x11events.h"
 
 #include <QApplication>
-#include <QX11Info>
-#include <QDesktopWidget>
 #include <QGlobalStatic>
+#include <QtGui/private/qtx11extras_p.h>
 
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
 #include <X11/extensions/XTest.h>
-
-#include <QX11Info>
+#include <X11/keysym.h>
 
 enum {
     LEFTSHIFT = 1,
     RIGHTSHIFT = 2,
-    ALTGR = 4
+    ALTGR = 4,
 };
 
 class EventData
@@ -43,19 +27,19 @@ class EventData
 public:
     EventData();
 
-    //keyboard
-    Display *dpy;
-    signed char modifiers[0x100];
-    KeyCode keycodes[0x100];
-    KeyCode leftShiftCode;
-    KeyCode rightShiftCode;
-    KeyCode altGrCode;
-    char modifierState;
+    // 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;
-    int x;
-    int y;
+    // mouse
+    int buttonMask = 0;
+    int x = 0;
+    int y = 0;
 
 private:
     void init();
@@ -73,7 +57,7 @@ void EventData::init()
     buttonMask = 0;
 
     dpy = QX11Info::display();
-    //initialize keycodes
+    // initialize keycodes
     KeySym key, *keymap;
     int i, j, minkey, maxkey, syms_per_keycode;
 
@@ -82,14 +66,14 @@ void EventData::init()
     XDisplayKeycodes(dpy, &minkey, &maxkey);
     Q_ASSERT(minkey >= 8);
     Q_ASSERT(maxkey < 256);
-    keymap = (KeySym *) XGetKeyboardMapping(dpy, minkey,
-                                            (maxkey - minkey + 1),
-                                            &syms_per_keycode);
+    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];
+            key = keymap[(i - minkey) * syms_per_keycode + j];
 
             if (key >= ' ' && key < 0x100 && i == XKeysymToKeycode(dpy, key)) {
                 keycodes[key] = i;
@@ -144,8 +128,13 @@ static void tweakModifiers(signed char mod, bool down)
 
 void X11EventHandler::handleKeyboard(bool down, rfbKeySym keySym)
 {
-#define ADJUSTMOD(sym,state) \
-    if(keySym==sym) { if(down) data->modifierState|=state; else data->modifierState&=~state; }
+#define ADJUSTMOD(sym, state)              \
+    if (keySym == sym) {                   \
+        if (down)                          \
+            data->modifierState |= state;  \
+        else                               \
+            data->modifierState &= ~state; \
+    }
 
     if (QX11Info::isPlatformX11()) {
         ADJUSTMOD(XK_Shift_L, LEFTSHIFT);
@@ -176,32 +165,24 @@ void X11EventHandler::handleKeyboard(bool down, rfbKeySym keySym)
             }
         }
     }
-/*
-    // Wayland platform and pipweire plugin in use
-    if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("pw")) {
+    /*
+        // 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);
+        XTestFakeMotionEvent(data->dpy, 0, x, y, CurrentTime);
 
         for (int i = 0; i < 5; i++) {
-            if ((data->buttonMask&(1 << i)) != (buttonMask&(1 << i))) {
+            if ((data->buttonMask & (1 << i)) != (buttonMask & (1 << i))) {
                 XTestFakeButtonEvent(data->dpy,
-                                        i + 1,
-                                        (buttonMask&(1 << i)) ? True : False,
-                                        CurrentTime);
+                                     i + 1,
+                                     (buttonMask & (1 << i)) ? True : False,
+                                     CurrentTime);
             }
         }
 

events/x11/x11events.h

@@ -1,22 +1,9 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2016 by Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef EVENTS_X11EVENTS_H
@@ -27,15 +14,15 @@
 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,20 +1,7 @@
 /* This file is part of the KDE project
-   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "x11eventsplugin.h"
@@ -22,10 +9,10 @@
 #include "x11events.h"
 
 #include <KPluginFactory>
-#include <QX11Info>
 
-K_PLUGIN_FACTORY_WITH_JSON(X11EventsPluginFactory, "krfb_events_x11.json",
-               registerPlugin<X11EventsPlugin>();)
+#include <QtGui/private/qtx11extras_p.h>
+
+K_PLUGIN_CLASS(X11EventsPlugin)
 
 X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)
@@ -35,11 +22,11 @@ X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
 EventHandler *X11EventsPlugin::eventHandler()
 {
     // works only under X11
-    if(!QX11Info::isPlatformX11())
+    if (!QX11Info::isPlatformX11()) {
         return nullptr;
+    }
 
     return new X11EventHandler();
 }
 
 #include "x11eventsplugin.moc"
-

events/x11/x11eventsplugin.h

@@ -1,20 +1,7 @@
 /* This file is part of the KDE project
-   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef KRFB_EVENTS_X11_X11EVENTSPLUGIN_H
@@ -29,9 +16,9 @@ class EventHandler;
 class X11EventsPlugin : public EventsPlugin
 {
     Q_OBJECT
+
 public:
     X11EventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~X11EventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 
@@ -39,5 +26,4 @@ private:
     Q_DISABLE_COPY(X11EventsPlugin)
 };
 
-
-#endif  // Header guard
+#endif // Header guard

events/xdp/CMakeLists.txt

@@ -7,7 +7,7 @@ set (krfb_events_xdp_SRCS
      xdpeventsplugin.cpp
 )
 
-qt5_add_dbus_interface(
+qt_add_dbus_interface(
    krfb_events_xdp_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
    xdp_dbus_remotedesktop_interface
@@ -16,12 +16,13 @@ qt5_add_dbus_interface(
 add_library (krfb_events_xdp MODULE ${krfb_events_xdp_SRCS})
 
 target_link_libraries (krfb_events_xdp
-                       KF5::CoreAddons
-                       KF5::I18n
-                       Qt5::DBus
+                       KF6::CoreAddons
+                       KF6::I18n
+                       Qt::DBus
                        krfbprivate
 )
+set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)
 
 install (TARGETS krfb_events_xdp
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events
 )

events/xdp/krfb_events_xdp.desktop

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

events/xdp/krfb_events_xdp.json

@@ -1,67 +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 al 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[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb",
-        "Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러",
-        "Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb",
-        "Description[nn]": "Xdg-desktop-portal-basert hendingshandtering for KRfb",
-        "Description[pl]": "Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb",
-        "Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb",
-        "Description[pt_BR]": "Manipulador de eventos baseado no xdg-desktop-portal para o KRfb",
-        "Description[sk]": "Obsluha udalostí založená na Xdg-desktop-portal pre KRfb",
-        "Description[sl]": "Upravljavec dogodkov, na osnovi portala Xdg-desktop za KRfb",
-        "Description[sv]": "Händelsehanterare för KRfb baserad på xdg-desktop-portal",
-        "Description[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
-        "Description[x-test]": "xxXdg-desktop-portal based event handler for KRfbxx",
-        "Description[zh_CN]": "基于 xdg-desktop-portal 的 KRfb 事件处理器",
-        "Description[zh_TW]": "KRfb 基於 Xdg-desktop-portal 的事件處理器",
-        "EnabledByDefault": true,
-        "Id": "xdp",
-        "License": "GPL",
-        "Name": "Xdg-desktop-portal Event handler for KRfb",
-        "Name[ca@valencia]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb",
-        "Name[ca]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb",
-        "Name[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[it]": "Gestore eventi xdg-desktop-portal per KRfb",
-        "Name[ko]": "KRfb  Xdg-desktop-portal 이벤트 핸들러",
-        "Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb",
-        "Name[nn]": "Xdg-desktop-portal-hendingshandtering for KRfb",
-        "Name[pl]": "Obsługa wydarzeń Xdg-desktop-portal dla KRfb",
-        "Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb",
-        "Name[pt_BR]": "Manipulador de eventos xdg-desktop-portal para o KRfb",
-        "Name[sk]": "Xdg-desktop-portal Obsluha udalostí pre KRfb",
-        "Name[sl]": "Upravljavec dogodkov za KRfb na osnovi portala Xdg-desktop",
-        "Name[sv]": "Xdg-desktop-portal händelsehanterare för Krfb",
-        "Name[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal",
-        "Name[x-test]": "xxXdg-desktop-portal Event handler for KRfbxx",
-        "Name[zh_CN]": "xdg-desktop-portal KRfb 事件处理器",
-        "Name[zh_TW]": "KRfb 的 Xdg-desktop-portal 事件處理器",
-        "ServiceTypes": [
-            "krfb/events"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

events/xdp/xdpevents.cpp

@@ -1,22 +1,9 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "xdpevents.h"
@@ -27,7 +14,6 @@
 #include <linux/input.h>
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QGlobalStatic>
 
 class EventData
@@ -35,10 +21,10 @@ class EventData
 public:
     EventData();
 
-    //mouse
-    int buttonMask;
-    int x;
-    int y;
+    // mouse
+    int buttonMask = 0;
+    int x = 0;
+    int y = 0;
 
     QScopedPointer<OrgFreedesktopPortalRemoteDesktopInterface> dbusXdpRemoteDesktopService;
 
@@ -55,24 +41,20 @@ EventData::EventData()
 
 void EventData::init()
 {
-    buttonMask = 0;
-
-    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QLatin1String("org.freedesktop.portal.Desktop"),
-                                      QLatin1String("/org/freedesktop/portal/desktop"), QDBusConnection::sessionBus()));
+    dbusXdpRemoteDesktopService.reset(new OrgFreedesktopPortalRemoteDesktopInterface(QStringLiteral("org.freedesktop.portal.Desktop"),
+                                                                                     QStringLiteral("/org/freedesktop/portal/desktop"), QDBusConnection::sessionBus()));
 }
 
 void XdpEventHandler::handleKeyboard(bool down, rfbKeySym keySym)
 {
-    // TODO: implement button handling
-    // both in FakeInput interface and here
-    Q_UNUSED(down)
-    Q_UNUSED(keySym)
+    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QStringLiteral("session_handle")).value<QDBusObjectPath>();
+    data->dbusXdpRemoteDesktopService->NotifyKeyboardKeysym(sessionHandle, {}, keySym, down);
 }
 
 void XdpEventHandler::handlePointer(int buttonMask, int x, int y)
 {
-    const uint streamNodeId = frameBuffer()->customProperty(QLatin1String("stream_node_id")).toUInt();
-    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QLatin1String("session_handle")).value<QDBusObjectPath>();
+    const uint streamNodeId = frameBuffer()->customProperty(QStringLiteral("stream_node_id")).toUInt();
+    const QDBusObjectPath sessionHandle = frameBuffer()->customProperty(QStringLiteral("session_handle")).value<QDBusObjectPath>();
 
     if (streamNodeId == 0 || sessionHandle.path().isEmpty()) {
         return;
@@ -86,7 +68,7 @@ void XdpEventHandler::handlePointer(int buttonMask, int x, int 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 };
+        QList<int> buttons = {BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, 0, 0, 0, 0, BTN_SIDE, BTN_EXTRA};
         for (auto it = buttons.constBegin(); it != buttons.constEnd(); ++it) {
             int prevButtonState = (data->buttonMask >> i) & 0x01;
             int currentButtonState = (buttonMask >> i) & 0x01;
@@ -99,22 +81,22 @@ void XdpEventHandler::handlePointer(int buttonMask, int x, int y)
                     int steps = 0;
                     switch (i) {
                     case 3:
-                        axis = 0;   // Vertical
+                        axis = 0; // Vertical
                         steps = -1;
                         break;
                     case 4:
-                        axis = 0;   // Vertical
+                        axis = 0; // Vertical
                         steps = 1;
                         break;
                     case 5:
-                        axis = 1;   // Horizontal
+                        axis = 1; // Horizontal
                         steps = -1;
                         break;
                     case 6:
-                        axis = 1;   // Horizontal
+                        axis = 1; // Horizontal
                         steps = 1;
                         break;
-                        }
+                    }
 
                     data->dbusXdpRemoteDesktopService->NotifyPointerAxisDiscrete(sessionHandle, QVariantMap(), axis, steps);
                 }

events/xdp/xdpevents.h

@@ -1,22 +1,9 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef EVENTS_XDPEVENTS_H
@@ -27,11 +14,10 @@
 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,22 +1,9 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "xdpeventsplugin.h"
@@ -25,8 +12,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(XdpEventsPluginFactory, "krfb_events_xdp.json",
-               registerPlugin<XdpEventsPlugin>();)
+K_PLUGIN_CLASS(XdpEventsPlugin)
 
 XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)
@@ -40,4 +26,3 @@ EventHandler *XdpEventsPlugin::eventHandler()
 }
 
 #include "xdpeventsplugin.moc"
-

events/xdp/xdpeventsplugin.h

@@ -1,22 +1,9 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2018-2019 Jan Grulich <jgrulich@redhat.com>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef KRFB_EVENTS_XDP_XDPEVENTSPLUGIN_H
@@ -31,9 +18,9 @@ class EventHandler;
 class XdpEventsPlugin : public EventsPlugin
 {
     Q_OBJECT
+
 public:
     XdpEventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~XdpEventsPlugin() = default;
 
     EventHandler *eventHandler() override;
 
@@ -41,6 +28,4 @@ private:
     Q_DISABLE_COPY(XdpEventsPlugin)
 };
 
-
-#endif  // Header guard
-
+#endif // Header guard

framebuffers/CMakeLists.txt

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

framebuffers/pipewire/CMakeLists.txt

@@ -5,15 +5,25 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}
 set (krfb_framebuffer_pw_SRCS
      pw_framebuffer.cpp
      pw_framebufferplugin.cpp
+
+     screencasting.cpp
 )
 
-qt5_add_dbus_interface(
+ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
+    HEADER krfb_fb_pipewire_debug.h
+    IDENTIFIER KRFB_FB_PIPEWIRE
+    CATEGORY_NAME krfb.framebuffer.pipewire
+    DESCRIPTION "KRFB PipeWire framebuffer plugin"
+    EXPORT KRFB
+)
+
+qt_add_dbus_interface(
    krfb_framebuffer_pw_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_screencast_interface.xml
    xdp_dbus_screencast_interface
 )
 
-qt5_add_dbus_interface(
+qt_add_dbus_interface(
    krfb_framebuffer_pw_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
    xdp_dbus_remotedesktop_interface
@@ -24,15 +34,43 @@ add_library(krfb_framebuffer_pw
     ${krfb_framebuffer_pw_SRCS}
 )
 
-target_link_libraries (krfb_framebuffer_pw
-                       Qt5::Core
-                       Qt5::Gui
-                       Qt5::DBus
-                       KF5::CoreAddons
-                       krfbprivate
-                       PipeWire::PipeWire
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+    ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
+        PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+        BASENAME zkde-screencast-unstable-v1
+    )
+else()
+    if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
+        set(private_code_option "PRIVATE_CODE")
+    endif()
+    qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
+        ${private_code_option}
+        FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+    )
+endif()
+
+if (KPipeWire_VERSION VERSION_LESS "6.0.80")
+    target_compile_definitions(krfb_framebuffer_pw PRIVATE -DKPIPEWIRE60=1)
+else()
+    target_compile_definitions(krfb_framebuffer_pw PRIVATE -DKPIPEWIRE60=0)
+endif()
+set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
+
+target_link_libraries(krfb_framebuffer_pw
+                      Qt::Core
+                      Qt::Gui
+                      Qt::DBus
+                      KF6::CoreAddons
+                      KF6::ConfigCore
+                      PkgConfig::PipeWire
+                      Plasma::KWaylandClient
+                      Wayland::Client
+                      krfbprivate
+                      K::KPipeWire
+                      K::KPipeWireDmaBuf
 )
 
+set_target_properties(krfb_framebuffer_pw PROPERTIES OUTPUT_NAME pw)
 install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )

framebuffers/pipewire/krfb_framebuffer_pw.json

@@ -1,71 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "PipeWire based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en «PipeWire» per al 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[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[uk]": "Буфер кадрів на основі PipeWire для KRfb.",
-        "Description[x-test]": "xxPipeWire based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "基于 PipeWire 的 KRfb 帧缓冲机制。",
-        "Description[zh_TW]": "KRfb 基於 PipeWire 的 Framebuffer。",
-        "EnabledByDefault": true,
-        "Id": "pw",
-        "License": "GPL3",
-        "Name": "PipeWire Framebuffer for KRfb",
-        "Name[ca@valencia]": "«Framebuffer» del «PipeWire» per al KRfb",
-        "Name[ca]": "«Framebuffer» del «PipeWire» per al KRfb",
-        "Name[cs]": "PipeWire Framebuffer pro KRfb",
-        "Name[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[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[uk]": "Буфер кадрів PipeWire для KRfb",
-        "Name[x-test]": "xxPipeWire Framebuffer for KRfbxx",
-        "Name[zh_CN]": "KRfb 的 PipeWire 帧缓冲机制",
-        "Name[zh_TW]": "KRfb 的 PipeWire Framebuffer",
-        "ServiceTypes": [
-            "krfb/framebuffer"
-        ],
-        "Version": "0.1",
-        "Website": "http://www.kde.org"
-    }
-}

framebuffers/pipewire/pipewire.json

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

framebuffers/pipewire/pw_framebuffer.h

@@ -1,18 +1,15 @@
 /* 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>
+   SPDX-FileCopyrightText: 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-3.0-or-later
 */
 #ifndef KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
 #define KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
 
 #include "framebuffer.h"
-#include <QWidget>
 #include <QVariantMap>
+#include <QWidget>
 
 /**
  * @brief The PWFrameBuffer class - framebuffer implementation based on XDG Desktop Portal ScreenCast interface.
@@ -20,36 +17,42 @@
  *
  * @author Oleg Chernovskiy <kanedias@xaker.ru>
  */
-class PWFrameBuffer: public FrameBuffer
+class PWFrameBuffer : public FrameBuffer
 {
     Q_OBJECT
+
 public:
-    typedef struct {
+    using Stream = struct
+    {
         uint nodeId;
         QVariantMap map;
-    } Stream;
-    typedef QList<Stream> Streams;
+    };
+    using Streams = QList<Stream>;
 
-    PWFrameBuffer(WId winid, QObject *parent = nullptr);
+    PWFrameBuffer(QObject *parent = nullptr);
     virtual ~PWFrameBuffer() override;
 
-    int  depth() override;
-    int  height() override;
-    int  width() override;
-    int  paddedWidth() 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);
+    void handleXdpSessionCreated(quint32 code, const QVariantMap &results);
+    void handleXdpDevicesSelected(quint32 code, const QVariantMap &results);
+    void handleXdpSourcesSelected(quint32 code, const QVariantMap &results);
+    void handleXdpRemoteDesktopStarted(quint32 code, const QVariantMap &results);
 
 private:
     class Private;

framebuffers/pipewire/pw_framebufferplugin.cpp

@@ -1,45 +1,30 @@
 /* This file is part of the KDE project
-   Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-
 #include "pw_framebufferplugin.h"
 #include "pw_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(PWFrameBufferPluginFactory, "krfb_framebuffer_pw.json",
-               registerPlugin<PWFrameBufferPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PWFrameBufferPlugin, "pipewire.json")
 
 PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
 {
 }
 
-
-PWFrameBufferPlugin::~PWFrameBufferPlugin()
+FrameBuffer *PWFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-
-FrameBuffer *PWFrameBufferPlugin::frameBuffer(WId id)
-{
-    auto pwfb = new PWFrameBuffer(id);
+    auto pwfb = new PWFrameBuffer;
+    if (args.contains(QLatin1String("name"))) {
+        pwfb->startVirtualMonitor(args[QStringLiteral("name")].toString(), args[QStringLiteral("resolution")].toSize(), args[QStringLiteral("scale")].toDouble());
+    } else {
+        // D-Bus is most important in XDG-Desktop-Portals init chain, no toys for us if something is wrong with XDP
+        // PipeWire connectivity is initialized after D-Bus session is started
+        pwfb->initDBus();
+    }
 
     // sanity check for dbus/wayland/pipewire errors
     if (!pwfb->isValid()) {

framebuffers/pipewire/pw_framebufferplugin.h

@@ -1,45 +1,27 @@
- /* This file is part of the KDE project
-    Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
+/* This file is part of the KDE project
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
 #ifndef KRFB_FRAMEBUFFER_PW_PWFRAMEBUFFERPLUGIN_H
 #define KRFB_FRAMEBUFFER_PW_PWFRAMEBUFFERPLUGIN_H
 
-
 #include "framebufferplugin.h"
-#include <QWidget>
-
 
 class FrameBuffer;
 
-class PWFrameBufferPlugin: public FrameBufferPlugin
+class PWFrameBufferPlugin : public FrameBufferPlugin
 {
-   Q_OBJECT
+    Q_OBJECT
 
 public:
-   PWFrameBufferPlugin(QObject *parent, const QVariantList &args);
-   virtual ~PWFrameBufferPlugin() override;
+    PWFrameBufferPlugin(QObject *parent, const QVariantList &args);
 
-   FrameBuffer *frameBuffer(WId id) override;
+    FrameBuffer *frameBuffer(const QVariantMap &args) override;
 
 private:
-   Q_DISABLE_COPY(PWFrameBufferPlugin)
+    Q_DISABLE_COPY(PWFrameBufferPlugin)
 };
 
-
-#endif  // Header guard
+#endif // Header guard

framebuffers/pipewire/screencasting.cpp

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

framebuffers/pipewire/screencasting.h

@@ -0,0 +1,79 @@
+/*
+    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 <QList>
+#include <QObject>
+#include <QSharedPointer>
+#include <optional>
+
+struct zkde_screencast_unstable_v1;
+
+namespace KWayland
+{
+namespace Client
+{
+
+class PlasmaWindow;
+class Registry;
+class Output;
+
+}
+}
+
+class ScreencastingPrivate;
+class ScreencastingSourcePrivate;
+class ScreencastingStreamPrivate;
+class ScreencastingStream : public QObject
+{
+    Q_OBJECT
+
+public:
+    ScreencastingStream(QObject *parent);
+    ~ScreencastingStream() override;
+
+    quint32 nodeId() const;
+
+Q_SIGNALS:
+    void created(quint32 nodeid);
+    void failed(const QString &error);
+    void closed();
+
+private:
+    friend class Screencasting;
+    QScopedPointer<ScreencastingStreamPrivate> d;
+};
+
+class Screencasting : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit Screencasting(QObject *parent = nullptr);
+    explicit Screencasting(KWayland::Client::Registry *registry, int id, int version, QObject *parent = nullptr);
+    ~Screencasting() override;
+
+    enum CursorMode {
+        Hidden = 1,
+        Embedded = 2,
+        Metadata = 4,
+    };
+    Q_ENUM(CursorMode)
+
+    ScreencastingStream *createVirtualMonitorStream(const QString &name, const QSize &resolution, qreal dpr, CursorMode mode);
+
+    void setup(zkde_screencast_unstable_v1 *screencasting);
+    void destroy();
+
+Q_SIGNALS:
+    void initialized();
+    void removed();
+    void sourcesChanged();
+
+private:
+    QScopedPointer<ScreencastingPrivate> d;
+};

framebuffers/qt/CMakeLists.txt

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

framebuffers/qt/krfb_framebuffer_qt.json

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

framebuffers/qt/qtframebuffer.cpp

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

framebuffers/qt/qtframebuffer.h

@@ -1,46 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-*/
-
-#ifndef KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
-#define KRFB_FRAMEBUFFER_QT_QTFRAMEBUFFER_H
-
-#include <QImage>
-#include "framebuffer.h"
-
-class QTimer;
-class QScreen;
-/**
-    @author Alessandro Praduroux <pradu@pradu.it>
-*/
-class QtFrameBuffer : public FrameBuffer
-{
-    Q_OBJECT
-public:
-    explicit QtFrameBuffer(WId id, QObject *parent = nullptr);
-
-    ~QtFrameBuffer() override;
-
-    int depth() override;
-    int height() override;
-    int width() override;
-    int paddedWidth() override;
-    void getServerFormat(rfbPixelFormat &format) override;
-    void startMonitor() override;
-    void stopMonitor() override;
-
-public Q_SLOTS:
-    void updateFrameBuffer();
-
-private:
-    QImage fbImage;
-    QTimer *t;
-    QScreen *primaryScreen;
-};
-
-#endif

framebuffers/qt/qtframebufferplugin.cpp

@@ -1,45 +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 "qtframebufferplugin.h"
-
-#include "qtframebuffer.h"
-
-#include <KPluginFactory>
-
-K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
-			   registerPlugin<QtFrameBufferPlugin>();)
-
-QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
-    : FrameBufferPlugin(parent, args)
-{
-}
-
-QtFrameBufferPlugin::~QtFrameBufferPlugin()
-{
-}
-
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
-{
-    return new QtFrameBuffer(id);
-}
-
-#include "qtframebufferplugin.moc"
-

framebuffers/qt/qtframebufferplugin.h

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

framebuffers/xcb/CMakeLists.txt

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

framebuffers/xcb/krfb_framebuffer_xcb.json

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

framebuffers/xcb/xcb.json

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

framebuffers/xcb/xcb_framebuffer.cpp

@@ -1,38 +1,34 @@
 /* This file is part of the KDE project
-   Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+   SPDX-FileCopyrightText: 2017 Alexey Min <alexey.min@gmail.com>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "xcb_framebuffer.h"
+#include "krfb_fb_xcb_debug.h"
 
-#include <xcb/xcb.h>
-#include <xcb/xproto.h>
 #include <xcb/damage.h>
 #include <xcb/shm.h>
 #include <xcb/xcb_image.h>
+#include <xcb/xproto.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
-#include <QX11Info>
-#include <QCoreApplication>
+#include <QAbstractNativeEventFilter>
+#include <QApplication>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QAbstractNativeEventFilter>
-#include <QDebug>
+#include <QtGui/private/qtx11extras_p.h>
+#include <qpa/qplatformnativeinterface.h>
 
-
-class KrfbXCBEventFilter: public QAbstractNativeEventFilter
+class KrfbXCBEventFilter : public QAbstractNativeEventFilter
 {
 public:
     KrfbXCBEventFilter(XCBFrameBuffer *owner);
 
 public:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
 
 public:
     int xdamageBaseEvent;
@@ -43,33 +39,33 @@ public:
     XCBFrameBuffer *fb_owner;
 };
 
-
-
-KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
-    xdamageBaseEvent(0), xdamageBaseError(0),
-    xshmBaseEvent(0), xshmBaseError(0), xshmAvail(false),
-    fb_owner(owner)
+KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner)
+    : xdamageBaseEvent(0)
+    , xdamageBaseError(0)
+    , xshmBaseEvent(0)
+    , xshmBaseError(0)
+    , xshmAvail(false)
+    , fb_owner(owner)
 {
     const xcb_query_extension_reply_t *xdamage_data = xcb_get_extension_data(
-                QX11Info::connection(), &xcb_damage_id);
+        QX11Info::connection(), &xcb_damage_id);
     if (xdamage_data) {
         // also query extension version!
         // ATTENTION: if we don't do that, xcb_damage_create() will always FAIL!
         xcb_damage_query_version_reply_t *xdamage_version = xcb_damage_query_version_reply(
-                    QX11Info::connection(),
-                    xcb_damage_query_version(
-                        QX11Info::connection(),
-                        XCB_DAMAGE_MAJOR_VERSION,
-                        XCB_DAMAGE_MINOR_VERSION),
-                    nullptr);
+            QX11Info::connection(),
+            xcb_damage_query_version(
+                QX11Info::connection(),
+                XCB_DAMAGE_MAJOR_VERSION,
+                XCB_DAMAGE_MINOR_VERSION),
+            nullptr);
         if (!xdamage_version) {
             qWarning() << "xcb framebuffer: ERROR: Failed to get XDamage extension version!\n";
             return;
         }
 
 #ifdef _DEBUG
-        qDebug() << "xcb framebuffer: XDamage extension version:" <<
-               xdamage_version->major_version << "." << xdamage_version->minor_version;
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XDamage extension version:" << xdamage_version->major_version << "." << xdamage_version->minor_version;
 #endif
 
         free(xdamage_version);
@@ -80,7 +76,7 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
         // XShm presence is optional. If it is present, all image getting
         // operations will be faster, without XShm it will only be slower.
         const xcb_query_extension_reply_t *xshm_data = xcb_get_extension_data(
-                    QX11Info::connection(), &xcb_shm_id);
+            QX11Info::connection(), &xcb_shm_id);
         if (xshm_data) {
             xshmAvail = true;
             xshmBaseEvent = xshm_data->first_event;
@@ -97,19 +93,21 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
     }
 }
 
-
 bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
-                                           void *message, long *result) {
-    Q_UNUSED(result);  // "result" is only used on windows
+                                           void *message, qintptr *result)
+{
+    Q_UNUSED(result); // "result" is only used on windows
 
-    if (xdamageBaseEvent == 0) return false;  // no xdamage extension
+    if (xdamageBaseEvent == 0) {
+        return false; // no xdamage extension
+    }
 
     if (eventType == "xcb_generic_event_t") {
-        xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message);
+        auto ev = static_cast<xcb_generic_event_t *>(message);
         if ((ev->response_type & 0x7F) == (xdamageBaseEvent + XCB_DAMAGE_NOTIFY)) {
             // this is xdamage notification
             this->fb_owner->handleXDamageNotify(ev);
-            return true;  // filter out this event, stop its processing
+            return true; // filter out this event, stop its processing
         }
     }
 
@@ -117,36 +115,38 @@ bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
     return false;
 }
 
-
-class XCBFrameBuffer::P {
+class XCBFrameBuffer::P
+{
 public:
-    xcb_damage_damage_t     damage;
-    xcb_shm_segment_info_t  shminfo;
-    xcb_screen_t           *rootScreen;   // X screen info (all monitors)
-    xcb_image_t            *framebufferImage;
-    xcb_image_t            *updateTile;
+    xcb_damage_damage_t damage;
+    xcb_shm_segment_info_t shminfo;
+    xcb_screen_t *rootScreen; // X screen info (all monitors)
+    xcb_image_t *framebufferImage;
+    xcb_image_t *updateTile;
 
-    KrfbXCBEventFilter     *x11EvtFilter;
+    KrfbXCBEventFilter *x11EvtFilter;
 
-    bool                    running;
+    bool running;
 
-    QRect                   area;  // capture area, primary monitor coordinates
+    QRect area; // capture area, primary monitor coordinates
+    WId win;
 };
 
-
-static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
+static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num)
+{
     xcb_screen_t *screen = nullptr;
     xcb_screen_iterator_t screens_iter = xcb_setup_roots_iterator(xcb_get_setup(conn));
-    for (; screens_iter.rem; --screen_num, xcb_screen_next(&screens_iter))
-        if (screen_num == 0)
+    for (; screens_iter.rem; --screen_num, xcb_screen_next(&screens_iter)) {
+        if (screen_num == 0) {
             screen = screens_iter.data;
+        }
+    }
     return screen;
 }
 
-
-
-XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
-    FrameBuffer(winid, parent), d(new XCBFrameBuffer::P)
+XCBFrameBuffer::XCBFrameBuffer(QObject *parent)
+    : FrameBuffer(parent)
+    , d(new XCBFrameBuffer::P)
 {
     d->running = false;
     d->damage = XCB_NONE;
@@ -163,18 +163,24 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
 
     QScreen *primaryScreen = QGuiApplication::primaryScreen();
     if (primaryScreen) {
-        qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
-                 << ", geometry: " << primaryScreen->geometry()
-                 << ", depth: " << primaryScreen->depth();
-        //
-        d->area = primaryScreen->geometry();
+        QPlatformNativeInterface *native = qApp->platformNativeInterface();
+        d->win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), primaryScreen));
+        qreal scaleFactor = primaryScreen->devicePixelRatio();
+        d->area = {primaryScreen->geometry().topLeft() * scaleFactor,
+                   primaryScreen->geometry().bottomRight() * scaleFactor};
+
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
+                             << ", geometry: " << primaryScreen->geometry()
+                             << ", device scaling: " << scaleFactor
+                             << ", native size: " << d->area
+                             << ", depth: " << primaryScreen->depth();
     } else {
         qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
         return;
     }
 
     d->framebufferImage = xcb_image_get(QX11Info::connection(),
-                                        this->win,
+                                        d->win,
                                         d->area.left(),
                                         d->area.top(),
                                         d->area.width(),
@@ -183,10 +189,10 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                                         XCB_IMAGE_FORMAT_Z_PIXMAP);
     if (d->framebufferImage) {
 #ifdef _DEBUG
-        qDebug() << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
-                 << ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
-                 << ", depth: " << d->framebufferImage->depth
-                 << ", padded width: " << d->framebufferImage->stride;
+        qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
+                             << ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
+                             << ", depth: " << d->framebufferImage->depth
+                             << ", padded width: " << d->framebufferImage->stride;
 #endif
         this->fb = (char *)d->framebufferImage->data;
     } else {
@@ -201,25 +207,25 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
         // "If base == 0 and bytes == ~0 and data == 0, no storage will be auto-allocated."
         // Width and height of the image = size of the capture area.
         d->updateTile = xcb_image_create_native(
-                    QX11Info::connection(),
-                    d->area.width(),            // width
-                    d->area.height(),           // height
-                    XCB_IMAGE_FORMAT_Z_PIXMAP,  // image format
-                    d->rootScreen->root_depth,  // depth
-                    nullptr,                    // base address = 0
-                    (uint32_t)~0,               // bytes = 0xffffffff
-                    nullptr);                   // data = 0
+            QX11Info::connection(),
+            d->area.width(), // width
+            d->area.height(), // height
+            XCB_IMAGE_FORMAT_Z_PIXMAP, // image format
+            d->rootScreen->root_depth, // depth
+            nullptr, // base address = 0
+            (uint32_t)~0, // bytes = 0xffffffff
+            nullptr); // data = 0
         if (d->updateTile) {
 #ifdef _DEBUG
-            qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
-            qDebug() << "    size: " << d->updateTile->width << "x" << d->updateTile->height
-                     << "(stride: " << d->updateTile->stride << ")";
-            qDebug() << "    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth; // 32, 24
-            qDebug() << "    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data;
-            qDebug() << "    size:  " << d->updateTile->size;
-            qDebug() << "    image byte order = " << d->updateTile->byte_order;  // == 0 .._LSB_FIRST
-            qDebug() << "    image bit order = " << d->updateTile->bit_order;    // == 1 .._MSB_FIRST
-            qDebug() << "    image plane_mask = " << d->updateTile->plane_mask;  // == 16777215 == 0x00FFFFFF
+            qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Successfully created new empty image in native format"
+                                 << "\n    size: " << d->updateTile->width << "x" << d->updateTile->height
+                                 << "(stride: " << d->updateTile->stride << ")"
+                                 << "\n    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth // 32, 24
+                                 << "\n    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data
+                                 << "\n    size:  " << d->updateTile->size
+                                 << "\n    image byte order = " << d->updateTile->byte_order // == 0 .._LSB_FIRST
+                                 << "\n    image bit order = " << d->updateTile->bit_order // == 1 .._MSB_FIRST
+                                 << "\n    image plane_mask = " << d->updateTile->plane_mask; // == 16777215 == 0x00FFFFFF
 #endif
 
             // allocate shared memory block only once, make its size large enough
@@ -237,18 +243,18 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
             xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
 
 #ifdef _DEBUG
-            qDebug() << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
+            qCDebug(KRFB_FB_XCB) << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
 #endif
 
             // will return 1 on success (yes!)
             int shmget_res = xcb_image_shm_get(
-                        QX11Info::connection(),
-                        this->win,
-                        d->updateTile,
-                        d->shminfo,
-                        d->area.left(), // x
-                        d->area.top(),  // y (size taken from image structure itself)?
-                        0xFFFFFFFF);
+                QX11Info::connection(),
+                d->win,
+                d->updateTile,
+                d->shminfo,
+                d->area.left(), // x
+                d->area.top(), // y (size taken from image structure itself)?
+                0xFFFFFFFF);
 
             if (shmget_res == 0) {
                 // error! shared mem not working?
@@ -273,32 +279,35 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
     }
 
 #ifdef _DEBUG
-    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;
+    qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
+                         << ", xshm base error = " << d->x11EvtFilter->xdamageBaseError
+                         << ", xdamage base event = " << d->x11EvtFilter->xdamageBaseEvent
+                         << ", xdamage base error = " << d->x11EvtFilter->xdamageBaseError;
 #endif
 
     QCoreApplication::instance()->installNativeEventFilter(d->x11EvtFilter);
 }
 
-
-XCBFrameBuffer::~XCBFrameBuffer() {
+XCBFrameBuffer::~XCBFrameBuffer()
+{
     // first - uninstall x11 event filter
     QCoreApplication::instance()->removeNativeEventFilter(d->x11EvtFilter);
     //
     if (d->framebufferImage) {
         xcb_image_destroy(d->framebufferImage);
-        fb = nullptr;  // image data was already destroyed by above call
+        fb = nullptr; // image data was already destroyed by above call
     }
     if (d->x11EvtFilter->xshmAvail) {
         // detach shared memory
-        if (d->shminfo.shmseg != XCB_NONE)
+        if (d->shminfo.shmseg != XCB_NONE) {
             xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg); // detach from X server
-        if (d->shminfo.shmaddr)
+        }
+        if (d->shminfo.shmaddr) {
             shmdt(d->shminfo.shmaddr); // detach addr from our address space
-        if (d->shminfo.shmid != XCB_NONE)
+        }
+        if (d->shminfo.shmid != XCB_NONE) {
             shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
+        }
     }
     // and delete image used for shared mem
     if (d->updateTile) {
@@ -313,43 +322,46 @@ XCBFrameBuffer::~XCBFrameBuffer() {
     delete d;
 }
 
-
-int XCBFrameBuffer::depth() {
+int XCBFrameBuffer::depth()
+{
     if (d->framebufferImage) {
         return d->framebufferImage->depth;
     }
     return 0;
 }
 
-
-int XCBFrameBuffer::height() {
+int XCBFrameBuffer::height()
+{
     if (d->framebufferImage) {
         return d->framebufferImage->height;
     }
     return 0;
 }
 
-
-int XCBFrameBuffer::width() {
+int XCBFrameBuffer::width()
+{
     if (d->framebufferImage) {
         return d->framebufferImage->width;
     }
     return 0;
 }
 
-int XCBFrameBuffer::paddedWidth() {
+int XCBFrameBuffer::paddedWidth()
+{
     if (d->framebufferImage) {
         return d->framebufferImage->stride;
     }
     return 0;
 }
 
-
-void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
-    if (!d->framebufferImage) return;
+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 = nullptr; // visual info
     if (d->rootScreen) {
         xcb_visualid_t root_visual = d->rootScreen->root_visual;
         xcb_depth_iterator_t depth_iter;
@@ -371,12 +383,11 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
         }
     }
 
-
     // fill in format common info
     format.bitsPerPixel = d->framebufferImage->bpp;
     format.depth = d->framebufferImage->depth;
-    format.trueColour = true;  // not using color palettes
-    format.bigEndian = false;  // always false for ZPIXMAP format!
+    format.trueColour = true; // not using color palettes
+    format.bigEndian = false; // always false for ZPIXMAP format!
 
     // information about pixels layout
 
@@ -415,55 +426,56 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
 
         // calculate pixel max value.
         // NOTE: bits_per_rgb_value is unreliable, thus should be avoided.
-        format.redMax   = root_visualtype->red_mask >> format.redShift;
+        format.redMax = root_visualtype->red_mask >> format.redShift;
         format.greenMax = root_visualtype->green_mask >> format.greenShift;
-        format.blueMax  = root_visualtype->blue_mask >> format.blueShift;
+        format.blueMax = root_visualtype->blue_mask >> format.blueShift;
 
 #ifdef _DEBUG
-        qDebug() << "    Calculated redShift   =" << (int)format.redShift;
-        qDebug() << "    Calculated greenShift =" << (int)format.greenShift;
-        qDebug() << "    Calculated blueShift  =" << (int)format.blueShift;
-        qDebug(     "    Calculated max values: R%d G%d B%d",
-               format.redMax, format.greenMax, format.blueMax);
+        qCDebug(KRFB_FB_XCB,
+                "    Calculated redShift   = %d\n"
+                "    Calculated greenShift = %d\n"
+                "    Calculated blueShift  = %d\n"
+                "    Calculated max values: R%d G%d B%d",
+                format.redShift, format.greenShift, format.blueShift format.redMax, format.greenMax, format.blueMax);
 #endif
     } else {
         // some kind of fallback (unlikely code execution will go this way)
         // idea taken from qt framefuffer sources
         if (format.bitsPerPixel == 8) {
-            format.redShift   = 0;
+            format.redShift = 0;
             format.greenShift = 3;
-            format.blueShift  = 6;
-            format.redMax   = 7;
+            format.blueShift = 6;
+            format.redMax = 7;
             format.greenMax = 7;
-            format.blueMax  = 3;
+            format.blueMax = 3;
         } else if (format.bitsPerPixel == 16) {
             // TODO: 16 bits per pixel format ??
             // what format of pixels does X server use for 16-bpp?
         } else if (format.bitsPerPixel == 32) {
-            format.redMax   = 0xff;
+            format.redMax = 0xff;
             format.greenMax = 0xff;
-            format.blueMax  = 0xff;
+            format.blueMax = 0xff;
             if (format.bigEndian) {
-                format.redShift   = 0;
+                format.redShift = 0;
                 format.greenShift = 8;
-                format.blueShift  = 16;
+                format.blueShift = 16;
             } else {
-                format.redShift   = 16;
+                format.redShift = 16;
                 format.greenShift = 8;
-                format.blueShift  = 0;
+                format.blueShift = 0;
             }
         }
     }
 }
 
-
 /**
  * This function contents was taken from X11 framebuffer source code.
  * It simply several intersecting rectangles into one bigger rect.
  * Non-intersecting rects are treated as different rects and exist
  * separately in this->tiles QList.
  */
-void XCBFrameBuffer::cleanupRects() {
+void XCBFrameBuffer::cleanupRects()
+{
     QList<QRect> cpy = tiles;
     bool inserted = false;
     tiles.clear();
@@ -472,15 +484,17 @@ void XCBFrameBuffer::cleanupRects() {
     while (iter.hasNext()) {
         const QRect &r = iter.next();
         // skip rects not intersecting with primary monitor
-        if (!r.intersects(d->area)) continue;
+        if (!r.intersects(d->area)) {
+            continue;
+        }
         // only take intersection of this rect with primary monitor rect
         QRect ri = r.intersected(d->area);
 
         if (tiles.size() > 0) {
-            for (int i = 0; i < tiles.size(); i++) {
-                // if current rect has intersection with tiles[i], unite them
-                if (ri.intersects(tiles[i])) {
-                    tiles[i] |= ri;
+            for (auto &tile : tiles) {
+                // if current rect has intersection with tile, unite them
+                if (ri.intersects(tile)) {
+                    tile |= ri;
                     inserted = true;
                     break;
                 }
@@ -498,35 +512,35 @@ void XCBFrameBuffer::cleanupRects() {
 
     // increase all rectangles size by 30 pixels each side.
     // limit coordinates to primary monitor boundaries.
-    for (int i = 0; i < tiles.size(); i++) {
-        tiles[i].adjust(-30, -30, 30, 30);
-        if (tiles[i].top() < d->area.top()) {
-            tiles[i].setTop(d->area.top());
+    for (auto &tile : tiles) {
+        tile.adjust(-30, -30, 30, 30);
+        if (tile.top() < d->area.top()) {
+            tile.setTop(d->area.top());
         }
-        if (tiles[i].bottom() > d->area.bottom()) {
-            tiles[i].setBottom(d->area.bottom());
+        if (tile.bottom() > d->area.bottom()) {
+            tile.setBottom(d->area.bottom());
         }
         //
-        if (tiles[i].left() < d->area.left()) {
-            tiles[i].setLeft(d->area.left());
+        if (tile.left() < d->area.left()) {
+            tile.setLeft(d->area.left());
         }
-        if (tiles[i].right() > d->area.right()) {
-            tiles[i].setRight(d->area.right());
+        if (tile.right() > d->area.right()) {
+            tile.setRight(d->area.right());
         }
         // move update rects so that they are positioned relative to
         //   framebuffer image, not whole screen
-        tiles[i].moveTo(tiles[i].left() - d->area.left(),
-                        tiles[i].top() - d->area.top());
+        tile.moveTo(tile.left() - d->area.left(),
+                    tile.top() - d->area.top());
     }
 }
 
-
 /**
  * This function is called by RfbServerManager::updateScreens()
  * approximately every 50ms (!!), driven by QTimer to get all
  * modified rectangles on the screen
  */
-QList<QRect> XCBFrameBuffer::modifiedTiles() {
+QList<QRect> XCBFrameBuffer::modifiedTiles()
+{
     QList<QRect> ret;
     if (!d->running) {
         return ret;
@@ -536,53 +550,52 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
 
     if (tiles.size() > 0) {
         if (d->x11EvtFilter->xshmAvail) {
-
             // loop over all damage rectangles gathered up to this time
             QListIterator<QRect> iter(tiles);
-            //foreach(const QRect &r, tiles) {
+            // foreach(const QRect &r, tiles) {
             while (iter.hasNext()) {
                 const QRect &r = iter.next();
 
                 // get image data into shared memory segment
                 // now rects are positioned relative to framebufferImage,
                 // but we need to get image from the whole screen, so
-                // translate whe coordinates
+                // translate the coordinates
                 xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
-                            QX11Info::connection(),
-                            this->win,
-                            d->area.left() + r.left(),
-                            d->area.top()  + r.top(),
-                            r.width(),
-                            r.height(),
-                            0xFFFFFFFF,
-                            XCB_IMAGE_FORMAT_Z_PIXMAP,
-                            d->shminfo.shmseg,
-                            0);
+                    QX11Info::connection(),
+                    d->win,
+                    d->area.left() + r.left(),
+                    d->area.top() + r.top(),
+                    r.width(),
+                    r.height(),
+                    0xFFFFFFFF,
+                    XCB_IMAGE_FORMAT_Z_PIXMAP,
+                    d->shminfo.shmseg,
+                    0);
 
                 xcb_shm_get_image_reply_t *sgi_reply = xcb_shm_get_image_reply(
-                            QX11Info::connection(), sgi_cookie, nullptr);
+                    QX11Info::connection(), sgi_cookie, nullptr);
                 if (sgi_reply) {
                     // create temporary image to get update rect contents into
                     d->updateTile = xcb_image_create_native(
-                                QX11Info::connection(),
-                                r.width(),
-                                r.height(),
-                                XCB_IMAGE_FORMAT_Z_PIXMAP,
-                                d->rootScreen->root_depth,
-                                nullptr,      // base == 0
-                                (uint32_t)~0, // bytes == ~0
-                                nullptr);
+                        QX11Info::connection(),
+                        r.width(),
+                        r.height(),
+                        XCB_IMAGE_FORMAT_Z_PIXMAP,
+                        d->rootScreen->root_depth,
+                        nullptr, // base == 0
+                        (uint32_t)~0, // bytes == ~0
+                        nullptr);
 
                     if (d->updateTile) {
                         d->updateTile->data = d->shminfo.shmaddr;
 
                         // copy pixels from this damage rectangle image
                         // to our total framebuffer image
-                        int pxsize =  d->framebufferImage->bpp / 8;
+                        int pxsize = d->framebufferImage->bpp / 8;
                         char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
                         char *src = (char *)d->updateTile->data;
                         for (int i = 0; i < d->updateTile->height; i++) {
-                            memcpy(dest, src, d->updateTile->stride);  // copy whole row of pixels
+                            memcpy(dest, src, d->updateTile->stride); // copy whole row of pixels
                             dest += d->framebufferImage->stride;
                             src += d->updateTile->stride;
                         }
@@ -599,28 +612,28 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
         } else {
             // not using shared memory
             // will use just xcb_image_get() and copy pixels
-            for (const QRect& r : qAsConst(tiles)) {
+            for (const QRect &r : std::as_const(tiles)) {
                 // I did not find XGetSubImage() analog in XCB!!
                 // need function that copies pixels from one image to another
                 xcb_image_t *damagedImage = xcb_image_get(
-                            QX11Info::connection(),
-                            this->win,
-                            r.left(),
-                            r.top(),
-                            r.width(),
-                            r.height(),
-                            0xFFFFFFFF, // AllPlanes
-                            XCB_IMAGE_FORMAT_Z_PIXMAP);
+                    QX11Info::connection(),
+                    d->win,
+                    r.left(),
+                    r.top(),
+                    r.width(),
+                    r.height(),
+                    0xFFFFFFFF, // AllPlanes
+                    XCB_IMAGE_FORMAT_Z_PIXMAP);
                 // manually copy pixels
-                int pxsize =  d->framebufferImage->bpp / 8;
+                int pxsize = d->framebufferImage->bpp / 8;
                 char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
                 char *src = (char *)damagedImage->data;
                 // loop every row in damaged image
                 for (int i = 0; i < damagedImage->height; i++) {
                     // copy whole row of pixels from src image to dest
                     memcpy(dest, src, damagedImage->stride);
-                    dest += d->framebufferImage->stride;  // move 1 row down in dest
-                    src += damagedImage->stride;          // move 1 row down in src
+                    dest += d->framebufferImage->stride; // move 1 row down in dest
+                    src += damagedImage->stride; // move 1 row down in src
                 }
                 //
                 xcb_image_destroy(damagedImage);
@@ -633,34 +646,37 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
     // ^^ If we clear here all our known "damage areas", then we can also clear
     //    damaged area for xdamage? No, we don't need to in our case
     //    (XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES report mode)
-    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+    // xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
 
     return ret;
 }
 
-
-void XCBFrameBuffer::startMonitor() {
-    if (d->running) return;
+void XCBFrameBuffer::startMonitor()
+{
+    if (d->running) {
+        return;
+    }
 
     d->running = true;
     d->damage = xcb_generate_id(QX11Info::connection());
-    xcb_damage_create(QX11Info::connection(), d->damage, this->win,
-            XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
+    xcb_damage_create(QX11Info::connection(), d->damage, d->win,
+                      XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
 
     // (currently) we do not call xcb_damage_subtract() EVER, because
     // RAW rectangles are reported. every time some area of the screen
     // was changed, we get only that rectangle
-    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+    // xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
 }
 
-
-void XCBFrameBuffer::stopMonitor() {
-    if (!d->running) return;
+void XCBFrameBuffer::stopMonitor()
+{
+    if (!d->running) {
+        return;
+    }
     d->running = false;
     xcb_damage_destroy(QX11Info::connection(), d->damage);
 }
 
-
 // void XCBFrameBuffer::acquireEvents() {} // this function was totally unused
 // in X11 framebuffer, but it was the only function where XDamageSubtract() was called?
 // Also it had a blocking event loop like:
@@ -674,12 +690,11 @@ void XCBFrameBuffer::stopMonitor() {
 // This loop takes all available Xdamage events from queue, and ends if there are no
 // more such events in input queue.
 
+void XCBFrameBuffer::handleXDamageNotify(xcb_generic_event_t *xevent)
+{
+    auto xdevt = (xcb_damage_notify_event_t *)xevent;
 
-void XCBFrameBuffer::handleXDamageNotify(xcb_generic_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,
+    QRect r((int)xdevt->area.x, (int)xdevt->area.y,
             (int)xdevt->area.width, (int)xdevt->area.height);
     this->tiles.append(r);
 }
-

framebuffers/xcb/xcb_framebuffer.h

@@ -1,10 +1,7 @@
 /* This file is part of the KDE project
-   Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+   SPDX-FileCopyrightText: 2017 Alexey Min <alexey.min@gmail.com>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
 #define KRFB_FRAMEBUFFER_XCB_XCB_FRAMEBUFFER_H
@@ -13,24 +10,23 @@
 #include <QWidget>
 #include <xcb/xcb.h>
 
-
-
 /**
     @author Alexey Min <alexey.min@gmail.com>
 */
-class XCBFrameBuffer: public FrameBuffer
+class XCBFrameBuffer : public FrameBuffer
 {
     Q_OBJECT
+
 public:
-    explicit XCBFrameBuffer(WId winid, QObject *parent = nullptr);
+    explicit XCBFrameBuffer(QObject *parent = nullptr);
     ~XCBFrameBuffer() override;
 
 public:
     QList<QRect> modifiedTiles() override;
-    int  depth() override;
-    int  height() override;
-    int  width() override;
-    int  paddedWidth() override;
+    int depth() override;
+    int height() override;
+    int width() override;
+    int paddedWidth() override;
     void getServerFormat(rfbPixelFormat &format) override;
     void startMonitor() override;
     void stopMonitor() override;

framebuffers/xcb/xcb_framebufferplugin.cpp

@@ -1,46 +1,24 @@
 /* This file is part of the KDE project
- Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+ SPDX-FileCopyrightText: 2017 Alexey Min <alexey.min@gmail.com>
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-
 #include "xcb_framebufferplugin.h"
 #include "xcb_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(XCBFrameBufferPluginFactory, "krfb_framebuffer_xcb.json",
-               registerPlugin<XCBFrameBufferPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(XCBFrameBufferPlugin, "xcb.json")
 
 XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
 {
 }
 
-
-XCBFrameBufferPlugin::~XCBFrameBufferPlugin()
+FrameBuffer *XCBFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-
-FrameBuffer *XCBFrameBufferPlugin::frameBuffer(WId id)
-{
-    return new XCBFrameBuffer(id);
+    Q_UNUSED(args);
+    return new XCBFrameBuffer;
 }
 
 #include "xcb_framebufferplugin.moc"
-

framebuffers/xcb/xcb_framebufferplugin.h

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

krfb/CMakeLists.txt

@@ -23,11 +23,11 @@ generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
 
 target_link_libraries (krfbprivate
-                       Qt5::Core
-                       Qt5::Widgets
-                       Qt5::X11Extras
+                       Qt::Core
+                       Qt::Widgets
+                       Qt::GuiPrivate
                        ${X11_X11_LIB}
-                       ${LIBVNCSERVER_LIBRARIES}
+                       LibVNCServer::vncserver
 )
 
 set_target_properties (krfbprivate PROPERTIES
@@ -36,16 +36,10 @@ set_target_properties (krfbprivate PROPERTIES
 )
 
 install (TARGETS krfbprivate
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
          LIBRARY NAMELINK_SKIP
 )
 
-install (FILES
-         krfb-framebuffer.desktop
-         krfb-events.desktop
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
 #####################################
 # Second target: krfb - the app
 # itself.
@@ -66,11 +60,19 @@ set (krfb_SRCS
      invitationsrfbclient.cpp
 )
 
+ecm_qt_declare_logging_category(krfb_SRCS
+    HEADER krfbdebug.h
+    IDENTIFIER KRFB
+    CATEGORY_NAME krfb.krfb
+    DESCRIPTION "KRFB Application"
+    EXPORT KRFB
+)
+
 kconfig_add_kcfg_files (krfb_SRCS
                      krfbconfig.kcfgc
 )
 
-ki18n_wrap_ui (krfb_SRCS
+ki18n_wrap_ui (krfb_UI_SRCS
                    ui/configtcp.ui
                    ui/configsecurity.ui
                    ui/configframebuffer.ui
@@ -78,12 +80,13 @@ ki18n_wrap_ui (krfb_SRCS
                    ui/mainwidget.ui
 )
 
-qt5_add_resources(krfb_SRCS
+qt_add_resources(krfb_SRCS
     krfb.qrc
 )
 
 add_executable (krfb
                      ${krfb_SRCS}
+                     ${krfb_UI_SRCS}
 )
 
 target_link_libraries (krfb
@@ -92,18 +95,19 @@ target_link_libraries (krfb
                        ${X11_Xext_LIB}
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
-                       Qt5::Network
-                       KF5::Completion
-                       KF5::CoreAddons
-                       KF5::DBusAddons
-                       KF5::DNSSD
-                       KF5::I18n
-                       KF5::Notifications
-                       KF5::Wallet
-                       KF5::WidgetsAddons
-                       KF5::WindowSystem
-                       KF5::XmlGui
-                       ${LIBVNCSERVER_LIBRARIES}
+                       Qt::Network
+                       KF6::CoreAddons
+                       KF6::DBusAddons
+                       KF6::DNSSD
+                       KF6::I18n
+                       KF6::Notifications
+                       KF6::Wallet
+                       KF6::WidgetsAddons
+                       KF6::WindowSystem
+                       KF6::XmlGui
+                       KF6::StatusNotifierItem
+                       KF6::Crash
+                       LibVNCServer::vncserver
 )
 
 if (X11_XTest_FOUND)
@@ -113,13 +117,49 @@ if (X11_XTest_FOUND)
 endif (X11_XTest_FOUND)
 
 install (TARGETS krfb
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+#################################
+kconfig_add_kcfg_files (krfbvm_SRCS
+                     krfbconfig.kcfgc
+)
+
+ecm_qt_declare_logging_category(krfbvm_SRCS
+    HEADER krfbdebug.h
+    IDENTIFIER KRFB
+    CATEGORY_NAME krfb.krfb
+    DESCRIPTION "KRFB Application"
+    EXPORT KRFB
+)
+
+add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb_UI_SRCS}
+                                   rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
+target_link_libraries(krfb-virtualmonitor
+                      krfbprivate
+                      Qt::Gui
+                      Qt::Network
+                      KF6::ConfigGui
+                      KF6::CoreAddons
+                      KF6::I18n
+                      KF6::Notifications
+                      KF6::WindowSystem
+                      KF6::Crash
+)
+
+install (TARGETS krfb-virtualmonitor
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+configure_file(org.kde.krfb.virtualmonitor.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop @ONLY)
+install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krfb.virtualmonitor.desktop
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )
 
 ########### install files ###############
 
 install (PROGRAMS org.kde.krfb.desktop
-         DESTINATION ${XDG_APPS_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )
 
 install(FILES org.kde.krfb.appdata.xml
@@ -127,6 +167,5 @@ install(FILES org.kde.krfb.appdata.xml
 )
 
 install (FILES krfb.notifyrc
-         DESTINATION ${DATA_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
 )
-

krfb/connectiondialog.cpp

@@ -1,22 +1,9 @@
 /* This file is part of the KDE project
-   Copyright (C) 2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+   SPDX-FileCopyrightText: 2010 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+   SPDX-FileCopyrightText: 2004 Nadeem Hasan <nhasan@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 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "connectiondialog.h"
@@ -24,22 +11,22 @@
 #include <QCheckBox>
 #include <QIcon>
 
+#include <KConfigGroup>
+#include <KGuiItem>
 #include <KLocalizedString>
 #include <KStandardGuiItem>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
-#include <KGuiItem>
 #include <QVBoxLayout>
 
-template <typename UI>
+template<typename UI>
 ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowTitle(i18n("New Connection"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    auto mainWidget = new QWidget(this);
+    auto mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);

krfb/connectiondialog.h

@@ -1,22 +1,9 @@
 /* This file is part of the KDE project
-   Copyright (C) 2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+   SPDX-FileCopyrightText: 2010 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+   SPDX-FileCopyrightText: 2004 Nadeem Hasan <nhasan@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 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef CONNECTIONDIALOG_H
@@ -25,12 +12,14 @@
 #include "ui_connectionwidget.h"
 #include <QDialog>
 
-template <typename UI>
+template<typename UI>
 class ConnectionDialog : public QDialog
 {
 public:
     explicit ConnectionDialog(QWidget *parent);
-    ~ConnectionDialog() override {};
+    ~ConnectionDialog() override
+    {
+    }
 
     void setAllowRemoteControl(bool b);
     bool allowRemoteControl();
@@ -40,14 +29,14 @@ protected:
     UI m_ui;
 };
 
-template <typename UI>
+template<typename UI>
 void ConnectionDialog<UI>::setAllowRemoteControl(bool b)
 {
     m_ui.cbAllowRemoteControl->setChecked(b);
     m_ui.cbAllowRemoteControl->setVisible(b);
 }
 
-template <typename UI>
+template<typename UI>
 bool ConnectionDialog<UI>::allowRemoteControl()
 {
     return m_ui.cbAllowRemoteControl->isChecked();
@@ -58,12 +47,12 @@ bool ConnectionDialog<UI>::allowRemoteControl()
 class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget>
 {
     Q_OBJECT
+
 public:
     explicit InvitationsConnectionDialog(QWidget *parent);
-    void setRemoteHost(const QString & host);
+    void setRemoteHost(const QString &host);
 };
 
 //*********
 
 #endif // CONNECTIONDIALOG_H
-

krfb/events.cpp

@@ -1,25 +1,12 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2010 Collabora Ltd.
-     @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-   Copyright (C) 2001-2003 by Tim Jansen <tim@tjansen.de>
+   SPDX-FileCopyrightText: 2010 Collabora Ltd.
+   SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
 
-   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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "events.h"

krfb/events.h

@@ -1,47 +1,36 @@
 /*
    This file is part of the KDE project
 
-   Copyright (C) 2010 Collabora Ltd.
-     @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-   Copyright (C) 2001-2003 by Tim Jansen <tim@tjansen.de>
+   SPDX-FileCopyrightText: 2010 Collabora Ltd.
+   SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
 
-   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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef EVENTS_H
 #define EVENTS_H
 
 #include "framebuffer.h"
-#include "rfb.h"
 #include "krfbprivate_export.h"
+#include "rfb.h"
 
 #include <QObject>
 
 class KRFBPRIVATE_EXPORT EventHandler : public QObject
 {
     Q_OBJECT
+
 public:
     explicit EventHandler(QObject *parent = nullptr);
-    virtual ~EventHandler() = default;
+    ~EventHandler() override = default;
     virtual void handleKeyboard(bool down, rfbKeySym key) = 0;
     virtual void handlePointer(int buttonMask, int x, int y) = 0;
 
     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;

krfb/eventsmanager.cpp

@@ -1,38 +1,22 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "eventsmanager.h"
 
 #include "eventsplugin.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
 #include "rfbservermanager.h"
 
-#include <QDebug>
 #include <QGlobalStatic>
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QtCore/QSharedPointer>
-
 class EventsManagerStatic
 {
 public:
@@ -43,76 +27,36 @@ Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)
 
 EventsManager::EventsManager()
 {
-    //qDebug();
-
-    loadPlugins();
+    const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
+        const KPluginFactory::Result<EventsPlugin> result = KPluginFactory::instantiatePlugin<EventsPlugin>(data);
+        if (result.plugin) {
+            m_plugins.insert(data.pluginId(), result.plugin);
+            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
+        } else {
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
+        }
+    }
 }
 
-EventsManager::~EventsManager()
-{
-    //qDebug();
-}
+EventsManager::~EventsManager() = default;
 
 EventsManager *EventsManager::instance()
 {
-    //qDebug();
-
     return &eventsManagerStatic->instance;
 }
 
-void EventsManager::loadPlugins()
-{
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/events"));
-        });
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-    KPluginMetaData data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name()))
-            continue;
-        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
-
-        if (!factory) {
-            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
-            continue;
-        } else {
-            qDebug() << "found plugin at " << data.fileName();
-        }
-
-        EventsPlugin *plugin = factory->create<EventsPlugin>(this);
-        if (plugin) {
-            m_plugins.insert(data.pluginId(), plugin);
-            qDebug() << "Loaded plugin with name " << data.pluginId();
-        } else {
-            qDebug() << "unable to load plugin for " << data.fileName();
-        }
-        unique.insert (data.name());
-    }
-}
-
 QSharedPointer<EventHandler> EventsManager::eventHandler()
 {
-    QMap<QString, EventsPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        QSharedPointer<EventHandler> eventHandler(iter.value()->eventHandler());
-
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<EventHandler> eventHandler(it.value()->eventHandler());
         if (eventHandler) {
             eventHandler->setFrameBufferPlugin(RfbServerManager::instance()->framebuffer());
             return eventHandler;
         }
-
-        ++iter;
     }
 
     // No valid events plugin found.
-    qDebug() << "No valid event handlers found. returning null.";
+    qCDebug(KRFB) << "No valid event handlers found. returning null.";
     return QSharedPointer<EventHandler>();
 }

krfb/eventsmanager.h

@@ -1,21 +1,8 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef KRFB_EVENTSMANAGER_H
@@ -43,7 +30,7 @@ class KRFBPRIVATE_EXPORT EventsManager : public QObject
 public:
     static EventsManager *instance();
 
-    virtual ~EventsManager();
+    ~EventsManager() override;
 
     QSharedPointer<EventHandler> eventHandler();
 
@@ -52,11 +39,8 @@ private:
 
     EventsManager();
 
-    void loadPlugins();
-
     QMap<QString, EventsPlugin *> m_plugins;
-    QList<QWeakPointer<EventHandler> > m_eventHandlers;
+    QList<QWeakPointer<EventHandler>> m_eventHandlers;
 };
 
-
-#endif  // Header guard
+#endif // Header guard

krfb/eventsplugin.cpp

@@ -1,21 +1,7 @@
-
 /* This file is part of the KDE project
-   Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
+   SPDX-FileCopyrightText: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "eventsplugin.h"

krfb/eventsplugin.h

@@ -1,21 +1,8 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef LIB_KRFB_EVENTSPLUGIN_H
@@ -23,20 +10,20 @@
 
 #include "krfbprivate_export.h"
 
-#include <QtCore/QVariantList>
 #include <QWidget>
+#include <QtCore/QVariantList>
 
 class EventHandler;
 
 class KRFBPRIVATE_EXPORT EventsPlugin : public QObject
 {
     Q_OBJECT
+
 public:
     EventsPlugin(QObject *parent, const QVariantList &args);
-    virtual ~EventsPlugin();
+    ~EventsPlugin() override;
 
     virtual EventHandler *eventHandler() = 0;
 };
 
-#endif  // Header guard
-
+#endif // Header guard

krfb/framebuffer.cpp

@@ -1,21 +1,18 @@
 /* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "framebuffer.h"
 
+#include <QCursor>
+#include <QGuiApplication>
+#include <QScreen>
 #include <config-krfb.h>
 
-#include <X11/Xutil.h>
-
-
-FrameBuffer::FrameBuffer(WId id, QObject *parent)
-    : QObject(parent), win(id)
+FrameBuffer::FrameBuffer(QObject *parent)
+    : QObject(parent)
 {
 }
 
@@ -29,7 +26,7 @@ char *FrameBuffer::data()
     return fb;
 }
 
-QList< QRect > FrameBuffer::modifiedTiles()
+QList<QRect> FrameBuffer::modifiedTiles()
 {
     QList<QRect> ret = tiles;
     tiles.clear();
@@ -73,3 +70,17 @@ void FrameBuffer::startMonitor()
 void FrameBuffer::stopMonitor()
 {
 }
+
+QPoint FrameBuffer::cursorPosition()
+{
+    QPoint cursorPos = QCursor::pos();
+    QScreen *primaryScreen = QGuiApplication::primaryScreen();
+    if (primaryScreen) {
+        qreal scaleFactor = primaryScreen->devicePixelRatio();
+        cursorPos.setX(qRound(cursorPos.x() * scaleFactor));
+        cursorPos.setY(qRound(cursorPos.y() * scaleFactor));
+    } else {
+        qWarning() << "cursorPosition: ERROR: Failed to get application's primary screen info!";
+    }
+    return cursorPos;
+}

krfb/framebuffer.h

@@ -1,10 +1,7 @@
 /* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef FRAMEBUFFER_H
@@ -14,13 +11,12 @@
 
 #include "krfbprivate_export.h"
 
+#include <QList>
 #include <QObject>
 #include <QRect>
-#include <QList>
 #include <QVariant>
 #include <QWidget>
 
-
 class FrameBuffer;
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
@@ -28,8 +24,9 @@ class FrameBuffer;
 class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
     Q_OBJECT
+
 public:
-    explicit FrameBuffer(WId id, QObject *parent = nullptr);
+    explicit FrameBuffer(QObject *parent = nullptr);
 
     ~FrameBuffer() override;
 
@@ -42,21 +39,21 @@ public:
     virtual int depth();
     virtual void startMonitor();
     virtual void stopMonitor();
+    virtual QPoint cursorPosition();
 
     virtual void getServerFormat(rfbPixelFormat &format);
 
     virtual QVariant customProperty(const QString &property) const;
+
 Q_SIGNALS:
     void frameBufferChanged();
 
 protected:
-    WId win;
-    char *fb;
+    char *fb = nullptr;
     QList<QRect> tiles;
 
 private:
     Q_DISABLE_COPY(FrameBuffer)
-
 };
 
 #endif

krfb/framebuffermanager.cpp

@@ -1,37 +1,22 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "framebuffermanager.h"
 
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
 
-#include <QDebug>
 #include <QGlobalStatic>
+#include <QGuiApplication>
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 #include <KPluginMetaData>
 
-#include <QSharedPointer>
-
 class FrameBufferManagerStatic
 {
 public:
@@ -42,97 +27,64 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {
-    //qDebug();
-
-    loadPlugins();
+    const auto platformFilter = [](const KPluginMetaData &pluginData) {
+        return pluginData.value(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms"), QStringList()).contains(QGuiApplication::platformName());
+    };
+    const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), platformFilter, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
+        const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
+        if (result.plugin) {
+            m_plugins.insert(data.pluginId(), result.plugin);
+            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
+        } else {
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
+        }
+    }
 }
 
 FrameBufferManager::~FrameBufferManager()
 {
-    //qDebug();
 }
 
 FrameBufferManager *FrameBufferManager::instance()
 {
-    //qDebug();
-
     return &frameBufferManagerStatic->instance;
 }
 
-void FrameBufferManager::loadPlugins()
+QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVariantMap &args)
 {
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-        const KPluginMetaData &data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name()))
-            continue;
-        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
-
-        if (!factory) {
-            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
-            continue;
-        } else {
-            qDebug() << "found plugin at " << data.fileName();
-        }
-
-        FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
-        if (plugin) {
-            m_plugins.insert(data.pluginId(), plugin);
-            qDebug() << "Loaded plugin with name " << data.pluginId();
-        } else {
-            qDebug() << "unable to load pluign for " << data.fileName();
-        }
-        unique.insert (data.name());
-    }
-}
-
-QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
-{
-    //qDebug();
-
     // See if there is still an existing framebuffer to this WId.
     if (m_frameBuffers.contains(id)) {
         QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);
 
         if (weakFrameBuffer) {
-            //qDebug() << "Found cached frame buffer.";
+            // qDebug() << "Found cached frame buffer.";
             return weakFrameBuffer.toStrongRef();
         } else {
-            //qDebug() << "Found deleted cached frame buffer. Don't use.";
+            // qDebug() << "Found deleted cached frame buffer. Don't use.";
             m_frameBuffers.remove(id);
         }
     }
 
-    // We don't already have that frame buffer.
-    QMap<QString, FrameBufferPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
-
-            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
-
-            if (frameBuffer) {
-                m_frameBuffers.insert(id, frameBuffer.toWeakRef());
-
-                return frameBuffer;
-            }
+    if (auto preferredPlugin = m_plugins.value(KrfbConfig::preferredFrameBufferPlugin())) {
+        if (auto frameBuffer = QSharedPointer<FrameBuffer>(preferredPlugin->frameBuffer(args))) {
+            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+            m_frameBuffers.insert(id, frameBuffer.toWeakRef());
+            return frameBuffer;
         }
+    }
 
-        ++iter;
+    // We don't already have that frame buffer.
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(args));
+        if (frameBuffer) {
+            qCDebug(KRFB) << "Using FrameBuffer:" << it.key();
+            m_frameBuffers.insert(id, frameBuffer.toWeakRef());
+            return frameBuffer;
+        }
     }
 
     // No valid framebuffer plugin found.
-    qDebug() << "No valid framebuffer found. returning null.";
+    qCDebug(KRFB) << "No valid framebuffer found. returning null.";
     return QSharedPointer<FrameBuffer>();
 }

krfb/framebuffermanager.h

@@ -1,21 +1,8 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef KRFB_FRAMEBUFFERMANAGER_H
@@ -45,19 +32,15 @@ public:
 
     ~FrameBufferManager() override;
 
-    QSharedPointer<FrameBuffer> frameBuffer(WId id);
+    QSharedPointer<FrameBuffer> frameBuffer(WId id, const QVariantMap &args);
 
 private:
     Q_DISABLE_COPY(FrameBufferManager)
 
     FrameBufferManager();
 
-    void loadPlugins();
-
     QMap<QString, FrameBufferPlugin *> m_plugins;
-    QMap<WId, QWeakPointer<FrameBuffer> > m_frameBuffers;
+    QMap<WId, QWeakPointer<FrameBuffer>> m_frameBuffers;
 };
 
-
-#endif  // Header guard
-
+#endif // Header guard

krfb/framebufferplugin.cpp

@@ -1,21 +1,8 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "framebufferplugin.h"

krfb/framebufferplugin.h

@@ -1,21 +1,8 @@
 /* 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>
+   SPDX-FileCopyrightText: 2009 Collabora Ltd <info@collabora.co.uk>
+   SPDX-FileContributor: 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.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef LIB_KRFB_FRAMEBUFFERPLUGIN_H
@@ -26,7 +13,6 @@
 #include <QVariantList>
 #include <QWidget>
 
-
 class FrameBuffer;
 
 class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
@@ -34,11 +20,10 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
     Q_OBJECT
 
 public:
-    FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    explicit FrameBufferPlugin(QObject *parent, const QVariantList &args);
     ~FrameBufferPlugin() override;
 
-    virtual FrameBuffer *frameBuffer(WId id) = 0;
+    virtual FrameBuffer *frameBuffer(const QVariantMap &args) = 0;
 };
 
-#endif  // Header guard
-
+#endif // Header guard

krfb/invitationsrfbclient.cpp

@@ -1,61 +1,50 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-    Copyright (C) 2001-2003 by Tim Jansen <tim@tjansen.de>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
 
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "rfb.h"
 #include "invitationsrfbclient.h"
+#include "connectiondialog.h"
 #include "invitationsrfbserver.h"
 #include "krfbconfig.h"
+#include "krfbdebug.h"
+#include "rfb.h"
 #include "sockethelpers.h"
-#include "connectiondialog.h"
 
-#include <KNotification>
 #include <KLocalizedString>
+#include <KNotification>
 
-#include <QDebug>
+#include <KConfigGroup>
 #include <QSocketNotifier>
 #include <poll.h>
-#include <KConfigGroup>
 
 struct PendingInvitationsRfbClient::Private
 {
-    Private(rfbClientPtr client) :
-        client(client),
-        askOnConnect(true)
-    {}
+    Private(rfbClientPtr client)
+        : client(client)
+        , askOnConnect(true)
+    {
+    }
 
     rfbClientPtr client;
-    QSocketNotifier *notifier;
+    QSocketNotifier *notifier = nullptr;
     bool askOnConnect;
 };
 
-static void clientGoneHookNoop(rfbClientPtr cl) { Q_UNUSED(cl); }
+static void clientGoneHookNoop(rfbClientPtr cl)
+{
+    Q_UNUSED(cl);
+}
 
-PendingInvitationsRfbClient::PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent) :
-    PendingRfbClient(client, parent),
-    d(new Private(client))
+PendingInvitationsRfbClient::PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent)
+    : PendingRfbClient(client, parent)
+    , 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()
@@ -68,18 +57,16 @@ void PendingInvitationsRfbClient::processNewClient()
     QString host = peerAddress(m_rfbClient->sock) + QLatin1Char(':') + QString::number(peerPort(m_rfbClient->sock));
 
     if (d->askOnConnect == false) {
-
         KNotification::event(QStringLiteral("NewConnectionAutoAccepted"),
                              i18n("Accepted connection from %1", host));
         accept(new InvitationsRfbClient(m_rfbClient, parent()));
 
     } else {
-
         KNotification::event(QStringLiteral("NewConnectionOnHold"),
-                            i18n("Received connection from %1, on hold (waiting for confirmation)",
-                                host));
+                             i18n("Received connection from %1, on hold (waiting for confirmation)",
+                                  host));
 
-        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(nullptr);
+        auto dialog = new InvitationsConnectionDialog(nullptr);
         dialog->setRemoteHost(host);
         dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
@@ -90,61 +77,26 @@ void PendingInvitationsRfbClient::processNewClient()
     }
 }
 
-void PendingInvitationsRfbClient::onSocketActivated()
+bool PendingInvitationsRfbClient::checkPassword(const QByteArray &encryptedPassword)
 {
-    //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 };
+    qCDebug(KRFB) << "about to start authentication";
 
-    while(poll(&pollfd, 1, 0) == 1) {
-
-        if(d->client->state == rfbClientRec::RFB_INITIALISATION) {
-            d->notifier->setEnabled(false);
-            //Client is Authenticated
-            processNewClient();
-            break;
-        }
-        rfbProcessClientMessage(d->client);
-
-        //This is how we handle disconnection.
-        //if rfbProcessClientMessage() finds out that it can't read the socket,
-        //it closes it and sets it to -1. So, we just have to check this here
-        //and call rfbClientConnectionGone() if necessary. This will call
-        //the clientGoneHook which in turn will remove this RfbClient instance
-        //from the server manager and will call deleteLater() to delete it
-        if (d->client->sock == -1) {
-            qDebug() << "disconnected from socket signal";
-            d->notifier->setEnabled(false);
-            rfbClientConnectionGone(d->client);
-            break;
-        }
-    }
-}
-
-bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
-{
-    qDebug() << "about to start authentication";
-
-    if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
-            InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
-            encryptedPassword) ) {
+    if (InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(), encryptedPassword)) {
         d->askOnConnect = false;
         return true;
     }
 
     return vncAuthCheckPassword(
-            InvitationsRfbServer::instance->desktopPassword().toLocal8Bit(),
-            encryptedPassword);
+        InvitationsRfbServer::instance->desktopPassword().toLocal8Bit(),
+        encryptedPassword);
 }
 
 void PendingInvitationsRfbClient::dialogAccepted()
 {
-    InvitationsConnectionDialog *dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
+    auto dialog = qobject_cast<InvitationsConnectionDialog *>(sender());
     Q_ASSERT(dialog);
 
-    InvitationsRfbClient *client = new InvitationsRfbClient(m_rfbClient, parent());
+    auto client = new InvitationsRfbClient(m_rfbClient, parent());
     client->setControlEnabled(dialog->allowRemoteControl());
     accept(client);
 }

krfb/invitationsrfbclient.h

@@ -1,19 +1,8 @@
 /*
-    Copyright (C) 2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef INVITATIONSRFBCLIENT_H
 #define INVITATIONSRFBCLIENT_H
@@ -23,29 +12,30 @@
 class InvitationsRfbClient : public RfbClient
 {
 public:
-    explicit InvitationsRfbClient(rfbClientPtr client, QObject* parent = nullptr)
-        : RfbClient(client, parent) {}
+    explicit InvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr)
+        : RfbClient(client, parent)
+    {
+    }
 };
 
-
 class PendingInvitationsRfbClient : public PendingRfbClient
 {
     Q_OBJECT
+
 public:
     explicit PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr);
     ~PendingInvitationsRfbClient() override;
 
 protected Q_SLOTS:
     void processNewClient() override;
-    virtual void onSocketActivated();
-    bool checkPassword(const QByteArray & encryptedPassword) override;
+    bool checkPassword(const QByteArray &encryptedPassword) override;
 
 private Q_SLOTS:
     void dialogAccepted();
 
 private:
     struct Private;
-    Private* const d;
+    Private *const d;
 };
 
 #endif // INVITATIONSRFBCLIENT_H

krfb/invitationsrfbserver.cpp

@@ -1,84 +1,82 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-    Copyright (C) 2001-2003 by Tim Jansen <tim@tjansen.de>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
 
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "invitationsrfbserver.h"
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
-#include "rfbservermanager.h"
-#include <QTimer>
+#include "krfbdebug.h"
 #include <QApplication>
 #include <QHostInfo>
-#include <QDebug>
 #include <QRandomGenerator>
+#include <QTimer>
 
 #include <KLocalizedString>
-#include <KUser>
 #include <KStringHandler>
-#include <KWallet/KWallet>
+#include <KUser>
+#include <KWallet>
+
+#include <KDNSSD/PublicService>
 
-#include <dnssd/publicservice.h>
 using KWallet::Wallet;
 
-//static
+// used for KWallet folder name
+static const QString s_krfbFolderName(QStringLiteral("krfb"));
+
+// static
 InvitationsRfbServer *InvitationsRfbServer::instance;
 
-//static
+// static
 void InvitationsRfbServer::init()
 {
     instance = new InvitationsRfbServer;
     instance->m_publicService = new KDNSSD::PublicService(
-            i18n("%1@%2 (shared desktop)",
-                KUser().loginName(),
-                QHostInfo::localHostName()),
-            QStringLiteral("_rfb._tcp"),
-            KrfbConfig::port());
+        i18n("%1@%2 (shared desktop)",
+             KUser().loginName(),
+             QHostInfo::localHostName()),
+        QStringLiteral("_rfb._tcp"),
+        KrfbConfig::port());
     instance->setListeningAddress("0.0.0.0");
     instance->setListeningPort(KrfbConfig::port());
     instance->setPasswordRequired(true);
 
     instance->m_wallet = nullptr;
     if (KrfbConfig::noWallet()) {
-        instance->walletOpened(false);
+        instance->readPasswordFromConfig();
     } else {
         instance->openKWallet();
     }
 }
 
-const QString& InvitationsRfbServer::desktopPassword() const
+const QString &InvitationsRfbServer::desktopPassword() const
 {
     return m_desktopPassword;
 }
 
-void InvitationsRfbServer::setDesktopPassword(const QString& password)
+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
+const QString &InvitationsRfbServer::unattendedPassword() const
 {
     return m_unattendedPassword;
 }
 
-void InvitationsRfbServer::setUnattendedPassword(const QString& password)
+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
@@ -88,9 +86,10 @@ bool InvitationsRfbServer::allowUnattendedAccess() const
 
 bool InvitationsRfbServer::start()
 {
-    if(RfbServer::start()) {
-        if(KrfbConfig::publishService())
+    if (RfbServer::start()) {
+        if (KrfbConfig::publishService()) {
             m_publicService->publishAsync();
+        }
         return true;
     }
     return false;
@@ -98,45 +97,42 @@ bool InvitationsRfbServer::start()
 
 void InvitationsRfbServer::stop()
 {
-    if(m_publicService->isPublished())
+    if (m_publicService->isPublished()) {
         m_publicService->stop();
+    }
     RfbServer::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);
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(), QStringLiteral("Security"));
     m_allowUnattendedAccess = krfbConfig.readEntry(
-            "allowUnattendedAccess", QVariant(false)).toBool();
+                                            "allowUnattendedAccess", QVariant(false))
+                                  .toBool();
 }
 
 InvitationsRfbServer::~InvitationsRfbServer()
 {
-    InvitationsRfbServer::stop();  // calling virtual funcs in destructor is bad
-
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(), "Security");
-    krfbConfig.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
-
+    InvitationsRfbServer::stop(); // calling virtual funcs in destructor is bad
+    saveSecuritySettings();
+    // ^^ also saves passwords in kwallet,
+    //    do it before closing kwallet
     if (!KrfbConfig::noWallet() && m_wallet) {
         closeKWallet();
-    } else {
-        krfbConfig.writeEntry("desktopPassword",
-                KStringHandler::obscure(m_desktopPassword));
-        krfbConfig.writeEntry("unattendedPassword",
-                KStringHandler::obscure(m_unattendedPassword));
-        krfbConfig.writeEntry("allowUnattendedAccess",
-                m_allowUnattendedAccess);
     }
 }
 
-PendingRfbClient* InvitationsRfbServer::newClient(rfbClientPtr client)
+PendingRfbClient *InvitationsRfbServer::newClient(rfbClientPtr client)
 {
     return new PendingInvitationsRfbClient(client, this);
 }
@@ -153,13 +149,6 @@ void InvitationsRfbServer::openKWallet()
 void InvitationsRfbServer::closeKWallet()
 {
     if (m_wallet && m_wallet->isOpen()) {
-        const QString krfbFolderName = QStringLiteral("krfb");
-        if ((m_wallet->currentFolder() == krfbFolderName) ||
-                ((m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName)) &&
-                m_wallet->setFolder(krfbFolderName)) ) {
-            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
-            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
-        }
         delete m_wallet; // closes the wallet
         m_wallet = nullptr;
     }
@@ -170,40 +159,20 @@ void InvitationsRfbServer::walletOpened(bool opened)
     QString desktopPassword;
     QString unattendedPassword;
     Q_ASSERT(m_wallet);
-    const QString krfbFolderName = QStringLiteral("krfb");
-    if( opened &&
-            ( m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName) ) &&
-            m_wallet->setFolder(krfbFolderName) ) {
 
-        if(m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword)==0 &&
-                !desktopPassword.isEmpty()) {
+    if (opened && m_wallet->hasFolder(s_krfbFolderName) && m_wallet->setFolder(s_krfbFolderName)) {
+        if (m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword) == 0 && !desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
-            emit passwordChanged(m_desktopPassword);
+            Q_EMIT passwordChanged(m_desktopPassword);
         }
 
-        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword)==0 &&
-                !unattendedPassword.isEmpty()) {
+        if (m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword) == 0 && !unattendedPassword.isEmpty()) {
             m_unattendedPassword = unattendedPassword;
         }
 
     } else {
-
-        qDebug() << "Could not open KWallet, Falling back to config file";
-        KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
-
-        desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
-                "desktopPassword", QString()));
-        if(!desktopPassword.isEmpty()) {
-            m_desktopPassword = desktopPassword;
-            emit passwordChanged(m_desktopPassword);
-        }
-
-        unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
-                "unattendedPassword", QString()));
-        if(!unattendedPassword.isEmpty()) {
-            m_unattendedPassword = unattendedPassword;
-        }
-
+        qCDebug(KRFB) << "Could not open KWallet, Falling back to config file";
+        readPasswordFromConfig();
     }
 }
 
@@ -222,13 +191,7 @@ QString InvitationsRfbServer::readableRandomString(int length)
             r += 6;
         }
         char c = char(r);
-        if ((c == 'i') ||
-                (c == 'I') ||
-                (c == '1') ||
-                (c == 'l') ||
-                (c == 'o') ||
-                (c == 'O') ||
-                (c == '0')) {
+        if ((c == 'i') || (c == 'I') || (c == '1') || (c == 'l') || (c == 'o') || (c == 'O') || (c == '0')) {
             continue;
         }
         str += QLatin1Char(c);
@@ -236,3 +199,51 @@ QString InvitationsRfbServer::readableRandomString(int length)
     }
     return str;
 }
+
+// one place to deal with all security configuration
+void InvitationsRfbServer::saveSecuritySettings()
+{
+    KConfigGroup secConfigGroup(KSharedConfig::openConfig(), QStringLiteral("Security"));
+    secConfigGroup.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
+    if (KrfbConfig::noWallet()) {
+        // save passwords in config file only if not using kwallet integration
+        secConfigGroup.writeEntry("desktopPassword", KStringHandler::obscure(m_desktopPassword));
+        secConfigGroup.writeEntry("unattendedPassword", KStringHandler::obscure(m_unattendedPassword));
+    } else {
+        // using KWallet, erase possibly stored passwords from krfbrc file
+        secConfigGroup.deleteEntry("desktopPassword");
+        secConfigGroup.deleteEntry("unattendedPassword");
+        // update passwords in kwallet
+        if (m_wallet && m_wallet->isOpen()) {
+            if (!m_wallet->hasFolder(s_krfbFolderName)) {
+                m_wallet->createFolder(s_krfbFolderName);
+            }
+            if (m_wallet->currentFolder() != s_krfbFolderName) {
+                m_wallet->setFolder(s_krfbFolderName);
+            }
+            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
+            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
+        }
+    }
+    KrfbConfig::self()->save();
+}
+
+void InvitationsRfbServer::readPasswordFromConfig()
+{
+    QString desktopPassword;
+    QString unattendedPassword;
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(), QStringLiteral("Security"));
+
+    desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
+        "desktopPassword", QString()));
+    if (!desktopPassword.isEmpty()) {
+        m_desktopPassword = desktopPassword;
+        Q_EMIT passwordChanged(m_desktopPassword);
+    }
+
+    unattendedPassword = KStringHandler::obscure(krfbConfig.readEntry(
+        "unattendedPassword", QString()));
+    if (!unattendedPassword.isEmpty()) {
+        m_unattendedPassword = unattendedPassword;
+    }
+}

krfb/invitationsrfbserver.h

@@ -1,50 +1,46 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef INVITATIONSRFBSERVER_H
 #define INVITATIONSRFBSERVER_H
 
 #include "rfbserver.h"
 
-namespace KWallet {
-    class Wallet;
+namespace KWallet
+{
+
+class Wallet;
+
 }
 
-namespace KDNSSD {
-    class PublicService;
+namespace KDNSSD
+{
+
+class PublicService;
+
 }
 
 class InvitationsRfbServer : public RfbServer
 {
     Q_OBJECT
+
 public:
     static InvitationsRfbServer *instance;
     static void init();
 
-    const QString& desktopPassword() const;
-    void setDesktopPassword(const QString&);
-    const QString& unattendedPassword() const;
-    void setUnattendedPassword(const QString&);
+    const QString &desktopPassword() const;
+    void setDesktopPassword(const QString &);
+    const QString &unattendedPassword() const;
+    void setUnattendedPassword(const QString &);
     bool allowUnattendedAccess() const;
 
 Q_SIGNALS:
-    void passwordChanged(const QString&);
+    void passwordChanged(const QString &);
 
 public Q_SLOTS:
     bool start() override;
@@ -52,23 +48,25 @@ public Q_SLOTS:
     void toggleUnattendedAccess(bool allow);
     void openKWallet();
     void closeKWallet();
+    void saveSecuritySettings();
 
 protected:
     InvitationsRfbServer();
     ~InvitationsRfbServer() override;
-    PendingRfbClient* newClient(rfbClientPtr client) override;
+    PendingRfbClient *newClient(rfbClientPtr client) override;
 
 private Q_SLOTS:
     void walletOpened(bool);
 
 private:
-    KDNSSD::PublicService *m_publicService;
+    KDNSSD::PublicService *m_publicService = nullptr;
     bool m_allowUnattendedAccess;
     QString m_desktopPassword;
     QString m_unattendedPassword;
-    KWallet::Wallet *m_wallet;
+    KWallet::Wallet *m_wallet = nullptr;
 
     QString readableRandomString(int);
+    void readPasswordFromConfig();
     Q_DISABLE_COPY(InvitationsRfbServer)
 };
 

krfb/krfb-events.desktop

@@ -1,33 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/events
-
-Comment=Event plugins for KRfb
-Comment[ca]=Connectors d'esdeveniments per al KRfb.
-Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb.
-Comment[cs]=Moduly událostí pro KRfb
-Comment[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[it]=Estensioni degli eventi per KRfb
-Comment[ko]=KRfb 이벤트 플러그인
-Comment[nl]=Plug-ins voor gebeurtenis voor KRfb
-Comment[nn]=Hendingstillegg for KRfb
-Comment[pl]=Wtyczki wydarzeń dla KRfb
-Comment[pt]='Plugins' de eventos para o KRfb
-Comment[pt_BR]=Plugins de evento para o KRfb
-Comment[sk]=Doplnky udalostí pre KRfb
-Comment[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,33 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Events plugins for KRfb",
-        "Description[ca@valencia]": "Connectors d'esdeveniments per al KRfb.",
-        "Description[ca]": "Connectors d'esdeveniments per al KRfb.",
-        "Description[cs]": "Moduly událostí pro KRfb",
-        "Description[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[it]": "Estensioni degli eventi per KRfb",
-        "Description[ko]": "KRfb 이벤트 플러그인",
-        "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb",
-        "Description[nn]": "Hendingstillegg for KRfb",
-        "Description[pl]": "Wtyczki wydarzeń dla KRfb",
-        "Description[pt]": "'Plugins' de eventos para o KRfb",
-        "Description[pt_BR]": "Plugins de evento para o KRfb",
-        "Description[sk]": "Doplnky udalostí pre KRfb",
-        "Description[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

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

krfb/krfb-framebuffer.json

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

krfb/krfb.notifyrc

@@ -33,10 +33,11 @@ Comment[id]=Desktop Sharing
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione del desktop
 Comment[ja]=デスクトップ共有
+Comment[ka]=სამუშაო მაგიდის გაზიარება
 Comment[kk]=Үстелді ортақтастыру
 Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
 Comment[ko]=데스크톱 공유
-Comment[lt]=Dalinimasis darbalaukiu
+Comment[lt]=Darbalaukio bendrinimas
 Comment[lv]=Darbvirsmas koplietošana
 Comment[mk]=Делење на работната површина
 Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
@@ -52,6 +53,7 @@ Comment[pt]=Partilha do Ecrã
 Comment[pt_BR]=Compartilhamento do ambiente de trabalho
 Comment[ro]=Partajare birou
 Comment[ru]=Параметры общего рабочего стола
+Comment[sa]=डेस्कटॉप् साझेदारी
 Comment[si]=වැඩතල හවුල්
 Comment[sk]=Zdieľanie pracovnej plochy
 Comment[sl]=Souporaba namizja
@@ -67,7 +69,6 @@ Comment[tr]=Masaüstü Paylaşımı
 Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
 Comment[uk]=Спільні стільниці
 Comment[xh]=Ulwahlulelano lwe Desktop
-Comment[x-test]=xxDesktop Sharingxx
 Comment[zh_CN]=桌面共享
 Comment[zh_HK]=桌面分享
 Comment[zh_TW]=桌面分享
@@ -92,6 +93,7 @@ Name[fi]=Käyttäjä hyväksyy yhteyden
 Name[fr]=L'utilisateur accepte la connexion
 Name[ga]=Glacann an tÚsáideoir Le Ceangal
 Name[gl]=O usuario acepta a conexión
+Name[he]=המשתמש מאשר חיבור
 Name[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
 Name[hne]=कमइया हर कनेक्सन स्वीकारा
 Name[hr]=Korisnik prihvaća vezu
@@ -101,6 +103,7 @@ Name[id]=Pengguna Menyetujui Koneksi
 Name[is]=Notandi samþykkir tengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
+Name[ka]=მომხმარებელი დაეთანხმა მიერთებას
 Name[kk]=Пайдаланушы қосылымды қабылдайды
 Name[km]=អ្នក​ប្រើ​ទទួល​យក​ការ​ត​ភ្ជាប់
 Name[ko]=사용자가 연결을 수락함
@@ -118,6 +121,7 @@ Name[pt]=O Utilizador Aceita a Ligação
 Name[pt_BR]=O usuário aceita a conexão
 Name[ro]=Utilizatorul acceptă conexiunea
 Name[ru]=Пользователь принимает соединения
+Name[sa]=उपयोक्ता संयोजनं स्वीकुर्वति
 Name[si]=සබැඳිය පරිශීලකයා තහවුරු කරයි
 Name[sk]=Užívateľ akceptuje pripojenie
 Name[sl]=Uporabnik sprejema povezavo
@@ -130,7 +134,6 @@ Name[th]=ผู้ใช้ยอมรับการเชื่อมต่
 Name[tr]=Kullanıcı Bağlantıyı Kabul Etti
 Name[ug]=ئىشلەتكۈچى باغلىنىشقا قوشۇلدى
 Name[uk]=Користувач приймає з’єднання
-Name[x-test]=xxUser Accepts Connectionxx
 Name[zh_CN]=用户接受连接
 Name[zh_TW]=使用者接受連線
 Comment=User accepts connection
@@ -155,7 +158,7 @@ Comment[fi]=Käyttäjä hyväksyy yhteyden
 Comment[fr]=L'utilisateur accepte la connexion
 Comment[ga]=Glacann úsáideoir le ceangal
 Comment[gl]=O usuario acepta a conexión
-Comment[he]=המשתמש מקבל את החיבור
+Comment[he]=המשתמש מאשר את החיבור
 Comment[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
 Comment[hne]=कमइया हर कनेक्सन स्वीकारा
 Comment[hr]=Korisnik prihvaća vezu
@@ -165,6 +168,7 @@ Comment[id]=Pengguna menyetujui koneksi
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
+Comment[ka]=მომხმარებელი დაეთანხმა მიერთებას
 Comment[kk]=Пайдаланушы қосылымды қабылдайды
 Comment[km]=អ្នក​ប្រើ​ទទួល​យក​ការ​ត​ភ្ជាប់
 Comment[ko]=사용자가 연결을 수락함
@@ -184,6 +188,7 @@ Comment[pt]=O utilizador aceita a ligação
 Comment[pt_BR]=O usuário aceita a conexão
 Comment[ro]=Utilizatorul acceptă conexiunea
 Comment[ru]=Пользователь принимает соединения
+Comment[sa]=उपयोक्ता संयोजनं स्वीकुर्वति
 Comment[si]=සබැඳිය පරිශීලකයා තහවුරු කරයි
 Comment[sk]=Užívateľ akceptuje pripojenie
 Comment[sl]=Uporabnik sprejema povezavo
@@ -199,7 +204,6 @@ Comment[tr]=Kullanıcı bağlantıyı kabul etti
 Comment[ug]=ئىشلەتكۈچى باغلىنىشقا قوشۇلدى
 Comment[uk]=Користувач приймає з’єднання
 Comment[xh]=Umsebenzisi wamkela uxhulumaniso
-Comment[x-test]=xxUser accepts connectionxx
 Comment[zh_CN]=用户接受连接
 Comment[zh_HK]=用戶接受連線
 Comment[zh_TW]=使用者接受連線
@@ -225,6 +229,7 @@ Name[fi]=Käyttäjä hylkää yhteyden
 Name[fr]=L'utilisateur refuse la connexion
 Name[ga]=Diúltaíonn an tÚsáideoir Le Ceangal
 Name[gl]=O usuario rexeita a conexión
+Name[he]=המשתמש מסרב לחיבור
 Name[hi]=उपयोक्ता ने कनेक्शन अस्वीकारा
 Name[hne]=कमइया हर कनेक्सन अस्वीकारा
 Name[hr]=Korisnik odbija vezu
@@ -234,6 +239,7 @@ Name[id]=Pengguna Menampik Koneksi
 Name[is]=Notandi hafnar tengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
+Name[ka]=მომხმარებელმა უარყო მიერთებას
 Name[kk]=Пайдаланушы қосылымдан бас тартады
 Name[km]=អ្នក​ប្រើ​បដិសេធ​ការ​ត​ភ្ជាប់
 Name[ko]=사용자가 연결을 거부함
@@ -251,6 +257,7 @@ Name[pt]=O Utilizador Recusa a Ligação
 Name[pt_BR]=O usuário rejeita a conexão
 Name[ro]=Utilizatorul refuză conexiunea
 Name[ru]=Пользователь отклоняет соединения
+Name[sa]=उपयोक्ता संयोजनं अङ्गीकुर्वति
 Name[si]=සබැඳිය පරිශීලකයා තහවුරු නොකරයි
 Name[sk]=Užívateľ odmieta pripojenie
 Name[sl]=Uporabnik zavrača povezavo
@@ -263,7 +270,6 @@ Name[th]=ผู้ใช้ปฏิเสธการเชื่อมต่
 Name[tr]=Kullanıcı Bağlantıyı Reddetti
 Name[ug]=ئىشلەتكۈچى باغلىنىشنى رەت قىلدى
 Name[uk]=Користувач не приймає з’єднання
-Name[x-test]=xxUser Refuses Connectionxx
 Name[zh_CN]=用户拒绝连接
 Name[zh_TW]=使用者拒絕連線
 Comment=User refuses connection
@@ -298,6 +304,7 @@ Comment[id]=Pengguna menampik koneksi
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
+Comment[ka]=მომხმარებელმა უარყო მიერთებას
 Comment[kk]=Пайдаланушы қосылымды қабылдамайды
 Comment[km]=អ្នក​ប្រើ​បដិសេធ​ការ​ត​ភ្ជាប់
 Comment[ko]=사용자가 연결을 거부함
@@ -317,6 +324,7 @@ Comment[pt]=O utilizador recusa a ligação
 Comment[pt_BR]=O usuário rejeita a conexão
 Comment[ro]=Utilizatorul refuză conexiunea
 Comment[ru]=Пользователь отклоняет соединения
+Comment[sa]=उपयोक्ता संयोजनं नकारयति
 Comment[si]=සබැඳිය පරිශීලකයා තහවුරු නොකරයි
 Comment[sk]=Užívateľ odmieta pripojenie
 Comment[sl]=Uporabnik zavrača povezavo
@@ -332,7 +340,6 @@ Comment[tr]=Kullanıcı bağlantıyı reddetti
 Comment[ug]=ئىشلەتكۈچى باغلىنىشنى رەت قىلدى
 Comment[uk]=Користувач не приймає з’єднання
 Comment[xh]=Umsebenzisi wala uxhulumaniso
-Comment[x-test]=xxUser refuses connectionxx
 Comment[zh_CN]=用户拒绝连接
 Comment[zh_HK]=用戶拒絕連線
 Comment[zh_TW]=使用者拒絕連線使用者
@@ -358,6 +365,7 @@ Name[fi]=Yhteys suljettu
 Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
 Name[gl]=Conexión pechada
+Name[he]=החיבור נסגר
 Name[hi]=कनेक्शन बन्द
 Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
@@ -367,11 +375,12 @@ Name[id]=Koneksi Ditutup
 Name[is]=Tengingu lokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
+Name[ka]=კავშირი დაიხურა
 Name[kk]=Қосылымдан жабылды
 Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Name[ko]=연결이 닫힘
-Name[lt]=Ryšys baigtas
-Name[lv]=Savienojums slēgts
+Name[lt]=Ryšys nutrauktas
+Name[lv]=Savienojums ir slēgts
 Name[mai]=संबंधन बन्न भ' गेल
 Name[ml]=ബന്ധം അടച്ചു
 Name[mr]=जुळवणी बंद केली
@@ -385,6 +394,7 @@ Name[pt]=Ligação Fechada
 Name[pt_BR]=Conexão encerrada
 Name[ro]=Conexiune închisă
 Name[ru]=Соединение закрыто
+Name[sa]=संयोजनं बन्दम्
 Name[si]=සබඳතාව වසා දැමිනි
 Name[sk]=Pripojenie bolo ukončené
 Name[sl]=Povezava zaprta
@@ -398,7 +408,6 @@ Name[th]=การเชื่อมต่อยุติ
 Name[tr]=Bağlantı Kapatıldı
 Name[ug]=باغلىنىش يېپىلدى
 Name[uk]=З'єднання закрито
-Name[x-test]=xxConnection Closedxx
 Name[zh_CN]=连接关闭
 Name[zh_TW]=連線已關閉
 Comment=Connection closed
@@ -434,11 +443,12 @@ Comment[id]=Koneksi ditutup
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
+Comment[ka]=კავშირი დახურულია
 Comment[kk]=Қосылым жабылды
 Comment[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Comment[ko]=연결이 닫힘
-Comment[lt]=Ryšys baigtas
-Comment[lv]=Savienojums tika slēgts
+Comment[lt]=Ryšys nutrauktas
+Comment[lv]=Savienojums ir slēgts
 Comment[mk]=Поврзувањето е затворено
 Comment[ml]=ബന്ധം അടച്ചു
 Comment[mr]=जुळवणी बंद केली
@@ -453,6 +463,7 @@ Comment[pt]=A ligação foi encerrada
 Comment[pt_BR]=Conexão encerrada
 Comment[ro]=Conexiune închisă
 Comment[ru]=Соединение закрыто
+Comment[sa]=संयोजनं बन्दम्
 Comment[si]=සබඳතාව වසාදැමිනි
 Comment[sk]=Pripojenie bolo ukončené
 Comment[sl]=Povezava zaprta
@@ -471,7 +482,6 @@ Comment[uk]=З'єднання закрито
 Comment[uz]=Aloqa uzildi
 Comment[uz@cyrillic]=Алоқа узилди
 Comment[xh]=Uxhulumaniso luvaliwe
-Comment[x-test]=xxConnection closedxx
 Comment[zh_CN]=连接关闭
 Comment[zh_HK]=連線已關閉
 Comment[zh_TW]=連線已關閉
@@ -479,7 +489,7 @@ Action=Popup
 
 [Event/InvalidPassword]
 Name=Invalid Password
-Name[ar]=كلمة المرور غير صحيحة
+Name[ar]=كلمة السر غير صحيحة
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -497,6 +507,7 @@ Name[fi]=Virheellinen salasana
 Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
 Name[gl]=O contrasinal é incorrecto
+Name[he]=סיסמה שגויה
 Name[hi]=अवैध पासवर्ड
 Name[hne]=अवैध पासवर्ड
 Name[hr]=Nevažeća zaporka
@@ -506,10 +517,11 @@ Name[id]=Sandi Tidak Absah
 Name[is]=Ógilt lykilorð
 Name[it]=Password non valida
 Name[ja]=無効なパスワード
+Name[ka]=არასწორი პაროლი
 Name[kk]=Жарамсыз паролі
 Name[km]=ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Name[ko]=잘못된 암호
-Name[lt]=Neteisingas slaptažodžis
+Name[lt]=Neteisingas slaptažodis
 Name[lv]=Nederīga parole
 Name[ml]=അസാധുവായ അടയാളവാക്ക്
 Name[mr]=अवैध गुप्तशब्द
@@ -518,11 +530,12 @@ Name[nds]=Leeg Passwoort
 Name[nl]=Ongeldig wachtwoord
 Name[nn]=Ugyldig passord
 Name[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Name[pl]=Błędne hasło
+Name[pl]=Nieprawidłowe hasło
 Name[pt]=Senha Inválida
 Name[pt_BR]=Senha inválida
 Name[ro]=Parolă nevalidă
 Name[ru]=Неверный пароль
+Name[sa]=अमान्य गुप्तशब्दः
 Name[si]=වැරදි මුරපදය
 Name[sk]=Neplatné heslo
 Name[sl]=Neveljavno geslo
@@ -537,12 +550,11 @@ Name[tr]=Geçersiz Parola
 Name[ug]=ئىناۋەتسىز ئىم
 Name[uk]=Неправильний пароль
 Name[wa]=Sicret nén valåbe
-Name[x-test]=xxInvalid Passwordxx
 Name[zh_CN]=无效密码
 Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
-Comment[ar]=كلمة المرور غير صحيحة
+Comment[ar]=كلمة السر غير صحيحة
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -573,6 +585,7 @@ Comment[id]=Sandi tidak absah
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=無効なパスワード
+Comment[ka]=არასწორი პაროლი
 Comment[kk]=Паролі дұрыс емес
 Comment[km]=ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Comment[ko]=잘못된 암호
@@ -589,11 +602,12 @@ Comment[nl]=Ongeldig wachtwoord
 Comment[nn]=Passordet var ugyldig
 Comment[oc]=Mot de pas invalid
 Comment[pa]=ਗਲਤ ਪਾਸਵਰਡ
-Comment[pl]=Błędne hasło
+Comment[pl]=Nieprawidłowe hasło
 Comment[pt]=A senha é inválida
 Comment[pt_BR]=Senha inválida
 Comment[ro]=Parolă nevalidă
 Comment[ru]=Неверный пароль
+Comment[sa]=अमान्यगुप्तशब्दः
 Comment[si]=වැරදි මුරපදය
 Comment[sk]=Neplatné heslo
 Comment[sl]=Neveljavno geslo
@@ -613,7 +627,6 @@ Comment[uz]=Maxfiy soʻz haqiqiy emas
 Comment[uz@cyrillic]=Махфий сўз ҳақиқий эмас
 Comment[wa]=Sicret nén valide
 Comment[xh]=Igama lokugqitha elingasebenziyo
-Comment[x-test]=xxInvalid passwordxx
 Comment[zh_CN]=无效密码
 Comment[zh_HK]=無效的密碼
 Comment[zh_TW]=不正確的密碼
@@ -621,7 +634,7 @@ Action=Popup
 
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
-Name[ar]=كلمة المرور الدعوات غير صحيحة
+Name[ar]=كلمة السر الدعوات غير صحيحة
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
 Name[ca]=Contrasenya no vàlida de les invitacions
@@ -639,6 +652,7 @@ Name[fi]=Virheellinen salasana kutsuun
 Name[fr]=Invitations de mots de passe non valables
 Name[ga]=Cuirí Neamhbhailí Focal Faire
 Name[gl]=O contrasinal de convidado incorrecto
+Name[he]=סיסמה שגויה להזמנות
 Name[hi]=अवैध पासवर्ड निमंत्रण
 Name[hne]=अवैध पासवर्ड निमंत्रन
 Name[hr]=Pozivnice s nevažećim zaporkama
@@ -648,6 +662,7 @@ Name[id]=Undangan Sandi Tidak Absah
 Name[is]=Ógild lykilorðsboð
 Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
+Name[ka]=არასწორი პაროლის მოსაწვევები
 Name[kk]=Жарамсыз паролімен шақыру
 Name[km]=ការ​អញ្ជើញ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ
 Name[ko]=잘못된 암호 초대장
@@ -665,6 +680,7 @@ Name[pt]=Convites de Senha Inválidos
 Name[pt_BR]=Avisos de senha inválida
 Name[ro]=Parolă nevalidă Invitații
 Name[ru]=Неверный пароль приглашения
+Name[sa]=अमान्यगुप्तशब्दनिमन्त्रणानि
 Name[si]=වැරදි මුරපද ආරාධනාවක්
 Name[sk]=Neplatné heslo pozvánky
 Name[sl]=Povabila z neveljavnimi gesli
@@ -677,12 +693,11 @@ Name[th]=รหัสผ่านของการเชื้อเชิญ
 Name[tr]=Geçersiz Parola Daveti
 Name[ug]=ئىناۋەتسىز ئىم تەكلىپلىرى
 Name[uk]=Запрошення з некоректними паролями
-Name[x-test]=xxInvalid Password Invitationsxx
 Name[zh_CN]=无效密码邀请
-Name[zh_TW]=不合法的密碼邀請
+Name[zh_TW]=無效的密碼邀請
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
-Comment[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال.
+Comment[ar]=المدعو أرسل كلمة سر غير صحيحة. رُفض الاتصال.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -712,10 +727,11 @@ Comment[id]=Undangan mengirimkan sebuah sandi tidak absah. Koneksi ditampik.
 Comment[is]=Boðinn aðili sendi ógilt lykilorð. Tengingu hafnað
 Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が無効なパスワードを送ってきました。接続を拒否しました。
+Comment[ka]=მოწვეული მხრის გამოგზავნილი პაროლი არასწორია. კავშირი უარყოფილია.
 Comment[kk]=Шқырылған жақ дұрыс емес парольді жіберді. Қосылымдан бас тартылды..
 Comment[km]=ភាគី​ដែល​បាន​អញ្ជើញ បាន​ផ្ញើ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។ ការ​តភ្ជាប់​ត្រូវ​បាន​បដិសេធ ។
 Comment[ko]=초대한 사람이 잘못된 암호를 보냈습니다. 연결이 잘못되었습니다.
-Comment[lt]=Pakviestoji pusė atsiuntė neteisingą slaptažodį. Ryšys nutrauktas.
+Comment[lt]=Pakviestoji pusė atsiuntė neteisingą slaptažodį. Ryšys atmestas.
 Comment[lv]=Ielūgtā persona nosūtīja nepareizu paroli. Savienojums noraidīts.
 Comment[mk]=Поканетата страна испрати невалидна лозинка. Поврзувањето е одбиено.
 Comment[ml]=ക്ഷണിച്ച പാര്‍ട്ടി അസാധുവായ അടയാളവാക്കാണ് അയച്ചത്. ബന്ധം നിഷേധിച്ചു.
@@ -729,6 +745,7 @@ Comment[pt]=O utilizador convidado enviou uma senha inválida. A ligação foi r
 Comment[pt_BR]=A parte "convidada" enviou uma senha inválida. Conexão recusada.
 Comment[ro]=Partea care invită a trimis o parolă nevalidă. Conexiune refuzată.
 Comment[ru]=Приглашённый пользователь ввёл неправильный пароль. Соединение отклонено.
+Comment[sa]=आमन्त्रितः पक्षः अमान्यगुप्तशब्दं प्रेषितवान् । संयोजनं नकारितम्।
 Comment[si]=ආරාධිත පාර්‍ශවය වැරදි මුරපදයක් එවන ලද බැවින් සබඳතාව ප්‍රතික්‍ෂේප විය.
 Comment[sk]=Pozvaná strana poslala neplatné heslo. Pripojenie bolo odmietnuté.
 Comment[sl]=Povabljena stranka je poslala neveljavno geslo. Povezava zavrnjena.
@@ -744,7 +761,6 @@ Comment[tr]=Davet edilenden gönderilmiş geçersiz parola. Bağlantı reddedild
 Comment[ug]=تەكلىپ قىلغۇچى ئەۋەتكەن ئىم ئىناۋەتسىز. باغلىنىش رەت قىلىندى.
 Comment[uk]=Запрошений учасник надіслав некоректний пароль. У з’єднанні відмовлено.
 Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
-Comment[x-test]=xxThe invited party sent an invalid password. Connection refused.xx
 Comment[zh_CN]=受邀请方发送的密码不对。连接被拒绝。
 Comment[zh_HK]=被邀請的一方送出無效的密碼。已拒絕連線。
 Comment[zh_TW]=邀請的人送出了不合法的密碼邀請。連線已拒絕。
@@ -770,6 +786,7 @@ Name[fi]=Uusi yhteys odottaa
 Name[fr]=Nouvelle connexion en attente
 Name[ga]=Ceangal Nua Ag Fanacht
 Name[gl]=Nova conexión en espera
+Name[he]=חיבור חדש בהמתנה
 Name[hi]=नया कनेक्शन होल्ड पर रखा
 Name[hne]=नवा कनेक्सन होल्ड मं रखा
 Name[hr]=Nova veza na čekanju
@@ -779,6 +796,7 @@ Name[id]=Koneksi Baru sedang Tertahan
 Name[is]=Ný tenging á bið
 Name[it]=Nuova connessione in attesa
 Name[ja]=保留中の新しい接続
+Name[ka]=ახალი შეერთება შეჩერებულია
 Name[kk]=Жаңа қосылым күтілуде
 Name[km]=ការ​តភ្ជាប់​ថ្មី កំពុង​ស្ថិត​នៅ​ក្នុង​ការ​រង់ចាំ
 Name[ko]=새 연결 대기 중
@@ -796,6 +814,7 @@ Name[pt]=Ligação Nova em Espera
 Name[pt_BR]=Nova conexão ativa
 Name[ro]=Conexiune nouă în așteptare
 Name[ru]=Новое соединение приостановлено
+Name[sa]=नूतनं संयोजनं स्थगितम् अस्ति
 Name[si]=නව සබඳතාවක් රඳවා ඇත
 Name[sk]=Nové pripojenie bolo pozdržané
 Name[sl]=Nova povezava na čakanju
@@ -807,7 +826,6 @@ Name[sv]=Ny anslutning väntar
 Name[th]=การเชื่อมต่อใหม่ถูกพักรอไว้ก่อน
 Name[tr]=Yeni Açık Bağlantı
 Name[uk]=Очікування на нове з’єднання
-Name[x-test]=xxNew Connection on Holdxx
 Name[zh_CN]=新连接已搁置
 Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
@@ -832,7 +850,7 @@ Comment[fi]=Pyydettiin yhteyttä, käyttäjän tulee hyväksyä
 Comment[fr]=Connexion demandée. L'utilisateur doit accepter
 Comment[ga]=Ceangal iarrtha; ní mór don úsáideoir glacadh leis
 Comment[gl]=Pediuse a conexión; o usuario debe aceptar
-Comment[he]=נתבקש חיבור, על המשתמש לקבלו
+Comment[he]=התבקש חיבור, על המשתמש לאשרו
 Comment[hi]=कनेक्शन निवेदित. उपयोक्ता को स्वीकार होना चाहिए
 Comment[hne]=कनेक्सन निवेदित. कमइया ल स्वीकार होना चाही
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
@@ -842,10 +860,11 @@ Comment[id]=Koneksi diminta, pengguna harus menyetujui
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザが許可しなければなりません。
+Comment[ka]=მიერთება მოთხოვნილია. მომხმარებელი მას უნდა დაეთანხმოს
 Comment[kk]=Қосылым сұралды, пайдаланушы жауап беруге тиіс
 Comment[km]=បាន​ស្នើ​ការ​ត​ភ្ជាប់​​ អ្នក​ប្រើ​ត្រូវ​តែ​ទទួល​យក
 Comment[ko]=연결 요청됨, 사용자가 수락해야 함
-Comment[lt]=Kvietimas ryšiui išsiųstas, naudotojas turi priimti kvietimą
+Comment[lt]=Kvietimas ryšiui išsiųstas, naudotojas privalo priimti kvietimą
 Comment[lv]=Ir pieprasīts jauns savienojums, kurš lietotājam ir jāapstiprina
 Comment[mk]=Побарано е поврзување, корисникот мора да прифати
 Comment[ml]=ബന്ധം ആവശ്യ‌പ്പെട്ടിട്ടുണ്ട്, ഉപയോക്താവ് സ്വീകരിക്കണം
@@ -860,6 +879,7 @@ Comment[pt]=Foi pedida uma ligação que o utilizador deverá aceitar
 Comment[pt_BR]=Conexão requisitada; o usuário deve aceitar
 Comment[ro]=Conexiune cerută, utilizatorul trebuie să accepte
 Comment[ru]=Запрос на соединение, требуется подтверждение пользователя
+Comment[sa]=संयोजनं अनुरोधितं, उपयोक्त्रेण अवश्यमेव स्वीकारणीयम्
 Comment[si]=සබඳතාව ඉල්ලා ඇත, පරිශීලක තහවුරු කල යුතුයි
 Comment[sk]=Vyžiadané pripojenie, užívateľ ho musí akceptovať
 Comment[sl]=Povezava zahtevana, uporabnik mora sprejeti
@@ -875,7 +895,6 @@ Comment[tr]=Bağlantı isteği, kullanıcı kabul etmeli
 Comment[ug]=باغلىنىش ئىلتىماس قىلىندى، ئىشلەتكۈچى قوشۇلۇشى كېرەك
 Comment[uk]=Отримано запит на з’єднання, користувач має його прийняти
 Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
-Comment[x-test]=xxConnection requested, user must acceptxx
 Comment[zh_CN]=连接已请求，用户必须接受
 Comment[zh_HK]=已請求連線，用戶必須接受
 Comment[zh_TW]=連線已要求，必須等使用者接受
@@ -883,7 +902,7 @@ Action=Popup
 
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
-Name[ar]=اتصال جديد مقبول تلقائيا
+Name[ar]=اتصال جديد مقبول آليّا
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -901,6 +920,7 @@ Name[fi]=Uusi yhteys hyväksyttiin automaattisesti
 Name[fr]=Nouvelle connexion acceptée automatiquement
 Name[ga]=Ceangal nua bunaithe go huathoibríoch
 Name[gl]=Nova conexión aceptada automaticamente
+Name[he]=חיבור חדש אושר אוטומטית
 Name[hi]=नय कनेक्शन स्वचालित स्वीकारा
 Name[hne]=नय कनेक्सन अपने अपन स्वीकारा
 Name[hr]=Nova veza automatski prihvaćena
@@ -910,6 +930,7 @@ Name[id]=Koneksi Baru Tersetujui Otomatis
 Name[is]=Ný tenging sjálfvirkt samþykkt
 Name[it]=Nuova connessione accettata automaticamente
 Name[ja]=新しい接続の自動受け入れ
+Name[ka]=ახალი მიერთება ავტომატურად მიღებულია
 Name[kk]=Жаңа қосылым автоқабылданды
 Name[km]=បាន​ទទួល​យក​ការ​តភ្ជាប់​ថ្មី​ដោយ​ស្វ័យ​ប្រវត្តិ
 Name[ko]=새 연결 자동 수락
@@ -926,6 +947,7 @@ Name[pt]=Nova Ligação Aceite Automaticamente
 Name[pt_BR]=Nova conexão com aceitação automática
 Name[ro]=Conexiune nouă acceptată automat
 Name[ru]=Новое соединение принимается автоматически
+Name[sa]=नवीनं संयोजनं स्वतः स्वीकृतम्
 Name[si]=නව සබඳතාව ස්වයංක්‍රීයව පිළිගැණිනි
 Name[sk]=Nové pripojenie bolo automaticky akceptované
 Name[sl]=Nova povezava samodejno sprejeta
@@ -938,12 +960,11 @@ Name[th]=รับการเชื่อมต่อใหม่โดยอ
 Name[tr]=Yeni Bağlantı Otomatik olarak Kabul Edildi
 Name[ug]=يېڭى باغلىنىش ئۆزلۈكىدىن قوشۇلدى
 Name[uk]=Нове з’єднання автоматично прийнято
-Name[x-test]=xxNew Connection Auto Acceptedxx
 Name[zh_CN]=新连接自动接受
 Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
-Comment[ar]=اتصال جديد مفعل تلقائيا 
+Comment[ar]=اتصال جديد مفعل آليّا 
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
@@ -963,7 +984,7 @@ Comment[fi]=Uusi yhteys muodostettiin automaattisesti
 Comment[fr]=Nouvelle connexion établie automatiquement
 Comment[ga]=Ceangal nua bunaithe go huathoibríoch
 Comment[gl]=Estabeleceuse automaticamente unha conexión nova
-Comment[he]=נוצר חיבור חדש באופן אוטומטי
+Comment[he]=חיבור חדש נוצר אוטומטית
 Comment[hi]=नया कनेक्शन स्वचलित स्थापित
 Comment[hne]=नवा कनेक्सन अपने अपन स्थापित
 Comment[hr]=Nova veza automatski prihvaćena
@@ -973,6 +994,7 @@ Comment[id]=Koneksi baru secara otomatis terpancang
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Nuova connessione stabilita automaticamente
 Comment[ja]=新しい接続を自動的に確立しました
+Comment[ka]=ახალი მიერთება ავტომატურად დამყარებულია
 Comment[kk]=Жаңа қосылым автоматты түрде орнатылды
 Comment[km]=បាន​បង្កើត​ការ​ត​ភ្ជាប់​ថ្មី​ដោយ​ស្វ័យ​ប្រវត្តិ
 Comment[ko]=새 연결이 자동으로 성립됨
@@ -991,6 +1013,7 @@ Comment[pt]=Foi estabelecida automaticamente uma nova ligação
 Comment[pt_BR]=Nova conexão estabelecida automaticamente
 Comment[ro]=Conexiune nouă stabilită automat
 Comment[ru]=Новое соединение устанавливается автоматически
+Comment[sa]=स्वयमेव नूतनं संयोजनं स्थापितं
 Comment[si]=නව සබඳතාව ස්වයංක්‍රීයව සැකසිනි
 Comment[sk]=Nové pripojenie bolo automaticky nadviazané
 Comment[sl]=Nova povezava samodejno vzpostavljena
@@ -1006,7 +1029,6 @@ Comment[tr]=Yeni bağlantı otomatik olarak kuruldu
 Comment[ug]=يېڭى باغلىنىش ئۆزلۈكىدىن قۇرۇلدى
 Comment[uk]=Автоматично встановлено нове з’єднання
 Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
-Comment[x-test]=xxNew connection automatically establishedxx
 Comment[zh_CN]=自动建立新连接
 Comment[zh_HK]=已自動建立新連線
 Comment[zh_TW]=新連線自動建立
@@ -1032,6 +1054,7 @@ Name[fi]=Liikaa yhteyksiä
 Name[fr]=Trop de connexions
 Name[ga]=An Iomarca Ceangal
 Name[gl]=Demasiadas conexións
+Name[he]=יותר מדי חיבורים
 Name[hi]=बहुत सारे कनेक्शन
 Name[hne]=बहुत अकन कनेक्सन
 Name[hr]=Previše veza
@@ -1041,6 +1064,7 @@ Name[id]=Terlalu Banyak Koneksi
 Name[is]=Of margar tengingar
 Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
+Name[ka]=მეტისმეტად ბევრი მიერთება
 Name[kk]=Тым көп қосылым
 Name[km]=ការ​តភ្ជាប់​ច្រើន​ពេក
 Name[ko]=너무 많은 연결
@@ -1057,6 +1081,7 @@ Name[pt]=Demasiadas Ligações
 Name[pt_BR]=Conexões em excesso
 Name[ro]=Prea multe conexiuni
 Name[ru]=Слишком много соединений
+Name[sa]=अत्यधिकं संयोजनानि
 Name[si]=වඩා වැඩි සබඳතා ගණනක්
 Name[sk]=Príliš veľa pripojení
 Name[sl]=Preveč povezav
@@ -1069,12 +1094,11 @@ Name[th]=มีการเชื่อมต่อมากเกินไป
 Name[tr]=Çok Fazla Bağlantı
 Name[ug]=باغلىنىش بەك كۆپ
 Name[uk]=Забагато з’єднань
-Name[x-test]=xxToo Many Connectionsxx
 Name[zh_CN]=连接过多
 Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
-Comment[ar]=مشغول، الإتصال رفض
+Comment[ar]=مشغول، الاتصال رفض
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1105,10 +1129,11 @@ Comment[id]=Sibuk, koneksi ditampik
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
+Comment[ka]=დაკავებულია, დაკავშირება უარყოფილია
 Comment[kk]=Бос емес, қосылым болмады
 Comment[km]=រវល់ បដិសេធ​ការ​ត​ភ្ជាប់
 Comment[ko]=바쁨, 연결 거부됨
-Comment[lt]=Užimta, kvietimas ryšiui atmestas
+Comment[lt]=Užimta, ryšys atmestas
 Comment[lv]=Aizņemts, savienojums noraidīts
 Comment[mk]=Зафатено, поврзувањето е одбиено
 Comment[ml]=തിരക്കിലാണ്, ബന്ധം നിഷേധിച്ചു
@@ -1123,6 +1148,7 @@ Comment[pt]=Ocupado, pelo a ligação foi recusada
 Comment[pt_BR]=Ocupado; conexão recusada
 Comment[ro]=Ocupat, conexiune refuzată
 Comment[ru]=Занят, соединение отклонено
+Comment[sa]=व्यस्तः, सम्पर्कः अङ्गीकृतः
 Comment[si]=කාර්‍යබහුලයි, සබඳතාව නොපිළිගැණිනි
 Comment[sk]=Zaneprázdnený, pripojenie bolo odmietnuté
 Comment[sl]=Zaposlen, povezava zavrnjena
@@ -1140,7 +1166,6 @@ Comment[uk]=Зайнято, у з’єднанні відмовлено
 Comment[uz]=Band, aloqa rad etildi
 Comment[uz@cyrillic]=Банд, алоқа рад этилди
 Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
-Comment[x-test]=xxBusy, connection refusedxx
 Comment[zh_CN]=对方处于忙碌状态，连接被拒绝
 Comment[zh_HK]=忙碌，已拒絕連線
 Comment[zh_TW]=忙碌，連線被拒
@@ -1166,6 +1191,7 @@ Name[fi]=Odottamaton yhteys
 Name[fr]=Connexion inattendue
 Name[ga]=Ceangal Gan Choinne
 Name[gl]=Conexión non agardada
+Name[he]=חיבור בלתי צפוי
 Name[hi]=अप्रत्याशित कनेक्शन
 Name[hne]=अप्रत्यासित कनेक्सन
 Name[hr]=Neočekivana veza
@@ -1175,10 +1201,11 @@ Name[id]=Koneksi Tak Terduga
 Name[is]=Óvænt Tenging
 Name[it]=Connessione inattesa
 Name[ja]=予期しない接続
+Name[ka]=მოულოდნელი შეერთება
 Name[kk]=Күтпеген қосылым
 Name[km]=ការ​តភ្ជាប់​ដែល​មិន​បាន​រំពឹង​ទុក
 Name[ko]=예상하지 않은 연결
-Name[lt]=Netikėtas kvietimas ryšiui
+Name[lt]=Netikėtas ryšys
 Name[lv]=Negaidīts savienojums
 Name[ml]=അപ്രതീക്ഷിതമായ ബന്ധം
 Name[nb]=Uventet tilkobling
@@ -1191,6 +1218,7 @@ Name[pt]=Ligação Inesperada
 Name[pt_BR]=Conexão inesperada
 Name[ro]=Conexiune neașteptată
 Name[ru]=Неожиданное соединение
+Name[sa]=अप्रत्याशितसंयोजनम्
 Name[si]=බලාපොරොත්තු රහිත සබඳතාවක්
 Name[sk]=Neočakávané pripojenie
 Name[sl]=Nepričakovana povezava
@@ -1204,7 +1232,6 @@ Name[th]=เกิดการเชื่อมต่อที่ไม่ค
 Name[tr]=Beklenmeyen Bağlantı
 Name[ug]=كۈتۈلمىگەن باغلىنىش
 Name[uk]=Неочікуване з’єднання
-Name[x-test]=xxUnexpected Connectionxx
 Name[zh_CN]=未预料的连接
 Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
@@ -1229,7 +1256,7 @@ 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[he]=נתקבל חיבור בלתי צפוי, בוטל
+Comment[he]=התקבל חיבור בלתי צפוי, בוטל
 Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
 Comment[hne]=अप्रत्यासित कनेक्सन प्राप्त. छोड़ा
 Comment[hr]=Primio sam neočekivanu vezu, prekid
@@ -1239,10 +1266,11 @@ Comment[id]=Diperoleh koneksi tak terduga, gugurkan
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inattesa, terminata
 Comment[ja]=予期しない接続を受信しました。廃棄します。
+Comment[ka]=მიღებულია მოულოდნელი მიერთება. გაუქმდება
 Comment[kk]=Күтпеген қосылым ұсынысы, доғарылды
 Comment[km]=បាន​ទទួល​យក​ការ​តភ្ជាប់​ដែល​មិន​បាន​រំពឹង​ទុក ​បោះបង់
 Comment[ko]=예상하지 않은 연결을 받았습니다, 중지합니다
-Comment[lt]=Sulaukta netikėto kvietimo ryšiui, nutraukiama
+Comment[lt]=Sulaukta netikėto ryšio, nutraukiama
 Comment[lv]=Saņemts negaidīts savienojums, pārtraukts
 Comment[mk]=Примено е неочекувано поврзување, се прекинува
 Comment[ml]=അപ്രതീക്ഷിതമായ ബന്ധം ലഭിച്ചു, നിരസിക്കുക
@@ -1256,6 +1284,7 @@ Comment[pt]=Foi recebida uma ligação inesperada, pelo que foi interrompida
 Comment[pt_BR]=Conexão recebida inesperadamente; cancelar
 Comment[ro]=Conexiune neașteptată recepționată, abandonare
 Comment[ru]=Получено неожиданное соединение. Отключение
+Comment[sa]=अप्रत्याशितसंयोजनं प्राप्तवान्, गर्भपातं करोतु
 Comment[si]=බලාපොරොත්තු රහිත සබඳතාවක් ලැබිනි, පිටවෙමින්
 Comment[sk]=Prijaté neočakávané pripojenie, prerušené
 Comment[sl]=Prejeta nepričakovana povezava, prekinjeno
@@ -1271,7 +1300,6 @@ Comment[tr]=Beklenmeyen bir bağlantı alındı, vazgeçiliyor
 Comment[ug]=ئويلاشمىغان باغلىنىشنى تاپشۇرۇۋالدى، توختات
 Comment[uk]=Отримано з’єднання, яке не очікувалось, припиняється
 Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
-Comment[x-test]=xxReceived unexpected connection, abortxx
 Comment[zh_CN]=收到意外连接，已中止
 Comment[zh_HK]=接收到非預期的連線，中止
 Comment[zh_TW]=已接收到未知的連線，中止。

krfb/krfb_rfb_handler.client

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

krfb/main-virtualmonitor.cpp

@@ -0,0 +1,189 @@
+/* This file is part of the KDE project
+   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@kde.org>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+*/
+
+#include "krfb_version.h"
+#include "rfbserver.h"
+#include "rfbservermanager.h"
+#include "sockethelpers.h"
+#include <KAboutData>
+#include <KCrash>
+#include <KLocalizedString>
+#include <KNotification>
+#include <KWindowSystem>
+#include <QApplication>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
+#include <QDebug>
+#include <QTimer>
+#include <signal.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);
+
+    KCrash::initialize();
+
+    QCommandLineParser parser;
+    aboutData.setupCommandLine(&parser);
+
+    const QCommandLineOption resolutionOption(
+        {QStringLiteral("resolution")},
+        i18n("Logical resolution of the new monitor"),
+        i18n("resolution"),
+        QStringLiteral("1920x1080"));
+    parser.addOption(resolutionOption);
+
+    const QCommandLineOption nameOption(
+        {QStringLiteral("name")},
+        i18n("Name of the monitor"),
+        i18n("name"),
+        QStringLiteral("Monitor"));
+    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("5900"));
+    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;
+    }
+    const QString res = parser.value(resolutionOption);
+    const auto resSplit = res.split(QLatin1Char('x'));
+    const QSize size = {resSplit[0].toInt(), resSplit[1].toInt()};
+    if (resSplit.size() != 2 || size.isEmpty()) {
+        qCritical() << "The resolution should be formatted as WIDTHxHEIGHT (e.g. --resolution 1920x1080).";
+        return 2;
+    }
+
+    RfbServerManager::s_pluginArgs = {
+        {QStringLiteral("name"), parser.value(nameOption)},
+        {QStringLiteral("resolution"), size},
+        {QStringLiteral("scale"), parser.value(scaleOption).toDouble()},
+    };
+
+    VirtualMonitorRfbServer server;
+    server.setPasswordRequired(true);
+    server.setPasswordSet(!parser.value(passwordOption).isEmpty());
+    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()) {
+        qCritical() << "Could not start the VNC server.";
+        return 3;
+    }
+
+    return app.exec();
+}

krfb/main.cpp

@@ -1,45 +1,31 @@
-/***************************************************************************
-                                   main.cpp
-                             -------------------
-    begin                : Sat Dec  8 03:23:02 CET 2001
-    copyright            : (C) 2001-2003 by Tim Jansen
-    email                : tim@tjansen.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+    SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
 
+#include "invitationsrfbserver.h"
+#include "krfb_version.h"
+#include "krfbconfig.h"
+#include "krfbdebug.h"
 #include "mainwindow.h"
 #include "trayicon.h"
-#include "invitationsrfbserver.h"
-#include "krfbconfig.h"
-#include "krfb_version.h"
 
 #include <KAboutData>
+#include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KWindowSystem>
 
-#include <QDebug>
 #include <QPixmap>
+#include <QtGui/private/qtx11extras_p.h>
 #include <qwindowdefs.h>
-#include <QX11Info>
 
-#include <signal.h>
-#include <X11/extensions/XTest.h>
-#include <QCommandLineParser>
 #include <QCommandLineOption>
+#include <QCommandLineParser>
+#include <X11/extensions/XTest.h>
+#include <csignal>
 
-
-static const char description[] = I18N_NOOP("VNC-compatible server to share "
-                                  "desktops");
 static bool checkX11Capabilities()
 {
     int bp1, bp2, majorv, minorv;
@@ -57,15 +43,16 @@ static bool checkX11Capabilities()
     return true;
 }
 
-static void checkOldX11PluginConfig() {
+static void checkOldX11PluginConfig()
+{
     if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("x11")) {
-        qDebug() << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
+        qCDebug(KRFB) << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
         KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
-                    QStringLiteral("preferredFrameBufferPlugin"));
+            QStringLiteral("preferredFrameBufferPlugin"));
         if (config_item) {
             config_item->setProperty(QStringLiteral("xcb"));
             KrfbConfig::self()->save();
-            qDebug() << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
+            qCDebug(KRFB) << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
         }
     }
 }
@@ -74,14 +61,14 @@ static void checkWaylandPluginConfig()
 {
     if (KrfbConfig::preferredFrameBufferPlugin() != QStringLiteral("pw")) {
         qWarning() << "Wayland: Detected invalid configuration: "
-                    "preferredFrameBufferPlugin is not pipewire: "
+                      "preferredFrameBufferPlugin is not pipewire: "
                    << KrfbConfig::preferredFrameBufferPlugin();
         KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
-                    QStringLiteral("preferredFrameBufferPlugin"));
+            QStringLiteral("preferredFrameBufferPlugin"));
         if (config_item) {
             config_item->setProperty(QStringLiteral("pw"));
             KrfbConfig::self()->save();
-            qDebug() << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
+            qCDebug(KRFB) << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
         }
     }
 }
@@ -95,15 +82,15 @@ int main(int argc, char *argv[])
     KAboutData aboutData(QStringLiteral("krfb"),
                          i18n("Desktop Sharing"),
                          QStringLiteral(KRFB_VERSION_STRING),
-                         i18n(description),
+                         i18n("VNC-compatible server to share desktops"),
                          KAboutLicense::GPL,
                          i18n("(c) 2009-2010, Collabora Ltd.\n"
-                               "(c) 2007, Alessandro Praduroux\n"
-                               "(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"));
+                              "(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(i18n("George Goldberg"),
                         i18n("Telepathy tubes support"),
                         QStringLiteral("george.goldberg@collabora.co.uk"));
@@ -120,12 +107,16 @@ int main(int argc, char *argv[])
                         i18n("ZLib encoder"));
     aboutData.addCredit(i18n("AT&T Laboratories Boston"),
                         i18n("original VNC encoders and "
-                              "protocol design"));
+                             "protocol design"));
     KAboutData::setApplicationData(aboutData);
 
+    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("krfb")));
+
+    KCrash::initialize();
+
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
-    const QCommandLineOption nodialogOption(QStringList{ QStringLiteral("nodialog") }, i18n("Do not show the invitations management dialog at startup"));
+    const QCommandLineOption nodialogOption(QStringList{QStringLiteral("nodialog")}, i18n("Do not show the invitations management dialog at startup"));
     parser.addOption(nodialogOption);
 
     parser.process(app);
@@ -153,15 +144,24 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    //init the core
+    // init the core
     InvitationsRfbServer::init();
 
-    //init the GUI
+    // init the GUI
     MainWindow mainWindow;
     TrayIcon trayicon(&mainWindow);
 
+    QObject::connect(&service, &KDBusService::activateRequested, &mainWindow, [&mainWindow](const QStringList & /*arguments*/, const QString & /*workdir*/) {
+        if (!mainWindow.isVisible()) {
+            mainWindow.setVisible(true);
+        } else {
+            KWindowSystem::updateStartupId(mainWindow.windowHandle());
+            KWindowSystem::activateWindow(mainWindow.windowHandle());
+        }
+    });
+
     if (KrfbConfig::startMinimized()) {
-      mainWindow.hide();
+        mainWindow.hide();
     } else if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
         mainWindow.restore(1, false);
     } else if (!parser.isSet(nodialogOption)) {

krfb/mainwindow.cpp

@@ -1,54 +1,53 @@
 /* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-   Copyright (C) 2013 Amandeep Singh <aman.dedman@gmail.com>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2013 Amandeep Singh <aman.dedman@gmail.com>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "mainwindow.h"
 #include "invitationsrfbserver.h"
 
 #include "krfbconfig.h"
-#include "ui_configtcp.h"
-#include "ui_configsecurity.h"
 #include "ui_configframebuffer.h"
+#include "ui_configsecurity.h"
+#include "ui_configtcp.h"
 
+#include <KActionCollection>
 #include <KConfigDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KMessageWidget>
-#include <KStandardAction>
-#include <KActionCollection>
-#include <KLineEdit>
 #include <KNewPasswordDialog>
-#include <KPluginLoader>
 #include <KPluginMetaData>
+#include <KStandardAction>
 
-#include <QIcon>
-#include <QWidget>
-#include <QLineEdit>
 #include <QComboBox>
-#include <QSizePolicy>
-#include <QVector>
-#include <QSet>
-#include <QNetworkInterface>
 #include <QHostInfo>
+#include <QIcon>
+#include <QLineEdit>
+#include <QList>
+#include <QMessageBox>
+#include <QNetworkInterface>
+#include <QSet>
+#include <QSizePolicy>
+#include <QWidget>
 
-
-class TCP: public QWidget, public Ui::TCP
+class TCP : public QWidget, public Ui::TCP
 {
 public:
-    TCP(QWidget *parent = nullptr) : QWidget(parent) {
+    explicit TCP(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
         setupUi(this);
     }
 };
 
-class Security: public QWidget, public Ui::Security
+class Security : public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = nullptr) : QWidget(parent) {
+    explicit Security(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
         setupUi(this);
         walletWarning = new KMessageWidget(this);
         walletWarning->setText(i18n("Storing passwords in config file is insecure!"));
@@ -58,7 +57,7 @@ public:
         vboxLayout->addWidget(walletWarning);
 
         // show warning when "noWallet" checkbox is checked
-        QObject::connect(kcfg_noWallet, &QCheckBox::toggled, this, [this] (bool checked) {
+        QObject::connect(kcfg_noWallet, &QCheckBox::toggled, this, [this](bool checked) {
             walletWarning->setVisible(checked);
         });
     }
@@ -66,10 +65,12 @@ public:
     KMessageWidget *walletWarning = nullptr;
 };
 
-class ConfigFramebuffer: public QWidget, public Ui::Framebuffer
+class ConfigFramebuffer : public QWidget, public Ui::Framebuffer
 {
 public:
-    ConfigFramebuffer(QWidget *parent = nullptr) : QWidget(parent) {
+    ConfigFramebuffer(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
         setupUi(this);
         // hide the line edit with framebuffer string
         kcfg_preferredFrameBufferPlugin->hide();
@@ -83,39 +84,30 @@ public:
                          kcfg_preferredFrameBufferPlugin, &QLineEdit::setText);
     }
 
-    void fillFrameBuffersCombo() {
-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(
-                    QStringLiteral("krfb"), [](const KPluginMetaData & md) {
-            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
-        });
-        QSet<QString> unique;
-        QVectorIterator<KPluginMetaData> i(plugins);
-        i.toBack();
-        while (i.hasPrevious()) {
-            const KPluginMetaData &metadata = i.previous();
-            if (unique.contains(metadata.pluginId())) continue;
+    void fillFrameBuffersCombo()
+    {
+        const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+        for (const KPluginMetaData &metadata : plugins) {
             cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
-            unique.insert(metadata.pluginId());
         }
     }
 };
 
-
 MainWindow::MainWindow(QWidget *parent)
     : KXmlGuiWindow(parent)
 {
     setAttribute(Qt::WA_DeleteOnClose, false);
 
     m_passwordEditable = false;
-    m_passwordLineEdit = new KLineEdit(this);
+    m_passwordLineEdit = new QLineEdit(this);
     m_passwordLineEdit->setVisible(false);
     m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
 
-    QWidget *mainWidget = new QWidget;
+    auto mainWidget = new QWidget;
     m_ui.setupUi(mainWidget);
     m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
-            InvitationsRfbServer::instance->allowUnattendedAccess());
+        InvitationsRfbServer::instance->allowUnattendedAccess());
 
     setCentralWidget(mainWidget);
 
@@ -137,12 +129,12 @@ MainWindow::MainWindow(QWidget *parent)
     // Figure out the address
     int port = KrfbConfig::port();
     const QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
-    for (const QNetworkInterface& interface : interfaceList) {
-        if(interface.flags() & QNetworkInterface::IsLoopBack)
+    for (const QNetworkInterface &interface : interfaceList) {
+        if (interface.flags() & QNetworkInterface::IsLoopBack) {
             continue;
+        }
 
-        if(interface.flags() & QNetworkInterface::IsRunning &&
-                !interface.addressEntries().isEmpty()) {
+        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()
@@ -152,17 +144,17 @@ MainWindow::MainWindow(QWidget *parent)
         }
     }
 
-    //Figure out the password
+    // Figure out the password
     m_ui.passwordDisplayLabel->setText(
-            InvitationsRfbServer::instance->desktopPassword());
+        InvitationsRfbServer::instance->desktopPassword());
 
-    KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection());
-    KStandardAction::preferences(this, SLOT(showConfiguration()), actionCollection());
+    KStandardAction::quit(QCoreApplication::instance(), &QCoreApplication::quit, actionCollection());
+    KStandardAction::preferences(this, &MainWindow::showConfiguration, actionCollection());
 
     setupGUI();
 
     if (KrfbConfig::allowDesktopControl()) {
-      m_ui.enableSharingCheckBox->setChecked(true);
+        m_ui.enableSharingCheckBox->setChecked(true);
     }
 
     setAutoSaveSettings();
@@ -174,21 +166,21 @@ MainWindow::~MainWindow()
 
 void MainWindow::editPassword()
 {
-    if(m_passwordEditable) {
+    if (m_passwordEditable) {
         m_passwordEditable = false;
         m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
         InvitationsRfbServer::instance->setDesktopPassword(
-                m_passwordLineEdit->text());
+            m_passwordLineEdit->text());
         m_ui.passwordDisplayLabel->setText(
-                InvitationsRfbServer::instance->desktopPassword());
+            InvitationsRfbServer::instance->desktopPassword());
         m_passwordLineEdit->setVisible(false);
     } else {
         m_passwordEditable = true;
         m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
-        m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
+        m_ui.passwordGridLayout->addWidget(m_passwordLineEdit, 0, 0);
         m_passwordLineEdit->setText(
-                InvitationsRfbServer::instance->desktopPassword());
+            InvitationsRfbServer::instance->desktopPassword());
         m_passwordLineEdit->setVisible(true);
         m_passwordLineEdit->setFocus(Qt::MouseFocusReason);
     }
@@ -198,23 +190,23 @@ void MainWindow::editUnattendedPassword()
 {
     KNewPasswordDialog dialog(this);
     dialog.setPrompt(i18n("Enter a new password for Unattended Access"));
-    if(dialog.exec()) {
+    if (dialog.exec()) {
         InvitationsRfbServer::instance->setUnattendedPassword(dialog.password());
     }
 }
 
 void MainWindow::toggleDesktopSharing(bool enable)
 {
-    if(enable) {
-        if(!InvitationsRfbServer::instance->start()) {
+    if (enable) {
+        if (!InvitationsRfbServer::instance->start()) {
             KMessageBox::error(this,
-                    i18n("Failed to start the krfb server. Desktop sharing "
-                        "will not work. Try setting another port in the settings "
-                        "and restart krfb."));
+                               i18n("Failed to start the krfb server. Desktop sharing "
+                                    "will not work. Try setting another port in the settings "
+                                    "and restart krfb."));
         }
     } else {
         InvitationsRfbServer::instance->stop();
-        if(m_passwordEditable) {
+        if (m_passwordEditable) {
             m_passwordEditable = false;
             m_passwordLineEdit->setVisible(false);
             m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
@@ -222,7 +214,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
     }
 }
 
-void MainWindow::passwordChanged(const QString& password)
+void MainWindow::passwordChanged(const QString &password)
 {
     m_passwordLineEdit->setText(password);
     m_ui.passwordDisplayLabel->setText(password);
@@ -230,16 +222,16 @@ void MainWindow::passwordChanged(const QString& password)
 
 void MainWindow::aboutConnectionAddress()
 {
-    KMessageBox::about(this,
-            i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+                       i18n("KDE Desktop Sharing"),
+                       i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."));
 }
 
 void MainWindow::aboutUnattendedMode()
 {
-    KMessageBox::about(this,
-            i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+                       i18n("KDE Desktop Sharing"),
+                       i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."));
 }
 
 void MainWindow::showConfiguration()
@@ -256,12 +248,12 @@ void MainWindow::showConfiguration()
         return;
     }
 
-    KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
+    auto dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
     dialog->addPage(new TCP, i18n("Network"), QStringLiteral("network-wired"));
     dialog->addPage(new Security, i18n("Security"), QStringLiteral("security-high"));
     dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), QStringLiteral("video-display"));
     dialog->show();
-    connect(dialog, &KConfigDialog::settingsChanged, this, [this] () {
+    connect(dialog, &KConfigDialog::settingsChanged, this, [this]() {
         // check if framebuffer plugin config has changed
         if (s_prevFramebufferPlugin != KrfbConfig::preferredFrameBufferPlugin()) {
             KMessageBox::information(this, i18n("To apply framebuffer plugin setting, "
@@ -275,7 +267,7 @@ void MainWindow::showConfiguration()
             } else {
                 InvitationsRfbServer::instance->openKWallet();
                 // erase stored passwords from krfbconfig file
-                KConfigGroup securityConfigGroup(KSharedConfig::openConfig(), "Security");
+                KConfigGroup securityConfigGroup(KSharedConfig::openConfig(), QStringLiteral("Security"));
                 securityConfigGroup.deleteEntry("desktopPassword");
                 securityConfigGroup.deleteEntry("unattendedPassword");
             }
@@ -283,7 +275,7 @@ void MainWindow::showConfiguration()
     });
 }
 
-void MainWindow::readProperties(const KConfigGroup& group)
+void MainWindow::readProperties(const KConfigGroup &group)
 {
     if (group.readEntry("Visible", true)) {
         show();
@@ -291,7 +283,7 @@ void MainWindow::readProperties(const KConfigGroup& group)
     KMainWindow::readProperties(group);
 }
 
-void MainWindow::saveProperties(KConfigGroup& group)
+void MainWindow::saveProperties(KConfigGroup &group)
 {
     group.writeEntry("Visible", isVisible());
     KMainWindow::saveProperties(group);

krfb/mainwindow.h

@@ -1,11 +1,8 @@
 /* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-   Copyright (C) 2013 Amandeep Singh <aman.dedman@gmail.com>
+   SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+   SPDX-FileCopyrightText: 2013 Amandeep Singh <aman.dedman@gmail.com>
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef KRFB_MAINWINDOW_H
@@ -15,35 +12,35 @@
 
 #include <KXmlGuiWindow>
 
-class KLineEdit;
+class QLineEdit;
 
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
 
-    public:
-        explicit MainWindow(QWidget *parent = nullptr);
-        ~MainWindow() override;
+public:
+    explicit MainWindow(QWidget *parent = nullptr);
+    ~MainWindow() override;
 
-    public Q_SLOTS:
-        void showConfiguration();
+public Q_SLOTS:
+    void showConfiguration();
 
-    protected:
-        void readProperties(const KConfigGroup & group) override;
-        void saveProperties(KConfigGroup & group) override;
+protected:
+    void readProperties(const KConfigGroup &group) override;
+    void saveProperties(KConfigGroup &group) override;
 
-    private Q_SLOTS:
-        void editPassword();
-        void editUnattendedPassword();
-        void toggleDesktopSharing(bool enable);
-        void passwordChanged(const QString&);
-        void aboutConnectionAddress();
-        void aboutUnattendedMode();
+private Q_SLOTS:
+    void editPassword();
+    void editUnattendedPassword();
+    void toggleDesktopSharing(bool enable);
+    void passwordChanged(const QString &);
+    void aboutConnectionAddress();
+    void aboutUnattendedMode();
 
-    private:
-        Ui::MainWidget m_ui;
-        bool m_passwordEditable;
-        KLineEdit *m_passwordLineEdit;
+private:
+    Ui::MainWidget m_ui;
+    bool m_passwordEditable;
+    QLineEdit *m_passwordLineEdit = nullptr;
 };
 
 #endif

krfb/org.kde.krfb.appdata.xml

@@ -4,6 +4,9 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>Krfb</name>
+  <name xml:lang="ar">كرفب</name>
+  <name xml:lang="ast">Krfb</name>
+  <name xml:lang="bg">Krfb</name>
   <name xml:lang="ca">Krfb</name>
   <name xml:lang="ca-valencia">Krfb</name>
   <name xml:lang="cs">Krfb</name>
@@ -11,21 +14,31 @@
   <name xml:lang="de">Krfb</name>
   <name xml:lang="el">Krfb</name>
   <name xml:lang="en-GB">Krfb</name>
+  <name xml:lang="eo">Krfb</name>
   <name xml:lang="es">Krfb</name>
   <name xml:lang="et">Krfb</name>
   <name xml:lang="eu">Krfb</name>
   <name xml:lang="fi">Krfb</name>
   <name xml:lang="fr">Krfb</name>
   <name xml:lang="gl">Krfb</name>
+  <name xml:lang="he">Krfb</name>
+  <name xml:lang="hu">Krfb</name>
   <name xml:lang="ia">Krfb</name>
   <name xml:lang="id">Krfb</name>
+  <name xml:lang="is">Krfb</name>
   <name xml:lang="it">Krfb</name>
+  <name xml:lang="ka">Krfb</name>
   <name xml:lang="ko">Krfb</name>
+  <name xml:lang="lt">Krfb</name>
+  <name xml:lang="lv">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="sa">Krfb</name>
   <name xml:lang="sk">Krfb</name>
   <name xml:lang="sl">Krfb</name>
   <name xml:lang="sr">КРФБ</name>
@@ -34,67 +47,88 @@
   <name xml:lang="sr-ijekavianlatin">KRFB</name>
   <name xml:lang="sv">Krfb</name>
   <name xml:lang="tr">Krfb</name>
+  <name xml:lang="ug">Krfb</name>
   <name xml:lang="uk">Krfb</name>
-  <name xml:lang="x-test">xxKrfbxx</name>
   <name xml:lang="zh-CN">Krfb</name>
   <name xml:lang="zh-TW">Krfb</name>
-  <summary>Desktop sharing</summary>
-  <summary xml:lang="ca">Compartició de l'escriptori</summary>
-  <summary xml:lang="ca-valencia">Compartició de l'escriptori</summary>
-  <summary xml:lang="cs">Sdílení pracovní plochy</summary>
-  <summary xml:lang="da">Skrivebordsdeling</summary>
-  <summary xml:lang="de">Freigabe der Arbeitsfläche</summary>
-  <summary xml:lang="el">Κοινή χρήση επιφάνειας εργασίας</summary>
-  <summary xml:lang="en-GB">Desktop sharing</summary>
-  <summary xml:lang="es">Compartir el escritorio</summary>
-  <summary xml:lang="et">Töölaua jagamine</summary>
-  <summary xml:lang="eu">Mahaigaina partekatzea</summary>
-  <summary xml:lang="fi">Työpöydän jako</summary>
-  <summary xml:lang="fr">Partage de bureau</summary>
-  <summary xml:lang="gl">Compartición do escritorio</summary>
-  <summary xml:lang="ia">Compartir de scriptorio</summary>
-  <summary xml:lang="id">Desktop sharing</summary>
-  <summary xml:lang="it">Condivisione del desktop</summary>
-  <summary xml:lang="ko">데스크톱 공유</summary>
-  <summary xml:lang="nl">Bureaublad delen</summary>
-  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
-  <summary xml:lang="pt">Partilha do ecrã</summary>
-  <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
-  <summary xml:lang="ru">Общий рабочий стол</summary>
-  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
-  <summary xml:lang="sl">Souporaba namizja</summary>
-  <summary xml:lang="sr">Дељење површи</summary>
-  <summary xml:lang="sr-Latn">Deljenje površi</summary>
-  <summary xml:lang="sr-ijekavian">Дељење површи</summary>
-  <summary xml:lang="sr-ijekavianlatin">Deljenje površi</summary>
-  <summary xml:lang="sv">Skrivbordsdelning</summary>
-  <summary xml:lang="tr">Masaüstü paylaşımı</summary>
-  <summary xml:lang="uk">Спільне користування стільницею</summary>
-  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
-  <summary xml:lang="zh-CN">桌面共享</summary>
-  <summary xml:lang="zh-TW">桌面分享</summary>
+  <summary>Share your desktop to another computer via VNC</summary>
+  <summary xml:lang="ar">مشاركة سطح مكتبك مع حاسوب آخر بواسطة VNC</summary>
+  <summary xml:lang="bg">Споделяне на работния плот на друг компютър чрез VNC</summary>
+  <summary xml:lang="ca">Comparteix l'escriptori amb un altre ordinador a través de VNC</summary>
+  <summary xml:lang="ca-valencia">Compartix l'escriptori amb un altre ordinador a través de VNC</summary>
+  <summary xml:lang="cs">Sdílejte své pracovní prostředí na jiný počítač pomocí VNC</summary>
+  <summary xml:lang="da">Del dit skrivebord til en anden computer via VNC</summary>
+  <summary xml:lang="de">Verbindung Ihrer Arbeitsfläche zu anderen Rechnern über VNC</summary>
+  <summary xml:lang="el">Μοιραστείτε την επιφάνεια εργασίας σας με άλλον υπολογιστή μέσω VNC</summary>
+  <summary xml:lang="en-GB">Share your desktop to another computer via VNC</summary>
+  <summary xml:lang="eo">Kundividu vian labortablon al alia komputilo per VNC</summary>
+  <summary xml:lang="es">Compartir su escritorio con otro equipo usando VNC</summary>
+  <summary xml:lang="et">Oma töölaua jagamine VNC kaudu teise arvutisse</summary>
+  <summary xml:lang="eu">Partekatu zure mahaigaina beste ordenagailu batekin VNC erabiliz</summary>
+  <summary xml:lang="fi">Jaa työpöytä toiselle koneelle VNC:n kautta</summary>
+  <summary xml:lang="fr">Partager votre bureau avec un autre ordinateur grâce à « VNC »</summary>
+  <summary xml:lang="gl">Comparte o teu escritorio con outro computador por VNC</summary>
+  <summary xml:lang="he">שיתוף שולחן העבודה שלך עם מחשב אחר דרך VNC</summary>
+  <summary xml:lang="hu">Ossza meg asztalát egy másik számítógéppel VNC-n keresztül</summary>
+  <summary xml:lang="ia">Compartir tu scriptorio a un altere computator via VNC</summary>
+  <summary xml:lang="id">Bagikan desktopmu ke komputer lainnya via VNC</summary>
+  <summary xml:lang="is">Deildu skjáborðinu þínu með öðrum tölvum í gegnum VNC</summary>
+  <summary xml:lang="it">Condividi il desktop con un altro computer tramite VNC</summary>
+  <summary xml:lang="ka">სამუშაო მაგიდის გაზიარება Krfb-სთან ერთად VNC-სთან ერთად</summary>
+  <summary xml:lang="ko">내 데스크톱을 VNC로 다른 컴퓨터와 공유</summary>
+  <summary xml:lang="lt">Bendrinti savo darbalaukį kitam kompiuteriui per VNC</summary>
+  <summary xml:lang="lv">Koplietojiet savas ierīces darbvirsmu ar citu datoru, izmantojot 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="sa">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="zh-CN">通过 VNC 分享您的桌面到另一台电脑</summary>
+  <summary xml:lang="zh-TW">透過 VNC 將您的桌面分享給另一台電腦</summary>
   <description>
     <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
+    <p xml:lang="ar">مشاركة سطح المكتب كرْفب هو تطبيق خادم يسمح لك بمشاركة جلستك الحالية مع مستخدم على جهاز آخر، والذي يمكنه استخدام عميل VNC لعرض سطح المكتب أو حتى التحكم فيه.</p>
+    <p xml:lang="bg">Krfb Desktop Sharing е сървърно приложение, което ви позволява да споделяте текущата си сесия с потребител на друга машина, който може да използва VNC клиент, за да преглежда или дори да управлява работния плот.</p>
     <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
-    <p xml:lang="ca-valencia">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="cs">Sdílení plochy Krfb je serverová aplikace, která vám umožňuje sdílet vaši aktuální relaci s uživatelem na jiném počítači, který může pomocí klienta VNC prohlížet nebo dokonce ovládat pracovní plochu.</p>
     <p xml:lang="da">Krfb-skrivebordsdeling er et serverprogram der giver dig mulighed for at dele din nuværende session med en bruger på en anden maskine som kan bruge en VNC-klient til at vise eller endda styrer skrivebordet.</p>
     <p xml:lang="de">Krfb ist eine Serveranwendung, welche die gemeinsame Benutzung der aktuellen Sitzung mit einem Benutzer auf einem anderen Rechner ermöglicht, der mit Hilfe eines VNC-Programms den Bildschirminhalt sehen oder sogar die Arbeitsfläche bedienen kann.</p>
     <p xml:lang="el">Η κοινή χρήση επιφάνειας εργασίας Krfb είναι μια εφαρμογή εξυπηρετητή που σας επιτρέπει να μοιράζεστε την τρέχουσα συνεδρία σας με έναν χρήστη σε άλλο μηχάνημα, ο οποίος μπορεί να χρησιμοποιεί έναν πελάτη VNC για να παρακολουθεί ή και να ελέγχει την επιφάνεια εργασίας σας.</p>
     <p xml:lang="en-GB">Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
+    <p xml:lang="eo">Krfb Desktop Sharing estas servila aplikaĵo, kiu ebligas al vi kunhavigi vian aktualan seancon kun uzanto sur alia maŝino, kiu povas uzi VNC-klienton por rigardi aŭ eĉ kontroli la labortablon.</p>
     <p xml:lang="es">Krfb para compartir el escritorio es una aplicación de servidor que le permite compartir su sesión actual con un usuario de otra máquina, que puede usar un cliente VNC para ver e incluso controlar su escritorio.</p>
     <p xml:lang="et">Krfb töölaua jagamine on serverirakendus, mis võimaldab jagada aktiivset seanssi mõne teise masina taga istuva kasutajaga, kes saab VNC kliendi kaudu töölauda näha või isegi juhtida.</p>
     <p xml:lang="eu">Krfb Mahaigaina Partekatzea zerbitzari aplikazio bat da zure uneko saioa beste makina batean dagoen erabiltzaile batekin partekatzen uzten dizuna. Beste makinan VNC bezeroa erabil dezake zure mahaigaina ikusi edo baita kontrolatzeko ere.</p>
     <p xml:lang="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
     <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
     <p xml:lang="gl">Krfb é unha aplicación de servidor que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="he">שיתוף שולחן העבודה Krfb הוא יישום שרת שמאפשר לך לשתף את ההפעלה הנוכחית שלך עם משתמש במכונה אחרת שיש להם גישה ללוח VNC לטובת צפייה ואפילו שליטה בשולחן העבודה.</p>
+    <p xml:lang="hu">A Krfb asztalmegosztás egy kiszolgáló alkalmazás, amely lehetővé teszi, hogy megossza az aktuális munkamenetet egy másik gépen lévő felhasználóval, aki egy VNC kliens segítségével megtekintheti vagy akár irányíthatja az asztalt.</p>
+    <p xml:lang="ia">Krfb Desktop Sharing es un application de servitor que te permitte compartir tu session currente con un usator sur un altere machina,le qual pote usar un cliente VNC per vider o anque controlar le scriptorio.</p>
     <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
+    <p xml:lang="is">Krfb-skjáborðsmiðlun er netþjónshugbúnaður sem gerir kleift að deila fyrirliggjandi setu með notanda á annarri tölvu, sem getur þá notað VNC-biðlaraforrit til að skoða eða jafnvel stýra skjáborðinu.</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="ka">Krfb სამუშაო მაგიდის გაზიარება აპლიკაციის სერვერია, რომელიც თქვენი მიმდინარე სესიის სხვა მომხმარებლისთვის, რომელსაც VNC კლიენტი აქვს, გაზიარების და კონტროლის გადაცემის საშუალებას გაძლევთ.</p>
+    <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 앱입니다.</p>
+    <p xml:lang="lt">Krfb darbalaukio bendrinimas yra serverio programa, leidžianti jums bendrinti esamą seansą su kitu naudotoju kitame kompiuteryje, kuris gali naudoti VNC kliento programą, kad matytų ar net valdytų darbalaukį.</p>
+    <p xml:lang="lv">„Krfb“ darbvirsmas koplietošana ir servera tipa programma, kas ļauj koplietot pašreizējo sesiju ar citas ierīces lietotāju, lai, izmantojot VNC klienta programmu, varētu redzēt vai pat kontrolēt darbvirsmu.</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="sa">Krfb Desktop Sharing इति सर्वर-अनुप्रयोगः अस्ति यत् अन्यस्मिन् यन्त्रे उपयोक्त्रेण सह स्वस्य वर्तमान-सत्रं साझां कर्तुं शक्नोति, यः डेस्कटॉप् द्रष्टुं वा नियन्त्रयितुं वा VNC क्लायन्ट्-उपयोगं कर्तुं शक्नोति</p>
     <p xml:lang="sk">Krfb je serverová aplikácia, ktorá vám umožní zdieľať vaše aktuálne sedenie s používateľom na inom stroji, ktorý môže používať VNC klienta na pripojenie alebo ovládanie stanice.</p>
     <p xml:lang="sl">Souporaba namizja Krfb je strežniški program, ki vam dovoli, da delite vašo trenutno sejo z uporabnikom na drugem računalniku, ki ima odjemalec VNC. Uporabnik lahko gleda ali celo nadzira namizje.</p>
     <p xml:lang="sr">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
@@ -102,9 +136,8 @@
     <p xml:lang="sr-ijekavian">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
     <p xml:lang="sr-ijekavianlatin">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
     <p xml:lang="sv">Krfb-skrivbordsdelning är ett serverprogram som gör det möjligt att dela aktuell session med en användare på en annan dator, som kan använda en VNC-klient för att betrakta eller till och med kontrollera skrivbordet.</p>
-    <p xml:lang="tr">Krfb Masaüstü Paylaşımı, mevcut oturumu masaüstünü görüntülemek veya kontrol etmek için, VNC istemcisi kullanan başka bir makinedeki, kullanıcıyla paylaşmanızı sağlayan bir sunucu uygulamasıdır.</p>
+    <p xml:lang="tr">Krfb Masaüstü Paylaşımı; geçerli oturumunuzu, başka bir makinedeki bir kullanıcıyla paylaşmanıza izin veren bir sunucu uygulamasıdır. Kullanıcılar, bir VNC istemcisi ile masaüstünüzü görüntüleyebilir ve hatta denetleyebilirler.</p>
     <p xml:lang="uk">Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.</p>
-    <p xml:lang="x-test">xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx</p>
     <p xml:lang="zh-CN">Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。</p>
     <p xml:lang="zh-TW">Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 用戶端檢視、甚至控制您的桌面。</p>
   </description>
@@ -115,32 +148,46 @@
   <screenshots>
     <screenshot type="default">
       <caption>Sharing desktop with Krfb</caption>
+      <caption xml:lang="ar">مشاركة سطح المكتب باستخدام كرفب</caption>
+      <caption xml:lang="bg">Споделяне на работното място с 1Krfb</caption>
       <caption xml:lang="ca">Compartint l'escriptori amb el Krfb</caption>
-      <caption xml:lang="ca-valencia">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="ca-valencia">Compartint l'escriptori amb Krfb</caption>
       <caption xml:lang="cs">Sdílím pracovní plochu pomocí Krfb</caption>
       <caption xml:lang="da">Deler skrivebord med Krfb</caption>
       <caption xml:lang="de">Freigabe der Arbeitsfläche mit Krfb</caption>
       <caption xml:lang="el">Κοινή χρήση επιφάνειας εργασίας με το Krfb</caption>
       <caption xml:lang="en-GB">Sharing desktop with Krfb</caption>
+      <caption xml:lang="eo">Kundividante labortablon per Krfb</caption>
       <caption xml:lang="es">Compartiendo el escritorio con Krfb</caption>
       <caption xml:lang="et">Töölaua jagamine Krfb abil</caption>
       <caption xml:lang="eu">Mahaigaina Krfb-ren bidez partekatzea</caption>
       <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
       <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
       <caption xml:lang="gl">Compartindo o escritorio con Krfb</caption>
+      <caption xml:lang="he">שיתוף שולחן העבודה עם Krfb</caption>
+      <caption xml:lang="hu">Asztalmegosztás a Krfb-vel</caption>
+      <caption xml:lang="ia">Compartir scriptorio con Krfb</caption>
       <caption xml:lang="id">Berbagi desktop dengan Krfb</caption>
+      <caption xml:lang="is">Skjáborðsmiðlun með Krfb</caption>
       <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
+      <caption xml:lang="ka">სამუშაო მაგიდის გაზიარება Krfb-სთან ერთად</caption>
       <caption xml:lang="ko">Krfb로 데스크톱 공유</caption>
+      <caption xml:lang="lt">Darbalaukio bendrinimas naudojant Krfb</caption>
+      <caption xml:lang="lv">Darbvirsmas koplietošana ar „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="sa">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="ug">Krfb ئارقىلىق ئۈستەلئۈستىنى ھەمبەھىرلەيدۇ</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>
@@ -151,9 +198,36 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <release version="20.08.0" date="2020-08-13"/>
-    <release version="20.04.3" date="2020-07-09"/>
-    <release version="20.04.2" date="2020-06-11"/>
-    <release version="20.04.1" date="2020-05-14"/>
+    <release version="26.04.3" date="2026-07-02"/>
+    <release version="26.04.2" date="2026-06-04"/>
+    <release version="26.04.1" date="2026-05-07"/>
+    <release version="26.04.0" date="2026-04-16"/>
+    <release version="25.12.3" date="2026-03-05"/>
+    <release version="25.12.2" date="2026-02-05"/>
+    <release version="25.12.1" date="2026-01-08"/>
+    <release version="25.12.0" date="2025-12-11"/>
+    <release version="25.08.3" date="2025-11-06"/>
+    <release version="25.08.2" date="2025-10-09"/>
+    <release version="25.08.1" date="2025-09-11"/>
+    <release version="25.08.0" date="2025-08-14"/>
+    <release version="25.04.3" date="2025-07-03"/>
+    <release version="25.04.2" date="2025-06-05"/>
+    <release version="25.04.1" date="2025-05-08"/>
+    <release version="25.04.0" date="2025-04-17"/>
+    <release version="24.12.3" date="2025-03-06"/>
+    <release version="24.12.2" date="2025-02-06"/>
+    <release version="24.12.1" date="2025-01-09"/>
+    <release version="24.12.0" date="2024-12-12"/>
+    <release version="24.08.3" date="2024-11-07"/>
+    <release version="24.08.2" date="2024-10-10"/>
+    <release version="24.08.1" date="2024-09-12"/>
+    <release version="24.08.0" date="2024-08-22"/>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
+    <release version="24.05.0" date="2024-05-23"/>
+    <release version="24.02.2" date="2024-04-11"/>
+    <release version="24.02.1" date="2024-03-21"/>
+    <release version="24.02.0" date="2024-02-28"/>
+    <release version="23.08.5" date="2024-02-15"/>
   </releases>
 </component>

krfb/org.kde.krfb.desktop

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

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

@@ -0,0 +1,84 @@
+# KDE Config File
+[Desktop Entry]
+Type=Application
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
+Icon=krfb
+Terminal=false
+Name=KRFBs Virtual Monitor
+Name[ar]=شاشة افتراضية لكرفب
+Name[bg]=Виртуален монитор на KRFB
+Name[ca]=Monitor virtual del Krfb
+Name[ca@valencia]=Monitor virtual de Krfb
+Name[cs]=Virtuální monitor KRFB
+Name[el]=Εικονική οθόνη του KRFB
+Name[en_GB]=KRFBs Virtual Monitor
+Name[eo]=Virtuala Monitoro de KRFB
+Name[es]=Monitor virtual de KRFB
+Name[eu]=KRFBren alegiazko monitorea
+Name[fi]=KRFB:n virtuaalinäyttö
+Name[fr]=Moniteur virtuel « Krfb »
+Name[gl]=Monitor virtual de KRFB
+Name[he]=הצג הווירטואלי של KRFB
+Name[hu]=KRFB virtuális monitor
+Name[ia]=Virtual Monitor de KRFB
+Name[is]=KRFB-sýndarskjár
+Name[it]=Monitor virtuale di KRFB
+Name[ka]=KRFB-ის ვირტუალური ეკრანი
+Name[ko]=KRFBs 가상 모니터
+Name[lt]=KRFBs virtualus monitorius
+Name[lv]=KRFB virtuālais monitors
+Name[nl]=Virtuele monitor van KRFB
+Name[nn]=KRFBs virtuell skjerm
+Name[pl]=Monitor wirtualny KRFB
+Name[pt]=Monitor Virtual do KRFB
+Name[pt_BR]=Monitor virtual do KRFB
+Name[ro]=Monitor virtual KRFB
+Name[ru]=Виртуальный монитор KRFB
+Name[sa]=KRFBs वर्चुअल मॉनिटर
+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[zh_CN]=KRBs 虚拟监视器
+Name[zh_TW]=KRFBs 虛擬螢幕
+Comment=Remote Virtual Monitor
+Comment[ar]=شاشة افتراضية بعيدة
+Comment[bg]=Отдалечен виртуален монитор
+Comment[ca]=Monitor virtual remot
+Comment[ca@valencia]=Monitor virtual remot
+Comment[cs]=Vzdálený virtuální monitor
+Comment[el]=Απομακρυσμένη εικονική οθόνη
+Comment[en_GB]=Remote Virtual Monitor
+Comment[eo]=Fora Virtuala Monitoro
+Comment[es]=Monitor virtual remoto
+Comment[eu]=Urruneko alegiazko monitorea
+Comment[fi]=Virtuaalinen etänäyttö
+Comment[fr]=Moniteur virtuel distant
+Comment[gl]=Monitor virtual remoto
+Comment[he]=צג וירטואלי מרוחק
+Comment[hu]=Távoli virtuális monitor
+Comment[ia]=Monitor Virtual Remote
+Comment[is]=Fjartengdur sýndarskjár
+Comment[it]=Monitor virtuale remoto
+Comment[ka]=დაშორებული ვირტუალური ეკრანი
+Comment[ko]=원격 가상 모니터
+Comment[lt]=Nuotolinis virtualus monitorius
+Comment[lv]=Attālais virtuālais monitors
+Comment[nl]=Virtual Monitor op afstand
+Comment[nn]=Virtuell skjerm for ekstern ressurs
+Comment[pl]=Zdalny monitor wirtualny
+Comment[pt]=Monitor Virtual Remoto
+Comment[pt_BR]=Monitor virtual remoto
+Comment[ro]=Monitor virtual distant
+Comment[ru]=Удалённый виртуальный монитор
+Comment[sa]=दूरस्थ आभासी निरीक्षक
+Comment[sk]=Vzdialený virtuálny monitor
+Comment[sl]=Oddaljeni navidezni monitor
+Comment[sv]=Virtuell fjärrbildskärm
+Comment[tr]=Uzak konumlar için sanal monitör
+Comment[uk]=Віддалений віртуальний монітор
+Comment[zh_CN]=远程虚拟监视器
+Comment[zh_TW]=遠端虛擬螢幕
+NoDisplay=true
+X-KDE-Wayland-Interfaces=zkde_screencast_unstable_v1

krfb/rfb.h

@@ -16,4 +16,3 @@
 #undef FALSE
 
 #endif // Header guard
-

krfb/rfbclient.cpp

@@ -1,38 +1,28 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "rfbclient.h"
 #include "connectiondialog.h"
-#include "krfbconfig.h"
-#include "sockethelpers.h"
 #include "eventsmanager.h"
+#include "krfbconfig.h"
+#include "krfbdebug.h"
+#include "sockethelpers.h"
 #include <QSocketNotifier>
-#include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
 
 struct RfbClient::Private
 {
-    Private(rfbClientPtr client) :
-        controlEnabled(KrfbConfig::allowDesktopControl()),
-        client(client)
-    {}
+    Private(rfbClientPtr client)
+        : controlEnabled(KrfbConfig::allowDesktopControl())
+        , client(client)
+    {
+    }
 
     bool controlEnabled;
     rfbClientPtr client;
@@ -41,11 +31,11 @@ struct RfbClient::Private
     QString remoteAddressString;
 };
 
-RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
-    : QObject(parent), d(new Private(client))
+RfbClient::RfbClient(rfbClientPtr client, QObject *parent)
+    : QObject(parent)
+    , d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') +
-                             QString::number(peerPort(d->client->sock));
+    d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') + QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(false);
@@ -56,7 +46,7 @@ RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
 
 RfbClient::~RfbClient()
 {
-    //qDebug();
+    // qDebug();
     delete d;
 }
 
@@ -65,7 +55,7 @@ QString RfbClient::name() const
     return d->remoteAddressString;
 }
 
-//static
+// static
 bool RfbClient::controlCanBeEnabled()
 {
     return KrfbConfig::allowDesktopControl();
@@ -126,23 +116,23 @@ void RfbClient::handleMouseEvent(int buttonMask, int x, int y)
 
 void RfbClient::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 };
+    // 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) {
+    while (poll(&pollfd, 1, 0) == 1) {
         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
+        // 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";
+            // qDebug() << "disconnected from socket signal";
             d->notifier->setEnabled(false);
             rfbClientConnectionGone(d->client);
             break;
@@ -154,14 +144,14 @@ void RfbClient::update()
 {
     rfbUpdateClient(d->client);
 
-    //This is how we handle disconnection.
-    //if rfbUpdateClient() finds out that it can't write to 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
+    // This is how we handle disconnection.
+    // if rfbUpdateClient() finds out that it can't write to 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 during update";
+        // qDebug() << "disconnected during update";
         d->notifier->setEnabled(false);
         rfbClientConnectionGone(d->client);
     }
@@ -170,17 +160,24 @@ void RfbClient::update()
 //*************
 
 PendingRfbClient::PendingRfbClient(rfbClientPtr client, QObject *parent)
-    : QObject(parent), m_rfbClient(client)
+    : 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()
-{}
+{
+}
 
 void PendingRfbClient::accept(RfbClient *newClient)
 {
-    //qDebug() << "accepted connection";
+    // qDebug() << "accepted connection";
 
     m_rfbClient->clientData = newClient;
     newClient->setOnHold(false);
@@ -189,13 +186,16 @@ void PendingRfbClient::accept(RfbClient *newClient)
     deleteLater();
 }
 
-static void clientGoneHookNoop(rfbClientPtr cl) { Q_UNUSED(cl); }
+static void clientGoneHookNoop(rfbClientPtr cl)
+{
+    Q_UNUSED(cl);
+}
 
 void PendingRfbClient::reject()
 {
-    //qDebug() << "refused connection";
+    // qDebug() << "refused connection";
 
-    //override the clientGoneHook that was previously set by RfbServer
+    // override the clientGoneHook that was previously set by RfbServer
     m_rfbClient->clientGoneHook = clientGoneHookNoop;
     rfbCloseClient(m_rfbClient);
     rfbClientConnectionGone(m_rfbClient);
@@ -204,20 +204,20 @@ void PendingRfbClient::reject()
     deleteLater();
 }
 
-bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
+bool PendingRfbClient::checkPassword(const QByteArray &encryptedPassword)
 {
     Q_UNUSED(encryptedPassword);
 
-    return m_rfbClient->screen->authPasswdData == (void*)nullptr;
+    return m_rfbClient->screen->authPasswdData == (void *)nullptr;
 }
 
-bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
+bool PendingRfbClient::vncAuthCheckPassword(const QByteArray &password, const QByteArray &encryptedPassword) const
 {
     if (password.isEmpty() && encryptedPassword.isEmpty()) {
         return true;
     }
 
-    char passwd[MAXPWLEN+1]; // +1 to make sure there's a nullptr at the end
+    char passwd[MAXPWLEN + 1]; // +1 to make sure there's a nullptr at the end
     unsigned char challenge[CHALLENGESIZE];
 
     memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE);
@@ -231,3 +231,35 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
     rfbEncryptBytes(challenge, passwd);
     return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
 }
+
+void PendingRfbClient::onSocketActivated()
+{
+    // Process not only one, but all pending messages.
+    // poll() idea/code copied from vino:
+    //  Copyright (C) 2003 Sun Microsystems, Inc.
+    //  License: GPL v2 or later
+    struct pollfd pollfd = {m_rfbClient->sock, POLLIN | POLLPRI, 0};
+
+    while (poll(&pollfd, 1, 0) == 1) {
+        if (m_rfbClient->state == rfbClientRec::RFB_INITIALISATION) {
+            m_notifier->setEnabled(false);
+            // Client is Authenticated
+            processNewClient();
+            break;
+        }
+        rfbProcessClientMessage(m_rfbClient);
+
+        // This is how we handle disconnection.
+        // if rfbProcessClientMessage() finds out that it can't read the socket,
+        // it closes it and sets it to -1. So, we just have to check this here
+        // and call rfbClientConnectionGone() if necessary. This will call
+        // the clientGoneHook which in turn will remove this RfbClient instance
+        // from the server manager and will call deleteLater() to delete it
+        if (m_rfbClient->sock == -1) {
+            qCDebug(KRFB) << "disconnected from socket signal";
+            m_notifier->setEnabled(false);
+            rfbClientConnectionGone(m_rfbClient);
+            break;
+        }
+    }
+}

krfb/rfbclient.h

@@ -1,21 +1,10 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef RFBCLIENT_H
 #define RFBCLIENT_H
@@ -23,11 +12,14 @@
 #include "rfb.h"
 #include <QObject>
 
+class QSocketNotifier;
+
 class RfbClient : public QObject
 {
     Q_OBJECT
     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;
@@ -49,7 +41,7 @@ Q_SIGNALS:
     void holdStatusChanged(bool onHold);
 
 protected:
-    friend class RfbServer; //the following event handling methods are called by RfbServer
+    friend class RfbServer; // the following event handling methods are called by RfbServer
 
     rfbClientPtr getRfbClientPtr();
     virtual void handleKeyboardEvent(bool down, rfbKeySym keySym);
@@ -59,8 +51,8 @@ private Q_SLOTS:
     void onSocketActivated();
 
 private:
-    ///called by RfbServerManager to send framebuffer updates
-    ///and check for possible disconnection
+    /// called by RfbServerManager to send framebuffer updates
+    /// and check for possible disconnection
     void update();
     friend class RfbServerManager;
 
@@ -68,10 +60,10 @@ private:
     Private *const d;
 };
 
-
 class PendingRfbClient : public QObject
 {
     Q_OBJECT
+
 public:
     explicit PendingRfbClient(rfbClientPtr client, QObject *parent = nullptr);
     ~PendingRfbClient() override;
@@ -86,24 +78,28 @@ protected Q_SLOTS:
     void reject();
 
 protected:
-
-    friend class RfbServer; //Following two methods are handled by RfbServer
+    friend class RfbServer; // Following two methods are handled by RfbServer
 
     /** This method is supposed to check if the provided \a encryptedPassword
      * matches the criteria for authenticating the client.
      * The default implementation returns false if a password is required.
      * Reimplement to do more useful stuff.
      */
-    virtual bool checkPassword(const QByteArray & encryptedPassword);
+    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
      * 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;
+    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

@@ -1,47 +1,39 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "rfbserver.h"
+#include "krfbdebug.h"
 #include "rfbservermanager.h"
-#include <QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
 #include <QPointer>
-#include <QDebug>
-#include <QX11Info>
+#include <QSocketNotifier>
+#include <QtGui/private/qtx11extras_p.h>
 
 struct RfbServer::Private
 {
     QByteArray listeningAddress;
     int listeningPort;
     bool passwordRequired;
+    bool passwordSet;
     rfbScreenInfoPtr screen;
     QPointer<QSocketNotifier> ipv4notifier;
     QPointer<QSocketNotifier> ipv6notifier;
 };
 
 RfbServer::RfbServer(QObject *parent)
-    : QObject(parent), d(new Private)
+    : QObject(parent)
+    , d(new Private)
 {
     d->listeningAddress = "0.0.0.0";
     d->listeningPort = 0;
     d->passwordRequired = true;
+    d->passwordSet = false;
     d->screen = nullptr;
 
     RfbServerManager::instance()->registerServer(this);
@@ -72,7 +64,12 @@ bool RfbServer::passwordRequired() const
     return d->passwordRequired;
 }
 
-void RfbServer::setListeningAddress(const QByteArray& address)
+bool RfbServer::passwordSet() const
+{
+    return d->passwordSet;
+}
+
+void RfbServer::setListeningAddress(const QByteArray &address)
 {
     d->listeningAddress = address;
 }
@@ -87,12 +84,17 @@ void RfbServer::setPasswordRequired(bool passwordRequired)
     d->passwordRequired = passwordRequired;
 }
 
+void RfbServer::setPasswordSet(bool passwordSet)
+{
+    d->passwordSet = passwordSet;
+}
+
 bool RfbServer::start()
 {
     if (!d->screen) {
         d->screen = RfbServerManager::instance()->newScreen();
         if (!d->screen) {
-            qDebug() << "Unable to get rbfserver screen";
+            qCDebug(KRFB) << "Unable to get rbfserver screen";
             return false;
         }
 
@@ -103,46 +105,50 @@ bool RfbServer::start()
         d->screen->ptrAddEvent = pointerHook;
         d->screen->passwordCheck = passwordCheck;
         d->screen->setXCutText = clipboardHook;
+        d->screen->setXCutTextUTF8 = clipboardHookUtf8;
     } else {
-        //if we already have a screen, stop listening first
+        // if we already have a screen, stop listening first
         rfbShutdownServer(d->screen, false);
     }
 
-    if (listeningAddress() != "0.0.0.0") {
-        strncpy(d->screen->thisHost, listeningAddress().constData(), 254);
-    }
+    if (passwordSet()) {
+        if (listeningAddress() != "0.0.0.0") {
+            strncpy(d->screen->thisHost, listeningAddress().constData(), 254);
+        }
 
-    if (listeningPort() == 0) {
-        d->screen->autoPort = 1;
-    }
+        if (listeningPort() == 0) {
+            d->screen->autoPort = 1;
+        }
 
-    d->screen->port = listeningPort();
+        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;
-    }
+        // Disable/Enable password checking
+        if (passwordRequired()) {
+            d->screen->authPasswdData = (void *)1;
+        } else {
+            d->screen->authPasswdData = (void *)nullptr;
+        }
 
-    qDebug() << "Starting server. Listen port:" << listeningPort()
-             << "Listen Address:" << listeningAddress()
-             << "Password enabled:" << passwordRequired();
+        qCDebug(KRFB) << "Starting server. Listen port:" << listeningPort()
+                      << "Listen Address:" << listeningAddress()
+                      << "Password enabled:" << passwordRequired();
 
-    rfbInitServer(d->screen);
+        rfbInitServer(d->screen);
 
-    if (!rfbIsActive(d->screen)) {
-        qDebug() << "Failed to start server";
-        rfbShutdownServer(d->screen, false);
-        return false;
-    };
+        if (!rfbIsActive(d->screen)) {
+            qCDebug(KRFB) << "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);
+        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()) {
@@ -177,11 +183,11 @@ void RfbServer::updateFrameBuffer(char *fb, int width, int height, int depth)
     rfbNewFramebuffer(d->screen, fb, width, height, 8, 3, bpp);
 }
 
-void RfbServer::updateScreen(const QList<QRect> & modifiedTiles)
+void RfbServer::updateScreen(const QList<QRect> &modifiedTiles)
 {
     if (d->screen) {
         QList<QRect>::const_iterator it = modifiedTiles.constBegin();
-        for(; it != modifiedTiles.constEnd(); ++it) {
+        for (; it != modifiedTiles.constEnd(); ++it) {
             rfbMarkRectAsModified(d->screen, it->x(), it->y(), it->right(), it->bottom());
         }
     }
@@ -189,8 +195,8 @@ void RfbServer::updateScreen(const QList<QRect> & modifiedTiles)
 
 /*
  * Code copied from vino's bundled libvncserver:
- *  Copyright (C) 2000, 2001 Const Kaplinsky.  All Rights Reserved.
- *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
+ *  SPDX-FileCopyrightText: 2000, 2001 Const Kaplinsky. All Rights Reserved.
+ *  SPDX-FileCopyrightText: 1999 AT &T Laboratories Cambridge.  All Rights Reserved.
  *  License: GPL v2 or later
  */
 void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int x, int y)
@@ -198,8 +204,9 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
     rfbClientIteratorPtr iterator;
     rfbClientPtr cl;
 
-    if (x == screen->cursorX || y == screen->cursorY)
+    if (x == screen->cursorX || y == screen->cursorY) {
         return;
+    }
 
     LOCK(screen->cursorMutex);
     screen->cursorX = x;
@@ -219,7 +226,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
     }
 }
 
-void RfbServer::updateCursorPosition(const QPoint & position)
+void RfbServer::updateCursorPosition(const QPoint &position)
 {
     if (d->screen) {
         krfb_rfbSetCursorPosition(d->screen, nullptr, position.x(), position.y());
@@ -228,10 +235,12 @@ void RfbServer::updateCursorPosition(const QPoint & position)
 
 void RfbServer::krfbSendServerCutText()
 {
-    if(d->screen) {
+    if (d->screen) {
         QString text = QApplication::clipboard()->text();
-        rfbSendServerCutText(d->screen,
-                text.toLocal8Bit().data(),text.length());
+        QByteArray utf8Bytes = text.toUtf8();
+        QByteArray latin1Bytes = text.toLatin1();
+        // Try to send the clipboard text to the client in UTF-8. Use Latin1 if UTF-8 is not supported.
+        rfbSendServerCutTextUTF8(d->screen, utf8Bytes.data(), utf8Bytes.length(), latin1Bytes.data(), latin1Bytes.length());
     }
 }
 
@@ -242,18 +251,18 @@ void RfbServer::onListenSocketActivated()
 
 void RfbServer::pendingClientFinished(RfbClient *client)
 {
-    //qDebug();
+    // qDebug();
     if (client) {
         RfbServerManager::instance()->addClient(client);
         client->getRfbClientPtr()->clientGoneHook = clientGoneHook;
     }
 }
 
-//static
+// static
 rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 {
-    //qDebug() << "New client";
-    RfbServer *server = static_cast<RfbServer*>(cl->screen->screenData);
+    // qDebug() << "New client";
+    auto server = static_cast<RfbServer *>(cl->screen->screenData);
 
     PendingRfbClient *pendingClient = server->newClient(cl);
     connect(pendingClient, &PendingRfbClient::finished,
@@ -262,40 +271,48 @@ rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
     return RFB_CLIENT_ON_HOLD;
 }
 
-//static
+// static
 void RfbServer::clientGoneHook(rfbClientPtr cl)
 {
-    //qDebug() << "client gone";
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    // qDebug() << "client gone";
+    auto client = static_cast<RfbClient *>(cl->clientData);
 
     RfbServerManager::instance()->removeClient(client);
     client->deleteLater();
 }
 
-//static
+// static
 rfbBool RfbServer::passwordCheck(rfbClientPtr cl, const char *encryptedPassword, int len)
 {
-    PendingRfbClient *client = static_cast<PendingRfbClient*>(cl->clientData);
+    auto client = static_cast<PendingRfbClient *>(cl->clientData);
     Q_ASSERT(client);
     return client->checkPassword(QByteArray::fromRawData(encryptedPassword, len));
 }
 
-//static
+// static
 void RfbServer::keyboardHook(rfbBool down, rfbKeySym keySym, rfbClientPtr cl)
 {
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    auto client = static_cast<RfbClient *>(cl->clientData);
     client->handleKeyboardEvent(down ? true : false, keySym);
 }
 
-//static
+// static
 void RfbServer::pointerHook(int bm, int x, int y, rfbClientPtr cl)
 {
-    RfbClient *client = static_cast<RfbClient*>(cl->clientData);
+    auto client = static_cast<RfbClient *>(cl->clientData);
     client->handleMouseEvent(bm, x, y);
 }
 
-//static
+// static
 void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
-    QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
+    QString text = QString::fromLatin1(str, len);
+    QApplication::clipboard()->setText(text);
+}
+
+void RfbServer::clipboardHookUtf8(char *str, int len, rfbClientPtr /*cl*/)
+{
+    // The last byte is a null terminator
+    QString text = QString::fromUtf8(str, len - 1);
+    QApplication::clipboard()->setText(text);
 }

krfb/rfbserver.h

@@ -1,21 +1,10 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef RFBSERVER_H
 #define RFBSERVER_H
@@ -27,6 +16,7 @@
 class RfbServer : public QObject
 {
     Q_OBJECT
+
 public:
     explicit RfbServer(QObject *parent = nullptr);
     ~RfbServer() override;
@@ -34,18 +24,20 @@ public:
     QByteArray listeningAddress() const;
     int listeningPort() const;
     bool passwordRequired() const;
+    bool passwordSet() const;
 
-    void setListeningAddress(const QByteArray & address);
+    void setListeningAddress(const QByteArray &address);
     void setListeningPort(int port);
     void setPasswordRequired(bool passwordRequired);
+    void setPasswordSet(bool passwordSet);
 
 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);
+    void updateScreen(const QList<QRect> &modifiedTiles);
+    void updateCursorPosition(const QPoint &position);
 
 private Q_SLOTS:
     void krfbSendServerCutText();
@@ -63,6 +55,7 @@ private:
     static void keyboardHook(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
     static void pointerHook(int bm, int x, int y, rfbClientPtr cl);
     static void clipboardHook(char *str, int len, rfbClientPtr cl);
+    static void clipboardHookUtf8(char *str, int len, rfbClientPtr cl);
 
     Q_DISABLE_COPY(RfbServer)
 

krfb/rfbservermanager.cpp

@@ -1,39 +1,31 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-    Copyright (C) 2001-2003 by Tim Jansen <tim@tjansen.de>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2001-2003 Tim Jansen <tim@tjansen.de>
 
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "rfbservermanager.h"
-#include "rfbserver.h"
-#include "framebuffer.h"
 #include "framebuffermanager.h"
-#include "sockethelpers.h"
 #include "krfbconfig.h"
-#include <QTimer>
+#include "krfbdebug.h"
+#include "rfbserver.h"
+#include "sockethelpers.h"
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QGlobalStatic>
 #include <QHostInfo>
-#include <QDebug>
+#include <QTimer>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <KLocalizedString>
-#include <KUser>
 #include <KNotification>
+#include <KUser>
+#include <KWindowSystem>
+#include <chrono>
+
+using namespace std::chrono_literals;
 
 static const char *cur =
     "                   "
@@ -77,7 +69,6 @@ static const char *mask =
     "     xxxxx         "
     "      xxx          ";
 
-
 struct RfbServerManagerStatic
 {
     RfbServerManager server;
@@ -85,7 +76,7 @@ struct RfbServerManagerStatic
 
 Q_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
 
-RfbServerManager* RfbServerManager::instance()
+RfbServerManager *RfbServerManager::instance()
 {
     return &s_instance->server;
 }
@@ -96,13 +87,13 @@ struct RfbServerManager::Private
     rfbCursorPtr myCursor;
     QByteArray desktopName;
     QTimer rfbUpdateTimer;
-    QSet<RfbServer*> servers;
-    QSet<RfbClient*> clients;
+    QSet<RfbServer *> servers;
+    QSet<RfbClient *> clients;
 };
 
-
 RfbServerManager::RfbServerManager()
-    : QObject(), d(new Private)
+    : QObject()
+    , d(new Private)
 {
     init();
 }
@@ -117,15 +108,24 @@ QSharedPointer<FrameBuffer> RfbServerManager::framebuffer() const
     return d->fb;
 }
 
+QVariantMap RfbServerManager::s_pluginArgs;
+
 void RfbServerManager::init()
 {
-    //qDebug();
+    // qDebug();
+    WId rootWindow = 0;
 
-    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
-    d->myCursor = rfbMakeXCursor(19, 19, (char *) cur, (char *) mask);
+    if (KWindowSystem::isPlatformX11()) {
+        QPlatformNativeInterface *native = qApp->platformNativeInterface();
+        rootWindow = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), QGuiApplication::primaryScreen()));
+    }
+
+    d->fb = FrameBufferManager::instance()->frameBuffer(rootWindow, s_pluginArgs);
+    d->myCursor = rfbMakeXCursor(19, 19, (char *)cur, (char *)mask);
     d->myCursor->cleanup = false;
-    d->desktopName = QStringLiteral("%1@%2 (shared desktop)") //FIXME check if we can use utf8
-                        .arg(KUser().loginName(),QHostInfo::localHostName()).toLatin1();
+    d->desktopName = QStringLiteral("%1@%2 (shared desktop)") // FIXME check if we can use utf8
+                         .arg(KUser().loginName(), QHostInfo::localHostName())
+                         .toLatin1();
 
     connect(d->fb.data(), &FrameBuffer::frameBufferChanged, this, &RfbServerManager::updateFrameBuffer);
     connect(&d->rfbUpdateTimer, &QTimer::timeout, this, &RfbServerManager::updateScreens);
@@ -134,7 +134,7 @@ void RfbServerManager::init()
 
 void RfbServerManager::updateFrameBuffer()
 {
-    Q_FOREACH(RfbServer *server, d->servers) {
+    for (RfbServer *server : std::as_const(d->servers)) {
         server->updateFrameBuffer(d->fb->data(), d->fb->width(), d->fb->height(), d->fb->depth());
     }
 }
@@ -142,28 +142,28 @@ void RfbServerManager::updateFrameBuffer()
 void RfbServerManager::updateScreens()
 {
     QList<QRect> rects = d->fb->modifiedTiles();
-    QPoint currentCursorPos = QCursor::pos();
+    const QPoint currentCursorPos = d->fb->cursorPosition();
 
-    for (RfbServer* server : qAsConst(d->servers)) {
+    for (RfbServer *server : std::as_const(d->servers)) {
         server->updateScreen(rects);
         server->updateCursorPosition(currentCursorPos);
     }
 
-    //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) {
+    // 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) {
         client->update();
     }
 }
 
 void RfbServerManager::cleanup()
 {
-    //qDebug();
+    // qDebug();
 
-    //copy because d->servers is going to be modified while we delete the servers
-    const QSet<RfbServer*> servers = d->servers;
+    // copy because d->servers is going to be modified while we delete the servers
+    const QSet<RfbServer *> servers = d->servers;
     qDeleteAll(servers);
 
     Q_ASSERT(d->servers.isEmpty());
@@ -174,12 +174,12 @@ void RfbServerManager::cleanup()
     d->fb.clear();
 }
 
-void RfbServerManager::registerServer(RfbServer* server)
+void RfbServerManager::registerServer(RfbServer *server)
 {
     d->servers.insert(server);
 }
 
-void RfbServerManager::unregisterServer(RfbServer* server)
+void RfbServerManager::unregisterServer(RfbServer *server)
 {
     d->servers.remove(server);
 }
@@ -198,9 +198,9 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
             bpp = 4;
         }
 
-        //qDebug() << "bpp: " << bpp;
+        // qDebug() << "bpp: " << bpp;
 
-        rfbLogEnable(0);
+        rfbLogEnable(KRFB().isDebugEnabled());
 
         screen = rfbGetScreen(nullptr, nullptr, w, h, 8, 3, bpp);
         screen->paddedWidthInBytes = d->fb->paddedWidth();
@@ -213,12 +213,12 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
     return screen;
 }
 
-void RfbServerManager::addClient(RfbClient* cc)
+void RfbServerManager::addClient(RfbClient *cc)
 {
     if (d->clients.size() == 0) {
-        //qDebug() << "Starting framebuffer monitor";
+        // qDebug() << "Starting framebuffer monitor";
         d->fb->startMonitor();
-        d->rfbUpdateTimer.start(50);
+        d->rfbUpdateTimer.start(50ms);
     }
     d->clients.insert(cc);
 
@@ -228,11 +228,11 @@ void RfbServerManager::addClient(RfbClient* cc)
     Q_EMIT clientConnected(cc);
 }
 
-void RfbServerManager::removeClient(RfbClient* cc)
+void RfbServerManager::removeClient(RfbClient *cc)
 {
     d->clients.remove(cc);
     if (d->clients.size() == 0) {
-        //qDebug() << "Stopping framebuffer monitor";
+        // qDebug() << "Stopping framebuffer monitor";
         d->fb->stopMonitor();
         d->rfbUpdateTimer.stop();
     }

krfb/rfbservermanager.h

@@ -1,28 +1,18 @@
 /*
-    Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-    Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
+    SPDX-FileCopyrightText: 2009-2010 Collabora Ltd <info@collabora.co.uk>
+    SPDX-FileContributor: George Goldberg <george.goldberg@collabora.co.uk>
+    SPDX-FileContributor: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
+    SPDX-FileCopyrightText: 2007 Alessandro Praduroux <pradu@pradu.it>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    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 Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef RFBSERVERMANAGER_H
 #define RFBSERVERMANAGER_H
 
-#include "rfb.h"
 #include "framebuffer.h"
+#include "rfb.h"
 #include <QObject>
+#include <QVariantMap>
 
 class RfbClient;
 struct RfbServerManagerStatic;
@@ -31,10 +21,12 @@ class RfbServer;
 class RfbServerManager : public QObject
 {
     Q_OBJECT
+
 public:
     static RfbServerManager *instance();
 
     QSharedPointer<FrameBuffer> framebuffer() const;
+    static QVariantMap s_pluginArgs;
 Q_SIGNALS:
     void clientConnected(RfbClient *cc);
     void clientDisconnected(RfbClient *cc);