From a495d1e8e9a5405e156bca081d3d367cd9cbc15e Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Wed, 26 Feb 2020 10:31:22 -0500 Subject: [PATCH] Style nits --- waybox/main.c | 14 +++++--------- waybox/seat.c | 10 ++++------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/waybox/main.c b/waybox/main.c index 11f17dc..e96695b 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -5,23 +5,19 @@ #include "waybox/server.h" -int main(int argc, char **argv){ +int main(int argc, char **argv) { char *startup_cmd = NULL; if (argc > 0) { int i; - for (i = 0; i < argc; i++) - { + for (i = 0; i < argc; i++) { if (!strcmp("--debug", argv[i]) || !strcmp("-v", argv[i]) || !strcmp("--exit", argv[i])) { printf("Warning: option %s is currently unimplemented\n", argv[i]); - } - else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { + } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { startup_cmd = argv[i + 1]; - } - else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { + } else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { printf(VERSION "\n"); return 0; - } - else if (argv[i][0] == '-') { + } else if (argv[i][0] == '-') { printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]); return strcmp("--help", argv[i]) != 0 && strcmp("-h", argv[i]) != 0; } diff --git a/waybox/seat.c b/waybox/seat.c index 18672e0..170824e 100644 --- a/waybox/seat.c +++ b/waybox/seat.c @@ -12,8 +12,7 @@ static bool handle_keybinding(struct wb_server *server, xkb_keysym_t sym, uint32 if (modifiers & WLR_MODIFIER_CTRL && sym == XKB_KEY_Escape) { wl_display_terminate(server->wl_display); - } - else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_Tab) { + } else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_Tab) { /* Cycle to the next view */ if (wl_list_length(&server->views) < 2) { return false; @@ -26,14 +25,13 @@ static bool handle_keybinding(struct wb_server *server, xkb_keysym_t sym, uint32 /* Move the previous view to the end of the list */ wl_list_remove(¤t_view->link); wl_list_insert(server->views.prev, ¤t_view->link); - } - else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_F2) - { + } else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_F2) { if (fork() == 0) { execl("/bin/sh", "/bin/sh", "-c", "(obrun || bemenu-run || synapse || gmrun || gnome-do || dmenu_run) 2>/dev/null", NULL); } + } else { + return false; } - else return false; return true; }