GIT_SILENT Upgrade KDE Applications version to 19.04.3.

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

.arcconfig

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

CMakeLists.txt

@@ -1,47 +1,81 @@
-project(krfb)
+cmake_minimum_required(VERSION 3.0)
 
-if(NOT INSIDE_KDENETWORK)
-    message("Not building inside KDENetwork, loading KDE CMake Macros.")
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "19")
+set (KDE_APPLICATIONS_VERSION_MINOR "04")
+set (KDE_APPLICATIONS_VERSION_MICRO "3")
+set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
-    find_package(KDE4 REQUIRED)
+project(krfb VERSION ${KDE_APPLICATIONS_VERSION})
 
-    include(KDE4Defaults)
-    include(MacroLibrary)
+set(QT_MIN_VERSION 5.6.0)
+set(KF5_MIN_VERSION 5.31.0)
 
-    include(CheckIncludeFile)
-    include(CheckIncludeFiles)
-    include(CheckSymbolExists)
-    include(CheckFunctionExists)
-    include(CheckLibraryExists)
-    include(CheckPrototypeExists)
-    include(CheckTypeSize)
+find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
 
-    set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
-    if(WIN32)
-       set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
-       set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
-    endif(WIN32)
-    add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-    include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-endif(NOT INSIDE_KDENETWORK)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+include(ECMInstallIcons)
+include(ECMAddAppIcon)
+include(ECMSetupVersion)
+include(FeatureSummary)
 
-set(IS_KTP_INTERNAL_MODULE TRUE)
-set(CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    ${CMAKE_MODULE_PATH}
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
+
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+    I18n
+    Completion
+    Config
+    CoreAddons
+    Crash
+    DBusAddons
+    DNSSD
+    DocTools
+    Notifications
+    Wallet
+    WidgetsAddons
+    XmlGui
 )
 
+find_package(X11 REQUIRED)
+
+find_package(XCB REQUIRED COMPONENTS
+    XCB
+    RENDER
+    SHAPE
+    XFIXES
+    DAMAGE
+    SHM
+    IMAGE
+)
+
+if(WIN32)
+    set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
+    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
+endif(WIN32)
+
+add_definitions(
+    -DQT_DEPRECATED_WARNINGS
+    -DQT_DISABLE_DEPRECATED_BEFORE=0x050600
+    -DQT_USE_QSTRINGBUILDER
+    -DQT_NO_CAST_TO_ASCII
+    -DQT_NO_CAST_FROM_ASCII
+    -DQT_NO_CAST_FROM_BYTEARRAY
+    -DQT_STRICT_ITERATORS
+    -DQT_NO_URL_CAST_FROM_STRING
+    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+)
+
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
+
 find_package(LibVNCServer REQUIRED)
 
-macro_optional_find_package(TelepathyQt4)
-macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
-
-macro_optional_find_package(KTp)
-macro_log_feature(KTP_FOUND "KTP" "KDE Telepathy" "https://projects.kde.org/projects/extragear/network/telepathy" FALSE "" "Needed to build KDE IM Contacts Display in KRFB.")
-
-macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
-macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
+ecm_setup_version(PROJECT
+                  VARIABLE_PREFIX KRFB
+                  VERSION_HEADER "krfb_version.h")
 
 include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
                      "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
@@ -50,14 +84,13 @@ include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
 
 if(Q_WS_X11)
   if(NOT X11_XTest_FOUND)
-    message(FATAL_ERROR "krfb requires the libXtst (http://xorg.freedesktop.org) to be built")
+    message(FATAL_ERROR "krfb requires the libXtst (https://xorg.freedesktop.org) to be built")
   endif(NOT X11_XTest_FOUND)
 endif(Q_WS_X11)
 
 add_subdirectory(krfb)
 add_subdirectory(framebuffers)
 add_subdirectory(doc)
+add_subdirectory(icons)
 
-if (NOT INSIDE_KDENETWORK)
-    macro_display_feature_log()
-endif ()
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

cmake/modules/FindKTp.cmake

@@ -1,38 +0,0 @@
-# Try to find the KTp library
-# KTP_FOUND
-# KTP_INCLUDE_DIR
-# KTP_LIBRARIES
-# KTP_MODELS_LIBRARIES
-# KTP_WIDGETS_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_KTP_INTERNAL_MODULE)
-   message (FATAL_ERROR "KTp can be used just from internal components at this time")
-endif (NOT IS_KTP_INTERNAL_MODULE)
-
-SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
-if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-  # Already in cache, be silent
-  set(KTP_FIND_QUIETLY TRUE)
-endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-
-find_path(KTP_INCLUDE_DIR
-  NAMES KTp/presence.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
-find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
-find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
-                                  KTP_LIBRARIES
-                                  KTP_MODELS_LIBRARIES
-                                  KTP_INCLUDE_DIR)
-
-mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)

cmake/modules/FindLibVNCServer.cmake

@@ -6,7 +6,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-INCLUDE(CheckPointerMember)
+INCLUDE(CheckStructHasMember)
 
 IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
     # Already in cache, be silent
@@ -25,7 +25,7 @@ FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
 
 IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
    SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
-   CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
+   CHECK_STRUCT_HAS_MEMBER("struct _rfbClient" GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
 ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
 
 IF (LIBVNCSERVER_FOUND)
@@ -38,4 +38,4 @@ ELSE (LIBVNCSERVER_FOUND)
   ENDIF (LIBVNCSERVER_FIND_REQUIRED)
 ENDIF (LIBVNCSERVER_FOUND)
 
-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)

doc/CMakeLists.txt

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

doc/index.docbook

@@ -1,22 +1,11 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&krfb;">
-  <!ENTITY package "kdenetwork">
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English 
-                                     original documentation, change 
-                                     the language here -->
-    
-  <!-- Do not define any other entities; instead, use the entities
-       from entities/general.entities and $LANG/user.entities. -->
+  <!ENTITY % English "INCLUDE">
 ]>
-<!-- Based on kdoctemplate v0.9 January 10 2003 -->
 
 <book id="krfb" lang="&language;">
 
-<!-- This header contains all of the meta-information for the document such
-as Authors, publish date, the abstract, and Keywords -->
-
 <bookinfo>
 <title>The &krfb; Handbook</title>
 
@@ -32,21 +21,11 @@ as Authors, publish date, the abstract, and Keywords -->
 <year>2003</year>
 <holder>&Brad.Hards;</holder>
 </copyright>
-<!-- Translators: put here the copyright notice of the translation -->
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<!-- Date and version information of the documentation
-Don't forget to include this last date and this last revision number, we
-need them for translation coordination !
-Please respect the format of the date (YYYY-MM-DD) and of the version
-(V.MM.LL), it could be used by automation scripts.
-Do NOT change these in the translation. -->
-
-<date>2013-06-19</date>
-<releaseinfo>&kde; 4.11</releaseinfo>
-
-<!-- Abstract about this handbook -->
+<date>2016-07-25</date>
+<releaseinfo>5.0 (Applications 16.08)</releaseinfo>
 
 <abstract>
 <para>
@@ -56,10 +35,6 @@ view or even control the desktop.
 </para>
 </abstract>
 
-<!-- This is a set of Keywords for indexing by search engines.
-Please at least include KDE, the KDE package it is in, the name
- of your application, and a few relevant keywords. -->
-
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdenetwork</keyword>
@@ -75,23 +50,9 @@ Please at least include KDE, the KDE package it is in, the name
 
 </bookinfo>
 
-<!-- The contents of the documentation begin here.  Label
-each chapter so with the id attribute. This is necessary for two reasons: it
-allows you to easily reference the chapter from other chapters of your
-document, and if there is no ID, the name of the generated HTML files will vary
-from time to time making it hard to manage for maintainers and for the CVS
-system. Any chapter labelled (OPTIONAL) may be left out at the author's
-discretion. Other chapters should not be left out in order to maintain a
-consistent documentation style across all KDE apps. -->
-
 <chapter id="introduction">
 <title>Introduction</title>
 
-<!-- The introduction chapter contains a brief introduction for the
-application that explains what it does and where to report
-problems. Basically a long version of the abstract.  Don't include a
-revision history. (see installation appendix comment) -->
-
 <para>
 &krfb; is a server application that allows you to share your current
 session with a user on another machine, who can use a <acronym>VNC</acronym> client to
@@ -112,7 +73,7 @@ to help you perform a task.
 <para>
 Please report any problems or feature requests to the &kde; mailing
 lists or file a bug at <ulink
-url="http://bugs.kde.org">http://bugs.kde.org</ulink>. 
+url="https://bugs.kde.org">https://bugs.kde.org</ulink>.
 </para>
 </chapter>
 
@@ -165,10 +126,8 @@ use &krfb; over other links, but performance is unlikely to be as good.
 <chapter id="using-krfb">
 <title>Using &krfb;</title>
 
-<!-- This chapter should tell the user how to use your app. You should use as
-many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document
-your application. -->
-
+<sect1 id="main-windw">
+<title>&krfb; Main Window</title>
 <para>
 It is very easy to use &krfb; - it has a simple interface, as shown in
 the screenshot below.
@@ -189,64 +148,69 @@ the screenshot below.
 </para>
 
 <para>
-When you want to allow someone to access your desktop, you can create
-an personal invitation using the <guibutton>New Personal
-Invitation...</guibutton> button, which will bring up a window
-containing the information needed to access your desktop. An example
-is shown below.
+When you want to allow someone to access your desktop, you have to
+enable the checkbox <guilabel>Enable Desktop Sharing</guilabel>,
+which will start the server.
+</para>
+
+<sect2 id="connection-details">
+<title>Connection Details</title>
+
+<para>
+The <guilabel>Address</guilabel> contains the address of your
+computer and the port number, separated by a colon.
+The address is just a hint - you can use any address that can
+reach your computer. &krfb; tries to guess your address from your
+network configuration, but does not always succeed in doing so.
+If your computer is behind a firewall it may have a different
+address or be unreachable for other computers.
+</para>
+<para>
+You can change the port on the <guilabel>Network</guilabel>
+page in the configuration dialog.
+</para>
+<para>
+The next field is prefilled with an automatically generated password.
+Click in the icon at the right of the field to change the password.
+</para>
+</sect2>
+
+<sect2 id="unattended-access">
+<title>Unattended Access</title>
+
+<para>
+Any remote user with the desktop sharing password will have to be authenticated.
+If unattended access is activated, and the remote user provides the password
+for unattended mode, desktop sharing access will be granted without explicit
+confirmation.
+</para>
+<para>
+By default the password for this mode is empty, to change that click on
+the button and enter a password.
+</para>
+<para>
+If unattended access is allowed, then you should probably specify a
+password.
 </para>
 
 <para>
-<screenshot>
-<screeninfo>Example &krfb; personal invitation</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="personal_invitation.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Example &krfb; personal invitation</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
+If the machine is a server and you are using &krfb; for remote
+administration, you probably want to use unattended access.
 </para>
 
-<para>
-To increase security, the invitation is only valid for an
-hour after it is created, and of course the person connecting has to
-have the correct password. 
-</para>
+</sect2>
+
+<sect2 id="transfer-login-information">
+<title>Transfer Login Information</title>
 
 <para>
-Since you may want to invite someone to access your desktop by email,
-&krfb; can create invitations as email messages. You can create such
-an invitation using the <guibutton>New Email Invitation...</guibutton>
-button on the &krfb; main window. This will usually bring up an email
-message that looks like the following, ready for you to type in the
-email address of the person you are sending the invitation to.
-</para>
-
-<para>
-<screenshot>
-<screeninfo>Example &krfb; email invitation</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="email_invitation.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Example &krfb; email invitation</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
-</para>
-
-<warning>
-<para>
-&krfb; will warn you about the security implications of sending this
-information across an insecure link. You must heed those warnings.
+&krfb; has no invitation feature any more as in previous versions.
+So you have to transfer the login information yourself using email
+or a personal invitation.
 </para>
 <para>
 If you cannot encrypt the email (or otherwise secure the link),
-sending invitations by email is a very serious security risk, since
+sending a password by email is a very serious security risk, since
 anyone can read the password and address from the email as it passes
 over the network. This means that they can potentially take control of
 your machine.
@@ -255,33 +219,32 @@ your machine.
 If you cannot encrypt the email message, it may be better to use a
 personal invitation, telephone the person you are giving access to,
 verify the identity of that person, and provide the required
-invitation information that way.
+information that way.
 </para>
-</warning>
-
-<sect1 id="krfb-managing-invitations">
-<title>Managing &krfb; invitations</title>
 
+<note>
 <para>
-Having created an invitation (either a personal invitation or one that
-was sent by email), &krfb; main window allows you to delete existing
-invitations. To just delete one of the invitations, select it with the
-mouse (it should become highlighted), and then select
-the <guibutton>Delete</guibutton>. To delete all invitations, just
-select the <guibutton>Delete All</guibutton> button.
+&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
+your password in the clear across the network. Instead, it uses a
+challenge-response system. This is reasonably secure, as long as the
+password is securely guarded.
 </para>
+</note>
 
-</sect1>
+</sect2>
 
-<sect1 id="krfb-qit">
+<sect2 id="krfb-qqit">
 <title>Quit &krfb;</title>
 
 <para>
-If you close the &krfb; main window the server keeps running, which is
-indicated by an icon in the system tray.
-To stop &krfb; right click on the  icon in the systems tray and select
+If you close the &krfb; main window by clicking on the window close icon or using the
+shortcut <keycombo action="simul">&Alt;<keycap>F4</keycap></keycombo> the server
+keeps running, which is indicated by an icon in the system tray.
+To stop &krfb; either use <menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>
+in the main window or right click on the icon in the system tray and select
 <guimenuitem>Quit</guimenuitem>.
 </para>
+</sect2>
 
 </sect1>
 
@@ -290,7 +253,7 @@ To stop &krfb; right click on the  icon in the systems tray and select
 <para>
 In addition to the main &krfb; interface shown and described above, 
 you can also control &krfb;  using the
-<guibutton>Configure...</guibutton> on the &krfb; main window. The &krfb;
+<guimenuitem>Configure...</guimenuitem> on the &krfb; main window. The &krfb;
 configuration has two pages, as shown in the screenshot below: 
 </para>
 
@@ -314,8 +277,8 @@ The <guilabel>Network</guilabel> page allows control over the port that
 </para>
 
 <para>
-The <guilabel>Announce service on the network</guilabel> checkbox
-controls whether &krfb; announces invitations over the network using
+The <guilabel>Announce service on the local network</guilabel> checkbox
+controls whether &krfb; announces the service over the local network using
 Service Location Protocol. This is normally a good idea, but only
 works really well with a Service Location Protocol aware client, such
 as &krdc;.
@@ -323,8 +286,8 @@ as &krdc;.
 
 <para>
 If you select the <guilabel>Use default port</guilabel> checkbox, 
-then &krfb; will locate a suitable port, and invitations will match 
-this port. If you deselect this checkbox, you can specify a particular
+then &krfb; will locate a suitable port.
+If you deselect this checkbox, you can specify a particular
 port. Specifying a particular port may be useful if you are using
 port-forwarding on the firewall. Note that if Service Location
 Protocol is turned on, this will automatically deal with identifying
@@ -332,8 +295,8 @@ the correct port.
 </para>
 
 <para>
-The <guilabel>Security</guilabel> page allows you configure settings
-related to access to the &krfb; server.
+The <guilabel>Security</guilabel> page allows you to configure whether the
+person connecting to the &krfb; server can control the desktop, or only view.
 </para>
 
 <para>
@@ -350,41 +313,15 @@ related to access to the &krfb; server.
 </screenshot>
 </para>
 
-<para>
-The <guilabel>Allow uninvited connections</guilabel> check box controls
-whether &krfb; allows connection without an invitation. If uninvited
-connections are allowed, then you should probably specify a
-password. You can also use the check boxes here to choose whether you
-have to confirm the connection before it proceeds, and whether the
-person connecting can control the desktop, or only view.
-</para>
-
-<para>
-If the machine is a workstation, and you choose to allow uninvited
-connections, you probably want to select the <guilabel>Ask 
-before accepting connections </guilabel>. Conversely, if the
-machine is a server and you are using &krfb; for remote
-administration, you probably want to deselect this option.
-</para>
-
-<note>
-<para>
-&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
-your password in the clear across the network. Instead, it uses a
-challenge-response system. This is reasonably secure, as long as the
-password is securely guarded.
-</para>
-</note>
-
 </sect1>
 
 <sect1 id="krfb-connection">
-<title>What happens when someone connects to &krfb;</title>
+<title>Connecting to &krfb;</title>
 
 <para>
 When someone connects to &krfb; on your machine, you will get a pop-up
 notification that looks like the following screenshot, unless you are
-accepting uninvited connections without warning.
+accepting unattended access without confirmation.
 </para>
 <para>
 <screenshot>
@@ -402,8 +339,8 @@ accepting uninvited connections without warning.
 
 <para>
 If you <guibutton>Accept Connection</guibutton>, the client can
-proceed to authenticate (which requires the correct password for a
-personal invitation or email invitation). If you <guibutton>Refuse
+proceed to authenticate, which requires the correct password for a
+login. If you <guibutton>Refuse
 Connection</guibutton>, then the attempt to connect will be terminated.
 </para>
 
@@ -413,23 +350,11 @@ mouse</guilabel> check box determines whether this client can only
 observe, or can take control of your machine. 
 </para>
 
-<para>
-If the client connection is successful, and used the password from a
-personal invitation or email invitation, then that invitation is
-deleted and cannot be used again. You will also get a small pop-up
-window in the dock, that shows that the connection has been made.
-</para>
-
 </sect1>
 </chapter>
 
 <chapter id="credits">
 
-<!-- Include credits for the programmers, documentation writers, and
-contributors here. The license for your software should then be included below
-the credits with a reference to the appropriate license file included in the KDE
-distribution. -->
-
 <title>Credits and License</title>
 
 <para>
@@ -458,33 +383,6 @@ Documentation Copyright &copy; 2003 &Brad.Hards; &Brad.Hards.mail;
 
 </chapter>
 
-<appendix id="installation">
-<title>Installation</title>
-
-<sect1 id="getting-krfb">
-<title>How to obtain &krfb;</title>
-
-<!-- This first entity contains boiler plate for applications that are
-part of KDE CVS.  You should remove it if you are releasing your
-application --> 
-
-&install.intro.documentation;
-
-</sect1>
-
-<sect1 id="compilation">
-<title>Compilation and Installation</title>
-
-<!-- This entity contains the boilerplate text for standard -->
-<!-- compilation instructions.  If your application requires any -->
-<!-- special handling, remove it, and replace with your own text. -->
-
-&install.compile.documentation;
-
-</sect1>
-
-</appendix>
-
 &documentation.index;
 </book>
 

framebuffers/CMakeLists.txt

@@ -1,3 +1,5 @@
 add_subdirectory (qt)
-add_subdirectory (x11)
 
+if (${XCB_DAMAGE_FOUND} AND ${XCB_SHM_FOUND} AND ${XCB_IMAGE_FOUND})
+add_subdirectory (xcb)
+endif()

framebuffers/qt/CMakeLists.txt

@@ -7,22 +7,18 @@ set (krfb_framebuffer_qt_SRCS
      qtframebufferplugin.cpp
 )
 
-kde4_add_plugin (krfb_framebuffer_qt
+add_library(krfb_framebuffer_qt
+ MODULE 
                  ${krfb_framebuffer_qt_SRCS}
 )
 
 target_link_libraries (krfb_framebuffer_qt
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${KDE4_KDEUI_LIBS}
+                       Qt5::Core
+                       Qt5::Gui
+                       KF5::CoreAddons
                        krfbprivate
 )
 
 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
 )
-
-install (FILES krfb_framebuffer_qt.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}
-)
-

framebuffers/qt/krfb_framebuffer_qt.desktop

@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=Qt based Framebuffer for KRfb.
-Comment[ast]=Esquema Qt de buffer pa KRfb
-Comment[bg]=Основан на Qt фреймбуфер за KRfb.
-Comment[bs]=Kadrobafer za KRfb na osnovu Qt.
-Comment[ca]=«Framebuffer» basat en Qt per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en Qt per al KRfb.
-Comment[cs]=Framebuffer založený na Qt pro KRfb.
-Comment[da]=Qt-baseret framebuffer til KRfb.
-Comment[de]=Qt-basierter Framebuffer für KRfb
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το Qt για το KRfb.
-Comment[en_GB]=Qt based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en Qt para KRfb.
-Comment[et]=KRfb Qt põhine kaadripuhver
-Comment[eu]=Qt-n oinarritutako KRfb-ren irteerako bideoa
-Comment[fi]=QT-perustainen Kehyspuskuri KRfb:lle
-Comment[fr]=Sortie vidéo fondée sur Qt pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar Qt.
-Comment[gl]=Framebuffer baseado en Qt para KRfb.
-Comment[hr]=Međuspremnik okvira baziran na Qt-u za KRfb.
-Comment[hu]=Qt-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur Qt per KRfb
-Comment[it]=Framebuffer basato su Qt per KRfb.
-Comment[kk]=Qt негіздеген KRfb-нің кадр буфері.
-Comment[km]=Framebuffer មាន​មូលដ្ឋាន​លើ Qt សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 Qt 기반 프레임버퍼.
-Comment[lt]=Qt pagrindu veikiantis Framebuffer skirtas KRfb.
-Comment[lv]=Qt balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Qt-basert rammebuffer for KRfb.
-Comment[nds]=Op Qt opbuut Bildpuffer för KRfb
-Comment[nl]=Op Qt gebaseerd framebuffer voor KRfb.
-Comment[nn]=Qt basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie Qt dla KRfb.
-Comment[pt]='Framebuffer' baseado no Qt para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no Qt para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе Qt.
-Comment[si]=KRfb සඳහා Qt මත පදනම් වූ රාමු බෆරය
-Comment[sk]=Framebuffer založený na Qt pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na Qt
-Comment[sr]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sv]=Qt-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için Qt temelli Çerçeve tamponu.
-Comment[uk]=Заснований на Qt буфер кадрів для KRfb.
-Comment[x-test]=xxQt based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 Qt 的 KRfb 帧缓冲机制
-Comment[zh_TW]=KRfb 的 Qt-based Framebuffer
-Name=Qt Framebuffer for KRfb
-Name[ast]=Esquema Qt de buffer pa KRfb
-Name[bg]=Qt фреймбуфер за KRfb
-Name[bs]=Qt-ov kadrobafer za KRFB
-Name[ca]=«Framebuffer» Qt per al KRfb.
-Name[ca@valencia]=«Framebuffer» Qt per al KRfb.
-Name[cs]=Qt Framebuffer pro KRfb
-Name[da]=Qt-framebuffer til KRfb
-Name[de]=Qt-Framebuffer für KRfb
-Name[el]=Qt Framebuffer for KRfb
-Name[en_GB]=Qt Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo Qt para KRfb
-Name[et]=KRfb Qt kaadripuhver
-Name[eu]=KRfb-ren Qt-ko irteerako bideoa
-Name[fi]=QT-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo Qt pour Krfb
-Name[ga]=Maolán fráma Qt le haghaidh KRfb
-Name[gl]=Framebuffer de Qt para KRfb
-Name[hr]=Qt Framebuffer za KRfb
-Name[hu]=Qt framebuffer a Krfb-hez
-Name[ia]=Framebuffer Qt per KRfb
-Name[it]=Framebuffer Qt per KRfb
-Name[kk]=Qt KRfb кадр буфері
-Name[km]=Qt Framebuffer សម្រាប់for KRfb
-Name[ko]=KRfb를 위한 Qt 프레임버퍼
-Name[lt]=Qt Framebufferis skirtas KRfb
-Name[lv]=Qt kadrbuferis priekš KRfb.
-Name[nb]=Qt rammebuffer for KRfb
-Name[nds]=Qt-Bildpuffer för KRfb
-Name[nl]=Qt-framebuffer voor KRfb
-Name[nn]=Qt-framebuffer for KRfb
-Name[pl]=Bufor ramki Qt dla KRfb
-Name[pt]='Framebuffer' do Qt para o KRfb
-Name[pt_BR]=Framebuffer do Qt para o KRfb
-Name[ru]=Буфер экрана Qt для KRfb
-Name[si]=KRfb සඳහා වන Qt රාමුබෆරය
-Name[sk]=Qt Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik Qt za KRFB
-Name[sr]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavian]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavianlatin]=Qt‑ov kadrobafer za KRFB
-Name[sr@latin]=Qt‑ov kadrobafer za KRFB
-Name[sv]=Qt-rambuffert för Krfb
-Name[tr]=KRfb için Qt Çerçeve tamponu
-Name[uk]=Буфер кадрів на Qt для KRfb
-Name[x-test]=xxQt Framebuffer for KRfbxx
-Name[zh_CN]=KRfb 的 Qt 帧缓冲机制
-Name[zh_TW]=Krfb 的 Qt Framebuffer
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_qt
-X-KDE-PluginInfo-Name=qt
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/qt/krfb_framebuffer_qt.json

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

