koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store output names as a linked list

Browse Source 
Currently, only one name is ever added, and only the first name is
ever accessed; actually using the capability to store and access
multiple names comes in the following commits.
This commit is contained in:
Vladimir Panteleev
2017-09-09 07:37:37 +00:00
parent 30b1ab38b3
commit d01a59b922
5 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/randr.c
View File

@ -266,7 +266,11 @@ Output *create_root_output(xcb_connection_t *conn) {
s->rect.y = 0;
s->rect.width = root_screen->width_in_pixels;
s->rect.height = root_screen->height_in_pixels;
s->name = "xroot-0";
struct output_name *output_name = scalloc(1, sizeof(struct output_name));
output_name->name = "xroot-0";
SLIST_INIT(&s->names_head);
SLIST_INSERT_HEAD(&s->names_head, output_name, names);
return s;
}
@ -594,7 +598,12 @@ static bool randr_query_outputs_15(void) {
Output *new = get_output_by_name(name, false);
if (new == NULL) {
new = scalloc(1, sizeof(Output));
new->name = sstrdup(name);
struct output_name *output_name = scalloc(1, sizeof(struct output_name));
output_name->name = sstrdup(name);
SLIST_INIT(&new->names_head);
SLIST_INSERT_HEAD(&new->names_head, output_name, names);
if (monitor_info->primary) {
TAILQ_INSERT_HEAD(&outputs, new, outputs);
} else {
@ -643,14 +652,23 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
Output *new = get_output_by_id(id);
bool existing = (new != NULL);
if (!existing)
if (!existing) {
new = scalloc(1, sizeof(Output));
SLIST_INIT(&new->names_head);
}
new->id = id;
new->primary = (primary && primary->output == id);
FREE(new->name);
sasprintf(&new->name, "%.*s",
while (!SLIST_EMPTY(&new->names_head)) {
FREE(SLIST_FIRST(&new->names_head)->name);
struct output_name *old_head = SLIST_FIRST(&new->names_head);
SLIST_REMOVE_HEAD(&new->names_head, names);
FREE(old_head);
}
struct output_name *output_name = scalloc(1, sizeof(struct output_name));
sasprintf(&output_name->name, "%.*s",
xcb_randr_get_output_info_name_length(output),
xcb_randr_get_output_info_name(output));
SLIST_INSERT_HEAD(&new->names_head, output_name, names);
DLOG("found output with name %s\n", output_primary_name(new));