summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--clients/simple-dmabuf-egl.c2
-rw-r--r--compositor/main.c2
-rw-r--r--desktop-shell/shell.c4
-rw-r--r--fullscreen-shell/fullscreen-shell.c2
-rw-r--r--ivi-shell/ivi-layout-export.h4
-rw-r--r--ivi-shell/ivi-layout.c4
-rw-r--r--libweston/compositor-wayland.c2
-rw-r--r--libweston/libbacklight.h2
-rw-r--r--libweston/libinput-seat.c2
-rw-r--r--libweston/pixel-formats.c2
-rw-r--r--libweston/vaapi-recorder.c2
-rw-r--r--libweston/weston-debug.c2
-rw-r--r--man/weston-debug.man2
-rw-r--r--man/weston-drm.man4
-rw-r--r--protocol/weston-debug.xml4
-rw-r--r--remoting/remoting-plugin.c4
-rw-r--r--tools/zunitc/src/zuc_collector.h4
-rw-r--r--xwayland/selection.c2
19 files changed, 26 insertions, 26 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c1f9aa3..21b3847a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -258,7 +258,7 @@ During review, the following matters should be checked:
- Stable ABI or API additions must be justified by actual use cases, not only
by speculation. They must also be documented, and it is strongly recommended to
-include tests excercising the additions in the test suite.
+include tests exercising the additions in the test suite.
- The code fits the existing software architecture, e.g. no layering
violations.
diff --git a/clients/simple-dmabuf-egl.c b/clients/simple-dmabuf-egl.c
index e81f1629..5353f5a0 100644
--- a/clients/simple-dmabuf-egl.c
+++ b/clients/simple-dmabuf-egl.c
@@ -1160,7 +1160,7 @@ display_set_up_egl(struct display *display)
if (!weston_check_egl_extension(gl_extensions,
"GL_OES_EGL_image")) {
- fprintf(stderr, "GL_OES_EGL_image not suported\n");
+ fprintf(stderr, "GL_OES_EGL_image not supported\n");
goto error;
}
diff --git a/compositor/main.c b/compositor/main.c
index 19a920e1..c3206783 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -381,7 +381,7 @@ child_client_exec(int sockfd, const char *path)
sigfillset(&allsigs);
sigprocmask(SIG_UNBLOCK, &allsigs, NULL);
- /* Launch clients as the user. Do not lauch clients with wrong euid.*/
+ /* Launch clients as the user. Do not launch clients with wrong euid. */
if (seteuid(getuid()) == -1) {
weston_log("compositor: failed seteuid\n");
return;
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 34b44753..93b1c70b 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1121,7 +1121,7 @@ animate_workspace_change_frame(struct weston_animation *animation,
else
timespec_add_msec(&shell->workspaces.anim_timestamp,
time,
- /* Invers of movement function 'y' below. */
+ /* Inverse of movement function 'y' below. */
-(asin(1.0 - shell->workspaces.anim_current) *
DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH *
M_2_PI));
@@ -2223,7 +2223,7 @@ get_focused_output(struct weston_compositor *compositor)
/* Priority has touch focus, then pointer and
* then keyboard focus. We should probably have
- * three for loops and check frist for touch,
+ * three for loops and check first for touch,
* then for pointer, etc. but unless somebody has some
* objections, I think this is sufficient. */
if (touch && touch->focus)
diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index 89884794..99e9dbbc 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -546,7 +546,7 @@ fs_output_configure_for_mode(struct fs_output *fsout,
&surf_width, &surf_height);
/* The actual output mode is in physical units. We need to
- * transform the surface size to physical unit size by flipping ans
+ * transform the surface size to physical unit size by flipping and
* possibly scaling it.
*/
switch (fsout->output->transform) {
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index c65eb306..77b06de9 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -28,7 +28,7 @@
* surface and layer which groups surfaces. A unique ID whose type is integer is
* required to create surface and layer. With the unique ID, surface and layer
* are identified to control them. The API set consists of APIs to control
- * properties of surface and layers about followings,
+ * properties of surface and layers about the following:
* - visibility.
* - opacity.
* - clipping (x,y,width,height).
@@ -554,7 +554,7 @@ struct ivi_layout_interface {
const int32_t number);
/**
- * transision animation for layer
+ * transition animation for layer
*/
void (*transition_move_layer_cancel)(struct ivi_layout_layer *layer);
int32_t (*layer_set_fade_info)(struct ivi_layout_layer* ivilayer,
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index ccb78dc3..2c450f31 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -42,8 +42,8 @@
* per each frame. See ivi-layout-transition.c in details. Transition
* animation interpolates frames between previous properties of ivi_surface
* and new ones.
- * For example, when a property of ivi_surface is changed from invisibile
- * to visibile, it behaves like fade-in. When ivi_layout_commitChange is
+ * For example, when a property of ivi_surface is changed from invisible
+ * to visible, it behaves like fade-in. When ivi_layout_commitChange is
* called during transition animation, it cancels the transition and
* re-start transition to new properties from current properties of final
* frame just before the cancellation.
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 0b1b7fa0..e1485ca6 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -1934,7 +1934,7 @@ input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format,
input->keyboard_state_update = STATE_UPDATE_NONE;
} else if (format == WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP) {
- weston_log("No keymap provided; falling back to defalt\n");
+ weston_log("No keymap provided; falling back to default\n");
keymap = NULL;
input->keyboard_state_update = STATE_UPDATE_AUTOMATIC;
} else {
diff --git a/libweston/libbacklight.h b/libweston/libbacklight.h
index 8717ab10..20078242 100644
--- a/libweston/libbacklight.h
+++ b/libweston/libbacklight.h
@@ -52,7 +52,7 @@ struct backlight {
/*
* Find and set up a backlight for a valid udev connector device, i.e. one
- * matching drm subsytem and with status of connected.
+ * matching drm subsystem and with status of connected.
*/
struct backlight *backlight_init(struct udev_device *drm_device,
uint32_t connector_type);
diff --git a/libweston/libinput-seat.c b/libweston/libinput-seat.c
index ac1e8e99..6625daff 100644
--- a/libweston/libinput-seat.c
+++ b/libweston/libinput-seat.c
@@ -392,7 +392,7 @@ udev_seat_output_changed(struct udev_seat *seat, struct weston_output *output)
wl_list_for_each(device, &seat->devices_list, link) {
/* If we find any input device without an associated output
* or an output name to associate with, just tie it with the
- * output we got here - the default assingment.
+ * output we got here - the default assignment.
*/
if (!device->output_name) {
if (!device->output)
diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
index 875e6526..cade2422 100644
--- a/libweston/pixel-formats.c
+++ b/libweston/pixel-formats.c
@@ -387,7 +387,7 @@ pixel_format_get_info_shm(uint32_t format)
return pixel_format_get_info(format);
}
-/** Retrive a pixel format information structure from a DRM FOURCC format
+/** Retrieve a pixel format information structure from a DRM FOURCC format
*
* \param format a DRM FOURCC format
*/
diff --git a/libweston/vaapi-recorder.c b/libweston/vaapi-recorder.c
index 1228f7d1..7d6d8cc9 100644
--- a/libweston/vaapi-recorder.c
+++ b/libweston/vaapi-recorder.c
@@ -116,7 +116,7 @@ struct vaapi_recorder {
static void *
worker_thread_function(void *);
-/* bistream code used for writing the packed headers */
+/* bitstream code used for writing the packed headers */
#define BITSTREAM_ALLOCATE_STEPPING 4096
diff --git a/libweston/weston-debug.c b/libweston/weston-debug.c
index 2776c881..b1349bc3 100644
--- a/libweston/weston-debug.c
+++ b/libweston/weston-debug.c
@@ -318,7 +318,7 @@ weston_debug_compositor_destroy(struct weston_compositor *compositor)
* \param compositor The libweston compositor where to enable.
*
* This enables the weston_debug_v1 Wayland protocol extension which any client
- * can use to get debug messsages from the compositor.
+ * can use to get debug messages from the compositor.
*
* WARNING: This feature should not be used in production. If a client
* provides a file descriptor that blocks writes, it will block the whole
diff --git a/man/weston-debug.man b/man/weston-debug.man
index b3e0a5b7..907783ec 100644
--- a/man/weston-debug.man
+++ b/man/weston-debug.man
@@ -13,7 +13,7 @@ debug messages from the compositor. The debug messages are categorized into diff
debug streams by the compositor (example: logs, proto, list, etc.,) and the compositor
requires a file descriptor to stream the messages.
-This tool accepts a file name or a file desciptor (not both) and any desired debug stream
+This tool accepts a file name or a file descriptor (not both) and any desired debug stream
names from the user as command line arguments and subscribes the desired streams from the
compositor by using the weston_debug_v1 interface. After the subscription, the
compositor will start to write the debug messages to the shared file descriptor.
diff --git a/man/weston-drm.man b/man/weston-drm.man
index 6f8fa024..3cc490c0 100644
--- a/man/weston-drm.man
+++ b/man/weston-drm.man
@@ -93,7 +93,7 @@ in user-mode (drmModeModeInfo) flag bits 19-22. For the non-CEA modes a value of
Each CEA-mode is identified by a unique, Video Identification Code (VIC).
For example, VIC=4 is 1280x720@60 aspect-ratio 16:9. This mode will be
different than a non-CEA mode 1280x720@60 0:0. When the video mode
-1280x720@60 0:0 is applied, since its timing doesnt exactly match with the CEA
+1280x720@60 0:0 is applied, since its timing doesn't exactly match with the CEA
information for VIC=4, it would be treated as a non-CEA mode. Also, while setting
the HDMI-AVI-Inforframe, VIC parameter will be given as '0'. If video mode
1280x720@60 16:9 is applied, its CEA timimgs matches with that of video mode with
@@ -192,7 +192,7 @@ status. For example, use
Use graphics and input devices designated for seat
.I seatid
instead of the seat defined in the environment variable
-.BR XDG_SEAT ". If neither is specifed, seat0 will be assumed."
+.BR XDG_SEAT ". If neither is specified, seat0 will be assumed."
.TP
\fB\-\-tty\fR=\fIx\fR
Launch Weston on tty
diff --git a/protocol/weston-debug.xml b/protocol/weston-debug.xml
index effa1a19..ac62661d 100644
--- a/protocol/weston-debug.xml
+++ b/protocol/weston-debug.xml
@@ -31,7 +31,7 @@
object advertized through wl_registry.
WARNING: This interface by design allows a denial-of-service attack. It
- should not be offered in production, or proper authorization mechnisms
+ should not be offered in production, or proper authorization mechanisms
must be enforced.
The idea is for a client to provide a file descriptor that the server
@@ -39,7 +39,7 @@
descriptor in blocking writes mode, which exposes the denial-of-service
risk. The blocking mode is necessary to ensure all debug messages can
be easily printed in place. It also ensures message ordering if a
- client subcribes to more than one debug stream.
+ client subscribes to more than one debug stream.
The available debugging features depend on the server.
diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c
index 3715b22b..e99d61e1 100644
--- a/remoting/remoting-plugin.c
+++ b/remoting/remoting-plugin.c
@@ -354,7 +354,7 @@ remoting_gstpipe_handler(int fd, uint32_t mask, void *data)
struct gstpipe_msg_data msg;
struct remoted_output *output = data;
- /* recieve message */
+ /* receive message */
ret = read(fd, &msg, sizeof(msg));
if (ret != sizeof(msg)) {
weston_log("ERROR: failed to read, ret=%zd, errno=%d\n",
@@ -371,7 +371,7 @@ remoting_gstpipe_handler(int fd, uint32_t mask, void *data)
remoting_output_buffer_release(output, msg.data);
break;
default:
- weston_log("Recieved unknown message! msg=%d\n", msg.type);
+ weston_log("Received unknown message! msg=%d\n", msg.type);
}
return 1;
}
diff --git a/tools/zunitc/src/zuc_collector.h b/tools/zunitc/src/zuc_collector.h
index d123b278..56f8a5fc 100644
--- a/tools/zunitc/src/zuc_collector.h
+++ b/tools/zunitc/src/zuc_collector.h
@@ -38,7 +38,7 @@ struct zuc_test;
* current test. Otherwise events will be passed back via IPC over this
* pipe with the expectation that the payload will be handled in the parent
* process via zuc_process_message().
- * @return a new collector intance.
+ * @return a new collector instance.
* @see zuc_process_message()
*/
struct zuc_event_listener *
@@ -47,7 +47,7 @@ zuc_collector_create(int *pipe_fd);
/**
* Reads events from the given pipe and processes them.
*
- * @param test the currently active test to attache events for.
+ * @param test the currently active test to attach events for.
* @param pipe_fd the file descriptor of the pipe to read from.
* @return a positive value if a message was received, 0 if the end has
* been reached and -1 if an error has occurred.
diff --git a/xwayland/selection.c b/xwayland/selection.c
index bc7318af..411fceda 100644
--- a/xwayland/selection.c
+++ b/xwayland/selection.c
@@ -537,7 +537,7 @@ weston_wm_send_incr_chunk(struct weston_wm *wm)
} else if (length > 0) {
/* Transfer is all done, but queue a flush for
* the delete of the last chunk so we can set
- * the 0 sized propert to signal the end of
+ * the 0 sized property to signal the end of
* the transfer. */
wm->flush_property_on_delete = 1;
wl_array_release(&wm->source_data);