framebuffers/qt/qtframebuffer.cpp

@@ -8,12 +8,13 @@
 */
 
 #include "qtframebuffer.h"
-#include "qtframebuffer.moc"
 
 #include <QTimer>
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
+#include <QGuiApplication>
+#include <QScreen>
 
 
 const int UPDATE_TIME = 500;
@@ -21,17 +22,26 @@ const int UPDATE_TIME = 500;
 QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
     : FrameBuffer(id, parent)
 {
-    fbImage = QPixmap::grabWindow(win).toImage();
-    fb = new char[fbImage.numBytes()];
+    QScreen *screen = QGuiApplication::primaryScreen();
+    if (screen) {
+        primaryScreen = screen;
+        fbImage = screen->grabWindow(win).toImage();
+        fb = new char[fbImage.byteCount()];
+    } else {
+        fb = nullptr;
+        primaryScreen = nullptr;
+    }
+
     t = new QTimer(this);
-    connect(t, SIGNAL(timeout()), SLOT(updateFrameBuffer()));
+    connect(t, &QTimer::timeout, this, &QtFrameBuffer::updateFrameBuffer);
 }
 
 
 QtFrameBuffer::~QtFrameBuffer()
 {
-    delete [] fb;
-    fb = 0;
+    if (fb)
+        delete [] fb;
+    fb = nullptr;
 }
 
 int QtFrameBuffer::depth()
@@ -66,7 +76,9 @@ void QtFrameBuffer::getServerFormat(rfbPixelFormat &format)
 
 void QtFrameBuffer::updateFrameBuffer()
 {
-    QImage img = QPixmap::grabWindow(win).toImage();
+    if (!fb || !primaryScreen) return;
+    QImage img = primaryScreen->grabWindow(win).toImage();
+#if 0 // This is actually slower than updating the whole desktop...
     QSize imgSize = img.size();
 
 
@@ -74,8 +86,6 @@ void QtFrameBuffer::updateFrameBuffer()
     // fbImage is the previous version of the image,
     // img is the current one
 
-#if 0 // This is actually slower than updating the whole desktop...
-
     QImage map(imgSize, QImage::Format_Mono);
     map.fill(0);
 
@@ -94,7 +104,7 @@ void QtFrameBuffer::updateFrameBuffer()
     tiles.append(img.rect());
 #endif
 
-    memcpy(fb, (const char *)img.bits(), img.numBytes());
+    memcpy(fb, (const char *)img.bits(), img.byteCount());
     fbImage = img;
 
 }

framebuffers/qt/qtframebuffer.h

@@ -14,6 +14,7 @@
 #include "framebuffer.h"
 
 class QTimer;
+class QScreen;
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
 */
@@ -21,17 +22,17 @@ class QtFrameBuffer : public FrameBuffer
 {
     Q_OBJECT
 public:
-    explicit QtFrameBuffer(WId id, QObject *parent = 0);
+    explicit QtFrameBuffer(WId id, QObject *parent = nullptr);
 
-    ~QtFrameBuffer();
+    ~QtFrameBuffer() override;
 
-    virtual int depth();
-    virtual int height();
-    virtual int width();
-    virtual int paddedWidth();
-    virtual void getServerFormat(rfbPixelFormat &format);
-    virtual void startMonitor();
-    virtual void stopMonitor();
+    int depth() override;
+    int height() override;
+    int width() override;
+    int paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;
 
 public Q_SLOTS:
     void updateFrameBuffer();
@@ -39,6 +40,7 @@ public Q_SLOTS:
 private:
     QImage fbImage;
     QTimer *t;
+    QScreen *primaryScreen;
 };
 
 #endif

framebuffers/qt/qtframebufferplugin.cpp

@@ -22,8 +22,10 @@
 
 #include "qtframebuffer.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
+K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
+			   registerPlugin<QtFrameBufferPlugin>();)
 
 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
@@ -39,9 +41,5 @@ FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
     return new QtFrameBuffer(id);
 }
 
-K_PLUGIN_FACTORY(factory, registerPlugin<QtFrameBufferPlugin>();) \
-K_EXPORT_PLUGIN(factory("krfb_framebuffer_qt"))
-
-
 #include "qtframebufferplugin.moc"
 

framebuffers/qt/qtframebufferplugin.h

@@ -23,9 +23,7 @@
 
 #include "framebufferplugin.h"
 
-#include <kdemacros.h>
-
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class FrameBuffer;
 
@@ -35,9 +33,9 @@ class QtFrameBufferPlugin : public FrameBufferPlugin
 
 public:
     QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~QtFrameBufferPlugin();
+    ~QtFrameBufferPlugin() override;
 
-    virtual FrameBuffer *frameBuffer(WId id);
+    FrameBuffer *frameBuffer(WId id) override;
 
 private:
     Q_DISABLE_COPY(QtFrameBufferPlugin)

framebuffers/x11/CMakeLists.txt

@@ -1,31 +0,0 @@
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set (krfb_framebuffer_x11_SRCS
-     x11framebuffer.cpp
-     x11framebufferplugin.cpp
-)
-
-kde4_add_plugin (krfb_framebuffer_x11
-                 ${krfb_framebuffer_x11_SRCS}
-)
-
-target_link_libraries (krfb_framebuffer_x11
-                       ${KDE4_KDEUI_LIBS}
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${X11_X11_LIB}
-                       ${X11_Xdamage_LIB}
-                       ${X11_Xext_LIB}
-                       krfbprivate
-)
-
-install (TARGETS krfb_framebuffer_x11
-         DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-install (FILES krfb_framebuffer_x11.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}
-)
-

framebuffers/x11/krfb_framebuffer_x11.desktop

@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
-Comment[bg]=Основан на X11 XDamage/XShm фреймбуфер за KRfb.
-Comment[bs]=X11 XDamage/XShm baziran framebafer za KRfb.
-Comment[ca]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt de l'X11 per al KRfb.
-Comment[cs]=Framebuffer založený na X11 XDamage/XShm pro KRfb.
-Comment[da]=X11 XDamage/XShm-baseret framebuffer til KRfb.
-Comment[de]=X11 XDamage/XShm-basierter Framebuffer für KRfb.
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το X11 XDamage/XShm για το KRfb.
-Comment[en_GB]=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en X11 Damage/XShm para KRfb.
-Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver
-Comment[eu]=X11 XDamage/XShm  oinarritutako KRfb-ren irteerako bideoa.
-Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
-Comment[fr]=Sortie vidéo fondée sur X11 « XDamage / XShm » pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar X11 XDamage/XShm
-Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
-Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
-Comment[hu]=X11 XDamage/XShm-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur X11 XDamage/XShm per KRfb.
-Comment[it]=Framebuffer basato su XDamage/XShm di X11 per KRfb.
-Comment[kk]=X11 XDamage/XShm негіздеген KRfb кадр буфері.
-Comment[km]=X11 XDamage/XShm based Framebuffer សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 X11 XDamage/XShm 기반 프레임버퍼.
-Comment[lt]=X11 XDamage/XShm paremtas Framebuffer skirtas KRfb.
-Comment[lv]=X11 XDamage/XShm balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Rammebuffer for KRfb basert på X11 XDamage/XShm.
-Comment[nds]=Op X11-XDamage/-XShm opbuut Bildpuffer för KRfb
-Comment[nl]=Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.
-Comment[nn]=X11 XDamage/XShm basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.
-Comment[pt]='Framebuffer' baseado no XDamage/XShm do X11 para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no XDamage/XShm do X11 para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе X11 XDamage/XShm
-Comment[si]=KRfb සඳහා වන රාමු බෆරය මත පදනම් වූ X11 XDamage/XShm.
-Comment[sk]=Framebuffer založený na X11 XDamage/XShm pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na X11 XDamage/XShm
-Comment[sr]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sv]=X11 XDamage/XShm-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için X11 XDamage/XShm temelli Çerçeve Tamponu.
-Comment[uk]=Заснований на XDamage/XShm X11 буфер кадрів для KRfb.
-Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 X11 XDamage/XShm 扩展的 KRfb 帧缓冲机制。
-Comment[zh_TW]=KRfb 的 X11 XDamage/XShm based Framebuffer
-Name=X11 Framebuffer for KRfb
-Name[ast]=Buffer de X11 pa KRfb
-Name[bg]=X11 фреймбуфер за KRfb
-Name[bs]=X11 frame bafer za KRfb
-Name[ca]=«Framebuffer» del X11 per al KRfb.
-Name[ca@valencia]=«Framebuffer» de l'X11 per al KRfb.
-Name[cs]=X11 Framebuffer pro KRfb
-Name[da]=X11-framebuffer til KRfb
-Name[de]=X11-Framebuffer für KRfb
-Name[el]=X11 Framebuffer for KRfb
-Name[en_GB]=X11 Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo X11 para KRfb
-Name[et]=KRfb X11 kaadripuhver
-Name[eu]=KRfb-ren X11-ko irteerako bideoa
-Name[fi]=X11-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo X11 pour Krfb
-Name[ga]=Maolán fráma X11 le haghaidh KRfb
-Name[gl]=Framebuffer de X11 para KRfb
-Name[hr]=Međuspremnik okvira X11 za KRfb
-Name[hu]=X11 framebuffer a Krfb-hez
-Name[ia]=Framebuffer X11 per KRfb
-Name[it]=Framebuffer X11 per KRfb
-Name[kk]=X11 KRfb кадр буфері
-Name[km]=X11 Framebuffer សម្រាប់ KRfb
-Name[ko]=KRfb를 위한 X11 프레임버퍼
-Name[lt]=X11 Framebuffer skirtas KRfb
-Name[lv]=X11 kadrbuferis priekš KRfb
-Name[nb]=X11 rammebuffer for KRfb
-Name[nds]=X11-Bildpuffer för KRfb
-Name[nl]=X11 framebuffer voor KRfb
-Name[nn]=X11-framebuffer for KRfb
-Name[pl]=Bufor ramki X11 dla KRfb
-Name[pt]='Framebuffer' do X11 para o KRfb
-Name[pt_BR]=Framebuffer do X11 para o KRfb
-Name[ru]=Буфер экрана X11 для KRfb
-Name[si]=KRfb සඳහා X11 රාමු බෆරය
-Name[sk]=X11 Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik X11 za KRFB
-Name[sr]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavian]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavianlatin]=X11 kadrobafer za KRFB.
-Name[sr@latin]=X11 kadrobafer za KRFB.
-Name[sv]=X11-rambuffert för Krfb
-Name[tr]=KRfb için X11 Çerçeve Tamponu
-Name[uk]=Буфер кадрів X11 для KRfb
-Name[x-test]=xxX11 Framebuffer for KRfbxx
-Name[zh_CN]=KRfb 的 X11 帧缓冲机制
-Name[zh_TW]=KRfb 的 X11 Framebuffer
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_x11
-X-KDE-PluginInfo-Name=x11
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true

framebuffers/x11/x11framebuffer.cpp

@@ -1,388 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-*/
-
-#include "x11framebuffer.h"
-#include "x11framebuffer.moc"
-
-#include <config-krfb.h>
-
-#include <QX11Info>
-#include <QApplication>
-#include <QDesktopWidget>
-
-#include <KApplication>
-#include <KDebug>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef HAVE_XDAMAGE
-#include <X11/extensions/Xdamage.h>
-#endif
-
-#ifdef HAVE_XSHM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-#endif
-
-class X11FrameBuffer::P
-{
-
-public:
-#ifdef HAVE_XDAMAGE
-    Damage damage;
-#endif
-#ifdef HAVE_XSHM
-    XShmSegmentInfo shminfo;
-#endif
-
-    XImage *framebufferImage;
-    XImage *updateTile;
-    EvWidget *ev;
-    bool useShm;
-    int xdamageBaseEvent;
-    bool running;
-};
-
-X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
-    : FrameBuffer(id, parent), d(new X11FrameBuffer::P)
-{
-#ifdef HAVE_XSHM
-    d->useShm = XShmQueryExtension(QX11Info::display());
-    kDebug() << "shm: " << d->useShm;
-#else
-    d->useShm = false;
-#endif
-    d->running = false;
-    d->framebufferImage = XGetImage(QX11Info::display(),
-                                    id,
-                                    0,
-                                    0,
-                                    QApplication::desktop()->width(), //arg, must get a widget ???
-                                    QApplication::desktop()->height(),
-                                    AllPlanes,
-                                    ZPixmap);
-
-    if (d->useShm) {
-#ifdef HAVE_XSHM
-        d->updateTile = XShmCreateImage(QX11Info::display(),
-                                        DefaultVisual(QX11Info::display(), 0),
-                                        d->framebufferImage->bits_per_pixel,
-                                        ZPixmap,
-                                        NULL,
-                                        &d->shminfo,
-                                        32,
-                                        32);
-        d->shminfo.shmid = shmget(IPC_PRIVATE,
-                                  d->updateTile->bytes_per_line * d->updateTile->height,
-                                  IPC_CREAT | 0777);
-
-        d->shminfo.shmaddr = d->updateTile->data = (char *)
-                             shmat(d->shminfo.shmid, 0, 0);
-        d->shminfo.readOnly = False;
-
-        XShmAttach(QX11Info::display(), &d->shminfo);
-#endif
-    } else {
-        ;
-    }
-
-    kDebug() << "Got image. bpp: " << d->framebufferImage->bits_per_pixel
-             << ", depth: " << d->framebufferImage->depth
-             << ", padded width: " << d->framebufferImage->bytes_per_line
-             << " (sent: " << d->framebufferImage->width * 4 << ")"
-             << endl;
-
-    fb = d->framebufferImage->data;
-#ifdef HAVE_XDAMAGE
-    d->ev = new EvWidget(this);
-    kapp->installX11EventFilter(d->ev);
-#endif
-}
-
-
-X11FrameBuffer::~X11FrameBuffer()
-{
-    XDestroyImage(d->framebufferImage);
-#ifdef HAVE_XDAMAGE
-    kapp->removeX11EventFilter(d->ev);
-#endif
-#ifdef HAVE_XSHM
-    XShmDetach(QX11Info::display(), &d->shminfo);
-    XDestroyImage(d->updateTile);
-    shmdt(d->shminfo.shmaddr);
-    shmctl(d->shminfo.shmid, IPC_RMID, 0);
-#endif
-    delete d;
-    fb = 0; // already deleted by XDestroyImage
-}
-
-
-int X11FrameBuffer::depth()
-{
-    return d->framebufferImage->depth;
-}
-
-int X11FrameBuffer::height()
-{
-    return d->framebufferImage->height;
-}
-
-int X11FrameBuffer::width()
-{
-    return d->framebufferImage->width;
-}
-
-int X11FrameBuffer::paddedWidth()
-{
-    return d->framebufferImage->bytes_per_line;
-}
-
-void X11FrameBuffer::getServerFormat(rfbPixelFormat &format)
-{
-    format.bitsPerPixel = d->framebufferImage->bits_per_pixel;
-    format.depth = d->framebufferImage->depth;
-    format.trueColour = true;
-    format.bigEndian = ((d->framebufferImage->bitmap_bit_order == MSBFirst) ? true : false);
-
-    if (format.bitsPerPixel == 8) {
-        format.redShift = 0;
-        format.greenShift = 3;
-        format.blueShift = 6;
-        format.redMax   = 7;
-        format.greenMax = 7;
-        format.blueMax  = 3;
-    } else {
-        format.redShift = 0;
-
-        if (d->framebufferImage->red_mask)
-            while (!(d->framebufferImage->red_mask & (1 << format.redShift))) {
-                format.redShift++;
-            }
-
-        format.greenShift = 0;
-
-        if (d->framebufferImage->green_mask)
-            while (!(d->framebufferImage->green_mask & (1 << format.greenShift))) {
-                format.greenShift++;
-            }
-
-        format.blueShift = 0;
-
-        if (d->framebufferImage->blue_mask)
-            while (!(d->framebufferImage->blue_mask & (1 << format.blueShift))) {
-                format.blueShift++;
-            }
-
-        format.redMax   = d->framebufferImage->red_mask   >> format.redShift;
-        format.greenMax = d->framebufferImage->green_mask >> format.greenShift;
-        format.blueMax  = d->framebufferImage->blue_mask  >> format.blueShift;
-    }
-}
-
-void X11FrameBuffer::handleXDamage(XEvent *event)
-{
-#ifdef HAVE_XDAMAGE
-    XDamageNotifyEvent *dev = (XDamageNotifyEvent *)event;
-    QRect r(dev->area.x, dev->area.y, dev->area.width, dev->area.height);
-    tiles.append(r);
-
-    /*if (!dev->more) {
-        XDamageSubtract(QX11Info::display(),d->damage, None, None);
-    }*/
-#endif
-}
-
-
-void X11FrameBuffer::cleanupRects()
-{
-
-    QList<QRect> cpy = tiles;
-    bool inserted = false;
-    tiles.clear();
-//     kDebug() << "before cleanup: " << cpy.size();
-    foreach(const QRect & r, cpy) {
-        if (tiles.size() > 0) {
-            for (int i = 0; i < tiles.size(); i++) {
-                //             kDebug() << r << tiles[i];
-                if (r.intersects(tiles[i])) {
-                    tiles[i] |= r;
-                    inserted = true;
-                    break;
-                    //                 kDebug() << "merged into " << tiles[i];
-                }
-            }
-
-            if (!inserted) {
-                tiles.append(r);
-                //             kDebug() << "appended " << r;
-            }
-        } else {
-            //         kDebug() << "appended " << r;
-            tiles.append(r);
-        }
-    }
-
-    for (int i = 0; i < tiles.size(); i++) {
-        tiles[i].adjust(-30, -30, 30, 30);
-
-        if (tiles[i].top() < 0) {
-            tiles[i].setTop(0);
-        }
-
-        if (tiles[i].left() < 0) {
-            tiles[i].setLeft(0);
-        }
-
-        if (tiles[i].bottom() > d->framebufferImage->height) {
-            tiles[i].setBottom(d->framebufferImage->height);
-        }
-
-        if (tiles[i].right() > d->framebufferImage->width) {
-            tiles[i].setRight(d->framebufferImage->width);
-        }
-    }
-
-//     kDebug() << "after cleanup: " << tiles.size();
-}
-
-void X11FrameBuffer::acquireEvents()
-{
-
-    XEvent ev;
-
-    while (XCheckTypedEvent(QX11Info::display(), d->xdamageBaseEvent + XDamageNotify, &ev)) {
-        handleXDamage(&ev);
-    }
-
-    XDamageSubtract(QX11Info::display(), d->damage, None, None);
-}
-
-QList< QRect > X11FrameBuffer::modifiedTiles()
-{
-    QList<QRect> ret;
-
-    if (!d->running) {
-        return ret;
-    }
-
-    kapp->processEvents(); // try to make sure every damage event goes trough;
-    cleanupRects();
-    QRect gl;
-
-    //d->useShm = false;
-    if (tiles.size()  > 0) {
-        if (d->useShm) {
-#ifdef HAVE_XSHM
-
-            foreach(const QRect & r, tiles) {
-//                 kDebug() << r;
-                gl |= r;
-                int y = r.y();
-                int x = r.x();
-
-                while (x < r.right()) {
-                    while (y < r.bottom()) {
-                        if (y + d->updateTile->height > d->framebufferImage->height) {
-                            y = d->framebufferImage->height - d->updateTile->height;
-                        }
-
-                        if (x + d->updateTile->width > d->framebufferImage->width) {
-                            x = d->framebufferImage->width - d->updateTile->width;
-                        }
-
-//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
-                        XShmGetImage(QX11Info::display(), win, d->updateTile, x, y, AllPlanes);
-                        int pxsize =  d->framebufferImage->bits_per_pixel / 8;
-                        char *dest = fb + ((d->framebufferImage->bytes_per_line * y) + (x * pxsize));
-                        char *src = d->updateTile->data;
-
-                        for (int i = 0; i < d->updateTile->height; i++) {
-                            memcpy(dest, src, d->updateTile->bytes_per_line);
-                            dest += d->framebufferImage->bytes_per_line;
-                            src += d->updateTile->bytes_per_line;
-                        }
-
-                        y += d->updateTile->height;
-                    }
-
-                    x += d->updateTile->width;
-                    y = r.y();
-                }
-            }
-#endif
-        } else {
-            foreach(const QRect & r, tiles) {
-                XGetSubImage(QX11Info::display(),
-                             win,
-                             r.left(),
-                             r.top(),
-                             r.width(),
-                             r.height(),
-                             AllPlanes,
-                             ZPixmap,
-                             d->framebufferImage,
-                             r.left(),
-                             r.top()
-                            );
-            }
-        }
-    }
-
-//     kDebug() << "tot: " << gl;
-//     kDebug() << tiles.size();
-    ret = tiles;
-    tiles.clear();
-    return ret;
-}
-
-void X11FrameBuffer::startMonitor()
-{
-    d->running = true;
-#ifdef HAVE_XDAMAGE
-    d->damage = XDamageCreate(QX11Info::display(), win, XDamageReportRawRectangles);
-    XDamageSubtract(QX11Info::display(), d->damage, None, None);
-#endif
-}
-
-void X11FrameBuffer::stopMonitor()
-{
-    d->running = false;
-#ifdef HAVE_XDAMAGE
-    XDamageDestroy(QX11Info::display(), d->damage);
-#endif
-}
-
-
-
-EvWidget::EvWidget(X11FrameBuffer *x11fb)
-    : QWidget(0), fb(x11fb)
-{
-#ifdef HAVE_XDAMAGE
-    int er;
-    XDamageQueryExtension(QX11Info::display(), &xdamageBaseEvent, &er);
-#endif
-}
-
-bool EvWidget::x11Event(XEvent *event)
-{
-#ifdef HAVE_XDAMAGE
-
-    if (event->type == xdamageBaseEvent + XDamageNotify) {
-        fb->handleXDamage(event);
-        return true;
-    }
-
-#endif
-    return false;
-}
-
-
-

framebuffers/x11/x11framebuffer.h

@@ -1,62 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-*/
-#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
-#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFER_H
-
-#include <framebuffer.h>
-#include <QWidget>
-
-class X11FrameBuffer;
-
-class EvWidget: public QWidget
-{
-    Q_OBJECT
-
-public:
-    EvWidget(X11FrameBuffer *x11fb);
-
-protected:
-    bool x11Event(XEvent *event);
-
-private:
-    X11FrameBuffer *fb;
-    int xdamageBaseEvent;
-};
-
-/**
-    @author Alessandro Praduroux <pradu@pradu.it>
-*/
-class X11FrameBuffer : public FrameBuffer
-{
-    Q_OBJECT
-public:
-    X11FrameBuffer(WId id, QObject *parent = 0);
-
-    ~X11FrameBuffer();
-
-    virtual QList<QRect> modifiedTiles();
-    virtual int depth();
-    virtual int height();
-    virtual int width();
-    virtual int paddedWidth();
-    virtual void getServerFormat(rfbPixelFormat &format);
-    virtual void startMonitor();
-    virtual void stopMonitor();
-
-
-    void handleXDamage(XEvent *event);
-private:
-    void cleanupRects();
-    void acquireEvents();
-
-    class P;
-    P *const d;
-};
-
-#endif

framebuffers/x11/x11framebufferplugin.cpp

