diff --git a/clients/window.c b/clients/window.c index 1399fa40..b84d3b2c 100644 --- a/clients/window.c +++ b/clients/window.c @@ -1032,7 +1032,7 @@ shm_surface_prepare(struct toysurface *base, int dx, int dy, surface->dx = dx; surface->dy = dy; - /* pick a free buffer, preferrably one that already has storage */ + /* pick a free buffer, preferably one that already has storage */ for (i = 0; i < MAX_LEAVES; i++) { if (surface->leaf[i].busy) continue; diff --git a/ivi-shell/README b/ivi-shell/README index 7f412910..412e5989 100644 --- a/ivi-shell/README +++ b/ivi-shell/README @@ -16,7 +16,7 @@ IVI-shell contains two main features: http://projects.genivi.org/wayland-ivi-extension/ -- Extension protocal; ivi-application to tie wl_surface and a given ID. +- Extension protocol; ivi-application to tie wl_surface and a given ID. With this ID, shell can identify which wl_surface is drawn by which application. In in-vehicle infortainment system, a shell has to update a property of a wl_surface. E.g. there may be a use case when vehicle diff --git a/protocol/fullscreen-shell.xml b/protocol/fullscreen-shell.xml index 8d7a87fe..e2b994b9 100644 --- a/protocol/fullscreen-shell.xml +++ b/protocol/fullscreen-shell.xml @@ -62,7 +62,7 @@ its own cursor and set wl_pointer.cursor(NULL). - + diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml index 3656e102..68cf4699 100644 --- a/protocol/xdg-shell.xml +++ b/protocol/xdg-shell.xml @@ -147,7 +147,7 @@ surface is mapped. Parent windows should be set on dialogs, toolboxes, or other - "auxilliary" surfaces, so that the parent is raised when the dialog + "auxiliary" surfaces, so that the parent is raised when the dialog is raised. diff --git a/src/cms-helper.h b/src/cms-helper.h index 6e5594df..0e08b418 100644 --- a/src/cms-helper.h +++ b/src/cms-helper.h @@ -41,7 +41,7 @@ * that allows the calibration state to be stored in the ICC profile * Output: Physical port with a display attached, e.g. LVDS1 * - * As a CMF is probably something you don't want or need on an embeded install + * As a CMF is probably something you don't want or need on an embedded install * these functions will not be called if the icc_profile key is set for a * specific [output] section in weston.ini * diff --git a/src/compositor.h b/src/compositor.h index 76b07781..26df74b9 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -593,7 +593,7 @@ enum weston_capability { /* screencaptures need to be y-flipped */ WESTON_CAP_CAPTURE_YFLIP = 0x0002, - /* backend/renderer has a seperate cursor plane */ + /* backend/renderer has a separate cursor plane */ WESTON_CAP_CURSOR_PLANE = 0x0004, /* backend supports setting arbitrary resolutions */ diff --git a/src/version.h.in b/src/version.h.in index 7b2c5e39..b1b4a02e 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -29,9 +29,9 @@ #define WESTON_VERSION "@WESTON_VERSION@" /* This macro may not do what you expect. Weston doesn't guarantee - * any stable API between 1.X and 1.Y, and thus this macro will return - * FALSE on any WESTON_VERSION_AT_LEAST(1,X,0) if the actualy version - * is 1.Y.0 and X !=Y). In particular, it fail if X < Y, that is, + * a stable API between 1.X and 1.Y, and thus this macro will return + * FALSE on any WESTON_VERSION_AT_LEAST(1,X,0) if the actual version + * is 1.Y.0 and X != Y). In particular, it fails if X < Y, that is, * 1.3.0 is considered to not be "at least" 1.4.0. * * If you want to test for the version number being 1.3.0 or above or