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

[server] Split PoointerInterface::Private into dedicated header

Browse source
This commit is contained in:
Martin Gräßlin 2016-04-06 11:27:42 +02:00
parent 84a1d5eadc
commit 031abb9722
2 changed files with 64 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/wayland/pointer_interface.cpp
View file

@ -18,6 +18,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "pointer_interface.h"
#include "pointer_interface_p.h"
#include "resource_p.h"
#include "seat_interface.h"
#include "display.h"
@ -32,34 +33,6 @@ namespace KWayland
namespace Server
{
class PointerInterface::Private : public Resource::Private
{
public:
Private(SeatInterface *parent, wl_resource *parentResource, PointerInterface *q);
SeatInterface *seat;
SurfaceInterface *focusedSurface = nullptr;
QPointer<SurfaceInterface> focusedChildSurface;
QMetaObject::Connection destroyConnection;
Cursor *cursor = nullptr;
void sendLeave(SurfaceInterface *surface, quint32 serial);
void sendEnter(SurfaceInterface *surface, const QPointF &parentSurfacePosition, quint32 serial);
private:
PointerInterface *q_func() {
return reinterpret_cast<PointerInterface *>(q);
}
void setCursor(quint32 serial, SurfaceInterface *surface, const QPoint &hotspot);
// interface
static void setCursorCallback(wl_client *client, wl_resource *resource, uint32_t serial,
wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y);
// since version 3
static void releaseCallback(wl_client *client, wl_resource *resource);
static const struct wl_pointer_interface s_interface;
};
class Cursor::Private
{
public:

63
src/wayland/pointer_interface_p.h Normal file
View file

@ -0,0 +1,63 @@
/********************************************************************
Copyright 2016 Martin Gräßlin <mgraesslin@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 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 6 of version 3 of the license.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef WAYLAND_SERVER_POINTER_INTERFACE_P_H
#define WAYLAND_SERVER_POINTER_INTERFACE_P_H
#include "pointer_interface.h"
#include "resource_p.h"
#include <QPointer>
namespace KWayland
{
namespace Server
{
class PointerInterface::Private : public Resource::Private
{
public:
Private(SeatInterface *parent, wl_resource *parentResource, PointerInterface *q);
SeatInterface *seat;
SurfaceInterface *focusedSurface = nullptr;
QPointer<SurfaceInterface> focusedChildSurface;
QMetaObject::Connection destroyConnection;
Cursor *cursor = nullptr;
void sendLeave(SurfaceInterface *surface, quint32 serial);
void sendEnter(SurfaceInterface *surface, const QPointF &parentSurfacePosition, quint32 serial);
private:
PointerInterface *q_func() {
return reinterpret_cast<PointerInterface *>(q);
}
void setCursor(quint32 serial, SurfaceInterface *surface, const QPoint &hotspot);
// interface
static void setCursorCallback(wl_client *client, wl_resource *resource, uint32_t serial,
wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y);
// since version 3
static void releaseCallback(wl_client *client, wl_resource *resource);
static const struct wl_pointer_interface s_interface;
};
}
}
#endif