GIT_SILENT made messages (after extraction)

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

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "20")
 set (RELEASE_SERVICE_VERSION_MINOR "08")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})

events/x11/krfb_events_x11.json

@@ -44,6 +44,7 @@
         "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä",
         "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb",
         "Name[gl]": "Xestor de eventos de X11 para KRfb",
+        "Name[ia]": "Manipulator de evento de X11 per KRfb",
         "Name[it]": "Gestore eventi X11 per KRfb",
         "Name[ko]": "KRfb X11 이벤트 핸들러",
         "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb",

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

@@ -15,6 +15,7 @@
         "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.",
@@ -47,6 +48,7 @@
         "Name[fi]": "KRfb:n PipeWire-kehyspuskuri",
         "Name[fr]": "Tampon d'images PipeWire pour KRfb",
         "Name[gl]": "Búfer de fotograma de PipeWire para KRfb",
+        "Name[ia]": "Framebuffer de PipeWire per KRfb",
         "Name[it]": "Framebuffer PipeWire per KRfb",
         "Name[ko]": "KRfb용 PipeWire 프레임버퍼",
         "Name[nl]": "PipeWire-framebuffer voor KRfb",

framebuffers/pipewire/pw_framebuffer.cpp

@@ -28,6 +28,10 @@
 
 #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>
@@ -688,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;
@@ -707,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
 }
 
 /**
@@ -743,7 +826,10 @@ pw_stream *PWFrameBuffer::Private::createReceivingStream()
                 SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
                 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_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)));

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

@@ -36,6 +36,9 @@
 #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;
         }
@@ -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

@@ -16,6 +16,7 @@ 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

krfb/krfb-events.json

@@ -14,6 +14,7 @@
         "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",

krfb/org.kde.krfb.appdata.xml

@@ -22,6 +22,7 @@
   <name xml:lang="it">Krfb</name>
   <name xml:lang="ko">Krfb</name>
   <name xml:lang="nl">Krfb</name>
+  <name xml:lang="nn">Krfb</name>
   <name xml:lang="pl">Krfb</name>
   <name xml:lang="pt">Krfb</name>
   <name xml:lang="pt-BR">Krfb</name>
@@ -57,6 +58,7 @@
   <summary xml:lang="it">Condivisione del desktop</summary>
   <summary xml:lang="ko">데스크톱 공유</summary>
   <summary xml:lang="nl">Bureaublad delen</summary>
+  <summary xml:lang="nn">Skrivebordsdeling</summary>
   <summary xml:lang="pl">Współdzielenie pulpitu</summary>
   <summary xml:lang="pt">Partilha do ecrã</summary>
   <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
@@ -91,6 +93,7 @@
     <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
     <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 프로그램입니다.</p>
     <p xml:lang="nl">Bureaublad delen is een server-applicatie die u in staat stelt uw huidige sessie te delen met een gebruiker op een andere machine, die een VNC-client kan gebruiken om uw bureaublad te bekijken of zelfs te besturen.</p>
+    <p xml:lang="nn">Krfb skrivebordsdeling er eit tenar­program som lèt deg dela skrivebords­økta di med ein brukar på ei anna maskin. Vedkommande kan så bruka ein VNC-klient for å sjå og eventuelt òg styra økta.</p>
     <p xml:lang="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
     <p xml:lang="pt">A Partilha de Ecrã Krfb é uma aplicação de servidor que lhe permite partilhar a sua sessão actual com um utilizador noutra máquina, o qual poderá usar um cliente de VNC para ver ou mesmo controlar o ambiente de trabalho.</p>
     <p xml:lang="pt-BR">Krfb Desktop Sharing é um aplicativo de servidor que lhe permite compartilhar a sua sessão atual com um usuário em outra máquina, que poderá usar um cliente de VNC para ver ou mesmo controlar a máquina.</p>
@@ -132,6 +135,7 @@
       <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
       <caption xml:lang="ko">Krfb로 데스크톱 공유</caption>
       <caption xml:lang="nl">Bureaublad delen met Krfb</caption>
+      <caption xml:lang="nn">Skrivebordsdeling med Krfb</caption>
       <caption xml:lang="pl">Udostępnienie pulpitu przy użyciu Krfb</caption>
       <caption xml:lang="pt">Partilha do ecrã com o Krfb</caption>
       <caption xml:lang="pt-BR">Compartilhando a área de trabalho com o Krfb</caption>
@@ -151,9 +155,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
+    <release version="20.08.3" date="2020-11-05"/>
+    <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"/>
-    <release version="20.04.2" date="2020-06-11"/>
-    <release version="20.04.1" date="2020-05-14"/>
   </releases>
 </component>