diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e9de30d5..30ab23426 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,645 +1,647 @@
 project(KWIN)
 set(PROJECT_VERSION "5.8.90")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.5.0")
 set(KF5_MIN_VERSION "5.26.0")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
 
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 
 include(FeatureSummary)
 include(WriteBasicConfigVersionFile)
 include(GenerateExportHeader)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Concurrent
     Core
     DBus
     Quick
     QuickWidgets
     Script
     UiTools
     Widgets
     X11Extras
 )
 
 find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
 set_package_properties(Qt5Test PROPERTIES
          PURPOSE "Required for tests"
          TYPE OPTIONAL
          )
 add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
 if (NOT Qt5Test_FOUND)
     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
 endif()
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
 include(ECMInstallIcons)
 include(ECMOptionalAddSubdirectory)
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER)
 
 # require at least gcc 4.8
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.8")
         message(SEND_ERROR "Version ${CMAKE_CXX_COMPILER_VERSION} of the ${CMAKE_CXX_COMPILER_ID} C++ compiler is not supported. Please use version 4.8 or later.")
     endif()
 endif()
 
 find_package(Qt5Multimedia QUIET)
 set_package_properties(Qt5Multimedia PROPERTIES
          PURPOSE "Runtime-only dependency for effect video playback"
          TYPE RUNTIME
          )
 
 
 # required frameworks by Core
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
     ConfigWidgets
     CoreAddons
     Crash
     GlobalAccel
     I18n
     Init
     Notifications
     Package
     Plasma
     WidgetsAddons
     WindowSystem
     IconThemes
     IdleTime
     Wayland
 )
 # required frameworks by config modules
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Completion
     Declarative
     KCMUtils
     KIO
     TextWidgets
     NewStuff
     Service
     XmlGui
 )
 
 find_package(Threads)
 set_package_properties(Threads PROPERTIES
          PURPOSE "Needed for VirtualTerminal support in KWin Wayland"
          TYPE REQUIRED
          )
 
 # optional frameworks
 find_package(KF5Activities ${KF5_MIN_VERSION} CONFIG)
 set_package_properties(KF5Activities PROPERTIES
          PURPOSE "Enable building of KWin with kactivities support"
          TYPE OPTIONAL
          )
 add_feature_info("KF5Activities" KF5Activities_FOUND "Enable building of KWin with kactivities support")
 
 find_package(KF5DocTools ${KF5_MIN_VERSION} CONFIG)
 set_package_properties(KF5DocTools PROPERTIES
          PURPOSE "Enable building documentation"
          TYPE OPTIONAL
          )
 add_feature_info("KF5DocTools" KF5DocTools_FOUND "Enable building documentation")
 
 find_package(KDecoration2 CONFIG REQUIRED)
 
 find_package(KScreenLocker CONFIG REQUIRED)
 set_package_properties(KScreenLocker PROPERTIES
                        TYPE REQUIRED
                        PURPOSE "For screenlocker integration in kwin_wayland")
 
 find_package(Breeze ${PROJECT_VERSION} CONFIG)
 set_package_properties(Breeze PROPERTIES
                        TYPE OPTIONAL
                        PURPOSE "For setting the default window decoration plugin")
 if(${Breeze_FOUND})
     if(${BREEZE_WITH_KDECORATION})
         set(HAVE_BREEZE_DECO true)
     else()
         set(HAVE_BREEZE_DECO FALSE)
     endif()
 else()
     set(HAVE_BREEZE_DECO FALSE)
 endif()
 add_feature_info("Breeze-Decoration" HAVE_BREEZE_DECO "Default decoration plugin Breeze")
 
 find_package(EGL)
 set_package_properties(EGL PROPERTIES
                        TYPE RUNTIME
                        PURPOSE "Required to build KWin with EGL support"
                       )
 
 find_package(epoxy)
 set_package_properties(epoxy PROPERTIES DESCRIPTION "libepoxy"
                        URL "http://github.com/anholt/libepoxy"
                        TYPE REQUIRED
                        PURPOSE "OpenGL dispatch library"
                       )
 
 set(HAVE_DL_LIBRARY FALSE)
 if(epoxy_HAS_GLX)
     find_library(DL_LIBRARY dl)
     if(DL_LIBRARY)
         set(HAVE_DL_LIBRARY TRUE)
     endif()
 endif()
 
 find_package(Wayland 1.2 REQUIRED COMPONENTS Cursor OPTIONAL_COMPONENTS Egl)
 set_package_properties(Wayland PROPERTIES
                        TYPE REQUIRED
                        PURPOSE "Required for building KWin with Wayland support"
                       )
 add_feature_info("Wayland::EGL" Wayland_Egl_FOUND "Enable building of Wayland backend and QPA with EGL support.")
 set(HAVE_WAYLAND_EGL FALSE)
 if(Wayland_Egl_FOUND)
     set(HAVE_WAYLAND_EGL TRUE)
 endif()
 
 find_package(XKB 0.5.0)
 set_package_properties(XKB PROPERTIES
                        TYPE REQUIRED
                        PURPOSE "Required for building KWin with Wayland support"
                       )
 
 find_package(Libinput 1.5)
 set_package_properties(Libinput PROPERTIES TYPE OPTIONAL PURPOSE "Required for input handling on Wayland.")
 
 find_package(UDev)
 set_package_properties(UDev PROPERTIES  URL "http://www.freedesktop.org/software/systemd/libudev/"
                                         DESCRIPTION "Linux device library."
                                         TYPE OPTIONAL
                                         PURPOSE "Required for input handling on Wayland."
                         )
 set(HAVE_INPUT FALSE)
 if (Libinput_FOUND AND UDEV_FOUND)
     set(HAVE_INPUT TRUE)
 endif()
 set(HAVE_UDEV FALSE)
 if (UDEV_FOUND)
     set(HAVE_UDEV TRUE)
 endif()
 
 find_package(Libdrm 2.4.62)
 set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL PURPOSE "Required for drm output on Wayland.")
 set(HAVE_DRM FALSE)
 if(Libdrm_FOUND AND UDEV_FOUND)
     set(HAVE_DRM TRUE)
 endif()
 
 find_package(gbm)
 set_package_properties(gbm PROPERTIES TYPE OPTIONAL PURPOSE "Required for egl ouput of drm backend.")
 set(HAVE_GBM FALSE)
 if(HAVE_DRM AND gbm_FOUND)
     set(HAVE_GBM TRUE)
 endif()
 
 find_package(libhybris)
 set_package_properties(libhybris PROPERTIES TYPE OPTIONAL PURPOSE "Required for libhybris backend")
 set(HAVE_LIBHYBRIS ${libhybris_FOUND})
 
 find_package(X11)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
                         URL "http://www.x.org"
                         TYPE REQUIRED
                     )
 add_feature_info("XInput" X11_Xinput_FOUND "Required for poll-free mouse cursor updates")
 set(HAVE_X11_XINPUT ${X11_Xinput_FOUND})
 
 # All the required XCB components
 find_package(XCB 1.10
     REQUIRED COMPONENTS
         XCB
         XFIXES
         DAMAGE
         COMPOSITE
         SHAPE
         SYNC
         RENDER
         RANDR
         KEYSYMS
         IMAGE
         SHM
         GLX
         CURSOR
     OPTIONAL_COMPONENTS
         ICCCM
 )
 set_package_properties(XCB PROPERTIES TYPE REQUIRED)
 
 # and the optional XCB dependencies
 if (XCB_ICCCM_VERSION VERSION_LESS "0.4")
     set(XCB_ICCCM_FOUND FALSE)
 endif()
 add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test applications for KWin")
 
 find_package(X11_XCB)
 set_package_properties(X11_XCB PROPERTIES
                        PURPOSE "Required for building X11 windowed backend of kwin_wayland"
                        TYPE OPTIONAL)
 
 # dependencies for QPA plugin
 if(Qt5Core_VERSION VERSION_LESS "5.8.0")
     find_package(Qt5PlatformSupport REQUIRED)
 else()
     find_package(Qt5FontDatabaseSupport REQUIRED)
     find_package(Qt5ThemeSupport REQUIRED)
     find_package(Qt5EventDispatcherSupport REQUIRED)
 endif()
 
 find_package(Freetype REQUIRED)
 set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine"
                        URL "http://www.freetype.org"
                        TYPE REQUIRED
                        PURPOSE "Needed for KWin's QPA plugin."
                       )
 find_package(Fontconfig REQUIRED)
 set_package_properties(Fontconfig PROPERTIES DESCRIPTION "Font access configuration library"
                        URL "http://www.freedesktop.org/wiki/Software/fontconfig"
                        TYPE REQUIRED
                        PURPOSE "Needed for KWin's QPA plugin."
                       )
 
 find_package(Xwayland)
 set_package_properties(Xwayland PROPERTIES
     URL "http://x.org"
     DESCRIPTION "Xwayland X server"
     TYPE RUNTIME
     PURPOSE "Needed for running kwin_wayland"
     )
 
 ########### configure tests ###############
 include(CMakeDependentOption)
 
 option(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON)
 option(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON)
 option(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
 option(KWIN_BUILD_XRENDER_COMPOSITING "Enable building of KWin with XRender Compositing support" ON)
 cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF)
 
 # Binary name of KWin
 set(KWIN_NAME "kwin")
 set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
 set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
 set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 # KWIN_HAVE_XRENDER_COMPOSITING - whether XRender-based compositing support is available: may be disabled
 if( KWIN_BUILD_XRENDER_COMPOSITING )
     set( KWIN_HAVE_XRENDER_COMPOSITING 1 )
 endif()
 
 include_directories(${XKB_INCLUDE_DIR})
 
 include_directories(${epoxy_INCLUDE_DIR})
 set(HAVE_EPOXY_GLX ${epoxy_HAS_GLX})
 
 # for things that are also used by kwin libraries
 configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
 # for kwin internal things
 set(HAVE_X11_XCB ${X11_XCB_FOUND})
 
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
 check_include_files(unistd.h HAVE_UNISTD_H)
 check_include_files(malloc.h HAVE_MALLOC_H)
 
 check_include_file("sys/prctl.h" HAVE_SYS_PRCTL_H)
 check_symbol_exists(PR_SET_DUMPABLE "sys/prctl.h" HAVE_PR_SET_DUMPABLE)
 check_include_file("sys/procctl.h" HAVE_SYS_PROCCTL_H)
 check_symbol_exists(PROC_TRACE_CTL "sys/procctl.h" HAVE_PROC_TRACE_CTL)
 if (HAVE_PR_SET_DUMPABLE OR HAVE_PROC_TRACE_CTL)
     set(CAN_DISABLE_PTRACE TRUE)
 endif()
 add_feature_info("prctl/procctl tracing control"
                  CAN_DISABLE_PTRACE
                  "Required for disallowing ptrace on kwin_wayland process")
 
 configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h )
 
 
 ########### global ###############
 set(kwin_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kwin.Effects.xml)
 
 include_directories(BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/libkwineffects
     ${CMAKE_CURRENT_SOURCE_DIR}/effects
     ${CMAKE_CURRENT_SOURCE_DIR}/tabbox
     )
 
 add_subdirectory( libkwineffects )
 if(KWIN_BUILD_KCMS)
     add_subdirectory( kcmkwin )
 endif()
 
 add_subdirectory( data )
 
 add_subdirectory( effects )
 add_subdirectory( scripts )
 add_subdirectory( tabbox )
 add_subdirectory(scripting)
 add_subdirectory(helpers)
 
 ########### next target ###############
 
 set(kwin_KDEINIT_SRCS
    workspace.cpp
    dbusinterface.cpp
    abstract_client.cpp
    client.cpp
    client_machine.cpp
    cursor.cpp
    debug_console.cpp
    tabgroup.cpp
    focuschain.cpp
    globalshortcuts.cpp
    input.cpp
    input_event.cpp
    keyboard_input.cpp
    pointer_input.cpp
    touch_input.cpp
    netinfo.cpp
    placement.cpp
    atoms.cpp
    utils.cpp
    layers.cpp
    main.cpp
    options.cpp
    outline.cpp
    events.cpp
    killwindow.cpp
    geometrytip.cpp
    screens.cpp
    shadow.cpp
    sm.cpp
    group.cpp
    manage.cpp
    overlaywindow.cpp
    activation.cpp
    useractions.cpp
    geometry.cpp
    rules.cpp
    composite.cpp
    toplevel.cpp
    unmanaged.cpp
    scene.cpp
    scene_xrender.cpp
    scene_opengl.cpp
    scene_qpainter.cpp
    screenlockerwatcher.cpp
    thumbnailitem.cpp
    lanczosfilter.cpp
    deleted.cpp
    effects.cpp
    effectloader.cpp
    virtualdesktops.cpp
    xcbutils.cpp
    x11eventfilter.cpp
    logind.cpp
+   onscreennotification.cpp
+   osd.cpp
     screenedge.cpp
     scripting/scripting.cpp
     scripting/workspace_wrapper.cpp
     scripting/meta.cpp
     scripting/scriptedeffect.cpp
     scripting/scriptingutils.cpp
     scripting/timer.cpp
     scripting/scripting_model.cpp
     scripting/dbuscall.cpp
     scripting/screenedgeitem.cpp
     scripting/scripting_logging.cpp
     decorations/decoratedclient.cpp
     decorations/decorationbridge.cpp
     decorations/decorationpalette.cpp
     decorations/settings.cpp
     decorations/decorationrenderer.cpp
     decorations/decorations_logging.cpp
     abstract_egl_backend.cpp
     platform.cpp
     shell_client.cpp
     wayland_server.cpp
     wayland_cursor_theme.cpp
     virtualkeyboard.cpp
    )
 
 if(KWIN_BUILD_TABBOX)
     set(
         kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
         tabbox/tabbox.cpp
         tabbox/clientmodel.cpp
         tabbox/desktopchain.cpp
         tabbox/desktopmodel.cpp
         tabbox/switcheritem.cpp
         tabbox/tabboxconfig.cpp
         tabbox/tabboxhandler.cpp
         tabbox/tabbox_logging.cpp
   )
 endif()
 
 if(KWIN_BUILD_ACTIVITIES)
     set(
         kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
         activities.cpp
     )
 endif()
 
 if(UDEV_FOUND)
     set(kwin_KDEINIT_SRCS
         ${kwin_KDEINIT_SRCS}
         udev.cpp
     )
 endif()
 
 if(HAVE_INPUT)
     set(kwin_KDEINIT_SRCS
         ${kwin_KDEINIT_SRCS}
         libinput/context.cpp
         libinput/connection.cpp
         libinput/device.cpp
         libinput/events.cpp
         libinput/libinput_logging.cpp
         virtual_terminal.cpp
     )
 endif()
 
 kconfig_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc)
 
 qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface )
 qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml dbusinterface.h KWin::CompositorDBusInterface )
 qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS ${kwin_effects_dbus_xml} effects.h KWin::EffectsHandlerImpl )
 
 qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.ScreenSaver.xml screenlocker_interface)
 
 qt5_add_resources( kwin_KDEINIT_SRCS resources.qrc )
 
 ki18n_wrap_ui(kwin_KDEINIT_SRCS
     debug_console.ui
     shortcutdialog.ui
 )
 
 ########### target link libraries ###############
 
 set(kwin_OWN_LIBS
     kwineffects
     kwinxrenderutils
     kwin4_effect_builtins
 )
 
 set(kwin_QT_LIBS
     Qt5::Concurrent
     Qt5::DBus
     Qt5::Quick
     Qt5::Script
     Qt5::X11Extras
 )
 
 set(kwin_KDE_LIBS
     KF5::ConfigCore
     KF5::CoreAddons
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::GlobalAccelPrivate
     KF5::I18n
     KF5::Notifications
     KF5::Package
     KF5::Plasma
     KF5::WindowSystem
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
     PW::KScreenLocker
 )
 
 set(kwin_XLIB_LIBS
     ${X11_X11_LIB}
     ${X11_ICE_LIB}
     ${X11_SM_LIB}
 )
 
 set(kwin_XCB_LIBS
     XCB::XCB
     XCB::XFIXES
     XCB::DAMAGE
     XCB::COMPOSITE
     XCB::SHAPE
     XCB::SYNC
     XCB::RENDER
     XCB::RANDR
     XCB::KEYSYMS
     XCB::SHM
     XCB::GLX
 )
 
 set(kwin_WAYLAND_LIBS
     XKB::XKB
     KF5::WaylandClient
     KF5::WaylandServer
     Wayland::Cursor
     ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(KWIN_BUILD_ACTIVITIES)
     set(kwin_KDE_LIBS ${kwin_KDE_LIBS} KF5::Activities)
 endif()
 
 set(kwinLibs
     ${kwin_OWN_LIBS}
     ${kwin_QT_LIBS}
     ${kwin_KDE_LIBS}
     ${kwin_XLIB_LIBS}
     ${kwin_XCB_LIBS}
     ${kwin_WAYLAND_LIBS}
 )
 
 if(UDEV_FOUND)
     set(kwinLibs ${kwinLibs} ${UDEV_LIBS})
 endif()
 
 if(HAVE_INPUT)
     set(kwinLibs ${kwinLibs} Libinput::Libinput)
 endif()
 
 add_library(kwin SHARED ${kwin_KDEINIT_SRCS})
 
 set_target_properties(kwin PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR}
    )
 
 target_link_libraries(kwin ${kwinLibs})
 generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)
 
 target_link_libraries(kwin kwinglutils ${epoxy_LIBRARY})
 
 kf5_add_kdeinit_executable(kwin_x11 main_x11.cpp)
 target_link_libraries(kdeinit_kwin_x11 kwin KF5::Crash)
 
 install(TARGETS kwin             ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP )
 install(TARGETS kdeinit_kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(TARGETS kwin_x11         ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 add_executable(kwin_wayland main_wayland.cpp)
 target_link_libraries(kwin_wayland kwin)
 
 install(TARGETS kwin_wayland         ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 add_subdirectory(plugins)
 
 ########### install files ###############
 
 install( FILES kwin.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}.kcfg )
 install( FILES kwin.notifyrc  DESTINATION  ${KNOTIFYRC_INSTALL_DIR} RENAME ${KWIN_NAME}.notifyrc)
 install(
     FILES
         org.kde.KWin.xml
         org.kde.kwin.Compositing.xml
         org.kde.kwin.Effects.xml
     DESTINATION
         ${KDE_INSTALL_DBUSINTERFACEDIR}
 )
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
 
 # Install the KWin/Script service type
 install( FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 ecm_install_icons(
     ICONS
         16-apps-kwin.png
         32-apps-kwin.png
         48-apps-kwin.png
         sc-apps-kwin.svgz
     DESTINATION
         ${ICON_INSTALL_DIR}
     THEME
         hicolor
 )
 
 add_subdirectory(qml)
 add_subdirectory(autotests)
 add_subdirectory(tests)
 
 if (KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 include(ECMPackageConfigHelpers)
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KWinDBusInterface")
 ecm_configure_package_config_file(KWinDBusInterfaceConfig.cmake.in
     "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake"
     PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake
     DESTINATION ${CMAKECONFIG_INSTALL_DIR})
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 25c059de9..5cc6da487 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,315 +1,333 @@
 add_definitions(-DKWIN_UNIT_TEST)
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
 add_subdirectory(libkwineffects)
 add_subdirectory(libxrenderutils)
 add_subdirectory(integration)
 if (HAVE_INPUT)
     add_subdirectory(libinput)
 endif()
 add_subdirectory(tabbox)
 
 ########################################################
 # Test ScreenPaintData
 ########################################################
 set( testScreenPaintData_SRCS test_screen_paint_data.cpp )
 add_executable(testScreenPaintData ${testScreenPaintData_SRCS})
 target_link_libraries( testScreenPaintData kwineffects Qt5::Test Qt5::Widgets KF5::WindowSystem)
 add_test(kwin-testScreenPaintData testScreenPaintData)
 ecm_mark_as_test(testScreenPaintData)
 
 ########################################################
 # Test WindowPaintData
 ########################################################
 set( testWindowPaintData_SRCS test_window_paint_data.cpp )
 add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
 target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
 add_test(kwin-testWindowPaintData testWindowPaintData)
 ecm_mark_as_test(testWindowPaintData)
 
 ########################################################
 # Test VirtualDesktopManager
 ########################################################
 set( testVirtualDesktops_SRCS
      test_virtual_desktops.cpp
      ../virtualdesktops.cpp
 )
 add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
 
 target_link_libraries( testVirtualDesktops
                        Qt5::Test
                        Qt5::Widgets
                        KF5::I18n
                        KF5::GlobalAccel
                        KF5::ConfigCore
                        KF5::WindowSystem
 )
 add_test(kwin-testVirtualDesktops testVirtualDesktops)
 ecm_mark_as_test(testVirtualDesktops)
 
 ########################################################
 # Test ClientMachine
 ########################################################
 set( testClientMachine_SRCS
      test_client_machine.cpp
      ../client_machine.cpp
 )
 add_executable( testClientMachine ${testClientMachine_SRCS} )
 
 target_link_libraries( testClientMachine
                        Qt5::Concurrent
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
                        XCB::XFIXES
                        ${X11_X11_LIB} # to make jenkins happy
 )
 add_test(kwin-testClientMachine testClientMachine)
 ecm_mark_as_test(testClientMachine)
 
 ########################################################
 # Test XcbWrapper
 ########################################################
 set( testXcbWrapper_SRCS
      test_xcb_wrapper.cpp
 )
 add_executable( testXcbWrapper ${testXcbWrapper_SRCS} )
 
 target_link_libraries( testXcbWrapper
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
 )
 add_test(kwin-testXcbWrapper testXcbWrapper)
 ecm_mark_as_test(testXcbWrapper)
 
 if (XCB_ICCCM_FOUND)
     add_executable( testXcbSizeHints test_xcb_size_hints.cpp )
     target_link_libraries( testXcbSizeHints
                            Qt5::Test
                            Qt5::X11Extras
                            KF5::ConfigCore
                            KF5::WindowSystem
                            XCB::XCB
                            XCB::ICCCM
     )
     add_test(kwin-testXcbSizeHints testXcbSizeHints)
     ecm_mark_as_test(testXcbSizeHints)
 endif()
 
 ########################################################
 # Test XcbWindow
 ########################################################
 set( testXcbWindow_SRCS
      test_xcb_window.cpp
 )
 add_executable( testXcbWindow ${testXcbWindow_SRCS} )
 
 target_link_libraries( testXcbWindow
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
 )
 add_test(kwin-testXcbWindow testXcbWindow)
 ecm_mark_as_test(testXcbWindow)
 
 ########################################################
 # Test BuiltInEffectLoader
 ########################################################
 set( testBuiltInEffectLoader_SRCS
     test_builtin_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
 )
 add_executable( testBuiltInEffectLoader ${testBuiltInEffectLoader_SRCS})
 
 target_link_libraries(testBuiltInEffectLoader
     Qt5::Concurrent
     Qt5::Test
     Qt5::X11Extras
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testBuiltInEffectLoader testBuiltInEffectLoader)
 ecm_mark_as_test(testBuiltInEffectLoader)
 
 ########################################################
 # Test ScriptedEffectLoader
 ########################################################
 include_directories(${KWIN_SOURCE_DIR})
 set( testScriptedEffectLoader_SRCS
     test_scripted_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
     ../scripting/scriptedeffect.cpp
     ../scripting/scriptingutils.cpp
     ../scripting/scripting_logging.cpp
 )
 add_executable( testScriptedEffectLoader ${testScriptedEffectLoader_SRCS})
 
 target_link_libraries(testScriptedEffectLoader
     Qt5::Concurrent
     Qt5::Script
     Qt5::Test
     Qt5::X11Extras
     KF5::ConfigGui
     KF5::GlobalAccel
     KF5::I18n
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testScriptedEffectLoader testScriptedEffectLoader)
 ecm_mark_as_test(testScriptedEffectLoader)
 
 ########################################################
 # Test PluginEffectLoader
 ########################################################
 set( testPluginEffectLoader_SRCS
     test_plugin_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
 )
 add_executable( testPluginEffectLoader ${testPluginEffectLoader_SRCS})
 
 target_link_libraries(testPluginEffectLoader
     Qt5::Concurrent
     Qt5::Test
     Qt5::X11Extras
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testPluginEffectLoader testPluginEffectLoader)
 ecm_mark_as_test(testPluginEffectLoader)
 
 ########################################################
 # FakeEffectPlugin
 ########################################################
 add_library(fakeeffectplugin MODULE fakeeffectplugin.cpp)
 set_target_properties(fakeeffectplugin PROPERTIES PREFIX "")
 target_link_libraries(fakeeffectplugin kwineffects)
 
 ########################################################
 # FakeEffectPlugin-Version
 ########################################################
 add_library(effectversionplugin MODULE fakeeffectplugin_version.cpp)
 set_target_properties(effectversionplugin PROPERTIES PREFIX "")
 target_link_libraries(effectversionplugin kwineffects)
 
 ########################################################
 # Test Screens
 ########################################################
 set( testScreens_SRCS
     test_screens.cpp
     mock_abstract_client.cpp
     mock_client.cpp
     mock_screens.cpp
     mock_workspace.cpp
     ../screens.cpp
     ../x11eventfilter.cpp
 )
 kconfig_add_kcfg_files(testScreens_SRCS ../settings.kcfgc)
 
 add_executable( testScreens ${testScreens_SRCS})
 target_include_directories(testScreens BEFORE PRIVATE ./)
 target_link_libraries(testScreens
     Qt5::Test
     Qt5::X11Extras
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::WindowSystem
 )
 
 add_test(kwin_testScreens testScreens)
 ecm_mark_as_test(testScreens)
 
 ########################################################
 # Test XrandRScreens
 ########################################################
 set( testXRandRScreens_SRCS
      test_xrandr_screens.cpp
      mock_abstract_client.cpp
      mock_client.cpp
      mock_screens.cpp
      mock_workspace.cpp
      ../screens.cpp
      ../plugins/platforms/x11/standalone/screens_xrandr.cpp
      ../xcbutils.cpp # init of extensions
      ../x11eventfilter.cpp
 )
 kconfig_add_kcfg_files(testXRandRScreens_SRCS ../settings.kcfgc)
 add_executable( testXRandRScreens ${testXRandRScreens_SRCS} )
 target_link_libraries( testXRandRScreens
                        Qt5::Test
                        Qt5::Gui
                        KF5::ConfigCore
                        KF5::ConfigGui
                        KF5::WindowSystem
                        XCB::XCB
                        XCB::RANDR
                        XCB::XFIXES
                        XCB::SYNC
                        XCB::COMPOSITE
                        XCB::DAMAGE
                        XCB::GLX
                        XCB::SHM
 )
 
 add_test(kwin-testXRandRScreens testXRandRScreens)
 ecm_mark_as_test(testXRandRScreens)
 
 ########################################################
 # Test ScreenEdges
 ########################################################
 set( testScreenEdges_SRCS
     test_screen_edges.cpp
     mock_abstract_client.cpp
     mock_client.cpp
     mock_screens.cpp
     mock_workspace.cpp
     ../atoms.cpp
     ../screens.cpp
     ../screenedge.cpp
     ../virtualdesktops.cpp
     ../xcbutils.cpp # init of extensions
     ../plugins/platforms/x11/standalone/edge.cpp
 )
 kconfig_add_kcfg_files(testScreenEdges_SRCS ../settings.kcfgc)
 qt5_add_dbus_interface( testScreenEdges_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../org.freedesktop.ScreenSaver.xml screenlocker_interface)
 
 add_executable( testScreenEdges ${testScreenEdges_SRCS})
 target_include_directories(testScreenEdges BEFORE PRIVATE ./)
 target_link_libraries(testScreenEdges
     Qt5::DBus
     Qt5::Test
     Qt5::X11Extras
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::I18n
     KF5::GlobalAccel
     KF5::WindowSystem
     XCB::XCB
     XCB::RANDR
     XCB::XFIXES
     XCB::SYNC
     XCB::COMPOSITE
     XCB::DAMAGE
     XCB::GLX
     XCB::SHM
 )
 
 add_test(kwin_testScreenEdges testScreenEdges)
 ecm_mark_as_test(testScreenEdges)
+
+########################################################
+# Test OnScreenNotification
+########################################################
+set( testOnScreenNotification_SRCS
+    onscreennotificationtest.cpp
+    ../onscreennotification.cpp
+)
+add_executable( testOnScreenNotification ${testOnScreenNotification_SRCS})
+
+target_link_libraries(testOnScreenNotification
+    Qt5::Test
+    Qt5::Quick
+    KF5::ConfigCore
+)
+
+add_test(kwin-testOnScreenNotification testOnScreenNotification)
+ecm_mark_as_test(testOnScreenNotification)
diff --git a/autotests/onscreennotificationtest.cpp b/autotests/onscreennotificationtest.cpp
new file mode 100644
index 000000000..16024b350
--- /dev/null
+++ b/autotests/onscreennotificationtest.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "onscreennotificationtest.h"
+#include "../onscreennotification.h"
+
+#include <KSharedConfig>
+
+#include <QQmlEngine>
+#include <QSignalSpy>
+#include <QTest>
+
+QTEST_MAIN(OnScreenNotificationTest);
+
+using KWin::OnScreenNotification;
+
+void OnScreenNotificationTest::show()
+{
+    OnScreenNotification notification;
+    notification.setConfig(KSharedConfig::openConfig(QString(), KSharedConfig::SimpleConfig));
+    notification.setEngine(new QQmlEngine(&notification));
+    notification.setMessage(QStringLiteral("Some text so that we see it in the test"));
+
+    QSignalSpy visibleChangedSpy(&notification, &OnScreenNotification::visibleChanged);
+    QCOMPARE(notification.isVisible(), false);
+    notification.setVisible(true);
+    QCOMPARE(notification.isVisible(), true);
+    QCOMPARE(visibleChangedSpy.count(), 1);
+
+    // show again should not trigger
+    notification.setVisible(true);
+    QCOMPARE(visibleChangedSpy.count(), 1);
+
+    // timer should not have hidden
+    QTest::qWait(500);
+    QCOMPARE(notification.isVisible(), true);
+
+    // hide again
+    notification.setVisible(false);
+    QCOMPARE(notification.isVisible(), false);
+    QCOMPARE(visibleChangedSpy.count(), 2);
+
+    // now show with timer
+    notification.setTimeout(250);
+    notification.setVisible(true);
+    QCOMPARE(notification.isVisible(), true);
+    QCOMPARE(visibleChangedSpy.count(), 3);
+    QVERIFY(visibleChangedSpy.wait());
+    QCOMPARE(notification.isVisible(), false);
+    QCOMPARE(visibleChangedSpy.count(), 4);
+}
+
+void OnScreenNotificationTest::timeout()
+{
+    OnScreenNotification notification;
+    QSignalSpy timeoutChangedSpy(&notification, &OnScreenNotification::timeoutChanged);
+    QCOMPARE(notification.timeout(), 0);
+    notification.setTimeout(1000);
+    QCOMPARE(notification.timeout(), 1000);
+    QCOMPARE(timeoutChangedSpy.count(), 1);
+    notification.setTimeout(1000);
+    QCOMPARE(timeoutChangedSpy.count(), 1);
+    notification.setTimeout(0);
+    QCOMPARE(notification.timeout(), 0);
+    QCOMPARE(timeoutChangedSpy.count(), 2);
+}
+
+void OnScreenNotificationTest::iconName()
+{
+    OnScreenNotification notification;
+    QSignalSpy iconNameChangedSpy(&notification, &OnScreenNotification::iconNameChanged);
+    QVERIFY(iconNameChangedSpy.isValid());
+    QCOMPARE(notification.iconName(), QString());
+    notification.setIconName(QStringLiteral("foo"));
+    QCOMPARE(notification.iconName(), QStringLiteral("foo"));
+    QCOMPARE(iconNameChangedSpy.count(), 1);
+    notification.setIconName(QStringLiteral("foo"));
+    QCOMPARE(iconNameChangedSpy.count(), 1);
+    notification.setIconName(QStringLiteral("bar"));
+    QCOMPARE(notification.iconName(), QStringLiteral("bar"));
+    QCOMPARE(iconNameChangedSpy.count(), 2);
+}
+
+void OnScreenNotificationTest::message()
+{
+    OnScreenNotification notification;
+    QSignalSpy messageChangedSpy(&notification, &OnScreenNotification::messageChanged);
+    QVERIFY(messageChangedSpy.isValid());
+    QCOMPARE(notification.message(), QString());
+    notification.setMessage(QStringLiteral("foo"));
+    QCOMPARE(notification.message(), QStringLiteral("foo"));
+    QCOMPARE(messageChangedSpy.count(), 1);
+    notification.setMessage(QStringLiteral("foo"));
+    QCOMPARE(messageChangedSpy.count(), 1);
+    notification.setMessage(QStringLiteral("bar"));
+    QCOMPARE(notification.message(), QStringLiteral("bar"));
+    QCOMPARE(messageChangedSpy.count(), 2);
+}
+
+#include "onscreennotificationtest.moc"
diff --git a/autotests/onscreennotificationtest.h b/autotests/onscreennotificationtest.h
new file mode 100644
index 000000000..6f525ad66
--- /dev/null
+++ b/autotests/onscreennotificationtest.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef ONSCREENNOTIFICATIONTEST_H
+#define ONSCREENNOTIFICATIONTEST_H
+
+#include <QObject>
+
+class OnScreenNotificationTest : public QObject
+{
+    Q_OBJECT
+private slots:
+
+    void show();
+    void timeout();
+    void iconName();
+    void message();
+};
+
+#endif // ONSCREENNOTIFICATIONTEST_H
diff --git a/onscreennotification.cpp b/onscreennotification.cpp
new file mode 100644
index 000000000..9bca93180
--- /dev/null
+++ b/onscreennotification.cpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "onscreennotification.h"
+#include <config-kwin.h>
+
+#include <QStandardPaths>
+#include <QTimer>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickWindow>
+
+#include <KConfigGroup>
+
+#include <functional>
+
+using namespace KWin;
+
+OnScreenNotification::OnScreenNotification(QObject *parent)
+    : QObject(parent)
+    , m_timer(new QTimer(this))
+{
+    m_timer->setSingleShot(true);
+    connect(m_timer, &QTimer::timeout, this, std::bind(&OnScreenNotification::setVisible, this, false));
+    connect(this, &OnScreenNotification::visibleChanged, this,
+        [this] {
+            if (m_visible) {
+                show();
+            } else {
+                m_timer->stop();
+            }
+        }
+    );
+}
+
+OnScreenNotification::~OnScreenNotification()
+{
+    if (QQuickWindow *w = qobject_cast<QQuickWindow*>(m_mainItem.data())) {
+        w->hide();
+        w->destroy();
+    }
+}
+
+void OnScreenNotification::setConfig(KSharedConfigPtr config)
+{
+    m_config = config;
+}
+
+void OnScreenNotification::setEngine(QQmlEngine *engine)
+{
+    m_qmlEngine = engine;
+}
+
+bool OnScreenNotification::isVisible() const
+{
+    return m_visible;
+}
+
+void OnScreenNotification::setVisible(bool visible)
+{
+    if (m_visible == visible) {
+        return;
+    }
+    m_visible = visible;
+    emit visibleChanged();
+}
+
+QString OnScreenNotification::message() const
+{
+    return m_message;
+}
+
+void OnScreenNotification::setMessage(const QString &message)
+{
+    if (m_message == message) {
+        return;
+    }
+    m_message = message;
+    emit messageChanged();
+}
+
+QString OnScreenNotification::iconName() const
+{
+    return m_iconName;
+}
+
+void OnScreenNotification::setIconName(const QString &iconName)
+{
+    if (m_iconName == iconName) {
+        return;
+    }
+    m_iconName = iconName;
+    emit iconNameChanged();
+}
+
+int OnScreenNotification::timeout() const
+{
+    return m_timer->interval();
+}
+
+void OnScreenNotification::setTimeout(int timeout)
+{
+    if (m_timer->interval() == timeout) {
+        return;
+    }
+    m_timer->setInterval(timeout);
+    emit timeoutChanged();
+}
+
+void OnScreenNotification::show()
+{
+    Q_ASSERT(m_visible);
+    ensureQmlContext();
+    ensureQmlComponent();
+    if (m_timer->interval() != 0) {
+        m_timer->start();
+    }
+}
+
+void OnScreenNotification::ensureQmlContext()
+{
+    Q_ASSERT(m_qmlEngine);
+    if (!m_qmlContext.isNull()) {
+        return;
+    }
+    m_qmlContext.reset(new QQmlContext(m_qmlEngine));
+    m_qmlContext->setContextProperty(QStringLiteral("osd"), this);
+}
+
+void OnScreenNotification::ensureQmlComponent()
+{
+    Q_ASSERT(m_config);
+    Q_ASSERT(m_qmlEngine);
+    if (!m_qmlComponent.isNull()) {
+        return;
+    }
+    m_qmlComponent.reset(new QQmlComponent(m_qmlEngine));
+    const QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                                m_config->group(QStringLiteral("OnScreenNotification")).readEntry("QmlPath", QStringLiteral(KWIN_NAME "/onscreennotification/plasma/main.qml")));
+    if (fileName.isEmpty()) {
+        return;
+    }
+    m_qmlComponent->loadUrl(QUrl::fromLocalFile(fileName));
+    if (!m_qmlComponent->isError()) {
+        m_mainItem.reset(m_qmlComponent->create(m_qmlContext.data()));
+    } else {
+        m_qmlComponent.reset();
+    }
+}
+
+#include "onscreennotification.moc"
diff --git a/onscreennotification.h b/onscreennotification.h
new file mode 100644
index 000000000..40a67e159
--- /dev/null
+++ b/onscreennotification.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef KWIN_ONSCREENNOTIFICATION_H
+#define KWIN_ONSCREENNOTIFICATION_H
+
+#include <QObject>
+
+#include <KSharedConfig>
+
+class QTimer;
+class QQmlContext;
+class QQmlComponent;
+class QQmlEngine;
+
+namespace KWin {
+
+class OnScreenNotification : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+    Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged)
+    Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged)
+    Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
+
+public:
+    explicit OnScreenNotification(QObject *parent = nullptr);
+    ~OnScreenNotification() override;
+    bool isVisible() const;
+    QString message() const;
+    QString iconName() const;
+    int timeout() const;
+
+    void setVisible(bool m_visible);
+    void setMessage(const QString &message);
+    void setIconName(const QString &iconName);
+    void setTimeout(int timeout);
+
+    void setConfig(KSharedConfigPtr config);
+    void setEngine(QQmlEngine *engine);
+
+Q_SIGNALS:
+    void visibleChanged();
+    void messageChanged();
+    void iconNameChanged();
+    void timeoutChanged();
+
+private:
+    void show();
+    void ensureQmlContext();
+    void ensureQmlComponent();
+    bool m_visible = false;
+    QString m_message;
+    QString m_iconName;
+    QTimer *m_timer;
+    KSharedConfigPtr m_config;
+    QScopedPointer<QQmlContext> m_qmlContext;
+    QScopedPointer<QQmlComponent> m_qmlComponent;
+    QQmlEngine *m_qmlEngine = nullptr;
+    QScopedPointer<QObject> m_mainItem;
+};
+}
+
+#endif // KWIN_ONSCREENNOTIFICATION_H
diff --git a/osd.cpp b/osd.cpp
new file mode 100644
index 000000000..8d2ec307c
--- /dev/null
+++ b/osd.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include "osd.h"
+#include "onscreennotification.h"
+#include "main.h"
+#include "workspace.h"
+#include "scripting/scripting.h"
+
+#include <QQmlEngine>
+
+namespace KWin
+{
+namespace OSD
+{
+
+static OnScreenNotification *create()
+{
+    auto osd = new OnScreenNotification(workspace());
+    osd->setConfig(kwinApp()->config());
+    osd->setEngine(Scripting::self()->qmlEngine());
+    return osd;
+}
+
+static OnScreenNotification *osd()
+{
+    static OnScreenNotification *s_osd = create();
+    return s_osd;
+}
+
+void show(const QString &message, const QString &iconName, int timeout)
+{
+    if (!kwinApp()->shouldUseWaylandForCompositing()) {
+        // FIXME: only supported on Wayland
+        return;
+    }
+    auto notification = osd();
+    notification->setIconName(iconName);
+    notification->setMessage(message);
+    notification->setTimeout(timeout);
+    notification->setVisible(true);
+}
+
+void show(const QString &message, int timeout)
+{
+    show(message, QString(), timeout);
+}
+
+void show(const QString &message, const QString &iconName)
+{
+    show(message, iconName, 0);
+}
+
+void hide()
+{
+    if (!kwinApp()->shouldUseWaylandForCompositing()) {
+        // FIXME: only supported on Wayland
+        return;
+    }
+    osd()->setVisible(false);
+}
+
+}
+}
diff --git a/osd.h b/osd.h
new file mode 100644
index 000000000..234ca65c5
--- /dev/null
+++ b/osd.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef KWIN_OSD_H
+#define KWIN_OSD_H
+
+#include <QString>
+
+namespace KWin
+{
+namespace OSD
+{
+
+void show(const QString &message, const QString &iconName = QString());
+void show(const QString &message, int timeout);
+void show(const QString &message, const QString &iconName, int timeout);
+void hide();
+
+}
+}
+
+#endif
diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt
index 4faff9151..4a0d1af23 100644
--- a/qml/CMakeLists.txt
+++ b/qml/CMakeLists.txt
@@ -1,2 +1,3 @@
 install( DIRECTORY outline/plasma   DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/outline )
