Make sure to save security settings each time they are modified

Settings that are modified using normal settings window, which is
invoked using menu "Configure Desktop Sharing..." are always saved
correctly.

However some settings that are present on Krfb main window
(normal password, unattended password, checkbox "enable unattended
access") are not handled by KConfigDialog and there is a chance that
settings might not be saved correctly (for example if application
was suddenly terminated).

This hopefully fixes some bugs which are present since year 2011-2014
and have 110 votes, like https://bugs.kde.org/show_bug.cgi?id=340411,
maybe something else.

BUG: 340411
FIXED-IN: 20.08.2
CHANGELOG: Make sure to save passwords each time they are modified

CMakeLists.txt

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
-set (KDE_APPLICATIONS_VERSION_MAJOR "19")
-set (KDE_APPLICATIONS_VERSION_MINOR "12")
-set (KDE_APPLICATIONS_VERSION_MICRO "3")
-set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+set (RELEASE_SERVICE_VERSION_MAJOR "20")
+set (RELEASE_SERVICE_VERSION_MINOR "08")
+set (RELEASE_SERVICE_VERSION_MICRO "2")
+set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-project(krfb VERSION ${KDE_APPLICATIONS_VERSION})
+project(krfb VERSION ${RELEASE_SERVICE_VERSION})
 
-set(QT_MIN_VERSION 5.6.0)
+set(QT_MIN_VERSION 5.10.0)
 set(KF5_MIN_VERSION 5.31.0)
 
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)

cmake/modules/FindPipeWire.cmake

@@ -32,7 +32,7 @@
 #=============================================================================
 # Copyright 2014 Alex Merry <alex.merry@kde.org>
 # Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
-# Copyright 2018 Jan Grulich <jgrulich@redhat.com>
+# 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
@@ -61,9 +61,11 @@
 # 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_check_modules(PKG_PipeWire QUIET libpipewire-0.2 libpipewire-0.3)
 
