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

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

CMakeLists.txt

@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
-set (KDE_APPLICATIONS_VERSION_MAJOR "19")
-set (KDE_APPLICATIONS_VERSION_MINOR "08")
-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 "04")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
+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(KF5_MIN_VERSION 5.31.0)

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

@@ -4,8 +4,10 @@ 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[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
@@ -18,6 +20,7 @@ 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
@@ -27,8 +30,10 @@ 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[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
@@ -41,6 +46,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
@@ -52,6 +58,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

@@ -5,8 +5,10 @@
         "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[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",
@@ -19,6 +21,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",
@@ -31,8 +34,10 @@
         "Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per al KRfb",
         "Name[ca]": "Gestor d'esdeveniments de l'X11 per al 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",
@@ -45,6 +50,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

@@ -4,8 +4,10 @@ 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[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
@@ -18,6 +20,7 @@ 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
@@ -27,8 +30,10 @@ 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[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
@@ -41,6 +46,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
@@ -52,7 +58,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

@@ -5,8 +5,10 @@
         "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[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",
@@ -19,6 +21,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",
@@ -31,8 +34,10 @@
         "Name[ca@valencia]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb",
         "Name[ca]": "Gestor d'esdeveniments Xdg-desktop-portal per al 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",
@@ -45,6 +50,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/krfb_framebuffer_pw.json

@@ -6,8 +6,10 @@
         "Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.",
         "Description[cs]": "Framebuffer založený na Pipe pro 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.",
@@ -21,6 +23,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",
@@ -34,8 +37,10 @@
         "Name[ca]": "«Framebuffer» del PipeWire per al KRfb",
         "Name[cs]": "PipeWire Framebuffer pro 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",
@@ -49,6 +54,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,15 @@
 // 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>
 #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 +67,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 +92,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 +115,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 +183,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 +200,7 @@ PWFrameBuffer::Private::Private(PWFrameBuffer *q) : q(q)
     pwStreamEvents.state_changed = &onStreamStateChanged;
     pwStreamEvents.format_changed = &onStreamFormatChanged;
     pwStreamEvents.process = &onStreamProcess;
+#endif
 }
 
 /**
@@ -260,7 +276,7 @@ void PWFrameBuffer::Private::handleSessionCreated(quint32 &code, QVariantMap &re
     // select sources for the session
     auto selectionOptions = QVariantMap {
         // We have to specify it's an uint, otherwise xdg-desktop-portal will not forward it to backend implementation
-        { QLatin1String("types"),QVariant::fromValue<uint>(7) }, // request all (KeyBoard, Pointer, TouchScreen)
+        { QLatin1String("types"), QVariant::fromValue<uint>(7) }, // request all (KeyBoard, Pointer, TouchScreen)
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
         { QLatin1String("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) }
 #else
@@ -304,7 +320,7 @@ void PWFrameBuffer::Private::handleDevicesSelected(quint32 &code, QVariantMap &r
 
     // select sources for the session
     auto selectionOptions = QVariantMap {
-        { QLatin1String("types"), 1 }, // only MONITOR is supported
+        { QLatin1String("types"), QVariant::fromValue<uint>(1) }, // only MONITOR is supported
         { QLatin1String("multiple"), false },
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
         { QLatin1String("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) }
@@ -443,25 +459,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 +521,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 +550,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 +571,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 +595,7 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
     default:
         break;
     }
+#endif
 }
 
 /**
@@ -542,24 +604,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 +641,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 +665,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
 }
 
 /**
@@ -647,7 +714,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 +722,31 @@ 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_Id(SPA_VIDEO_FORMAT_RGBx),
+                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 +756,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 +788,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

@@ -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

@@ -381,49 +381,50 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
     // information about pixels layout
 
     if (root_visualtype) {
-        uint16_t pixelmaxValue = (1 << root_visualtype->bits_per_rgb_value) - 1;
-
 #ifdef _DEBUG
         qDebug("xcb framebuffer: Got info about root visual:\n"
                "    bits per rgb value: %d\n"
                "    red   mask: %08x\n"
                "    green mask: %08x\n"
-               "    blue  mask: %08x\n"
-               "    pixelMaxValue = %d\n",
+               "    blue  mask: %08x\n",
                (int)root_visualtype->bits_per_rgb_value,
                root_visualtype->red_mask,
                root_visualtype->green_mask,
-               root_visualtype->blue_mask,
-               (int)pixelmaxValue);
+               root_visualtype->blue_mask);
 #endif
 
         // calculate shifts
         format.redShift = 0;
-        format.redMax = pixelmaxValue;
         if (root_visualtype->red_mask) {
             while (!(root_visualtype->red_mask & (1 << format.redShift))) {
                 format.redShift++;
             }
         }
         format.greenShift = 0;
-        format.greenMax = pixelmaxValue;
         if (root_visualtype->green_mask) {
             while (!(root_visualtype->green_mask & (1 << format.greenShift))) {
                 format.greenShift++;
             }
         }
         format.blueShift = 0;
-        format.blueMax = pixelmaxValue;
         if (root_visualtype->blue_mask) {
             while (!(root_visualtype->blue_mask & (1 << format.blueShift))) {
                 format.blueShift++;
             }
         }
 
+        // calculate pixel max value.
+        // NOTE: bits_per_rgb_value is unreliable, thus should be avoided.
+        format.redMax   = root_visualtype->red_mask >> format.redShift;
+        format.greenMax = root_visualtype->green_mask >> format.greenShift;
+        format.blueMax  = root_visualtype->blue_mask >> format.blueShift;
+
 #ifdef _DEBUG
         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);
 #endif
     } else {
         // some kind of fallback (unlikely code execution will go this way)

krfb/krfb-events.desktop

@@ -7,8 +7,10 @@ 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[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
@@ -21,6 +23,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

@@ -5,8 +5,10 @@
         "Description[ca]": "Connectors d'esdeveniments per al KRfb.",
         "Description[cs]": "Moduly událostí pro 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",
@@ -19,6 +21,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

@@ -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

@@ -12,6 +12,7 @@
   <name xml:lang="el">Krfb</name>
   <name xml:lang="en-GB">Krfb</name>
   <name xml:lang="es">Krfb</name>
+  <name xml:lang="et">Krfb</name>
   <name xml:lang="eu">Krfb</name>
   <name xml:lang="fi">Krfb</name>
   <name xml:lang="fr">Krfb</name>
@@ -46,6 +47,7 @@
   <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>
@@ -80,6 +82,7 @@
     <p xml:lang="el">Η κοινή χρήση επιφάνειας εργασίας Krfb είναι μια εφαρμογή εξυπηρετητή που σας επιτρέπει να μοιράζεστε την τρέχουσα συνεδρία σας με έναν χρήστη σε άλλο μηχάνημα, ο οποίος μπορεί να χρησιμοποιεί έναν πελάτη VNC για να παρακολουθεί ή και να ελέγχει την επιφάνεια εργασίας σας.</p>
     <p xml:lang="en-GB">Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
     <p xml:lang="es">Krfb para compartir el escritorio es una aplicación de servidor que le permite compartir su sesión actual con un usuario de otra máquina, que puede usar un cliente VNC para ver e incluso controlar su escritorio.</p>
+    <p xml:lang="et">Krfb töölaua jagamine on serverirakendus, mis võimaldab jagada aktiivset seanssi mõne teise masina taga istuva kasutajaga, kes saab VNC kliendi kaudu töölauda näha või isegi juhtida.</p>
     <p xml:lang="eu">Krfb Mahaigaina Partekatzea zerbitzari aplikazio bat da zure uneko saioa beste makina batean dagoen erabiltzaile batekin partekatzen uzten dizuna. Beste makinan VNC bezeroa erabil dezake zure mahaigaina ikusi edo baita kontrolatzeko ere.</p>
     <p xml:lang="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
     <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
@@ -103,7 +106,7 @@
     <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>
+    <p xml:lang="zh-TW">Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 用戶端檢視、甚至控制您的桌面。</p>
   </description>
   <url type="homepage">https://userbase.kde.org/Krfb</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=krfb</url>
@@ -117,8 +120,10 @@
       <caption xml:lang="cs">Sdílím pracovní plochu pomocí Krfb</caption>
       <caption xml:lang="da">Deler skrivebord med Krfb</caption>
       <caption xml:lang="de">Freigabe der Arbeitsfläche mit Krfb</caption>
+      <caption xml:lang="el">Κοινή χρήση επιφάνειας εργασίας με το Krfb</caption>
       <caption xml:lang="en-GB">Sharing desktop with Krfb</caption>
       <caption xml:lang="es">Compartiendo el escritorio con Krfb</caption>
+      <caption xml:lang="et">Töölaua jagamine Krfb abil</caption>
       <caption xml:lang="eu">Mahaigaina Krfb-ren bidez partekatzea</caption>
       <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
       <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
@@ -132,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>
@@ -144,4 +150,10 @@
     <binary>krfb</binary>
   </provides>
   <project_group>KDE</project_group>
+  <releases>
+    <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="20.04.0" date="2020-04-23"/>
+  </releases>
 </component>

krfb/rfbclient.cpp

@@ -217,11 +217,11 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
         return true;
     }
 
-    char passwd[MAXPWLEN];
+    char passwd[MAXPWLEN+1]; // +1 to make sure there's a nullptr at the end
     unsigned char challenge[CHALLENGESIZE];
 
     memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE);
-    memset(passwd, 0, MAXPWLEN);
+    memset(passwd, 0, sizeof(passwd));
 
     if (!password.isEmpty()) {
         strncpy(passwd, password.constData(),