@@ -1,47 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
-    @author George Goldberg <george.goldberg@collabora.co.uk>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "x11framebufferplugin.h"
-
-#include "x11framebuffer.h"
-
-#include <KGenericFactory>
-
-
-X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)
-    : FrameBufferPlugin(parent, args)
-{
-}
-
-X11FrameBufferPlugin::~X11FrameBufferPlugin()
-{
-}
-
-FrameBuffer *X11FrameBufferPlugin::frameBuffer(WId id)
-{
-    return new X11FrameBuffer(id);
-}
-
-K_PLUGIN_FACTORY(factory, registerPlugin<X11FrameBufferPlugin>();) \
-K_EXPORT_PLUGIN(factory("krfb_framebuffer_x11"))
-
-
-#include "x11framebufferplugin.moc"
-

framebuffers/x11/x11framebufferplugin.h

@@ -1,48 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2009 Collabora Ltd <info@collabora.co.uk>
-    @author George Goldberg <george.goldberg@collabora.co.uk>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
-#define KRFB_FRAMEBUFFER_X11_X11FRAMEBUFFERPLUGIN_H
-
-#include "framebufferplugin.h"
-
-#include <kdemacros.h>
-
-#include <QtGui/QWidget>
-
-class FrameBuffer;
-
-class X11FrameBufferPlugin : public FrameBufferPlugin
-{
-    Q_OBJECT
-
-public:
-    X11FrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~X11FrameBufferPlugin();
-
-    virtual FrameBuffer *frameBuffer(WId id);
-
-private:
-    Q_DISABLE_COPY(X11FrameBufferPlugin)
-};
-
-
-#endif  // Header guard
-

framebuffers/xcb/CMakeLists.txt

@@ -0,0 +1,28 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set (krfb_framebuffer_xcb_SRCS
+      xcb_framebufferplugin.cpp
+      xcb_framebuffer.cpp
+)
+
+add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
+
+target_link_libraries (krfb_framebuffer_xcb
+                       Qt5::Core
+                       Qt5::Gui
+                       XCB::XCB
+                       XCB::RENDER
+                       XCB::SHAPE
+                       XCB::XFIXES
+                       XCB::DAMAGE
+                       XCB::SHM
+                       XCB::IMAGE
+                       KF5::CoreAddons
+                       krfbprivate
+)
+
+install (TARGETS krfb_framebuffer_xcb
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+)

framebuffers/xcb/krfb_framebuffer_xcb.json

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

framebuffers/xcb/xcb_framebuffer.cpp

@@ -0,0 +1,684 @@
+/* This file is part of the KDE project
+   Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+*/
+
+#include "xcb_framebuffer.h"
+
+#include <xcb/xcb.h>
+#include <xcb/xproto.h>
+#include <xcb/damage.h>
+#include <xcb/shm.h>
+#include <xcb/xcb_image.h>
+
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
+#include <QX11Info>
+#include <QCoreApplication>
+#include <QGuiApplication>
+#include <QScreen>
+#include <QAbstractNativeEventFilter>
+#include <QDebug>
+
+
+class KrfbXCBEventFilter: public QAbstractNativeEventFilter
+{
+public:
+    KrfbXCBEventFilter(XCBFrameBuffer *owner);
+
+public:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+
+public:
+    int xdamageBaseEvent;
+    int xdamageBaseError;
+    int xshmBaseEvent;
+    int xshmBaseError;
+    bool xshmAvail;
+    XCBFrameBuffer *fb_owner;
+};
+
+
+
+KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
+    xdamageBaseEvent(0), xdamageBaseError(0),
+    xshmBaseEvent(0), xshmBaseError(0), xshmAvail(false),
+    fb_owner(owner)
+{
+    const xcb_query_extension_reply_t *xdamage_data = xcb_get_extension_data(
+                QX11Info::connection(), &xcb_damage_id);
+    if (xdamage_data) {
+        // also query extension version!
+        // ATTENTION: if we don't do that, xcb_damage_create() will always FAIL!
+        xcb_damage_query_version_reply_t *xdamage_version = xcb_damage_query_version_reply(
+                    QX11Info::connection(),
+                    xcb_damage_query_version(
+                        QX11Info::connection(),
+                        XCB_DAMAGE_MAJOR_VERSION,
+                        XCB_DAMAGE_MINOR_VERSION),
+                    nullptr);
+        if (!xdamage_version) {
+            qWarning() << "xcb framebuffer: ERROR: Failed to get XDamage extension version!\n";
+            return;
+        }
+
+#ifdef _DEBUG
+        qDebug() << "xcb framebuffer: XDamage extension version:" <<
+               xdamage_version->major_version << "." << xdamage_version->minor_version;
+#endif
+
+        free(xdamage_version);
+
+        xdamageBaseEvent = xdamage_data->first_event;
+        xdamageBaseError = xdamage_data->first_error;
+
+        // XShm presence is optional. If it is present, all image getting
+        // operations will be faster, without XShm it will only be slower.
+        const xcb_query_extension_reply_t *xshm_data = xcb_get_extension_data(
+                    QX11Info::connection(), &xcb_shm_id);
+        if (xshm_data) {
+            xshmAvail = true;
+            xshmBaseEvent = xshm_data->first_event;
+            xshmBaseError = xshm_data->first_error;
+        } else {
+            xshmAvail = false;
+            qWarning() << "xcb framebuffer: WARNING: XSHM extension not available!";
+        }
+    } else {
+        // if there is no xdamage available, this plugin can be considered useless anyway.
+        // you can use just qt framebuffer plugin instead...
+        qWarning() << "xcb framebuffer: ERROR: no XDamage extension available. I am useless.";
+        qWarning() << "xcb framebuffer:        use qt framebuffer plugin instead.";
+    }
+}
+
+
+bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType,
+                                           void *message, long *result) {
+    Q_UNUSED(result);  // "result" is only used on windows
+
+    if (xdamageBaseEvent == 0) return false;  // no xdamage extension
+
+    if (eventType == "xcb_generic_event_t") {
+        xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message);
+        if ((ev->response_type & 0x7F) == (xdamageBaseEvent + XCB_DAMAGE_NOTIFY)) {
+            // this is xdamage notification
+            this->fb_owner->handleXDamageNotify(ev);
+            return true;  // filter out this event, stop its processing
+        }
+    }
+
+    // continue event processing
+    return false;
+}
+
+
+class XCBFrameBuffer::P {
+public:
+    xcb_damage_damage_t     damage;
+    xcb_shm_segment_info_t  shminfo;
+    xcb_screen_t           *rootScreen;   // X screen info (all monitors)
+    xcb_image_t            *framebufferImage;
+    xcb_image_t            *updateTile;
+
+    KrfbXCBEventFilter     *x11EvtFilter;
+
+    bool                    running;
+
+    QRect                   area;  // capture area, primary monitor coordinates
+};
+
+
+static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
+    xcb_screen_t *screen = nullptr;
+    xcb_screen_iterator_t screens_iter = xcb_setup_roots_iterator(xcb_get_setup(conn));
+    for (; screens_iter.rem; --screen_num, xcb_screen_next(&screens_iter))
+        if (screen_num == 0)
+            screen = screens_iter.data;
+    return screen;
+}
+
+
+
+XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
+    FrameBuffer(winid, parent), d(new XCBFrameBuffer::P)
+{
+    d->running = false;
+    d->damage = XCB_NONE;
+    d->framebufferImage = nullptr;
+    d->shminfo.shmaddr = nullptr;
+    d->shminfo.shmid = XCB_NONE;
+    d->shminfo.shmseg = XCB_NONE;
+    d->updateTile = nullptr;
+    d->area.setRect(0, 0, 0, 0);
+    d->x11EvtFilter = new KrfbXCBEventFilter(this);
+    d->rootScreen = get_xcb_screen(QX11Info::connection(), QX11Info::appScreen());
+
+    this->fb = nullptr;
+
+    QScreen *primaryScreen = QGuiApplication::primaryScreen();
+    if (primaryScreen) {
+        qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
+                 << ", geometry: " << primaryScreen->geometry()
+                 << ", depth: " << primaryScreen->depth();
+        //
+        d->area = primaryScreen->geometry();
+    } else {
+        qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
+        return;
+    }
+
+    d->framebufferImage = xcb_image_get(QX11Info::connection(),
+                                        this->win,
+                                        d->area.left(),
+                                        d->area.top(),
+                                        d->area.width(),
+                                        d->area.height(),
+                                        0xFFFFFFFF, // == Xlib: AllPlanes ((unsigned long)~0L)
+                                        XCB_IMAGE_FORMAT_Z_PIXMAP);
+    if (d->framebufferImage) {
+#ifdef _DEBUG
+        qDebug() << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
+                 << ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
+                 << ", depth: " << d->framebufferImage->depth
+                 << ", padded width: " << d->framebufferImage->stride;
+#endif
+        this->fb = (char *)d->framebufferImage->data;
+    } else {
+        qWarning() << "xcb framebuffer: ERROR: Failed to get primary screen image!";
+        return;
+    }
+
+    // all XShm operations should take place only if Xshm extension was loaded
+    if (d->x11EvtFilter->xshmAvail) {
+        // Create xcb_image_t structure, but do not automatically allocate memory
+        // for image data storage - it will be allocated as shared memory.
+        // "If base == 0 and bytes == ~0 and data == 0, no storage will be auto-allocated."
+        // Width and height of the image = size of the capture area.
+        d->updateTile = xcb_image_create_native(
+                    QX11Info::connection(),
+                    d->area.width(),            // width
+                    d->area.height(),           // height
+                    XCB_IMAGE_FORMAT_Z_PIXMAP,  // image format
+                    d->rootScreen->root_depth,  // depth
+                    nullptr,                    // base address = 0
+                    (uint32_t)~0,               // bytes = 0xffffffff
+                    nullptr);                   // data = 0
+        if (d->updateTile) {
+#ifdef _DEBUG
+            qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
+            qDebug() << "    size: " << d->updateTile->width << "x" << d->updateTile->height
+                     << "(stride: " << d->updateTile->stride << ")";
+            qDebug() << "    bpp, depth:  " << d->updateTile->bpp << d->updateTile->depth; // 32, 24
+            qDebug() << "    addr of base, data:  " << d->updateTile->base << (void *)d->updateTile->data;
+            qDebug() << "    size:  " << d->updateTile->size;
+            qDebug() << "    image byte order = " << d->updateTile->byte_order;  // == 0 .._LSB_FIRST
+            qDebug() << "    image bit order = " << d->updateTile->bit_order;    // == 1 .._MSB_FIRST
+            qDebug() << "    image plane_mask = " << d->updateTile->plane_mask;  // == 16777215 == 0x00FFFFFF
+#endif
+
+            // allocate shared memory block only once, make its size large enough
+            // to fit whole capture area (d->area rect)
+            // so, we get as many bytes as needed for image (updateTile->size)
+            d->shminfo.shmid = shmget(IPC_PRIVATE, d->updateTile->size, IPC_CREAT | 0777);
+            // attached shared memory address is stored both in shminfo structure and in xcb_image_t->data
+            d->shminfo.shmaddr = (uint8_t *)shmat(d->shminfo.shmid, nullptr, 0);
+            d->updateTile->data = d->shminfo.shmaddr;
+            // we keep updateTile->base == NULL here, so xcb_image_destroy() will not attempt
+            // to free this block, just in case.
+
+            // attach this shm segment also to X server
+            d->shminfo.shmseg = xcb_generate_id(QX11Info::connection());
+            xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
+
+#ifdef _DEBUG
+            qDebug() << "    shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
+#endif
+
+            // will return 1 on success (yes!)
+            int shmget_res = xcb_image_shm_get(
+                        QX11Info::connection(),
+                        this->win,
+                        d->updateTile,
+                        d->shminfo,
+                        d->area.left(), // x
+                        d->area.top(),  // y (size taken from image structure itself)?
+                        0xFFFFFFFF);
+
+            if (shmget_res == 0) {
+                // error! shared mem not working?
+                // will not use shared mem! detach and cleanup
+                xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg);
+                shmdt(d->shminfo.shmaddr);
+                shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
+                d->x11EvtFilter->xshmAvail = false;
+                d->shminfo.shmaddr = nullptr;
+                d->shminfo.shmid = XCB_NONE;
+                d->shminfo.shmseg = XCB_NONE;
+                qWarning() << "xcb framebuffer: ERROR: xcb_image_shm_get() result: " << shmget_res;
+            }
+
+            // image is freed, and recreated again for every new damage rectangle
+            // data was allocated manually and points to shared mem;
+            // tell xcb_image_destroy() do not free image data
+            d->updateTile->data = nullptr;
+            xcb_image_destroy(d->updateTile);
+            d->updateTile = nullptr;
+        }
+    }
+
+#ifdef _DEBUG
+    qDebug() << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
+             << ", xshm base error = " << d->x11EvtFilter->xdamageBaseError
+             << ", xdamage base event = " << d->x11EvtFilter->xdamageBaseEvent
+             << ", xdamage base error = " << d->x11EvtFilter->xdamageBaseError;
+#endif
+
+    QCoreApplication::instance()->installNativeEventFilter(d->x11EvtFilter);
+}
+
+
+XCBFrameBuffer::~XCBFrameBuffer() {
+    // first - uninstall x11 event filter
+    QCoreApplication::instance()->removeNativeEventFilter(d->x11EvtFilter);
+    //
+    if (d->framebufferImage) {
+        xcb_image_destroy(d->framebufferImage);
+        fb = nullptr;  // image data was already destroyed by above call
+    }
+    if (d->x11EvtFilter->xshmAvail) {
+        // detach shared memory
+        if (d->shminfo.shmseg != XCB_NONE)
+            xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg); // detach from X server
+        if (d->shminfo.shmaddr)
+            shmdt(d->shminfo.shmaddr); // detach addr from our address space
+        if (d->shminfo.shmid != XCB_NONE)
+            shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
+    }
+    // and delete image used for shared mem
+    if (d->updateTile) {
+        d->updateTile->base = nullptr;
+        d->updateTile->data = nullptr;
+        xcb_image_destroy(d->updateTile);
+    }
+    // we don't use d->x11EvtFilter anymore, can delete it now
+    if (d->x11EvtFilter) {
+        delete d->x11EvtFilter;
+    }
+    delete d;
+}
+
+
+int XCBFrameBuffer::depth() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->depth;
+    }
+    return 0;
+}
+
+
+int XCBFrameBuffer::height() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->height;
+    }
+    return 0;
+}
+
+
+int XCBFrameBuffer::width() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->width;
+    }
+    return 0;
+}
+
+int XCBFrameBuffer::paddedWidth() {
+    if (d->framebufferImage) {
+        return d->framebufferImage->stride;
+    }
+    return 0;
+}
+
+
+void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
+    if (!d->framebufferImage) return;
+
+    // get information about XCB visual params
+    xcb_visualtype_t *root_visualtype = nullptr;  // visual info
+    if (d->rootScreen) {
+        xcb_visualid_t root_visual = d->rootScreen->root_visual;
+        xcb_depth_iterator_t depth_iter;
+        // To get the xcb_visualtype_t structure, it's a bit less easy.
+        // You have to get the xcb_screen_t structure that you want, get its
+        // root_visual member, then iterate over the xcb_depth_t's and the
+        // xcb_visualtype_t's, and compare the xcb_visualid_t of these
+        // xcb_visualtype_ts: with root_visual
+        depth_iter = xcb_screen_allowed_depths_iterator(d->rootScreen);
+        for (; depth_iter.rem; xcb_depth_next(&depth_iter)) {
+            xcb_visualtype_iterator_t visual_iter;
+            visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
+            for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) {
+                if (root_visual == visual_iter.data->visual_id) {
+                    root_visualtype = visual_iter.data;
+                    break;
+                }
+            }
+        }
+    }
+
+
+    // fill in format common info
+    format.bitsPerPixel = d->framebufferImage->bpp;
+    format.depth = d->framebufferImage->depth;
+    format.trueColour = true;  // not using color palettes
+    format.bigEndian = false;  // always false for ZPIXMAP format!
+
+    // 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",
+               (int)root_visualtype->bits_per_rgb_value,
+               root_visualtype->red_mask,
+               root_visualtype->green_mask,
+               root_visualtype->blue_mask,
+               (int)pixelmaxValue);
+#endif
+
+        // calculate shifts
+        format.redShift = 0;
+        format.redMax = pixelmaxValue;
+        if (root_visualtype->red_mask) {
+            while (!(root_visualtype->red_mask & (1 << format.redShift))) {
+                format.redShift++;
+            }
+        }
+        format.greenShift = 0;
+        format.greenMax = pixelmaxValue;
+        if (root_visualtype->green_mask) {
+            while (!(root_visualtype->green_mask & (1 << format.greenShift))) {
+                format.greenShift++;
+            }
+        }
+        format.blueShift = 0;
+        format.blueMax = pixelmaxValue;
+        if (root_visualtype->blue_mask) {
+            while (!(root_visualtype->blue_mask & (1 << format.blueShift))) {
+                format.blueShift++;
+            }
+        }
+
+#ifdef _DEBUG
+        qDebug() << "    Calculated redShift   =" << (int)format.redShift;
+        qDebug() << "    Calculated greenShift =" << (int)format.greenShift;
+        qDebug() << "    Calculated blueShift  =" << (int)format.blueShift;
+#endif
+    } else {
+        // some kind of fallback (unlikely code execution will go this way)
+        // idea taken from qt framefuffer sources
+        if (format.bitsPerPixel == 8) {
+            format.redShift   = 0;
+            format.greenShift = 3;
+            format.blueShift  = 6;
+            format.redMax   = 7;
+            format.greenMax = 7;
+            format.blueMax  = 3;
+        } else if (format.bitsPerPixel == 16) {
+            // TODO: 16 bits per pixel format ??
+            // what format of pixels does X server use for 16-bpp?
+        } else if (format.bitsPerPixel == 32) {
+            format.redMax   = 0xff;
+            format.greenMax = 0xff;
+            format.blueMax  = 0xff;
+            if (format.bigEndian) {
+                format.redShift   = 0;
+                format.greenShift = 8;
+                format.blueShift  = 16;
+            } else {
+                format.redShift   = 16;
+                format.greenShift = 8;
+                format.blueShift  = 0;
+            }
+        }
+    }
+}
+
+
+/**
+ * This function contents was taken from X11 framebuffer source code.
+ * It simply several intersecting rectangles into one bigger rect.
+ * Non-intersecting rects are treated as different rects and exist
+ * separately in this->tiles QList.
+ */
+void XCBFrameBuffer::cleanupRects() {
+    QList<QRect> cpy = tiles;
+    bool inserted = false;
+    tiles.clear();
+
+    QListIterator<QRect> iter(cpy);
+    while (iter.hasNext()) {
+        const QRect &r = iter.next();
+        // skip rects not intersecting with primary monitor
+        if (!r.intersects(d->area)) continue;
+        // only take intersection of this rect with primary monitor rect
+        QRect ri = r.intersected(d->area);
+
+        if (tiles.size() > 0) {
+            for (int i = 0; i < tiles.size(); i++) {
+                // if current rect has intersection with tiles[i], unite them
+                if (ri.intersects(tiles[i])) {
+                    tiles[i] |= ri;
+                    inserted = true;
+                    break;
+                }
+            }
+
+            if (!inserted) {
+                // else, append to list as different rect
+                tiles.append(ri);
+            }
+        } else {
+            // tiles list is empty, append first item
+            tiles.append(ri);
+        }
+    }
+
+    // increase all rectangles size by 30 pixels each side.
+    // limit coordinates to primary monitor boundaries.
+    for (int i = 0; i < tiles.size(); i++) {
+        tiles[i].adjust(-30, -30, 30, 30);
+        if (tiles[i].top() < d->area.top()) {
+            tiles[i].setTop(d->area.top());
+        }
+        if (tiles[i].bottom() > d->area.bottom()) {
+            tiles[i].setBottom(d->area.bottom());
+        }
+        //
+        if (tiles[i].left() < d->area.left()) {
+            tiles[i].setLeft(d->area.left());
+        }
+        if (tiles[i].right() > d->area.right()) {
+            tiles[i].setRight(d->area.right());
+        }
+        // move update rects so that they are positioned relative to
+        //   framebuffer image, not whole screen
+        tiles[i].moveTo(tiles[i].left() - d->area.left(),
+                        tiles[i].top() - d->area.top());
+    }
+}
+
+
+/**
+ * This function is called by RfbServerManager::updateScreens()
+ * approximately every 50ms (!!), driven by QTimer to get all
+ * modified rectangles on the screen
+ */
+QList<QRect> XCBFrameBuffer::modifiedTiles() {
+    QList<QRect> ret;
+    if (!d->running) {
+        return ret;
+    }
+
+    cleanupRects();
+
+    if (tiles.size() > 0) {
+        if (d->x11EvtFilter->xshmAvail) {
+
+            // loop over all damage rectangles gathered up to this time
+            QListIterator<QRect> iter(tiles);
+            //foreach(const QRect &r, tiles) {
+            while (iter.hasNext()) {
+                const QRect &r = iter.next();
+
+                // get image data into shared memory segment
+                // now rects are positioned relative to framebufferImage,
+                // but we need to get image from the whole screen, so
+                // translate whe coordinates
+                xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
+                            QX11Info::connection(),
+                            this->win,
+                            d->area.left() + r.left(),
+                            d->area.top()  + r.top(),
+                            r.width(),
+                            r.height(),
+                            0xFFFFFFFF,
+                            XCB_IMAGE_FORMAT_Z_PIXMAP,
+                            d->shminfo.shmseg,
+                            0);
+
+                xcb_shm_get_image_reply_t *sgi_reply = xcb_shm_get_image_reply(
+                            QX11Info::connection(), sgi_cookie, nullptr);
+                if (sgi_reply) {
+                    // create temporary image to get update rect contents into
+                    d->updateTile = xcb_image_create_native(
+                                QX11Info::connection(),
+                                r.width(),
+                                r.height(),
+                                XCB_IMAGE_FORMAT_Z_PIXMAP,
+                                d->rootScreen->root_depth,
+                                nullptr,      // base == 0
+                                (uint32_t)~0, // bytes == ~0
+                                nullptr);
+
+                    if (d->updateTile) {
+                        d->updateTile->data = d->shminfo.shmaddr;
+
+                        // copy pixels from this damage rectangle image
+                        // to our total framebuffer image
+                        int pxsize =  d->framebufferImage->bpp / 8;
+                        char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
+                        char *src = (char *)d->updateTile->data;
+                        for (int i = 0; i < d->updateTile->height; i++) {
+                            memcpy(dest, src, d->updateTile->stride);  // copy whole row of pixels
+                            dest += d->framebufferImage->stride;
+                            src += d->updateTile->stride;
+                        }
+
+                        // delete temporary image
+                        d->updateTile->data = nullptr;
+                        xcb_image_destroy(d->updateTile);
+                        d->updateTile = nullptr;
+                    }
+
+                    free(sgi_reply);
+                }
+            } // foreach
+        } else {
+            // not using shared memory
+            // will use just xcb_image_get() and copy pixels
+            for (const QRect& r : qAsConst(tiles)) {
+                // I did not find XGetSubImage() analog in XCB!!
+                // need function that copies pixels from one image to another
+                xcb_image_t *damagedImage = xcb_image_get(
+                            QX11Info::connection(),
+                            this->win,
+                            r.left(),
+                            r.top(),
+                            r.width(),
+                            r.height(),
+                            0xFFFFFFFF, // AllPlanes
+                            XCB_IMAGE_FORMAT_Z_PIXMAP);
+                // manually copy pixels
+                int pxsize =  d->framebufferImage->bpp / 8;
+                char *dest = fb + ((d->framebufferImage->stride * r.top()) + (r.left() * pxsize));
+                char *src = (char *)damagedImage->data;
+                // loop every row in damaged image
+                for (int i = 0; i < damagedImage->height; i++) {
+                    // copy whole row of pixels from src image to dest
+                    memcpy(dest, src, damagedImage->stride);
+                    dest += d->framebufferImage->stride;  // move 1 row down in dest
+                    src += damagedImage->stride;          // move 1 row down in src
+                }
+                //
+                xcb_image_destroy(damagedImage);
+            }
+        }
+    } // if (tiles.size() > 0)
+
+    ret = tiles;
+    tiles.clear();
+    // ^^ If we clear here all our known "damage areas", then we can also clear
+    //    damaged area for xdamage? No, we don't need to in our case
+    //    (XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES report mode)
+    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+
+    return ret;
+}
+
+
+void XCBFrameBuffer::startMonitor() {
+    if (d->running) return;
+
+    d->running = true;
+    d->damage = xcb_generate_id(QX11Info::connection());
+    xcb_damage_create(QX11Info::connection(), d->damage, this->win,
+            XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
+
+    // (currently) we do not call xcb_damage_subtract() EVER, because
+    // RAW rectangles are reported. every time some area of the screen
+    // was changed, we get only that rectangle
+    //xcb_damage_subtract(QX11Info::connection(), d->damage, XCB_NONE, XCB_NONE);
+}
+
+
+void XCBFrameBuffer::stopMonitor() {
+    if (!d->running) return;
+    d->running = false;
+    xcb_damage_destroy(QX11Info::connection(), d->damage);
+}
+
+
+// void XCBFrameBuffer::acquireEvents() {} // this function was totally unused
+// in X11 framebuffer, but it was the only function where XDamageSubtract() was called?
+// Also it had a blocking event loop like:
+//
+//     XEvent ev;
+//     while (XCheckTypedEvent(QX11Info::display(), d->xdamageBaseEvent + XDamageNotify, &ev)) {
+//         handleXDamage(&ev);
+//     }
+//     XDamageSubtract(QX11Info::display(), d->damage, None, None);
+//
+// This loop takes all available Xdamage events from queue, and ends if there are no
+// more such events in input queue.
+
+
+void XCBFrameBuffer::handleXDamageNotify(xcb_generic_event_t *xevent) {
+    xcb_damage_notify_event_t *xdevt = (xcb_damage_notify_event_t *)xevent;
+
+    QRect r((int)xdevt->area.x,     (int)xdevt->area.y,
+            (int)xdevt->area.width, (int)xdevt->area.height);
+    this->tiles.append(r);
+}
+

framebuffers/xcb/xcb_framebuffer.h

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

framebuffers/xcb/xcb_framebufferplugin.cpp

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

framebuffers/xcb/xcb_framebufferplugin.h

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

icons/CMakeLists.txt

@@ -0,0 +1,4 @@
+ecm_install_icons(ICONS
+    sc-apps-krfb.svgz
+    48-apps-krfb.png
+DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )

krfb.kdev4

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

krfb/CMakeLists.txt

@@ -2,6 +2,8 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake
                 ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h
 )
 
