itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2108 from RedSoxFan/store-outputs

Browse Source 
Allow outputs to be re-enabled
master
emersion 7 years ago committed by GitHub
parent 22c1c4beb4 e072fbc6d9
commit 2e289831ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 107 additions and 37 deletions
Show Stats Download Patch File Download Diff File

1
include/sway/ipc-json.h
Unescape View File

@ -6,6 +6,7 @@
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_recursive(struct sway_container *c);
json_object *ipc_json_describe_input(struct sway_input_device *device);

3
include/sway/output.h
Unescape View File

@ -29,6 +29,8 @@ struct sway_output {
struct wl_listener damage_destroy;
struct wl_listener damage_frame;
struct wl_list link;
pid_t bg_pid;
};
@ -45,4 +47,5 @@ void output_damage_whole_container(struct sway_output *output,
struct sway_container *output_by_name(const char *name);
void output_enable(struct sway_output *output);
#endif

2
include/sway/tree/layout.h
Unescape View File

@ -31,6 +31,8 @@ struct sway_root {
struct wlr_texture *debug_tree;
struct wl_list outputs; // sway_output::link
struct {
struct wl_signal new_container;
} events;

24
sway/commands/output.c
Unescape View File

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

2
sway/config/output.c
Unescape 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;
if (oc && oc->enabled == 0) {
struct sway_output *sway_output = output->sway_output;
if (output->sway_output->bg_pid != 0) {
terminate_swaybg(output->sway_output->bg_pid);
output->sway_output->bg_pid = 0;
}
container_destroy(output);
sway_output->swayc = NULL;
wlr_output_layout_remove(root_container.sway_root->output_layout,
wlr_output);
return;

4
sway/desktop/layer_shell.c
Unescape View File

@ -252,7 +252,7 @@ static void unmap(struct sway_layer_surface *sway_layer) {
return;
}
struct sway_output *output = wlr_output->data;
if (output == NULL) {
if (output == NULL || output->swayc == NULL) {
return;
}
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
@ -279,7 +279,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&sway_layer->surface_commit.link);
if (sway_layer->layer_surface->output != NULL) {
struct sway_output *output = sway_layer->layer_surface->output->data;
if (output != NULL) {
if (output != NULL && output->swayc != NULL) {
arrange_layers(output);
}
wl_list_remove(&sway_layer->output_destroy.link);

20
sway/desktop/output.c
Unescape View File

@ -1165,9 +1165,18 @@ static void damage_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);
if (output->swayc) {
container_destroy(output->swayc);
}
if (&output->link) {
wl_list_remove(&output->link);
wl_list_remove(&output->destroy.link);
output->wlr_output = NULL;
free(output);
}
}
static void handle_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode);
arrange_layers(output);
@ -1203,6 +1212,9 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->wlr_output = wlr_output;
wlr_output->data = output;
output->server = server;
wl_list_insert(&root_container.sway_root->outputs, &output->link);
output->damage = wlr_output_damage_create(wlr_output);
if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
@ -1210,11 +1222,15 @@ void handle_new_output(struct wl_listener *listener, void *data) {
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;
output->swayc = output_create(output);
if (!output->swayc) {
free(output);
// Output is disabled
return;
}

20
sway/ipc-json.c
Unescape 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 *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,
json_object *object) {
int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1;

8
sway/ipc-server.c
Unescape View File

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

4
sway/tree/container.c
Unescape 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->transform.link);
wl_list_remove(&output->sway_output->scale.link);
@ -263,8 +262,7 @@ static struct sway_container *container_output_destroy(
wl_list_remove(&output->sway_output->damage_destroy.link);
wl_list_remove(&output->sway_output->damage_frame.link);
// clear the wlr_output reference to this container
output->sway_output->wlr_output->data = NULL;
output->sway_output->swayc = NULL;
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
_container_destroy(output);

1
sway/tree/layout.c
Unescape 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->output_layout = wlr_output_layout_create();
wl_list_init(&root_container.sway_root->outputs);
wl_list_init(&root_container.sway_root->xwayland_unmanaged);
wl_signal_init(&root_container.sway_root->events.new_container);

13
swaymsg/main.c
Unescape View File

@ -174,8 +174,9 @@ static void pretty_print_output(json_object *o) {
json_object *modes;
json_object_object_get_ex(o, "modes", &modes);
if (json_object_get_boolean(active)) {
printf(
"Output %s '%s %s %s'%s%s\n"
"Output %s '%s %s %s'%s\n"
" Current mode: %dx%d @ %f Hz\n"
" Position: %d,%d\n"
" Scale factor: %dx\n"
@ -186,7 +187,6 @@ static void pretty_print_output(json_object *o) {
json_object_get_string(model),
json_object_get_string(serial),
json_object_get_boolean(focused) ? " (focused)" : "",
!json_object_get_boolean(active) ? " (inactive)" : "",
json_object_get_int(width), json_object_get_int(height),
(float)json_object_get_int(refresh) / 1000,
json_object_get_int(x), json_object_get_int(y),
@ -194,6 +194,15 @@ static void pretty_print_output(json_object *o) {
json_object_get_string(transform),
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);
if (modes_len > 0) {

Write Preview
Loading…
Cancel
Save