-set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS_OTHER}")
+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
@@ -71,13 +73,23 @@ find_path(PipeWire_INCLUDE_DIRS
         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.2 pipewire-0.3
+        pipewire-0.3
+        pipewire-0.2
     HINTS
-        ${PKG_PipeWire_LIBRARIES_DIRS}
+        ${PKG_PipeWire_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
@@ -87,6 +99,7 @@ find_package_handle_standard_args(PipeWire
     REQUIRED_VARS
         PipeWire_LIBRARIES
         PipeWire_INCLUDE_DIRS
+        Spa_INCLUDE_DIRS
     VERSION_VAR
         PipeWire_VERSION
 )
@@ -96,7 +109,7 @@ if(PipeWire_FOUND AND NOT TARGET PipeWire::PipeWire)
     set_target_properties(PipeWire::PipeWire PROPERTIES
         IMPORTED_LOCATION "${PipeWire_LIBRARIES}"
         INTERFACE_COMPILE_OPTIONS "${PipeWire_DEFINITIONS}"
-        INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS};${Spa_INCLUDE_DIRS}"
     )
 endif()
 
@@ -104,6 +117,6 @@ mark_as_advanced(PipeWire_LIBRARIES PipeWire_INCLUDE_DIRS)
 
 include(FeatureSummary)
 set_package_properties(PipeWire PROPERTIES
-    URL "http://www.pipewire.org"
+    URL "https://www.pipewire.org"
     DESCRIPTION "PipeWire - multimedia processing"
 )

events/x11/krfb_events_x11.desktop

@@ -1,8 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=X11 XFakeInput based event handler for KRfb
-Comment[ca]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
-Comment[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
+Comment[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
@@ -20,14 +21,16 @@ 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 el XFakeInput de l'X11 per al KRfb
-Name[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb
+Name[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
@@ -45,6 +48,7 @@ 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
@@ -56,6 +60,6 @@ ServiceTypes=krfb/events
 X-KDE-Library=krfb_events_x11
 X-KDE-PluginInfo-Name=x11
 X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-Website=https://www.kde.org
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true

events/x11/krfb_events_x11.json

@@ -2,8 +2,9 @@
     "Encoding": "UTF-8",
     "KPlugin": {
         "Description": "X11 XFakeInput based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb",
-        "Description[ca]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb",
+        "Description[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",
@@ -21,6 +22,7 @@
         "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",
@@ -32,6 +34,7 @@
         "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",
@@ -41,7 +44,6 @@
         "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä",
         "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb",
         "Name[gl]": "Xestor de eventos de X11 para KRfb",
-        "Name[ia]": "Gerente de evento de  X11 per KRfb",
         "Name[it]": "Gestore eventi X11 per KRfb",
         "Name[ko]": "KRfb X11 이벤트 핸들러",
         "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb",
@@ -50,6 +52,7 @@
         "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",

events/xdp/krfb_events_xdp.desktop

@@ -1,8 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Xdg-desktop-portal based event handler for KRfb
-Comment[ca]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
-Comment[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb
+Comment[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
@@ -20,14 +21,16 @@ 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 el Xdg-desktop-portal per al KRfb
-Name[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al 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
@@ -45,6 +48,7 @@ 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
@@ -56,7 +60,7 @@ ServiceTypes=krfb/events
 X-KDE-Library=krfb_events_xdp
 X-KDE-PluginInfo-Name=xdp
 X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-Website=https://www.kde.org
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 

events/xdp/krfb_events_xdp.json

@@ -2,8 +2,9 @@
     "Encoding": "UTF-8",
     "KPlugin": {
         "Description": "Xdg-desktop-portal based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb",
-        "Description[ca]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb",
+        "Description[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",
@@ -21,6 +22,7 @@
         "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",
@@ -30,8 +32,9 @@
         "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[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",
@@ -49,6 +52,7 @@
         "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",

framebuffers/pipewire/CMakeLists.txt

@@ -24,6 +24,12 @@ add_library(krfb_framebuffer_pw
     ${krfb_framebuffer_pw_SRCS}
 )
 
+
+check_include_file("linux/dma-buf.h" HAVE_LINUX_DMABUF_H)
+if (HAVE_LINUX_DMABUF_H)
+    target_compile_definitions(krfb_framebuffer_pw PRIVATE -DHAVE_LINUX_DMABUF_H)
+endif ()
+
 target_link_libraries (krfb_framebuffer_pw
                        Qt5::Core
                        Qt5::Gui

framebuffers/pipewire/krfb_framebuffer_pw.json

@@ -2,9 +2,10 @@
     "Encoding": "UTF-8",
     "KPlugin": {
         "Description": "PipeWire based Framebuffer for KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en el PipeWire per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.",
+        "Description[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.",
@@ -14,7 +15,6 @@
         "Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.",
         "Description[fr]": "Tampon d'images utilisant PipeWire pour KRfb.",
         "Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.",
-        "Description[ia]": "Framebuffer basate sur PipeWire per KRfb",
         "Description[it]": "Framebuffer basato su PipeWire per KRfb.",
         "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.",
         "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.",
@@ -24,6 +24,7 @@
         "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",
@@ -33,9 +34,10 @@
         "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[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",
@@ -45,7 +47,6 @@
         "Name[fi]": "KRfb:n PipeWire-kehyspuskuri",
         "Name[fr]": "Tampon d'images PipeWire pour KRfb",
         "Name[gl]": "Búfer de fotograma de PipeWire para KRfb",
-        "Name[ia]": "Framebuffer basate sur PipeWire per KRfb",
         "Name[it]": "Framebuffer PipeWire per KRfb",
         "Name[ko]": "KRfb용 PipeWire 프레임버퍼",
         "Name[nl]": "PipeWire-framebuffer voor KRfb",
@@ -55,6 +56,7 @@
         "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",

framebuffers/pipewire/pw_framebuffer.cpp

@@ -26,19 +26,19 @@
 // pipewire
 #include <pipewire/version.h>
 
-#if !PW_CHECK_VERSION(0, 2, 9)
-#include <spa/support/type-map.h>
-#include <spa/param/format-utils.h>
-#include <spa/param/video/format-utils.h>
-#include <spa/param/video/raw-utils.h>
+#if PW_CHECK_VERSION(0, 2, 90)
+#include <spa/utils/result.h>
+#ifdef HAVE_LINUX_DMABUF_H
+#include <linux/dma-buf.h>
 #endif
+#include <sys/ioctl.h>
+#endif
+
+#include <spa/param/format-utils.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/param/props.h>
 
-#include <pipewire/factory.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/remote.h>
-#include <pipewire/stream.h>
 
 #include <limits.h>
 
@@ -71,7 +71,7 @@ const QDBusArgument &operator >> (const QDBusArgument &arg, PWFrameBuffer::Strea
     return arg;
 }
 
-#if !PW_CHECK_VERSION(0, 2, 9)
+#if !PW_CHECK_VERSION(0, 2, 90)
 /**
  * @brief The PwType class - helper class to contain pointers to raw C pipewire media mappings
  */
@@ -96,14 +96,19 @@ public:
 private:
     friend class PWFrameBuffer;
 
+#if PW_CHECK_VERSION(0, 2, 90)
+    static void onCoreError(void *data, uint32_t id, int seq, int res, const char *message);
+    static void onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format);
+#else
     static void onStateChanged(void *data, pw_remote_state old, pw_remote_state state, const char *error);
-    static void onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message);
     static void onStreamFormatChanged(void *data, const struct spa_pod *format);
+#endif
+    static void onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message);
     static void onStreamProcess(void *data);
 
     void initDbus();
     void initPw();
-#if !PW_CHECK_VERSION(0, 2, 9)
+#if !PW_CHECK_VERSION(0, 2, 90)
     void initializePwTypes();
 #endif
 
@@ -114,40 +119,45 @@ private:
     void handleRemoteDesktopStarted(quint32 &code, QVariantMap &results);
 
     // pw handling
-    void createReceivingStream();
+    pw_stream *createReceivingStream();
     void handleFrame(pw_buffer *pwBuffer);
 
     // link to public interface
     PWFrameBuffer *q;
 
     // pipewire stuff
-#if PW_CHECK_VERSION(0, 2, 9)
+#if PW_CHECK_VERSION(0, 2, 90)
+    struct pw_context *pwContext = nullptr;
     struct pw_core *pwCore = nullptr;
-    struct pw_loop *pwLoop = nullptr;
     struct pw_stream *pwStream = nullptr;
-    struct pw_remote *pwRemote = nullptr;
     struct pw_thread_loop *pwMainLoop = nullptr;
+
+    // wayland-like listeners
+    // ...of events that happen in pipewire server
+    spa_hook coreListener = {};
+    spa_hook streamListener = {};
+
+    // event handlers
+    pw_core_events pwCoreEvents = {};
+    pw_stream_events pwStreamEvents = {};
 #else
     pw_core *pwCore = nullptr;
     pw_loop *pwLoop = nullptr;
+    pw_thread_loop *pwMainLoop = nullptr;
     pw_stream *pwStream = nullptr;
     pw_remote *pwRemote = nullptr;
-    pw_thread_loop *pwMainLoop = nullptr;
     pw_type *pwCoreType = nullptr;
     PwType *pwType = nullptr;
-#endif
 
-    uint pwStreamNodeId = 0;
+    spa_hook remoteListener = {};
+    spa_hook streamListener = {};
 
     // event handlers
     pw_remote_events pwRemoteEvents = {};
     pw_stream_events pwStreamEvents = {};
+#endif
 
-    // wayland-like listeners
-    // ...of events that happen in pipewire server
-    spa_hook remoteListener = {};
-    // ...of events that happen with the stream we consume
-    spa_hook streamListener = {};
+    uint pwStreamNodeId = 0;
 
     // negotiated video format
     spa_video_info_raw *videoFormat = nullptr;
@@ -177,6 +187,15 @@ private:
 
 PWFrameBuffer::Private::Private(PWFrameBuffer *q) : q(q)
 {
+#if PW_CHECK_VERSION(0, 2, 90)
+    pwCoreEvents.version = PW_VERSION_CORE_EVENTS;
+    pwCoreEvents.error = &onCoreError;
+
+    pwStreamEvents.version = PW_VERSION_STREAM_EVENTS;
+    pwStreamEvents.state_changed = &onStreamStateChanged;
+    pwStreamEvents.param_changed = &onStreamParamChanged;
+    pwStreamEvents.process = &onStreamProcess;
+#else
     // initialize event handlers, remote end and stream-related
     pwRemoteEvents.version = PW_VERSION_REMOTE_EVENTS;
     pwRemoteEvents.state_changed = &onStateChanged;
@@ -185,6 +204,7 @@ PWFrameBuffer::Private::Private(PWFrameBuffer *q) : q(q)
     pwStreamEvents.state_changed = &onStreamStateChanged;
     pwStreamEvents.format_changed = &onStreamFormatChanged;
     pwStreamEvents.process = &onStreamProcess;
+#endif
 }
 
 /**
@@ -443,25 +463,43 @@ void PWFrameBuffer::Private::initPw() {
     // init pipewire (required)
     pw_init(nullptr, nullptr); // args are not used anyways
 
+#if PW_CHECK_VERSION(0, 2, 90)
+    pwMainLoop = pw_thread_loop_new("pipewire-main-loop", nullptr);
+    pwContext = pw_context_new(pw_thread_loop_get_loop(pwMainLoop), nullptr, 0);
+    if (!pwContext) {
+        qWarning() << "Failed to create PipeWire context";
+        return;
+    }
+
+    pwCore = pw_context_connect(pwContext, nullptr, 0);
+    if (!pwCore) {
+        qWarning() << "Failed to connect PipeWire context";
+        return;
+    }
+
+    pw_core_add_listener(pwCore, &coreListener, &pwCoreEvents, this);
+
+    pwStream = createReceivingStream();
+    if (!pwStream) {
+        qWarning() << "Failed to create PipeWire stream";
+        return;
+    }
+#else
     // initialize our source
     pwLoop = pw_loop_new(nullptr);
     pwMainLoop = pw_thread_loop_new(pwLoop, "pipewire-main-loop");
-
     // create PipeWire core object (required)
     pwCore = pw_core_new(pwLoop, nullptr);
-#if !PW_CHECK_VERSION(0, 2, 9)
     pwCoreType = pw_core_get_type(pwCore);
 
-    // init type maps
     initializePwTypes();
-#endif
 
     // pw_remote should be initialized before type maps or connection error will happen
     pwRemote = pw_remote_new(pwCore, nullptr, 0);
-
     // init PipeWire remote, add listener to handle events
     pw_remote_add_listener(pwRemote, &remoteListener, &pwRemoteEvents, this);
     pw_remote_connect_fd(pwRemote, pipewireFd.fileDescriptor());
+#endif
 
     if (pw_thread_loop_start(pwMainLoop) < 0) {
         qWarning() << "Failed to start main PipeWire loop";
@@ -487,6 +525,18 @@ void PWFrameBuffer::Private::initializePwTypes()
 }
 #endif
 
+
+#if PW_CHECK_VERSION(0, 2, 90)
+void PWFrameBuffer::Private::onCoreError(void *data, uint32_t id, int seq, int res, const char *message)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(id);
+    Q_UNUSED(seq);
+    Q_UNUSED(res);
+
+    qInfo() << "core error: " << message;
+}
+#else
 /**
  * @brief PWFrameBuffer::Private::onStateChanged - global state tracking for pipewire connection
  * @param data pointer that you have set in pw_remote_add_listener call's last argument
@@ -504,13 +554,14 @@ void PWFrameBuffer::Private::onStateChanged(void *data, pw_remote_state /*old*/,
         qWarning() << "remote error: " << error;
         break;
     case PW_REMOTE_STATE_CONNECTED:
-        d->createReceivingStream();
+        d->pwStream = d->createReceivingStream();
         break;
     default:
         qInfo() << "remote state: " << pw_remote_state_as_string(state);
         break;
     }
 }
+#endif
 
 /**
  * @brief PWFrameBuffer::Private::onStreamStateChanged - called whenever stream state changes on pipewire server
@@ -524,6 +575,20 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
 
     auto *d = static_cast<PWFrameBuffer::Private *>(data);
 
+#if PW_CHECK_VERSION(0, 2, 90)
+    switch (state) {
+    case PW_STREAM_STATE_ERROR:
+        qWarning() << "pipewire stream error: " << error_message;
+        break;
+    case PW_STREAM_STATE_PAUSED:
+            pw_stream_set_active(d->pwStream, true);
+        break;
+    case PW_STREAM_STATE_STREAMING:
+    case PW_STREAM_STATE_UNCONNECTED:
+    case PW_STREAM_STATE_CONNECTING:
+        break;
+    }
+#else
     switch (state) {
     case PW_STREAM_STATE_ERROR:
         qWarning() << "pipewire stream error: " << error_message;
@@ -534,6 +599,7 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
     default:
         break;
     }
+#endif
 }
 
 /**
@@ -542,24 +608,28 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
  * @param data pointer that you have set in pw_stream_add_listener call's last argument
  * @param format format that's being proposed
  */
-#if defined(PW_API_PRE_0_2_0)
-void PWFrameBuffer::Private::onStreamFormatChanged(void *data, struct spa_pod *format)
+#if PW_CHECK_VERSION(0, 2, 90)
+void PWFrameBuffer::Private::onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format)
 #else
 void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_pod *format)
-#endif // defined(PW_API_PRE_0_2_0)
+#endif
 {
     qInfo() << "Stream format changed";
     auto *d = static_cast<PWFrameBuffer::Private *>(data);
 
     const int bpp = 4;
 
+#if PW_CHECK_VERSION(0, 2, 90)
+    if (!format || id != SPA_PARAM_Format) {
+#else
     if (!format) {
         pw_stream_finish_format(d->pwStream, 0, nullptr, 0);
+#endif
         return;
     }
 
     d->videoFormat = new spa_video_info_raw();
-#if PW_CHECK_VERSION(0, 2, 9)
+#if PW_CHECK_VERSION(0, 2, 90)
     spa_format_video_raw_parse(format, d->videoFormat);
 #else
     spa_format_video_raw_parse(format, d->videoFormat, &d->pwType->format_video);
@@ -575,17 +645,19 @@ void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_
     // setup buffers and meta header for new format
     const struct spa_pod *params[2];
 
-#if PW_CHECK_VERSION(0, 2, 9)
+#if PW_CHECK_VERSION(0, 2, 90)
     params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
                 SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
-                ":", SPA_PARAM_BUFFERS_size, "i", size,
-                ":", SPA_PARAM_BUFFERS_stride, "i", stride,
-                ":", SPA_PARAM_BUFFERS_buffers, "?ri", SPA_CHOICE_RANGE(8, 1, 32),
-                ":", SPA_PARAM_BUFFERS_align, "i", 16));
+                SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
+                SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
+                SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32),
+                SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(1),
+                SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)));
     params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
                 SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-                ":", SPA_PARAM_META_type, "I", SPA_META_Header,
-                ":", SPA_PARAM_META_size, "i", sizeof(struct spa_meta_header)));
+                SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
+                SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
+    pw_stream_update_params(d->pwStream, params, 2);
 #else
     params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_object(&builder,
                 d->pwCoreType->param.idBuffers, d->pwCoreType->param_buffers.Buffers,
@@ -597,9 +669,8 @@ void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_
                 d->pwCoreType->param.idMeta, d->pwCoreType->param_meta.Meta,
                 ":", d->pwCoreType->param_meta.type, "I", d->pwCoreType->meta.Header,
                 ":", d->pwCoreType->param_meta.size, "i", sizeof(struct spa_meta_header)));
