aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/client.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-10-07 14:44:37 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-10-07 14:44:37 -0400
commit92e1fc00fdb78abaf050606797ffbb86a3f4328b (patch)
tree29bd04516a0c032026d00c83ea2d9d4bb5952f74 /sway/commands/client.c
parentswaynag: s/Toggle Details/Toggle details/ (diff)
downloadsway-92e1fc00fdb78abaf050606797ffbb86a3f4328b.tar.gz
sway-92e1fc00fdb78abaf050606797ffbb86a3f4328b.tar.zst
sway-92e1fc00fdb78abaf050606797ffbb86a3f4328b.zip
Shim client.background and client.placeholder
These are not supported by sway, but are valid i3 commands and should not cause config errors. Also includes a couple of minor touch-ups.
Diffstat (limited to 'sway/commands/client.c')
-rw-r--r--sway/commands/client.c15
1 files changed, 10 insertions, 5 deletions
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}