vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Take in consideration keyboard shortcuts inhibit rename to V1

master
Benjamin Port 2020-05-29 11:18:47 +02:00
parent 4a90f6ab60
commit 301d3defc5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wayland_server.cpp
View File

@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KWaylandServer/xdgoutput_interface.h>
#include <KWaylandServer/keystate_interface.h>
#include <KWaylandServer/filtered_display.h>
#include <KWaylandServer/keyboard_shortcuts_inhibit_interface.h>
#include <KWaylandServer/keyboard_shortcuts_inhibit_v1_interface.h>
// KF
#include <KServiceTypeTrader>
@ -323,7 +323,7 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
);
m_tabletManager = m_display->createTabletManagerInterface(m_display);
m_keyboardShortcutsInhibitManager = m_display->createKeyboardShortcutsInhibitManager(m_display);
m_keyboardShortcutsInhibitManager = m_display->createKeyboardShortcutsInhibitManagerV1(m_display);
m_xdgShell = m_display->createXdgShell(XdgShellInterfaceVersion::Stable, m_display);
m_xdgShell->create();
connect(m_xdgShell, &XdgShellInterface::surfaceCreated, this, &WaylandServer::createSurface<XdgShellSurfaceInterface>);

6
wayland_server.h
View File

@ -70,7 +70,7 @@ class KeyStateInterface;
class LinuxDmabufUnstableV1Interface;
class LinuxDmabufUnstableV1Buffer;
class TabletManagerInterface;
class KeyboardShortcutsInhibitManagerInterface;
class KeyboardShortcutsInhibitManagerV1Interface;
}
@ -133,7 +133,7 @@ public:
KWaylandServer::XdgOutputManagerInterface *xdgOutputManager() const {
return m_xdgOutputManager;
}
KWaylandServer::KeyboardShortcutsInhibitManagerInterface *keyboardShortcutsInhibitManager() const
KWaylandServer::KeyboardShortcutsInhibitManagerV1Interface *keyboardShortcutsInhibitManager() const
{
return m_keyboardShortcutsInhibitManager;
}
@ -281,7 +281,7 @@ private:
KWaylandServer::XdgOutputManagerInterface *m_xdgOutputManager = nullptr;
KWaylandServer::XdgDecorationManagerInterface *m_xdgDecorationManager = nullptr;
KWaylandServer::LinuxDmabufUnstableV1Interface *m_linuxDmabuf = nullptr;
KWaylandServer::KeyboardShortcutsInhibitManagerInterface *m_keyboardShortcutsInhibitManager = nullptr;
KWaylandServer::KeyboardShortcutsInhibitManagerV1Interface *m_keyboardShortcutsInhibitManager = nullptr;
QSet<KWaylandServer::LinuxDmabufUnstableV1Buffer*> m_linuxDmabufBuffers;
struct {
KWaylandServer::ClientConnection *client = nullptr;