-#endif
-
     pw_stream_finish_format(d->pwStream, 0, params, 2);
+#endif
 }
 
 /**
@@ -621,18 +692,85 @@ void PWFrameBuffer::Private::onStreamProcess(void *data)
     pw_stream_queue_buffer(d->pwStream, buf);
 }
 
+#if PW_CHECK_VERSION(0, 2, 90) && defined(HAVE_LINUX_DMABUF_H)
+static void syncDmaBuf(int fd, uint64_t start_or_end)
+{
+    struct dma_buf_sync sync = { 0 };
+    sync.flags = start_or_end | DMA_BUF_SYNC_READ;
+
+    while(true) {
+        int ret;
+        ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
+        if (ret == -1 && errno == EINTR) {
+            continue;
+        } else if (ret == -1) {
+            qWarning() << "Failed to synchronize DMA buffer: " << strerror(errno);
+            break;
+        } else {
+            break;
+        }
+    }
+}
+#endif
+
 void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
 {
     auto *spaBuffer = pwBuffer->buffer;
-    void *src = nullptr;
-
-    src = spaBuffer->datas[0].data;
+    void *src = spaBuffer->datas[0].data;
     if (!src) {
+        qDebug() << "discarding null buffer";
         return;
     }
 
-    quint32 maxSize = spaBuffer->datas[0].maxsize;
-    qint32 srcStride = spaBuffer->datas[0].chunk->stride;
+#if PW_CHECK_VERSION(0, 2, 90)
+    if (spaBuffer->datas->type != SPA_DATA_DmaBuf) {
+        qDebug() << "discarding null buffer";
+        return;
+    }
+#endif
+
+    const quint32 maxSize = spaBuffer->datas[0].maxsize;
+
+    std::function<void()> cleanup;
+#if PW_CHECK_VERSION(0, 2, 90)
+#ifdef HAVE_LINUX_DMABUF_H
+    if (spaBuffer->datas->type == SPA_DATA_DmaBuf) {
+        const int fd = spaBuffer->datas[0].fd;
+        auto map = mmap(
+            nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
+            PROT_READ, MAP_PRIVATE, fd, 0);
+        if (map == MAP_FAILED) {
+            qWarning() << "Failed to mmap the dmabuf: " << strerror(errno);
+            return;
+        }
+
+        syncDmaBuf(fd, DMA_BUF_SYNC_START);
+        src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
+
+        cleanup = [map, spaBuffer, fd] {
+            syncDmaBuf(fd, DMA_BUF_SYNC_END);
+            munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
+        };
+    } else
+#endif
+    if (spaBuffer->datas->type == SPA_DATA_MemFd) {
+        uint8_t *map = static_cast<uint8_t*>(mmap(
+            nullptr, spaBuffer->datas->maxsize + spaBuffer->datas->mapoffset,
+            PROT_READ, MAP_PRIVATE, spaBuffer->datas->fd, 0));
+
+        if (map == MAP_FAILED) {
+            qWarning() << "Failed to mmap the memory: " << strerror(errno);
+            return;
+        }
+        src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
+
+        cleanup = [map, spaBuffer] {
+            munmap(map, spaBuffer->datas->maxsize + spaBuffer->datas->mapoffset);
+        };
+    }
+#endif
+
+    const qint32 srcStride = spaBuffer->datas[0].chunk->stride;
     if (srcStride != q->paddedWidth()) {
         qWarning() << "Got buffer with stride different from screen stride" << srcStride << "!=" << q->paddedWidth();
         return;
@@ -640,6 +778,18 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
 
     q->tiles.append(QRect(0, 0, q->width(), q->height()));
     std::memcpy(q->fb, src, maxSize);
+    cleanup();
+
+#if PW_CHECK_VERSION(0, 2, 90)
+    if (videoFormat->format != SPA_VIDEO_FORMAT_RGB) {
+        const QImage::Format format = videoFormat->format == SPA_VIDEO_FORMAT_BGR  ? QImage::Format_BGR888
+                                    : videoFormat->format == SPA_VIDEO_FORMAT_RGBx ? QImage::Format_RGBX8888
+                                                                                   : QImage::Format_RGB32;
+
+        QImage img((uchar*) q->fb, videoFormat->size.width, videoFormat->size.height, spaBuffer->datas->chunk->stride, format);
+        img.convertTo(QImage::Format_RGB888);
+    }
+#endif
 }
 
 /**
@@ -647,7 +797,7 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
  *        and copy the framebuffer to the existing image that we track. The state of the stream and configuration
  *        are later handled by the corresponding listener.
  */
