CodeStyle: prevent space in code indents

diff --git a/include/labwc.h b/include/labwc.h
index 6a68514eb0007e030b0c398a37fc2d5060d6b02e..6212a09f734b978ed519c302c53573dd466d7dbe 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -401,8 +401,7 @@ void seat_set_pressed(struct seat *seat, struct view *view,
        struct wlr_surface *toplevel, uint32_t resize_edges);
 void seat_reset_pressed(struct seat *seat);
 
-void interactive_begin(struct view *view, enum input_mode mode,
-                     uint32_t edges);
+void interactive_begin(struct view *view, enum input_mode mode, uint32_t edges);
 void interactive_finish(struct view *view);
 void interactive_cancel(struct view *view);
 

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5925f2a81ae9cbe5868d2bb76eb1197d9de0fe16..45a7b0b04862110819c54eadddfe746ef3642272 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3738,6 +3738,14 @@ sub process {
 # check we are in a valid source file C or perl if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/);
 
+# at the beginning of a line in a .c file there should be no
+# spaces unless it is a single space in front of a multiline comment
+               if ($realfile =~ /\.c$/ && $rawline =~ /^\+\t* [^*]/) {
+                       my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+                       WARN("CODE_INDENT",
+                                 "code indent should never contain spaces\n" . $herevet);
+               }
+
 # at the beginning of a line any tabs must come first and anything
 # more than $tabsize must use tabs.
                if ($rawline =~ /^\+\s* \t\s*\S/ ||

diff --git a/src/common/dir.c b/src/common/dir.c
index c3864cb706e3045b53edf975fa61feeb236cec78..8e24153078fb58b2285057f0ae70bfee6f6be467 100644 (file)
--- a/src/common/dir.c
+++ b/src/common/dir.c
@@ -66,10 +66,10 @@ build_theme_path(struct ctx *ctx, char *prefix, const char *path)
 {
        if (!prefix) {
                snprintf(ctx->buf, ctx->len, "%s/%s/openbox-3", path,
-                        ctx->theme_name);
+                       ctx->theme_name);
        } else {
                snprintf(ctx->buf, ctx->len, "%s/%s/%s/openbox-3", prefix, path,
-                        ctx->theme_name);
+                       ctx->theme_name);
        }
 }
 
@@ -122,10 +122,12 @@ config_dir(void)
        if (buf[0] != '\0') {
                return buf;
        }
-       struct ctx ctx = { .build_path_fn = build_config_path,
-                          .buf = buf,
-                          .len = sizeof(buf),
-                          .dirs = config_dirs };
+       struct ctx ctx = {
+               .build_path_fn = build_config_path,
+               .buf = buf,
+               .len = sizeof(buf),
+               .dirs = config_dirs
+       };
        return find_dir(&ctx);
 }
 
@@ -133,10 +135,12 @@ char *
 theme_dir(const char *theme_name)
 {
        static char buf[4096] = { 0 };
-       struct ctx ctx = { .build_path_fn = build_theme_path,
-                          .buf = buf,
-                          .len = sizeof(buf),
-                          .dirs = theme_dirs,
-                          .theme_name = theme_name };
+       struct ctx ctx = {
+               .build_path_fn = build_theme_path,
+               .buf = buf,
+               .len = sizeof(buf),
+               .dirs = theme_dirs,
+               .theme_name = theme_name
+       };
        return find_dir(&ctx);
 }

diff --git a/src/cursor.c b/src/cursor.c
index cac5dd8e645b94bcb9f252c1fc9303a30619610d..299c76b74e151e3708975a01df47a18ee2691dc0 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -1105,7 +1105,7 @@ cursor_init(struct seat *seat)
        wl_signal_add(&seat->cursor->events.motion, &seat->cursor_motion);
        seat->cursor_motion_absolute.notify = cursor_motion_absolute;
        wl_signal_add(&seat->cursor->events.motion_absolute,
-                     &seat->cursor_motion_absolute);
+               &seat->cursor_motion_absolute);
        seat->cursor_button.notify = cursor_button;
        wl_signal_add(&seat->cursor->events.button, &seat->cursor_button);
        seat->cursor_axis.notify = cursor_axis;

