mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-26 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor type implementations

Browse source
This commit is contained in:
Drew DeVault 2017-06-04 19:30:37 -04:00
parent 7051d0e79d
commit 7d82476590
10 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
session/direct.c
View file

@ -1,5 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <errno.h>
#include <stdlib.h>
#include <stdbool.h>
@ -7,10 +6,11 @@
#include <fcntl.h>
#include <unistd.h>
#include <wayland-server.h>
#include "session/interface.h"
#include <wlr/session/interface.h>
#include "common/log.h"
const struct session_impl session_direct;
struct direct_session {
struct wlr_session base;
};
@ -44,13 +44,13 @@ static struct wlr_session *direct_session_start(struct wl_display *disp) {
wlr_log(L_INFO, "Successfully loaded direct session");
session->base.iface = &session_direct_iface;
session->base.impl = &session_direct;
wl_signal_init(&session->base.device_paused);
wl_signal_init(&session->base.device_resumed);
return &session->base;
}
const struct session_interface session_direct_iface = {
const struct session_impl session_direct = {
.start = direct_session_start,
.finish = direct_session_finish,
.open = direct_session_open,

10
session/logind.c
View file

@ -1,5 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
@ -12,10 +11,11 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <wayland-server.h>
#include "session/interface.h"
#include <wlr/session/interface.h>
#include "common/log.h"
const struct session_impl session_logind;
struct logind_session {
struct wlr_session base;
@ -335,7 +335,7 @@ static struct wlr_session *logind_session_start(struct wl_display *disp) {
wlr_log(L_INFO, "Successfully loaded logind session");
session->base.iface = &session_logind_iface;
session->base.impl = &session_logind;
wl_signal_init(&session->base.device_paused);
wl_signal_init(&session->base.device_resumed);
return &session->base;
@ -350,7 +350,7 @@ error:
return NULL;
}
const struct session_interface session_logind_iface = {
const struct session_impl session_logind = {
.start = logind_session_start,
.finish = logind_session_finish,
.open = logind_take_device,

26
session/session.c
View file

@ -1,22 +1,24 @@
#include <stddef.h>
#include <wlr/session.h>
#include <stdarg.h>
#include <wlr/session.h>
#include <wlr/session/interface.h>
#include "common/log.h"
#include "session/interface.h"
static const struct session_interface *ifaces[] = {
extern const struct session_impl session_logind;
extern const struct session_impl session_direct;
static const struct session_impl *impls[] = {
#ifdef HAS_SYSTEMD
&session_logind_iface,
&session_logind,
#endif
&session_direct_iface,
&session_direct,
NULL,
};
struct wlr_session *wlr_session_start(struct wl_display *disp) {
const struct session_interface **iter;
const struct session_impl **iter;
for (iter = ifaces; *iter; ++iter) {
for (iter = impls; *iter; ++iter) {
struct wlr_session *session = (*iter)->start(disp);
if (session) {
return session;
@ -28,19 +30,19 @@ struct wlr_session *wlr_session_start(struct wl_display *disp) {
}
void wlr_session_finish(struct wlr_session *session) {
session->iface->finish(session);
session->impl->finish(session);
};
int wlr_session_open_file(struct wlr_session *restrict session,
const char *restrict path) {
return session->iface->open(session, path);
return session->impl->open(session, path);
}
void wlr_session_close_file(struct wlr_session *session, int fd) {
session->iface->close(session, fd);
session->impl->close(session, fd);
}
bool wlr_session_change_vt(struct wlr_session *session, int vt) {
return session->iface->change_vt(session, vt);
return session->impl->change_vt(session, vt);
}