aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands.c
diff options
context:
space:
mode:
authorLibravatar Dominique Martinet <asmadeus@codewreck.org>2018-01-05 22:32:51 +0100
committerLibravatar Dominique Martinet <asmadeus@codewreck.org>2018-01-05 23:39:46 +0100
commit67985e903188a464e602d04f9ed218bd397f5ab1 (patch)
tree3589175749c9a2ed746b0cc280ab3ccfb33125e9 /sway/commands.c
parentMerge pull request #1554 from martinetd/cmd_set (diff)
downloadsway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.gz
sway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.zst
sway-67985e903188a464e602d04f9ed218bd397f5ab1.zip
sway: change all sway_log to wlr_log
Diffstat (limited to 'sway/commands.c')
-rw-r--r--sway/commands.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/commands.c b/sway/commands.c
index f01329db..1005cf68 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -176,7 +176,7 @@ static struct cmd_handler seat_handlers[] = {
176static struct cmd_handler *find_handler(char *line, enum cmd_status block) { 176static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
177 struct cmd_handler d = { .command=line }; 177 struct cmd_handler d = { .command=line };
178 struct cmd_handler *res = NULL; 178 struct cmd_handler *res = NULL;
179 sway_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_SEAT); 179 wlr_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_SEAT);
180 180
181 if (block == CMD_BLOCK_INPUT) { 181 if (block == CMD_BLOCK_INPUT) {
182 res = bsearch(&d, input_handlers, 182 res = bsearch(&d, input_handlers,
@@ -215,10 +215,10 @@ struct cmd_results *handle_command(char *_exec) {
215 cmd = argsep(&cmdlist, ","); 215 cmd = argsep(&cmdlist, ",");
216 cmd += strspn(cmd, whitespace); 216 cmd += strspn(cmd, whitespace);
217 if (strcmp(cmd, "") == 0) { 217 if (strcmp(cmd, "") == 0) {
218 sway_log(L_INFO, "Ignoring empty command."); 218 wlr_log(L_INFO, "Ignoring empty command.");
219 continue; 219 continue;
220 } 220 }
221 sway_log(L_INFO, "Handling command '%s'", cmd); 221 wlr_log(L_INFO, "Handling command '%s'", cmd);
222 //TODO better handling of argv 222 //TODO better handling of argv
223 int argc; 223 int argc;
224 char **argv = split_args(cmd, &argc); 224 char **argv = split_args(cmd, &argc);
@@ -276,7 +276,7 @@ struct cmd_results *config_command(char *exec, enum cmd_status block) {
276 goto cleanup; 276 goto cleanup;
277 } 277 }
278 278
279 sway_log(L_INFO, "handling config command '%s'", exec); 279 wlr_log(L_INFO, "handling config command '%s'", exec);
280 // Endblock 280 // Endblock
281 if (**argv == '}') { 281 if (**argv == '}') {
282 results = cmd_results_new(CMD_BLOCK_END, NULL, NULL); 282 results = cmd_results_new(CMD_BLOCK_END, NULL, NULL);
@@ -380,7 +380,7 @@ struct cmd_results *config_commands_command(char *exec) {
380 } 380 }
381 policy->context = context; 381 policy->context = context;
382 382
383 sway_log(L_INFO, "Set command policy for %s to %d", 383 wlr_log(L_INFO, "Set command policy for %s to %d",
384 policy->command, policy->context); 384 policy->command, policy->context);
385 385
386 results = cmd_results_new(CMD_SUCCESS, NULL, NULL); 386 results = cmd_results_new(CMD_SUCCESS, NULL, NULL);
@@ -394,7 +394,7 @@ struct cmd_results *cmd_results_new(enum cmd_status status,
394 const char *input, const char *format, ...) { 394 const char *input, const char *format, ...) {
395 struct cmd_results *results = malloc(sizeof(struct cmd_results)); 395 struct cmd_results *results = malloc(sizeof(struct cmd_results));
396 if (!results) { 396 if (!results) {
397 sway_log(L_ERROR, "Unable to allocate command results"); 397 wlr_log(L_ERROR, "Unable to allocate command results");
398 return NULL; 398 return NULL;
399 } 399 }
400 results->status = status; 400 results->status = status;