From 612a9317b0720ee8c67556bb6b489234d6076643 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 31 May 2022 18:29:36 +0200 Subject: [PATCH 1/2] GitHub Actions: declare /usr/src/i3 as safe directory (#4992) --- travis/travis-base-386.Dockerfile | 5 +++++ travis/travis-base-ubuntu-386.Dockerfile | 5 +++++ travis/travis-base-ubuntu.Dockerfile | 5 +++++ travis/travis-base.Dockerfile | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/travis/travis-base-386.Dockerfile b/travis/travis-base-386.Dockerfile index fab1a48f7..8996e029f 100644 --- a/travis/travis-base-386.Dockerfile +++ b/travis/travis-base-386.Dockerfile @@ -26,3 +26,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN linux32 apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile index a66d58a2c..4a41fe3e7 100644 --- a/travis/travis-base-ubuntu-386.Dockerfile +++ b/travis/travis-base-ubuntu-386.Dockerfile @@ -26,3 +26,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN linux32 apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile index 9ee9d3554..8523b92ca 100644 --- a/travis/travis-base-ubuntu.Dockerfile +++ b/travis/travis-base-ubuntu.Dockerfile @@ -27,3 +27,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile index da5531ffa..52ae0656a 100644 --- a/travis/travis-base.Dockerfile +++ b/travis/travis-base.Dockerfile @@ -27,3 +27,8 @@ COPY debian/changelog /usr/src/i3-debian-packaging/changelog RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 From 6ab64aa5b72f22ceee48551a453becbb2a5308e1 Mon Sep 17 00:00:00 2001 From: George Rodrigues Date: Wed, 1 Jun 2022 04:49:05 -0300 Subject: [PATCH 2/2] Fix typos (#4989) --- debian/changelog | 2 +- docs/userguide | 2 +- i3-input/keysym.map | 2 +- i3bar/include/common.h | 2 +- i3bar/src/xcb.c | 2 +- include/commands_parser.h | 2 +- include/config_parser.h | 2 +- include/workspace.h | 2 +- libi3/font.c | 2 +- src/click.c | 2 +- src/commands_parser.c | 2 +- src/config_parser.c | 2 +- src/floating.c | 2 +- src/handlers.c | 6 +++--- src/manage.c | 2 +- src/workspace.c | 2 +- testcases/inject_randr1.5.c | 2 +- testcases/t/117-workspace.t | 2 +- testcases/t/171-config-migrate.t | 2 +- testcases/t/210-mark-unmark.t | 2 +- testcases/t/219-ipc-window-focus.t | 2 +- testcases/t/247-config-line-continuation.t | 2 +- testcases/t/294-focus-order.t | 2 +- testcases/t/301-shape.t | 4 ++-- testcases/t/304-ipc-workspace-init.t | 2 +- testcases/t/531-fullscreen-on-given-output.t | 2 +- testcases/t/543-move-workspace-to-multiple-outputs.t | 2 +- testcases/t/544-focus-multiple-outputs.t | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index ebe90dc9e..19d0ae534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -627,7 +627,7 @@ i3-wm (3.d-bf1-1) unstable; urgency=low * Bugfix: Resize client after updating base_width/base_height * Bugfix: Force render containers after setting the client active * Bugfix: Fix two problems in resizing floating windows with right mouse - * Bugfix: Use more precise floating point arithmetics + * Bugfix: Use more precise floating point arithmetic * Bugfix: Correctly place new windows below fullscreen windows -- Michael Stapelberg Mon, 21 Dec 2009 22:33:02 +0100 diff --git a/docs/userguide b/docs/userguide index 8026d87e7..fe619df9b 100644 --- a/docs/userguide +++ b/docs/userguide @@ -538,7 +538,7 @@ for the keybinding. # The middle button over a titlebar kills the window bindsym --release button2 kill -# The middle button and a modifer over any part of the window kills the window +# The middle button and a modifier over any part of the window kills the window bindsym --whole-window $mod+button2 kill # The right button toggles floating diff --git a/i3-input/keysym.map b/i3-input/keysym.map index b198dd6db..aaecdfc36 100644 --- a/i3-input/keysym.map +++ b/i3-input/keysym.map @@ -1,6 +1,6 @@ # This list can be used to convert X11 Keysyms to Unicode 2.1 character. # The list is not checked for correctness by Unicode officials. Use it -# at your own risk and the creator is not responsable for any damage that +# at your own risk and the creator is not responsible for any damage that # occurred due to using this list. # # The list is created by looking at the Keysym names and the Unicode data diff --git a/i3bar/include/common.h b/i3bar/include/common.h index 52f77b0e6..e0f2e7e43 100644 --- a/i3bar/include/common.h +++ b/i3bar/include/common.h @@ -66,7 +66,7 @@ struct status_block { uint32_t border_left; bool pango_markup; - /* The amount of pixels necessary to render a separater after the block. */ + /* The amount of pixels necessary to render a separator after the block. */ uint32_t sep_block_width; /* Continuously-updated information on how to render this status block. */ diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 671588fe5..1cfd457be 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -203,7 +203,7 @@ static uint32_t predict_statusline_length(bool use_short_text) { if (block->border) render->width += logical_px(block->border_left + block->border_right); - /* Compute offset and append for text aligment in min_width. */ + /* Compute offset and append for text alignment in min_width. */ if (block->min_width <= render->width) { render->x_offset = 0; render->x_append = 0; diff --git a/include/commands_parser.h b/include/commands_parser.h index 31333af71..7e1c52034 100644 --- a/include/commands_parser.h +++ b/include/commands_parser.h @@ -14,7 +14,7 @@ #include /** - * Holds an intermediate represenation of the result of a call to any command. + * Holds an intermediate representation of the result of a call to any command. * When calling parse_command("floating enable, border none"), the parser will * internally use this struct when calling cmd_floating and cmd_border. */ diff --git a/include/config_parser.h b/include/config_parser.h index 7b28c1703..82c570909 100644 --- a/include/config_parser.h +++ b/include/config_parser.h @@ -61,7 +61,7 @@ struct parser_ctx { }; /** - * An intermediate reprsentation of the result of a parse_config call. + * An intermediate representation of the result of a parse_config call. * Currently unused, but the JSON output will be useful in the future when we * implement a config parsing IPC command. * diff --git a/include/workspace.h b/include/workspace.h index 2193ed0ba..fe6d9f88e 100644 --- a/include/workspace.h +++ b/include/workspace.h @@ -92,7 +92,7 @@ Con *create_workspace_on_output(Output *output, Con *content); /** * Returns true if the workspace is currently visible. Especially important for - * multi-monitor environments, as they can have multiple currenlty active + * multi-monitor environments, as they can have multiple currently active * workspaces. * */ diff --git a/libi3/font.c b/libi3/font.c index 514328f62..5a11b5363 100644 --- a/libi3/font.c +++ b/libi3/font.c @@ -160,7 +160,7 @@ i3Font load_font(const char *pattern, const bool fallback) { font.type = FONT_TYPE_NONE; font.pattern = NULL; - /* No XCB connction, return early because we're just validating the + /* No XCB connection, return early because we're just validating the * configuration file. */ if (conn == NULL) { return font; diff --git a/src/click.c b/src/click.c index 7f8dd2783..df1c321cd 100644 --- a/src/click.c +++ b/src/click.c @@ -80,7 +80,7 @@ static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press */ static bool floating_mod_on_tiled_client(Con *con, xcb_button_press_event_t *event) { /* The client is in tiling layout. We can still initiate a resize with the - * right mouse button, by chosing the border which is the most near one to + * right mouse button, by choosing the border which is the most near one to * the position of the mouse pointer */ int to_right = con->rect.width - event->event_x, to_left = event->event_x, diff --git a/src/commands_parser.c b/src/commands_parser.c index fd02293dc..7cdf6c68a 100644 --- a/src/commands_parser.c +++ b/src/commands_parser.c @@ -390,7 +390,7 @@ CommandResult *parse_command(const char *input, yajl_gen gen, ipc_client *client free(possible_tokens); /* Contains the same amount of characters as 'input' has, but with - * the unparseable part highlighted using ^ characters. */ + * the unparsable part highlighted using ^ characters. */ char *position = smalloc(len + 1); for (const char *copywalk = input; *copywalk != '\0'; copywalk++) position[(copywalk - input)] = (copywalk >= walk ? '^' : ' '); diff --git a/src/config_parser.c b/src/config_parser.c index a900db00a..3b7e08ef3 100644 --- a/src/config_parser.c +++ b/src/config_parser.c @@ -438,7 +438,7 @@ static void parse_config(struct parser_ctx *ctx, const char *input, struct conte const char *error_line = start_of_line(walk, input); /* Contains the same amount of characters as 'input' has, but with - * the unparseable part highlighted using ^ characters. */ + * the unparsable part highlighted using ^ characters. */ char *position = scalloc(strlen(error_line) + 1, 1); const char *copywalk; for (copywalk = error_line; diff --git a/src/floating.c b/src/floating.c index f087832d2..7888d5793 100644 --- a/src/floating.c +++ b/src/floating.c @@ -253,7 +253,7 @@ bool floating_enable(Con *con, bool automatic) { } /* Consider the part of the focus stack of our current workspace: * [ ... S_{i-1} S_{i} S_{i+1} ... ] - * Where S_{x} is a container tree and the container 'con' that is beeing switched to + * Where S_{x} is a container tree and the container 'con' that is being switched to * floating belongs in S_{i}. The new floating container, 'nc', will have the * workspace as its parent so it needs to be placed in this stack. If C was focused * we just need to call con_focus(). Otherwise, nc must be placed before or after S_{i}. diff --git a/src/handlers.c b/src/handlers.c index d77d180ef..de7c09df3 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -268,7 +268,7 @@ static void handle_map_request(xcb_map_request_event_t *event) { * Configure requests are received when the application wants to resize windows * on their own. * - * We generate a synthethic configure notify event to signalize the client its + * We generate a synthetic configure notify event to signalize the client its * "new" position. * */ @@ -799,7 +799,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { } else if (event->type == A_WM_CHANGE_STATE) { /* http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4 */ if (event->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC) { - /* For compatiblity reasons, Wine will request iconic state and cannot ensure that the WM has agreed on it; + /* For compatibility reasons, Wine will request iconic state and cannot ensure that the WM has agreed on it; * immediately revert to normal to avoid being stuck in a paused state. */ DLOG("Client has requested iconic state, rejecting. (window = %08x)\n", event->window); long data[] = {XCB_ICCCM_WM_STATE_NORMAL, XCB_NONE}; @@ -1182,7 +1182,7 @@ static bool handle_machine_change(Con *con, xcb_get_property_reply_t *prop) { } /* - * Handles the _MOTIF_WM_HINTS property of specifing window deocration settings. + * Handles the _MOTIF_WM_HINTS property of specifying window deocration settings. * */ static bool handle_motif_hints_change(Con *con, xcb_get_property_reply_t *prop) { diff --git a/src/manage.c b/src/manage.c index 5f9aeb53c..2fe6d4ee1 100644 --- a/src/manage.c +++ b/src/manage.c @@ -123,7 +123,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki geomc = xcb_get_geometry(conn, d); - /* Check if the window is mapped (it could be not mapped when intializing and + /* Check if the window is mapped (it could be not mapped when initializing and calling manage_window() for every window) */ if ((attr = xcb_get_window_attributes_reply(conn, cookie, 0)) == NULL) { DLOG("Could not get attributes\n"); diff --git a/src/workspace.c b/src/workspace.c index 739358a8a..7a9d01e55 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -299,7 +299,7 @@ Con *create_workspace_on_output(Output *output, Con *content) { /* * Returns true if the workspace is currently visible. Especially important for - * multi-monitor environments, as they can have multiple currenlty active + * multi-monitor environments, as they can have multiple currently active * workspaces. * */ diff --git a/testcases/inject_randr1.5.c b/testcases/inject_randr1.5.c index 9c0b73d41..75cbf8355 100644 --- a/testcases/inject_randr1.5.c +++ b/testcases/inject_randr1.5.c @@ -433,7 +433,7 @@ int main(int argc, char *argv[]) { bound = true; /* Let the user know bind() was successful, so that they know the * error messages can be disregarded. */ - fprintf(stderr, "Successfuly bound to %s\n", addr.sun_path); + fprintf(stderr, "Successfully bound to %s\n", addr.sun_path); sun_path = sstrdup(addr.sun_path); break; } diff --git a/testcases/t/117-workspace.t b/testcases/t/117-workspace.t index 48a0dbf66..6345ae680 100644 --- a/testcases/t/117-workspace.t +++ b/testcases/t/117-workspace.t @@ -14,7 +14,7 @@ # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf # (unless you are already familiar with Perl) # -# Tests whether we can switch to a non-existant workspace +# Tests whether we can switch to a non-existent workspace # (necessary for further tests) # use List::Util qw(first); diff --git a/testcases/t/171-config-migrate.t b/testcases/t/171-config-migrate.t index 136333278..99158eab5 100644 --- a/testcases/t/171-config-migrate.t +++ b/testcases/t/171-config-migrate.t @@ -267,7 +267,7 @@ like($output->[2], qr|^bindsym Mod1\+f resize shrink right 20 px$|, 'resize righ like($output->[3], qr|^bindsym Mod1\+f resize grow down 23 px$|, 'resize bottom changed'); ##################################################################### -# also resizing, but with indention this time +# also resizing, but with indentation this time ##################################################################### like($output->[4], qr|^bindsym Mod1\+f resize grow left 10 px$|, 'resize left changed'); diff --git a/testcases/t/210-mark-unmark.t b/testcases/t/210-mark-unmark.t index 0d9a073b6..166ca23f6 100644 --- a/testcases/t/210-mark-unmark.t +++ b/testcases/t/210-mark-unmark.t @@ -71,7 +71,7 @@ cmd 'focus left'; cmd 'mark left'; # -# get_marks replys an array of marks, whose order is undefined, +# get_marks replies an array of marks, whose order is undefined, # so we use sort to be able to compare the output # diff --git a/testcases/t/219-ipc-window-focus.t b/testcases/t/219-ipc-window-focus.t index 15e170999..770536f32 100644 --- a/testcases/t/219-ipc-window-focus.t +++ b/testcases/t/219-ipc-window-focus.t @@ -18,7 +18,7 @@ use i3test i3_config => <4096 characters). +# Use line continuation with too many lines (>4096 characters). # This config is invalid. Use it to ensure no buffer overflow. bindsym Mod1+b \ 0001-This is a very very very very very very very very very very very very very very very very very long cmd \ diff --git a/testcases/t/294-focus-order.t b/testcases/t/294-focus-order.t index ce790019e..dfadd0af0 100644 --- a/testcases/t/294-focus-order.t +++ b/testcases/t/294-focus-order.t @@ -14,7 +14,7 @@ # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf # (unless you are already familiar with Perl) # -# Verify that the corrent focus stack order is preserved after various +# Verify that the current focus stack order is preserved after various # operations. use i3test i3_config => < <rect, $orig_rect1, "first window spans the first output"); -is_deeply(scalar $win_on_second_output->rect, $orig_rect2, "second window spans the sencond output"); +is_deeply(scalar $win_on_second_output->rect, $orig_rect2, "second window spans the second output"); # Check that both windows remained fullscreen my $tree = i3(get_socket_path())->get_tree->recv; diff --git a/testcases/t/543-move-workspace-to-multiple-outputs.t b/testcases/t/543-move-workspace-to-multiple-outputs.t index c2826ee5c..7b0f8c2b3 100644 --- a/testcases/t/543-move-workspace-to-multiple-outputs.t +++ b/testcases/t/543-move-workspace-to-multiple-outputs.t @@ -66,7 +66,7 @@ for (my $i = 1; $i < 9; $i++) { } ############################################################################### -# Same as above but explicitely type all the outputs +# Same as above but explicitly type all the outputs ############################################################################### is_ws(1, 0, 'sanity check'); diff --git a/testcases/t/544-focus-multiple-outputs.t b/testcases/t/544-focus-multiple-outputs.t index eda1f832c..504b8d11a 100644 --- a/testcases/t/544-focus-multiple-outputs.t +++ b/testcases/t/544-focus-multiple-outputs.t @@ -37,7 +37,7 @@ for (my $i = 1; $i < 9; $i++) { } ############################################################################### -# Same as above but explicitely type all the outputs +# Same as above but explicitly type all the outputs ############################################################################### is(focused_output, "fake-0", 'sanity check');