-void PWFrameBuffer::Private::createReceivingStream()
+pw_stream *PWFrameBuffer::Private::createReceivingStream()
 {
     spa_rectangle pwMinScreenBounds = SPA_RECTANGLE(1, 1);
     spa_rectangle pwMaxScreenBounds = SPA_RECTANGLE(screenGeometry.width, screenGeometry.height);
@@ -655,22 +805,34 @@ void PWFrameBuffer::Private::createReceivingStream()
     spa_fraction pwFramerateMin = SPA_FRACTION(0, 1);
     spa_fraction pwFramerateMax = SPA_FRACTION(60, 1);
 
-    auto reuseProps = pw_properties_new("pipewire.client.reuse", "1", nullptr); // null marks end of varargs
-    pwStream = pw_stream_new(pwRemote, "krfb-fb-consume-stream", reuseProps);
+#if PW_CHECK_VERSION(0, 2, 90)
+    auto stream = pw_stream_new_simple(pw_thread_loop_get_loop(pwMainLoop), "krfb-fb-consume-stream",
+                                       pw_properties_new(PW_KEY_MEDIA_TYPE, "Video",
+                                                         PW_KEY_MEDIA_CATEGORY, "Capture",
+                                                         PW_KEY_MEDIA_ROLE, "Screen",
+                                                         nullptr),
+                                       &pwStreamEvents, this);
 
+#else
+    auto reuseProps = pw_properties_new("pipewire.client.reuse", "1", nullptr); // null marks end of varargs
+    auto stream = pw_stream_new(pwRemote, "krfb-fb-consume-stream", reuseProps);
+#endif
     uint8_t buffer[1024] = {};
     const spa_pod *params[1];
     auto builder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
 
-#if PW_CHECK_VERSION(0, 2, 9)
+#if PW_CHECK_VERSION(0, 2, 90)
     params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
                 SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-                ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_video,
-                ":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_raw,
-                ":", SPA_FORMAT_VIDEO_format, "I", SPA_VIDEO_FORMAT_RGBx,
-                ":", SPA_FORMAT_VIDEO_size, "?rR", SPA_CHOICE_RANGE(&pwMaxScreenBounds, &pwMinScreenBounds, &pwMaxScreenBounds),
-                ":", SPA_FORMAT_VIDEO_framerate, "F", &pwFramerateMin,
-                ":", SPA_FORMAT_VIDEO_maxFramerate, "?rF", SPA_CHOICE_RANGE(&pwFramerateMax, &pwFramerateMin, &pwFramerateMax)));
+                SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
+                SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
+                SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(6,
+                                                    SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
+                                                    SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA,
+                                                    SPA_VIDEO_FORMAT_RGB, SPA_VIDEO_FORMAT_BGR),
+                SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMaxScreenBounds, &pwMinScreenBounds, &pwMaxScreenBounds),
+                SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&pwFramerateMin),
+                SPA_FORMAT_VIDEO_maxFramerate, SPA_POD_CHOICE_RANGE_Fraction(&pwFramerateMax, &pwFramerateMin, &pwFramerateMax)));
 #else
     params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_object(&builder,
                 pwCoreType->param.idEnumFormat, pwCoreType->spa_format,
@@ -680,18 +842,20 @@ void PWFrameBuffer::Private::createReceivingStream()
                 ":", pwType->format_video.size, "Rru", &pwMaxScreenBounds, SPA_POD_PROP_MIN_MAX(&pwMinScreenBounds, &pwMaxScreenBounds),
                 ":", pwType->format_video.framerate, "F", &pwFramerateMin,
                 ":", pwType->format_video.max_framerate, "Fru", &pwFramerateMax, 2, &pwFramerateMin, &pwFramerateMax));