diff --git a/src/keyboard.c b/src/keyboard.c
index 39414cd802f7d0a9a878011921f1a27f61a48d4f..1749aaf3ef8836280ea341e1c4df584810ef465f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -27,9 +27,8 @@ keyboard_any_modifiers_pressed(struct wlr_keyboard *keyboard)
 {
        xkb_mod_index_t i;
        for (i = 0; i < xkb_keymap_num_mods(keyboard->keymap); i++) {
-               if (xkb_state_mod_index_is_active
-                               (keyboard->xkb_state, i,
-                                XKB_STATE_MODS_DEPRESSED)) {
+               if (xkb_state_mod_index_is_active(keyboard->xkb_state,
+                               i, XKB_STATE_MODS_DEPRESSED)) {
                        return true;
                }
        }
@@ -99,14 +98,14 @@ handle_keybinding(struct server *server, uint32_t modifiers, xkb_keysym_t sym)
 
 static bool is_modifier_key(xkb_keysym_t sym)
 {
-       return sym == XKB_KEY_Shift_L ||
-                  sym == XKB_KEY_Shift_R ||
-                  sym == XKB_KEY_Alt_L ||
-                  sym == XKB_KEY_Alt_R ||
-                  sym == XKB_KEY_Control_L ||
-                  sym == XKB_KEY_Control_R ||
-                  sym == XKB_KEY_Super_L ||
-                  sym == XKB_KEY_Super_R;
+       return sym == XKB_KEY_Shift_L
+               || sym == XKB_KEY_Shift_R
+               || sym == XKB_KEY_Alt_L
+               || sym == XKB_KEY_Alt_R
+               || sym == XKB_KEY_Control_L
+               || sym == XKB_KEY_Control_R
+               || sym == XKB_KEY_Super_L
+               || sym == XKB_KEY_Super_R;
 }
 
 static bool

diff --git a/src/server.c b/src/server.c
index f0b330d999804d1b0be32fb8d7b920d90f9bbf44..7fbc38056c7c6e30fbea61e47ca7be89bdbf3175 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -76,15 +76,14 @@ seat_inhibit_input(struct seat *seat,  struct wl_client *active_client)
 {
        seat->active_client_while_inhibited = active_client;
 
-       if (seat->focused_layer &&
-           (wl_resource_get_client(seat->focused_layer->resource) !=
-           active_client)) {
+       if (seat->focused_layer && active_client !=
+                       wl_resource_get_client(seat->focused_layer->resource)) {
                seat_set_focus_layer(seat, NULL);
        }
        struct wlr_surface *previous_kb_surface =
                seat->seat->keyboard_state.focused_surface;
-       if (previous_kb_surface &&
-           wl_resource_get_client(previous_kb_surface->resource) != active_client) {
+       if (previous_kb_surface && active_client !=
+                       wl_resource_get_client(previous_kb_surface->resource)) {
                seat_focus_surface(seat, NULL);   /* keyboard focus */
        }
 
@@ -307,7 +306,7 @@ server_init(struct server *server)
        }
        server->new_xdg_surface.notify = xdg_surface_new;
        wl_signal_add(&server->xdg_shell->events.new_surface,
-                     &server->new_xdg_surface);
+               &server->new_xdg_surface);
 
        /* Disable CSD */
        struct wlr_xdg_decoration_manager_v1 *xdg_deco_mgr = NULL;
@@ -317,7 +316,7 @@ server_init(struct server *server)
                exit(EXIT_FAILURE);
        }
        wl_signal_add(&xdg_deco_mgr->events.new_toplevel_decoration,
-                     &server->xdg_toplevel_decoration);
+               &server->xdg_toplevel_decoration);
        server->xdg_toplevel_decoration.notify = xdg_toplevel_decoration;
 
        struct wlr_server_decoration_manager *deco_mgr = NULL;
@@ -327,9 +326,9 @@ server_init(struct server *server)
                exit(EXIT_FAILURE);
        }
        wlr_server_decoration_manager_set_default_mode(
-               deco_mgr, rc.xdg_shell_server_side_deco ?
-                                 WLR_SERVER_DECORATION_MANAGER_MODE_SERVER :
-                                 WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
+               deco_mgr, rc.xdg_shell_server_side_deco
+               ? WLR_SERVER_DECORATION_MANAGER_MODE_SERVER
+               : WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
 
        struct wlr_presentation *presentation =
                wlr_presentation_create(server->wl_display, server->backend);

diff --git a/src/theme.c b/src/theme.c
index 494ae7c9a1b248765ef1a65b2deadf0b005ff505..0ff174ee3584b962d1772b6c8f59d2d7f949ea78 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -351,7 +351,7 @@ theme_read(struct theme *theme, const char *theme_name)
 
        if (strlen(theme_dir(theme_name))) {
                snprintf(themerc, sizeof(themerc), "%s/themerc",
-                        theme_dir(theme_name));
+                       theme_dir(theme_name));
                stream = fopen(themerc, "r");
        }
        if (!stream) {

diff --git a/src/xbm/parse.c b/src/xbm/parse.c
index bb45705826db87543d5fc2600573b874edab391e..0af100ce7377a6b337b2fc699a4ba6aae05cf54a 100644 (file)
--- a/src/xbm/parse.c
+++ b/src/xbm/parse.c
@@ -26,7 +26,7 @@ u32(float *rgba)
                r[i] = rgba[i] * 255;
        }
        return ((r[3] & 0xff) << 24) | ((r[0] & 0xff) << 16) |
