diff options
Diffstat (limited to 'sway/tree/workspace.c')
-rw-r--r-- | sway/tree/workspace.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 51f0fcb4..50f9400a 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c | |||
@@ -49,7 +49,7 @@ struct sway_container *workspace_create(struct sway_container *output, | |||
49 | output = get_workspace_initial_output(name); | 49 | output = get_workspace_initial_output(name); |
50 | } | 50 | } |
51 | 51 | ||
52 | wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name); | 52 | wlr_log(WLR_DEBUG, "Added workspace %s for output %s", name, output->name); |
53 | struct sway_container *workspace = container_create(C_WORKSPACE); | 53 | struct sway_container *workspace = container_create(C_WORKSPACE); |
54 | 54 | ||
55 | workspace->x = output->x; | 55 | workspace->x = output->x; |
@@ -107,7 +107,7 @@ static bool workspace_valid_on_output(const char *output_name, | |||
107 | } | 107 | } |
108 | 108 | ||
109 | char *workspace_next_name(const char *output_name) { | 109 | char *workspace_next_name(const char *output_name) { |
110 | wlr_log(L_DEBUG, "Workspace: Generating new workspace name for output %s", | 110 | wlr_log(WLR_DEBUG, "Workspace: Generating new workspace name for output %s", |
111 | output_name); | 111 | output_name); |
112 | // Scan all workspace bindings to find the next available workspace name, | 112 | // Scan all workspace bindings to find the next available workspace name, |
113 | // if none are found/available then default to a number | 113 | // if none are found/available then default to a number |
@@ -135,7 +135,7 @@ char *workspace_next_name(const char *output_name) { | |||
135 | while (isspace(*_target)) { | 135 | while (isspace(*_target)) { |
136 | memmove(_target, _target+1, strlen(_target+1)); | 136 | memmove(_target, _target+1, strlen(_target+1)); |
137 | } | 137 | } |
138 | wlr_log(L_DEBUG, "Got valid workspace command for target: '%s'", | 138 | wlr_log(WLR_DEBUG, "Got valid workspace command for target: '%s'", |
139 | _target); | 139 | _target); |
140 | 140 | ||
141 | // Make sure that the command references an actual workspace | 141 | // Make sure that the command references an actual workspace |
@@ -161,7 +161,7 @@ char *workspace_next_name(const char *output_name) { | |||
161 | temp[length - 1] = '\0'; | 161 | temp[length - 1] = '\0'; |
162 | free(_target); | 162 | free(_target); |
163 | _target = temp; | 163 | _target = temp; |
164 | wlr_log(L_DEBUG, "Isolated name from workspace number: '%s'", _target); | 164 | wlr_log(WLR_DEBUG, "Isolated name from workspace number: '%s'", _target); |
165 | 165 | ||
166 | // Make sure the workspace number doesn't already exist | 166 | // Make sure the workspace number doesn't already exist |
167 | if (workspace_by_number(_target)) { | 167 | if (workspace_by_number(_target)) { |
@@ -190,7 +190,7 @@ char *workspace_next_name(const char *output_name) { | |||
190 | order = binding->order; | 190 | order = binding->order; |
191 | free(target); | 191 | free(target); |
192 | target = _target; | 192 | target = _target; |
193 | wlr_log(L_DEBUG, "Workspace: Found free name %s", _target); | 193 | wlr_log(WLR_DEBUG, "Workspace: Found free name %s", _target); |
194 | } else { | 194 | } else { |
195 | free(_target); | 195 | free(_target); |
196 | } | 196 | } |
@@ -387,7 +387,7 @@ bool workspace_switch(struct sway_container *workspace) { | |||
387 | free(prev_workspace_name); | 387 | free(prev_workspace_name); |
388 | prev_workspace_name = malloc(strlen(active_ws->name) + 1); | 388 | prev_workspace_name = malloc(strlen(active_ws->name) + 1); |
389 | if (!prev_workspace_name) { | 389 | if (!prev_workspace_name) { |
390 | wlr_log(L_ERROR, "Unable to allocate previous workspace name"); | 390 | wlr_log(WLR_ERROR, "Unable to allocate previous workspace name"); |
391 | return false; | 391 | return false; |
392 | } | 392 | } |
393 | strcpy(prev_workspace_name, active_ws->name); | 393 | strcpy(prev_workspace_name, active_ws->name); |
@@ -409,7 +409,7 @@ bool workspace_switch(struct sway_container *workspace) { | |||
409 | } | 409 | } |
410 | } | 410 | } |
411 | 411 | ||
412 | wlr_log(L_DEBUG, "Switching to workspace %p:%s", | 412 | wlr_log(WLR_DEBUG, "Switching to workspace %p:%s", |
413 | workspace, workspace->name); | 413 | workspace, workspace->name); |
414 | struct sway_container *next = seat_get_focus_inactive(seat, workspace); | 414 | struct sway_container *next = seat_get_focus_inactive(seat, workspace); |
415 | if (next == NULL) { | 415 | if (next == NULL) { |