mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-03 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

basic headless mode

Browse source
This commit is contained in:
Tony Crisci 2018-02-24 21:44:50 -05:00
parent 2ea9a55d96
commit c8a7b28c42
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/server.h
View file

@ -63,7 +63,7 @@ struct sway_server {
struct sway_server server; struct sway_server server;
bool server_init(struct sway_server *server); bool server_init(struct sway_server *server, bool headless);
void server_fini(struct sway_server *server); void server_fini(struct sway_server *server);
void server_run(struct sway_server *server); void server_run(struct sway_server *server);

10
sway/main.c
View file

@ -251,12 +251,14 @@ static void drop_permissions(bool keep_caps) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
static int verbose = 0, debug = 0, validate = 0; static int verbose = 0, debug = 0, validate = 0;
bool headless = false;
static struct option long_options[] = { static struct option long_options[] = {
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"config", required_argument, NULL, 'c'}, {"config", required_argument, NULL, 'c'},
{"validate", no_argument, NULL, 'C'}, {"validate", no_argument, NULL, 'C'},
{"debug", no_argument, NULL, 'd'}, {"debug", no_argument, NULL, 'd'},
{"headless", no_argument, NULL, 'H'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{"verbose", no_argument, NULL, 'V'}, {"verbose", no_argument, NULL, 'V'},
{"get-socketpath", no_argument, NULL, 'p'}, {"get-socketpath", no_argument, NULL, 'p'},
@ -272,6 +274,7 @@ int main(int argc, char **argv) {
" -c, --config <config> Specify a config file.\n" " -c, --config <config> Specify a config file.\n"
" -C, --validate Check the validity of the config file, then exit.\n" " -C, --validate Check the validity of the config file, then exit.\n"
" -d, --debug Enables full logging, including debug information.\n" " -d, --debug Enables full logging, including debug information.\n"
" -H, --headless Starts sway with the headless backend.\n"
" -v, --version Show the version number and quit.\n" " -v, --version Show the version number and quit.\n"
" -V, --verbose Enables more verbose logging.\n" " -V, --verbose Enables more verbose logging.\n"
" --get-socketpath Gets the IPC socket path and prints it, then exits.\n" " --get-socketpath Gets the IPC socket path and prints it, then exits.\n"
@ -288,7 +291,7 @@ int main(int argc, char **argv) {
int c; int c;
while (1) { while (1) {
int option_index = 0; int option_index = 0;
c = getopt_long(argc, argv, "hCdvVc:", long_options, &option_index); c = getopt_long(argc, argv, "hCHdvVc:", long_options, &option_index);
if (c == -1) { if (c == -1) {
break; break;
} }
@ -306,6 +309,9 @@ int main(int argc, char **argv) {
case 'd': // debug case 'd': // debug
debug = 1; debug = 1;
break; break;
case 'H':
headless = true;
break;
case 'v': // version case 'v': // version
fprintf(stdout, "sway version " SWAY_VERSION "\n"); fprintf(stdout, "sway version " SWAY_VERSION "\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -384,7 +390,7 @@ int main(int argc, char **argv) {
init_layout(); init_layout();
if (!server_init(&server)) { if (!server_init(&server, headless)) {
return 1; return 1;
} }

21
sway/server.c
View file

@ -39,17 +39,28 @@ static void server_ready(struct wl_listener *listener, void *data) {
} }
} }
bool server_init(struct sway_server *server) { bool server_init(struct sway_server *server, bool headless) {
wlr_log(L_DEBUG, "Initializing Wayland server"); wlr_log(L_DEBUG, "Initializing Wayland server");
server->wl_display = wl_display_create(); server->wl_display = wl_display_create();
server->wl_event_loop = wl_display_get_event_loop(server->wl_display); server->wl_event_loop = wl_display_get_event_loop(server->wl_display);
server->backend = wlr_backend_autocreate(server->wl_display);
wl_list_init(&server->subbackends); wl_list_init(&server->subbackends);
server->renderer = wlr_gles2_renderer_create(server->backend); if (headless) {
server->backend = wlr_multi_backend_create(server->wl_display);
struct sway_subbackend *subbackend =
sway_subbackend_create(SWAY_SUBBACKEND_HEADLESS, "headless");
sway_server_add_subbackend(server, subbackend);
} else {
// TODO add whatever this function creates to the subbackends
server->backend = wlr_backend_autocreate(server->wl_display);
}
wl_display_init_shm(server->wl_display); wl_display_init_shm(server->wl_display);
server->renderer = wlr_backend_get_renderer(server->backend);
server->compositor = wlr_compositor_create( server->compositor = wlr_compositor_create(
server->wl_display, server->renderer); server->wl_display, server->renderer);
@ -181,13 +192,9 @@ static struct wlr_backend *x11_backend_create(struct sway_server *server) {
static struct wlr_backend *headless_backend_create( static struct wlr_backend *headless_backend_create(
struct sway_server *server) { struct sway_server *server) {
wlr_log(L_DEBUG, "TODO: create headless backend");
return NULL;
/*
struct wlr_backend *backend = struct wlr_backend *backend =
wlr_headless_backend_create(server->wl_display); wlr_headless_backend_create(server->wl_display);
return backend; return backend;
*/
} }
static struct wlr_backend *drm_backend_create(struct sway_server *server) { static struct wlr_backend *drm_backend_create(struct sway_server *server) {