Skip to content
Commits on Jan 3, 2015
  1. Merge branch 'clutter-1.22' back into master

    This is the bulk of the clutter-1.22 → master merge.
    The clutter-1.22 branch is where the current development of Clutter
    happens, and contains all the history of the project after the API
    bump branch point.
  2. WARNING: Massive revert commit

    Revert all the work that happened on the master branch.
    Sadly, this is the only way to merge the current development branch back
    into master.
    It is now abundantly clear that I merged the 1.99 branch far too soon,
    and that Clutter 2.0 won't happen any time soon, if at all.
    Since having the development happen on a separate branch throws a lot of
    people into confusion, let's undo the clutter-1.99 → master merge, and
    move back the development of Clutter to the master branch.
    In order to do so, we need to do some surgery to the Git repository.
    First, we do a massive revert in a single commit of all that happened
    since the switch to 1.99 and the API version bump done with the
    89a2862 commit. The history is too long
    to be reverted commit by commit without being extremely messy.
Commits on Jan 2, 2015
  1. build: Use `env` instead of TestEnvironment key

    We rely on having the DISPLAY environment variable set, otherwise we
    default to skipping all tests automatically. The TestEnvironment key
    inside the installed test launcher keyfile replaces the whole
    environment, instead of just adding to it like the TESTS_ENVIRONMENT
    automake variable.
Commits on Jan 1, 2015
  1. build: Drop ad hoc gitignore generation rules

    Instead, include
  2. build: Fix up gitignore generation rules

    Use more sources, and allow adding files to the ignore list when
  3. Ignore automake droppings

  4. Remove unused pointer

    The PangoContext has been moved into ClutterActor.
  5. Remove global "actor id"

    It's absolutely, positively pointless. Every surviving call has long
    since been deprecated, and should have not been public in the first
  6. Improve debugging notes for main loop start/stop

    This way, we can track when we quit the main loop.
  7. Improve the warning message in clutter_main_quit()

    If you call clutter_main_quit() without calling clutter_main()
    [ South Park ski instructor]
    You're going to have a bad time.
  8. actor: Do not restore the easing state in finalize()

    The easing state is part of the AnimationInfo structure, which is stored
    inside the GObject's datalist. Each instance frees the data stored there
    during finalization, so there is no point for us to restore an easing
    state (which may or may not be the last one) just to have everything
    cleared out once we chain up to GObject's own finalize() implementation.
  9. stage: Use the symbolic constant for event handled

    Clarifies the intent for everybody.
  10. Use the proper debug category

    Backend-related notes should use the `BACKEND` category, not `MISC`.
Commits on Dec 16, 2014
  1. Add proper annotations for the test utilities

    This avoids g-ir-scanner complaining.
  2. Revert "bind-constraint: Update the preferred size"

    This reverts commit fcc67e9.
    It seems this causes some recursion overflow in GNOME Shell's usage of
    constraints, and needs more investigation.
  3. constraint: Fix update_allocation()'s return value

    The update_allocation() method returns TRUE if the allocation was
  4. bind-constraint: Update the preferred size

    Bind the preferred size of an actor using a BindConstraint to the
    preferred size of the source of the constraint, depending on the
    coordinate of the constraint.
  5. actor: Update preferred size using constraints

    If an actor has any constraint that may affect its preferred size, then
    it should query them when computing its preferred size.
  6. constraint: Add the ability to update the preferred size

    Constraints can only update an existing allocation, which means they
    live only halfway through the layout management system used by Clutter;
    this limitation makes it impossible, for instance, to query the
    preferred size of an actor, if the actor is only using constraints to
    manage its own size.
  7. constraint: Add a private header

    And move the only private ClutterConstraint method to it.
    This commit also sneaks in a change that makes sense for the debugging
    of the update_allocation() method, which checks if the allocation was
    effectively changed.
  8. Release Clutter 1.21.2

  9. build: Fix out-of-tree builds

    Add a srcdir prefix to the inspected files for glib-mkenums.
Commits on Dec 15, 2014
  1. Use new introspection annotation syntax

    Instead of the deprecated one.
  2. Bump up the requirement for GLib and introspection

    The syntax for some introspection annotations has changed between 1.38
    and 1.39, so we need to bump up the dependency in order to get the new
    scanner. Introspection should be updated in lock-step with GLib, so we
    should also bump up the required GLib version.
  3. actor: Queue a relayout if we use the content's preferred size

    In case the ClutterContent changes, and the actor uses the content's
    preferred size to drive its own.
  4. build: Use subdir-objects

  5. Fix the version number

    This is a development cycle.
  6. @sjoerd-ccu

    device-manager-xi2: Fix core pointer retrieval race

    sjoerd-ccu committed with
    The core pointer concept doesn't really exist anymore in an XI2 world,
    so the clutter API is a bit of a mismatch with what X provides. Using
    XIGetClientPointer doesn't really help, as far as i can tell the
    semantics of XIGetClientPointer are essentially: Whatever the X server
    picked when it had to reply with device-dependant data to a query
    without a device specifier. Not very useful...
    To make matters worse, whether XIGetClientPointer returns a valid
    pointer depends on whether there has been a query that forced it to pick
    one in the first place, making the whole thing pretty non-deterministic.
    This patch changes things around such that instead of using
    XIGetClientPointer to determine the core pointer, we simply pick the
    first master pointer device. In practise this will essentially always
    be the X virtual core pointer.
  7. @jadahl

    DeviceManagerXi2: Update cached core pointer in getter if NULL

    jadahl committed with
    XIGetClientPointer() may return the device id '0' when called early.
    This patch makes pointer cursors work in nested mutter Wayland
    sessions again.
Something went wrong with that request. Please try again.