Differential D8050 Diff 20101 src/server/filtered_display.cpp

Changeset View

Standalone View

View Options

src/server/filtered_display.cpp

  • This file was added.
1​/********************************************************************
2​Copyright 2017 David Edmundson <davidedmundson@kde.org>
3​
4​This library is free software; you can redistribute it and/or
5​modify it under the terms of the GNU Lesser General Public
6​License as published by the Free Software Foundation; either
7​version 2.1 of the License, or (at your option) version 3, or any
8​later version accepted by the membership of KDE e.V. (or its
9​successor approved by the membership of KDE e.V.), which shall
10​act as a proxy defined in Section 6 of version 3 of the license.
11​
12​This library is distributed in the hope that it will be useful,
13​but WITHOUT ANY WARRANTY; without even the implied warranty of
14​MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​Lesser General Public License for more details.
16​
17​You should have received a copy of the GNU Lesser General Public
18​License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*********************************************************************/
20​
21​#include "filtered_display.h"
22​#include "display.h"
23​
24​#include <wayland-server.h>
25​
26​#include <QByteArray>
27​
28​namespace KWayland
29​{
30​namespace Server
31​{
32​
33​class FilteredDisplay::Private
34​{
35​public:
36​ Private(FilteredDisplay *_q);
37​ FilteredDisplay *q;
38​ static bool globalFilterCallback(const wl_client *client, const wl_global *global, void *data)
39​ {
40​ auto t = static_cast<FilteredDisplay::Private*>(data);
41​ auto clientConnection = t->q->getConnection(const_cast<wl_client*>(client));
42​ auto interface = wl_global_get_interface(global);
graesslinUnsubmitted
Not Done

Why a const cast? Or other said: could we overload the getConnection to accept a const wl_client*?

graesslin: Why a const cast? Or other said: could we overload the getConnection to accept a const…
davidedmundsonAuthorUnsubmitted
Not Done

I tried.

modding getConnection means modding modding ClientConnection constructor, modding that means modding the Private ctor

that gets into

wl_client_add_destroy_listener(c, &listener);

c is now const, that fails.

We have 3 options:

  • a const_cast somewhere
  • Change Display to create ClientConnections when they come in, not on demand, then we can make getconnection const everywhere. (IMHO, maybe worth it, as our current clientConnected signal is rather misleading)
  • return PID in the API here instead of the client.
davidedmundson: I tried. modding getConnection means modding modding ClientConnection constructor, modding…
graesslinUnsubmitted
Not Done

ouch, then const_cast is clearly better.

graesslin: ouch, then const_cast is clearly better.
43​ auto name = QByteArray::fromRawData(interface->name, strlen(interface->name));
44​ return t->q->allowInterface(clientConnection, name);
45​ };
46​};
graesslinUnsubmitted
Not Done

that looks like dead code.

graesslin: that looks like dead code.
47​
48​FilteredDisplay::Private::Private(FilteredDisplay *_q):
49​ q(_q)
50​{}
51​
52​
53​FilteredDisplay::FilteredDisplay(QObject *parent):
54​ Display(parent),
55​ d(new Private(this))
56​{
57​ connect(this, &Display::runningChanged, [this](bool running) {
58​ if (!running) {
59​ return;
60​ }
61​ wl_display_set_global_filter(*this, Private::globalFilterCallback, d.data());
62​ });
63​}
graesslinUnsubmitted
Not Done

I didn't know such API exists! This is great ;-)

But I think you need to increase the minimum Wayland version.

graesslin: I didn't know such API exists! This is great ;-) But I think you need to increase the minimum…
davidedmundsonAuthorUnsubmitted
Not Done

Somewhat.
This is new in 1.13, we depend on 1.7.

Debian is currently on 1.12.
(my general rule is: "is Debian has it, everyone else must do")

Should we #ifdefs and then no-op (with a qwarning) on older libwayland?

davidedmundson: Somewhat. This is new in 1.13, we depend on 1.7. Debian is currently on 1.12. (my general…
graesslinUnsubmitted
Not Done

Debian testing is already at 1.14. My general rule is: "if Debian testing has it, everyone else must do". Given that ifdef is always a mess I would say: go for increase!

graesslin: Debian testing is already at 1.14. My general rule is: "if Debian testing has it, everyone else…
64​
65​FilteredDisplay::~FilteredDisplay()
66​{
67​}
68​
69​}
70​}