alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Store sway_outputs so that they can be reenabled

Browse source
This commit is contained in:
Brian Ashworth 2018-06-05 17:56:32 -04:00
parent 22c1c4beb4
commit a1b5b93d29
11 changed files with 118 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/ipc-json.h
View file

@ -6,6 +6,7 @@
json_object *ipc_json_get_version(); json_object *ipc_json_get_version();
json_object *ipc_json_describe_disabled_output(struct sway_output *o);
json_object *ipc_json_describe_container(struct sway_container *c); json_object *ipc_json_describe_container(struct sway_container *c);
json_object *ipc_json_describe_container_recursive(struct sway_container *c); json_object *ipc_json_describe_container_recursive(struct sway_container *c);
json_object *ipc_json_describe_input(struct sway_input_device *device); json_object *ipc_json_describe_input(struct sway_input_device *device);

1
include/sway/output.h
View file

@ -45,4 +45,5 @@ void output_damage_whole_container(struct sway_output *output,
struct sway_container *output_by_name(const char *name); struct sway_container *output_by_name(const char *name);
void output_enable(struct sway_output *output);
#endif #endif

2
include/sway/tree/layout.h
View file

@ -31,6 +31,8 @@ struct sway_root {
struct wlr_texture *debug_tree; struct wlr_texture *debug_tree;
list_t *outputs;
struct { struct {
struct wl_signal new_container; struct wl_signal new_container;
} events; } events;

29
sway/commands/output.c
View file

@ -1,5 +1,7 @@
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/output.h"
#include "sway/tree/layout.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
@ -80,16 +82,25 @@ struct cmd_results *cmd_output(int argc, char **argv) {
// will be applied during normal "new output" event from wlroots. // will be applied during normal "new output" event from wlroots.
char identifier[128]; char identifier[128];
bool all = strcmp(output->name, "*") == 0; bool all = strcmp(output->name, "*") == 0;
for (int i = 0; i < root_container.children->length; ++i) { list_t *sway_outputs = root_container.sway_root->outputs;
struct sway_container *cont = root_container.children->items[i]; for (int i = 0; i < sway_outputs->length; ++i) {
if (cont->type != C_OUTPUT) { struct sway_output *sway_output = sway_outputs->items[i];
continue; output_get_identifier(identifier, sizeof(identifier), sway_output);
} wlr_log(L_DEBUG, "Checking identifier %s", identifier);
if (all || strcmp(sway_output->wlr_output->name, output->name) == 0
|| strcmp(identifier, output->name) == 0) {
if (!sway_output->swayc) {
if (!output->enabled) {
if (!all) {
break;
}
continue;
}
output_get_identifier(identifier, sizeof(identifier), cont->sway_output); output_enable(sway_output);
if (all || strcmp(cont->name, output->name) == 0 || }
strcmp(identifier, output->name) == 0) {
apply_output_config(output, cont); apply_output_config(output, sway_output->swayc);
if (!all) { if (!all) {
// Stop looking if the output config isn't applicable to all // Stop looking if the output config isn't applicable to all

2
sway/config/output.c
View file

@ -131,11 +131,13 @@ void apply_output_config(struct output_config *oc, struct sway_container *output
struct wlr_output *wlr_output = output->sway_output->wlr_output; struct wlr_output *wlr_output = output->sway_output->wlr_output;
if (oc && oc->enabled == 0) { if (oc && oc->enabled == 0) {
struct sway_output *sway_output = output->sway_output;
if (output->sway_output->bg_pid != 0) { if (output->sway_output->bg_pid != 0) {
terminate_swaybg(output->sway_output->bg_pid); terminate_swaybg(output->sway_output->bg_pid);
output->sway_output->bg_pid = 0; output->sway_output->bg_pid = 0;
} }
container_destroy(output); container_destroy(output);
sway_output->swayc = NULL;
wlr_output_layout_remove(root_container.sway_root->output_layout, wlr_output_layout_remove(root_container.sway_root->output_layout,
wlr_output); wlr_output);
return; return;

35
sway/desktop/output.c
View file

@ -1157,6 +1157,10 @@ void output_damage_whole_container(struct sway_output *output,
wlr_output_damage_add_box(output->damage, &box); wlr_output_damage_add_box(output->damage, &box);
} }
static int find_output(const void *output1, const void *output2) {
return output1 == output2 ? 0 : 1;
}
static void damage_handle_destroy(struct wl_listener *listener, void *data) { static void damage_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = struct sway_output *output =
wl_container_of(listener, output, damage_destroy); wl_container_of(listener, output, damage_destroy);
@ -1165,7 +1169,19 @@ static void damage_handle_destroy(struct wl_listener *listener, void *data) {
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, destroy); struct sway_output *output = wl_container_of(listener, output, destroy);
container_destroy(output->swayc); if (output->swayc) {
container_destroy(output->swayc);
}
int index = list_seq_find(root_container.sway_root->outputs, find_output,
output);
if (index >= 0 && index < root_container.sway_root->outputs->length) {
wlr_log(L_DEBUG, "Removing %s from outputs list",
output->wlr_output->name);
list_del(root_container.sway_root->outputs, index);
wl_list_remove(&output->destroy.link);
output->wlr_output = NULL;
free(output);
}
} }
static void handle_mode(struct wl_listener *listener, void *data) { static void handle_mode(struct wl_listener *listener, void *data) {
@ -1203,6 +1219,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->wlr_output = wlr_output; output->wlr_output = wlr_output;
wlr_output->data = output; wlr_output->data = output;
output->server = server; output->server = server;
list_add(root_container.sway_root->outputs, output);
if (!wl_list_empty(&wlr_output->modes)) { if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode = struct wlr_output_mode *mode =
@ -1210,11 +1227,23 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wlr_output_set_mode(wlr_output, mode); wlr_output_set_mode(wlr_output, mode);
} }
output->damage = wlr_output_damage_create(wlr_output); output_enable(output);
}
void output_enable(struct sway_output *output) {
struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_output->data) {
wlr_output->data = output;
}
if (!output->damage) {
output->damage = wlr_output_damage_create(wlr_output);
}
output->swayc = output_create(output); output->swayc = output_create(output);
if (!output->swayc) { if (!output->swayc) {
free(output); // Output is disabled
return; return;
} }

20
sway/ipc-json.c
View file

@ -139,6 +139,26 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje
json_object_object_add(object, "layout", json_object_new_string("output")); json_object_object_add(object, "layout", json_object_new_string("output"));
} }
json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
struct wlr_output *wlr_output = output->wlr_output;
json_object *object = json_object_new_object();
json_object_object_add(object, "type", json_object_new_string("output"));
json_object_object_add(object, "name",
wlr_output->name ? json_object_new_string(wlr_output->name) : NULL);
json_object_object_add(object, "active", json_object_new_boolean(false));
json_object_object_add(object, "make",
json_object_new_string(wlr_output->make));
json_object_object_add(object, "model",
json_object_new_string(wlr_output->model));
json_object_object_add(object, "serial",
json_object_new_string(wlr_output->serial));
json_object_object_add(object, "modes", json_object_new_array());
return object;
}
static void ipc_json_describe_workspace(struct sway_container *workspace, static void ipc_json_describe_workspace(struct sway_container *workspace,
json_object *object) { json_object *object) {
int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1; int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1;

9
sway/ipc-server.c
View file

@ -19,6 +19,7 @@
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/ipc-json.h" #include "sway/ipc-json.h"
#include "sway/ipc-server.h" #include "sway/ipc-server.h"
#include "sway/output.h"
#include "sway/server.h" #include "sway/server.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
@ -488,6 +489,14 @@ void ipc_client_handle_command(struct ipc_client *client) {
ipc_json_describe_container(container)); ipc_json_describe_container(container));
} }
} }
for (int i = 0; i < root_container.sway_root->outputs->length; ++i) {
struct sway_output *output =
root_container.sway_root->outputs->items[i];
if (!output->swayc) {
json_object_array_add(outputs,
ipc_json_describe_disabled_output(output));
}
}
const char *json_string = json_object_to_json_string(outputs); const char *json_string = json_object_to_json_string(outputs);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(outputs); // free json_object_put(outputs); // free

2
sway/tree/container.c
View file

@ -255,7 +255,6 @@ static struct sway_container *container_output_destroy(
} }
} }
wl_list_remove(&output->sway_output->destroy.link);
wl_list_remove(&output->sway_output->mode.link); wl_list_remove(&output->sway_output->mode.link);
wl_list_remove(&output->sway_output->transform.link); wl_list_remove(&output->sway_output->transform.link);
wl_list_remove(&output->sway_output->scale.link); wl_list_remove(&output->sway_output->scale.link);
@ -265,6 +264,7 @@ static struct sway_container *container_output_destroy(
// clear the wlr_output reference to this container // clear the wlr_output reference to this container
output->sway_output->wlr_output->data = NULL; output->sway_output->wlr_output->data = NULL;
output->sway_output->swayc = NULL;
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
_container_destroy(output); _container_destroy(output);

1
sway/tree/layout.c
View file

@ -35,6 +35,7 @@ void layout_init(void) {
root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
root_container.sway_root->output_layout = wlr_output_layout_create(); root_container.sway_root->output_layout = wlr_output_layout_create();
root_container.sway_root->outputs = create_list();
wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_list_init(&root_container.sway_root->xwayland_unmanaged);
wl_signal_init(&root_container.sway_root->events.new_container); wl_signal_init(&root_container.sway_root->events.new_container);

49
swaymsg/main.c
View file

@ -174,26 +174,35 @@ static void pretty_print_output(json_object *o) {
json_object *modes; json_object *modes;
json_object_object_get_ex(o, "modes", &modes); json_object_object_get_ex(o, "modes", &modes);
printf( if (json_object_get_boolean(active)) {
"Output %s '%s %s %s'%s%s\n" printf(
" Current mode: %dx%d @ %f Hz\n" "Output %s '%s %s %s'%s\n"
" Position: %d,%d\n" " Current mode: %dx%d @ %f Hz\n"
" Scale factor: %dx\n" " Position: %d,%d\n"
" Transform: %s\n" " Scale factor: %dx\n"
" Workspace: %s\n", " Transform: %s\n"
json_object_get_string(name), " Workspace: %s\n",
json_object_get_string(make), json_object_get_string(name),
json_object_get_string(model), json_object_get_string(make),
json_object_get_string(serial), json_object_get_string(model),
json_object_get_boolean(focused) ? " (focused)" : "", json_object_get_string(serial),
!json_object_get_boolean(active) ? " (inactive)" : "", json_object_get_boolean(focused) ? " (focused)" : "",
json_object_get_int(width), json_object_get_int(height), json_object_get_int(width), json_object_get_int(height),
(float)json_object_get_int(refresh) / 1000, (float)json_object_get_int(refresh) / 1000,
json_object_get_int(x), json_object_get_int(y), json_object_get_int(x), json_object_get_int(y),
json_object_get_int(scale), json_object_get_int(scale),
json_object_get_string(transform), json_object_get_string(transform),
json_object_get_string(ws) json_object_get_string(ws)
); );
} else {
printf(
"Output %s '%s %s %s' (inactive)",
json_object_get_string(name),
json_object_get_string(make),
json_object_get_string(model),
json_object_get_string(serial)
);
}
size_t modes_len = json_object_array_length(modes); size_t modes_len = json_object_array_length(modes);
if (modes_len > 0) { if (modes_len > 0) {