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

Make get_assigned_output public

Browse Source
This commit is contained in:
Orestis Floros 2020-04-16 21:58:57 +02:00
parent 9d2c855fcd
commit 6b2d8cb4d6
No known key found for this signature in database
GPG Key ID: A09DBD7D3222C1C3
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/workspace.h
View File

@ -45,6 +45,19 @@ Con *get_existing_workspace_by_name(const char *name);
*/
Con *get_existing_workspace_by_num(int num);
/**
* Returns the first output that is assigned to a workspace specified by the
* given name or number. Returns NULL if no such output exists.
*
* If an assignment matches by number but there is an assignment later that
* matches by name, the second one is preferred.
* The order of the 'ws_assignments' queue is respected: if multiple
* assignments match the criteria, the first one is returned.
* 'name' is ignored when NULL, 'parsed_num' is ignored when it is -1.
*
*/
Con *get_assigned_output(const char *name, long parsed_num);
/**
* Returns true if the first output assigned to a workspace with the given
* workspace assignment is the same as the given output.

22
src/workspace.c
View File

@ -72,21 +72,22 @@ static void _workspace_apply_default_orientation(Con *ws) {
/*
* Returns the first output that is assigned to a workspace specified by the
* given name or number or NULL if no such output exists. If there is a
* workspace with a matching name and another workspace with a matching number,
* the output assigned to the first one is returned.
* The order of the 'ws_assignments' queue is respected: if multiple assignments
* match the specified workspace, the first one is returned.
* If 'name' is NULL it will be ignored.
* If 'parsed_num' is -1 it will be ignored.
* given name or number. Returns NULL if no such output exists.
*
* If an assignment matches by number but there is an assignment later that
* matches by name, the second one is preferred.
* The order of the 'ws_assignments' queue is respected: if multiple
* assignments match the criteria, the first one is returned.
* 'name' is ignored when NULL, 'parsed_num' is ignored when it is -1.
*
*/
static Con *get_assigned_output(const char *name, long parsed_num) {
Con *get_assigned_output(const char *name, long parsed_num) {
Con *output = NULL;
struct Workspace_Assignment *assignment;
TAILQ_FOREACH (assignment, &ws_assignments, ws_assignments) {
if (name && strcmp(assignment->name, name) == 0) {
DLOG("Found workspace name assignment to output \"%s\"\n", assignment->output);
DLOG("Found workspace name=\"%s\" assignment to output \"%s\"\n",
name, assignment->output);
Output *assigned_by_name = get_output_by_name(assignment->output, true);
if (assigned_by_name) {
/* When the name matches exactly, skip numbered assignments. */
@ -96,7 +97,8 @@ static Con *get_assigned_output(const char *name, long parsed_num) {
parsed_num != -1 &&
name_is_digits(assignment->name) &&
ws_name_to_number(assignment->name) == parsed_num) {
DLOG("Found workspace number assignment to output \"%s\"\n", assignment->output);
DLOG("Found workspace number=%ld assignment to output \"%s\"\n",
parsed_num, assignment->output);
Output *assigned_by_num = get_output_by_name(assignment->output, true);
if (assigned_by_num) {
output = assigned_by_num->con;