mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-01 20:28:38 +00:00
libweston: Remove dbus helpers
Now that launcher-logind is gone, we don't use any of this anymore. Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
parent
e3b6ed50f1
commit
4f17af4691
|
@ -1,110 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2013 David Herrmann <dh.herrmann@gmail.com>
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
* a copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
* permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
* the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice (including the
|
|
||||||
* next paragraph) shall be included in all copies or substantial
|
|
||||||
* portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _WESTON_DBUS_H_
|
|
||||||
#define _WESTON_DBUS_H_
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <wayland-server.h>
|
|
||||||
|
|
||||||
#include <libweston/libweston.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
|
||||||
|
|
||||||
#include <dbus/dbus.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_open() - Open new dbus connection
|
|
||||||
*
|
|
||||||
* Opens a new dbus connection to the bus given as @bus. It automatically
|
|
||||||
* integrates the new connection into the main-loop @loop. The connection
|
|
||||||
* itself is returned in @out.
|
|
||||||
* This also returns a context source used for dbus dispatching. It is
|
|
||||||
* returned on success in @ctx_out and must be passed to weston_dbus_close()
|
|
||||||
* unchanged. You must not access it from outside of a dbus helper!
|
|
||||||
*
|
|
||||||
* Returns 0 on success, negative error code on failure.
|
|
||||||
*/
|
|
||||||
int weston_dbus_open(struct wl_event_loop *loop, DBusBusType bus,
|
|
||||||
DBusConnection **out, struct wl_event_source **ctx_out);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_close() - Close dbus connection
|
|
||||||
*
|
|
||||||
* Closes a dbus connection that was previously opened via weston_dbus_open().
|
|
||||||
* It unbinds the connection from the main-loop it was previously bound to,
|
|
||||||
* closes the dbus connection and frees all resources. If you want to access
|
|
||||||
* @c after this call returns, you must hold a dbus-reference to it. But
|
|
||||||
* notice that the connection is closed after this returns so it cannot be
|
|
||||||
* used to spawn new dbus requests.
|
|
||||||
* You must pass the context source returns by weston_dbus_open() as @ctx.
|
|
||||||
*/
|
|
||||||
void weston_dbus_close(DBusConnection *c, struct wl_event_source *ctx);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_add_match() - Add dbus match
|
|
||||||
*
|
|
||||||
* Configure a dbus-match on the given dbus-connection. This match is saved
|
|
||||||
* on the dbus-server as long as the connection is open. See dbus-manual
|
|
||||||
* for information. Compared to the dbus_bus_add_match() this allows a
|
|
||||||
* var-arg formatted match-string.
|
|
||||||
*/
|
|
||||||
int weston_dbus_add_match(DBusConnection *c, const char *format, ...);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_add_match_signal() - Add dbus signal match
|
|
||||||
*
|
|
||||||
* Same as weston_dbus_add_match() but does the dbus-match formatting for
|
|
||||||
* signals internally.
|
|
||||||
*/
|
|
||||||
int weston_dbus_add_match_signal(DBusConnection *c, const char *sender,
|
|
||||||
const char *iface, const char *member,
|
|
||||||
const char *path);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_remove_match() - Remove dbus match
|
|
||||||
*
|
|
||||||
* Remove a previously configured dbus-match from the dbus server. There is
|
|
||||||
* no need to remove dbus-matches if you close the connection, anyway.
|
|
||||||
* Compared to dbus_bus_remove_match() this allows a var-arg formatted
|
|
||||||
* match string.
|
|
||||||
*/
|
|
||||||
void weston_dbus_remove_match(DBusConnection *c, const char *format, ...);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* weston_dbus_remove_match_signal() - Remove dbus signal match
|
|
||||||
*
|
|
||||||
* Same as weston_dbus_remove_match() but does the dbus-match formatting for
|
|
||||||
* signals internally.
|
|
||||||
*/
|
|
||||||
void weston_dbus_remove_match_signal(DBusConnection *c, const char *sender,
|
|
||||||
const char *iface, const char *member,
|
|
||||||
const char *path);
|
|
||||||
|
|
||||||
#endif /* HAVE_DBUS */
|
|
||||||
|
|
||||||
#endif // _WESTON_DBUS_H_
|
|
|
@ -21,7 +21,6 @@ backend_vnc_h = files('backend-vnc.h')
|
||||||
backend_wayland_h = files('backend-wayland.h')
|
backend_wayland_h = files('backend-wayland.h')
|
||||||
backend_x11_h = files('backend-x11.h')
|
backend_x11_h = files('backend-x11.h')
|
||||||
|
|
||||||
dbus_h = files('dbus.h')
|
|
||||||
xwayland_api_h = files('xwayland-api.h')
|
xwayland_api_h = files('xwayland-api.h')
|
||||||
|
|
||||||
libweston_version_h = configuration_data()
|
libweston_version_h = configuration_data()
|
||||||
|
|
|
@ -1,408 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2013 David Herrmann <dh.herrmann@gmail.com>
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
* a copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
* permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
* the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice (including the
|
|
||||||
* next paragraph) shall be included in all copies or substantial
|
|
||||||
* portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* DBus Helpers
|
|
||||||
* This file contains the dbus mainloop integration and several helpers to
|
|
||||||
* make lowlevel libdbus access easier.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <dbus/dbus.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sys/epoll.h>
|
|
||||||
#include <sys/eventfd.h>
|
|
||||||
#include <sys/timerfd.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <wayland-server.h>
|
|
||||||
|
|
||||||
#include <libweston/libweston.h>
|
|
||||||
#include <libweston/dbus.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* DBus Mainloop Integration
|
|
||||||
* weston_dbus_bind() and weston_dbus_unbind() allow to bind an existing
|
|
||||||
* DBusConnection to an existing wl_event_loop object. All dbus dispatching
|
|
||||||
* is then nicely integrated into the wayland event loop.
|
|
||||||
* Note that this only provides basic watch and timeout dispatching. No
|
|
||||||
* remote thread wakeup, signal handling or other dbus insanity is supported.
|
|
||||||
* This is fine as long as you don't use any of the deprecated libdbus
|
|
||||||
* interfaces (like waking up remote threads..). There is really no rational
|
|
||||||
* reason to support these.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int weston_dbus_dispatch_watch(int fd, uint32_t mask, void *data)
|
|
||||||
{
|
|
||||||
DBusWatch *watch = data;
|
|
||||||
uint32_t flags = 0;
|
|
||||||
|
|
||||||
if (dbus_watch_get_enabled(watch)) {
|
|
||||||
if (mask & WL_EVENT_READABLE)
|
|
||||||
flags |= DBUS_WATCH_READABLE;
|
|
||||||
if (mask & WL_EVENT_WRITABLE)
|
|
||||||
flags |= DBUS_WATCH_WRITABLE;
|
|
||||||
if (mask & WL_EVENT_HANGUP)
|
|
||||||
flags |= DBUS_WATCH_HANGUP;
|
|
||||||
if (mask & WL_EVENT_ERROR)
|
|
||||||
flags |= DBUS_WATCH_ERROR;
|
|
||||||
|
|
||||||
dbus_watch_handle(watch, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static dbus_bool_t weston_dbus_add_watch(DBusWatch *watch, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_loop *loop = data;
|
|
||||||
struct wl_event_source *s;
|
|
||||||
int fd;
|
|
||||||
uint32_t mask = 0, flags;
|
|
||||||
|
|
||||||
if (dbus_watch_get_enabled(watch)) {
|
|
||||||
flags = dbus_watch_get_flags(watch);
|
|
||||||
if (flags & DBUS_WATCH_READABLE)
|
|
||||||
mask |= WL_EVENT_READABLE;
|
|
||||||
if (flags & DBUS_WATCH_WRITABLE)
|
|
||||||
mask |= WL_EVENT_WRITABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
fd = dbus_watch_get_unix_fd(watch);
|
|
||||||
s = wl_event_loop_add_fd(loop, fd, mask, weston_dbus_dispatch_watch,
|
|
||||||
watch);
|
|
||||||
if (!s)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
dbus_watch_set_data(watch, s, NULL);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void weston_dbus_remove_watch(DBusWatch *watch, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_source *s;
|
|
||||||
|
|
||||||
s = dbus_watch_get_data(watch);
|
|
||||||
if (!s)
|
|
||||||
return;
|
|
||||||
|
|
||||||
wl_event_source_remove(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void weston_dbus_toggle_watch(DBusWatch *watch, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_source *s;
|
|
||||||
uint32_t mask = 0, flags;
|
|
||||||
|
|
||||||
s = dbus_watch_get_data(watch);
|
|
||||||
if (!s)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (dbus_watch_get_enabled(watch)) {
|
|
||||||
flags = dbus_watch_get_flags(watch);
|
|
||||||
if (flags & DBUS_WATCH_READABLE)
|
|
||||||
mask |= WL_EVENT_READABLE;
|
|
||||||
if (flags & DBUS_WATCH_WRITABLE)
|
|
||||||
mask |= WL_EVENT_WRITABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
wl_event_source_fd_update(s, mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int weston_dbus_dispatch_timeout(void *data)
|
|
||||||
{
|
|
||||||
DBusTimeout *timeout = data;
|
|
||||||
|
|
||||||
if (dbus_timeout_get_enabled(timeout))
|
|
||||||
dbus_timeout_handle(timeout);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int weston_dbus_adjust_timeout(DBusTimeout *timeout,
|
|
||||||
struct wl_event_source *s)
|
|
||||||
{
|
|
||||||
int64_t t = 0;
|
|
||||||
|
|
||||||
if (dbus_timeout_get_enabled(timeout))
|
|
||||||
t = dbus_timeout_get_interval(timeout);
|
|
||||||
|
|
||||||
return wl_event_source_timer_update(s, t);
|
|
||||||
}
|
|
||||||
|
|
||||||
static dbus_bool_t weston_dbus_add_timeout(DBusTimeout *timeout, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_loop *loop = data;
|
|
||||||
struct wl_event_source *s;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
s = wl_event_loop_add_timer(loop, weston_dbus_dispatch_timeout,
|
|
||||||
timeout);
|
|
||||||
if (!s)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
r = weston_dbus_adjust_timeout(timeout, s);
|
|
||||||
if (r < 0) {
|
|
||||||
wl_event_source_remove(s);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
dbus_timeout_set_data(timeout, s, NULL);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void weston_dbus_remove_timeout(DBusTimeout *timeout, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_source *s;
|
|
||||||
|
|
||||||
s = dbus_timeout_get_data(timeout);
|
|
||||||
if (!s)
|
|
||||||
return;
|
|
||||||
|
|
||||||
wl_event_source_remove(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void weston_dbus_toggle_timeout(DBusTimeout *timeout, void *data)
|
|
||||||
{
|
|
||||||
struct wl_event_source *s;
|
|
||||||
|
|
||||||
s = dbus_timeout_get_data(timeout);
|
|
||||||
if (!s)
|
|
||||||
return;
|
|
||||||
|
|
||||||
weston_dbus_adjust_timeout(timeout, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int weston_dbus_dispatch(int fd, uint32_t mask, void *data)
|
|
||||||
{
|
|
||||||
DBusConnection *c = data;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
do {
|
|
||||||
r = dbus_connection_dispatch(c);
|
|
||||||
if (r == DBUS_DISPATCH_COMPLETE)
|
|
||||||
r = 0;
|
|
||||||
else if (r == DBUS_DISPATCH_DATA_REMAINS)
|
|
||||||
r = -EAGAIN;
|
|
||||||
else if (r == DBUS_DISPATCH_NEED_MEMORY)
|
|
||||||
r = -ENOMEM;
|
|
||||||
else
|
|
||||||
r = -EIO;
|
|
||||||
} while (r == -EAGAIN);
|
|
||||||
|
|
||||||
if (r)
|
|
||||||
weston_log("cannot dispatch dbus events: %d\n", r);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int weston_dbus_bind(struct wl_event_loop *loop, DBusConnection *c,
|
|
||||||
struct wl_event_source **ctx_out)
|
|
||||||
{
|
|
||||||
bool b;
|
|
||||||
int r, fd;
|
|
||||||
|
|
||||||
/* Idle events cannot reschedule themselves, therefore we use a dummy
|
|
||||||
* event-fd and mark it for post-dispatch. Hence, the dbus
|
|
||||||
* dispatcher is called after every dispatch-round.
|
|
||||||
* This is required as dbus doesn't allow dispatching events from
|
|
||||||
* within its own event sources. */
|
|
||||||
fd = eventfd(0, EFD_CLOEXEC);
|
|
||||||
if (fd < 0)
|
|
||||||
return -errno;
|
|
||||||
|
|
||||||
*ctx_out = wl_event_loop_add_fd(loop, fd, 0, weston_dbus_dispatch, c);
|
|
||||||
close(fd);
|
|
||||||
|
|
||||||
if (!*ctx_out)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
wl_event_source_check(*ctx_out);
|
|
||||||
|
|
||||||
b = dbus_connection_set_watch_functions(c,
|
|
||||||
weston_dbus_add_watch,
|
|
||||||
weston_dbus_remove_watch,
|
|
||||||
weston_dbus_toggle_watch,
|
|
||||||
loop,
|
|
||||||
NULL);
|
|
||||||
if (!b) {
|
|
||||||
r = -ENOMEM;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
b = dbus_connection_set_timeout_functions(c,
|
|
||||||
weston_dbus_add_timeout,
|
|
||||||
weston_dbus_remove_timeout,
|
|
||||||
weston_dbus_toggle_timeout,
|
|
||||||
loop,
|
|
||||||
NULL);
|
|
||||||
if (!b) {
|
|
||||||
r = -ENOMEM;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
dbus_connection_ref(c);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
error:
|
|
||||||
dbus_connection_set_timeout_functions(c, NULL, NULL, NULL,
|
|
||||||
NULL, NULL);
|
|
||||||
dbus_connection_set_watch_functions(c, NULL, NULL, NULL,
|
|
||||||
NULL, NULL);
|
|
||||||
wl_event_source_remove(*ctx_out);
|
|
||||||
*ctx_out = NULL;
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void weston_dbus_unbind(DBusConnection *c, struct wl_event_source *ctx)
|
|
||||||
{
|
|
||||||
dbus_connection_set_timeout_functions(c, NULL, NULL, NULL,
|
|
||||||
NULL, NULL);
|
|
||||||
dbus_connection_set_watch_functions(c, NULL, NULL, NULL,
|
|
||||||
NULL, NULL);
|
|
||||||
dbus_connection_unref(c);
|
|
||||||
wl_event_source_remove(ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Convenience Helpers
|
|
||||||
* Several convenience helpers are provided to make using dbus in weston
|
|
||||||
* easier. We don't use any of the gdbus or qdbus helpers as they pull in
|
|
||||||
* huge dependencies and actually are quite awful to use. Instead, we only
|
|
||||||
* use the basic low-level libdbus library.
|
|
||||||
*/
|
|
||||||
|
|
||||||
int weston_dbus_open(struct wl_event_loop *loop, DBusBusType bus,
|
|
||||||
DBusConnection **out, struct wl_event_source **ctx_out)
|
|
||||||
{
|
|
||||||
DBusConnection *c;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
/* Ihhh, global state.. stupid dbus. */
|
|
||||||
dbus_connection_set_change_sigpipe(FALSE);
|
|
||||||
|
|
||||||
/* This is actually synchronous. It blocks for some authentication and
|
|
||||||
* setup. We just trust the dbus-server here and accept this blocking
|
|
||||||
* call. There is no real reason to complicate things further and make
|
|
||||||
* this asynchronous/non-blocking. A context should be created during
|
|
||||||
* thead/process/app setup, so blocking calls should be fine. */
|
|
||||||
c = dbus_bus_get_private(bus, NULL);
|
|
||||||
if (!c)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
dbus_connection_set_exit_on_disconnect(c, FALSE);
|
|
||||||
|
|
||||||
r = weston_dbus_bind(loop, c, ctx_out);
|
|
||||||
if (r < 0)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
*out = c;
|
|
||||||
return r;
|
|
||||||
|
|
||||||
error:
|
|
||||||
dbus_connection_close(c);
|
|
||||||
dbus_connection_unref(c);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
void weston_dbus_close(DBusConnection *c, struct wl_event_source *ctx)
|
|
||||||
{
|
|
||||||
weston_dbus_unbind(c, ctx);
|
|
||||||
dbus_connection_close(c);
|
|
||||||
dbus_connection_unref(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
int weston_dbus_add_match(DBusConnection *c, const char *format, ...)
|
|
||||||
{
|
|
||||||
DBusError err;
|
|
||||||
int r;
|
|
||||||
va_list list;
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
va_start(list, format);
|
|
||||||
r = vasprintf(&str, format, list);
|
|
||||||
va_end(list);
|
|
||||||
|
|
||||||
if (r < 0)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
dbus_error_init(&err);
|
|
||||||
dbus_bus_add_match(c, str, &err);
|
|
||||||
free(str);
|
|
||||||
if (dbus_error_is_set(&err)) {
|
|
||||||
dbus_error_free(&err);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int weston_dbus_add_match_signal(DBusConnection *c, const char *sender,
|
|
||||||
const char *iface, const char *member,
|
|
||||||
const char *path)
|
|
||||||
{
|
|
||||||
return weston_dbus_add_match(c,
|
|
||||||
"type='signal',"
|
|
||||||
"sender='%s',"
|
|
||||||
"interface='%s',"
|
|
||||||
"member='%s',"
|
|
||||||
"path='%s'",
|
|
||||||
sender, iface, member, path);
|
|
||||||
}
|
|
||||||
|
|
||||||
void weston_dbus_remove_match(DBusConnection *c, const char *format, ...)
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
va_list list;
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
va_start(list, format);
|
|
||||||
r = vasprintf(&str, format, list);
|
|
||||||
va_end(list);
|
|
||||||
|
|
||||||
if (r < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
dbus_bus_remove_match(c, str, NULL);
|
|
||||||
free(str);
|
|
||||||
}
|
|
||||||
|
|
||||||
void weston_dbus_remove_match_signal(DBusConnection *c, const char *sender,
|
|
||||||
const char *iface, const char *member,
|
|
||||||
const char *path)
|
|
||||||
{
|
|
||||||
weston_dbus_remove_match(c,
|
|
||||||
"type='signal',"
|
|
||||||
"sender='%s',"
|
|
||||||
"interface='%s',"
|
|
||||||
"member='%s',"
|
|
||||||
"path='%s'",
|
|
||||||
sender, iface, member, path);
|
|
||||||
}
|
|
|
@ -1,38 +0,0 @@
|
||||||
if not get_option('dbus')
|
|
||||||
dep_dbus = declare_dependency()
|
|
||||||
subdir_done()
|
|
||||||
endif
|
|
||||||
|
|
||||||
dbus_dep = dependency('dbus-1', version: '>= 1.6', required: false)
|
|
||||||
if not dbus_dep.found()
|
|
||||||
error('dbus support requires dbus-1 >= 1.6 which was not found. Or, you can use \'-Ddbus=false\'')
|
|
||||||
endif
|
|
||||||
|
|
||||||
config_h.set('HAVE_DBUS', '1')
|
|
||||||
|
|
||||||
srcs_dbus = [
|
|
||||||
'dbus.c',
|
|
||||||
]
|
|
||||||
|
|
||||||
deps_dbus = [
|
|
||||||
dep_libweston_private,
|
|
||||||
dbus_dep,
|
|
||||||
]
|
|
||||||
|
|
||||||
lib_dbus = static_library(
|
|
||||||
'dbus',
|
|
||||||
srcs_dbus,
|
|
||||||
include_directories: common_inc,
|
|
||||||
dependencies: deps_dbus,
|
|
||||||
name_prefix: '',
|
|
||||||
install: true,
|
|
||||||
install_dir: dir_module_libweston
|
|
||||||
)
|
|
||||||
|
|
||||||
dep_dbus = declare_dependency(
|
|
||||||
link_with: lib_dbus,
|
|
||||||
dependencies: deps_dbus,
|
|
||||||
include_directories: include_directories('.')
|
|
||||||
)
|
|
||||||
|
|
||||||
install_headers(dbus_h, subdir: dir_include_libweston_install)
|
|
|
@ -162,8 +162,6 @@ pkgconfig.generate(
|
||||||
install_dir: dir_data_pc
|
install_dir: dir_data_pc
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('dbus')
|
|
||||||
|
|
||||||
if get_option('backend-drm')
|
if get_option('backend-drm')
|
||||||
dep_libseat = dependency('libseat', version: '>= 0.4')
|
dep_libseat = dependency('libseat', version: '>= 0.4')
|
||||||
srcs_session_helper = [
|
srcs_session_helper = [
|
||||||
|
|
|
@ -156,13 +156,6 @@ option(
|
||||||
description: 'DEPRECATED: color management plugin cms-colord (requires cms-static)'
|
description: 'DEPRECATED: color management plugin cms-colord (requires cms-static)'
|
||||||
)
|
)
|
||||||
|
|
||||||
option(
|
|
||||||
'dbus',
|
|
||||||
type: 'boolean',
|
|
||||||
value: true,
|
|
||||||
description: 'D-Bus protocol support'
|
|
||||||
)
|
|
||||||
|
|
||||||
option(
|
option(
|
||||||
'image-jpeg',
|
'image-jpeg',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
|
Loading…
Reference in a new issue