add missing files for the contrast effect
This commit is contained in:
Marco Martin
parent
1f4beb0334
commit
47d7a79f9d
2 changed files with 347 additions and 0 deletions
271
src/wayland/contrast_interface.cpp
Normal file
271
src/wayland/contrast_interface.cpp
Normal file
|
|
@ -0,0 +1,271 @@
|
||||||
|
/********************************************************************
|
||||||
|
Copyright 2015 Martin Gräßlin <mgraesslin@kde.org>
|
||||||
|
Copyright 2015 Marco Martin <mart@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/>.
|
||||||
|
*********************************************************************/
|
||||||
|
#include "contrast_interface.h"
|
||||||
|
#include "region_interface.h"
|
||||||
|
#include "display.h"
|
||||||
|
#include "global_p.h"
|
||||||
|
#include "resource_p.h"
|
||||||
|
#include "surface_interface_p.h"
|
||||||
|
|
||||||
|
#include <wayland-server.h>
|
||||||
|
#include <wayland-contrast-server-protocol.h>
|
||||||
|
|
||||||
|
namespace KWayland
|
||||||
|
{
|
||||||
|
namespace Server
|
||||||
|
{
|
||||||
|
|
||||||
|
static const quint32 s_version = 1;
|
||||||
|
|
||||||
|
class ContrastManagerInterface::Private : public Global::Private
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Private(ContrastManagerInterface *q, Display *d);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void bind(wl_client *client, uint32_t version, uint32_t id) override;
|
||||||
|
void createContrast(wl_client *client, wl_resource *resource, uint32_t id, wl_resource *surface);
|
||||||
|
|
||||||
|
static void createCallback(wl_client *client, wl_resource *resource, uint32_t id, wl_resource *surface);
|
||||||
|
static void unsetCallback(wl_client *client, wl_resource *resource, wl_resource *surface);
|
||||||
|
static void unbind(wl_resource *resource);
|
||||||
|
static Private *cast(wl_resource *r) {
|
||||||
|
return reinterpret_cast<Private*>(wl_resource_get_user_data(r));
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastManagerInterface *q;
|
||||||
|
static const struct org_kde_kwin_contrast_manager_interface s_interface;
|
||||||
|
};
|
||||||
|
|
||||||
|
const struct org_kde_kwin_contrast_manager_interface ContrastManagerInterface::Private::s_interface = {
|
||||||
|
createCallback,
|
||||||
|
unsetCallback
|
||||||
|
};
|
||||||
|
|
||||||
|
ContrastManagerInterface::Private::Private(ContrastManagerInterface *q, Display *d)
|
||||||
|
: Global::Private(d, &org_kde_kwin_contrast_manager_interface, s_version)
|
||||||
|
, q(q)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastManagerInterface::Private::bind(wl_client *client, uint32_t version, uint32_t id)
|
||||||
|
{
|
||||||
|
auto c = display->getConnection(client);
|
||||||
|
wl_resource *resource = c->createResource(&org_kde_kwin_contrast_manager_interface, qMin(version, s_version), id);
|
||||||
|
if (!resource) {
|
||||||
|
wl_client_post_no_memory(client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wl_resource_set_implementation(resource, &s_interface, this, unbind);
|
||||||
|
// TODO: should we track?
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastManagerInterface::Private::unbind(wl_resource *resource)
|
||||||
|
{
|
||||||
|
Q_UNUSED(resource)
|
||||||
|
// TODO: implement?
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastManagerInterface::Private::createCallback(wl_client *client, wl_resource *resource, uint32_t id, wl_resource *surface)
|
||||||
|
{
|
||||||
|
cast(resource)->createContrast(client, resource, id, surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastManagerInterface::Private::createContrast(wl_client *client, wl_resource *resource, uint32_t id, wl_resource *surface)
|
||||||
|
{
|
||||||
|
SurfaceInterface *s = SurfaceInterface::get(surface);
|
||||||
|
if (!s) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface *contrast = new ContrastInterface(q, resource);
|
||||||
|
contrast->create(display->getConnection(client), wl_resource_get_version(resource), id);
|
||||||
|
if (!contrast->resource()) {
|
||||||
|
wl_resource_post_no_memory(resource);
|
||||||
|
delete contrast;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
QObject::connect(s, &QObject::destroyed, contrast,
|
||||||
|
[contrast] {
|
||||||
|
if (contrast->resource()) {
|
||||||
|
wl_resource_destroy(contrast->resource());
|
||||||
|
delete contrast;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
s->d_func()->setContrast(QPointer<ContrastInterface>(contrast));
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastManagerInterface::Private::unsetCallback(wl_client *client, wl_resource *resource, wl_resource *surface)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
Q_UNUSED(resource)
|
||||||
|
SurfaceInterface *s = SurfaceInterface::get(surface);
|
||||||
|
if (!s) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
s->d_func()->setContrast(QPointer<ContrastInterface>());
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastManagerInterface::ContrastManagerInterface(Display *display, QObject *parent)
|
||||||
|
: Global(new Private(this, display), parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastManagerInterface::~ContrastManagerInterface() = default;
|
||||||
|
|
||||||
|
class ContrastInterface::Private : public Resource::Private
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Private(ContrastInterface *q, ContrastManagerInterface *c, wl_resource *parentResource);
|
||||||
|
~Private();
|
||||||
|
|
||||||
|
QRegion pendingRegion;
|
||||||
|
QRegion currentRegion;
|
||||||
|
qreal pendingContrast;
|
||||||
|
qreal currentContrast;
|
||||||
|
qreal pendingIntensity;
|
||||||
|
qreal currentIntensity;
|
||||||
|
qreal pendingSaturation;
|
||||||
|
qreal currentSaturation;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void commit();
|
||||||
|
//TODO
|
||||||
|
ContrastInterface *q_func() {
|
||||||
|
return reinterpret_cast<ContrastInterface *>(q);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void commitCallback(wl_client *client, wl_resource *resource);
|
||||||
|
static void setRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region);
|
||||||
|
static void setContrastCallback(wl_client *client, wl_resource *resource, wl_fixed_t contrast);
|
||||||
|
static void setIntensityCallback(wl_client *client, wl_resource *resource, wl_fixed_t intensity);
|
||||||
|
static void setSaturationCallback(wl_client *client, wl_resource *resource, wl_fixed_t saturation);
|
||||||
|
|
||||||
|
static const struct org_kde_kwin_contrast_interface s_interface;
|
||||||
|
};
|
||||||
|
|
||||||
|
const struct org_kde_kwin_contrast_interface ContrastInterface::Private::s_interface = {
|
||||||
|
commitCallback,
|
||||||
|
setRegionCallback,
|
||||||
|
setContrastCallback,
|
||||||
|
setIntensityCallback,
|
||||||
|
setSaturationCallback
|
||||||
|
};
|
||||||
|
|
||||||
|
void ContrastInterface::Private::commitCallback(wl_client *client, wl_resource *resource)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
cast<Private>(resource)->commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastInterface::Private::commit()
|
||||||
|
{
|
||||||
|
currentRegion = pendingRegion;
|
||||||
|
currentContrast = pendingContrast;
|
||||||
|
currentIntensity = pendingIntensity;
|
||||||
|
currentSaturation = pendingSaturation;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastInterface::Private::setRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
Private *p = cast<Private>(resource);
|
||||||
|
RegionInterface *r = RegionInterface::get(region);
|
||||||
|
if (r) {
|
||||||
|
p->pendingRegion = r->region();
|
||||||
|
} else {
|
||||||
|
p->pendingRegion = QRegion();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastInterface::Private::setContrastCallback(wl_client *client, wl_resource *resource, wl_fixed_t contrast)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
Private *p = cast<Private>(resource);
|
||||||
|
p->pendingContrast = wl_fixed_to_double(contrast);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastInterface::Private::setIntensityCallback(wl_client *client, wl_resource *resource, wl_fixed_t intensity)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
Private *p = cast<Private>(resource);
|
||||||
|
p->pendingIntensity = wl_fixed_to_double(intensity);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ContrastInterface::Private::setSaturationCallback(wl_client *client, wl_resource *resource, wl_fixed_t saturation)
|
||||||
|
{
|
||||||
|
Q_UNUSED(client)
|
||||||
|
Private *p = cast<Private>(resource);
|
||||||
|
p->pendingSaturation = wl_fixed_to_double(saturation);
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface::Private::Private(ContrastInterface *q, ContrastManagerInterface *c, wl_resource *parentResource)
|
||||||
|
: Resource::Private(q, c, parentResource, &org_kde_kwin_contrast_interface, &s_interface)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface::Private::~Private()
|
||||||
|
{
|
||||||
|
if (resource) {
|
||||||
|
wl_resource_destroy(resource);
|
||||||
|
resource = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface::ContrastInterface(ContrastManagerInterface *parent, wl_resource *parentResource)
|
||||||
|
: Resource(new Private(this, parent, parentResource))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface::~ContrastInterface() = default;
|
||||||
|
|
||||||
|
QRegion ContrastInterface::region() const
|
||||||
|
{
|
||||||
|
Q_D();
|
||||||
|
return d->currentRegion;
|
||||||
|
}
|
||||||
|
|
||||||
|
qreal ContrastInterface::contrast() const
|
||||||
|
{
|
||||||
|
Q_D();
|
||||||
|
return d->currentContrast;
|
||||||
|
}
|
||||||
|
|
||||||
|
qreal ContrastInterface::intensity() const
|
||||||
|
{
|
||||||
|
Q_D();
|
||||||
|
return d->currentIntensity;
|
||||||
|
}
|
||||||
|
|
||||||
|
qreal ContrastInterface::saturation() const
|
||||||
|
{
|
||||||
|
Q_D();
|
||||||
|
return d->currentSaturation;
|
||||||
|
}
|
||||||
|
|
||||||
|
ContrastInterface::Private *ContrastInterface::d_func() const
|
||||||
|
{
|
||||||
|
return reinterpret_cast<Private*>(d.data());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
76
src/wayland/contrast_interface.h
Normal file
76
src/wayland/contrast_interface.h
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
/********************************************************************
|
||||||
|
Copyright 2015 Martin Gräßlin <mgraesslin@kde.org>
|
||||||
|
Copyright 2015 Marco Martin <mart@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 KWAYLAND_SERVER_CONTRAST_INTERFACE_H
|
||||||
|
#define KWAYLAND_SERVER_CONTRAST_INTERFACE_H
|
||||||
|
|
||||||
|
#include "global.h"
|
||||||
|
#include "resource.h"
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QMarginsF>
|
||||||
|
|
||||||
|
#include <KWayland/Server/kwaylandserver_export.h>
|
||||||
|
|
||||||
|
struct wl_region;
|
||||||
|
|
||||||
|
namespace KWayland
|
||||||
|
{
|
||||||
|
namespace Server
|
||||||
|
{
|
||||||
|
|
||||||
|
class BufferInterface;
|
||||||
|
class Display;
|
||||||
|
|
||||||
|
class KWAYLANDSERVER_EXPORT ContrastManagerInterface : public Global
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
virtual ~ContrastManagerInterface();
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit ContrastManagerInterface(Display *display, QObject *parent = nullptr);
|
||||||
|
friend class Display;
|
||||||
|
class Private;
|
||||||
|
};
|
||||||
|
|
||||||
|
class KWAYLANDSERVER_EXPORT ContrastInterface : public Resource
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
virtual ~ContrastInterface();
|
||||||
|
|
||||||
|
QRegion region() const;
|
||||||
|
qreal contrast() const;
|
||||||
|
qreal intensity() const;
|
||||||
|
qreal saturation() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit ContrastInterface(ContrastManagerInterface *parent, wl_resource *parentResource);
|
||||||
|
friend class ContrastManagerInterface;
|
||||||
|
|
||||||
|
class Private;
|
||||||
|
Private *d_func() const;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in a new issue