aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/bind.c
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-20 13:51:12 -0500
committerLibravatar emersion <contact@emersion.fr>2019-01-21 12:59:42 +0100
commit1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch)
tree5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/commands/bind.c
parentLog libinput_config_status errors (diff)
downloadsway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'sway/commands/bind.c')
-rw-r--r--sway/commands/bind.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index b0493f7e..ce087fd0 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -291,7 +291,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
291 for (int i = 0; i < mode_bindings->length; ++i) { 291 for (int i = 0; i < mode_bindings->length; ++i) {
292 struct sway_binding *config_binding = mode_bindings->items[i]; 292 struct sway_binding *config_binding = mode_bindings->items[i];
293 if (binding_key_compare(binding, config_binding)) { 293 if (binding_key_compare(binding, config_binding)) {
294 wlr_log(WLR_INFO, "Overwriting binding '%s' for device '%s' " 294 sway_log(SWAY_INFO, "Overwriting binding '%s' for device '%s' "
295 "from `%s` to `%s`", argv[0], binding->input, 295 "from `%s` to `%s`", argv[0], binding->input,
296 binding->command, config_binding->command); 296 binding->command, config_binding->command);
297 if (warn) { 297 if (warn) {
@@ -310,7 +310,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
310 list_add(mode_bindings, binding); 310 list_add(mode_bindings, binding);
311 } 311 }
312 312
313 wlr_log(WLR_DEBUG, "%s - Bound %s to command `%s` for device '%s'", 313 sway_log(SWAY_DEBUG, "%s - Bound %s to command `%s` for device '%s'",
314 bindtype, argv[0], binding->command, binding->input); 314 bindtype, argv[0], binding->command, binding->input);
315 return cmd_results_new(CMD_SUCCESS, NULL); 315 return cmd_results_new(CMD_SUCCESS, NULL);
316} 316}
@@ -327,14 +327,14 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) {
327 * Execute the command associated to a binding 327 * Execute the command associated to a binding
328 */ 328 */
329void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) { 329void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) {
330 wlr_log(WLR_DEBUG, "running command for binding: %s", binding->command); 330 sway_log(SWAY_DEBUG, "running command for binding: %s", binding->command);
331 331
332 list_t *res_list = execute_command(binding->command, seat, NULL); 332 list_t *res_list = execute_command(binding->command, seat, NULL);
333 bool success = true; 333 bool success = true;
334 for (int i = 0; i < res_list->length; ++i) { 334 for (int i = 0; i < res_list->length; ++i) {
335 struct cmd_results *results = res_list->items[i]; 335 struct cmd_results *results = res_list->items[i];
336 if (results->status != CMD_SUCCESS) { 336 if (results->status != CMD_SUCCESS) {
337 wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)", 337 sway_log(SWAY_DEBUG, "could not run command for binding: %s (%s)",
338 binding->command, results->error); 338 binding->command, results->error);
339 success = false; 339 success = false;
340 } 340 }