+    pw_stream_add_listener(stream, &streamListener, &pwStreamEvents, this);
 #endif
 
-    pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this);
     auto flags = static_cast<pw_stream_flags>(PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE | PW_STREAM_FLAG_MAP_BUFFERS);
-#if PW_CHECK_VERSION(0, 2, 9)
-    if (pw_stream_connect(pwStream, PW_DIRECTION_INPUT, pwStreamNodeId, flags, params, 1) != 0) {
+#if PW_CHECK_VERSION(0, 2, 90)
+    if (pw_stream_connect(stream, PW_DIRECTION_INPUT, PW_ID_ANY, flags, params, 1) != 0) {
 #else
-    if (pw_stream_connect(pwStream, PW_DIRECTION_INPUT, nullptr, flags, params, 1) != 0) {
+    if (pw_stream_connect(stream, PW_DIRECTION_INPUT, nullptr, flags, params, 1) != 0) {
 #endif
         qWarning() << "Could not connect receiving stream";
         isValid = false;
     }
+
+    return stream;
 }
 
 PWFrameBuffer::Private::~Private()
@@ -710,20 +874,36 @@ PWFrameBuffer::Private::~Private()
         pw_stream_destroy(pwStream);
     }
 
+#if !PW_CHECK_VERSION(0, 2, 90)
     if (pwRemote) {
         pw_remote_destroy(pwRemote);
     }
+#endif
 
-    if (pwCore)
+#if PW_CHECK_VERSION(0, 2, 90)
+    if (pwCore) {
+        pw_core_disconnect(pwCore);
+    }
+
+    if (pwContext) {
+        pw_context_destroy(pwContext);
+    }
+#else
+    if (pwCore) {
         pw_core_destroy(pwCore);
+    }
+#endif
 
     if (pwMainLoop) {
         pw_thread_loop_destroy(pwMainLoop);
     }
 
+#if !PW_CHECK_VERSION(0, 2, 90)
     if (pwLoop) {
+        pw_loop_leave(pwLoop);
         pw_loop_destroy(pwLoop);
     }
+#endif
 }
 
 PWFrameBuffer::PWFrameBuffer(WId winid, QObject *parent)

