mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
Refactor type implementations
This commit is contained in:
parent
7051d0e79d
commit
7d82476590
10 changed files with 33 additions and 37 deletions
|
@ -4,9 +4,9 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <wlr/session.h>
|
#include <wlr/session.h>
|
||||||
|
#include <wlr/backend/interface.h>
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
#include "backend/drm/backend.h"
|
#include "backend/drm/backend.h"
|
||||||
#include "backend.h"
|
|
||||||
|
|
||||||
struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
|
struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
|
||||||
struct wlr_backend_state *state) {
|
struct wlr_backend_state *state) {
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <wlr/session.h>
|
#include <wlr/session.h>
|
||||||
#include <wlr/types.h>
|
#include <wlr/types.h>
|
||||||
#include <wlr/common/list.h>
|
#include <wlr/common/list.h>
|
||||||
#include "backend.h"
|
#include <wlr/backend/interface.h>
|
||||||
#include "backend/udev.h"
|
#include "backend/udev.h"
|
||||||
#include "backend/drm/backend.h"
|
#include "backend/drm/backend.h"
|
||||||
#include "backend/drm/drm.h"
|
#include "backend/drm/drm.h"
|
||||||
|
|
|
@ -12,12 +12,11 @@
|
||||||
#include <gbm.h>
|
#include <gbm.h>
|
||||||
#include <GLES3/gl3.h>
|
#include <GLES3/gl3.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/backend/interface.h>
|
||||||
#include "types.h"
|
|
||||||
#include "backend.h"
|
|
||||||
#include "backend/drm/backend.h"
|
#include "backend/drm/backend.h"
|
||||||
#include "backend/drm/drm.h"
|
#include "backend/drm/drm.h"
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
#include "types.h"
|
||||||
|
|
||||||
static const char *conn_name[] = {
|
static const char *conn_name[] = {
|
||||||
[DRM_MODE_CONNECTOR_Unknown] = "Unknown",
|
[DRM_MODE_CONNECTOR_Unknown] = "Unknown",
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
#include <xf86drmMode.h>
|
#include <xf86drmMode.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
#include <wlr/session.h>
|
#include <wlr/session.h>
|
||||||
#include "backend.h"
|
|
||||||
#include "backend/drm/backend.h"
|
|
||||||
#include "backend/udev.h"
|
#include "backend/udev.h"
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef _WLR_BACKEND_INTERNAL_H
|
#ifndef _WLR_BACKEND_INTERFACE_H
|
||||||
#define _WLR_BACKEND_INTERNAL_H
|
#define _WLR_BACKEND_INTERFACE_H
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <wlr/backend.h>
|
#include <wlr/backend.h>
|
|
@ -4,7 +4,7 @@
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
struct session_interface;
|
struct session_impl;
|
||||||
|
|
||||||
// Passed to the listeners of device_paused/resumed
|
// Passed to the listeners of device_paused/resumed
|
||||||
struct device_arg {
|
struct device_arg {
|
||||||
|
@ -13,7 +13,7 @@ struct device_arg {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_session {
|
struct wlr_session {
|
||||||
const struct session_interface *iface;
|
const struct session_impl *impl;
|
||||||
|
|
||||||
struct wl_signal device_paused;
|
struct wl_signal device_paused;
|
||||||
struct wl_signal device_resumed;
|
struct wl_signal device_resumed;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <wlr/session.h>
|
#include <wlr/session.h>
|
||||||
|
|
||||||
struct session_interface {
|
struct session_impl {
|
||||||
struct wlr_session *(*start)(struct wl_display *disp);
|
struct wlr_session *(*start)(struct wl_display *disp);
|
||||||
void (*finish)(struct wlr_session *session);
|
void (*finish)(struct wlr_session *session);
|
||||||
int (*open)(struct wlr_session *restrict session,
|
int (*open)(struct wlr_session *restrict session,
|
||||||
|
@ -12,7 +12,4 @@ struct session_interface {
|
||||||
bool (*change_vt)(struct wlr_session *session, int vt);
|
bool (*change_vt)(struct wlr_session *session, int vt);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const struct session_interface session_logind_iface;
|
|
||||||
extern const struct session_interface session_direct_iface;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
|
@ -1,5 +1,4 @@
|
||||||
#define _POSIX_C_SOURCE 200809L
|
#define _POSIX_C_SOURCE 200809L
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
@ -7,10 +6,11 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/session/interface.h>
|
||||||
#include "session/interface.h"
|
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
|
const struct session_impl session_direct;
|
||||||
|
|
||||||
struct direct_session {
|
struct direct_session {
|
||||||
struct wlr_session base;
|
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");
|
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_paused);
|
||||||
wl_signal_init(&session->base.device_resumed);
|
wl_signal_init(&session->base.device_resumed);
|
||||||
return &session->base;
|
return &session->base;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct session_interface session_direct_iface = {
|
const struct session_impl session_direct = {
|
||||||
.start = direct_session_start,
|
.start = direct_session_start,
|
||||||
.finish = direct_session_finish,
|
.finish = direct_session_finish,
|
||||||
.open = direct_session_open,
|
.open = direct_session_open,
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#define _POSIX_C_SOURCE 200809L
|
#define _POSIX_C_SOURCE 200809L
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -12,10 +11,11 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
|
#include <wlr/session/interface.h>
|
||||||
#include "session/interface.h"
|
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
|
const struct session_impl session_logind;
|
||||||
|
|
||||||
struct logind_session {
|
struct logind_session {
|
||||||
struct wlr_session base;
|
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");
|
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_paused);
|
||||||
wl_signal_init(&session->base.device_resumed);
|
wl_signal_init(&session->base.device_resumed);
|
||||||
return &session->base;
|
return &session->base;
|
||||||
|
@ -350,7 +350,7 @@ error:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct session_interface session_logind_iface = {
|
const struct session_impl session_logind = {
|
||||||
.start = logind_session_start,
|
.start = logind_session_start,
|
||||||
.finish = logind_session_finish,
|
.finish = logind_session_finish,
|
||||||
.open = logind_take_device,
|
.open = logind_take_device,
|
||||||
|
|
|
@ -1,22 +1,24 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <wlr/session.h>
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <wlr/session.h>
|
||||||
|
#include <wlr/session/interface.h>
|
||||||
#include "common/log.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
|
#ifdef HAS_SYSTEMD
|
||||||
&session_logind_iface,
|
&session_logind,
|
||||||
#endif
|
#endif
|
||||||
&session_direct_iface,
|
&session_direct,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_session *wlr_session_start(struct wl_display *disp) {
|
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);
|
struct wlr_session *session = (*iter)->start(disp);
|
||||||
if (session) {
|
if (session) {
|
||||||
return 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) {
|
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,
|
int wlr_session_open_file(struct wlr_session *restrict session,
|
||||||
const char *restrict path) {
|
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) {
|
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) {
|
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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue