diff --git a/NEWS b/NEWS index 94855d5a3..be24fffe8 100644 --- a/NEWS +++ b/NEWS @@ -572,7 +572,7 @@ Contributors: 3.31.92 ======= * Fix flicker of apps that use multiple SHM buffers [Jonas Å.; #199] -* Don't disable page flips after temporary failues [Jonas Å.; #460] +* Don't disable page flips after temporary failures [Jonas Å.; #460] * Improve redraw performance [Carlos; !196] * Add cursor-mode support to window screencasting [Jonas Å.; !413] * Add back support for system-wide monitor configurations [Jonas Å.; !253] @@ -984,7 +984,7 @@ Translations: ======= * Reduce memory use of suspended instances [Jonas; #786299] * Make supported scales determination saner [Rui; #786474] -* Fix crash on inhibit-shortcuts dialog reponse [Jonas; #786385] +* Fix crash on inhibit-shortcuts dialog response [Jonas; #786385] * Support libinput's tag-and-drag setting [freeroot; #775755] * Avoid overlapping keybindings with multiple layouts [Jonas; #786408] * Fix non-transformed cursor on rotated monitors [Jonas; #786023] @@ -1303,7 +1303,7 @@ Translations: * Consider XDG_SESSION_TYPE when determining session type [Jouke; #759388] * Re-add support for edge scrolling on some touchpads [Bastien; #768245] * Support mouse and trackball acceleration profile [Jonas; #769179] -* Draw monitor contentn to individual framebuffer [Jonas; #768976] +* Draw monitor content to individual framebuffer [Jonas; #768976] * Support virtual input devices [Jonas, Carlos; #765009] * Set correct output scale on hotplug [Jonas; #769505] * Misc. bug fixes and cleanups [Florian, Jonas, Thomas, Bastien, Carlos; @@ -2128,7 +2128,7 @@ Translations: * Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399] * Don't save pixbuf data in user data [Tim; #706777] * Don't queue redraws for obscured regions [Adel; #703332] -* Suppor the opaque region hints for wayland clients [Jasper; #707019] +* Support the opaque region hints for wayland clients [Jasper; #707019] * Turn blending off when drawing entirely opaque regions [Jasper; #707019] * Check event timestamps before reconfiguring [Giovanni; #706735] * Merge the DBus API for display configuration in the wayland branch [Giovanni] @@ -2613,7 +2613,7 @@ Translations: ====== * Automaximize large windows on map [Adel; #671677] * When unmaximizing windows, make sure the unminimized size - is signficantly less than the maximized size [Adel; #671677] + is significantly less than the maximized size [Adel; #671677] * Don't offer maximize option for windows larger than the screen [Jasper; #643606] * Always focus the window immediately underneath without restacking @@ -2713,7 +2713,7 @@ Translations: * Move from GConf to GSettings for preferences [Florian; #635378] * Add meta_display_add_keybinding()/meta_display_remove_keybinding() to allow creating new keybindings at runtime [Florian; #663428] -* Add suport for new _NET_WM_STATE_FOCUSED atom in _NET_WM_STATE +* Add support for new _NET_WM_STATE_FOCUSED atom in _NET_WM_STATE to allow applications to draw unfocused windows differently [Rui; #661427] * Add meta_window_move_resize_frame() to allow specifying the @@ -2825,7 +2825,7 @@ Contributors: for easy resizing with thin borders. (New draggable_border_width GConf key controls the total width of visible and invisible borders.) [Jasper; #644930] -* Draw rounded window corners with antialising [Jasper; #628195] +* Draw rounded window corners with antialiasing [Jasper; #628195] * Unredirect override-redirect fullscreen windows, such as full-screen 3D games to avoid any performance impact [Adel; #597014] * Add :resizable and :above properties to MetaWindow. [Tim; #653858] @@ -2918,7 +2918,7 @@ Translations: 3.0.2.1 ======= * When saving the session, use the "program name" rather than - harcoding mutter, fixing session saving for gnome-shell [Matthias] + hardcoding mutter, fixing session saving for gnome-shell [Matthias] https://bugzilla.gnome.org/show_bug.cgi?id=648828 Contributors: @@ -3236,7 +3236,7 @@ Bugs fixed: 634779 MetaWindowGroup: further optimize paints by using current scissor 634833 Draw the root window background 592382 improve shadow effect - 628199 Add antialising to arc and line drawing operations + 628199 Add antialiasing to arc and line drawing operations 633002 meta-actor-window: Use G_UNLIKELY for TFP check 634771 MetaStackTracker: Avoid queueing resync for obvious no-ops 635421 Fix crash in check_needs_shadow @@ -3433,7 +3433,7 @@ Fixed Bugs: - Allow a theme to turn on title ellipsization * Performance enhancements: - Stream raw damage updates to ClutterX11TexturePixmap - to enable partial stage updates when windos change [Robert] + to enable partial stage updates when windows change [Robert] - Don't trap XErrors in meta_compositor_process_event [Adel] * Add meta_prefs_override_preference_location(); this allows a plugin like GNOME Shell to redirect preferences to a @@ -3478,7 +3478,7 @@ Fixed Bugs: 613136 - remove over-restrictive assert from meta_prefs_get_workspace_name() 613398 - Don't trap XErrors in meta_compositor_process_event 615586 - Allow redirecting preferences to a different GConf key - 615672 - cant' compile mutter error: dereferencing pointer ‘p’ does break + 615672 - can't compile mutter error: dereferencing pointer ‘p’ does break strict-aliasing rules 616050 - alt-tab infrastructure patches 616274 - mutter from git fails with gcc 4.5 (on new warning) @@ -4424,7 +4424,7 @@ Arthur Taylor, Elijah Newren, Josselin Mouette, Havoc Pennington, Benjamin Berg, and Carlo Wood for improvements in this release. - new icon for the force-quit dialog (Jaap) [#396655] - - add configureable mouse click action abilities, and clean up lots of + - add configurable mouse click action abilities, and clean up lots of related code (Linus) [#408899, #408902, others] - add schemeas for middle and right click titlebar actions (Charlie) [#408903] @@ -4978,7 +4978,7 @@ this release. running with --disable-gconf. Make --disable-gconf actually work. (Elijah) [#326661] - fix some reading-from-free'd-data errors (Søren) [#327575] - - fix an unitialized value problem when in raise-on-click mode + - fix an uninitialized value problem when in raise-on-click mode (Søren) [#327572] - avoid flashing original-sized window when closing a maximized window (Elijah) [#317254] diff --git a/clutter/clutter/cally/cally-actor-private.h b/clutter/clutter/cally/cally-actor-private.h index 7e9927868..23884bb27 100644 --- a/clutter/clutter/cally/cally-actor-private.h +++ b/clutter/clutter/cally/cally-actor-private.h @@ -28,7 +28,7 @@ #include "cally-actor.h" /* - * Auxiliar define, in order to get the clutter actor from the AtkObject using + * Auxiliary define, in order to get the clutter actor from the AtkObject using * AtkGObject methods * */ diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c index 91f68d492..fa0257548 100644 --- a/clutter/clutter/cally/cally-actor.c +++ b/clutter/clutter/cally/cally-actor.c @@ -1104,7 +1104,7 @@ cally_actor_add_action_full (CallyActor *cally_actor, * * Removes a action, using the @action_id returned by cally_actor_add_action() * - * Return value: %TRUE if the operation was succesful, %FALSE otherwise + * Return value: %TRUE if the operation was successful, %FALSE otherwise * * Since: 1.4 */ @@ -1138,7 +1138,7 @@ cally_actor_remove_action (CallyActor *cally_actor, * Removes an action, using the @action_name used when the action was added * with cally_actor_add_action() * - * Return value: %TRUE if the operation was succesful, %FALSE otherwise + * Return value: %TRUE if the operation was successful, %FALSE otherwise * * Since: 1.4 */ diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c index b32249211..ae5aa48bc 100644 --- a/clutter/clutter/cally/cally-stage.c +++ b/clutter/clutter/cally/cally-stage.c @@ -47,7 +47,7 @@ static AtkStateSet* cally_stage_ref_state_set (AtkObject *obj); /* AtkWindow */ static void cally_stage_window_interface_init (AtkWindowIface *iface); -/* Auxiliar */ +/* Auxiliary */ static void cally_stage_activate_cb (ClutterStage *stage, gpointer data); static void cally_stage_deactivate_cb (ClutterStage *stage, @@ -222,7 +222,7 @@ cally_stage_window_interface_init (AtkWindowIface *iface) /* At this moment AtkWindow is just about signals */ } -/* Auxiliar */ +/* Auxiliary */ static void cally_stage_activate_cb (ClutterStage *stage, gpointer data) diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c index 2b34f098c..c1419b4bf 100644 --- a/clutter/clutter/cally/cally-text.c +++ b/clutter/clutter/cally/cally-text.c @@ -1513,7 +1513,7 @@ cally_text_get_offset_at_point (AtkText *text, } -/******** Auxiliar private methods ******/ +/******** Auxiliary private methods ******/ /* ClutterText only maintains the current cursor position and a extra selection bound, but this could be before or after the cursor. This method returns @@ -1552,7 +1552,7 @@ _cally_text_delete_text_cb (ClutterText *clutter_text, g_return_if_fail (CALLY_IS_TEXT (data)); - /* Ignore zero lengh deletions */ + /* Ignore zero length deletions */ if (end_pos - start_pos == 0) return; @@ -1653,7 +1653,7 @@ cally_text_insert_text (AtkEditableText *text, clutter_text_insert_text (CLUTTER_TEXT (actor), string, *position); - /* we suppose that the text insertion will be succesful, + /* we suppose that the text insertion will be successful, clutter-text doesn't warn about it. A option would be search for the text, but it seems not really required */ *position += length; diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c index 9e30c62bd..feb9abd59 100644 --- a/clutter/clutter/clutter-actor-box.c +++ b/clutter/clutter/clutter-actor-box.c @@ -320,7 +320,7 @@ clutter_actor_box_get_area (const ClutterActorBox *box) * @y: Y coordinate of the point * * Checks whether a point with @x, @y coordinates is contained - * withing @box + * within @box * * Return value: %TRUE if the point is contained by the #ClutterActorBox * @@ -554,7 +554,7 @@ _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box) * * The reason this is important is because effects will use this * API to determine the size of offscreen framebuffers and so for - * a fixed-size object that may be animated accross the screen we + * a fixed-size object that may be animated across the screen we * want to make sure that the stage paint-box has an equally stable * size so that effects aren't made to continuously re-allocate * a corresponding fbo. @@ -583,7 +583,7 @@ _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box) /* Now we redefine the top-left relative to the bottom right based on the * rounded width/height determined above + a constant so that the overall - * size of the box will be stable and not dependant on the box's + * size of the box will be stable and not dependent on the box's * position. * * Adding 3px to the width/height will ensure we cover the maximum of diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index 32e485c6c..6a8dfe89a 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -1636,7 +1636,7 @@ clutter_actor_real_map (ClutterActor *self) * and realizes its children if they are visible. Does nothing if the * actor is not visible. * - * Calling this function is strongly disencouraged: the default + * Calling this function is strongly discouraged: the default * implementation of #ClutterActorClass.map() will map all the children * of an actor when mapping its parent. * @@ -9289,7 +9289,7 @@ clutter_actor_get_allocation_box (ClutterActor *self, clutter_stage_maybe_relayout (stage); } - /* commenting out the code above and just keeping this assigment + /* commenting out the code above and just keeping this assignment * implements 3) */ *box = self->priv->allocation; @@ -10940,7 +10940,7 @@ clutter_actor_set_scale_z (ClutterActor *self, /** * clutter_actor_get_scale: * @self: A #ClutterActor - * @scale_x: (out) (allow-none): Location to store horizonal + * @scale_x: (out) (allow-none): Location to store horizontal * scale factor, or %NULL. * @scale_y: (out) (allow-none): Location to store vertical * scale factor, or %NULL. @@ -12239,7 +12239,7 @@ clutter_actor_get_parent (ClutterActor *self) * * This is by definition the same as %CLUTTER_ACTOR_IS_MAPPED. * - * Return Value: %TRUE if the actor is visibile and will be painted. + * Return Value: %TRUE if the actor is visible and will be painted. * * Since: 0.8 */ @@ -14444,7 +14444,7 @@ clutter_actor_create_pango_layout (ClutterActor *self, * Allows overriding the calculated paint opacity (as returned by * clutter_actor_get_paint_opacity()). This is used internally by * ClutterClone and ClutterOffscreenEffect, and should be used by - * actors that need to mimick those. + * actors that need to mimic those. * * In almost all cases this should not used by applications. * @@ -16544,7 +16544,7 @@ clutter_actor_get_child_at_index (ClutterActor *self, /*< private > * _clutter_actor_foreach_child: - * @actor: The actor whos children you want to iterate + * @actor: The actor whose children you want to iterate * @callback: The function to call for each child * @user_data: Private data to pass to @callback * @@ -19560,7 +19560,7 @@ clutter_actor_has_mapped_clones (ClutterActor *self) /* Clones will force-show their own source actor but not children of * it, so if we're hidden and an actor up the hierarchy has a clone, - * we won't be visisble. + * we won't be visible. */ if (!CLUTTER_ACTOR_IS_VISIBLE (actor)) return FALSE; diff --git a/clutter/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c index fcbcd2ec7..ea2719c69 100644 --- a/clutter/clutter/clutter-base-types.c +++ b/clutter/clutter/clutter-base-types.c @@ -259,7 +259,7 @@ clutter_matrix_init_identity (ClutterMatrix *matrix) * Initializes @matrix with the contents of a C array of floating point * values. * - * Return value: (transfer none): the initialzed #ClutterMatrix + * Return value: (transfer none): the initialized #ClutterMatrix * * Since: 1.12 */ diff --git a/clutter/clutter/clutter-bezier.c b/clutter/clutter/clutter-bezier.c index b874e503a..378dfd123 100644 --- a/clutter/clutter/clutter-bezier.c +++ b/clutter/clutter/clutter-bezier.c @@ -35,7 +35,7 @@ #undef CBZ_L2T_INTERPOLATION /**************************************************************************** - * ClutterBezier -- represenation of a cubic bezier curve * + * ClutterBezier -- representation of a cubic bezier curve * * (private; a building block for the public bspline object) * ****************************************************************************/ @@ -213,7 +213,7 @@ sqrti (int number) * algorithm does not calculate the square root, but its reciprocal ('y' * below), which is only at the end turned to the inverse value. In order * for the algorithm to produce satisfactory results, the reciprocal value - * must be represented with sufficient precission; the 16.16 we use + * must be represented with sufficient precision; the 16.16 we use * elsewhere in clutter is not good enough, and 10.22 is used instead. */ _FixedT x; @@ -236,7 +236,7 @@ sqrti (int number) /* Now, we convert the float to 10.22 fixed. We exploit the mechanism * described at http://www.d6.com/users/checker/pdfs/gdmfp.pdf. * - * We want 22 bit fraction; a single precission float uses 23 bit + * We want 22 bit fraction; a single precision float uses 23 bit * mantisa, so we only need to add 2^(23-22) (no need for the 1.5 * multiplier as we are only dealing with positive numbers). * @@ -256,7 +256,7 @@ sqrti (int number) flt2.i = (flt2.i >> 11) * (y_1 >> 11); /* If the original argument is less than 342, we do another - * iteration to improve precission (for arguments >= 342, the single + * iteration to improve precision (for arguments >= 342, the single * iteration produces generally better results). */ if (x < 171) diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index 93c8392fb..4a2164fb6 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -39,7 +39,7 @@ * #ClutterActor:y-expand are set, the available size * - honours the #ClutterActor's #ClutterActor:x-align and #ClutterActor:y-align properties * to fill the available size - * - if the #ClutterBoxLayout:homogeneous boolean propert is set, then all widgets will + * - if the #ClutterBoxLayout:homogeneous boolean property is set, then all widgets will * get the same size, ignoring expand settings and the preferred sizes * * It is possible to control the spacing between children of a @@ -719,7 +719,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout, if (priv->is_homogeneous) { - /* If were homogenous we still need to run the above loop to get the + /* If were homogeneous we still need to run the above loop to get the * minimum sizes for children that are not going to fill */ if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL) @@ -1218,7 +1218,7 @@ clutter_box_layout_get_homogeneous (ClutterBoxLayout *layout) * @pack_start: %TRUE if the @layout should pack children at the * beginning of the layout * - * Sets whether children of @layout should be layed out by appending + * Sets whether children of @layout should be laid out by appending * them or by prepending them * * Since: 1.2 diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c index 4373ad7a1..a546d4c06 100644 --- a/clutter/clutter/clutter-clone.c +++ b/clutter/clutter/clutter-clone.c @@ -199,7 +199,7 @@ clutter_clone_get_paint_volume (ClutterActor *actor, if (priv->clone_source == NULL) return TRUE; - /* query the volume of the source actor and simply masquarade it as + /* query the volume of the source actor and simply masquerade it as * the clones volume... */ source_volume = clutter_actor_get_paint_volume (priv->clone_source); if (source_volume == NULL) diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c index 424fee22a..5fc69beff 100644 --- a/clutter/clutter/clutter-color.c +++ b/clutter/clutter/clutter-color.c @@ -611,7 +611,7 @@ parse_hsla (ClutterColor *color, /** * clutter_color_from_string: * @color: (out caller-allocates): return location for a #ClutterColor - * @str: a string specifiying a color + * @str: a string specifying a color * * Parses a string definition of a color, filling the #ClutterColor.red, * #ClutterColor.green, #ClutterColor.blue and #ClutterColor.alpha fields diff --git a/clutter/clutter/clutter-container.h b/clutter/clutter/clutter-container.h index 26b991c9c..6575569db 100644 --- a/clutter/clutter/clutter-container.h +++ b/clutter/clutter/clutter-container.h @@ -74,7 +74,7 @@ typedef struct _ClutterContainerIface ClutterContainerIface; * fields in the instance and add the record to a data structure for * subsequent access for #ClutterContainerIface::get_child_meta * @destroy_child_meta: virtual function that gets called when a child is - * removed; it shuld release all resources held by the record + * removed; it should release all resources held by the record * @get_child_meta: return the record for a container child * @actor_added: class handler for #ClutterContainer::actor-added * @actor_removed: class handler for #ClutterContainer::actor-removed diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index 82d9911ff..0f498acb3 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -28,7 +28,7 @@ * @see_also: #ClutterEffect, #ClutterOffscreenEffect * * #ClutterDesaturateEffect is a sub-class of #ClutterEffect that - * desaturates the color of an actor and its contents. The strenght + * desaturates the color of an actor and its contents. The strength * of the desaturation effect is controllable and animatable through * the #ClutterDesaturateEffect:factor property. * diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c index 81109ff0e..43185ea21 100644 --- a/clutter/clutter/clutter-effect.c +++ b/clutter/clutter/clutter-effect.c @@ -349,7 +349,7 @@ _clutter_effect_has_custom_paint_volume (ClutterEffect *effect) * the actor itself so the %CLUTTER_EFFECT_PAINT_ACTOR_DIRTY would still * not be set. The effect can detect this case by keeping track of the * last modelview matrix that was used to render the actor and - * veryifying that it remains the same in the next paint. + * verifying that it remains the same in the next paint. * * Any other effects that are layered on top of the passed in effect * will still be passed the %CLUTTER_EFFECT_PAINT_ACTOR_DIRTY flag. If diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index ce1121d8d..66f6d9beb 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -127,7 +127,7 @@ typedef enum /*< prefix=CLUTTER_REQUEST >*/ * @CLUTTER_EASE_IN_OUT_QUAD: quadratic tweening, combininig * %CLUTTER_EASE_IN_QUAD and %CLUTTER_EASE_OUT_QUAD * @CLUTTER_EASE_IN_CUBIC: cubic tweening - * @CLUTTER_EASE_OUT_CUBIC: cubic tweening, invers of + * @CLUTTER_EASE_OUT_CUBIC: cubic tweening, inverse of * %CLUTTER_EASE_IN_CUBIC * @CLUTTER_EASE_IN_OUT_CUBIC: cubic tweening, combining * %CLUTTER_EASE_IN_CUBIC and %CLUTTER_EASE_OUT_CUBIC @@ -513,7 +513,7 @@ typedef enum { * a toplevel, and all parents visible) * @CLUTTER_ACTOR_REALIZED: the resources associated to the actor have been * allocated - * @CLUTTER_ACTOR_REACTIVE: the actor 'reacts' to mouse events emmitting event + * @CLUTTER_ACTOR_REACTIVE: the actor 'reacts' to mouse events emitting event * signals * @CLUTTER_ACTOR_VISIBLE: the actor has been shown by the application program * @CLUTTER_ACTOR_NO_LAYOUT: the actor provides an explicit layout management @@ -1196,7 +1196,7 @@ typedef enum /*< prefix=CLUTTER_TEXTURE >*/ * * Since: 0.8 * - * Deprecated: 1.22: The #ClutterTexture class was the only used ot + * Deprecated: 1.22: The #ClutterTexture class was the only user of * this API; use #ClutterImage and clutter_actor_set_content_scaling_filters() * instead. */ diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c index f7ced9837..29919ad33 100644 --- a/clutter/clutter/clutter-flow-layout.c +++ b/clutter/clutter/clutter-flow-layout.c @@ -913,7 +913,7 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) * ClutterFlowLayout:orientation: * * The orientation of the #ClutterFlowLayout. The children - * of the layout will be layed out following the orientation. + * of the layout will be laid out following the orientation. * * This property also controls the overflowing directions * diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c index 11e717ba9..73e4a2c02 100644 --- a/clutter/clutter/clutter-input-device.c +++ b/clutter/clutter/clutter-input-device.c @@ -1651,7 +1651,7 @@ _clutter_input_device_remove_slave (ClutterInputDevice *master, * @device: a #ClutterInputDevice * @sequence: a #ClutterEventSequence * - * Start tracking informations related to a touch point (position, + * Start tracking information related to a touch point (position, * actor underneath the touch point). */ void @@ -1676,7 +1676,7 @@ _clutter_input_device_add_event_sequence (ClutterInputDevice *device, * @device: a #ClutterInputDevice * @sequence: a #ClutterEventSequence * - * Stop tracking informations related to a touch point. + * Stop tracking information related to a touch point. */ void _clutter_input_device_remove_event_sequence (ClutterInputDevice *device, diff --git a/clutter/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c index 97d2026aa..b7d75a4bd 100644 --- a/clutter/clutter/clutter-interval.c +++ b/clutter/clutter/clutter-interval.c @@ -1176,7 +1176,7 @@ clutter_interval_compute_value (ClutterInterval *interval, * g_object_set_property() * * Return value: (transfer none): a pointer to the computed value, - * or %NULL if the computation was not successfull + * or %NULL if the computation was not successful * * Since: 1.4 */ diff --git a/clutter/clutter/clutter-keysyms-update.pl b/clutter/clutter/clutter-keysyms-update.pl index 37469e9e9..a37598140 100755 --- a/clutter/clutter/clutter-keysyms-update.pl +++ b/clutter/clutter/clutter-keysyms-update.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # Author : Simos Xenitellis . -# Authos : Bastien Nocera +# Author : Bastien Nocera # Version : 1.2 # # Notes : It downloads keysymdef.h from the Internet, if not found locally, diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c index 9c4f7228b..3fe02a196 100644 --- a/clutter/clutter/clutter-layout-manager.c +++ b/clutter/clutter/clutter-layout-manager.c @@ -41,7 +41,7 @@ * The implementation of a layout manager does not differ from the * implementation of the size requisition and allocation bits of * #ClutterActor, so you should read the relative documentation - * forr subclassing #ClutterActor. + * for subclassing #ClutterActor. * * The layout manager implementation can hold a back pointer to the * #ClutterContainer by implementing the #ClutterLayoutManagerClass.set_container() diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h index 6df0cecdf..4817f7c88 100644 --- a/clutter/clutter/clutter-layout-manager.h +++ b/clutter/clutter/clutter-layout-manager.h @@ -84,7 +84,7 @@ struct _ClutterLayoutManager * in newly written code. * @end_animation: virtual function; override to end an animation started * by clutter_layout_manager_begin_animation(). This virtual function is - * deprecated, and it should not be overriden in newly written code. + * deprecated, and it should not be overridden in newly written code. * @get_animation_progress: virtual function; override to control the * progress of the animation of a #ClutterLayoutManager. This virtual * function is deprecated, and it should not be overridden in newly written diff --git a/clutter/clutter/clutter-paint-volume-private.h b/clutter/clutter/clutter-paint-volume-private.h index 21e35c202..6a3f53428 100644 --- a/clutter/clutter/clutter-paint-volume-private.h +++ b/clutter/clutter/clutter-paint-volume-private.h @@ -85,8 +85,8 @@ struct _ClutterPaintVolume * TRUE) */ guint is_2d:1; - /* Set to TRUE initialy but cleared if the paint volume is - * transfomed by a matrix. */ + /* Set to TRUE initially but cleared if the paint volume is + * transformed by a matrix. */ guint is_axis_aligned:1; diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c index 09edeb6f0..3facd71cf 100644 --- a/clutter/clutter/clutter-paint-volume.c +++ b/clutter/clutter/clutter-paint-volume.c @@ -827,7 +827,7 @@ _clutter_paint_volume_project (ClutterPaintVolume *pv, } /* All the vertices must be up to date, since after the projection - * it wont be trivial to derive the other vertices. */ + * it won't be trivial to derive the other vertices. */ _clutter_paint_volume_complete (pv); /* Most actors are 2D so we only have to transform the front 4 @@ -866,7 +866,7 @@ _clutter_paint_volume_transform (ClutterPaintVolume *pv, } /* All the vertices must be up to date, since after the transform - * it wont be trivial to derive the other vertices. */ + * it won't be trivial to derive the other vertices. */ _clutter_paint_volume_complete (pv); /* Most actors are 2D so we only have to transform the front 4 @@ -1057,9 +1057,9 @@ clutter_paint_volume_set_from_allocation (ClutterPaintVolume *pv, } /* Currently paint volumes are defined relative to a given actor, but - * in some cases it is desireable to be able to change the actor that + * in some cases it is desirable to be able to change the actor that * a volume relates too (For instance for ClutterClone actors where we - * need to masquarade the source actors volume as the volume for the + * need to masquerade the source actors volume as the volume for the * clone). */ void _clutter_paint_volume_set_reference_actor (ClutterPaintVolume *pv, diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c index facb7b07a..49c440203 100644 --- a/clutter/clutter/clutter-path.c +++ b/clutter/clutter/clutter-path.c @@ -314,7 +314,7 @@ clutter_path_add_node_full (ClutterPath *path, priv->nodes_dirty = TRUE; } -/* Helper function to make the rest of teh add_* functions shorter */ +/* Helper function to make the rest of the add_* functions shorter */ static void clutter_path_add_node_helper (ClutterPath *path, ClutterPathNodeType type, diff --git a/clutter/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c index 0de445795..e1165fd72 100644 --- a/clutter/clutter/clutter-script-parser.c +++ b/clutter/clutter/clutter-script-parser.c @@ -161,7 +161,7 @@ _clutter_script_get_type_from_class (const gchar *name) * The enumeration value can be an integer, the enumeration nick * or the enumeration name, as part of the #GEnumValue structure. * - * Return value: %TRUE if the conversion was successfull. + * Return value: %TRUE if the conversion was successful. */ gboolean _clutter_script_enum_from_string (GType type, diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c index 15bfdc582..96133e79a 100644 --- a/clutter/clutter/clutter-script.c +++ b/clutter/clutter/clutter-script.c @@ -36,7 +36,7 @@ * parse it and build all the objects defined into it. Each object must * have an "id" and a "type" properties defining the name to be used * to retrieve it from #ClutterScript with clutter_script_get_object(), - * and the class type to be instanciated. Every other attribute will + * and the class type to be instantiated. Every other attribute will * be mapped to the class properties. * * A #ClutterScript holds a reference on every object it creates from @@ -852,7 +852,7 @@ clutter_script_default_connect (ClutterScript *script, } CLUTTER_NOTE (SCRIPT, - "connecting %s::%s to %s (afetr:%s, swapped:%s, object:%s)", + "connecting %s::%s to %s (after:%s, swapped:%s, object:%s)", (connect_gobject ? G_OBJECT_TYPE_NAME (connect_gobject) : G_OBJECT_TYPE_NAME (gobject)), signal_name, diff --git a/clutter/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c index 969ba5370..661654b75 100644 --- a/clutter/clutter/clutter-scroll-actor.c +++ b/clutter/clutter/clutter-scroll-actor.c @@ -173,7 +173,7 @@ clutter_scroll_actor_class_init (ClutterScrollActorClass *klass) /** * ClutterScrollActor:scroll-mode: * - * The scrollin direction. + * The scrolling direction. * * Since: 1.12 */ diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c index 59fc1a891..be15d32b1 100644 --- a/clutter/clutter/clutter-shader-effect.c +++ b/clutter/clutter/clutter-shader-effect.c @@ -32,7 +32,7 @@ * * #ClutterShaderEffect creates an offscreen buffer and then applies the * GLSL shader (after checking whether the compilation and linking were - * successfull) to the buffer before painting it on screen. + * successful) to the buffer before painting it on screen. * * #ClutterShaderEffect is available since Clutter 1.4 * @@ -788,7 +788,7 @@ add_uniform: * values; and %CLUTTER_TYPE_SHADER_MATRIX, for a pointer to an array of * floating point values mapping a matrix * - * The number of values interepreted is defined by the @n_value + * The number of values interpreted is defined by the @n_value * argument, and by the @gtype argument. For instance, a uniform named * "sampler0" and containing a single integer value is set using: * diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index f133a9825..be690ca7d 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -1580,7 +1580,7 @@ clutter_stage_real_apply_transform (ClutterActor *stage, { ClutterStagePrivate *priv = CLUTTER_STAGE (stage)->priv; - /* FIXME: we probably shouldn't be explicitly reseting the matrix + /* FIXME: we probably shouldn't be explicitly resetting the matrix * here... */ cogl_matrix_init_identity (matrix); cogl_matrix_multiply (matrix, matrix, &priv->view); @@ -2270,9 +2270,9 @@ _clutter_stage_get_viewport (ClutterStage *stage, * @stage: A #ClutterStage * @x: x coordinate of the first pixel that is read from stage * @y: y coordinate of the first pixel that is read from stage - * @width: Width dimention of pixels to be read, or -1 for the + * @width: Width dimension of pixels to be read, or -1 for the * entire stage width - * @height: Height dimention of pixels to be read, or -1 for the + * @height: Height dimension of pixels to be read, or -1 for the * entire stage height * * Makes a screenshot of the stage in RGBA 8bit data, returns a @@ -2634,7 +2634,7 @@ clutter_stage_ensure_viewport (ClutterStage *stage) * can never converge with the two corners of our triangle no * matter what size the triangle has. * - With a fov > 53° there is a trade off between maximizing the gap - * size relative to the stage size but not loosing depth precision. + * size relative to the stage size but not losing depth precision. * - Perhaps ideally we wouldn't just consider the fov on the y-axis * that is usually used to define a perspective, we would consider * the fov of the axis with the largest stage size so the gap would @@ -3063,7 +3063,7 @@ _clutter_stage_paint_volume_stack_free_all (ClutterStage *stage) g_array_set_size (paint_volume_stack, 0); } -/* The is an out-of-band paramater available while painting that +/* The is an out-of-band parameter available while painting that * can be used to cull actors. */ const ClutterPlane * _clutter_stage_get_clip (ClutterStage *stage) diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h index 344e4cbdc..b65724d72 100644 --- a/clutter/clutter/clutter-text-buffer.h +++ b/clutter/clutter/clutter-text-buffer.h @@ -69,7 +69,7 @@ struct _ClutterTextBuffer /** * ClutterTextBufferClass: * @inserted_text: default handler for the #ClutterTextBuffer::inserted-text signal - * @deleted_text: default hanlder for the #ClutterTextBuffer::deleted-text signal + * @deleted_text: default handler for the #ClutterTextBuffer::deleted-text signal * @get_text: virtual function * @get_length: virtual function * @insert_text: virtual function diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c index 082bcb399..18d6bda6e 100644 --- a/clutter/clutter/clutter-text.c +++ b/clutter/clutter/clutter-text.c @@ -4124,7 +4124,7 @@ clutter_text_class_init (ClutterTextClass *klass) * * Whether the text includes Pango markup. * - * For more informations about the Pango markup format, see + * For more information about the Pango markup format, see * pango_layout_set_markup() in the Pango documentation. * * It is not possible to round-trip this property between diff --git a/cogl/cogl-config.h.meson b/cogl/cogl-config.h.meson index f2d46b259..29ca42981 100644 --- a/cogl/cogl-config.h.meson +++ b/cogl/cogl-config.h.meson @@ -4,7 +4,7 @@ /* Have GLES 2.0 for rendering */ #mesondefine HAVE_COGL_GLES2 -/* Building with Sysprof profiling suport */ +/* Building with Sysprof profiling support */ #mesondefine HAVE_TRACING /* Enable unit tests */ diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c index 5374629fc..9ec19b755 100644 --- a/cogl/cogl/cogl-atlas-texture.c +++ b/cogl/cogl/cogl-atlas-texture.c @@ -531,7 +531,7 @@ _cogl_atlas_texture_convert_bitmap_for_upload (CoglAtlasTexture *atlas_tex, format specified when the texture was created. However we'll preserve the premult status of the internal format because the images are all stored in the original premult format of the - orignal format so we do need to trigger the conversion */ + original format so we do need to trigger the conversion */ internal_format = (COGL_PIXEL_FORMAT_RGBA_8888 | (internal_format & COGL_PREMULT_BIT)); diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c index 1c0c88d0b..f42bc9f9b 100644 --- a/cogl/cogl/cogl-attribute.c +++ b/cogl/cogl/cogl-attribute.c @@ -561,7 +561,7 @@ validate_layer_cb (CoglPipeline *pipeline, "with waste\n", layer_index); /* XXX: maybe we can add a mechanism for users to forcibly use - * textures with waste where it would be their responsability to use + * textures with waste where it would be their responsibility to use * texture coords in the range [0,1] such that sampling outside isn't * required. We can then use a texture matrix (or a modification of * the users own matrix) to map 1 to the edge of the texture data. diff --git a/cogl/cogl/cogl-attribute.h b/cogl/cogl/cogl-attribute.h index f35274b56..39a62d2dd 100644 --- a/cogl/cogl/cogl-attribute.h +++ b/cogl/cogl/cogl-attribute.h @@ -139,12 +139,12 @@ GType cogl_attribute_get_gtype (void); * position may be comprised of 2 x and y @components. You should aim * to keep the number of components to a minimum as more components * means more data needs to be mapped into the GPU which can be a - * bottlneck when dealing with a large number of vertices. + * bottleneck when dealing with a large number of vertices. * * Finally you need to specify the component data type. Here you * should aim to use the smallest type that meets your precision * requirements. Again the larger the type then more data needs to be - * mapped into the GPU which can be a bottlneck when dealing with + * mapped into the GPU which can be a bottleneck when dealing with * a large number of vertices. * * Return value: (transfer full): A newly allocated #CoglAttribute diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c index 10af4966d..8a32e6eff 100644 --- a/cogl/cogl/cogl-bitmap-pixbuf.c +++ b/cogl/cogl/cogl-bitmap-pixbuf.c @@ -113,7 +113,7 @@ _cogl_bitmap_from_file (CoglContext *ctx, } /* We just use the data directly from the pixbuf so that we don't - have to copy to a seperate buffer. Note that Cogl is expected not + have to copy to a separate buffer. Note that Cogl is expected not to read past the end of bpp*width on the last row even if the rowstride is much larger so we don't need to worry about GdkPixbuf's semantics that it may under-allocate the buffer. */ diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c index 222cc86ea..754c66fa8 100644 --- a/cogl/cogl/cogl-bitmask.c +++ b/cogl/cogl/cogl-bitmask.c @@ -47,7 +47,7 @@ _COGL_STATIC_ASSERT (sizeof (unsigned long) <= sizeof (void *), "This toolchain breaks Cogl's assumption that it can " "safely cast an unsigned long to a pointer without " - "loosing data"); + "losing data"); #define ARRAY_INDEX(bit_num) \ ((bit_num) / (sizeof (unsigned long) * 8)) diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c index dd7d8cb18..592605cce 100644 --- a/cogl/cogl/cogl-buffer.c +++ b/cogl/cogl/cogl-buffer.c @@ -329,12 +329,12 @@ _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer) { /* Note: don't try to catch OOM errors here since the use cases * we currently have for this api (the journal and path stroke - * tesselator) don't have anything particularly sensible they + * tessellator) don't have anything particularly sensible they * can do in response to a failure anyway so it seems better to * simply abort instead. * * If we find this is a problem for real world applications - * then in the path tesselation case we could potentially add an + * then in the path tessellation case we could potentially add an * explicit cogl_path_tesselate_stroke() api that can throw an * error for the app to cache. For the journal we could * potentially flush the journal in smaller batches so we use diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h index 79d4f7b5e..2d68793a0 100644 --- a/cogl/cogl/cogl-context-private.h +++ b/cogl/cogl/cogl-context-private.h @@ -286,7 +286,7 @@ _cogl_context_get_winsys (CoglContext *context); /* Query the GL extensions and lookup the corresponding function * pointers. Theoretically the list of extensions can change for - * different GL contexts so it is the winsys backend's responsiblity + * different GL contexts so it is the winsys backend's responsibility * to know when to re-query the GL extensions. The backend should also * check whether the GL context is supported by Cogl. If not it should * return FALSE and set @error */ diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h index e0d79d927..e5882e7dd 100644 --- a/cogl/cogl/cogl-context.h +++ b/cogl/cogl/cogl-context.h @@ -80,14 +80,14 @@ G_BEGIN_DECLS * context. * * One a context has been destroyed then all directly or indirectly - * dependant resources will be in an inconsistent state and should not + * dependent resources will be in an inconsistent state and should not * be manipulated or queried in any way. * * For applications that rely on the operating system to clean up * resources this policy shouldn't affect them, but for applications * that need to carefully destroy and re-create Cogl contexts multiple * times throughout their lifetime (such as Android applications) they - * should be careful to destroy all context dependant resources, such as + * should be careful to destroy all context dependent resources, such as * framebuffers or textures etc before unrefing and destroying the * context. */ diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h index 2cbfc7342..38e58fd69 100644 --- a/cogl/cogl/cogl-framebuffer-private.h +++ b/cogl/cogl/cogl-framebuffer-private.h @@ -147,7 +147,7 @@ struct _CoglFramebuffer CoglStereoMode stereo_mode; /* We journal the textured rectangles we want to submit to OpenGL so - * we have an oppertunity to batch them together into less draw + * we have an opportunity to batch them together into less draw * calls. */ CoglJournal *journal; diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c index a79a46756..a2ad821ae 100644 --- a/cogl/cogl/cogl-framebuffer.c +++ b/cogl/cogl/cogl-framebuffer.c @@ -203,7 +203,7 @@ _cogl_framebuffer_get_winsys (CoglFramebuffer *framebuffer) /* This version of cogl_clear can be used internally as an alternative * to avoid flushing the journal or the framebuffer state. This is - * needed when doing operations that may be called whiling flushing + * needed when doing operations that may be called while flushing * the journal */ void _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer, @@ -1263,7 +1263,7 @@ cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer, pixels); /* Note: we don't try and catch errors here since we created the - * bitmap storage up-front and can assume we wont hit an + * bitmap storage up-front and can assume we won't hit an * out-of-memory error which should be the only exception * this api throws. */ diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h index 77c678384..209c4d379 100644 --- a/cogl/cogl/cogl-framebuffer.h +++ b/cogl/cogl/cogl-framebuffer.h @@ -435,7 +435,7 @@ cogl_framebuffer_set_modelview_matrix (CoglFramebuffer *framebuffer, * * You should be careful not to have to great a @z_far / @z_near * ratio since that will reduce the effectiveness of depth testing - * since there wont be enough precision to identify the depth of + * since there won't be enough precision to identify the depth of * objects near to each other. * * Since: 1.10 @@ -1388,7 +1388,7 @@ cogl_framebuffer_finish (CoglFramebuffer *framebuffer); * @framebuffer: A #CoglFramebuffer * @x: The x position to read from * @y: The y position to read from - * @source: Identifies which auxillary buffer you want to read + * @source: Identifies which auxiliary buffer you want to read * (only COGL_READ_PIXELS_COLOR_BUFFER supported currently) * @bitmap: The bitmap to store the results in. * diff --git a/cogl/cogl/cogl-indices.h b/cogl/cogl/cogl-indices.h index 09631df9c..9c9c44d30 100644 --- a/cogl/cogl/cogl-indices.h +++ b/cogl/cogl/cogl-indices.h @@ -72,7 +72,7 @@ G_BEGIN_DECLS * For example, to describe a quadrilateral as 2 triangles for the GPU * you could either provide data with 6 vertices or instead with * indices you can provide vertex data for just 4 vertices and an - * index buffer that specfies the 6 vertices by indexing the shared + * index buffer that specifies the 6 vertices by indexing the shared * vertices multiple times. * * |[ @@ -94,7 +94,7 @@ G_BEGIN_DECLS * Something else to consider is that often indices can be defined * once and remain static while the vertex data may change for * animations perhaps. That means you may be able to ignore the - * negligable cost of mapping your indices into the GPU if they don't + * negligible cost of mapping your indices into the GPU if they don't * ever change. * * The above illustration is actually a good example of static indices diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c index b7eb3c709..418fd9895 100644 --- a/cogl/cogl/cogl-journal.c +++ b/cogl/cogl/cogl-journal.c @@ -959,7 +959,7 @@ maybe_software_clip_entries (CoglJournalEntry *batch_start, entry in the journal. We store it in a separate buffer because it's expensive to calculate but at this point we still don't know whether we can clip all of the entries so we don't want to do the - rest of the dependant calculations until we're sure we can. */ + rest of the dependent calculations until we're sure we can. */ if (ctx->journal_clip_bounds == NULL) ctx->journal_clip_bounds = g_array_new (FALSE, FALSE, sizeof (ClipBounds)); g_array_set_size (ctx->journal_clip_bounds, batch_len); @@ -1700,7 +1700,7 @@ entry_to_screen_polygon (CoglFramebuffer *framebuffer, #define VIEWPORT_TRANSFORM_X(x, vp_origin_x, vp_width) \ ( ( ((x) + 1.0) * ((vp_width) / 2.0) ) + (vp_origin_x) ) /* Note: for Y we first flip all coordinates around the X axis while in - * normalized device coodinates */ + * normalized device coordinates */ #define VIEWPORT_TRANSFORM_Y(y, vp_origin_y, vp_height) \ ( ( ((-(y)) + 1.0) * ((vp_height) / 2.0) ) + (vp_origin_y) ) diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c index 138d3ac54..1c878c09f 100644 --- a/cogl/cogl/cogl-matrix-stack.c +++ b/cogl/cogl/cogl-matrix-stack.c @@ -808,7 +808,7 @@ cogl_matrix_entry_equal (CoglMatrixEntry *entry0, CoglMatrixEntryTranslate *translate1 = (CoglMatrixEntryTranslate *)entry1; /* We could perhaps use an epsilon to compare here? - * I expect the false negatives are probaly never going to + * I expect the false negatives are probably never going to * be a problem and this is a bit cheaper. */ if (!graphene_point3d_equal (&translate0->translate, &translate1->translate)) diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h index d8262d3c3..0cda12790 100644 --- a/cogl/cogl/cogl-matrix-stack.h +++ b/cogl/cogl/cogl-matrix-stack.h @@ -373,7 +373,7 @@ cogl_matrix_stack_frustum (CoglMatrixStack *stack, * * You should be careful not to have too great a @z_far / @z_near * ratio since that will reduce the effectiveness of depth testing - * since there wont be enough precision to identify the depth of + * since there won't be enough precision to identify the depth of * objects near to each other. */ COGL_EXPORT void diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c index 06cded0f8..695887a70 100644 --- a/cogl/cogl/cogl-matrix.c +++ b/cogl/cogl/cogl-matrix.c @@ -143,7 +143,7 @@ do { \ */ #define MAT_FLAG_IDENTITY 0 /*< is an identity matrix flag. * (Not actually used - the identity - * matrix is identified by the absense + * matrix is identified by the absence * of all other flags.) */ #define MAT_FLAG_GENERAL 0x1 /*< is a general matrix flag */ @@ -1294,7 +1294,7 @@ _cogl_matrix_rotate (CoglMatrix *matrix, * ...etc. Because of those relations and the standard trigonometric * relations, it is pssible to reduce the transforms down to what * is used below. It may be that any primary axis chosen will give the - * same results (modulo a sign convention) using thie method. + * same results (modulo a sign convention) using this method. * * Particularly nice is to notice that all divisions that might * have caused trouble when parallel to certain planes or @@ -1606,7 +1606,7 @@ cogl_matrix_init_identity (CoglMatrix *matrix) /* * Set a matrix to the (tx, ty, tz) translation matrix. * - * @matix matrix. + * @matrix matrix. * @tx x coordinate of the translation vector * @ty y coordinate of the translation vector * @tz z coordinate of the translation vector @@ -1878,13 +1878,13 @@ cogl_matrix_equal (const void *v1, const void *v2) g_return_val_if_fail (v2 != NULL, FALSE); /* We want to avoid having a fuzzy _equal() function (e.g. that uses - * an arbitrary epsilon value) since this function noteably conforms + * an arbitrary epsilon value) since this function notably conforms * to the prototype suitable for use with g_hash_table_new() and a * fuzzy hash function isn't really appropriate for comparing hash * table keys since it's possible that you could end up fetching * different values if you end up with multiple similar keys in use * at the same time. If you consider that fuzzyness allows cases - * such as A == B == C but A != C then you could also end up loosing + * such as A == B == C but A != C then you could also end up losing * values in a hash table. * * We do at least use the == operator to compare values though so diff --git a/cogl/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h index c14bb3565..5e0a5498e 100644 --- a/cogl/cogl/cogl-matrix.h +++ b/cogl/cogl/cogl-matrix.h @@ -263,7 +263,7 @@ cogl_matrix_scale (CoglMatrix *matrix, * vector, which is normally simply (0, 1, 0) to map up to the * positive direction of the y axis. * - * Because there is a lot of missleading documentation online for + * Because there is a lot of misleading documentation online for * gluLookAt regarding the up vector we want to try and be a bit * clearer here. * @@ -271,7 +271,7 @@ cogl_matrix_scale (CoglMatrix *matrix, * and does not need to change as you move the eye and object * positions. Many online sources may claim that the up vector needs * to be perpendicular to the vector between the eye and object - * position (partly because the man page is somewhat missleading) but + * position (partly because the man page is somewhat misleading) but * that is not necessary for this function. * * You should never look directly along the world-up @@ -336,7 +336,7 @@ cogl_matrix_frustum (CoglMatrix *matrix, * * You should be careful not to have to great a @z_far / @z_near * ratio since that will reduce the effectiveness of depth testing - * since there wont be enough precision to identify the depth of + * since there won't be enough precision to identify the depth of * objects near to each other. */ COGL_EXPORT void @@ -563,7 +563,7 @@ cogl_matrix_get_inverse (const CoglMatrix *matrix, * @z: (inout): The Z component of your points position * @w: (inout): The W component of your points position * - * Transforms a point whos position is given and returned as four float + * Transforms a point whose position is given and returned as four float * components. */ COGL_EXPORT void @@ -645,7 +645,7 @@ cogl_matrix_transform_points (const CoglMatrix *matrix, * Projects an array of input points and writes the result to another * array of output points. The input points can either have 2, 3 or 4 * components each. The output points always have 4 components (known - * as homogenous coordinates). The output array can simply point to + * as homogeneous coordinates). The output array can simply point to * the input array to do the transform in-place. * * Here's an example with differing input/output strides: diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c index b44e3bac4..65b45df60 100644 --- a/cogl/cogl/cogl-memory-stack.c +++ b/cogl/cogl/cogl-memory-stack.c @@ -44,9 +44,9 @@ * rewind the entire stack back to the start. There is no * the concept of stack frames to allow partial rewinds. * - * For example; we plan to use this in our tesselator which has to + * For example; we plan to use this in our tessellator which has to * allocate lots of small vertex, edge and face structures because - * when tesselation has been finished we just want to free the whole + * when tessellation has been finished we just want to free the whole * lot in one go. * * diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c index 32d341300..026d86cd7 100644 --- a/cogl/cogl/cogl-meta-texture.c +++ b/cogl/cogl/cogl-meta-texture.c @@ -509,7 +509,7 @@ cogl_meta_texture_foreach_in_region (CoglMetaTexture *meta_texture, tx_2 *= width; ty_2 *= height; - /* XXX: at some point this wont be routed through the CoglTexture + /* XXX: at some point this won't be routed through the CoglTexture * vtable, instead there will be a separate CoglMetaTexture * interface vtable. */ diff --git a/cogl/cogl/cogl-node-private.h b/cogl/cogl/cogl-node-private.h index 37981c4ab..b167f05f1 100644 --- a/cogl/cogl/cogl-node-private.h +++ b/cogl/cogl/cogl-node-private.h @@ -42,7 +42,7 @@ typedef struct _CoglNode CoglNode; /* Pipelines and layers represent their state in a tree structure where * some of the state relating to a given pipeline or layer may actually * be owned by one if is ancestors in the tree. We have a common data - * type to track the tree heirachy so we can share code... */ + * type to track the tree hierarchy so we can share code... */ struct _CoglNode { /* the parent in terms of class hierarchy, so anything inheriting diff --git a/cogl/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h index 27c19e5d4..83f42b410 100644 --- a/cogl/cogl/cogl-object-private.h +++ b/cogl/cogl/cogl-object-private.h @@ -38,7 +38,7 @@ #include "cogl-object.h" #include "cogl-debug.h" -/* For compatability until all components have been converted */ +/* For compatibility until all components have been converted */ typedef struct _CoglObjectClass CoglHandleClass; typedef struct _CoglObject CoglHandleObject; @@ -249,7 +249,7 @@ _cogl_is_##type_name (void *object) \ #define COGL_OBJECT_INTERNAL_DEFINE(TypeName, type_name) \ COGL_OBJECT_INTERNAL_DEFINE_WITH_CODE (TypeName, type_name, (void) 0) -/* For temporary compatability */ +/* For temporary compatibility */ #define COGL_HANDLE_INTERNAL_DEFINE_WITH_CODE(TypeName, type_name, code) \ \ COGL_OBJECT_INTERNAL_DEFINE_WITH_CODE (TypeName, type_name, code) \ diff --git a/cogl/cogl/cogl-object.c b/cogl/cogl/cogl-object.c index b96f19817..d3713f4cb 100644 --- a/cogl/cogl/cogl-object.c +++ b/cogl/cogl/cogl-object.c @@ -114,7 +114,7 @@ cogl_handle_get_type (void) { static GType our_type = 0; - /* XXX: We are keeping the "CoglHandle" name for now incase it would + /* XXX: We are keeping the "CoglHandle" name for now in case it would * break bindings to change to "CoglObject" */ if (G_UNLIKELY (our_type == 0)) our_type = g_boxed_type_register_static (g_intern_static_string ("CoglHandle"), diff --git a/cogl/cogl/cogl-object.h b/cogl/cogl/cogl-object.h index 6a04d5826..c93983f71 100644 --- a/cogl/cogl/cogl-object.h +++ b/cogl/cogl/cogl-object.h @@ -129,8 +129,8 @@ typedef struct { /** * CoglUserDataDestroyCallback: - * @user_data: The data whos association with a #CoglObject has been - * destoyed. + * @user_data: The data whose association with a #CoglObject has been + * destroyed. * * When associating private data with a #CoglObject a callback can be * given which will be called either if the object is destroyed or if diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h index e70d3f806..b0cd99fce 100644 --- a/cogl/cogl/cogl-onscreen.h +++ b/cogl/cogl/cogl-onscreen.h @@ -120,7 +120,7 @@ cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen); * client API via cogl_wayland_onscreen_get_surface(). * * Since Cogl doesn't explicitly track the visibility status of - * onscreen framebuffers it wont try to avoid redundant window system + * onscreen framebuffers it won't try to avoid redundant window system * requests e.g. to show an already visible window. This also means * that it's acceptable to alternatively use native APIs to show and * hide windows without confusing Cogl. @@ -145,7 +145,7 @@ cogl_onscreen_show (CoglOnscreen *onscreen); * framebuffer before hiding it. * * Since Cogl doesn't explicitly track the visibility status of - * onscreen framebuffers it wont try to avoid redundant window system + * onscreen framebuffers it won't try to avoid redundant window system * requests e.g. to show an already visible window. This also means * that it's acceptable to alternatively use native APIs to show and * hide windows without confusing Cogl. @@ -420,7 +420,7 @@ GType cogl_frame_closure_get_gtype (void); * ready for this application to render a new frame. In this case * %COGL_FRAME_EVENT_SYNC will be passed as the event argument to the * given @callback in addition to the #CoglFrameInfo corresponding to - * the frame beeing acknowledged by the compositor. + * the frame being acknowledged by the compositor. * * The @callback will also be called to notify when the frame has * ended. In this case %COGL_FRAME_EVENT_COMPLETE will be passed as @@ -709,7 +709,7 @@ GType cogl_onscreen_dirty_closure_get_gtype (void); * been moved causing a region of the onscreen to be exposed. * * The @callback will be passed a #CoglOnscreenDirtyInfo struct which - * decribes a rectangle containing the newly dirtied region. Note that + * describes a rectangle containing the newly dirtied region. Note that * this may be called multiple times to describe a non-rectangular * region composed of multiple smaller rectangles. * diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h index 901489d2b..1246fa8c2 100644 --- a/cogl/cogl/cogl-pipeline-layer-private.h +++ b/cogl/cogl/cogl-pipeline-layer-private.h @@ -207,7 +207,7 @@ struct _CoglPipelineLayer /* Layers represent their state in a tree structure where some of * the state relating to a given pipeline or layer may actually be * owned by one if is ancestors in the tree. We have a common data - * type to track the tree heirachy so we can share code... */ + * type to track the tree hierarchy so we can share code... */ CoglNode _parent; /* Some layers have a pipeline owner, which is to say that the layer diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c index 3362c6220..a076c7e95 100644 --- a/cogl/cogl/cogl-pipeline-layer.c +++ b/cogl/cogl/cogl-pipeline-layer.c @@ -377,9 +377,9 @@ _cogl_pipeline_layer_pre_change_notify (CoglPipeline *required_owner, goto init_layer_state; } - /* Note: At this point we know there is only one pipeline dependant on + /* Note: At this point we know there is only one pipeline dependent on * this layer (required_owner), and there are no other layers - * dependant on this layer so it's ok to modify it. */ + * dependent on this layer so it's ok to modify it. */ /* NB: Although layers can have private state associated with them * by multiple backends we know that a layer can't be *changed* if @@ -796,7 +796,7 @@ _cogl_pipeline_init_default_layers (void) /* Since we passed a newly allocated layer we don't expect that * _set_layer_unit() will have to allocate *another* layer. */ - /* Finally we create a dummy dependant for ->default_layer_n which + /* Finally we create a dummy dependent for ->default_layer_n which * effectively ensures that ->default_layer_n and ->default_layer_0 * remain immutable. */ diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h index 1e719a068..2655089af 100644 --- a/cogl/cogl/cogl-pipeline-private.h +++ b/cogl/cogl/cogl-pipeline-private.h @@ -272,7 +272,7 @@ struct _CoglPipeline /* Layers represent their state in a tree structure where some of * the state relating to a given pipeline or layer may actually be * owned by one if is ancestors in the tree. We have a common data - * type to track the tree heirachy so we can share code... */ + * type to track the tree hierarchy so we can share code... */ CoglNode _parent; /* When weak pipelines are destroyed the user is notified via this @@ -529,7 +529,7 @@ _cogl_pipeline_pre_paint_for_layer (CoglPipeline *pipeline, * supplied texture and need to be replaced with fallback textures. (1 = * fallback, and the least significant bit = layer 0) * @COGL_PIPELINE_FLUSH_DISABLE_MASK: The disable_layers member is set to - * a uint32_t mask of the layers that you want to completly disable + * a uint32_t mask of the layers that you want to completely disable * texturing for (1 = fallback, and the least significant bit = layer 0) * @COGL_PIPELINE_FLUSH_LAYER0_OVERRIDE: The layer0_override_texture member is * set to a GLuint OpenGL texture name to override the texture used for diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h index 286f673c1..ceec55fc9 100644 --- a/cogl/cogl/cogl-pipeline-state.h +++ b/cogl/cogl/cogl-pipeline-state.h @@ -229,7 +229,7 @@ cogl_pipeline_get_alpha_test_reference (CoglPipeline *pipeline); * * This is the list of source-names usable as blend factors: * - * SRC_COLOR: The color of the in comming fragment + * SRC_COLOR: The color of the incoming fragment * DST_COLOR: The color of the framebuffer * CONSTANT: The constant set via cogl_pipeline_set_blend_constant() * @@ -363,7 +363,7 @@ cogl_pipeline_get_point_size (CoglPipeline *pipeline); * * Since: 2.0 * Stability: Unstable - * Return value: %TRUE if the change suceeded or %FALSE otherwise + * Return value: %TRUE if the change succeeded or %FALSE otherwise */ COGL_EXPORT gboolean cogl_pipeline_set_per_vertex_point_size (CoglPipeline *pipeline, @@ -513,7 +513,7 @@ typedef enum * get overridden. For example, if a model has gaps so that it is * impossible to see the inside then faces which are facing away from * the screen will never be seen so there is no point in drawing - * them. This can be acheived by setting the cull face mode to + * them. This can be achieved by setting the cull face mode to * %COGL_PIPELINE_CULL_FACE_MODE_BACK. * * Face culling relies on the primitives being drawn with a specific diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c index 3b911b83f..f9489448a 100644 --- a/cogl/cogl/cogl-pipeline.c +++ b/cogl/cogl/cogl-pipeline.c @@ -487,7 +487,7 @@ _cogl_pipeline_update_layers_cache (CoglPipeline *pipeline) g_warn_if_reached (); } -/* XXX: Be carefull when using this API that the callback given doesn't result +/* XXX: Be careful when using this API that the callback given doesn't result * in the layer cache being invalidated during the iteration! */ void _cogl_pipeline_foreach_layer_internal (CoglPipeline *pipeline, @@ -2180,7 +2180,7 @@ _cogl_pipeline_prune_redundant_ancestry (CoglPipeline *pipeline) * ancestors to define the state of those 4 layers. * * If a pipeline depends on any ancestors for layer state then we - * immediatly bail out. + * immediately bail out. */ if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS) { @@ -2655,7 +2655,7 @@ add_layer_to_array_cb (CoglPipelineLayer *layer, /* This tries to find the oldest ancestor whose pipeline and layer state matches the given flags. This is mostly used to detect code - gen authorities so that we can reduce the numer of programs + gen authorities so that we can reduce the number of programs generated */ CoglPipeline * _cogl_pipeline_find_equivalent_parent (CoglPipeline *pipeline, diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h index 16acc772d..f420a5a84 100644 --- a/cogl/cogl/cogl-pipeline.h +++ b/cogl/cogl/cogl-pipeline.h @@ -125,7 +125,7 @@ cogl_is_pipeline (void *object); /** * CoglPipelineLayerCallback: - * @pipeline: The #CoglPipeline whos layers are being iterated + * @pipeline: The #CoglPipeline whose layers are being iterated * @layer_index: The current layer index * @user_data: The private data passed to cogl_pipeline_foreach_layer() * diff --git a/cogl/cogl/cogl-pixel-format.c b/cogl/cogl/cogl-pixel-format.c index 11df72bf0..05169b955 100644 --- a/cogl/cogl/cogl-pixel-format.c +++ b/cogl/cogl/cogl-pixel-format.c @@ -354,7 +354,7 @@ _cogl_pixel_format_is_endian_dependant (CoglPixelFormat format) /* NB: currently checking whether the format components are aligned * or not determines whether the format is endian dependent or not. * In the future though we might consider adding formats with - * aligned components that are also endian independant. */ + * aligned components that are also endian independent. */ for (i = 0; i < G_N_ELEMENTS (format_info_table); i++) { diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c index ff547387f..01654584e 100644 --- a/cogl/cogl/cogl-primitive.c +++ b/cogl/cogl/cogl-primitive.c @@ -424,7 +424,7 @@ cogl_primitive_set_attributes (CoglPrimitive *primitive, /* NB: we don't unref the previous attributes before refing the new * in case we would end up releasing the last reference for an - * attribute thats actually in the new list too. */ + * attribute that's actually in the new list too. */ for (i = 0; i < n_attributes; i++) { g_return_if_fail (cogl_is_attribute (attributes[i])); @@ -434,7 +434,7 @@ cogl_primitive_set_attributes (CoglPrimitive *primitive, for (i = 0; i < primitive->n_attributes; i++) cogl_object_unref (primitive->attributes[i]); - /* First try to use the embedded storage assocated with the + /* First try to use the embedded storage associated with the * primitive, else fallback to slice allocating separate storage for * the attribute pointers... */ diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c index 7d5141d4d..71a7ca5d2 100644 --- a/cogl/cogl/cogl-primitives.c +++ b/cogl/cogl/cogl-primitives.c @@ -265,7 +265,7 @@ _cogl_texture_quad_multiple_primitives (CoglFramebuffer *framebuffer, state.v_to_q_scale_x = fabs (state.quad_len_x / (tx_2 - tx_1)); state.v_to_q_scale_y = fabs (state.quad_len_y / (ty_2 - ty_1)); - /* For backwards compatablity the default wrap mode for cogl_rectangle() is + /* For backwards compatibility the default wrap mode for cogl_rectangle() is * _REPEAT... */ if (wrap_s == COGL_PIPELINE_WRAP_MODE_AUTOMATIC) wrap_s = COGL_PIPELINE_WRAP_MODE_REPEAT; diff --git a/cogl/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h index aec502173..2d14b91fb 100644 --- a/cogl/cogl/cogl-snippet.h +++ b/cogl/cogl/cogl-snippet.h @@ -107,7 +107,7 @@ G_BEGIN_DECLS * The snippets can be added to a pipeline with * cogl_pipeline_add_snippet() or * cogl_pipeline_add_layer_snippet(). Which function to use depends on - * which hook the snippet is targetting. The snippets are all + * which hook the snippet is targeting. The snippets are all * generated in the order they are added to the pipeline. That is, the * post strings are executed in the order they are added to the * pipeline and the pre strings are executed in reverse order. If any @@ -645,7 +645,7 @@ GType cogl_snippet_get_gtype (void); * * * The ‘post’ string in @snippet will be inserted after texture lookup - * has been preformed. Here the snippet can modify the cogl_texel + * has been performed. Here the snippet can modify the cogl_texel * variable to alter the returned texel. * * diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h index 29a25a570..98b8479d3 100644 --- a/cogl/cogl/cogl-texture-2d-sliced.h +++ b/cogl/cogl/cogl-texture-2d-sliced.h @@ -62,7 +62,7 @@ * texel wide texture, leaving 3 texels unallocated so we'd then * create a 4 texel wide texture - now there is only one texel of * waste. The algorithm continues to slice the right most textures - * until the amount of waste is less than or equal to a specfied + * until the amount of waste is less than or equal to a specified * max-waste threshold. The same logic for slicing from left to right * is also applied from top to bottom. */ diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c index 2481943c8..f69dfc161 100644 --- a/cogl/cogl/cogl-texture.c +++ b/cogl/cogl/cogl-texture.c @@ -277,7 +277,7 @@ cogl_texture_is_sliced (CoglTexture *texture) } /* If this returns FALSE, that implies _foreach_sub_texture_in_region - * will be needed to iterate over multiple sub textures for regions whos + * will be needed to iterate over multiple sub textures for regions whose * texture coordinates extend out of the range [0,1] */ gboolean @@ -331,7 +331,7 @@ _cogl_texture_pre_paint (CoglTexture *texture, CoglTexturePrePaintFlags flags) * * XXX: Maybe it could even be considered a programmer error if the * texture hasn't been allocated by this point since it implies we - * are abount to paint with undefined texture contents? + * are about to paint with undefined texture contents? */ cogl_texture_allocate (texture, NULL); diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index 751a84d1d..35871703d 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -456,10 +456,10 @@ typedef enum _CoglWinsysFeature * only needs to be throttled to the framerate */ COGL_WINSYS_FEATURE_SWAP_REGION_SYNCHRONIZED, - /* Avaiable if the age of the back buffer can be queried */ + /* Available if the age of the back buffer can be queried */ COGL_WINSYS_FEATURE_BUFFER_AGE, - /* Avaiable if the winsys directly handles _SYNC and _COMPLETE events */ + /* Available if the winsys directly handles _SYNC and _COMPLETE events */ COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT, COGL_WINSYS_FEATURE_N_FEATURES diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c index 2cf0dbe21..320c0186d 100644 --- a/cogl/cogl/cogl.c +++ b/cogl/cogl/cogl.c @@ -167,7 +167,7 @@ _cogl_driver_error_quark (void) #define VIEWPORT_TRANSFORM_X(x, vp_origin_x, vp_width) \ ( ( ((x) + 1.0) * ((vp_width) / 2.0) ) + (vp_origin_x) ) /* Note: for Y we first flip all coordinates around the X axis while in - * normalized device coodinates */ + * normalized device coordinates */ #define VIEWPORT_TRANSFORM_Y(y, vp_origin_y, vp_height) \ ( ( ((-(y)) + 1.0) * ((vp_height) / 2.0) ) + (vp_origin_y) ) diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index 7eb6cfa74..07b496208 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -123,7 +123,7 @@ #include #include #include -/* XXX: This will definitly go away once all the Clutter winsys +/* XXX: This will definitely go away once all the Clutter winsys * code has been migrated down into Cogl! */ #include diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h index 740322e56..37ab372af 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.h +++ b/cogl/cogl/deprecated/cogl-material-compat.h @@ -45,7 +45,7 @@ G_BEGIN_DECLS /** * SECTION:cogl-material - * @short_description: Fuctions for creating and manipulating materials + * @short_description: Functions for creating and manipulating materials * * COGL allows creating and manipulating materials used to fill in * geometry. Materials may simply be lighting attributes (such as an @@ -287,7 +287,7 @@ cogl_material_set_alpha_test_function (CoglMaterial *material, * * This is the list of source-names usable as blend factors: * - * SRC_COLOR: The color of the in comming fragment + * SRC_COLOR: The color of the incoming fragment * DST_COLOR: The color of the framebuffer * CONSTANT: The constant set via cogl_material_set_blend_constant() * diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h index a7676fa42..79c023664 100644 --- a/cogl/cogl/deprecated/cogl-shader.h +++ b/cogl/cogl/deprecated/cogl-shader.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS /** * SECTION:cogl-shaders - * @short_description: Fuctions for accessing the programmable GL pipeline + * @short_description: Functions for accessing the programmable GL pipeline * * Cogl allows accessing the GL programmable pipeline in order to create * vertex and fragment shaders. @@ -222,7 +222,7 @@ G_BEGIN_DECLS /** * CoglShaderType: - * @COGL_SHADER_TYPE_VERTEX: A program for proccessing vertices + * @COGL_SHADER_TYPE_VERTEX: A program for processing vertices * @COGL_SHADER_TYPE_FRAGMENT: A program for processing fragments * * Types of shaders diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c index 7fce18a56..cca19719f 100644 --- a/cogl/cogl/driver/gl/cogl-buffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c @@ -363,7 +363,7 @@ _cogl_buffer_gl_set_data (CoglBuffer *buffer, _cogl_buffer_gl_bind (buffer, target, &internal_error); /* NB: _cogl_buffer_gl_bind() may return NULL in non-error - * conditions so we have to explicity check internal_error + * conditions so we have to explicitly check internal_error * to see if an exception was thrown. */ if (internal_error) diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c index 68e2e44e1..520beaf17 100644 --- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c @@ -452,7 +452,7 @@ attach_depth_texture (CoglContext *ctx, if (flags & COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL) { /* attach a GL_DEPTH_STENCIL texture to the GL_DEPTH_ATTACHMENT and - * GL_STENCIL_ATTACHMENT attachement points */ + * GL_STENCIL_ATTACHMENT attachment points */ g_assert (_cogl_texture_get_format (depth_texture) == COGL_PIXEL_FORMAT_DEPTH_24_STENCIL_8); @@ -471,7 +471,7 @@ attach_depth_texture (CoglContext *ctx, else if (flags & COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH) { /* attach a newly created GL_DEPTH_COMPONENT16 texture to the - * GL_DEPTH_ATTACHMENT attachement point */ + * GL_DEPTH_ATTACHMENT attachment point */ g_assert (_cogl_texture_get_format (depth_texture) == COGL_PIXEL_FORMAT_DEPTH_16); @@ -1187,7 +1187,7 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer, framebuffer, COGL_FRAMEBUFFER_STATE_BIND); - /* The y co-ordinate should be given in OpenGL's coordinate system + /* The y coordinate should be given in OpenGL's coordinate system * so 0 is the bottom row * * NB: all offscreen rendering is done upside down so no conversion @@ -1330,7 +1330,7 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer, COGL_BUFFER_ACCESS_WRITE, 0, /* hints */ &internal_error); - /* NB: _cogl_bitmap_gl_bind() can return NULL in sucessfull + /* NB: _cogl_bitmap_gl_bind() can return NULL in successful * cases so we have to explicitly check the cogl error pointer * to know if there was a problem */ if (internal_error) diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c index 4d754d9b3..42986c306 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c @@ -55,7 +55,7 @@ #include /* - * GL/GLES compatability defines for pipeline thingies: + * GL/GLES compatibility defines for pipeline thingies: */ /* This might not be defined on GLES */ diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h index 62846237c..3626fd16c 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h +++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h @@ -45,7 +45,7 @@ * * Roughly speaking the members in this structure are of two kinds: * either they are a low level reflection of the state we send to - * OpenGL or they are for high level meta data assoicated with the + * OpenGL or they are for high level meta data associated with the * texture unit when flushing CoglPipelineLayers that is typically * used to optimize subsequent re-flushing of the same layer. * @@ -92,7 +92,7 @@ typedef struct _CoglTextureUnit * Higher level layer state associated with the unit... */ - /* The CoglPipelineLayer whos state was flushed to update this + /* The CoglPipelineLayer whose state was flushed to update this * texture unit last. * * This will be set to NULL if the layer is modified or freed which @@ -102,7 +102,7 @@ typedef struct _CoglTextureUnit CoglPipelineLayer *layer; /* To help minimize the state changes required we track the - * difference flags associated with the layer whos state was last + * difference flags associated with the layer whose state was last * flushed to update this texture unit. * * Note: we track this explicitly because .layer may get invalidated diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c index da13e293b..b99b74efe 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c @@ -51,7 +51,7 @@ #include /* - * GL/GLES compatability defines for pipeline thingies: + * GL/GLES compatibility defines for pipeline thingies: */ /* These aren't defined in the GLES headers */ @@ -883,7 +883,7 @@ fragend_add_layer_cb (CoglPipelineLayer *layer, * Details of override options: * ->fallback_mask: is a bitmask of the pipeline layers that need to be * replaced with the default, fallback textures. The fallback textures are - * fully transparent textures so they hopefully wont contribute to the + * fully transparent textures so they hopefully won't contribute to the * texture combining. * * The intention of fallbacks is to try and preserve @@ -918,7 +918,7 @@ fragend_add_layer_cb (CoglPipelineLayer *layer, * XXX: It might also help if we could specify a texture matrix for code * dealing with slicing that would be multiplied with the users own matrix. * - * Normaly texture coords in the range [0, 1] refer to the extents of the + * Normally texture coords in the range [0, 1] refer to the extents of the * texture, but when your GL texture represents a slice of the real texture * (from the users POV) then a texture matrix would be a neat way of * transforming the mapping for each slice. diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c index 083308ced..b9b6048fd 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c @@ -129,7 +129,7 @@ typedef struct /* The 'flip' uniform is used to flip the geometry upside-down when the framebuffer requires it only when there are vertex - snippets. Otherwise this is acheived using the projection + snippets. Otherwise this is achieved using the projection matrix */ GLint flip_uniform; int flushed_flip_state; diff --git a/cogl/cogl/driver/gl/cogl-util-gl-private.h b/cogl/cogl/driver/gl/cogl-util-gl-private.h index c3f550863..c5f432cc8 100644 --- a/cogl/cogl/driver/gl/cogl-util-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-util-gl-private.h @@ -125,7 +125,7 @@ _cogl_context_get_gl_version (CoglContext *context); * the "OpenGL ES" part on GLES). The version number can be followed * by the end of the string, a space or a full stop. Anything else * will be treated as invalid. Returns TRUE and sets major_out and - * minor_out if it is succesfully parsed or FALSE otherwise. */ + * minor_out if it is successfully parsed or FALSE otherwise. */ gboolean _cogl_gl_util_parse_gl_version (const char *version_string, int *major_out, diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c index f254de711..5e95d05a7 100644 --- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -202,7 +202,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx, data = _cogl_bitmap_gl_bind (source_bmp, COGL_BUFFER_ACCESS_READ, 0, &internal_error); - /* NB: _cogl_bitmap_gl_bind() may return NULL when successfull so we + /* NB: _cogl_bitmap_gl_bind() may return NULL when successful so we * have to explicitly check the cogl error pointer to catch * problems... */ if (internal_error) diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c index c9d652cf5..904d39d34 100644 --- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -258,7 +258,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx, data = _cogl_bitmap_gl_bind (slice_bmp, COGL_BUFFER_ACCESS_READ, 0, &internal_error); - /* NB: _cogl_bitmap_gl_bind() may return NULL when successfull so we + /* NB: _cogl_bitmap_gl_bind() may return NULL when successful so we * have to explicitly check the cogl error pointer to catch * problems... */ if (internal_error) diff --git a/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h b/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h index bbe4912bc..a65586ce1 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h +++ b/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h @@ -41,7 +41,7 @@ * COGL_WINSYS_FEATURE_END () * * Note: You can list multiple namespace and extension names if the - * corresponding _FEATURE_FUNCTIONS have the same semantics accross + * corresponding _FEATURE_FUNCTIONS have the same semantics across * the different extension variants. * * XXX: NB: Don't add a trailing semicolon when using these macros diff --git a/cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h b/cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h index e6be46502..31e73dbc2 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h +++ b/cogl/cogl/winsys/cogl-winsys-glx-feature-functions.h @@ -43,7 +43,7 @@ * COGL_WINSYS_FEATURE_END () * * Note: You can list multiple namespace and extension names if the - * corresponding _FEATURE_FUNCTIONS have the same semantics accross + * corresponding _FEATURE_FUNCTIONS have the same semantics across * the different extension variants. * * XXX: NB: Don't add a trailing semicolon when using these macros diff --git a/cogl/test-fixtures/test-utils.h b/cogl/test-fixtures/test-utils.h index b584badec..55cb70fe2 100644 --- a/cogl/test-fixtures/test-utils.h +++ b/cogl/test-fixtures/test-utils.h @@ -85,7 +85,7 @@ test_utils_fini (void); * * Creates a new #CoglTexture with the specified dimensions and pixel format. * - * The storage for the texture is not necesarily created before this + * The storage for the texture is not necessarily created before this * function returns. The storage can be explicitly allocated using * cogl_texture_allocate() or preferably you can let Cogl * automatically allocate the storage lazily when uploading data when @@ -156,8 +156,8 @@ test_utils_texture_new_from_bitmap (CoglBitmap *bitmap, /* * test_utils_check_pixel: * @framebuffer: The #CoglFramebuffer to read from - * @x: x co-ordinate of the pixel to test - * @y: y co-ordinate of the pixel to test + * @x: x coordinate of the pixel to test + * @y: y coordinate of the pixel to test * @pixel: An integer of the form 0xRRGGBBAA representing the expected * pixel value * @@ -173,8 +173,8 @@ test_utils_check_pixel (CoglFramebuffer *framebuffer, /** * @framebuffer: The #CoglFramebuffer to read from - * @x: x co-ordinate of the pixel to test - * @y: y co-ordinate of the pixel to test + * @x: x coordinate of the pixel to test + * @y: y coordinate of the pixel to test * @pixel: An integer of the form 0xRRGGBBAA representing the expected * pixel value * @@ -192,8 +192,8 @@ test_utils_check_pixel_and_alpha (CoglFramebuffer *fb, /* * test_utils_check_pixel: * @framebuffer: The #CoglFramebuffer to read from - * @x: x co-ordinate of the pixel to test - * @y: y co-ordinate of the pixel to test + * @x: x coordinate of the pixel to test + * @y: y coordinate of the pixel to test * @pixel: An integer of the form 0xrrggbb representing the expected pixel value * * This performs reads a pixel on the given cogl @framebuffer and @@ -209,8 +209,8 @@ test_utils_check_pixel_rgb (CoglFramebuffer *framebuffer, /* * test_utils_check_region: * @framebuffer: The #CoglFramebuffer to read from - * @x: x co-ordinate of the region to test - * @y: y co-ordinate of the region to test + * @x: x coordinate of the region to test + * @y: y coordinate of the region to test * @width: width of the region to test * @height: height of the region to test * @pixel: An integer of the form 0xrrggbb representing the expected region color diff --git a/cogl/tests/conform/test-blend.c b/cogl/tests/conform/test-blend.c index 720fcc02c..99c1e4687 100644 --- a/cogl/tests/conform/test-blend.c +++ b/cogl/tests/conform/test-blend.c @@ -38,7 +38,7 @@ paint (void) * attribute with an alpha component which implies blending is * required. * - * If Cogl gets this wrong then then in all likelyhood the second + * If Cogl gets this wrong then then in all likelihood the second * primitive will be drawn with blending still disabled. */ diff --git a/cogl/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c index 6480d921f..1d438fd67 100644 --- a/cogl/tests/conform/test-multitexture.c +++ b/cogl/tests/conform/test-multitexture.c @@ -190,9 +190,9 @@ test_multitexture (TestUtilsGTestFixture *fixture, group = clutter_actor_new (); clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); - /* We force continuous redrawing incase someone comments out the + /* We force continuous redrawing in case someone comments out the * clutter_test_quit and wants visual feedback for the test since we - * wont be doing anything else that will trigger redrawing. */ + * won't be doing anything else that will trigger redrawing. */ idle_source = g_idle_add (queue_redraw, stage); g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state); diff --git a/cogl/tests/conform/test-pipeline-uniforms.c b/cogl/tests/conform/test-pipeline-uniforms.c index d2b5e8f4d..a02f5d446 100644 --- a/cogl/tests/conform/test-pipeline-uniforms.c +++ b/cogl/tests/conform/test-pipeline-uniforms.c @@ -149,7 +149,7 @@ init_long_pipeline_state (TestState *state) state->long_pipeline = create_pipeline_for_shader (state, long_source); /* This tries to lookup a large number of uniform names to make sure - that the bitmask of overriden uniforms flows over the size of a + that the bitmask of overridden uniforms flows over the size of a single long so that it has to resort to allocating it */ for (i = 0; i < LONG_ARRAY_SIZE; i++) { diff --git a/cogl/tests/conform/test-primitive-and-journal.c b/cogl/tests/conform/test-primitive-and-journal.c index c6c943605..aa93a1f1c 100644 --- a/cogl/tests/conform/test-primitive-and-journal.c +++ b/cogl/tests/conform/test-primitive-and-journal.c @@ -87,7 +87,7 @@ test_primitive_and_journal (void) /* Draw a rectangle using the journal in-between the two primitives. * This should test that the journal gets flushed correctly and that * the modelview matrix is restored. Half of the rectangle should be - * overriden by the second primitive */ + * overridden by the second primitive */ cogl_framebuffer_draw_rectangle (test_fb, pipeline, 100, 0, /* x1/y1 */ diff --git a/cogl/tests/conform/test-readpixels.c b/cogl/tests/conform/test-readpixels.c index b94c35db6..003179436 100644 --- a/cogl/tests/conform/test-readpixels.c +++ b/cogl/tests/conform/test-readpixels.c @@ -159,7 +159,7 @@ test_readpixels (TestUtilsGTestFixture *fixture, clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); /* We force continuous redrawing of the stage, since we need to skip - * the first few frames, and we wont be doing anything else that + * the first few frames, and we won't be doing anything else that * will trigger redrawing. */ idle_source = g_idle_add (queue_redraw, stage); g_signal_connect_after (stage, "paint", G_CALLBACK (on_paint), NULL); diff --git a/cogl/tests/conform/test-texture-mipmaps.c b/cogl/tests/conform/test-texture-mipmaps.c index 547e6e560..4bab5e829 100644 --- a/cogl/tests/conform/test-texture-mipmaps.c +++ b/cogl/tests/conform/test-texture-mipmaps.c @@ -121,7 +121,7 @@ test_texture_mipmaps (TestUtilsGTestFixture *fixture, clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); /* We force continuous redrawing of the stage, since we need to skip - * the first few frames, and we wont be doing anything else that + * the first few frames, and we won't be doing anything else that * will trigger redrawing. */ idle_source = g_idle_add (queue_redraw, stage); diff --git a/cogl/tests/conform/test-viewport.c b/cogl/tests/conform/test-viewport.c index 56c04836f..e4d172872 100644 --- a/cogl/tests/conform/test-viewport.c +++ b/cogl/tests/conform/test-viewport.c @@ -397,7 +397,7 @@ test_viewport (TestUtilsGTestFixture *fixture, clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); /* We force continuous redrawing of the stage, since we need to skip - * the first few frames, and we wont be doing anything else that + * the first few frames, and we won't be doing anything else that * will trigger redrawing. */ idle_source = g_idle_add (queue_redraw, stage); g_signal_connect_after (stage, "paint", G_CALLBACK (on_paint), NULL); diff --git a/config.h.meson b/config.h.meson index f5c0e71a6..b2a23596f 100644 --- a/config.h.meson +++ b/config.h.meson @@ -49,7 +49,7 @@ /* Building with startup notification support */ #mesondefine HAVE_STARTUP_NOTIFICATION -/* Building with Sysprof profiling suport */ +/* Building with Sysprof profiling support */ #mesondefine HAVE_PROFILER /* Path to Xwayland executable */ diff --git a/meson_options.txt b/meson_options.txt index 655ef433f..601f0a773 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -150,7 +150,7 @@ option('xwayland_path', option('xwayland_grab_default_access_rules', type: 'string', value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + description: 'Comma delimited list of applications resources or class allowed to issue X11 grabs in Xwayland' ) option('xwayland_initfd', diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c index 8145565da..829c9f5ff 100644 --- a/src/backends/meta-backend.c +++ b/src/backends/meta-backend.c @@ -34,7 +34,7 @@ * - Input device configuration (using the #ClutterDeviceManager) * - Creating the #MetaRenderer * - Setting up the stage of the scene graph (using #MetaStage) - * - Creating the object that deals wih the cursor (using #MetaCursorTracker) + * - Creating the object that deals with the cursor (using #MetaCursorTracker) * and its possible pointer constraint (using #MetaPointerConstraint) * - Setting the cursor sprite (using #MetaCursorRenderer) * - Interacting with logind (using the appropriate D-Bus interface) @@ -1329,7 +1329,7 @@ meta_backend_get_client_pointer_constraint (MetaBackend *backend) * @constraint: (nullable): the client constraint to follow. * * Sets the current pointer constraint and removes (and unrefs) the previous - * one. If @constrant is %NULL, this means that there is no + * one. If @constraint is %NULL, this means that there is no * #MetaPointerConstraint active. */ void diff --git a/src/backends/meta-keymap-utils.c b/src/backends/meta-keymap-utils.c index 8b1e75411..123eb2303 100644 --- a/src/backends/meta-keymap-utils.c +++ b/src/backends/meta-keymap-utils.c @@ -34,7 +34,7 @@ meta_create_xkb_context (void) /* * We can only append search paths in libxkbcommon, so we start with an - * emtpy set, then add the XDG dir, then add the default search paths. + * empty set, then add the XDG dir, then add the default search paths. */ ctx = xkb_context_new (XKB_CONTEXT_NO_DEFAULT_INCLUDES); diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h index 424390d17..d5ef1da83 100644 --- a/src/backends/meta-logical-monitor.h +++ b/src/backends/meta-logical-monitor.h @@ -48,7 +48,7 @@ struct _MetaLogicalMonitor It can be matched to a winsys_id of a MetaOutput. This is used as an opaque token on reconfiguration when switching from - clone to extened, to decide on what output the windows should go next + clone to extended, to decide on what output the windows should go next (it's an attempt to keep windows on the same monitor, and preferably on the primary one). */ diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c index 0f03f409a..129b63285 100644 --- a/src/backends/meta-monitor-config-store.c +++ b/src/backends/meta-monitor-config-store.c @@ -1531,7 +1531,7 @@ meta_monitor_config_store_constructed (GObject *object) META_MONITOR_CONFIG_STORE_ERROR_NEEDS_MIGRATION)) g_warning ("System monitor configuration file (%s) is " "incompatible; ask your administrator to migrate " - "the system monitor configuation.", + "the system monitor configuration.", system_file_path); else g_warning ("Failed to read monitors config file '%s': %s", diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c index 4aaa516d7..ae7816a3b 100644 --- a/src/backends/meta-monitor.c +++ b/src/backends/meta-monitor.c @@ -73,7 +73,7 @@ typedef struct _MetaMonitorPrivate * It can be matched to a winsys_id of a MetaOutput. * * This is used as an opaque token on reconfiguration when switching from - * clone to extened, to decide on what output the windows should go next + * clone to extended, to decide on what output the windows should go next * (it's an attempt to keep windows on the same monitor, and preferably on * the primary one). */ diff --git a/src/backends/native/meta-input-device-native.c b/src/backends/native/meta-input-device-native.c index 3ba954806..bedfc2b86 100644 --- a/src/backends/native/meta-input-device-native.c +++ b/src/backends/native/meta-input-device-native.c @@ -494,7 +494,7 @@ update_stickykeys_event (ClutterEvent *event, static void notify_stickykeys_change (MetaInputDeviceNative *device) { - /* Everytime sticky keys setting is changed, clear the masks */ + /* Every time sticky keys setting is changed, clear the masks */ device->stickykeys_depressed_mask = 0; update_internal_xkb_state (device, 0, 0); diff --git a/src/backends/native/meta-renderer-native-gles3.c b/src/backends/native/meta-renderer-native-gles3.c index 43394cc64..c0eb77554 100644 --- a/src/backends/native/meta-renderer-native-gles3.c +++ b/src/backends/native/meta-renderer-native-gles3.c @@ -38,7 +38,7 @@ #include "backends/meta-gles3-table.h" /* - * GL/gl.h being included may conflit with gl3.h on some architectures. + * GL/gl.h being included may conflict with gl3.h on some architectures. * Make sure that hasn't happened on any architecture. */ #ifdef GL_VERSION_1_1 diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c index d561e322a..5aab09cd7 100644 --- a/src/backends/native/meta-seat-native.c +++ b/src/backends/native/meta-seat-native.c @@ -3142,7 +3142,7 @@ meta_seat_native_reclaim_devices (MetaSeatNative *seat) * @seat: the #ClutterSeat created by the evdev backend * @keymap: the new keymap * - * Instructs @evdev to use the speficied keyboard map. This will cause + * Instructs @evdev to use the specified keyboard map. This will cause * the backend to drop the state and create a new one with the new * map. To avoid state being lost, callers should ensure that no key * is pressed when calling this function. diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c index 1a29bbbac..88b99911f 100644 --- a/src/backends/x11/meta-seat-x11.c +++ b/src/backends/x11/meta-seat-x11.c @@ -958,7 +958,7 @@ translate_raw_event (MetaSeatX11 *seat_x11, /* We don't get actual pointer location with raw events, and we cannot * rely on `clutter_input_device_get_coords()` either because of * unreparented toplevels (like all client-side decoration windows), - * so we need to explicitely query the pointer here... + * so we need to explicitly query the pointer here... */ if (meta_input_device_x11_get_pointer_location (device, &x, &y)) _clutter_input_pointer_a11y_on_motion_event (device, x, y); diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 41a65be39..e5fc844a4 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -764,7 +764,7 @@ meta_compositor_switch_workspace (MetaCompositor *compositor, { priv->switch_workspace_in_progress--; - /* We have to explicitely call this to fix up stacking order of the + /* We have to explicitly call this to fix up stacking order of the * actors; this is because the abs stacking position of actors does not * necessarily change during the window hiding/unhiding, only their * relative position toward the destkop window. @@ -1057,7 +1057,7 @@ on_presented (ClutterStage *stage, * clock_gettime(CLOCK_MONOTONIC), so the same as g_get_monotonic_time), * but there's no exposure of that through the API. clock_gettime() * is fairly fast, so calling it twice and subtracting to get a - * nearly-zero number is acceptable, if a litle ugly. + * nearly-zero number is acceptable, if a little ugly. */ current_cogl_time = cogl_get_clock_time (priv->context); current_monotonic_time = g_get_monotonic_time (); @@ -1318,8 +1318,8 @@ meta_compositor_class_init (MetaCompositorClass *klass) * meta_disable_unredirect_for_display: * @display: a #MetaDisplay * - * Disables unredirection, can be usefull in situations where having - * unredirected windows is undesireable like when recording a video. + * Disables unredirection, can be useful in situations where having + * unredirected windows is undesirable like when recording a video. * */ void diff --git a/src/compositor/meta-background-image.c b/src/compositor/meta-background-image.c index a29e74380..ed9425bb3 100644 --- a/src/compositor/meta-background-image.c +++ b/src/compositor/meta-background-image.c @@ -222,7 +222,7 @@ out: * * Loads an image to use as a background, or returns a reference to an * image that is already in the process of loading or loaded. In either - * case, what is returned is a #MetaBackgroundImage which can be derefenced + * case, what is returned is a #MetaBackgroundImage which can be dereferenced * to get a #CoglTexture. If meta_background_image_is_loaded() returns %TRUE, * the background is loaded, otherwise the MetaBackgroundImage::loaded * signal will be emitted exactly once. The 'loaded' state means that the diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c index c4228fa37..d6bee655b 100644 --- a/src/compositor/meta-shadow-factory.c +++ b/src/compositor/meta-shadow-factory.c @@ -19,7 +19,7 @@ /** * SECTION:meta-shadow-factory * @title: MetaShadowFactory - * @short_description: Create and cache shadow textures for abritrary window shapes + * @short_description: Create and cache shadow textures for arbitrary window shapes */ #include "config.h" diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index 2d7facaa0..9eeb08146 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -1515,9 +1515,9 @@ meta_shaped_texture_new (void) * @stex: A #MetaShapedTexture * @buffer_scale: The scale that should be applied to coorsinate space * - * Instructs @stex to intepret the geometry of the input texture by scaling it + * Instructs @stex to interpret the geometry of the input texture by scaling it * with @buffer_scale. This means that the #CoglTexture that is provided by a - * client is alreay scaled by that factor. + * client is already scaled by that factor. */ void meta_shaped_texture_set_buffer_scale (MetaShapedTexture *stex, diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c index a1b419bbe..f9577e752 100644 --- a/src/compositor/meta-window-actor-x11.c +++ b/src/compositor/meta-window-actor-x11.c @@ -506,7 +506,7 @@ has_shadow (MetaWindowActorX11 *actor_x11) if (actor_x11->shadow_mode == META_SHADOW_MODE_FORCED_ON) return TRUE; - /* Leaving out shadows for maximized and fullscreen windows is an effeciency + /* Leaving out shadows for maximized and fullscreen windows is an efficiency * win and also prevents the unsightly effect of the shadow of maximized * window appearing on an adjacent window */ if ((meta_window_get_maximized (window) == META_MAXIMIZE_BOTH) || diff --git a/src/core/bell.c b/src/core/bell.c index d7000b250..f0c6f9463 100644 --- a/src/core/bell.c +++ b/src/core/bell.c @@ -33,7 +33,7 @@ * in visual mode and calls through to bell_visual_notify(). That * function then checks what kind of visual flash you like, and calls either * bell_flash_fullscreen()-- which calls bell_flash_screen() to do - * its work-- or bell_flash_frame(), which flashes the focussed window + * its work-- or bell_flash_frame(), which flashes the focused window * using bell_flash_window(), unless there is no such window, in * which case it flashes the screen instead. * diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h index 7616d6c92..d39816495 100644 --- a/src/core/boxes-private.h +++ b/src/core/boxes-private.h @@ -72,7 +72,7 @@ char* meta_rectangle_edge_list_to_string ( /* Resize old_rect to the given new_width and new_height, but store the * result in rect. NOTE THAT THIS IS RESIZE ONLY SO IT CANNOT BE USED FOR - * A MOVERESIZE OPERATION (that simplies the routine a little bit as it + * A MOVERESIZE OPERATION (that simplifies the routine a little bit as it * means there's no difference between META_GRAVITY_NORTH_WEST and * META_GRAVITY_STATIC. Also, I lied a little bit--technically, you could use * it in a MoveResize operation if you muck with old_rect just right). @@ -119,7 +119,7 @@ GList* meta_rectangle_expand_region_conditionally ( const int min_y); /* Expand rect in direction to the size of expand_to, and then clip out any - * overlapping struts oriented orthognal to the expansion direction. (Think + * overlapping struts oriented orthogonal to the expansion direction. (Think * horizontal or vertical maximization) */ META_EXPORT_TEST diff --git a/src/core/constraints.c b/src/core/constraints.c index 61ed2c049..168a55b8a 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -681,7 +681,7 @@ get_size_limits (MetaWindow *window, MetaRectangle *min_size, MetaRectangle *max_size) { - /* We pack the results into MetaRectangle structs just for convienience; we + /* We pack the results into MetaRectangle structs just for convenience; we * don't actually use the position of those rects. */ min_size->x = min_size->y = max_size->x = max_size->y = 0; diff --git a/src/core/display.c b/src/core/display.c index 4f2ed6c60..d0bf2ab14 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1546,7 +1546,7 @@ meta_display_lookup_stack_id (MetaDisplay *display, } /* We return a pointer into a ring of static buffers. This is to make - * using this function for debug-logging convenient and avoid tempory + * using this function for debug-logging convenient and avoid temporary * strings that must be freed. */ const char * meta_display_describe_stack_id (MetaDisplay *display, @@ -2215,7 +2215,7 @@ meta_display_ping_window (MetaWindow *window, /** * meta_display_pong_for_serial: * @display: the display we got the pong from - * @serial: the serial in the pong repsonse + * @serial: the serial in the pong response * * Process the pong (the response message) from the ping we sent * to the window. This involves removing the timeout, calling the @@ -2371,7 +2371,7 @@ mru_cmp (gconstpointer a, * * Determine the list of windows that should be displayed for Alt-TAB * functionality. The windows are returned in most recently used order. - * If @workspace is not %NULL, the list only conains windows that are on + * If @workspace is not %NULL, the list only contains windows that are on * @workspace or have the demands-attention hint set; otherwise it contains * all windows. * diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 48d693577..cbf78d0b5 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -1049,7 +1049,7 @@ meta_display_add_keybinding (MetaDisplay *display, * Remove keybinding @name; the function will fail if @name is not a known * keybinding or has not been added with meta_display_add_keybinding(). * - * Returns: %TRUE if the binding has been removed sucessfully, + * Returns: %TRUE if the binding has been removed successfully, * otherwise %FALSE */ gboolean diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c index 36d0b9bcd..f0ec1f09c 100644 --- a/src/core/meta-workspace-manager.c +++ b/src/core/meta-workspace-manager.c @@ -238,7 +238,7 @@ meta_workspace_manager_new (MetaDisplay *display) /* This is the default layout extracted from default * variable values in update_num_workspaces () - * This can be overriden using _NET_DESKTOP_LAYOUT in + * This can be overridden using _NET_DESKTOP_LAYOUT in * meta_x11_display_new (), if it's specified */ meta_workspace_manager_update_workspace_layout (workspace_manager, META_DISPLAY_TOPLEFT, @@ -497,7 +497,7 @@ meta_workspace_manager_update_num_workspaces (MetaWorkspaceManager *workspace_ma * @new_index: the new index of the passed workspace * * Reorder a workspace to a new index. If the workspace is currently active - * the "active-workspace-changed" signal will be emited. + * the "active-workspace-changed" signal will be emitted. * If the workspace's index is the same as @new_index or the workspace * will not be found in the list, this function will return. * diff --git a/src/core/stack.c b/src/core/stack.c index f7e0f1b90..56e810ff2 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -728,7 +728,7 @@ ensure_above (MetaWindow *above, if (is_transient && above->layer < below->layer) { meta_topic (META_DEBUG_STACK, - "Promoting window %s from layer %u to %u due to contraint\n", + "Promoting window %s from layer %u to %u due to constraint\n", above->desc, above->layer, below->layer); above->layer = below->layer; } diff --git a/src/core/window.c b/src/core/window.c index 07fca38a8..681805c06 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -5361,7 +5361,7 @@ meta_window_set_focused_internal (MetaWindow *window, * will be provided set by the task bar or other user interface element * displaying the icon, and is relative to the root window. * - * Return value: %TRUE if the icon geometry was succesfully retrieved. + * Return value: %TRUE if the icon geometry was successfully retrieved. */ gboolean meta_window_get_icon_geometry (MetaWindow *window, diff --git a/src/core/workspace.c b/src/core/workspace.c index 7217ddcee..64a0d259c 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -173,7 +173,7 @@ meta_workspace_get_property (GObject *object, case PROP_N_WINDOWS: /* * This is reliable, but not very efficient; should we store - * the list lenth ? + * the list length ? */ g_value_set_uint (value, g_list_length (ws->windows)); break; @@ -1207,7 +1207,7 @@ meta_motion_direction_to_string (MetaMotionDirection direction) * @workspace: a #MetaWorkspace * @direction: a #MetaMotionDirection, relative to @workspace * - * Calculate and retrive the workspace that is next to @workspace, + * Calculate and retrieve the workspace that is next to @workspace, * according to @direction and the current workspace layout, as set * by meta_screen_override_workspace_layout(). * diff --git a/src/meta/common.h b/src/meta/common.h index c4f634bd7..ab9308049 100644 --- a/src/meta/common.h +++ b/src/meta/common.h @@ -456,14 +456,14 @@ void meta_frame_borders_clear (MetaFrameBorders *self); #define META_DEFAULT_ICON_NAME "window" /* Main loop priorities determine when activity in the GLib - * will take precendence over the others. Priorities are sometimes + * will take precedence over the others. Priorities are sometimes * used to enforce ordering: give A a higher priority than B if * A must occur before B. But that poses a problem since then * if A occurs frequently enough, B will never occur. * * Anything we want to occur more or less immediately should * have a priority of G_PRIORITY_DEFAULT. When we want to - * coelesce multiple things together, the appropriate place to + * coalesce multiple things together, the appropriate place to * do it is usually META_PRIORITY_BEFORE_REDRAW. * * Note that its usually better to use meta_later_add() rather @@ -476,7 +476,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self); * delayed. This happens if the screen is updating rapidly: we * are spending all our time either redrawing or waiting for a * vblank-synced buffer swap. (When X is improved to allow - * clutter to do the buffer-swap asychronously, this will get + * clutter to do the buffer-swap asynchronously, this will get * better.) */ diff --git a/src/org.gnome.Mutter.DisplayConfig.xml b/src/org.gnome.Mutter.DisplayConfig.xml index ec04649fa..495bebca1 100644 --- a/src/org.gnome.Mutter.DisplayConfig.xml +++ b/src/org.gnome.Mutter.DisplayConfig.xml @@ -101,7 +101,7 @@ or not - "presentation" (b): whether this output is for presentation only - Note: properties might be ignored if not consistenly + Note: properties might be ignored if not consistently applied to all outputs in the same clone group. In general, it's expected that presentation or primary outputs will not be cloned. @@ -360,7 +360,7 @@ @layout_mode current layout mode represents the way logical monitors - are layed out on the screen. Possible modes include: + are laid out on the screen. Possible modes include: 1 : physical 2 : logical diff --git a/src/tests/clutter/accessibility/cally-atkevents-example.c b/src/tests/clutter/accessibility/cally-atkevents-example.c index 3d7e67cde..a94b7880a 100644 --- a/src/tests/clutter/accessibility/cally-atkevents-example.c +++ b/src/tests/clutter/accessibility/cally-atkevents-example.c @@ -147,7 +147,7 @@ main (int argc, char *argv[]) if (cally_util_a11y_init (&argc, &argv) == FALSE) { g_error ("This example requires the accessibility support, " - "especifically AtkUtil implementation loaded, " + "specifically AtkUtil implementation loaded, " "as it tries to register and remove event listeners"); } diff --git a/src/tests/clutter/conform/actor-pivot-point.c b/src/tests/clutter/conform/actor-pivot-point.c index 6bbd07873..fc196b03f 100644 --- a/src/tests/clutter/conform/actor-pivot-point.c +++ b/src/tests/clutter/conform/actor-pivot-point.c @@ -29,10 +29,10 @@ actor_pivot (void) clutter_actor_set_pivot_point (actor_implicit, 0.5, 0.5); clutter_actor_set_pivot_point (actor_explicit, 0.5, 0.5); - /* Implict transformation */ + /* Implicit transformation */ clutter_actor_set_rotation_angle (actor_implicit, CLUTTER_Z_AXIS, angle); - /* Explict transformation */ + /* Explicit transformation */ clutter_matrix_init_identity(&transform); cogl_matrix_rotate (&transform, angle, 0, 0, 1.0); clutter_actor_set_transform (actor_explicit, &transform); diff --git a/src/tests/clutter/interactive/test-cogl-tex-polygon.c b/src/tests/clutter/interactive/test-cogl-tex-polygon.c index 77e8feccd..2479a3d7c 100644 --- a/src/tests/clutter/interactive/test-cogl-tex-polygon.c +++ b/src/tests/clutter/interactive/test-cogl-tex-polygon.c @@ -218,7 +218,7 @@ test_coglbox_paint (ClutterActor *self, cogl_framebuffer_rotate (framebuffer, priv->frame, 0, 1, 0); cogl_framebuffer_translate (framebuffer, -tex_width / 2, 0, 0); - /* Draw a hand and refect it */ + /* Draw a hand and reflect it */ cogl_framebuffer_draw_textured_rectangle (framebuffer, material, 0, 0, tex_width, tex_height, 0, 0, 1, 1); diff --git a/src/tests/clutter/interactive/test-grab.c b/src/tests/clutter/interactive/test-grab.c index 4127d3e80..595aac220 100644 --- a/src/tests/clutter/interactive/test-grab.c +++ b/src/tests/clutter/interactive/test-grab.c @@ -217,9 +217,9 @@ test_grab_main (int argc, char *argv[]) clutter_test_init (&argc, &argv); - g_print ("Red box: aquire grab on press, releases it on next button release\n"); - g_print ("Blue box: aquire grab on press, destroys the blue box actor on release\n"); - g_print ("Yellow box: aquire grab on press, releases grab on next press on yellow box\n"); + g_print ("Red box: acquire grab on press, releases it on next button release\n"); + g_print ("Blue box: acquire grab on press, destroys the blue box actor on release\n"); + g_print ("Yellow box: acquire grab on press, releases grab on next press on yellow box\n"); g_print ("Green box: toggle per actor motion events.\n\n"); g_print ("Cyan box: toggle grab (from cyan box) for keyboard events.\n\n"); diff --git a/src/tests/clutter/performance/create-report.rb b/src/tests/clutter/performance/create-report.rb index 43defc4af..9a58fdb89 100755 --- a/src/tests/clutter/performance/create-report.rb +++ b/src/tests/clutter/performance/create-report.rb @@ -23,7 +23,7 @@ class Database [1,0,1, 0.8], [1,1,0, 0.8], #[0.5,0.5,0.5,0.8], - # gray doesnt have sufficient contrast against background + # gray doesn't have sufficient contrast against background [0.5,0.5,1, 0.8], [0.5,1,0.5, 0.8], [0.5,1,1, 0.8], diff --git a/src/tests/clutter/performance/test-common.h b/src/tests/clutter/performance/test-common.h index bf8e1b61b..caab59c4d 100644 --- a/src/tests/clutter/performance/test-common.h +++ b/src/tests/clutter/performance/test-common.h @@ -16,7 +16,7 @@ clutter_perf_fps_init (void) g_setenv ("vblank_mode", "0", FALSE); g_setenv ("CLUTTER_VBLANK", "none", FALSE); - /* also overrride internal default FPS */ + /* also override internal default FPS */ g_setenv ("CLUTTER_DEFAULT_FPS", "1000", FALSE); if (g_getenv ("CLUTTER_PERFORMANCE_TEST_DURATION")) @@ -89,7 +89,7 @@ static gboolean perf_fake_mouse_cb (gpointer stage) if (!inited) /* XXX: force clutter to do handle our motion events, by forcibly updating the input device's state - this shoudl be possible to do in a better + this should be possible to do in a better manner in the future, a versioning check will have to be added when this is possible without a hack... and the means to do the diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c index 577c4dcae..1a5ccd944 100644 --- a/src/tests/test-runner.c +++ b/src/tests/test-runner.c @@ -175,7 +175,7 @@ test_case_parse_window_id (TestCase *test, const char *slash = strchr (client_and_window_id, '/'); char *tmp; if (slash == NULL) - BAD_COMMAND ("client/window ID %s doesnt' contain a /", client_and_window_id); + BAD_COMMAND ("client/window ID %s doesn't contain a /", client_and_window_id); *window_id = slash + 1; @@ -1131,7 +1131,7 @@ main (int argc, char **argv) g_free (curdir); } - /* Then initalize mutter with a different set of arguments */ + /* Then initialize mutter with a different set of arguments */ char *fake_args[] = { NULL, (char *)"--wayland", (char *)"--nested" }; fake_args[0] = argv[0]; diff --git a/src/tests/wayland-test-clients/meta-anonymous-file.c b/src/tests/wayland-test-clients/meta-anonymous-file.c index 70f739866..a998cc406 100644 --- a/src/tests/wayland-test-clients/meta-anonymous-file.c +++ b/src/tests/wayland-test-clients/meta-anonymous-file.c @@ -207,7 +207,7 @@ main (int argc, meta_anonymous_file_close_fd (other_fd); - /* Test an artificial out-of-space situation by setting the maximium file + /* Test an artificial out-of-space situation by setting the maximum file * size this process may create to 2 bytes, if memfd_create with * MAPMODE_PRIVATE is used, everything should still work (the existing FD * should be used). */ diff --git a/src/ui/ui.c b/src/ui/ui.c index 64afb0134..2fbaad993 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -64,7 +64,7 @@ meta_ui_new (MetaX11Display *x11_display) * handle style changes. This means that the dummy widget we create * to get the style for title bars actually needs to be mapped * and fully tracked as a MetaWindow. Horrible, but mostly harmless - - * the window is a 1x1 overide redirect window positioned offscreen. + * the window is a 1x1 override redirect window positioned offscreen. */ gtk_widget_show (GTK_WIDGET (ui->frames)); diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c index 5a5a20c78..3c0321ce0 100644 --- a/src/wayland/meta-wayland-dma-buf.c +++ b/src/wayland/meta-wayland-dma-buf.c @@ -695,7 +695,7 @@ dma_buf_bind (struct wl_client *client, * * Creates the global Wayland object that exposes the linux-dmabuf protocol. * - * Returns: Whether the initialization was succesfull. If this is %FALSE, + * Returns: Whether the initialization was successful. If this is %FALSE, * clients won't be able to use the linux-dmabuf protocol to pass buffers. */ gboolean diff --git a/src/x11/events.c b/src/x11/events.c index 8ca2fb983..8c78b2ff1 100644 --- a/src/x11/events.c +++ b/src/x11/events.c @@ -1386,7 +1386,7 @@ handle_other_xevent (MetaX11Display *x11_display, } break; case MapNotify: - /* NB: override redirect windows wont cause a map request so we + /* NB: override redirect windows won't cause a map request so we * watch out for map notifies against any root windows too if a * compositor is enabled: */ if (window == NULL && event->xmap.event == x11_display->xroot) diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index 87d8a2bfa..525d0cab6 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -448,7 +448,7 @@ query_xi_extension (MetaX11Display *x11_display) } /* - * Initialises the bell subsystem. This involves intialising + * Initialises the bell subsystem. This involves initialising * XKB (which, despite being a keyboard extension, is the * place to look for bell notifications), then asking it * to send us bell notifications, and then also switching diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index ff8361540..ea9e82c8f 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -1505,7 +1505,7 @@ meta_window_x11_move_resize_internal (MetaWindow *window, * we grow the frame more than we shrink. The idea is to avoid * messing up the window contents by having a temporary situation * where the frame is smaller than the window. However, if we're - * cooperating with the client to create an atomic frame upate, + * cooperating with the client to create an atomic frame update, * and the window is redirected, then we should always update * the frame first, since updating the frame will force a new * backing pixmap to be allocated, and the old backing pixmap