framebuffers/pipewire/pw_framebuffer.h

@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
    Copyright (C) 2018 Oleg Chernovskiy <kanedias@xaker.ru>
-   Copyright (C) 2018 Jan Grulich <jgrulich@redhat.com>
+   Copyright (C) 2018-2020 Jan Grulich <jgrulich@redhat.com>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public

framebuffers/qt/krfb_framebuffer_qt.json

@@ -25,7 +25,7 @@
         "Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.",
         "Description[ru]": "Буфер кадров для KRfb на базе Qt",
         "Description[sk]": "Framebuffer založený na Qt pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na Qt",
+        "Description[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",
@@ -64,7 +64,7 @@
         "Name[pt_BR]": "Framebuffer do Qt para o KRfb",
         "Name[ru]": "Буфер кадров Qt для KRfb",
         "Name[sk]": "Qt Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik Qt za KRfb",
+        "Name[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",

framebuffers/xcb/krfb_framebuffer_xcb.json

@@ -1,8 +1,8 @@
 {
     "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[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.",
@@ -25,7 +25,7 @@
         "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.",
         "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm",
         "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na X11 XDamage/XShm",
+        "Description[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.",
@@ -64,7 +64,7 @@
         "Name[pt_BR]": "Framebuffer do X11 para o KRfb",
         "Name[ru]": "Буфер кадров X11 для KRfb",
         "Name[sk]": "X11 Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik X11 za KRfb",
+        "Name[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.",

framebuffers/xcb/xcb_framebuffer.cpp

@@ -163,11 +163,14 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
 
     QScreen *primaryScreen = QGuiApplication::primaryScreen();
     if (primaryScreen) {
+        qreal scaleFactor = primaryScreen->devicePixelRatio();
+        d->area = { primaryScreen->geometry().topLeft() * scaleFactor,
+                    primaryScreen->geometry().bottomRight() * scaleFactor };
         qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
                  << ", geometry: " << primaryScreen->geometry()
+                 << ", device scaling: " << scaleFactor
+                 << ", native size: " << d->area
                  << ", depth: " << primaryScreen->depth();
-        //
-        d->area = primaryScreen->geometry();
     } else {
         qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
         return;

krfb/framebuffermanager.cpp

@@ -89,7 +89,7 @@ void FrameBufferManager::loadPlugins()
             m_plugins.insert(data.pluginId(), plugin);
             qDebug() << "Loaded plugin with name " << data.pluginId();
         } else {
-            qDebug() << "unable to load pluign for " << data.fileName();
+            qDebug() << "unable to load plugin for " << data.fileName();
         }
         unique.insert (data.name());
     }

