mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

workspace: Improve workspace_next_name.

Browse source 
This function looks for bound commands that start with `workspace` (ie.
the commands that change to a static workspace) and fetches the
workspace name.

However, if it's actually a list of commands, then the parsing will pick
up the delimiter ("," or ";") and also fail to recognize keywords
("next" etc).

This patch fixes that by properly separating with delimiters.
This commit is contained in:
S. Christoffer Eliesen 2015-11-24 23:03:00 +01:00
parent 04bd9386fe
commit 0a78af0acc
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sway/workspace.c
View file

@ -27,13 +27,19 @@ char *workspace_next_name(void) {
for (i = 0; i < mode->bindings->length; ++i) { for (i = 0; i < mode->bindings->length; ++i) {
struct sway_binding *binding = mode->bindings->items[i]; struct sway_binding *binding = mode->bindings->items[i];
const char* command = binding->command; char *cmdlist = strdup(binding->command);
list_t *args = split_string(command, " "); char *dup = cmdlist;
char *name = NULL;
if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) { // workspace n
sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", (char *)args->items[1]); char *cmd = argsep(&cmdlist, " ");
char* target = malloc(strlen(args->items[1]) + 1); if (cmdlist) {
strcpy(target, args->items[1]); name = argsep(&cmdlist, " ,;");
}
if (strcmp("workspace", cmd) == 0 && name) {
sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", name);
char* target = strdup(name);
while (*target == ' ' || *target == '\t') while (*target == ' ' || *target == '\t')
target++; target++;
@ -47,22 +53,20 @@ char *workspace_next_name(void) {
strcmp(target, "back_and_forth") == 0 || strcmp(target, "back_and_forth") == 0 ||
strcmp(target, "current") == 0) strcmp(target, "current") == 0)
{ {
free_flat_list(args); free(target);
continue; continue;
} }
// Make sure that the workspace doesn't already exist // Make sure that the workspace doesn't already exist
if (workspace_by_name(target)) { if (workspace_by_name(target)) {
free_flat_list(args); free(target);
continue; continue;
} }
free(dup);
free_flat_list(args);
sway_log(L_DEBUG, "Workspace: Found free name %s", target); sway_log(L_DEBUG, "Workspace: Found free name %s", target);
return target; return target;
} }
free_flat_list(args); free(dup);
} }
// As a fall back, get the current number of active workspaces // As a fall back, get the current number of active workspaces
// and return that + 1 for the next workspace's name // and return that + 1 for the next workspace's name