mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-15 20:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-wlroots-1148

Browse source
This commit is contained in:
Drew DeVault 2018-07-19 14:09:19 -07:00 committed by GitHub
parent 4154234eee da9c86c608
commit 3483f1ea1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/server.h
View file

@ -56,6 +56,7 @@ struct sway_server server;
bool server_privileged_prepare(struct sway_server *server);
bool server_init(struct sway_server *server);
void server_fini(struct sway_server *server);
bool server_start_backend(struct sway_server *server);
void server_run(struct sway_server *server);
void handle_new_output(struct wl_listener *listener, void *data);

4
sway/config.c
View file

@ -649,7 +649,6 @@ bool read_config(FILE *file, struct sway_config *config) {
} else {
res = config_command(expanded);
}
free(expanded);
switch(res->status) {
case CMD_FAILURE:
case CMD_INVALID:
@ -660,7 +659,7 @@ bool read_config(FILE *file, struct sway_config *config) {
case CMD_DEFER:
wlr_log(WLR_DEBUG, "Deferring command `%s'", line);
list_add(config->cmd_queue, strdup(line));
list_add(config->cmd_queue, strdup(expanded));
break;
case CMD_BLOCK_COMMANDS:
@ -693,6 +692,7 @@ bool read_config(FILE *file, struct sway_config *config) {
sizeof(config->handler_context));
default:;
}
free(expanded);
free(line);
free_cmd_results(res);
}

9
sway/main.c
View file

@ -429,9 +429,16 @@ int main(int argc, char **argv) {
security_sanity_check();
config->active = true;
setenv("WAYLAND_DISPLAY", server.socket, true);
if (!terminate_request) {
if (!server_start_backend(&server)) {
sway_terminate(EXIT_FAILURE);
}
}
config->active = true;
// Execute commands until there are none left
wlr_log(WLR_DEBUG, "Running deferred commands");
while (config->cmd_queue->length) {
char *line = config->cmd_queue->items[0];
struct cmd_results *res = execute_command(line, NULL);

12
sway/server.c
View file

@ -137,13 +137,19 @@ void server_fini(struct sway_server *server) {
list_free(server->transactions);
}
void server_run(struct sway_server *server) {
wlr_log(WLR_INFO, "Running compositor on wayland display '%s'",
bool server_start_backend(struct sway_server *server) {
wlr_log(WLR_INFO, "Starting backend on wayland display '%s'",
server->socket);
if (!wlr_backend_start(server->backend)) {
wlr_log(WLR_ERROR, "Failed to start backend");
wlr_backend_destroy(server->backend);
return;
return false;
}
return true;
}
void server_run(struct sway_server *server) {
wlr_log(WLR_INFO, "Running compositor on wayland display '%s'",
server->socket);
wl_display_run(server->wl_display);
}

6
sway/tree/view.c
View file

@ -564,7 +564,11 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
}
focus = seat_get_focus_inactive(seat, workspace);
} else {
// TODO: CT_ASSIGN_OUTPUT
// CT_ASSIGN_OUTPUT
struct sway_container *output = output_by_name(criteria->target);
if (output) {
focus = seat_get_focus_inactive(seat, output);
}
}
}
// If we're about to launch the view into the floating container, then