applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve error messages for i3-internal workspace names

Browse Source
This commit is contained in:
Michael Stapelberg 2014-05-03 15:02:51 +02:00
parent dba8c91eff
commit ff94d28b85
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands.c
View File

@ -484,7 +484,7 @@ void cmd_move_con_to_workspace_back_and_forth(I3_CMD) {
*/ */
void cmd_move_con_to_workspace_name(I3_CMD, char *name) { void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
if (strncasecmp(name, "__", strlen("__")) == 0) { if (strncasecmp(name, "__", strlen("__")) == 0) {
LOG("You cannot switch to the i3 internal workspaces.\n"); LOG("You cannot move containers to i3-internal workspaces (\"%s\").\n", name);
ysuccess(false); ysuccess(false);
return; return;
} }
@ -999,7 +999,7 @@ void cmd_workspace_back_and_forth(I3_CMD) {
*/ */
void cmd_workspace_name(I3_CMD, char *name) { void cmd_workspace_name(I3_CMD, char *name) {
if (strncasecmp(name, "__", strlen("__")) == 0) { if (strncasecmp(name, "__", strlen("__")) == 0) {
LOG("You cannot switch to the i3 internal workspaces.\n"); LOG("You cannot switch to the i3-internal workspaces (\"%s\").\n", name);
ysuccess(false); ysuccess(false);
return; return;
} }
@ -1868,7 +1868,7 @@ void cmd_scratchpad_show(I3_CMD) {
*/ */
void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) { void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
if (strncasecmp(new_name, "__", strlen("__")) == 0) { if (strncasecmp(new_name, "__", strlen("__")) == 0) {
LOG("You cannot switch to the i3 internal workspaces.\n"); LOG("Cannot rename workspace to \"%s\": names starting with __ are i3-internal.", new_name);
ysuccess(false); ysuccess(false);
return; return;
} }

2
src/workspace.c
View File

@ -143,7 +143,7 @@ Con *create_workspace_on_output(Output *output, Con *content) {
if (*target == '"') if (*target == '"')
target++; target++;
if (strncasecmp(target, "__", strlen("__")) == 0) { if (strncasecmp(target, "__", strlen("__")) == 0) {
LOG("Cannot create workspace. '__' is a reserved prefix.\n"); LOG("Cannot create workspace \"%s\". Names starting with __ are i3-internal.\n", target);
continue; continue;
} }
FREE(ws->name); FREE(ws->name);