-              ((r[1] & 0xff) << 8) | (r[2] & 0xff);
+               ((r[1] & 0xff) << 8) | (r[2] & 0xff);
 }
 
 void

diff --git a/src/xbm/xbm.c b/src/xbm/xbm.c
index a251ed446c87bab78e3190d43529bc628f700749..3e9e1aec3c4bc554d51252bfa03d2e423a0138fd 100644 (file)
--- a/src/xbm/xbm.c
+++ b/src/xbm/xbm.c
@@ -28,8 +28,8 @@ static char *
 xbm_path(const char *button)
 {
        static char buffer[4096] = { 0 };
-       snprintf(buffer, sizeof(buffer), "%s/%s", theme_dir(rc.theme_name),
-                button);
+       snprintf(buffer, sizeof(buffer), "%s/%s",
+               theme_dir(rc.theme_name), button);
        return buffer;
 }
 
@@ -65,28 +65,28 @@ void
 xbm_load(struct theme *theme)
 {
        parse_set_color(theme->window_active_button_menu_unpressed_image_color);
-       load_button("menu.xbm", &theme->xbm_menu_active_unpressed,
-                   menu_button_normal);
+       load_button("menu.xbm",
+               &theme->xbm_menu_active_unpressed, menu_button_normal);
        parse_set_color(theme->window_active_button_iconify_unpressed_image_color);
-       load_button("iconify.xbm", &theme->xbm_iconify_active_unpressed,
-                   iconify_button_normal);
+       load_button("iconify.xbm",
+               &theme->xbm_iconify_active_unpressed, iconify_button_normal);
        parse_set_color(theme->window_active_button_max_unpressed_image_color);
-       load_button("max.xbm", &theme->xbm_maximize_active_unpressed,
-                   max_button_normal);
+       load_button("max.xbm",
+               &theme->xbm_maximize_active_unpressed, max_button_normal);
        parse_set_color(theme->window_active_button_close_unpressed_image_color);
-       load_button("close.xbm", &theme->xbm_close_active_unpressed,
-                   close_button_normal);
+       load_button("close.xbm",
+               &theme->xbm_close_active_unpressed, close_button_normal);
 
        parse_set_color(theme->window_inactive_button_menu_unpressed_image_color);
-       load_button("menu.xbm", &theme->xbm_menu_inactive_unpressed,
-                   menu_button_normal);
+       load_button("menu.xbm",
+               &theme->xbm_menu_inactive_unpressed, menu_button_normal);
        parse_set_color(theme->window_inactive_button_iconify_unpressed_image_color);
-       load_button("iconify.xbm", &theme->xbm_iconify_inactive_unpressed,
-                   iconify_button_normal);
+       load_button("iconify.xbm",
+               &theme->xbm_iconify_inactive_unpressed, iconify_button_normal);
        parse_set_color(theme->window_inactive_button_max_unpressed_image_color);
-       load_button("max.xbm", &theme->xbm_maximize_inactive_unpressed,
-                   max_button_normal);
+       load_button("max.xbm",
+               &theme->xbm_maximize_inactive_unpressed, max_button_normal);
        parse_set_color(theme->window_inactive_button_close_unpressed_image_color);
-       load_button("close.xbm", &theme->xbm_close_inactive_unpressed,
-                   close_button_normal);
+       load_button("close.xbm",
+               &theme->xbm_close_inactive_unpressed, close_button_normal);
 }

