mirror of
https://github.com/swaywm/sway.git
synced 2024-12-29 00:16:22 +01:00
Merge branch 'master' into fix_transparency
This commit is contained in:
commit
ffc61e5f3f
3 changed files with 2 additions and 2 deletions
|
@ -663,7 +663,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
|
|||
}
|
||||
|
||||
seat_send_focus(container, seat);
|
||||
container_damage_whole(container);
|
||||
container_damage_whole(container->parent);
|
||||
}
|
||||
|
||||
// clean up unfocused empty workspace on new output
|
||||
|
|
|
@ -416,6 +416,7 @@ int main(int argc, char **argv) {
|
|||
security_sanity_check();
|
||||
|
||||
config->active = true;
|
||||
setenv("WAYLAND_DISPLAY", server.socket, true);
|
||||
// Execute commands until there are none left
|
||||
while (config->cmd_queue->length) {
|
||||
char *line = config->cmd_queue->items[0];
|
||||
|
|
|
@ -143,7 +143,6 @@ void server_fini(struct sway_server *server) {
|
|||
void server_run(struct sway_server *server) {
|
||||
wlr_log(L_INFO, "Running compositor on wayland display '%s'",
|
||||
server->socket);
|
||||
setenv("WAYLAND_DISPLAY", server->socket, true);
|
||||
if (!wlr_backend_start(server->backend)) {
|
||||
wlr_log(L_ERROR, "Failed to start backend");
|
||||
wlr_backend_destroy(server->backend);
|
||||
|
|
Loading…
Reference in a new issue