From 3f87c2caea6656cf409f99040a5af8deba9c19c1 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 10 Apr 2021 17:26:47 +0200 Subject: [PATCH] backend/session: Remove noop backend This is instead delegated to libseat. --- backend/session/meson.build | 1 - backend/session/noop.c | 51 ------------------------------------- backend/session/session.c | 3 --- 3 files changed, 55 deletions(-) delete mode 100644 backend/session/noop.c diff --git a/backend/session/meson.build b/backend/session/meson.build index 17b0d42e..41a56031 100644 --- a/backend/session/meson.build +++ b/backend/session/meson.build @@ -5,7 +5,6 @@ libseat = dependency('libseat', ) wlr_files += files( - 'noop.c', 'session.c', 'libseat.c' ) diff --git a/backend/session/noop.c b/backend/session/noop.c deleted file mode 100644 index 3f293775..00000000 --- a/backend/session/noop.c +++ /dev/null @@ -1,51 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include -#include -#include -#include -#include "backend/session/session.h" -#include "util/signal.h" - -const struct session_impl session_noop; - -static int noop_session_open(struct wlr_session *base, const char *path) { - return open(path, O_RDWR | O_CLOEXEC); -} - -static void noop_session_close(struct wlr_session *base, int fd) { - close(fd); -} - -static bool noop_change_vt(struct wlr_session *base, unsigned vt) { - return false; -} - -static void noop_session_destroy(struct wlr_session *base) { - free(base); -} - -static struct wlr_session *noop_session_create(struct wl_display *disp) { - struct wlr_session *session = calloc(1, sizeof(*session)); - if (!session) { - wlr_log_errno(WLR_ERROR, "Allocation failed"); - return NULL; - } - - session_init(session); - session->impl = &session_noop; - session->active = true; - - wlr_log(WLR_INFO, "Successfully initialized noop session"); - return session; -} - -const struct session_impl session_noop = { - .create = noop_session_create, - .destroy = noop_session_destroy, - .open = noop_session_open, - .close = noop_session_close, - .change_vt = noop_change_vt, -}; diff --git a/backend/session/session.c b/backend/session/session.c index 67ee1e1f..c9df78e4 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -21,7 +21,6 @@ #define WAIT_GPU_TIMEOUT 10000 // ms extern const struct session_impl session_libseat; -extern const struct session_impl session_noop; static const struct session_impl *const impls[] = { &session_libseat, @@ -109,8 +108,6 @@ struct wlr_session *wlr_session_create(struct wl_display *disp) { if (env_wlr_session) { if (strcmp(env_wlr_session, "libseat") == 0) { session = session_libseat.create(disp); - } else if (strcmp(env_wlr_session, "noop") == 0) { - session = session_noop.create(disp); } else { wlr_log(WLR_ERROR, "Unsupported WLR_SESSION: %s", env_wlr_session);