krfb/invitationsrfbserver.cpp

@@ -26,16 +26,19 @@
 #include <QApplication>
 #include <QHostInfo>
 #include <QDebug>
+#include <QRandomGenerator>
 
 #include <KLocalizedString>
 #include <KUser>
-#include <KRandom>
 #include <KStringHandler>
 #include <KWallet/KWallet>
 
 #include <dnssd/publicservice.h>
 using KWallet::Wallet;
 
+// used for KWallet folder name
+static const QString s_krfbFolderName(QStringLiteral("krfb"));
+
 //static
 InvitationsRfbServer *InvitationsRfbServer::instance;
 
@@ -69,6 +72,9 @@ const QString& InvitationsRfbServer::desktopPassword() const
 void InvitationsRfbServer::setDesktopPassword(const QString& password)
 {
     m_desktopPassword = password;
+    // this is called from GUI every time desktop password is edited.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 const QString& InvitationsRfbServer::unattendedPassword() const
@@ -79,6 +85,9 @@ const QString& InvitationsRfbServer::unattendedPassword() const
 void InvitationsRfbServer::setUnattendedPassword(const QString& password)
 {
     m_unattendedPassword = password;
+    // this is called from GUI every time unattended password is edited.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 bool InvitationsRfbServer::allowUnattendedAccess() const
@@ -106,6 +115,9 @@ void InvitationsRfbServer::stop()
 void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
 {
     m_allowUnattendedAccess = allow;
+    // this is called from GUI every time unattended access is toggled.
+    // make sure we save settings immediately each time
+    saveSecuritySettings();
 }
 
 InvitationsRfbServer::InvitationsRfbServer()
@@ -120,19 +132,11 @@ InvitationsRfbServer::InvitationsRfbServer()
 InvitationsRfbServer::~InvitationsRfbServer()
 {
     InvitationsRfbServer::stop();  // calling virtual funcs in destructor is bad
-
-    KConfigGroup krfbConfig(KSharedConfig::openConfig(), "Security");
-    krfbConfig.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
-
+    saveSecuritySettings();
+    // ^^ also saves passwords in kwallet,
+    //    do it before closing kwallet
     if (!KrfbConfig::noWallet() && m_wallet) {
         closeKWallet();
-    } else {
-        krfbConfig.writeEntry("desktopPassword",
-                KStringHandler::obscure(m_desktopPassword));
-        krfbConfig.writeEntry("unattendedPassword",
-                KStringHandler::obscure(m_unattendedPassword));
-        krfbConfig.writeEntry("allowUnattendedAccess",
-                m_allowUnattendedAccess);
     }
 }
 
@@ -153,13 +157,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,18 +167,15 @@ void InvitationsRfbServer::walletOpened(bool opened)
     QString desktopPassword;
     QString unattendedPassword;
     Q_ASSERT(m_wallet);
-    const QString krfbFolderName = QStringLiteral("krfb");
-    if( opened &&
-            ( m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName) ) &&
-            m_wallet->setFolder(krfbFolderName) ) {
 
-        if(m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword)==0 &&
+    if (opened && m_wallet->hasFolder(s_krfbFolderName) && m_wallet->setFolder(s_krfbFolderName) ) {
+        if (m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword) == 0 &&
                 !desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
             emit passwordChanged(m_desktopPassword);
         }
 
-        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword)==0 &&
+        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword) == 0 &&
                 !unattendedPassword.isEmpty()) {
             m_unattendedPassword = unattendedPassword;
         }
@@ -213,7 +207,7 @@ QString InvitationsRfbServer::readableRandomString(int length)
 {
     QString str;
     while (length) {
-        int r = KRandom::random() % 62;
+        int r = QRandomGenerator::global()->bounded(62);
         r += 48;
         if (r > 57) {
             r += 7;
@@ -236,3 +230,31 @@ QString InvitationsRfbServer::readableRandomString(int length)
     }
     return str;
 }
+
+// one place to deal with all security configuration
+void InvitationsRfbServer::saveSecuritySettings()
+{
+    KConfigGroup secConfigGroup(KSharedConfig::openConfig(), "Security");
+    secConfigGroup.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
+    if (KrfbConfig::noWallet()) {
+        // save passwords in config file only if not using kwallet integration
+        secConfigGroup.writeEntry("desktopPassword", KStringHandler::obscure(m_desktopPassword));
+        secConfigGroup.writeEntry("unattendedPassword", KStringHandler::obscure(m_unattendedPassword));
+    } else {
+        // using KWallet, erase possibly stored passwords from krfbrc file
+        secConfigGroup.deleteEntry("desktopPassword");
+        secConfigGroup.deleteEntry("unattendedPassword");
+        // update passwords in kwallet
+        if (m_wallet && m_wallet->isOpen()) {
+            if (!m_wallet->hasFolder(s_krfbFolderName)) {
+                m_wallet->createFolder(s_krfbFolderName);
+            }
+            if (m_wallet->currentFolder() != s_krfbFolderName) {
+                m_wallet->setFolder(s_krfbFolderName);
+            }
+            m_wallet->writePassword(QStringLiteral("desktopSharingPassword"), m_desktopPassword);
+            m_wallet->writePassword(QStringLiteral("unattendedAccessPassword"), m_unattendedPassword);
+        }
+    }
+    KrfbConfig::self()->save();
+}

krfb/invitationsrfbserver.h

@@ -52,6 +52,7 @@ public Q_SLOTS:
     void toggleUnattendedAccess(bool allow);
     void openKWallet();
     void closeKWallet();
+    void saveSecuritySettings();
 
 protected:
     InvitationsRfbServer();

krfb/krfb-events.desktop

@@ -6,6 +6,7 @@ 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
@@ -15,7 +16,6 @@ Comment[eu]=KRfb-rako gertaeren pluginak
 Comment[fi]=KRfb:n tapahtumaliitännäinen
 Comment[fr]=Modules externes d'événements pour Krfb
 Comment[gl]=Complementos de eventos para KRfb
-Comment[ia]=Plug-ins de evento per KRfb
 Comment[it]=Estensioni degli eventi per KRfb
 Comment[ko]=KRfb 이벤트 플러그인
 Comment[nl]=Plug-ins voor gebeurtenis voor KRfb
@@ -24,6 +24,7 @@ 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

krfb/krfb-events.json

@@ -4,6 +4,7 @@
         "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",
@@ -13,7 +14,6 @@
         "Description[fi]": "KRfb:n tapahtumaliitännäinen",
         "Description[fr]": "Modules externes d'évènements pour KRfb",
         "Description[gl]": "Complementos de eventos para KRfb",
-        "Description[ia]": "Plug-ins de eventos per KRfb",
         "Description[it]": "Estensioni degli eventi per KRfb",
         "Description[ko]": "KRfb 이벤트 플러그인",
         "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb",
@@ -22,6 +22,7 @@
         "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",

krfb/krfb-framebuffer.json

@@ -25,7 +25,7 @@
         "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
         "Description[ru]": "Модули буфера кадров для KRfb",
         "Description[sk]": "Frame Buffer modul pre KRfb",
-        "Description[sl]": "Vstavki slikovnih medpomnilnikov za KRfb",
+        "Description[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",

krfb/krfb.notifyrc

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

krfb/org.kde.krfb.appdata.xml

@@ -75,8 +75,8 @@
   <summary xml:lang="zh-TW">桌面分享</summary>
   <description>
     <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
-    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
-    <p xml:lang="ca-valencia">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
+    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
+    <p xml:lang="ca-valencia">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="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>
@@ -137,6 +137,7 @@
       <caption xml:lang="pt-BR">Compartilhando a área de trabalho com o Krfb</caption>
       <caption xml:lang="ru">Общий доступ к рабочему столу с использованием Krfb</caption>
       <caption xml:lang="sk">Zdieľanie pracovnej plochy s Krfb</caption>
+      <caption xml:lang="sl">Deljenje namizij s Krfb</caption>
       <caption xml:lang="sv">Dela skrivbord med Krfb</caption>
       <caption xml:lang="uk">Спільне використання стільниці за допомогою Krfb</caption>
       <caption xml:lang="x-test">xxSharing desktop with Krfbxx</caption>
@@ -150,9 +151,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <release version="19.12.3" date="2020-03-05"/>
-    <release version="19.12.2" date="2020-02-06"/>
-    <release version="19.12.1" date="2020-01-09"/>
-    <release version="19.12.0" date="2019-12-12"/>
+    <release version="20.08.2" date="2020-10-08"/>
+    <release version="20.08.1" date="2020-09-03"/>
+    <release version="20.08.0" date="2020-08-13"/>
+    <release version="20.04.3" date="2020-07-09"/>
   </releases>
 </component>