aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/drm/bo_handle_table.c2
-rw-r--r--include/render/allocator/allocator.h2
-rw-r--r--include/wlr/types/wlr_idle.h2
-rw-r--r--include/wlr/util/box.h2
-rw-r--r--protocol/input-method-unstable-v2.xml2
-rw-r--r--tinywl/tinywl.c8
6 files changed, 9 insertions, 9 deletions
diff --git a/backend/drm/bo_handle_table.c b/backend/drm/bo_handle_table.c
index 026194ce..479168b4 100644
--- a/backend/drm/bo_handle_table.c
+++ b/backend/drm/bo_handle_table.c
@@ -18,7 +18,7 @@ bool drm_bo_handle_table_ref(struct wlr_drm_bo_handle_table *table,
assert(handle != 0);
if (handle > table->len) {
- // Grow linearily, because we don't expect the number of BOs to explode
+ // Grow linearly, because we don't expect the number of BOs to explode
size_t len = align(handle + 1, 512);
size_t *nrefs = realloc(table->nrefs, len * sizeof(size_t));
if (nrefs == NULL) {
diff --git a/include/render/allocator/allocator.h b/include/render/allocator/allocator.h
index d67116cd..5d8028cb 100644
--- a/include/render/allocator/allocator.h
+++ b/include/render/allocator/allocator.h
@@ -18,7 +18,7 @@ struct wlr_allocator_interface {
struct wlr_allocator {
const struct wlr_allocator_interface *impl;
- // Capabilites of the buffers created with this allocator
+ // Capabilities of the buffers created with this allocator
uint32_t buffer_caps;
struct {
diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h
index acb98dfe..8e89a341 100644
--- a/include/wlr/types/wlr_idle.h
+++ b/include/wlr/types/wlr_idle.h
@@ -76,7 +76,7 @@ void wlr_idle_set_enabled(struct wlr_idle *idle, struct wlr_seat *seat,
/**
* Create a new timer on the given seat. The idle event will be called after
* the given amount of milliseconds of inactivity, and the resumed event will
- * be sent at the first user activty after the fired event.
+ * be sent at the first user activity after the fired event.
*/
struct wlr_idle_timeout *wlr_idle_timeout_create(struct wlr_idle *idle,
struct wlr_seat *seat, uint32_t timeout);
diff --git a/include/wlr/util/box.h b/include/wlr/util/box.h
index 83ea5001..66cfa21c 100644
--- a/include/wlr/util/box.h
+++ b/include/wlr/util/box.h
@@ -49,7 +49,7 @@ void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
double *dest_x, double *dest_y);
/**
- * Gives the intersecting box betweem two wlr_box.
+ * Gives the intersecting box between two wlr_box.
*
* Returns an empty wlr_box if the provided wlr_box don't intersect.
*/
diff --git a/protocol/input-method-unstable-v2.xml b/protocol/input-method-unstable-v2.xml
index e8ef6eea..51bccf28 100644
--- a/protocol/input-method-unstable-v2.xml
+++ b/protocol/input-method-unstable-v2.xml
@@ -350,7 +350,7 @@
the time of its creation.
The compositor must issue this request when the object is no longer
- useable, e.g. due to seat removal.
+ usable, e.g. due to seat removal.
The input method context becomes inert and should be destroyed after
deactivation is handled. Any further requests and events except for the
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index 8697d2b3..b11549be 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -281,7 +281,7 @@ static void server_new_input(struct wl_listener *listener, void *data) {
static void seat_request_cursor(struct wl_listener *listener, void *data) {
struct tinywl_server *server = wl_container_of(
listener, server, request_cursor);
- /* This event is rasied by the seat when a client provides a cursor image */
+ /* This event is raised by the seat when a client provides a cursor image */
struct wlr_seat_pointer_request_set_cursor_event *event = data;
struct wlr_seat_client *focused_client =
server->seat->pointer_state.focused_client;
@@ -656,7 +656,7 @@ static void output_frame(struct wl_listener *listener, void *data) {
}
static void server_new_output(struct wl_listener *listener, void *data) {
- /* This event is rasied by the backend when a new output (aka a display or
+ /* This event is raised by the backend when a new output (aka a display or
* monitor) becomes available. */
struct tinywl_server *server =
wl_container_of(listener, server, new_output);
@@ -758,7 +758,7 @@ static void xdg_toplevel_request_move(
/* This event is raised when a client would like to begin an interactive
* move, typically because the user clicked on their client-side
* decorations. Note that a more sophisticated compositor should check the
- * provied serial against a list of button press serials sent to this
+ * provided serial against a list of button press serials sent to this
* client, to prevent the client from requesting this whenever they want. */
struct tinywl_view *view = wl_container_of(listener, view, request_move);
begin_interactive(view, TINYWL_CURSOR_MOVE, 0);
@@ -769,7 +769,7 @@ static void xdg_toplevel_request_resize(
/* This event is raised when a client would like to begin an interactive
* resize, typically because the user clicked on their client-side
* decorations. Note that a more sophisticated compositor should check the
- * provied serial against a list of button press serials sent to this
+ * provided serial against a list of button press serials sent to this
* client, to prevent the client from requesting this whenever they want. */
struct wlr_xdg_toplevel_resize_event *event = data;
struct tinywl_view *view = wl_container_of(listener, view, request_resize);