+install( DIRECTORY onscreennotification/plasma DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/onscreennotification )
 install( DIRECTORY virtualkeyboard   DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME} )
diff --git a/qml/onscreennotification/plasma/dummydata/osd.qml b/qml/onscreennotification/plasma/dummydata/osd.qml
new file mode 100644
index 000000000..b7a17c2c3
--- /dev/null
+++ b/qml/onscreennotification/plasma/dummydata/osd.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.3
+
+QtObject {
+    property bool visible: true
+    property string message: "This is an example message.\nUsing multiple lines"
+    property string iconName: "kwin"
+}
diff --git a/qml/onscreennotification/plasma/main.qml b/qml/onscreennotification/plasma/main.qml
new file mode 100644
index 000000000..999ba9c3b
--- /dev/null
+++ b/qml/onscreennotification/plasma/main.qml
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016  Martin Graesslin <mgraesslin@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.0;
+import QtQuick.Window 2.0;
+import org.kde.plasma.core 2.0 as PlasmaCore;
+import org.kde.plasma.components 2.0 as Plasma;
+import QtQuick.Layouts 1.3;
+
+PlasmaCore.Dialog {
+    id: dialog
+    location: PlasmaCore.Types.Floating
+    visible: osd.visible
+    flags: Qt.X11BypassWindowManagerHint | Qt.FramelessWindowHint
+    type: PlasmaCore.Dialog.OnScreenDisplay
+    outputOnly: true
+
+    mainItem: RowLayout {
+        PlasmaCore.IconItem {
+            Layout.minimumWidth: 64
+            Layout.minimumHeight: 64
+            source: osd.iconName
+            visible: osd.iconName != ""
+        }
+        Plasma.Label {
+            text: osd.message
+        }
+    }
+}