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

Introduce output_primary_name function

Browse Source 
Currently simply returns output->name, but this will make it easier to
change how output names are stored in the following commits.

Also replace reading output->name with invocations of
output_primary_name. Code which writes output->name is unchanged. Done
using a mostly mechanical replacement of output->name to
output_primary_name(output).
This commit is contained in:
Vladimir Panteleev
2017-09-09 07:18:29 +00:00
parent 0f2bce3916
commit 30b1ab38b3
12 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/randr.c
View File

@ -49,7 +49,7 @@ Output *get_output_by_name(const char *name, const bool require_active) {
bool get_primary = (strcasecmp("primary", name) == 0);
TAILQ_FOREACH(output, &outputs, outputs) {
if ((output->primary && get_primary) ||
((!require_active || output->active) && strcasecmp(output->name, name) == 0)) {
((!require_active || output->active) && strcasecmp(output_primary_name(output), name) == 0)) {
return output;
}
}
@ -178,7 +178,7 @@ Output *get_output_next_wrap(direction_t direction, Output *current) {
}
if (!best)
best = current;
DLOG("current = %s, best = %s\n", current->name, best->name);
DLOG("current = %s, best = %s\n", output_primary_name(current), output_primary_name(best));
return best;
}
@ -250,7 +250,7 @@ Output *get_output_next(direction_t direction, Output *current, output_close_far
}
}
DLOG("current = %s, best = %s\n", current->name, (best ? best->name : "NULL"));
DLOG("current = %s, best = %s\n", output_primary_name(current), (best ? output_primary_name(best) : "NULL"));
return best;
}
@ -280,12 +280,12 @@ void output_init_con(Output *output) {
Con *con = NULL, *current;
bool reused = false;
DLOG("init_con for output %s\n", output->name);
DLOG("init_con for output %s\n", output_primary_name(output));
/* Search for a Con with that name directly below the root node. There
* might be one from a restored layout. */
TAILQ_FOREACH(current, &(croot->nodes_head), nodes) {
if (strcmp(current->name, output->name) != 0)
if (strcmp(current->name, output_primary_name(output)) != 0)
continue;
con = current;
@ -297,7 +297,7 @@ void output_init_con(Output *output) {
if (con == NULL) {
con = con_new(croot, NULL);
FREE(con->name);
con->name = sstrdup(output->name);
con->name = sstrdup(output_primary_name(output));
con->type = CT_OUTPUT;
con->layout = L_OUTPUT;
con_fix_percent(croot);
@ -384,7 +384,7 @@ void init_ws_for_output(Output *output, Con *content) {
/* go through all assignments and move the existing workspaces to this output */
struct Workspace_Assignment *assignment;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
if (strcmp(assignment->output, output->name) != 0)
if (strcmp(assignment->output, output_primary_name(output)) != 0)
continue;
/* check if this workspace actually exists */
@ -402,13 +402,13 @@ void init_ws_for_output(Output *output, Con *content) {
LOG("Workspace \"%s\" assigned to output \"%s\", but it is already "
"there. Do you have two assignment directives for the same "
"workspace in your configuration file?\n",
workspace->name, output->name);
workspace->name, output_primary_name(output));
continue;
}
/* if so, move it over */
LOG("Moving workspace \"%s\" from output \"%s\" to \"%s\" due to assignment\n",
workspace->name, workspace_out->name, output->name);
workspace->name, workspace_out->name, output_primary_name(output));
/* if the workspace is currently visible on that output, we need to
* switch to a different workspace - otherwise the output would end up
@ -445,7 +445,7 @@ void init_ws_for_output(Output *output, Con *content) {
workspace_out->name);
init_ws_for_output(get_output_by_name(workspace_out->name, true),
output_get_content(workspace_out));
DLOG("Done re-initializing, continuing with \"%s\"\n", output->name);
DLOG("Done re-initializing, continuing with \"%s\"\n", output_primary_name(output));
}
}
@ -465,7 +465,7 @@ void init_ws_for_output(Output *output, Con *content) {
/* otherwise, we create the first assigned ws for this output */
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
if (strcmp(assignment->output, output->name) != 0)
if (strcmp(assignment->output, output_primary_name(output)) != 0)
continue;
LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n",
@ -652,7 +652,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
xcb_randr_get_output_info_name_length(output),
xcb_randr_get_output_info_name(output));
DLOG("found output with name %s\n", new->name);
DLOG("found output with name %s\n", output_primary_name(new));
/* Even if no CRTC is used at the moment, we store the output so that
* we do not need to change the list ever again (we only update the
@ -672,7 +672,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts);
if ((crtc = xcb_randr_get_crtc_info_reply(conn, icookie, NULL)) == NULL) {
DLOG("Skipping output %s: could not get CRTC (%p)\n",
new->name, crtc);
output_primary_name(new), crtc);
free(new);
return;
}
@ -789,7 +789,7 @@ void randr_query_outputs(void) {
if (!output->active || output->to_be_disabled)
continue;
DLOG("output %p / %s, position (%d, %d), checking for clones\n",
output, output->name, output->rect.x, output->rect.y);
output, output_primary_name(output), output->rect.x, output->rect.y);
for (other = output;
other != TAILQ_END(&outputs);
@ -813,7 +813,7 @@ void randr_query_outputs(void) {
update_if_necessary(&(other->rect.width), width);
update_if_necessary(&(other->rect.height), height);
DLOG("disabling output %p (%s)\n", other, other->name);
DLOG("disabling output %p (%s)\n", other, output_primary_name(other));
other->to_be_disabled = true;
DLOG("new output mode %d x %d, other mode %d x %d\n",
@ -828,7 +828,7 @@ void randr_query_outputs(void) {
* LVDS1 gets disabled. */
TAILQ_FOREACH(output, &outputs, outputs) {
if (output->active && output->con == NULL) {
DLOG("Need to initialize a Con for output %s\n", output->name);
DLOG("Need to initialize a Con for output %s\n", output_primary_name(output));
output_init_con(output);
output->changed = false;
}
@ -854,7 +854,7 @@ void randr_query_outputs(void) {
Con *content = output_get_content(output->con);
if (!TAILQ_EMPTY(&(content->nodes_head)))
continue;
DLOG("Should add ws for output %s\n", output->name);
DLOG("Should add ws for output %s\n", output_primary_name(output));
init_ws_for_output(output, content);
}
@ -863,7 +863,7 @@ void randr_query_outputs(void) {
if (!output->primary || !output->con)
continue;
DLOG("Focusing primary output %s\n", output->name);
DLOG("Focusing primary output %s\n", output_primary_name(output));
con_focus(con_descend_focused(output->con));
}
@ -881,7 +881,7 @@ void randr_disable_output(Output *output) {
assert(output->to_be_disabled);
output->active = false;
DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name);
DLOG("Output %s disabled, re-assigning workspaces/docks\n", output_primary_name(output));
Output *first = get_first_output();