diff --git a/src/xdg-deco.c b/src/xdg-deco.c
index 0b96583eba0080f388fce43a9a588a7597ecb55d..c8e818c0c7b88e899a6bcba7492ab89aedc100d6 100644 (file)
--- a/src/xdg-deco.c
+++ b/src/xdg-deco.c
@@ -53,7 +53,7 @@ xdg_toplevel_decoration(struct wl_listener *listener, void *data)
        wl_signal_add(&wlr_decoration->events.destroy, &xdg_deco->destroy);
        xdg_deco->request_mode.notify = xdg_deco_request_mode;
        wl_signal_add(&wlr_decoration->events.request_mode,
-                     &xdg_deco->request_mode);
+               &xdg_deco->request_mode);
 
        xdg_deco_request_mode(&xdg_deco->request_mode, wlr_decoration);
 }

diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 1eb226199edd394d6110fb8b7c2d26b6dc0e11b5..57870b099b73c0edfabcf2bf66f3bacd279ef9b9 100644 (file)
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -151,7 +151,7 @@ xwayland_unmanaged_create(struct server *server,
        unmanaged->xwayland_surface = xsurface;
 
        wl_signal_add(&xsurface->events.request_configure,
-                     &unmanaged->request_configure);
+               &unmanaged->request_configure);
        unmanaged->request_configure.notify =
                unmanaged_handle_request_configure;
 

diff --git a/src/xwayland.c b/src/xwayland.c
index cc61ea6a97196546aa9759860810e022a9662d00..bc0f237908fb2d048cee09387823a47492591a78 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -379,7 +379,7 @@ static bool
 want_deco(struct wlr_xwayland_surface *xwayland_surface)
 {
        return xwayland_surface->decorations ==
-              WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
+               WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
 }
 
 static void
@@ -418,9 +418,9 @@ set_initial_position(struct view *view,
 {
        /* Don't center views with position explicitly specified */
        bool has_position = xwayland_surface->size_hints &&
-               (xwayland_surface->size_hints->flags &
-                       (XCB_ICCCM_SIZE_HINT_US_POSITION |
-                        XCB_ICCCM_SIZE_HINT_P_POSITION));
+               (xwayland_surface->size_hints->flags & (
+                       XCB_ICCCM_SIZE_HINT_US_POSITION |
+                       XCB_ICCCM_SIZE_HINT_P_POSITION));
 
        if (has_position) {
                /* Just make sure the view is on-screen */
@@ -679,7 +679,7 @@ xwayland_server_init(struct server *server, struct wlr_compositor *compositor)
        }
        server->xwayland_new_surface.notify = handle_new_surface;
        wl_signal_add(&server->xwayland->events.new_surface,
-                     &server->xwayland_new_surface);
+               &server->xwayland_new_surface);
 
        server->xwayland_ready.notify = handle_ready;
        wl_signal_add(&server->xwayland->events.ready,
@@ -693,14 +693,14 @@ xwayland_server_init(struct server *server, struct wlr_compositor *compositor)
        }
 
        struct wlr_xcursor *xcursor;
-       xcursor = wlr_xcursor_manager_get_xcursor(server->seat.xcursor_manager,
-                                                 XCURSOR_DEFAULT, 1);
+       xcursor = wlr_xcursor_manager_get_xcursor(
+               server->seat.xcursor_manager, XCURSOR_DEFAULT, 1);
        if (xcursor) {
                struct wlr_xcursor_image *image = xcursor->images[0];
                wlr_xwayland_set_cursor(server->xwayland, image->buffer,
-                                       image->width * 4, image->width,
-                                       image->height, image->hotspot_x,
-                                       image->hotspot_y);
+                       image->width * 4, image->width,
+                       image->height, image->hotspot_x,
+                       image->hotspot_y);
        }
 }