yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backends/x11] Use NETWinInfo for our window.

Browse source
This commit is contained in:
Martin Gräßlin 2015-09-16 13:51:44 +02:00
parent b0dc3b3009
commit 4fa01583cb
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
backends/x11/x11windowed_backend.cpp
View file

@ -25,11 +25,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "xcbutils.h" #include "xcbutils.h"
#include "eglonxbackend.h" #include "eglonxbackend.h"
#include <kwinxrenderutils.h> #include <kwinxrenderutils.h>
// KDE
#include <KLocalizedString>
#include <QAbstractEventDispatcher> #include <QAbstractEventDispatcher>
#include <QCoreApplication> #include <QCoreApplication>
#include <QSocketNotifier> #include <QSocketNotifier>
// kwayland // kwayland
#include <KWayland/Server/buffer_interface.h> #include <KWayland/Server/buffer_interface.h>
#include <KWayland/Server/display.h>
#include <KWayland/Server/seat_interface.h> #include <KWayland/Server/seat_interface.h>
#include <KWayland/Server/surface_interface.h> #include <KWayland/Server/surface_interface.h>
// system // system
@ -115,6 +118,26 @@ void X11WindowedBackend::createWindow()
xcb_create_window(m_connection, XCB_COPY_FROM_PARENT, m_window, m_screen->root, xcb_create_window(m_connection, XCB_COPY_FROM_PARENT, m_window, m_screen->root,
0, 0, m_size.width(), m_size.height(), 0, 0, m_size.width(), m_size.height(),
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, mask, values); 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, mask, values);
m_winInfo = new NETWinInfo(m_connection, m_window, m_screen->root, NET::WMWindowType, NET::Properties2());
m_winInfo->setWindowType(NET::Normal);
m_winInfo->setName(i18n("KDE Wayland Compositor (%1)", waylandServer()->display()->socketName()).toUtf8().constData());
m_winInfo->setPid(QCoreApplication::applicationPid());
QIcon windowIcon = QIcon::fromTheme(QStringLiteral("kwin"));
auto addIcon = [this, &windowIcon] (const QSize &size) {
if (windowIcon.actualSize(size) != size) {
return;
}
NETIcon icon;
icon.data = windowIcon.pixmap(size).toImage().bits();
icon.size.width = size.width();
icon.size.height = size.height();
m_winInfo->setIcon(icon, false);
};
addIcon(QSize(16, 16));
addIcon(QSize(32, 32));
addIcon(QSize(48, 48));
xcb_map_window(m_connection, m_window); xcb_map_window(m_connection, m_window);
m_protocols = protocolsAtom; m_protocols = protocolsAtom;

2
backends/x11/x11windowed_backend.h
View file

@ -30,6 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
struct _XDisplay; struct _XDisplay;
typedef struct _XDisplay Display; typedef struct _XDisplay Display;
class NETWinInfo;
namespace KWin namespace KWin
{ {
@ -93,6 +94,7 @@ private:
xcb_atom_t m_deleteWindowProtocol = XCB_ATOM_NONE; xcb_atom_t m_deleteWindowProtocol = XCB_ATOM_NONE;
xcb_cursor_t m_cursor = XCB_CURSOR_NONE; xcb_cursor_t m_cursor = XCB_CURSOR_NONE;
Display *m_display = nullptr; Display *m_display = nullptr;
NETWinInfo *m_winInfo = nullptr;
}; };
} }