+include(GenerateExportHeader)
+
 #####################################
 # First target: libkrfbprivate - a library
 # for linking plugins against.
@@ -11,21 +13,23 @@ set (krfbprivate_SRCS
      framebufferplugin.cpp
 )
 
-kde4_add_library (krfbprivate
+add_library (krfbprivate
                   SHARED
                   ${krfbprivate_SRCS}
 )
+generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
 target_link_libraries (krfbprivate
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
+                       Qt5::Core
+                       Qt5::Widgets
+                       Qt5::X11Extras
                        ${X11_X11_LIB}
                        ${LIBVNCSERVER_LIBRARIES}
 )
 
 set_target_properties (krfbprivate PROPERTIES
-                       VERSION ${GENERIC_LIB_VERSION}
-                       SOVERSION ${GENERIC_LIB_VERSION}
+                       VERSION 5
+                       SOVERSION 5.0
 )
 
 install (TARGETS krfbprivate
@@ -42,16 +46,6 @@ install (FILES
 # Second target: krfb - the app
 # itself.
 
-if(TelepathyQt4_FOUND)
-    add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
-    include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
-endif()
-
-if(KTP_FOUND)
-    add_definitions(-DKRFB_WITH_KDE_TELEPATHY)
-    include_directories(${KTP_INCLUDE_DIR})
-endif()
-
 set (krfb_SRCS
      connectiondialog.cpp
      events.cpp
@@ -67,60 +61,45 @@ set (krfb_SRCS
      invitationsrfbclient.cpp
 )
 
-if(TelepathyQt4_FOUND)
-    set (krfb_SRCS
-         ${krfb_SRCS}
-         tubesrfbserver.cpp
-         tubesrfbclient.cpp
-    )
-endif()
-
-kde4_add_kcfg_files (krfb_SRCS
+kconfig_add_kcfg_files (krfb_SRCS
                      krfbconfig.kcfgc
 )
 
-kde4_add_ui_files (krfb_SRCS
+ki18n_wrap_ui (krfb_SRCS
                    ui/configtcp.ui
                    ui/configsecurity.ui
+                   ui/configframebuffer.ui
                    ui/connectionwidget.ui
                    ui/mainwidget.ui
 )
 
-if(TelepathyQt4_FOUND)
-    kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
-endif()
+qt5_add_resources(krfb_SRCS
+    krfb.qrc
+)
 
-kde4_add_executable (krfb
+add_executable (krfb
                      ${krfb_SRCS}
 )
 
 target_link_libraries (krfb
                        krfbprivate
-                       vncserver
                        ${JPEG_LIBRARIES}
                        ${X11_Xext_LIB}
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
-                       ${QT_QTNETWORK_LIBRARY}
-                       ${KDE4_KDNSSD_LIBS}
-                       ${KDE4_KDEUI_LIBS}
+                       Qt5::Network
+                       KF5::Completion
+                       KF5::CoreAddons
+                       KF5::DBusAddons
+                       KF5::DNSSD
+                       KF5::I18n
+                       KF5::Notifications
+                       KF5::Wallet
+                       KF5::WidgetsAddons
+                       KF5::XmlGui
                        ${LIBVNCSERVER_LIBRARIES}
 )
 
-if(TelepathyQt4_FOUND)
-    target_link_libraries(krfb
-                          ${TELEPATHY_QT4_LIBRARIES}
-    )
-endif()
-
-if(KTP_FOUND)
-    target_link_libraries(krfb
-                          ${KTP_LIBRARIES}
-                          ${KTP_MODELS_LIBRARIES}
-                          ${KTP_WIDGETS_LIBRARIES}
-    )
-endif()
-
 if (X11_XTest_FOUND)
     target_link_libraries (krfb
                            ${X11_XTest_LIB}
@@ -131,21 +110,16 @@ install (TARGETS krfb
          ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
-if(TelepathyQt4_FOUND)
-    configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
-                   org.freedesktop.Telepathy.Client.krfb_rfb_handler.service)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service
-            DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-
-    install(FILES krfb_rfb_handler.client DESTINATION ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/)
-endif()
-
 ########### install files ###############
 
-install (PROGRAMS krfb.desktop
+install (PROGRAMS org.kde.krfb.desktop
          DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
+install(FILES org.kde.krfb.appdata.xml
+        DESTINATION ${KDE_INSTALL_METAINFODIR}
+)
+
 install (FILES krfb.notifyrc
          DESTINATION ${DATA_INSTALL_DIR}/krfb
 )

krfb/connectiondialog.cpp

@@ -21,20 +21,33 @@
 
 #include "connectiondialog.h"
 
-#include <KIconLoader>
-#include <KLocale>
-#include <KStandardGuiItem>
+#include <QCheckBox>
+#include <QIcon>
 
-#include <QtGui/QCheckBox>
-#include <QtGui/QLabel>
+#include <KLocalizedString>
+#include <KStandardGuiItem>
+#include <KConfigGroup>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <KGuiItem>
+#include <QVBoxLayout>
 
 template <typename UI>
 ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
-    : KDialog(parent)
+    : QDialog(parent)
 {
-    setCaption(i18n("New Connection"));
-    setButtons(Ok | Cancel);
-    setDefaultButton(Cancel);
+    setWindowTitle(i18n("New Connection"));
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QWidget *mainWidget = new QWidget(this);
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    mainLayout->addWidget(mainWidget);
+    QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setDefault(true);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &ConnectionDialog<UI>::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &ConnectionDialog<UI>::reject);
+    buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true);
     setModal(true);
 
     setMinimumSize(500, 200);
@@ -42,17 +55,18 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     m_connectWidget = new QWidget(this);
     m_ui.setupUi(m_connectWidget);
 
-    m_ui.pixmapLabel->setPixmap(KIcon("krfb").pixmap(128));
+    m_ui.pixmapLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
 
     KGuiItem accept = KStandardGuiItem::ok();
     accept.setText(i18n("Accept Connection"));
-    setButtonGuiItem(Ok, accept);
+    KGuiItem::assign(okButton, accept);
 
     KGuiItem refuse = KStandardGuiItem::cancel();
     refuse.setText(i18n("Refuse Connection"));
-    setButtonGuiItem(Cancel, refuse);
+    KGuiItem::assign(buttonBox->button(QDialogButtonBox::Cancel), refuse);
 
-    setMainWidget(m_connectWidget);
+    mainLayout->addWidget(m_connectWidget);
+    mainLayout->addWidget(buttonBox);
 }
 
 //**********
@@ -66,23 +80,3 @@ void InvitationsConnectionDialog::setRemoteHost(const QString &host)
 {
     m_ui.remoteHost->setText(host);
 }
-
-//**********
-
-#ifdef KRFB_WITH_TELEPATHY_TUBES
-
-TubesConnectionDialog::TubesConnectionDialog(QWidget *parent)
-    : ConnectionDialog<Ui::TubesConnectionWidget>(parent)
-{
-}
-
-void TubesConnectionDialog::setContactName(const QString & name)
-{
-    QString txt = i18n("You have requested to share your desktop with %1. If you proceed, "
-                       "you will allow the remote user to watch your desktop.", name);
-    m_ui.mainTextLabel->setText(txt);
-}
-
-#endif // KRFB_WITH_TELEPATHY_TUBES
-
-#include "connectiondialog.moc"

krfb/connectiondialog.h

@@ -23,14 +23,14 @@
 #define CONNECTIONDIALOG_H
 
 #include "ui_connectionwidget.h"
-#include <KDialog>
+#include <QDialog>
 
 template <typename UI>
-class ConnectionDialog : public KDialog
+class ConnectionDialog : public QDialog
 {
 public:
-    ConnectionDialog(QWidget *parent);
-    ~ConnectionDialog() {};
+    explicit ConnectionDialog(QWidget *parent);
+    ~ConnectionDialog() override {};
 
     void setAllowRemoteControl(bool b);
     bool allowRemoteControl();
@@ -59,24 +59,11 @@ class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget
 {
     Q_OBJECT
 public:
-    InvitationsConnectionDialog(QWidget *parent);
+    explicit InvitationsConnectionDialog(QWidget *parent);
     void setRemoteHost(const QString & host);
 };
 
 //*********
 
-#ifdef KRFB_WITH_TELEPATHY_TUBES
-# include "ui_tubesconnectionwidget.h"
-
-class TubesConnectionDialog : public ConnectionDialog<Ui::TubesConnectionWidget>
-{
-    Q_OBJECT
-public:
-    TubesConnectionDialog(QWidget *parent);
-    void setContactName(const QString & name);
-};
-
-#endif // KRFB_WITH_TELEPATHY_TUBES
-
 #endif // CONNECTIONDIALOG_H
 

krfb/events.cpp

@@ -24,10 +24,10 @@
 
 #include "events.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QX11Info>
-#include <QtGui/QDesktopWidget>
-#include <KGlobal>
+#include <QApplication>
+#include <QX11Info>
+#include <QDesktopWidget>
+#include <QGlobalStatic>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -60,7 +60,7 @@ private:
     void init();
 };
 
-K_GLOBAL_STATIC(EventData, data)
+Q_GLOBAL_STATIC(EventData, data)
 
 EventData::EventData()
 {

krfb/framebuffer.cpp

@@ -9,7 +9,7 @@
 
 #include "framebuffer.h"
 
-#include "config-krfb.h"
+#include <config-krfb.h>
 
 #include <X11/Xutil.h>
 
@@ -67,7 +67,3 @@ void FrameBuffer::startMonitor()
 void FrameBuffer::stopMonitor()
 {
 }
-
-
-#include "framebuffer.moc"
-

krfb/framebuffer.h

@@ -12,25 +12,25 @@
 
 #include "rfb.h"
 
-#include <kdemacros.h>
+#include "krfbprivate_export.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QList>
+#include <QObject>
+#include <QRect>
+#include <QList>
+#include <QWidget>
 
-#include <QtGui/QWidget>
 
 class FrameBuffer;
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
 */
-class KDE_EXPORT FrameBuffer : public QObject
+class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
     Q_OBJECT
 public:
-    explicit FrameBuffer(WId id, QObject *parent = 0);
+    explicit FrameBuffer(WId id, QObject *parent = nullptr);
 
-    virtual ~FrameBuffer();
+    ~FrameBuffer() override;
 
     char *data();
 

krfb/framebuffermanager.cpp

@@ -23,11 +23,14 @@
 #include "framebufferplugin.h"
 #include "krfbconfig.h"
 
-#include <KDebug>
-#include <KGlobal>
-#include <KServiceTypeTrader>
+#include <QDebug>
+#include <QGlobalStatic>
 
-#include <QtCore/QSharedPointer>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KPluginMetaData>
+
+#include <QSharedPointer>
 
 class FrameBufferManagerStatic
 {
@@ -35,71 +38,75 @@ public:
     FrameBufferManager instance;
 };
 
-K_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
+Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {
-    kDebug();
+    //qDebug();
 
     loadPlugins();
 }
 
 FrameBufferManager::~FrameBufferManager()
 {
-    kDebug();
+    //qDebug();
 }
 
 FrameBufferManager *FrameBufferManager::instance()
 {
-    kDebug();
+    //qDebug();
 
     return &frameBufferManagerStatic->instance;
 }
 
 void FrameBufferManager::loadPlugins()
 {
-    kDebug();
+    //qDebug();
 
-    // Load the all the plugin factories here, for use later.
-    KService::List offers = KServiceTypeTrader::self()->query("krfb/framebuffer");
+    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
+            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
+        });
 
-    KService::List::const_iterator iter;
-
-    for (iter = offers.constBegin(); iter < offers.constEnd(); ++iter) {
-        QString error;
-        KService::Ptr service = *iter;
-
-        KPluginFactory *factory = KPluginLoader(service->library()).factory();
+    QVectorIterator<KPluginMetaData> i(plugins);
+    i.toBack();
+    QSet<QString> unique;
+    while (i.hasPrevious()) {
+        const KPluginMetaData &data = i.previous();
+        // only load plugins once, even if found multiple times!
+        if (unique.contains(data.name()))
+            continue;
+        KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
 
         if (!factory) {
-            kWarning() << "KPluginFactory could not load the plugin:" << service->library();
-            continue;
+            qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
+        } else {
+            qDebug() << "found plugin at " << data.fileName();
         }
 
         FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
-
         if (plugin) {
-            kDebug() << "Loaded plugin:" << service->name();
-            m_plugins.insert(service->library(), plugin);
+            m_plugins.insert(data.pluginId(), plugin);
+            qDebug() << "Loaded plugin with name " << data.pluginId();
         } else {
-            kDebug() << error;
+            qDebug() << "unable to load pluign for " << data.fileName();
         }
+        unique.insert (data.name());
     }
 }
 
 QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
 {
-    kDebug();
+    //qDebug();
 
     // See if there is still an existing framebuffer to this WId.
     if (m_frameBuffers.contains(id)) {
         QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);
 
         if (weakFrameBuffer) {
-            kDebug() << "Found cached frame buffer.";
+            //qDebug() << "Found cached frame buffer.";
             return weakFrameBuffer.toStrongRef();
         } else {
-            kDebug() << "Found deleted cached frame buffer. Don't use.";
+            //qDebug() << "Found deleted cached frame buffer. Don't use.";
             m_frameBuffers.remove(id);
         }
     }
@@ -110,7 +117,7 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
     while (iter != m_plugins.constEnd()) {
 
         if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            kDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+            qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
 
             QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
 
@@ -125,10 +132,6 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
     }
 
     // No valid framebuffer plugin found.
-    kDebug() << "No valid framebuffer found. returning null.";
+    qDebug() << "No valid framebuffer found. returning null.";
     return QSharedPointer<FrameBuffer>();
 }
-
-
-#include "framebuffermanager.moc"
-

krfb/framebuffermanager.h

@@ -23,19 +23,19 @@
 
 #include "framebuffer.h"
 
-#include <kdemacros.h>
+#include "krfbprivate_export.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QWeakPointer>
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class FrameBufferPlugin;
 class KPluginFactory;
 
-class KDE_EXPORT FrameBufferManager : public QObject
+class KRFBPRIVATE_EXPORT FrameBufferManager : public QObject
 {
     Q_OBJECT
     friend class FrameBufferManagerStatic;
@@ -43,7 +43,7 @@ class KDE_EXPORT FrameBufferManager : public QObject
 public:
     static FrameBufferManager *instance();
 
-    virtual ~FrameBufferManager();
+    ~FrameBufferManager() override;
 
     QSharedPointer<FrameBuffer> frameBuffer(WId id);
 

krfb/framebufferplugin.cpp

@@ -30,7 +30,3 @@ FrameBufferPlugin::FrameBufferPlugin(QObject *parent, const QVariantList &)
 FrameBufferPlugin::~FrameBufferPlugin()
 {
 }
-
-
-#include "framebufferplugin.moc"
-

krfb/framebufferplugin.h

@@ -21,25 +21,24 @@
 #ifndef LIB_KRFB_FRAMEBUFFERPLUGIN_H
 #define LIB_KRFB_FRAMEBUFFERPLUGIN_H
 
-#include <kdemacros.h>
+#include "krfbprivate_export.h"
 
-#include <QtCore/QVariantList>
+#include <QVariantList>
+#include <QWidget>
 
-#include <QtGui/QWidget>
 
 class FrameBuffer;
 
-class KDE_EXPORT FrameBufferPlugin : public QObject
+class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
 {
     Q_OBJECT
 
 public:
     FrameBufferPlugin(QObject *parent, const QVariantList &args);
-    virtual ~FrameBufferPlugin();
+    ~FrameBufferPlugin() override;
 
     virtual FrameBuffer *frameBuffer(WId id) = 0;
 };
 
-
 #endif  // Header guard
 

krfb/invitationsrfbclient.cpp

@@ -24,10 +24,14 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "connectiondialog.h"
+
 #include <KNotification>
-#include <KLocale>
-#include <QtCore/QSocketNotifier>
+#include <KLocalizedString>
+
+#include <QDebug>
+#include <QSocketNotifier>
 #include <poll.h>
+#include <KConfigGroup>
 
 struct PendingInvitationsRfbClient::Private
 {
@@ -50,8 +54,8 @@ PendingInvitationsRfbClient::PendingInvitationsRfbClient(rfbClientPtr client, QO
     d->client->clientGoneHook = clientGoneHookNoop;
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(true);
-    connect(d->notifier, SIGNAL(activated(int)),
-            this, SLOT(onSocketActivated()));
+    connect(d->notifier, &QSocketNotifier::activated,
+            this, &PendingInvitationsRfbClient::onSocketActivated);
 }
 
 PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
@@ -61,26 +65,26 @@ PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
 
 void PendingInvitationsRfbClient::processNewClient()
 {
-    QString host = peerAddress(m_rfbClient->sock) + ":" + QString::number(peerPort(m_rfbClient->sock));
+    QString host = peerAddress(m_rfbClient->sock) + QLatin1Char(':') + QString::number(peerPort(m_rfbClient->sock));
 
     if (d->askOnConnect == false) {
 
-        KNotification::event("NewConnectionAutoAccepted",
+        KNotification::event(QStringLiteral("NewConnectionAutoAccepted"),
                              i18n("Accepted connection from %1", host));
         accept(new InvitationsRfbClient(m_rfbClient, parent()));
 
     } else {
 
-        KNotification::event("NewConnectionOnHold",
+        KNotification::event(QStringLiteral("NewConnectionOnHold"),
                             i18n("Received connection from %1, on hold (waiting for confirmation)",
                                 host));
 
-        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(0);
+        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(nullptr);
         dialog->setRemoteHost(host);
         dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
 
-        connect(dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
-        connect(dialog, SIGNAL(cancelClicked()), SLOT(reject()));
+        connect(dialog, &InvitationsConnectionDialog::accepted, this, &PendingInvitationsRfbClient::dialogAccepted);
+        connect(dialog, &InvitationsConnectionDialog::rejected, this, &PendingInvitationsRfbClient::reject);
 
         dialog->show();
     }
@@ -111,7 +115,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
         //the clientGoneHook which in turn will remove this RfbClient instance
         //from the server manager and will call deleteLater() to delete it
         if (d->client->sock == -1) {
-            kDebug() << "disconnected from socket signal";
+            qDebug() << "disconnected from socket signal";
             d->notifier->setEnabled(false);
             rfbClientConnectionGone(d->client);
             break;
@@ -122,7 +126,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
 bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     QByteArray password ;
-    kDebug() << "about to start autentication";
+    qDebug() << "about to start authentication";
 
     if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
             InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
@@ -145,5 +149,3 @@ void PendingInvitationsRfbClient::dialogAccepted()
     client->setControlEnabled(dialog->allowRemoteControl());
     accept(client);
 }
-
-#include "invitationsrfbclient.moc"

krfb/invitationsrfbclient.h

@@ -23,7 +23,7 @@
 class InvitationsRfbClient : public RfbClient
 {
 public:
-    InvitationsRfbClient(rfbClientPtr client, QObject* parent = 0)
+    explicit InvitationsRfbClient(rfbClientPtr client, QObject* parent = nullptr)
         : RfbClient(client, parent) {}
 };
 
@@ -32,13 +32,13 @@ class PendingInvitationsRfbClient : public PendingRfbClient
 {
     Q_OBJECT
 public:
-    PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~PendingInvitationsRfbClient();
+    explicit PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~PendingInvitationsRfbClient() override;
 
 protected Q_SLOTS:
-    virtual void processNewClient();
+    void processNewClient() override;
     virtual void onSocketActivated();
-    virtual bool checkPassword(const QByteArray & encryptedPassword);
+    bool checkPassword(const QByteArray & encryptedPassword) override;
 
 private Q_SLOTS:
     void dialogAccepted();

krfb/invitationsrfbserver.cpp

@@ -22,17 +22,18 @@
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
 #include "rfbservermanager.h"
-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtNetwork/QHostInfo>
-#include <KNotification>
-#include <KLocale>
-#include <KMessageBox>
+#include <QTimer>
+#include <QApplication>
+#include <QHostInfo>
+#include <QDebug>
+
+#include <KLocalizedString>
 #include <KUser>
 #include <KRandom>
 #include <KStringHandler>
-#include <KWallet/Wallet>
-#include <DNSSD/PublicService>
+#include <KWallet/KWallet>
+
+#include <dnssd/publicservice.h>
 using KWallet::Wallet;
 
 //static
@@ -42,21 +43,21 @@ InvitationsRfbServer *InvitationsRfbServer::instance;
 void InvitationsRfbServer::init()
 {
     instance = new InvitationsRfbServer;
-    instance->m_publicService = new DNSSD::PublicService(
+    instance->m_publicService = new KDNSSD::PublicService(
             i18n("%1@%2 (shared desktop)",
                 KUser().loginName(),
                 QHostInfo::localHostName()),
-            "_rfb._tcp",
+            QStringLiteral("_rfb._tcp"),
             KrfbConfig::port());
     instance->setListeningAddress("0.0.0.0");
     instance->setListeningPort(KrfbConfig::port());
     instance->setPasswordRequired(true);
 
-    instance->m_wallet = Wallet::openWallet(
-            Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
-    if(instance->m_wallet) {
-        connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
-                instance, SLOT(walletOpened(bool)));
+    instance->m_wallet = nullptr;
+    if (KrfbConfig::noWallet()) {
+        instance->walletOpened(false);
+    } else {
+        instance->openKWallet();
     }
 }
 
@@ -95,11 +96,11 @@ bool InvitationsRfbServer::start()
     return false;
 }
 
-void InvitationsRfbServer::stop(bool disconnectClients)
+void InvitationsRfbServer::stop()
 {
     if(m_publicService->isPublished())
         m_publicService->stop();
-    RfbServer::stop(disconnectClients);
+    RfbServer::stop();
 }
 
 void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
@@ -109,10 +110,9 @@ void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
 
 InvitationsRfbServer::InvitationsRfbServer()
 {
-    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
+    m_desktopPassword = readableRandomString(4) + QLatin1Char('-') + readableRandomString(3);
+    m_unattendedPassword = readableRandomString(4) + QLatin1Char('-') + readableRandomString(3);
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
     m_allowUnattendedAccess = krfbConfig.readEntry(
             "allowUnattendedAccess", QVariant(false)).toBool();
 }
@@ -120,19 +120,12 @@ InvitationsRfbServer::InvitationsRfbServer()
 InvitationsRfbServer::~InvitationsRfbServer()
 {
     stop();
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
-    krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
-    if(m_wallet && m_wallet->isOpen()) {
 
-         if( (m_wallet->currentFolder()=="krfb") ||
-                 ((m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb")) &&
-                    m_wallet->setFolder("krfb")) ) {
-
-             m_wallet->writePassword("desktopSharingPassword",m_desktopPassword);
-             m_wallet->writePassword("unattendedAccessPassword",m_unattendedPassword);
-         }
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(), "Security");
+    krfbConfig.writeEntry("allowUnattendedAccess", m_allowUnattendedAccess);
 
+    if (!KrfbConfig::noWallet() && m_wallet) {
+        closeKWallet();
     } else {
         krfbConfig.writeEntry("desktopPassword",
                 KStringHandler::obscure(m_desktopPassword));
@@ -148,31 +141,55 @@ PendingRfbClient* InvitationsRfbServer::newClient(rfbClientPtr client)
     return new PendingInvitationsRfbClient(client, this);
 }
 
+void InvitationsRfbServer::openKWallet()
+{
+    m_wallet = Wallet::openWallet(Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
+    if (m_wallet) {
+        connect(instance->m_wallet, &KWallet::Wallet::walletOpened,
+                this, &InvitationsRfbServer::walletOpened);
+    }
+}
+
+void InvitationsRfbServer::closeKWallet()
+{
+    if (m_wallet && m_wallet->isOpen()) {
+        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;
+    }
+}
+
 void InvitationsRfbServer::walletOpened(bool opened)
 {
     QString desktopPassword;
     QString unattendedPassword;
     Q_ASSERT(m_wallet);
+    const QString krfbFolderName = QStringLiteral("krfb");
     if( opened &&
-            ( m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb") ) &&
-            m_wallet->setFolder("krfb") ) {
+            ( m_wallet->hasFolder(krfbFolderName) || m_wallet->createFolder(krfbFolderName) ) &&
+            m_wallet->setFolder(krfbFolderName) ) {
 
-        if(m_wallet->readPassword("desktopSharingPassword", desktopPassword)==0 &&
+        if(m_wallet->readPassword(QStringLiteral("desktopSharingPassword"), desktopPassword)==0 &&
                 !desktopPassword.isEmpty()) {
             m_desktopPassword = desktopPassword;
             emit passwordChanged(m_desktopPassword);
         }
 
-        if(m_wallet->readPassword("unattendedAccessPassword", unattendedPassword)==0 &&
+        if(m_wallet->readPassword(QStringLiteral("unattendedAccessPassword"), unattendedPassword)==0 &&
                 !unattendedPassword.isEmpty()) {
             m_unattendedPassword = unattendedPassword;
         }
 
     } else {
 
-        kDebug() << "Could not open KWallet, Falling back to config file";
-        KSharedConfigPtr config = KGlobal::config();
-        KConfigGroup krfbConfig(config,"Security");
+        qDebug() << "Could not open KWallet, Falling back to config file";
+        KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
 
         desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
                 "desktopPassword", QString()));
@@ -214,10 +231,8 @@ QString InvitationsRfbServer::readableRandomString(int length)
                 (c == '0')) {
             continue;
         }
-        str += c;
+        str += QLatin1Char(c);
         length--;
     }
     return str;
 }
-
-#include "invitationsrfbserver.moc"

krfb/invitationsrfbserver.h

@@ -26,7 +26,7 @@ namespace KWallet {
     class Wallet;
 }
 
-namespace DNSSD {
+namespace KDNSSD {
     class PublicService;
 }
 
@@ -47,20 +47,22 @@ Q_SIGNALS:
     void passwordChanged(const QString&);
 
 public Q_SLOTS:
-    bool start();
-    void stop(bool disconnectClients=true);
-    void toggleUnattendedAccess(bool allow=true);
+    bool start() override;
+    void stop() override;
+    void toggleUnattendedAccess(bool allow);
+    void openKWallet();
+    void closeKWallet();
 
 protected:
     InvitationsRfbServer();
-    virtual ~InvitationsRfbServer();
-    virtual PendingRfbClient* newClient(rfbClientPtr client);
+    ~InvitationsRfbServer() override;
+    PendingRfbClient* newClient(rfbClientPtr client) override;
 
 private Q_SLOTS:
     void walletOpened(bool);
 
 private:
-    DNSSD::PublicService *m_publicService;
+    KDNSSD::PublicService *m_publicService;
     bool m_allowUnattendedAccess;
     QString m_desktopPassword;
     QString m_unattendedPassword;

krfb/krfb-framebuffer.desktop

@@ -3,7 +3,6 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/framebuffer
 
 Comment=Frame Buffer plugins for KRfb
-Comment[ast]=Complementu de buffer pa KRfb
 Comment[bg]=Приставки за фреймбуфер за KRfb
 Comment[bs]=Priključci framebafera za KRfb
 Comment[ca]=Connectors de «framebuffer» per al KRfb.
@@ -19,16 +18,17 @@ Comment[eu]=Irteerako bideoaren pluginak KRfb-rentzako
 Comment[fi]=Kehyspuskuriliitännäinen kohteelle KRfb
 Comment[fr]=Modules externes de sortie vidéo pour Krfb
 Comment[ga]=Breiseáin Mhaoláin Fráma le haghaidh KRfb
-Comment[gl]=Engadido de frame buffer para KRfb
+Comment[gl]=Complementos de búfer de fotograma para KRfb
 Comment[hr]=Priključci za međuspremnike okvira za KRfb
 Comment[hu]=Framebuffer bővítmények a Krfb-hez
 Comment[ia]=Plug-ins de Frame Buffer per KRfb
+Comment[id]=Plugin Frame Buffer untuk KRfb
 Comment[it]=Estensioni del framebuffer per KRfb
 Comment[ja]=KRfb の フレームバッファプラグイン
 Comment[kk]=KRfb кадр буфер плагині
 Comment[km]=កម្មវិធី​ជំនួយ​ Frame Buffer សម្រាប់ KRfb
 Comment[ko]=KRfb 프레임버퍼 플러그인
-Comment[lt]=Frame Buffer priedai skirti KRfb
+Comment[lt]=Frame Buffer papildiniai skirti KRfb
 Comment[lv]=Kadru bufera sprudņi priekš KRfb
 Comment[nb]=Rammebuffer-programtillegg for KRfb
 Comment[nds]=Bildpuffer-Modulen för KRfb
@@ -51,5 +51,5 @@ Comment[th]=ส่วนเสริมของ KRfb สำหรับจั
 Comment[tr]=KRfb için Çerçeve Tamponu eklentileri
 Comment[uk]=Додатки буфера кадрів для KRfb
 Comment[x-test]=xxFrame Buffer plugins for KRfbxx
-Comment[zh_CN]=KRfb 帧缓冲插件
+Comment[zh_CN]=KRfb 的帧缓冲插件
 Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式

krfb/krfb-framebuffer.json

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

krfb/krfb.kcfg

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM
-    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-<kcfg>
-  <kcfgfile />
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name="krfbrc"/>
+  <group name="MainWindow">
+    <entry name="startMinimized" type="Bool">
+    <label>Start minimized</label>
+    <default>false</default>
+    </entry>
+  </group>
   <group name="TCP">
     <entry name="useDefaultPort" type="Bool">
       <label>Use the default port for VNC (5900)</label>
@@ -18,6 +25,10 @@
     </entry>
   </group>
   <group name="Security">
+   <entry name="noWallet" type="Bool">
+      <label>Do not store passwords in KWallet</label>
+      <default>false</default>
+    </entry>
     <entry name="allowDesktopControl" type="Bool">
       <label>Allow remote connections to manage the desktop.</label>
       <default>true</default>
@@ -36,7 +47,7 @@
   <group name="FrameBuffer">
     <entry name="preferredFrameBufferPlugin" type="String">
       <label>Preferred Frame Buffer Plugin</label>
-      <default>krfb_framebuffer_x11</default>
+      <default>xcb</default>
     </entry>
   </group>
 </kcfg>

krfb/krfb.notifyrc

@@ -3,13 +3,12 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Escritoriu compartíu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
 Comment[bs]=Dijeljenje radne površine
-Comment[ca]=Compartició de l'escriptori
-Comment[ca@valencia]=Compartició de l'escriptori
+Comment[ca]=Compartir l'escriptori
+Comment[ca@valencia]=Compartir l'escriptori
 Comment[cs]=Sdílení pracovní plochy
 Comment[cy]=Rhannu Penbwrdd
 Comment[da]=Skrivebordsdeling
@@ -30,13 +29,14 @@ Comment[hne]=डेस्कटाप साझेदारी
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
 Comment[ia]=Compartir de scriptorio
+Comment[id]=Desktop Sharing
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione del desktop
 Comment[ja]=デスクトップ共有
 Comment[kk]=Үстелді ортақтастыру
 Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
 Comment[ko]=데스크톱 공유
-Comment[lt]=Dalinimasis darbastaliu
+Comment[lt]=Dalinimasis darbalaukiu
 Comment[lv]=Darbvirsmas koplietošana
 Comment[mk]=Делење на работната површина
 Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
@@ -75,7 +75,6 @@ Comment[zh_TW]=桌面分享
 [Event/UserAcceptsConnection]
 Name=User Accepts Connection
 Name[ar]=المستخدم يقبل الاتصال
-Name[ast]=L'usuariu aceuta la conexón
 Name[bg]=Потребителят приема връзката
 Name[bs]=Korisnik prihvata vezu
 Name[ca]=L'usuari accepta la connexió
@@ -98,6 +97,7 @@ Name[hne]=कमइया हर कनेक्सन स्वीकारा
 Name[hr]=Korisnik prihvaća vezu
 Name[hu]=A felhasználó engedélyezi a csatlakozást
 Name[ia]=Usator da acceptation a connexion
+Name[id]=Pengguna Menyetujui Koneksi
 Name[is]=Notandi samþykkir tengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
@@ -136,7 +136,6 @@ Name[zh_TW]=使用者接受連線
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
 Comment[ar]=المستخدم يقبل الاتصال
-Comment[ast]=L'usuariu aceuta la conexón
 Comment[bg]=Потребителят приема връзката
 Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 Comment[bs]=Korisnik prihvata vezu
@@ -162,6 +161,7 @@ Comment[hne]=कमइया हर कनेक्सन स्वीकार
 Comment[hr]=Korisnik prihvaća vezu
 Comment[hu]=A felhasználó engedélyezi a csatlakozást
 Comment[ia]=Usator da acceptation a connexion
+Comment[id]=Pengguna menyetujui koneksi
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
@@ -208,7 +208,6 @@ Action=Popup
 [Event/UserRefusesConnection]
 Name=User Refuses Connection
 Name[ar]=المستخدم يرفض الاتصال
-Name[ast]=L'usuariu refuga la conexón
 Name[bg]=Потребителят отказва връзката
 Name[bs]=Korisnik odbija vezu
 Name[ca]=L'usuari refusa la connexió
@@ -231,6 +230,7 @@ Name[hne]=कमइया हर कनेक्सन अस्वीकार
 Name[hr]=Korisnik odbija vezu
 Name[hu]=A felhasználó elutasítja a csatlakozást
 Name[ia]=Usator refuta connexion
+Name[id]=Pengguna Menampik Koneksi
 Name[is]=Notandi hafnar tengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
@@ -269,7 +269,6 @@ Name[zh_TW]=使用者拒絕連線
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
 Comment[ar]=المستخدم يرفض الاتصال
-Comment[ast]=L'usuariu refuga la conexón
 Comment[bg]=Потребителят отказва връзката
 Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Comment[bs]=Korisnik odbija vezu
@@ -295,6 +294,7 @@ Comment[hne]=कमइया हर कनेक्सन अस्वीका
 Comment[hr]=Korisnik odbija vezu
 Comment[hu]=A felhasználó elutasítja a csatlakozást
 Comment[ia]=Usator refuta connexion
+Comment[id]=Pengguna menampik koneksi
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
@@ -341,7 +341,6 @@ Action=Popup
 [Event/ConnectionClosed]
 Name=Connection Closed
 Name[ar]=الاتصال أغلق
-Name[ast]=Conexón zarrada
 Name[bg]=Връзката е прекъсната
 Name[bs]=Konekcija zatvorena
 Name[ca]=Connexió tancada
@@ -358,12 +357,13 @@ Name[eu]=Konexioa itxi da
 Name[fi]=Yhteys suljettu
 Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
-Name[gl]=Conexión fechada
+Name[gl]=Conexión pechada
 Name[hi]=कनेक्शन बन्द
 Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
 Name[hu]=A kapcsolat megszűnt
 Name[ia]=Connexion claudite
+Name[id]=Koneksi Ditutup
 Name[is]=Tengingu lokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
@@ -404,7 +404,6 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
-Comment[ast]=Conexón zarrada
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -424,13 +423,14 @@ Comment[eu]=Konexioa itxi da
 Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion fermée
 Comment[ga]=Ceangal dúnta
-Comment[gl]=A conexión está fechada
+Comment[gl]=A conexión está pechada
 Comment[he]=החיבור נסגר
 Comment[hi]=कनेक्शन बन्द
 Comment[hne]=कनेक्सन बन्द
 Comment[hr]=Veza prekinuta
 Comment[hu]=A kapcsolat megszűnt
 Comment[ia]=Connexion claudite
+Comment[id]=Koneksi ditutup
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
@@ -480,7 +480,6 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
-Name[ast]=Contraseña incorreuta
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -497,12 +496,13 @@ Name[eu]=Baliogabeko pasahitza
 Name[fi]=Virheellinen salasana
 Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
-Name[gl]=O contrasinal non é válido
+Name[gl]=O contrasinal é incorrecto
 Name[hi]=अवैध पासवर्ड
 Name[hne]=अवैध पासवर्ड
 Name[hr]=Nevažeća zaporka
 Name[hu]=Érvénytelen jelszó
 Name[ia]=Contrasigno invalide
+Name[id]=Sandi Tidak Absah
 Name[is]=Ógilt lykilorð
 Name[it]=Password non valida
 Name[ja]=無効なパスワード
@@ -543,7 +543,6 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
-Comment[ast]=Contraseña incorreuta
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -563,13 +562,14 @@ Comment[eu]=Baliogabeko pasahitza
 Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
 Comment[ga]=Focal faire neamhbhailí
-Comment[gl]=Este contrasinal non é válido
+Comment[gl]=Este contrasinal é incorrecto
 Comment[he]=הסיסמה שגויה
 Comment[hi]=अवैध पासवर्ड
 Comment[hne]=अवैध पासवर्ड
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
 Comment[ia]=Contrasigno invalide
+Comment[id]=Sandi tidak absah
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=無効なパスワード
@@ -622,7 +622,6 @@ Action=Popup
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
-Name[ast]=Contraseñas d'invitaciones incorreutes
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
 Name[ca]=Contrasenya de les invitacions no vàlides
@@ -639,12 +638,13 @@ Name[eu]=Gonbitearen pasahitza baliogabea
 Name[fi]=Virheellinen salasana kutsuun
 Name[fr]=Invitations de mots de passe non valables
 Name[ga]=Cuirí Neamhbhailí Focal Faire
-Name[gl]=O contrasinal de convidado non válido
+Name[gl]=O contrasinal de convidado incorrecto
 Name[hi]=अवैध पासवर्ड निमंत्रण
 Name[hne]=अवैध पासवर्ड निमंत्रन
 Name[hr]=Pozivnice s nevažećim zaporkama
 Name[hu]=Érvénytelen jelszavas meghívó
 Name[ia]=Invitationes de contrasigno invalide
+Name[id]=Undangan Sandi Tidak Absah
 Name[is]=Ógild lykilorðsboð
 Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
@@ -683,7 +683,6 @@ Name[zh_TW]=不合法的密碼邀請
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
 Comment[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال.
-Comment[ast]=L'invitáu unvió una contraseña incorreuta. Conexón refugada.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -702,13 +701,14 @@ Comment[eu]=Gonbidatutako parekoak baliogabeko pasahitza bidali du. Konexioa uka
 Comment[fi]=Kutsuttu taho lähetti virheellisen salasanan. Yhteys hylättiin.
 Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion refusée.
 Comment[ga]=Sheol an duine le cuireadh focal faire neamhbhailí. Diúltaíodh an ceangal.
-Comment[gl]=A parte convidada envioulle un contrasinal non válido. A conexión foi rexeitada.
+Comment[gl]=A parte convidada envioulle un contrasinal incorrecto. Rexeitouse a conexión.
 Comment[he]=הצד המוזמן שלח סיסמה שגויה. החיבור נדחה.
 Comment[hi]=निमंत्रित पार्टी ने अवैध पासवर्ड भेजा. कनेक्शन अस्वीकृत.
 Comment[hne]=निमंत्रित पार्टी हर अवैध पासवर्ड भेजिस. कनेक्सन अस्वीकृत.
 Comment[hr]=Stranka koju ste pozvali je poslala nevažeću šifru. Veza odbijena.
 Comment[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozási kérés elutasítva.
 Comment[ia]=Le partita invitate inviava un contrasigno invalide. Connexion refusate.
+Comment[id]=Undangan mengirimkan sebuah sandi tidak absah. Koneksi ditampik.
 Comment[is]=Boðinn aðili sendi ógilt lykilorð. Tengingu hafnað
 Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が無効なパスワードを送ってきました。接続を拒否しました。
@@ -753,11 +753,10 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
-Name[ast]=Conexón nueva a la espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
-Name[ca]=Nova connexió en espera
-Name[ca@valencia]=Nova connexió en espera
+Name[ca]=Connexió nova en espera
+Name[ca@valencia]=Connexió nova en espera
 Name[cs]=Nové spojení pozdrženo
 Name[da]=Ny forbindelse sat til at vente
 Name[de]=Neue Verbindung wartet
@@ -776,6 +775,7 @@ Name[hne]=नवा कनेक्सन होल्ड मं रखा
 Name[hr]=Nova veza na čekanju
 Name[hu]=Új kapcsolat tartva
 Name[ia]=Nove connexion in pausa
+Name[id]=Koneksi Baru sedang Tertahan
 Name[is]=Ný tenging á bið
 Name[it]=Nuova connessione in attesa
 Name[ja]=保留中の新しい接続
@@ -813,12 +813,11 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
-Comment[ast]=Conexón solicitada, l'usuario tien d'aceutala
 Comment[bg]=Поискана е връзка, следва потребителят да приеме
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
-Comment[ca]=Connexió sol·licitada, l'usuari ha d'acceptar-la
-Comment[ca@valencia]=Connexió sol·licitada, l'usuari ha d'acceptar-la
+Comment[ca]=Connexió sol·licitada, l'usuari l'ha d'acceptar
+Comment[ca@valencia]=Connexió sol·licitada, l'usuari l'ha d'acceptar
 Comment[cs]=Vyžadováno spojení, uživatel musí přijmout
 Comment[cy]=Cais wedi'i wneud am gysylltiad,rhaid i'r ddefnyddiwr ei dderbyn
 Comment[da]=Forbindelse forespurgt, bruger skal acceptere
@@ -839,6 +838,7 @@ Comment[hne]=कनेक्सन निवेदित. कमइया ल
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
 Comment[hu]=Csatlakozási kérés, a felhasználónak el kell fogadnia
 Comment[ia]=Connexion requirite, usator debe dar acceptation
+Comment[id]=Koneksi diminta, pengguna harus menyetujui
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザが許可しなければなりません。
@@ -884,11 +884,10 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
-Name[ast]=Conexón nueva aceutada automáticamente
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
-Name[ca]=Nova connexió acceptada automàticament
-Name[ca@valencia]=Nova connexió acceptada automàticament
+Name[ca]=Connexió nova acceptada automàticament
+Name[ca@valencia]=Connexió nova acceptada automàticament
 Name[cs]=Nové spojení automaticky přijato
 Name[da]=Ny forbindelse automatisk accepteret
 Name[de]=Neue Verbindung automatisch angenommen
@@ -907,6 +906,7 @@ Name[hne]=नय कनेक्सन अपने अपन स्वीका
 Name[hr]=Nova veza automatski prihvaćena
 Name[hu]=Új kapcsolat automatikusan engedélyezve
 Name[ia]=Nove connexion con acceptation automatic
+Name[id]=Koneksi Baru Tersetujui Otomatis
 Name[is]=Ný tenging sjálfvirkt samþykkt
 Name[it]=Nuova connessione accettata automaticamente
 Name[ja]=新しい接続の自動受け入れ
@@ -944,12 +944,11 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
-Comment[ast]=Conexón nueva afitada automáticamente
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
-Comment[ca]=Nova connexió establerta automàticament
-Comment[ca@valencia]=Nova connexió establerta automàticament
+Comment[ca]=Connexió nova establerta automàticament
+Comment[ca@valencia]=Connexió nova establida automàticament
 Comment[cs]=Automaticky navázáno nové spojení
 Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
 Comment[da]=Ny forbindelse automatisk etableret
@@ -970,6 +969,7 @@ Comment[hne]=नवा कनेक्सन अपने अपन स्था
 Comment[hr]=Nova veza automatski prihvaćena
 Comment[hu]=Automatikusan létrejött egy új kapcsolat
 Comment[ia]=Nove connexion establite automaticamente
+Comment[id]=Koneksi baru secara otomatis terpancang
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Nuova connessione stabilita automaticamente
 Comment[ja]=新しい接続を自動的に確立しました
@@ -1015,7 +1015,6 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
-Name[ast]=Abondes conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1038,6 +1037,7 @@ Name[hne]=बहुत अकन कनेक्सन
 Name[hr]=Previše veza
 Name[hu]=Túl sok kapcsolat
 Name[ia]=Nimie connexiones
+Name[id]=Terlalu Banyak Koneksi
 Name[is]=Of margar tengingar
 Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
@@ -1075,7 +1075,6 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
-Comment[ast]=Ocupáu, conexón refugada
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1095,13 +1094,14 @@ Comment[eu]=Lanpetuta, konexioa ukatu da
 Comment[fi]=Varattu, yhteys hylättiin
 Comment[fr]=Occupé. Connexion refusée
 Comment[ga]=Gnóthach; ceangal diúltaithe
-Comment[gl]=Ocupado; a conexión foi rexeitada
+Comment[gl]=Ocupado, rexeitouse a conexión.
 Comment[he]=תפוס, החיבור נדחה
 Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
 Comment[hne]=व्यस्त, कनेक्सन अस्वीकृत
 Comment[hr]=Zauzeto, veza odbijena
 Comment[hu]=A csatlakozási kérés elutasítva túlterhelés miatt
 Comment[ia]=Occupate, connexion refusate
+Comment[id]=Sibuk, koneksi ditampik
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
@@ -1149,7 +1149,6 @@ Action=Popup
 [Event/UnexpectedConnection]
 Name=Unexpected Connection
 Name[ar]=الاتصال غير متوقّع
-Name[ast]=Conexón inesperada
 Name[bg]=Неочаквана връзка
 Name[bs]=Neočekivana veza
 Name[ca]=Connexió inesperada
@@ -1172,6 +1171,7 @@ Name[hne]=अप्रत्यासित कनेक्सन
 Name[hr]=Neočekivana veza
 Name[hu]=Nem várt kapcsolat
 Name[ia]=Connexion impreviste
+Name[id]=Koneksi Tak Terduga
 Name[is]=Óvænt Tenging
 Name[it]=Connessione inattesa
 Name[ja]=予期しない接続
@@ -1210,12 +1210,11 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
-Comment[ast]=Recibióse conexón inesperada, albortando
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini
-Comment[ca]=Rebuda una connexió inesperada, avortant
-Comment[ca@valencia]=Rebuda una connexió inesperada, avortant
+Comment[ca]=S'ha rebut una connexió inesperada, avortant
+Comment[ca@valencia]=S'ha rebut una connexió inesperada, avortant
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
 Comment[da]=Modtog uventet forbindelse, afbrød
@@ -1229,13 +1228,14 @@ Comment[eu]=Ustekabeko konexioa jaso da, abortatzen
 Comment[fi]=Vastaanotettiin odottamaton yhteys, lopeta
 Comment[fr]=Connexion inattendue reçue. Annulation
 Comment[ga]=Fuarthas ceangal gan choinne, á thobscor
-Comment[gl]=Recibiuse unha conexión non agardada; cancélase
+Comment[gl]=Recibiuse unha conexión non agardada; interrómpese
 Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
 Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
 Comment[hne]=अप्रत्यासित कनेक्सन प्राप्त. छोड़ा
 Comment[hr]=Primio sam neočekivanu vezu, prekid
 Comment[hu]=Nem várt csatlakozási kérés érkezett, megszakítás
 Comment[ia]=On recipeva connexion impreviste, aborta
+Comment[id]=Diperoleh koneksi tak terduga, gugurkan
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inattesa, terminata
 Comment[ja]=予期しない接続を受信しました。廃棄します。

krfb/krfb.qrc

@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/kxmlgui5/krfb">
+        <file>krfbui.rc</file>
+    </qresource>
+</RCC>

krfb/krfbui.rc

@@ -0,0 +1,7 @@
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="krfb" version="0">
+
+<MenuBar>
+</MenuBar>
+
+</gui>

krfb/main.cpp

@@ -18,29 +18,27 @@
 #include "mainwindow.h"
 #include "trayicon.h"
 #include "invitationsrfbserver.h"
+#include "krfbconfig.h"
+#include "krfb_version.h"
 
-#include <KAboutApplicationDialog>
 #include <KAboutData>
-#include <KAction>
-#include <KUniqueApplication>
-#include <KCmdLineArgs>
-#include <KDebug>
-#include <KLocale>
+#include <KDBusService>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KNotification>
 
-#include <QtGui/QPixmap>
-#include <QtGui/qwindowdefs.h>
-
-#ifdef KRFB_WITH_TELEPATHY_TUBES
-# include "tubesrfbserver.h"
-#endif
+#include <QDebug>
+#include <QPixmap>
+#include <qwindowdefs.h>
+#include <QX11Info>
 
 #include <signal.h>
 #include <X11/extensions/XTest.h>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
+
 
 static const char description[] = I18N_NOOP("VNC-compatible server to share "
-                                  "KDE desktops");
+                                  "desktops");
 
 static bool checkX11Capabilities()
 {
@@ -49,7 +47,7 @@ static bool checkX11Capabilities()
                                  &majorv, &minorv);
 
     if ((!r) || (((majorv * 1000) + minorv) < 2002)) {
-        KMessageBox::error(0,
+        KMessageBox::error(nullptr,
                            i18n("Your X11 Server does not support the required XTest extension "
                                 "version 2.2. Sharing your desktop is not possible."),
                            i18n("Desktop Sharing Error"));
@@ -59,69 +57,96 @@ static bool checkX11Capabilities()
     return true;
 }
 
+
+static void checkOldX11PluginConfig() {
+    if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("x11")) {
+        qDebug() << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
+        KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
+                    QStringLiteral("preferredFrameBufferPlugin"));
+        if (config_item) {
+            config_item->setProperty(QStringLiteral("xcb"));
+            KrfbConfig::self()->save();
+            qDebug() << "  Fixed preferredFrameBufferPlugin from x11 to xcb.";
+        }
+    }
+}
+
+
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("krfb", 0, ki18n("Desktop Sharing"), KDE_VERSION_STRING,
-                         ki18n(description), KAboutData::License_GPL,
-                         ki18n("(c) 2009-2010, Collabora Ltd.\n"
+    QApplication app(argc, argv);
+
+    KLocalizedString::setApplicationDomain("krfb");
+
+    KAboutData aboutData(QStringLiteral("krfb"),
+                         i18n("Desktop Sharing"),
+                         QStringLiteral(KRFB_VERSION_STRING),
+                         i18n(description),
+                         KAboutLicense::GPL,
+                         i18n("(c) 2009-2010, Collabora Ltd.\n"
                                "(c) 2007, Alessandro Praduroux\n"
                                "(c) 2001-2003, Tim Jansen\n"
                                "(c) 2001, Johannes E. Schindelin\n"
                                "(c) 2000-2001, Const Kaplinsky\n"
                                "(c) 2000, Tridia Corporation\n"
                                "(c) 1999, AT&T Laboratories Boston\n"));
-    aboutData.addAuthor(ki18n("George Goldberg"),
-                        ki18n("Telepathy tubes support"),
-                        "george.goldberg@collabora.co.uk");
-    aboutData.addAuthor(ki18n("George Kiagiadakis"),
-                        KLocalizedString(),
-                        "george.kiagiadakis@collabora.co.uk");
-    aboutData.addAuthor(ki18n("Alessandro Praduroux"), ki18n("KDE4 porting"), "pradu@pradu.it");
-    aboutData.addAuthor(ki18n("Tim Jansen"), ki18n("Original author"), "tim@tjansen.de");
-    aboutData.addCredit(ki18n("Johannes E. Schindelin"),
-                        ki18n("libvncserver"));
-    aboutData.addCredit(ki18n("Const Kaplinsky"),
-                        ki18n("TightVNC encoder"));
-    aboutData.addCredit(ki18n("Tridia Corporation"),
-                        ki18n("ZLib encoder"));
-    aboutData.addCredit(ki18n("AT&T Laboratories Boston"),
-                        ki18n("original VNC encoders and "
+    aboutData.addAuthor(i18n("George Goldberg"),
+                        i18n("Telepathy tubes support"),
+                        QStringLiteral("george.goldberg@collabora.co.uk"));
+    aboutData.addAuthor(i18n("George Kiagiadakis"),
+                        QString(),
+                        QStringLiteral("george.kiagiadakis@collabora.co.uk"));
+    aboutData.addAuthor(i18n("Alessandro Praduroux"), i18n("KDE4 porting"), QStringLiteral("pradu@pradu.it"));
+    aboutData.addAuthor(i18n("Tim Jansen"), i18n("Original author"), QStringLiteral("tim@tjansen.de"));
+    aboutData.addCredit(i18n("Johannes E. Schindelin"),
+                        i18n("libvncserver"));
+    aboutData.addCredit(i18n("Const Kaplinsky"),
+                        i18n("TightVNC encoder"));
+    aboutData.addCredit(i18n("Tridia Corporation"),
+                        i18n("ZLib encoder"));
+    aboutData.addCredit(i18n("AT&T Laboratories Boston"),
+                        i18n("original VNC encoders and "
                               "protocol design"));
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    KAboutData::setApplicationData(aboutData);
 
-    KCmdLineOptions options;
-    options.add("nodialog", ki18n("Do not show the invitations management dialog at startup"));
-    KCmdLineArgs::addCmdLineOptions(options);
+    QCommandLineParser parser;
+    aboutData.setupCommandLine(&parser);
+    const QCommandLineOption nodialogOption(QStringList{ QStringLiteral("nodialog") }, i18n("Do not show the invitations management dialog at startup"));
+    parser.addOption(nodialogOption);
+
+    parser.process(app);
+    aboutData.processCommandLine(&parser);
+
+    KDBusService service(KDBusService::Unique, &app);
 
-    KUniqueApplication app;
     app.setQuitOnLastWindowClosed(false);
 
     if (!checkX11Capabilities()) {
         return 1;
     }
 
+    // upgrade the configuration
+    checkOldX11PluginConfig();
+
     //init the core
     InvitationsRfbServer::init();
 
-#ifdef KRFB_WITH_TELEPATHY_TUBES
-    TubesRfbServer::init();
-#endif
-
     //init the GUI
     MainWindow mainWindow;
     TrayIcon trayicon(&mainWindow);
 
-    if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
+    if (KrfbConfig::startMinimized()) {
+      mainWindow.hide();
+    } else if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
         mainWindow.restore(1, false);
-    } else if (KCmdLineArgs::parsedArgs()->isSet("dialog")) {
+    } else if (!parser.isSet(nodialogOption)) {
         mainWindow.show();
     }
 
     sigset_t sigs;
     sigemptyset(&sigs);
     sigaddset(&sigs, SIGPIPE);
-    sigprocmask(SIG_BLOCK, &sigs, 0);
+    sigprocmask(SIG_BLOCK, &sigs, nullptr);
 
     return app.exec();
 }
-

krfb/mainwindow.cpp

@@ -13,37 +13,33 @@
 #include "krfbconfig.h"
 #include "ui_configtcp.h"
 #include "ui_configsecurity.h"
+#include "ui_configframebuffer.h"
 
 #include <KConfigDialog>
-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KStandardGuiItem>
-#include <KSystemTimeZone>
-#include <KToolInvocation>
+#include <KMessageWidget>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KLineEdit>
 #include <KNewPasswordDialog>
+#include <KPluginLoader>
+#include <KPluginMetaData>
 
-#include <QtGui/QWidget>
-#include <QtGui/QSizePolicy>
-#include <QtNetwork/QNetworkInterface>
+#include <QIcon>
+#include <QWidget>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QSizePolicy>
+#include <QVector>
+#include <QSet>
+#include <QNetworkInterface>
 
-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include "tubesrfbserver.h"
-#include <TelepathyQt/PendingReady>
-#include <TelepathyQt/PendingChannelRequest>
-#include <KTp/actions.h>
-#include <KTp/Widgets/contact-view-widget.h>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/Models/contacts-filter-model.h>
-#endif
 
 class TCP: public QWidget, public Ui::TCP
 {
 public:
-    TCP(QWidget *parent = 0) : QWidget(parent) {
+    TCP(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
     }
 };
@@ -51,8 +47,55 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = 0) : QWidget(parent) {
+    Security(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
+        walletWarning = new KMessageWidget(this);
+        walletWarning->setText(i18n("Storing passwords in config file is insecure!"));
+        walletWarning->setCloseButtonVisible(false);
+        walletWarning->setMessageType(KMessageWidget::Warning);
+        walletWarning->hide();
+        vboxLayout->addWidget(walletWarning);
+
+        // show warning when "noWallet" checkbox is checked
+        QObject::connect(kcfg_noWallet, &QCheckBox::toggled, [this](bool checked){
+            walletWarning->setVisible(checked);
+        });
+    }
+
+    KMessageWidget *walletWarning = nullptr;
+};
+
+class ConfigFramebuffer: public QWidget, public Ui::Framebuffer
+{
+public:
+    ConfigFramebuffer(QWidget *parent = nullptr) : QWidget(parent) {
+        setupUi(this);
+        // hide the line edit with framebuffer string
+        kcfg_preferredFrameBufferPlugin->hide();
+        // fill drop-down combo with a list of real existing plugins
+        this->fillFrameBuffersCombo();
+        // initialize combo with currently configured framebuffer plugin
+        cb_preferredFrameBufferPlugin->setCurrentText(KrfbConfig::preferredFrameBufferPlugin());
+        // connect signals between combo<->lineedit
+        // if we change selection in combo, lineedit is updated
+        QObject::connect(cb_preferredFrameBufferPlugin, &QComboBox::currentTextChanged,
+                         kcfg_preferredFrameBufferPlugin, &QLineEdit::setText);
+    }
+
+    void fillFrameBuffersCombo() {
+        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(
+                    QStringLiteral("krfb"), [](const KPluginMetaData & md) {
+            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
+        });
+        QSet<QString> unique;
+        QVectorIterator<KPluginMetaData> i(plugins);
+        i.toBack();
+        while (i.hasPrevious()) {
+            const KPluginMetaData &metadata = i.previous();
+            if (unique.contains(metadata.pluginId())) continue;
+            cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
+            unique.insert(metadata.pluginId());
+        }
     }
 };
 
@@ -69,37 +112,37 @@ MainWindow::MainWindow(QWidget *parent)
 
     QWidget *mainWidget = new QWidget;
     m_ui.setupUi(mainWidget);
-    m_ui.krfbIconLabel->setPixmap(KIcon("krfb").pixmap(128));
+    m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
             InvitationsRfbServer::instance->allowUnattendedAccess());
 
     setCentralWidget(mainWidget);
 
-    connect(m_ui.passwordEditButton,SIGNAL(clicked()),
-            this,SLOT(editPassword()));
-    connect(m_ui.enableSharingCheckBox,SIGNAL(toggled(bool)),
-            this, SLOT(toggleDesktopSharing(bool)));
-    connect(m_ui.enableUnattendedCheckBox, SIGNAL(toggled(bool)),
-            InvitationsRfbServer::instance, SLOT(toggleUnattendedAccess(bool)));
-    connect(m_ui.unattendedPasswordButton, SIGNAL(clicked()),
-            this, SLOT(editUnattendedPassword()));
-    connect(m_ui.addressAboutButton, SIGNAL(clicked()),
-            this, SLOT(aboutConnectionAddress()));
-    connect(m_ui.unattendedAboutButton, SIGNAL(clicked()),
-            this, SLOT(aboutUnattendedMode()));
-    connect(InvitationsRfbServer::instance, SIGNAL(passwordChanged(const QString&)),
-            this, SLOT(passwordChanged(const QString&)));
+    connect(m_ui.passwordEditButton, &QToolButton::clicked,
+            this, &MainWindow::editPassword);
+    connect(m_ui.enableSharingCheckBox, &QCheckBox::toggled,
+            this, &MainWindow::toggleDesktopSharing);
+    connect(m_ui.enableUnattendedCheckBox, &QCheckBox::toggled,
+            InvitationsRfbServer::instance, &InvitationsRfbServer::toggleUnattendedAccess);
+    connect(m_ui.unattendedPasswordButton, &QPushButton::clicked,
+            this, &MainWindow::editUnattendedPassword);
+    connect(m_ui.addressAboutButton, &QToolButton::clicked,
+            this, &MainWindow::aboutConnectionAddress);
+    connect(m_ui.unattendedAboutButton, &QToolButton::clicked,
+            this, &MainWindow::aboutUnattendedMode);
+    connect(InvitationsRfbServer::instance, &InvitationsRfbServer::passwordChanged,
+            this, &MainWindow::passwordChanged);
 
     // Figure out the address
     int port = KrfbConfig::port();
-    QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
-    foreach(const QNetworkInterface & interface, interfaceList) {
+    const QList<QNetworkInterface> interfaceList = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface& interface : interfaceList) {
         if(interface.flags() & QNetworkInterface::IsLoopBack)
             continue;
 
         if(interface.flags() & QNetworkInterface::IsRunning &&
                 !interface.addressEntries().isEmpty())
-            m_ui.addressDisplayLabel->setText(QString("%1 : %2")
+            m_ui.addressDisplayLabel->setText(QStringLiteral("%1 : %2")
                     .arg(interface.addressEntries().first().ip().toString())
                     .arg(port));
     }
@@ -108,36 +151,15 @@ MainWindow::MainWindow(QWidget *parent)
     m_ui.passwordDisplayLabel->setText(
             InvitationsRfbServer::instance->desktopPassword());
 
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-
-    m_contactViewWidget = new KTp::ContactViewWidget(
-            TubesRfbServer::instance->contactsListModel(), this);
-
-    m_contactViewWidget->setEnabled(false);
-    connect(m_ui.enableSharingCheckBox, SIGNAL(toggled(bool)),
-            m_contactViewWidget, SLOT(setEnabled(bool)));
-    m_contactViewWidget->setIconSize(QSize(32,32));
-    m_contactViewWidget->setMinimumWidth(120);
-    m_contactViewWidget->setMaximumWidth(360);
-    m_contactViewWidget->setMinimumHeight(300);
-    m_contactViewWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
-    m_contactViewWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
-    m_contactViewWidget->filter()->setTubesFilterStrings(QStringList("rfb"));
-    m_contactViewWidget->filter()->setCapabilityFilterFlags(KTp::ContactsFilterModel::FilterByTubes);
-
-    m_contactViewWidget->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-    m_ui.tpContactsLayout->addWidget(m_contactViewWidget);
-    connect(m_contactViewWidget, SIGNAL(contactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &)),
-        this, SLOT(onContactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &)));
-#endif
-
-
     KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection());
     KStandardAction::preferences(this, SLOT(showConfiguration()), actionCollection());
 
     setupGUI();
 
+    if (KrfbConfig::allowDesktopControl()) {
+      m_ui.enableSharingCheckBox->setChecked(true);
+    }
+
     setAutoSaveSettings();
 }
 
@@ -149,7 +171,7 @@ void MainWindow::editPassword()
 {
     if(m_passwordEditable) {
         m_passwordEditable = false;
-        m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
         InvitationsRfbServer::instance->setDesktopPassword(
                 m_passwordLineEdit->text());
@@ -158,7 +180,7 @@ void MainWindow::editPassword()
         m_passwordLineEdit->setVisible(false);
     } else {
         m_passwordEditable = true;
-        m_ui.passwordEditButton->setIcon(KIcon("document-save"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
         m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
         m_passwordLineEdit->setText(
                 InvitationsRfbServer::instance->desktopPassword());
@@ -190,7 +212,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
         if(m_passwordEditable) {
             m_passwordEditable = false;
             m_passwordLineEdit->setVisible(false);
-            m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
+            m_ui.passwordEditButton->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         }
     }
 }
@@ -215,36 +237,45 @@ void MainWindow::aboutUnattendedMode()
             i18n("KDE Desktop Sharing"));
 }
 
-#ifdef KRFB_WITH_KDE_TELEPATHY
-
-void MainWindow::onContactDoubleClicked(const Tp::AccountPtr &account, const KTp::ContactPtr &contact)
-{
-    Tp::PendingOperation *op = KTp::Actions::startDesktopSharing(account, contact);
-    connect(op, SIGNAL(finished(Tp::PendingOperation*)),
-            this, SLOT(pendingDesktopShareFinished(Tp::PendingOperation*)));
-}
-
-void MainWindow::pendingDesktopShareFinished(Tp::PendingOperation *operation)
-{
-    if(operation->isError()) {
-        KMessageBox::error(this,
-                operation->errorName() + ": " + operation->errorMessage());
-    }
-}
-
-#endif
-
 void MainWindow::showConfiguration()
 {
-    if (KConfigDialog::showDialog("settings")) {
+    static QString s_prevFramebufferPlugin;
+    static bool s_prevNoWallet;
+    // ^^ needs to be static, because lambda will be called long time
+    //    after showConfiguration() ends, so auto variable would go out of scope
+    // save previously selected framebuffer plugin config
+    s_prevFramebufferPlugin = KrfbConfig::preferredFrameBufferPlugin();
+    s_prevNoWallet = KrfbConfig::noWallet();
+
+    if (KConfigDialog::showDialog(QStringLiteral("settings"))) {
         return;
     }
 
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
-    dialog->addPage(new TCP, i18n("Network"), "network-workgroup");
-    dialog->addPage(new Security, i18n("Security"), "security-high");
-    dialog->setHelp(QString(), "krfb");
+    KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
+    dialog->addPage(new TCP, i18n("Network"), QStringLiteral("network-wired"));
+    dialog->addPage(new Security, i18n("Security"), QStringLiteral("security-high"));
+    dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), QStringLiteral("video-display"));
     dialog->show();
+    connect(dialog, &KConfigDialog::settingsChanged, [this] () {
+        // check if framebuffer plugin config has changed
+        if (s_prevFramebufferPlugin != KrfbConfig::preferredFrameBufferPlugin()) {
+            KMessageBox::information(this, i18n("To apply framebuffer plugin setting, "
+                                                "you need to restart the program."));
+        }
+        // check if kwallet config has changed
+        if (s_prevNoWallet != KrfbConfig::noWallet()) {
+            // try to apply settings immediately
+            if (KrfbConfig::noWallet()) {
+                InvitationsRfbServer::instance->closeKWallet();
+            } else {
+                InvitationsRfbServer::instance->openKWallet();
+                // erase stored passwords from krfbconfig file
+                KConfigGroup securityConfigGroup(KSharedConfig::openConfig(), "Security");
+                securityConfigGroup.deleteEntry("desktopPassword");
+                securityConfigGroup.deleteEntry("unattendedPassword");
+            }
+        }
+    });
 }
 
 void MainWindow::readProperties(const KConfigGroup& group)
@@ -260,5 +291,3 @@ void MainWindow::saveProperties(KConfigGroup& group)
     group.writeEntry("Visible", isVisible());
     KMainWindow::saveProperties(group);
 }
-
-#include "mainwindow.moc"

krfb/mainwindow.h

@@ -8,24 +8,13 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#ifndef MANAGEINVITATIONSDIALOG_H
-#define MANAGEINVITATIONSDIALOG_H
+#ifndef KRFB_MAINWINDOW_H
+#define KRFB_MAINWINDOW_H
 
 #include "ui_mainwidget.h"
 
 #include <KXmlGuiWindow>
 
-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include <KTp/contact.h>
-#include <TelepathyQt/PendingReady>
-namespace KTp {
-    class ContactViewWidget;
-}
-namespace Tp {
-    class PendingOperation;
-}
-#endif
-
 class KLineEdit;
 
 class MainWindow : public KXmlGuiWindow
@@ -33,15 +22,15 @@ class MainWindow : public KXmlGuiWindow
     Q_OBJECT
 
     public:
-        MainWindow(QWidget *parent = 0);
-        ~MainWindow();
+        explicit MainWindow(QWidget *parent = nullptr);
+        ~MainWindow() override;
 
     public Q_SLOTS:
         void showConfiguration();
 
     protected:
-        virtual void readProperties(const KConfigGroup & group);
-        virtual void saveProperties(KConfigGroup & group);
+        void readProperties(const KConfigGroup & group) override;
+        void saveProperties(KConfigGroup & group) override;
 
     private Q_SLOTS:
         void editPassword();
@@ -50,19 +39,11 @@ class MainWindow : public KXmlGuiWindow
         void passwordChanged(const QString&);
         void aboutConnectionAddress();
         void aboutUnattendedMode();
-#ifdef KRFB_WITH_KDE_TELEPATHY
-        void onContactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &);
-        void pendingDesktopShareFinished(Tp::PendingOperation*);
-#endif
 
     private:
         Ui::MainWidget m_ui;
         bool m_passwordEditable;
         KLineEdit *m_passwordLineEdit;
-#ifdef KRFB_WITH_KDE_TELEPATHY
-        KTp::ContactViewWidget *m_contactViewWidget;
-#endif
-
 };
 
 #endif

krfb/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in

@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.krfb_rfb_handler
-Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb --nodialog

krfb/org.kde.krfb.appdata.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>org.kde.krfb.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Krfb</name>
+  <name xml:lang="ca">Krfb</name>
+  <name xml:lang="ca-valencia">Krfb</name>
+  <name xml:lang="cs">Krfb</name>
+  <name xml:lang="da">Krfb</name>
+  <name xml:lang="de">Krfb</name>
+  <name xml:lang="el">Krfb</name>
+  <name xml:lang="en-GB">Krfb</name>
+  <name xml:lang="es">Krfb</name>
+  <name xml:lang="fi">Krfb</name>
+  <name xml:lang="fr">Krfb</name>
+  <name xml:lang="gl">Krfb</name>
+  <name xml:lang="ia">Krfb</name>
+  <name xml:lang="id">Krfb</name>
+  <name xml:lang="it">Krfb</name>
+  <name xml:lang="ko">Krfb</name>
+  <name xml:lang="nl">Krfb</name>
+  <name xml:lang="pl">Krfb</name>
+  <name xml:lang="pt">Krfb</name>
+  <name xml:lang="pt-BR">Krfb</name>
+  <name xml:lang="ru">Krfb</name>
+  <name xml:lang="sk">Krfb</name>
+  <name xml:lang="sl">Krfb</name>
+  <name xml:lang="sr">КРФБ</name>
+  <name xml:lang="sr-Latn">KRFB</name>
+  <name xml:lang="sr-ijekavian">КРФБ</name>
+  <name xml:lang="sr-ijekavianlatin">KRFB</name>
+  <name xml:lang="sv">Krfb</name>
+  <name xml:lang="tr">Krfb</name>
+  <name xml:lang="uk">Krfb</name>
+  <name xml:lang="x-test">xxKrfbxx</name>
+  <name xml:lang="zh-CN">Krfb</name>
+  <name xml:lang="zh-TW">Krfb</name>
+  <summary>Desktop sharing</summary>
+  <summary xml:lang="ca">Compartició de l'escriptori</summary>
+  <summary xml:lang="ca-valencia">Compartició de l'escriptori</summary>
+  <summary xml:lang="cs">Sdílení pracovní plochy</summary>
+  <summary xml:lang="da">Skrivebordsdeling</summary>
+  <summary xml:lang="de">Freigabe der Arbeitsfläche</summary>
+  <summary xml:lang="el">Κοινή χρήση επιφάνειας εργασίας</summary>
+  <summary xml:lang="en-GB">Desktop sharing</summary>
+  <summary xml:lang="es">Compartir el escritorio</summary>
+  <summary xml:lang="fi">Työpöydän jako</summary>
+  <summary xml:lang="fr">Partage de bureau</summary>
+  <summary xml:lang="gl">Compartición do escritorio</summary>
+  <summary xml:lang="ia">Compartir de scriptorio</summary>
+  <summary xml:lang="id">Desktop sharing</summary>
+  <summary xml:lang="it">Condivisione del desktop</summary>
+  <summary xml:lang="ko">데스크톱 공유</summary>
+  <summary xml:lang="nl">Bureaublad delen</summary>
+  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
+  <summary xml:lang="pt">Partilha do ecrã</summary>
+  <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
+  <summary xml:lang="ru">Общий рабочий стол</summary>
+  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
+  <summary xml:lang="sl">Souporaba namizja</summary>
+  <summary xml:lang="sr">Дељење површи</summary>
+  <summary xml:lang="sr-Latn">Deljenje površi</summary>
+  <summary xml:lang="sr-ijekavian">Дељење површи</summary>
+  <summary xml:lang="sr-ijekavianlatin">Deljenje površi</summary>
+  <summary xml:lang="sv">Skrivbordsdelning</summary>
+  <summary xml:lang="tr">Masaüstü paylaşımı</summary>
+  <summary xml:lang="uk">Спільне користування стільницею</summary>
+  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
+  <summary xml:lang="zh-CN">桌面共享</summary>
+  <summary xml:lang="zh-TW">桌面分享</summary>
+  <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="da">Krfb-skrivebordsdeling er et serverprogram der giver dig mulighed for at dele din nuværende session med en bruger på en anden maskine som kan bruge en VNC-klient til at vise eller endda styrer skrivebordet.</p>
+    <p xml:lang="de">Krfb ist eine Serveranwendung, welche die gemeinsame Benutzung der aktuellen Sitzung mit einem Benutzer auf einem anderen Rechner ermöglicht, der mit Hilfe eines VNC-Programms den Bildschirminhalt sehen oder sogar die Arbeitsfläche bedienen kann.</p>
+    <p xml:lang="el">Η κοινή χρήση επιφάνειας εργασίας Krfb είναι μια εφαρμογή εξυπηρετητή που σας επιτρέπει να μοιράζεστε την τρέχουσα συνεδρία σας με έναν χρήστη σε άλλο μηχάνημα, ο οποίος μπορεί να χρησιμοποιεί έναν πελάτη VNC για να παρακολουθεί ή και να ελέγχει την επιφάνεια εργασίας σας.</p>
+    <p xml:lang="en-GB">Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
+    <p xml:lang="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="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
+    <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
+    <p xml:lang="gl">Krfb é un aplicativo de servidor que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
+    <p xml:lang="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="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
+    <p xml:lang="pt">A Partilha de Ecrã Krfb é uma aplicação de servidor que lhe permite partilhar a sua sessão actual com um utilizador noutra máquina, o qual poderá usar um cliente de VNC para ver ou mesmo controlar o ambiente de trabalho.</p>
+    <p xml:lang="pt-BR">Krfb Desktop Sharing é um aplicativo de servidor que lhe permite compartilhar a sua sessão atual com um usuário em outra máquina, que poderá usar um cliente de VNC para ver ou mesmo controlar a máquina.</p>
+    <p xml:lang="ru">Krfb является сервером, который позволяет вам предоставлять доступ к своему текущему сеансу пользователю на другом компьютере, который использует клиент VNC для просмотра или управления вашим рабочим столом.</p>
+    <p xml:lang="sk">Krfb je serverová aplikácia, ktorá vám umožní zdieľať vaše aktuálne sedenie s používateľom na inom stroji, ktorý môže používať VNC klienta na pripojenie alebo ovládanie stanice.</p>
+    <p xml:lang="sl">Souporaba namizja Krfb je strežniški program, ki vam dovoli, da delite vašo trenutno sejo z uporabnikom na drugem računalniku, ki ima odjemalec VNC. Uporabnik lahko gleda ali celo nadzira namizje.</p>
+    <p xml:lang="sr">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
+    <p xml:lang="sr-Latn">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
+    <p xml:lang="sr-ijekavian">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
+    <p xml:lang="sr-ijekavianlatin">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
+    <p xml:lang="sv">Krfb-skrivbordsdelning är ett serverprogram som gör det möjligt att dela aktuell session med en användare på en annan dator, som kan använda en VNC-klient för att betrakta eller till och med kontrollera skrivbordet.</p>
+    <p xml:lang="tr">Krfb Masaüstü Paylaşımı, mevcut oturumu masaüstünü görüntülemek veya kontrol etmek için, VNC istemcisi kullanan başka bir makinedeki, kullanıcıyla paylaşmanızı sağlayan bir sunucu uygulamasıdır.</p>
+    <p xml:lang="uk">Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.</p>
+    <p xml:lang="x-test">xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx</p>
+    <p xml:lang="zh-CN">Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。</p>
+    <p xml:lang="zh-TW">Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 客戶端檢視、甚至控制您的桌面。</p>
+  </description>
+  <url type="homepage">https://userbase.kde.org/Krfb</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=krfb</url>
+  <url type="donation">https://www.kde.org/community/donations</url>
+  <url type="help">https://docs.kde.org/?application=krfb</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Sharing desktop with Krfb</caption>
+      <caption xml:lang="ca">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="ca-valencia">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="cs">Sdílím pracovní plochu pomocí Krfb</caption>
+      <caption xml:lang="da">Deler skrivebord med Krfb</caption>
+      <caption xml:lang="de">Freigabe der Arbeitsfläche mit Krfb</caption>
+      <caption xml:lang="en-GB">Sharing desktop with Krfb</caption>
+      <caption xml:lang="es">Compartiendo el escritorio con Krfb</caption>
+      <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
+      <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
+      <caption xml:lang="gl">Compartindo o escritorio con Krfb</caption>
+      <caption xml:lang="id">Berbagi desktop dengan Krfb</caption>
+      <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
+      <caption xml:lang="ko">Krfb로 데스크톱 공유</caption>
+      <caption xml:lang="nl">Bureaublad delen met Krfb</caption>
+      <caption xml:lang="pl">Udostępnienie pulpitu przy użyciu Krfb</caption>
+      <caption xml:lang="pt">Partilha do ecrã com o Krfb</caption>
+      <caption xml:lang="pt-BR">Compartilhando a área de trabalho com o Krfb</caption>
+      <caption xml:lang="ru">Общий доступ к рабочему столу с использованием 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>
+      <caption xml:lang="zh-CN">使用 Krfb 共享桌面</caption>
+      <caption xml:lang="zh-TW">使用 Krfb 分享桌面</caption>
+      <image>https://cdn.kde.org/screenshots/krfb/krfb.png</image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>krfb</binary>
+  </provides>
+  <project_group>KDE</project_group>
+</component>

krfb/org.kde.krfb.desktop

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

krfb/rfb.h

@@ -8,6 +8,10 @@
 
 #include "rfb/rfb.h"
 
+#ifdef max
+#undef max
+#endif
+
 #undef TRUE
 #undef FALSE
 

krfb/rfbclient.cpp

@@ -22,9 +22,8 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "events.h"
-#include <QtCore/QSocketNotifier>
-#include <KDebug>
-#include <KNotification>
+#include <QSocketNotifier>
+#include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
 
@@ -44,17 +43,17 @@ struct RfbClient::Private
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
     : QObject(parent), d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + ":" +
+    d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') +
                              QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(false);
-    connect(d->notifier, SIGNAL(activated(int)), this, SLOT(onSocketActivated()));
+    connect(d->notifier, &QSocketNotifier::activated, this, &RfbClient::onSocketActivated);
 }
 
 RfbClient::~RfbClient()
 {
-    kDebug();
+    //qDebug();
     delete d;
 }
 
@@ -140,7 +139,7 @@ void RfbClient::onSocketActivated()
         //the clientGoneHook which in turn will remove this RfbClient instance
         //from the server manager and will call deleteLater() to delete it
         if (d->client->sock == -1) {
-            kDebug() << "disconnected from socket signal";
+            //qDebug() << "disconnected from socket signal";
             d->notifier->setEnabled(false);
             rfbClientConnectionGone(d->client);
             break;
@@ -159,7 +158,7 @@ void RfbClient::update()
     //the clientGoneHook which in turn will remove this RfbClient instance
     //from the server manager and will call deleteLater() to delete it
     if (d->client->sock == -1) {
-        kDebug() << "disconnected during update";
+        //qDebug() << "disconnected during update";
         d->notifier->setEnabled(false);
         rfbClientConnectionGone(d->client);
     }
@@ -178,7 +177,7 @@ PendingRfbClient::~PendingRfbClient()
 
 void PendingRfbClient::accept(RfbClient *newClient)
 {
-    kDebug() << "accepted connection";
+    //qDebug() << "accepted connection";
 
     m_rfbClient->clientData = newClient;
     newClient->setOnHold(false);
@@ -191,14 +190,14 @@ static void clientGoneHookNoop(rfbClientPtr cl) { Q_UNUSED(cl); }
 
 void PendingRfbClient::reject()
 {
-    kDebug() << "refused connection";
+    //qDebug() << "refused connection";
 
     //override the clientGoneHook that was previously set by RfbServer
     m_rfbClient->clientGoneHook = clientGoneHookNoop;
     rfbCloseClient(m_rfbClient);
     rfbClientConnectionGone(m_rfbClient);
 
-    Q_EMIT finished(NULL);
+    Q_EMIT finished(nullptr);
     deleteLater();
 }
 
@@ -206,7 +205,7 @@ bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     Q_UNUSED(encryptedPassword);
 
-    return m_rfbClient->screen->authPasswdData == (void*)0;
+    return m_rfbClient->screen->authPasswdData == (void*)nullptr;
 }
 
 bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
@@ -222,12 +221,10 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
     bzero(passwd, MAXPWLEN);
 
     if (!password.isEmpty()) {
-        strncpy(passwd, password,
+        strncpy(passwd, password.constData(),
                 (MAXPWLEN <= password.size()) ? MAXPWLEN : password.size());
     }
 
     rfbEncryptBytes(challenge, passwd);
-    return memcmp(challenge, encryptedPassword, encryptedPassword.size()) == 0;
+    return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
 }
-
-#include "rfbclient.moc"

krfb/rfbclient.h

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

krfb/rfbserver.cpp

@@ -19,10 +19,11 @@
 */
 #include "rfbserver.h"
 #include "rfbservermanager.h"
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
-#include <KDebug>
+#include <QPointer>
+#include <QDebug>
 
 struct RfbServer::Private
 {
@@ -30,7 +31,8 @@ struct RfbServer::Private
     int listeningPort;
     bool passwordRequired;
     rfbScreenInfoPtr screen;
-    QSocketNotifier *notifier;
+    QPointer<QSocketNotifier> ipv4notifier;
+    QPointer<QSocketNotifier> ipv6notifier;
 };
 
 RfbServer::RfbServer(QObject *parent)
@@ -39,8 +41,7 @@ RfbServer::RfbServer(QObject *parent)
     d->listeningAddress = "0.0.0.0";
     d->listeningPort = 0;
     d->passwordRequired = true;
-    d->screen = NULL;
-    d->notifier = NULL;
+    d->screen = nullptr;
 
     RfbServerManager::instance()->registerServer(this);
 }
@@ -90,6 +91,7 @@ bool RfbServer::start()
     if (!d->screen) {
         d->screen = RfbServerManager::instance()->newScreen();
         if (!d->screen) {
+            qDebug() << "Unable to get rbfserver screen";
             return false;
         }
 
@@ -119,38 +121,43 @@ bool RfbServer::start()
     if (passwordRequired()) {
         d->screen->authPasswdData = (void *)1;
     } else {
-        d->screen->authPasswdData = (void *)0;
+        d->screen->authPasswdData = (void *)nullptr;
     }
 
-    kDebug() << "Starting server. Listen port:" << listeningPort()
+    qDebug() << "Starting server. Listen port:" << listeningPort()
              << "Listen Address:" << listeningAddress()
              << "Password enabled:" << passwordRequired();
 
     rfbInitServer(d->screen);
 
     if (!rfbIsActive(d->screen)) {
-        kDebug() << "Failed to start server";
+        qDebug() << "Failed to start server";
         rfbShutdownServer(d->screen, false);
         return false;
     };
 
-    d->notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
-    d->notifier->setEnabled(true);
-    connect(d->notifier, SIGNAL(activated(int)), this, SLOT(onListenSocketActivated()));
-    connect(QApplication::clipboard(), SIGNAL(dataChanged()),
-            this, SLOT(krfbSendServerCutText()));
+    d->ipv4notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
+    connect(d->ipv4notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    if (d->screen->listen6Sock > 0) {
+        // we're also listening on additional IPv6 socket, get events from there
+        d->ipv6notifier = new QSocketNotifier(d->screen->listen6Sock, QSocketNotifier::Read, this);
+        connect(d->ipv6notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    }
+    connect(QApplication::clipboard(), &QClipboard::dataChanged,
+            this, &RfbServer::krfbSendServerCutText);
 
     return true;
 }
 
-void RfbServer::stop(bool disconnectClients)
+void RfbServer::stop()
 {
     if (d->screen) {
-        rfbShutdownServer(d->screen, disconnectClients);
-        if (d->notifier) {
-            d->notifier->setEnabled(false);
-            d->notifier->deleteLater();
-            d->notifier = NULL;
+        rfbShutdownServer(d->screen, true);
+        for (auto notifier : {d->ipv4notifier, d->ipv6notifier}) {
+            if (notifier) {
+                notifier->setEnabled(false);
+                notifier->deleteLater();
+            }
         }
     }
 }
@@ -186,21 +193,21 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 
     /* Inform all clients about this cursor movement. */
     iterator = rfbGetClientIterator(screen);
-    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
-        cl->cursorWasMoved = TRUE;
+    while ((cl = rfbClientIteratorNext(iterator)) != nullptr) {
+        cl->cursorWasMoved = true;
     }
     rfbReleaseClientIterator(iterator);
 
     /* The cursor was moved by this client, so don't send CursorPos. */
     if (client) {
-        client->cursorWasMoved = FALSE;
+        client->cursorWasMoved = false;
     }
 }
 
 void RfbServer::updateCursorPosition(const QPoint & position)
 {
     if (d->screen) {
-        krfb_rfbSetCursorPosition(d->screen, NULL, position.x(), position.y());
+        krfb_rfbSetCursorPosition(d->screen, nullptr, position.x(), position.y());
     }
 }
 
@@ -220,7 +227,7 @@ void RfbServer::onListenSocketActivated()
 
 void RfbServer::pendingClientFinished(RfbClient *client)
 {
-    kDebug();
+    //qDebug();
     if (client) {
         RfbServerManager::instance()->addClient(client);
         client->getRfbClientPtr()->clientGoneHook = clientGoneHook;
@@ -230,12 +237,12 @@ void RfbServer::pendingClientFinished(RfbClient *client)
 //static
 rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 {
-    kDebug() << "New client";
+    //qDebug() << "New client";
     RfbServer *server = static_cast<RfbServer*>(cl->screen->screenData);
 
     PendingRfbClient *pendingClient = server->newClient(cl);
-    connect(pendingClient, SIGNAL(finished(RfbClient*)),
-            server, SLOT(pendingClientFinished(RfbClient*)));
+    connect(pendingClient, &PendingRfbClient::finished,
+            server, &RfbServer::pendingClientFinished);
 
     return RFB_CLIENT_ON_HOLD;
 }
@@ -243,7 +250,7 @@ rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 //static
 void RfbServer::clientGoneHook(rfbClientPtr cl)
 {
-    kDebug() << "client gone";
+    //qDebug() << "client gone";
     RfbClient *client = static_cast<RfbClient*>(cl->clientData);
 
     RfbServerManager::instance()->removeClient(client);
@@ -273,9 +280,7 @@ void RfbServer::pointerHook(int bm, int x, int y, rfbClientPtr cl)
 }
 
 //static
-void RfbServer::clipboardHook(char *str, int len, rfbClientPtr cl)
+void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
     QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
 }
-
-#include "rfbserver.moc"

krfb/rfbserver.h

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

krfb/rfbservermanager.cpp

@@ -24,13 +24,14 @@
 #include "framebuffermanager.h"
 #include "sockethelpers.h"
 #include "krfbconfig.h"
-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtNetwork/QHostInfo>
-#include <KGlobal>
-#include <KDebug>
-#include <KLocale>
+#include <QTimer>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QGlobalStatic>
+#include <QHostInfo>
+#include <QDebug>
+
+#include <KLocalizedString>
 #include <KUser>
 #include <KNotification>
 
@@ -82,7 +83,7 @@ struct RfbServerManagerStatic
     RfbServerManager server;
 };
 
-K_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
+Q_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
 
 RfbServerManager* RfbServerManager::instance()
 {
@@ -114,16 +115,16 @@ RfbServerManager::~RfbServerManager()
 
 void RfbServerManager::init()
 {
-    kDebug();
+    //qDebug();
 
     d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
     d->myCursor = rfbMakeXCursor(19, 19, (char *) cur, (char *) mask);
     d->myCursor->cleanup = false;
-    d->desktopName = QString("%1@%2 (shared desktop)") //FIXME check if we can use utf8
+    d->desktopName = QStringLiteral("%1@%2 (shared desktop)") //FIXME check if we can use utf8
                         .arg(KUser().loginName(),QHostInfo::localHostName()).toLatin1();
 
-    connect(&d->rfbUpdateTimer, SIGNAL(timeout()), SLOT(updateScreens()));
-    connect(qApp, SIGNAL(aboutToQuit()), SLOT(cleanup()));
+    connect(&d->rfbUpdateTimer, &QTimer::timeout, this, &RfbServerManager::updateScreens);
+    connect(qApp, &QApplication::aboutToQuit, this, &RfbServerManager::cleanup);
 }
 
 void RfbServerManager::updateScreens()
@@ -131,7 +132,7 @@ void RfbServerManager::updateScreens()
     QList<QRect> rects = d->fb->modifiedTiles();
     QPoint currentCursorPos = QCursor::pos();
 
-    Q_FOREACH(RfbServer *server, d->servers) {
+    for (RfbServer* server : qAsConst(d->servers)) {
         server->updateScreen(rects);
         server->updateCursorPosition(currentCursorPos);
     }
@@ -139,21 +140,19 @@ void RfbServerManager::updateScreens()
     //update() might disconnect some of the clients, which will synchronously
     //call the removeClient() method and will change d->clients, so we need
     //to copy the set here to avoid problems.
-    QSet<RfbClient*> clients = d->clients;
-    Q_FOREACH(RfbClient *client, clients) {
+    const QSet<RfbClient*> clients = d->clients;
+    for (RfbClient* client : clients) {
         client->update();
     }
 }
 
 void RfbServerManager::cleanup()
 {
-    kDebug();
+    //qDebug();
 
     //copy because d->servers is going to be modified while we delete the servers
-    QSet<RfbServer*> servers = d->servers;
-    Q_FOREACH(RfbServer *server, servers) {
-        delete server;
-    }
+    const QSet<RfbServer*> servers = d->servers;
+    qDeleteAll(servers);
 
     Q_ASSERT(d->servers.isEmpty());
     Q_ASSERT(d->clients.isEmpty());
@@ -175,7 +174,7 @@ void RfbServerManager::unregisterServer(RfbServer* server)
 
 rfbScreenInfoPtr RfbServerManager::newScreen()
 {
-    rfbScreenInfoPtr screen = NULL;
+    rfbScreenInfoPtr screen = nullptr;
 
     if (!d->fb.isNull()) {
         int w = d->fb->width();
@@ -187,11 +186,11 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
             bpp = 4;
         }
 
-        kDebug() << "bpp: " << bpp;
+        //qDebug() << "bpp: " << bpp;
 
         rfbLogEnable(0);
 
-        screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+        screen = rfbGetScreen(nullptr, nullptr, w, h, 8, 3, bpp);
         screen->paddedWidthInBytes = d->fb->paddedWidth();
         d->fb->getServerFormat(screen->serverFormat);
         screen->frameBuffer = d->fb->data();
@@ -206,13 +205,13 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
 void RfbServerManager::addClient(RfbClient* cc)
 {
     if (d->clients.size() == 0) {
-        kDebug() << "Starting framebuffer monitor";
+        //qDebug() << "Starting framebuffer monitor";
         d->fb->startMonitor();
         d->rfbUpdateTimer.start(50);
     }
     d->clients.insert(cc);
 
-    KNotification::event("UserAcceptsConnection",
+    KNotification::event(QStringLiteral("UserAcceptsConnection"),
                          i18n("The remote user %1 is now connected.", cc->name()));
 
     Q_EMIT clientConnected(cc);
@@ -222,14 +221,12 @@ void RfbServerManager::removeClient(RfbClient* cc)
 {
     d->clients.remove(cc);
     if (d->clients.size() == 0) {
-        kDebug() << "Stopping framebuffer monitor";
+        //qDebug() << "Stopping framebuffer monitor";
         d->fb->stopMonitor();
         d->rfbUpdateTimer.stop();
     }
 
-    KNotification::event("ConnectionClosed", i18n("The remote user %1 disconnected.", cc->name()));
+    KNotification::event(QStringLiteral("ConnectionClosed"), i18n("The remote user %1 disconnected.", cc->name()));
 
     Q_EMIT clientDisconnected(cc);
 }
-
-#include "rfbservermanager.moc"

krfb/rfbservermanager.h

@@ -21,10 +21,10 @@
 #define RFBSERVERMANAGER_H
 
 #include "rfb.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 class RfbClient;
-class RfbServerManagerStatic;
+struct RfbServerManagerStatic;
 class RfbServer;
 
 class RfbServerManager : public QObject
@@ -52,11 +52,11 @@ private:
     void removeClient(RfbClient *cc);
 
     RfbServerManager();
-    virtual ~RfbServerManager();
+    ~RfbServerManager() override;
     Q_DISABLE_COPY(RfbServerManager)
 
     friend class RfbServer;
-    friend class RfbServerManagerStatic;
+    friend struct RfbServerManagerStatic;
 
     struct Private;
     Private *const d;

krfb/sockethelpers.cpp

@@ -36,19 +36,19 @@ QString peerAddress(int sock)
     if (getpeername(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
             struct sockaddr_in *si = (struct sockaddr_in *)&sa;
-            return QString(inet_ntoa(si->sin_addr));
+            return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString(inetbuf);
+            return QString::fromLatin1(inetbuf);
         }
 
-        return QString("not a network address");
+        return QStringLiteral("not a network address");
     }
 
-    return QString("unable to determine...");
+    return QStringLiteral("unable to determine...");
 }
 
 unsigned short peerPort(int sock)
@@ -75,19 +75,19 @@ QString localAddress(int sock)
     if (getsockname(sock, &sa, &salen) == 0) {
         if (sa.sa_family == AF_INET) {
             struct sockaddr_in *si = (struct sockaddr_in *)&sa;
-            return QString(inet_ntoa(si->sin_addr));
+            return QString::fromLatin1(inet_ntoa(si->sin_addr));
         }
 
         if (sa.sa_family == AF_INET6) {
             char inetbuf[ADDR_SIZE];
             inet_ntop(sa.sa_family, &sa, inetbuf, ADDR_SIZE);
-            return QString(inetbuf);
+            return QString::fromLatin1(inetbuf);
         }
 
-        return QString("not a network address");
+        return QStringLiteral("not a network address");
     }
 
-    return QString("unable to determine...");
+    return QStringLiteral("unable to determine...");
 }
 
 unsigned short localPort(int sock)

krfb/sockethelpers.h

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

krfb/trayicon.cpp

@@ -22,51 +22,53 @@
 #include "rfbservermanager.h"
 #include "rfbclient.h"
 
+#include <QIcon>
+#include <QMenu>
+
 #include <KAboutApplicationDialog>
 #include <KActionCollection>
-#include <KDialog>
-#include <KGlobal>
-#include <KLocale>
-#include <KMenu>
+#include <QDialog>
+#include <KHelpMenu>
+#include <KLocalizedString>
 #include <KStandardAction>
-#include <KDebug>
-
+#include <KToggleAction>
+#include <KConfigGroup>
 
 class ClientActions
 {
 public:
-    ClientActions(RfbClient *client, KMenu *menu, QAction *before);
+    ClientActions(RfbClient *client, QMenu *menu, QAction *before);
     virtual ~ClientActions();
 
 private:
-    KMenu *m_menu;
+    QMenu *m_menu;
     QAction *m_title;
     QAction *m_disconnectAction;
     QAction *m_enableControlAction;
     QAction *m_separator;
 };
 
-ClientActions::ClientActions(RfbClient* client, KMenu* menu, QAction* before)
+ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
     : m_menu(menu)
 {
-    m_title = m_menu->addTitle(client->name(), before);
+    m_title = m_menu->insertSection(before, client->name());
 
-    m_disconnectAction = new KAction(i18n("Disconnect"), m_menu);
+    m_disconnectAction = new QAction(i18n("Disconnect"), m_menu);
     m_menu->insertAction(before, m_disconnectAction);
 
-    QObject::connect(m_disconnectAction, SIGNAL(triggered()), client, SLOT(closeConnection()));
+    QObject::connect(m_disconnectAction, &QAction::triggered, client, &RfbClient::closeConnection);
 
     if (client->controlCanBeEnabled()) {
         m_enableControlAction = new KToggleAction(i18n("Enable Remote Control"), m_menu);
         m_enableControlAction->setChecked(client->controlEnabled());
         m_menu->insertAction(before, m_enableControlAction);
 
-        QObject::connect(m_enableControlAction, SIGNAL(triggered(bool)),
-                         client, SLOT(setControlEnabled(bool)));
-        QObject::connect(client, SIGNAL(controlEnabledChanged(bool)),
-                         m_enableControlAction, SLOT(setChecked(bool)));
+        QObject::connect(m_enableControlAction, &KToggleAction::triggered,
+                         client, &RfbClient::setControlEnabled);
+        QObject::connect(client, &RfbClient::controlEnabledChanged,
+                         m_enableControlAction, &KToggleAction::setChecked);
     } else {
-        m_enableControlAction = NULL;
+        m_enableControlAction = nullptr;
     }
 
     m_separator = m_menu->insertSeparator(before);
@@ -74,8 +76,6 @@ ClientActions::ClientActions(RfbClient* client, KMenu* menu, QAction* before)
 
 ClientActions::~ClientActions()
 {
-    kDebug();
-
     m_menu->removeAction(m_title);
     delete m_title;
 
@@ -96,26 +96,24 @@ ClientActions::~ClientActions()
 TrayIcon::TrayIcon(QWidget *mainWindow)
     : KStatusNotifierItem(mainWindow)
 {
-    setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
+    setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
 
     setToolTipTitle(i18n("Desktop Sharing - disconnected"));
     setCategory(KStatusNotifierItem::ApplicationStatus);
 
-    connect(RfbServerManager::instance(), SIGNAL(clientConnected(RfbClient*)),
-            this, SLOT(onClientConnected(RfbClient*)));
-    connect(RfbServerManager::instance(), SIGNAL(clientDisconnected(RfbClient*)),
-            this, SLOT(onClientDisconnected(RfbClient*)));
+    connect(RfbServerManager::instance(), &RfbServerManager::clientConnected,
+            this, &TrayIcon::onClientConnected);
+    connect(RfbServerManager::instance(), &RfbServerManager::clientDisconnected,
+            this, &TrayIcon::onClientDisconnected);
 
-    m_aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), actionCollection());
+    m_aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), this);
     contextMenu()->addAction(m_aboutAction);
 }
 
 void TrayIcon::onClientConnected(RfbClient* client)
 {
-    kDebug();
-
     if (m_clientActions.isEmpty()) { //first client connected
-        setIconByName("krfb");
+        setIconByName(QStringLiteral("krfb"));
         setToolTipTitle(i18n("Desktop Sharing - connected with %1", client->name()));
         setStatus(KStatusNotifierItem::Active);
     } else { //Nth client connected, N != 1
@@ -127,13 +125,11 @@ void TrayIcon::onClientConnected(RfbClient* client)
 
 void TrayIcon::onClientDisconnected(RfbClient* client)
 {
-    kDebug();
-
     ClientActions *actions = m_clientActions.take(client);
     delete actions;
 
     if (m_clientActions.isEmpty()) {
-        setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
+        setIconByPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(22, 22, QIcon::Disabled));
         setToolTipTitle(i18n("Desktop Sharing - disconnected"));
         setStatus(KStatusNotifierItem::Passive);
     } else if (m_clientActions.size() == 1) { //clients number dropped back to 1
@@ -144,9 +140,6 @@ void TrayIcon::onClientDisconnected(RfbClient* client)
 
 void TrayIcon::showAbout()
 {
-    KDialog *dlg = new KAboutApplicationDialog(KGlobal::mainComponent().aboutData());
-    dlg->setAttribute(Qt::WA_DeleteOnClose, true);
-    dlg->show();
+    KHelpMenu menu;
+    menu.aboutApplication();
 }
-
-#include "trayicon.moc"

krfb/trayicon.h

@@ -19,9 +19,7 @@
 #define TRAYICON_H
 
 #include <KStatusNotifierItem>
-#include <KToggleAction>
 
-class KDialog;
 class RfbClient;
 class ClientActions;
 
@@ -34,7 +32,7 @@ class TrayIcon : public KStatusNotifierItem
 {
     Q_OBJECT
 public:
-    TrayIcon(QWidget *mainWindow);
+    explicit TrayIcon(QWidget *mainWindow);
 
 public Q_SLOTS:
     void onClientConnected(RfbClient *client);
@@ -42,7 +40,7 @@ public Q_SLOTS:
     void showAbout();
 
 private:
-    KAction *m_aboutAction;
+    QAction *m_aboutAction;
     QHash<RfbClient*, ClientActions*> m_clientActions;
 };
 

krfb/tubesrfbclient.cpp

@@ -1,87 +0,0 @@
-/*
-    Copyright (C) 2009-2010 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tubesrfbclient.h"
-#include "krfbconfig.h"
-#include "connectiondialog.h"
-#include <KNotification>
-#include <KLocale>
-
-QString TubesRfbClient::name() const
-{
-    return m_contact->alias();
-}
-
-//********
-
-PendingTubesRfbClient::PendingTubesRfbClient(rfbClientPtr client, QObject* parent) :
-    PendingRfbClient(client, parent),
-    m_processNewClientCalled(false)
-{
-    processNewClient();
-}
-
-void PendingTubesRfbClient::setContact(const Tp::ContactPtr & contact)
-{
-    m_contact = contact;
-    if (m_processNewClientCalled) {
-        //processNewClient has already been called, so we need to act here
-        showConfirmationDialog();
-    }
-}
-
-void PendingTubesRfbClient::processNewClient()
-{
-    if (!m_contact) {
-        //no associated contact yet, hold.
-        m_processNewClientCalled = true; //act when a contact is set
-    } else {
-        //we have a contact, begin handling
-        showConfirmationDialog();
-    }
-}
-
-void PendingTubesRfbClient::showConfirmationDialog()
-{
-    QString name = m_contact->alias();
-
-    KNotification::event("NewConnectionOnHold",
-                        i18n("Received connection from %1, on hold (waiting for confirmation)",
-                            name));
-
-    TubesConnectionDialog *dialog = new TubesConnectionDialog(0);
-    dialog->setContactName(name);
-    dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
-
-    connect(dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
-    connect(dialog, SIGNAL(cancelClicked()), SLOT(reject()));
-
-    dialog->show();
-}
-
-void PendingTubesRfbClient::dialogAccepted()
-{
-    TubesConnectionDialog *dialog = qobject_cast<TubesConnectionDialog *>(sender());
-    Q_ASSERT(dialog);
-
-    TubesRfbClient *client = new TubesRfbClient(m_rfbClient, m_contact, parent());
-    client->setControlEnabled(dialog->allowRemoteControl());
-    accept(client);
-}
-
-#include "tubesrfbclient.moc"

krfb/tubesrfbclient.h

@@ -1,60 +0,0 @@
-/*
-    Copyright (C) 2010 Collabora Ltd. <info@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TUBESRFBCLIENT_H
-#define TUBESRFBCLIENT_H
-
-#include "rfbclient.h"
-#include <TelepathyQt/Contact>
-
-class TubesRfbClient : public RfbClient
-{
-public:
-    TubesRfbClient(rfbClientPtr client,
-            const Tp::ContactPtr &contact, QObject *parent=0)
-        : RfbClient(client, parent), m_contact(contact)
-    {}
-
-    virtual QString name() const;
-
-private:
-    Tp::ContactPtr m_contact;
-};
-
-//*********
-
-class PendingTubesRfbClient : public PendingRfbClient
-{
-    Q_OBJECT
-public:
-    PendingTubesRfbClient(rfbClientPtr client, QObject* parent = 0);
-
-    void setContact(const Tp::ContactPtr & contact);
-
-protected Q_SLOTS:
-    virtual void processNewClient();
-
-private Q_SLOTS:
-    void showConfirmationDialog();
-    void dialogAccepted();
-
-private:
-    Tp::ContactPtr m_contact;
-    bool m_processNewClientCalled;
-};
-
-#endif // TUBESRFBCLIENT_H

krfb/tubesrfbserver.cpp

@@ -1,262 +0,0 @@
-/*
-    Copyright (C) 2009-2011 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tubesrfbserver.h"
-#include "tubesrfbclient.h"
-#include "sockethelpers.h"
-
-#include <KDebug>
-#include <KRandom>
-
-#include <TelepathyQt/Debug>
-#include <TelepathyQt/Contact>
-#include <TelepathyQt/AccountFactory>
-#include <TelepathyQt/ConnectionFactory>
-#include <TelepathyQt/ContactFactory>
-#include <TelepathyQt/ChannelFactory>
-#include <TelepathyQt/OutgoingStreamTubeChannel>
-#include <TelepathyQt/StreamTubeServer>
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include <TelepathyQt/AccountSet>
-#include <TelepathyQt/AccountManager>
-#include <TelepathyQt/PendingReady>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/contact-factory.h>
-#endif
-
-struct TubesRfbServer::Private
-{
-    Tp::StreamTubeServerPtr stubeServer;
-    QHash<quint16, Tp::ContactPtr> contactsPerPort;
-    QHash<quint16, PendingTubesRfbClient*> clientsPerPort;
-};
-
-//static
-TubesRfbServer *TubesRfbServer::instance;
-
-//static
-void TubesRfbServer::init()
-{
-    instance = new TubesRfbServer;
-    //RfbServerManager takes care of deletion
-
-    instance->startAndCheck();
-}
-
-TubesRfbServer::TubesRfbServer(QObject *parent)
-    : RfbServer(parent), d(new Private)
-{
-    kDebug() << "starting";
-
-    Tp::enableDebug(true);
-    Tp::enableWarnings(true);
-    Tp::registerTypes();
-
-    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(
-            QDBusConnection::sessionBus(),
-            Tp::Features() << Tp::Account::FeatureCore
-            << Tp::Account::FeatureAvatar
-            << Tp::Account::FeatureCapabilities
-            << Tp::Account::FeatureProtocolInfo
-            << Tp::Account::FeatureProfile);
-
-    Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(
-            QDBusConnection::sessionBus(),
-            Tp::Features() << Tp::Connection::FeatureCore
-            << Tp::Connection::FeatureSelfContact);
-
-    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(
-            QDBusConnection::sessionBus());
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(
-            Tp::Features() << Tp::Contact::FeatureAlias
-            <<Tp::Contact::FeatureAvatarToken
-            <<Tp::Contact::FeatureAvatarData
-            <<Tp::Contact::FeatureSimplePresence
-            <<Tp::Contact::FeatureCapabilities
-            <<Tp::Contact::FeatureClientTypes);
-
-    m_accountManager = Tp::AccountManager::create(
-            QDBusConnection::sessionBus(),
-            accountFactory,
-            connectionFactory,
-            channelFactory,
-            contactFactory);
-
-    d->stubeServer = Tp::StreamTubeServer::create(
-            m_accountManager,
-            QStringList() << QLatin1String("rfb"),
-            QStringList(),
-            QLatin1String("krfb_rfb_handler"),
-            true);
-
-    connect(m_accountManager->becomeReady(),
-            SIGNAL(finished(Tp::PendingOperation*)),
-            this,
-            SLOT(onAccountManagerReady()));
-
-    m_contactsListModel = new KTp::ContactsListModel(this);
-#else
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(
-            Tp::Contact::FeatureAlias);
-
-    d->stubeServer = Tp::StreamTubeServer::create(
-            QStringList() << QLatin1String("rfb"),
-            QStringList(),
-            QLatin1String("krfb_rfb_handler"),
-            true,
-            accountFactory,
-            connectionFactory,
-            channelFactory,
-            contactFactory);
-#endif  //KRFB_WITH_KDE_TELEPATHY
-
-    connect(d->stubeServer.data(),
-            SIGNAL(tubeRequested(Tp::AccountPtr,Tp::OutgoingStreamTubeChannelPtr,
-                                 QDateTime,Tp::ChannelRequestHints)),
-            SLOT(onTubeRequested()));
-    connect(d->stubeServer.data(),
-            SIGNAL(tubeClosed(Tp::AccountPtr,Tp::OutgoingStreamTubeChannelPtr,QString,QString)),
-            SLOT(onTubeClosed()));
-
-    connect(d->stubeServer.data(),
-            SIGNAL(newTcpConnection(QHostAddress,quint16,Tp::AccountPtr,
-                                    Tp::ContactPtr,Tp::OutgoingStreamTubeChannelPtr)),
-            SLOT(onNewTcpConnection(QHostAddress,quint16,Tp::AccountPtr,
-                                    Tp::ContactPtr,Tp::OutgoingStreamTubeChannelPtr)));
-    connect(d->stubeServer.data(),
-            SIGNAL(tcpConnectionClosed(QHostAddress,quint16,Tp::AccountPtr,Tp::ContactPtr,
-                                       QString,QString,Tp::OutgoingStreamTubeChannelPtr)),
-            SLOT(onTcpConnectionClosed(QHostAddress,quint16,Tp::AccountPtr,Tp::ContactPtr,
-                                       QString,QString,Tp::OutgoingStreamTubeChannelPtr)));
-
-    // Pick a random port in the private range (49152–65535)
-    setListeningPort((KRandom::random() % 16383) + 49152);
-    // Listen only on the loopback network interface
-    setListeningAddress("127.0.0.1");
-    setPasswordRequired(false);
-}
-
-TubesRfbServer::~TubesRfbServer()
-{
-    kDebug();
-    stop();
-    delete d;
-}
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-KTp::ContactsListModel *TubesRfbServer::contactsListModel()
-{
-    return m_contactsListModel;
-}
-#endif
-
-void TubesRfbServer::startAndCheck()
-{
-    if (!start()) {
-        //try a few times with different ports
-        bool ok = false;
-        for (int i=0; !ok && i<5; i++) {
-            setListeningPort((KRandom::random() % 16383) + 49152);
-            ok = start();
-        }
-
-        if (!ok) {
-            kError() << "Failed to start tubes rfb server";
-            return;
-        }
-    }
-
-    //TODO listeningAddress() should be a QHostAddress
-    d->stubeServer->exportTcpSocket(QHostAddress(QString::fromAscii(listeningAddress())),
-                                    listeningPort());
-}
-
-void TubesRfbServer::onTubeRequested()
-{
-    kDebug() << "Got a tube";
-}
-
-void TubesRfbServer::onTubeClosed()
-{
-    kDebug() << "tube closed";
-}
-
-void TubesRfbServer::onNewTcpConnection(const QHostAddress & sourceAddress,
-                                        quint16 sourcePort,
-                                        const Tp::AccountPtr & account,
-                                        const Tp::ContactPtr & contact,
-                                        const Tp::OutgoingStreamTubeChannelPtr & tube)
-{
-    Q_UNUSED(account);
-    Q_UNUSED(tube);
-
-    kDebug() << "CM signaled tube connection from" << sourceAddress << ":" << sourcePort;
-
-    d->contactsPerPort[sourcePort] = contact;
-    if (d->clientsPerPort.contains(sourcePort)) {
-        kDebug() << "client already exists";
-        d->clientsPerPort[sourcePort]->setContact(contact);
-    }
-}
-
-void TubesRfbServer::onTcpConnectionClosed(const QHostAddress& sourceAddress,
-                                           quint16 sourcePort,
-                                           const Tp::AccountPtr& account,
-                                           const Tp::ContactPtr& contact,
-                                           const QString& error,
-                                           const QString& message,
-                                           const Tp::OutgoingStreamTubeChannelPtr& tube)
-{
-    Q_UNUSED(account);
-    Q_UNUSED(contact);
-    Q_UNUSED(tube);
-
-    kDebug() << "Connection from" << sourceAddress << ":" << sourcePort << "closed."
-             << error << message;
-
-    d->clientsPerPort.remove(sourcePort);
-    d->contactsPerPort.remove(sourcePort);
-}
-
-PendingRfbClient* TubesRfbServer::newClient(rfbClientPtr client)
-{
-    PendingTubesRfbClient *c = new PendingTubesRfbClient(client, this);
-    quint16 port = peerPort(client->sock);
-
-    kDebug() << "new tube client on port" << port;
-
-    d->clientsPerPort[port] = c;
-    if (d->contactsPerPort.contains(port)) {
-        kDebug() << "already have a contact";
-        c->setContact(d->contactsPerPort[port]);
-    }
-
-    return c;
-}
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-void TubesRfbServer::onAccountManagerReady()
-{
-    m_contactsListModel->setAccountManager(m_accountManager);
-}
-#endif
-
-#include "tubesrfbserver.moc"

krfb/tubesrfbserver.h

@@ -1,86 +0,0 @@
-/*
-    Copyright (C) 2009-2011 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TUBESRFBSERVER_H
-#define TUBESRFBSERVER_H
-
-#include "rfbserver.h"
-#include <QtNetwork/QHostAddress>
-#include <TelepathyQt/Types>
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-namespace KTp {
-    class ContactsListModel;
-}
-#endif
-
-class TubesRfbServer : public RfbServer
-{
-    Q_OBJECT
-public:
-    static TubesRfbServer *instance;
-    static void init();
-
-    virtual ~TubesRfbServer();
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    KTp::ContactsListModel *contactsListModel();
-#endif
-
-protected:
-    TubesRfbServer(QObject *parent = 0);
-
-    virtual PendingRfbClient* newClient(rfbClientPtr client);
-
-private Q_SLOTS:
-    void startAndCheck();
-
-    void onTubeRequested();
-    void onTubeClosed();
-
-    void onNewTcpConnection(
-            const QHostAddress &sourceAddress,
-            quint16 sourcePort,
-            const Tp::AccountPtr &account,
-            const Tp::ContactPtr &contact,
-            const Tp::OutgoingStreamTubeChannelPtr &tube);
-
-    void onTcpConnectionClosed(
-            const QHostAddress &sourceAddress,
-            quint16 sourcePort,
-            const Tp::AccountPtr &account,
-            const Tp::ContactPtr &contact,
-            const QString &error,
-            const QString &message,
-            const Tp::OutgoingStreamTubeChannelPtr &tube);
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    void onAccountManagerReady();
-#endif
-
-private:
-    struct Private;
-    Private *const d;
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    KTp::ContactsListModel *m_contactsListModel;
-    Tp::AccountManagerPtr m_accountManager;
-#endif
-
-};
-
-#endif // TUBESRFBSERVER_H

krfb/ui/configframebuffer.ui

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Framebuffer</class>
+ <widget class="QWidget" name="Framebuffer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>418</width>
+    <height>186</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Framebuffer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Preferred frameb&amp;uffer plugin:</string>
+       </property>
+       <property name="buddy">
+        <cstring>cb_preferredFrameBufferPlugin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cb_preferredFrameBufferPlugin">
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="kcfg_preferredFrameBufferPlugin"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="helpText">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When using x11, &lt;span style=&quot; font-weight:600;&quot;&gt;xcb&lt;/span&gt; plugin should be preferred, because it is more performant.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;qt&lt;/span&gt; plugin is a safe fallback, if for some reason others don't work. But also it is very slow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="margin">
+      <number>5</number>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::NoTextInteraction</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>63</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>cb_preferredFrameBufferPlugin</tabstop>
+  <tabstop>kcfg_preferredFrameBufferPlugin</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

krfb/ui/configsecurity.ui

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

krfb/ui/configtcp.ui

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

krfb/ui/invitewidget.ui

@@ -1,171 +0,0 @@
-<ui version="4.0" >
- <class>InviteWidget</class>
- <widget class="QWidget" name="InviteWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>603</width>
-    <height>364</height>
-   </rect>
-  </property>
-  <layout class="QHBoxLayout" >
-   <item>
-    <widget class="QLabel" name="pixmapLabel" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>128</width>
-       <height>128</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QLabel" name="TextLabel2" >
-       <property name="font" >
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text" >
-        <string>Welcome to KDE Desktop Sharing</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="helpLabel" >
-       <property name="text" >
-        <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a></string>
-       </property>
-       <property name="textFormat" >
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="wordWrap" >
-        <bool>true</bool>
-       </property>
-       <property name="textInteractionFlags" >
-        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>215</width>
-         <height>101</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>90</width>
-           <height>26</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" >
-         <item>
-          <widget class="QPushButton" name="btnCreateInvite" >
-           <property name="toolTip" >
-            <string/>
-           </property>
-           <property name="whatsThis" >
-            <string>Create a new invitation and display the connection data. Use this option if you want to invite somebody personally, for example, to give the connection data over the phone.</string>
-           </property>
-           <property name="text" >
-            <string>Create &amp;Personal Invitation...</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnEmailInvite" >
-           <property name="whatsThis" >
-            <string>This button will start your email application with a pre-configured text that explains to the recipient how to connect to your computer. </string>
-           </property>
-           <property name="text" >
-            <string>Invite via &amp;Email...</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnManageInvite" >
-           <property name="text" >
-            <string>&amp;Manage Invitations (%1)...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>90</width>
-           <height>26</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>24</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
-  <resources/>
- <connections/>
-</ui>

krfb/ui/mainwidget.ui

@@ -442,7 +442,7 @@
            </widget>
           </item>
           <item>
-           <widget class="KPushButton" name="unattendedPasswordButton">
+           <widget class="QPushButton" name="unattendedPasswordButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
               <horstretch>0</horstretch>
@@ -486,11 +486,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>enableSharingCheckBox</tabstop>

krfb/ui/tubesconnectionwidget.ui

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TubesConnectionWidget</class>
- <widget class="QWidget" name="TubesConnectionWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>162</height>
-   </rect>
-  </property>
-  <layout class="QHBoxLayout">
-   <item>
-    <widget class="QLabel" name="pixmapLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>128</width>
-       <height>128</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout">
-     <item>
-      <widget class="QLabel" name="TextLabel5">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>13</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Confirmation</string>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="mainTextLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="lineWidth">
-        <number>-1</number>
-       </property>
-       <property name="midLineWidth">
-        <number>5</number>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::AutoText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="cbAllowRemoteControl">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="whatsThis">
-        <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string>
-       </property>
-       <property name="text">
-        <string>Allow remote user to &amp;control keyboard and mouse</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>