aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 f7fafb96..21b8b87a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -103,6 +103,7 @@ sway_cmd cmd_bar;
103sway_cmd cmd_bindcode; 103sway_cmd cmd_bindcode;
104sway_cmd cmd_bindsym; 104sway_cmd cmd_bindsym;
105sway_cmd cmd_border; 105sway_cmd cmd_border;
106sway_cmd cmd_client_noop;
106sway_cmd cmd_client_focused; 107sway_cmd cmd_client_focused;
107sway_cmd cmd_client_focused_inactive; 108sway_cmd cmd_client_focused_inactive;
108sway_cmd cmd_client_unfocused; 109sway_cmd cmd_client_unfocused;
diff --git a/sway/commands.c b/sway/commands.c
index 5dd27f7e..780cd7d6 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -77,8 +77,10 @@ static struct cmd_handler handlers[] = {
77 { "bar", cmd_bar }, 77 { "bar", cmd_bar },
78 { "bindcode", cmd_bindcode }, 78 { "bindcode", cmd_bindcode },
79 { "bindsym", cmd_bindsym }, 79 { "bindsym", cmd_bindsym },
80 { "client.background", cmd_client_noop },
80 { "client.focused", cmd_client_focused }, 81 { "client.focused", cmd_client_focused },
81 { "client.focused_inactive", cmd_client_focused_inactive }, 82 { "client.focused_inactive", cmd_client_focused_inactive },
83 { "client.placeholder", cmd_client_noop },
82 { "client.unfocused", cmd_client_unfocused }, 84 { "client.unfocused", cmd_client_unfocused },
83 { "client.urgent", cmd_client_urgent }, 85 { "client.urgent", cmd_client_urgent },
84 { "default_border", cmd_default_border }, 86 { "default_border", cmd_default_border },
diff --git a/sway/commands/client.c b/sway/commands/client.c
index 6e5f08a2..9f54fa94 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,
64 64
65 if (!parse_color_float(argv[0], class->border)) { 65 if (!parse_color_float(argv[0], class->border)) {
66 return cmd_results_new(CMD_INVALID, cmd_name, 66 return cmd_results_new(CMD_INVALID, cmd_name,
67 "Unable to parse border color"); 67 "Unable to parse border color '%s'", argv[0]);
68 } 68 }
69 69
70 if (!parse_color_float(argv[1], class->background)) { 70 if (!parse_color_float(argv[1], class->background)) {
71 return cmd_results_new(CMD_INVALID, cmd_name, 71 return cmd_results_new(CMD_INVALID, cmd_name,
72 "Unable to parse background color"); 72 "Unable to parse background color '%s'", argv[1]);
73 } 73 }
74 74
75 if (!parse_color_float(argv[2], class->text)) { 75 if (!parse_color_float(argv[2], class->text)) {
76 return cmd_results_new(CMD_INVALID, cmd_name, 76 return cmd_results_new(CMD_INVALID, cmd_name,
77 "Unable to parse text color"); 77 "Unable to parse text color '%s'", argv[2]);
78 } 78 }
79 79
80 if (!parse_color_float(argv[3], class->indicator)) { 80 if (!parse_color_float(argv[3], class->indicator)) {
81 return cmd_results_new(CMD_INVALID, cmd_name, 81 return cmd_results_new(CMD_INVALID, cmd_name,
82 "Unable to parse indicator color"); 82 "Unable to parse indicator color '%s'", argv[3]);
83 } 83 }
84 84
85 if (!parse_color_float(argv[4], class->child_border)) { 85 if (!parse_color_float(argv[4], class->child_border)) {
86 return cmd_results_new(CMD_INVALID, cmd_name, 86 return cmd_results_new(CMD_INVALID, cmd_name,
87 "Unable to parse child border color"); 87 "Unable to parse child border color '%s'", argv[4]);
88 } 88 }
89 89
90 if (config->active) { 90 if (config->active) {
@@ -114,3 +114,8 @@ struct cmd_results *cmd_client_unfocused(int argc, char **argv) {
114struct cmd_results *cmd_client_urgent(int argc, char **argv) { 114struct cmd_results *cmd_client_urgent(int argc, char **argv) {
115 return handle_command(argc, argv, &config->border_colors.urgent, "client.urgent"); 115 return handle_command(argc, argv, &config->border_colors.urgent, "client.urgent");
116} 116}
117
118struct cmd_results *cmd_client_noop(int argc, char **argv) {
119 wlr_log(WLR_INFO, "Warning: %s is ignored by sway", argv[-1]);
120 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
121}