aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-10-07 23:30:05 +0200
committerGitHub <noreply@github.com>2018-10-07 23:30:05 +0200
commit89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420 (patch)
tree29bd04516a0c032026d00c83ea2d9d4bb5952f74
parent7252c7f7157394c7a2243eda7c7af608ed5016e7 (diff)
parent92e1fc00fdb78abaf050606797ffbb86a3f4328b (diff)
downloadsway-89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420.zip
sway-89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420.tar.gz
sway-89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420.tar.bz2
Merge pull request #2786 from swaywm/no-op-client-commands
Shim client.background and client.placeholder
-rw-r--r--include/sway/commands.h1
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/client.c15
3 files changed, 13 insertions, 5 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index f7fafb9..21b8b87 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -103,6 +103,7 @@ sway_cmd cmd_bar;
sway_cmd cmd_bindcode;
sway_cmd cmd_bindsym;
sway_cmd cmd_border;
+sway_cmd cmd_client_noop;
sway_cmd cmd_client_focused;
sway_cmd cmd_client_focused_inactive;
sway_cmd cmd_client_unfocused;
diff --git a/sway/commands.c b/sway/commands.c
index 5dd27f7..780cd7d 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -77,8 +77,10 @@ static struct cmd_handler handlers[] = {
{ "bar", cmd_bar },
{ "bindcode", cmd_bindcode },
{ "bindsym", cmd_bindsym },
+ { "client.background", cmd_client_noop },
{ "client.focused", cmd_client_focused },
{ "client.focused_inactive", cmd_client_focused_inactive },
+ { "client.placeholder", cmd_client_noop },
{ "client.unfocused", cmd_client_unfocused },
{ "client.urgent", cmd_client_urgent },
{ "default_border", cmd_default_border },
diff --git a/sway/commands/client.c b/sway/commands/client.c
index 6e5f08a..9f54fa9 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -64,27 +64,27 @@ static struct cmd_results *handle_command(int argc, char **argv,
if (!parse_color_float(argv[0], class->border)) {
return cmd_results_new(CMD_INVALID, cmd_name,
- "Unable to parse border color");
+ "Unable to parse border color '%s'", argv[0]);
}
if (!parse_color_float(argv[1], class->background)) {
return cmd_results_new(CMD_INVALID, cmd_name,
- "Unable to parse background color");
+ "Unable to parse background color '%s'", argv[1]);
}
if (!parse_color_float(argv[2], class->text)) {
return cmd_results_new(CMD_INVALID, cmd_name,
- "Unable to parse text color");
+ "Unable to parse text color '%s'", argv[2]);
}
if (!parse_color_float(argv[3], class->indicator)) {
return cmd_results_new(CMD_INVALID, cmd_name,
- "Unable to parse indicator color");
+ "Unable to parse indicator color '%s'", argv[3]);
}
if (!parse_color_float(argv[4], class->child_border)) {
return cmd_results_new(CMD_INVALID, cmd_name,
- "Unable to parse child border color");
+ "Unable to parse child border color '%s'", argv[4]);
}
if (config->active) {
@@ -114,3 +114,8 @@ struct cmd_results *cmd_client_unfocused(int argc, char **argv) {
struct cmd_results *cmd_client_urgent(int argc, char **argv) {
return handle_command(argc, argv, &config->border_colors.urgent, "client.urgent");
}
+
+struct cmd_results *cmd_client_noop(int argc, char **argv) {
+ wlr_log(WLR_INFO, "Warning: %s is ignored by sway", argv[-1]);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}