From 66d9c983e44888dbf58435f8793ff0dcd9bc9054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20Engestr=C3=B6m?= Date: Mon, 4 Apr 2016 08:33:59 +0100 Subject: [PATCH] Fix spelling mistakes --- docs/hacking-howto | 2 +- i3-input/keysym.map | 2 +- i3-input/main.c | 2 +- i3bar/src/mode.c | 2 +- i3bar/src/outputs.c | 2 +- i3bar/src/workspaces.c | 2 +- i3bar/src/xcb.c | 2 +- include/shmlog.h | 2 +- src/commands.c | 2 +- src/randr.c | 2 +- src/render.c | 2 +- src/sighandler.c | 4 ++-- src/tree.c | 2 +- testcases/complete-run.pl | 4 ++-- testcases/lib/StatusLine.pm | 4 ++-- testcases/t/103-move.t | 2 +- testcases/t/105-stacking.t | 2 +- testcases/t/131-stacking-order.t | 2 +- testcases/t/159-socketpaths.t | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/hacking-howto b/docs/hacking-howto index bd99b900b..74a690e7c 100644 --- a/docs/hacking-howto +++ b/docs/hacking-howto @@ -187,7 +187,7 @@ cleanup ("flatten") the tree. See also +src/move.c+ for another similar function, which was moved into its own file because it is so long. src/util.c:: -Contains useful functions which are not really dependant on anything. +Contains useful functions which are not really dependent on anything. src/window.c:: Handlers to update X11 window properties like +WM_CLASS+, +_NET_WM_NAME+, diff --git a/i3-input/keysym.map b/i3-input/keysym.map index 6e587bdc0..b198dd6db 100644 --- a/i3-input/keysym.map +++ b/i3-input/keysym.map @@ -1,7 +1,7 @@ # 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 -# occured due to using this list. +# occurred due to using this list. # # The list is created by looking at the Keysym names and the Unicode data # file. Other mapping tables were used as a reference where needed. diff --git a/i3-input/main.c b/i3-input/main.c index 64a089dd8..7115727e0 100644 --- a/i3-input/main.c +++ b/i3-input/main.c @@ -80,7 +80,7 @@ void debuglog(char *fmt, ...) { } /* - * Restores the X11 input focus to whereever it was before. + * Restores the X11 input focus to wherever it was before. * This is necessary because i3-input’s window has override_redirect=1 * (→ unmanaged by the window manager) and thus i3-input changes focus itself. * This function is called on exit(). diff --git a/i3bar/src/mode.c b/i3bar/src/mode.c index d6767786c..3e52f0b19 100644 --- a/i3bar/src/mode.c +++ b/i3bar/src/mode.c @@ -119,7 +119,7 @@ void parse_mode_json(char *json) { state = yajl_parse(handle, (const unsigned char *)json, strlen(json)); - /* FIXME: Propper error handling for JSON parsing */ + /* FIXME: Proper error handling for JSON parsing */ switch (state) { case yajl_status_ok: break; diff --git a/i3bar/src/outputs.c b/i3bar/src/outputs.c index 841a7565c..b53d8cc85 100644 --- a/i3bar/src/outputs.c +++ b/i3bar/src/outputs.c @@ -271,7 +271,7 @@ void parse_outputs_json(char *json) { state = yajl_parse(handle, (const unsigned char *)json, strlen(json)); - /* FIXME: Propper errorhandling for JSON-parsing */ + /* FIXME: Proper errorhandling for JSON-parsing */ switch (state) { case yajl_status_ok: break; diff --git a/i3bar/src/workspaces.c b/i3bar/src/workspaces.c index 77b351e8b..1187a946c 100644 --- a/i3bar/src/workspaces.c +++ b/i3bar/src/workspaces.c @@ -233,7 +233,7 @@ void parse_workspaces_json(char *json) { state = yajl_parse(handle, (const unsigned char *)json, strlen(json)); - /* FIXME: Propper error handling for JSON parsing */ + /* FIXME: Proper error handling for JSON parsing */ switch (state) { case yajl_status_ok: break; diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 496035c22..9bf361871 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -445,7 +445,7 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { /* * Handle a button press event (i.e. a mouse click on one of our bars). - * We determine, whether the click occured on a workspace button or if the scroll- + * We determine, whether the click occurred on a workspace button or if the scroll- * wheel was used and change the workspace appropriately * */ diff --git a/include/shmlog.h b/include/shmlog.h index 231681cab..01fea8b45 100644 --- a/include/shmlog.h +++ b/include/shmlog.h @@ -24,7 +24,7 @@ typedef struct i3_shmlog_header { /* Byte offset where the next line will be written to. */ uint32_t offset_next_write; - /* Byte offset where the last wrap occured. */ + /* Byte offset where the last wrap occurred. */ uint32_t offset_last_wrap; /* The size of the logfile in bytes. Since the size is limited to 25 MiB diff --git a/src/commands.c b/src/commands.c index 0faf27751..405bb4297 100644 --- a/src/commands.c +++ b/src/commands.c @@ -46,7 +46,7 @@ } \ } while (0) -/** If an error occured during parsing of the criteria, we want to exit instead +/** If an error occurred during parsing of the criteria, we want to exit instead * of relying on fallback behavior. See #2091. */ #define HANDLE_INVALID_MATCH \ do { \ diff --git a/src/randr.c b/src/randr.c index 6753f8a67..f0234c5c4 100644 --- a/src/randr.c +++ b/src/randr.c @@ -420,7 +420,7 @@ void init_ws_for_output(Output *output, Con *content) { /* In case the workspace we just moved was visible but there was no * other workspace to switch to, we need to initialize the source - * output aswell */ + * output as well */ if (visible && previous == NULL) { LOG("There is no workspace left on \"%s\", re-initializing\n", workspace_out->name); diff --git a/src/render.c b/src/render.c index 9fa40f037..7ee501f01 100644 --- a/src/render.c +++ b/src/render.c @@ -167,7 +167,7 @@ void render_con(Con *con, bool render_fullscreen) { /* By rendering the stacked container again, we handle the case * that we have a non-leaf-container inside the stack. In that * case, the children of the non-leaf-container need to be raised - * aswell. */ + * as well. */ render_con(child, false); } diff --git a/src/sighandler.c b/src/sighandler.c index 80d2fae26..400cd5a59 100644 --- a/src/sighandler.c +++ b/src/sighandler.c @@ -116,7 +116,7 @@ static int backtrace(void) { waitpid(pid_gdb, &status, 0); - /* see if the backtrace was succesful or not */ + /* see if the backtrace was successful or not */ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { DLOG("GDB did not run properly\n"); return -1; @@ -176,7 +176,7 @@ static int sig_draw_window(xcb_window_t win, int width, int height, int font_hei static int sig_handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) { uint16_t state = event->state; - /* Apparantly, after activating numlock once, the numlock modifier + /* Apparently, after activating numlock once, the numlock modifier * stays turned on (use xev(1) to verify). So, to resolve useful * keysyms, we remove the numlock flag from the event state */ state &= ~xcb_numlock_mask; diff --git a/src/tree.c b/src/tree.c index 0c301209e..e848a6ac4 100644 --- a/src/tree.c +++ b/src/tree.c @@ -477,7 +477,7 @@ static void mark_unmapped(Con *con) { TAILQ_FOREACH(current, &(con->nodes_head), nodes) mark_unmapped(current); if (con->type == CT_WORKSPACE) { - /* We need to call mark_unmapped on floating nodes aswell since we can + /* We need to call mark_unmapped on floating nodes as well since we can * make containers floating. */ TAILQ_FOREACH(current, &(con->floating_head), floating_windows) mark_unmapped(current); diff --git a/testcases/complete-run.pl b/testcases/complete-run.pl index 2d61e993c..14c0a15d8 100755 --- a/testcases/complete-run.pl +++ b/testcases/complete-run.pl @@ -49,7 +49,7 @@ BEGIN # subshell or situations like that. AnyEvent::Util::close_all_fds_except(0, 1, 2); -# convinience wrapper to write to the log file +# convenience wrapper to write to the log file my $log; sub Log { say $log "@_" } @@ -208,7 +208,7 @@ BEGIN $aggregator->stop(); -# print empty lines to seperate failed tests from statuslines +# print empty lines to separate failed tests from statuslines print "\n\n"; for (@done) { diff --git a/testcases/lib/StatusLine.pm b/testcases/lib/StatusLine.pm index f24877978..6d32104a7 100644 --- a/testcases/lib/StatusLine.pm +++ b/testcases/lib/StatusLine.pm @@ -46,8 +46,8 @@ sub status_init { status_completed(0); } -# generates the status text, prints it in the appropiate line -# and returns it, so it can be used in conjuction with C +# generates the status text, prints it in the appropriate line +# and returns it, so it can be used in conjunction with C sub status { my ($display, $msg) = @_; my $status = "[$display] $msg"; diff --git a/testcases/t/103-move.t b/testcases/t/103-move.t index 0e01d90b7..64a9d621c 100644 --- a/testcases/t/103-move.t +++ b/testcases/t/103-move.t @@ -33,7 +33,7 @@ my $x = X11::XCB::Connection->new; my $i3 = i3; -# Switch to the nineth workspace +# Switch to the ninth workspace $i3->command('9')->recv; ##################################################################### diff --git a/testcases/t/105-stacking.t b/testcases/t/105-stacking.t index 96c649753..e9d84851a 100644 --- a/testcases/t/105-stacking.t +++ b/testcases/t/105-stacking.t @@ -33,7 +33,7 @@ my $x = X11::XCB::Connection->new; my $i3 = i3; -# Switch to the nineth workspace +# Switch to the ninth workspace $i3->command('9')->recv; ##################################################################### diff --git a/testcases/t/131-stacking-order.t b/testcases/t/131-stacking-order.t index c04f1b09f..8993a071c 100644 --- a/testcases/t/131-stacking-order.t +++ b/testcases/t/131-stacking-order.t @@ -14,7 +14,7 @@ # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf # (unless you are already familiar with Perl) # -# Check if stacking containers can be used independantly of +# Check if stacking containers can be used independently of # the split mode (horizontal/vertical) of the underlying # container. # diff --git a/testcases/t/159-socketpaths.t b/testcases/t/159-socketpaths.t index d21581d1f..6c214d20b 100644 --- a/testcases/t/159-socketpaths.t +++ b/testcases/t/159-socketpaths.t @@ -65,7 +65,7 @@ ok(-S $socketpath, "file $socketpath exists and is a socket"); exit_gracefully($pid); ##################################################################### -# configuration file case: socket gets placed whereever we specify +# configuration file case: socket gets placed wherever we specify ##################################################################### my $tmpdir = tempdir(CLEANUP => 1);