From 43f24b03e5ef36f2b77b183478dde6c96f96085b Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui
Date: Fri, 2 Aug 2024 16:09:56 +0200
Subject: [PATCH] cally: Merge inside Clutter
Only do the build system bits, we would have to rename
the types and expose at least CallyActor as ClutterActorAccessible
Part-of:
---
.gitlab-ci.yml | 2 +-
README.md | 1 -
.../clutter/{cally => }/cally-actor-private.h | 2 +-
clutter/clutter/{cally => }/cally-actor.c | 4 +-
clutter/clutter/{cally => }/cally-actor.h | 6 +-
clutter/clutter/{cally => }/cally-clone.c | 4 +-
clutter/clutter/{cally => }/cally-clone.h | 8 +-
clutter/clutter/{cally => }/cally-root.c | 2 +-
clutter/clutter/{cally => }/cally-root.h | 6 +-
clutter/clutter/{cally => }/cally-stage.c | 5 +-
clutter/clutter/{cally => }/cally-stage.h | 8 +-
clutter/clutter/{cally => }/cally-text.c | 4 +-
clutter/clutter/{cally => }/cally-text.h | 7 +-
clutter/clutter/{cally => }/cally-util.c | 8 +-
clutter/clutter/{cally => }/cally-util.h | 8 +-
.../clutter/cally/ChangeLog.pre-cally-merge | 986 ------------------
clutter/clutter/cally/cally.h | 32 -
clutter/clutter/clutter-actor.c | 2 +-
clutter/clutter/clutter-clone.c | 2 +-
clutter/clutter/clutter-context.c | 2 +-
clutter/clutter/clutter-main.c | 2 +-
clutter/clutter/clutter-stage.c | 2 +-
clutter/clutter/clutter-text.c | 2 +-
clutter/clutter/clutter.h | 6 +
clutter/clutter/meson.build | 59 +-
doc/reference/cally/cally.toml.in | 41 -
doc/reference/cally/logo.svg | 1 -
doc/reference/cally/meson.build | 35 -
doc/reference/cally/urlmap.js | 11 -
doc/reference/meson.build | 3 +-
doc/reference/meta/meson.build | 1 -
doc/website/index.html | 5 -
.../accessibility/cally-atkevents-example.c | 1 -
33 files changed, 67 insertions(+), 1201 deletions(-)
rename clutter/clutter/{cally => }/cally-actor-private.h (97%)
rename clutter/clutter/{cally => }/cally-actor.c (99%)
rename clutter/clutter/{cally => }/cally-actor.h (90%)
rename clutter/clutter/{cally => }/cally-clone.c (97%)
rename clutter/clutter/{cally => }/cally-clone.h (87%)
rename clutter/clutter/{cally => }/cally-root.c (99%)
rename clutter/clutter/{cally => }/cally-root.h (89%)
rename clutter/clutter/{cally => }/cally-stage.c (96%)
rename clutter/clutter/{cally => }/cally-stage.h (86%)
rename clutter/clutter/{cally => }/cally-text.c (99%)
rename clutter/clutter/{cally => }/cally-text.h (87%)
rename clutter/clutter/{cally => }/cally-util.c (99%)
rename clutter/clutter/{cally => }/cally-util.h (88%)
delete mode 100644 clutter/clutter/cally/ChangeLog.pre-cally-merge
delete mode 100644 clutter/clutter/cally/cally.h
delete mode 100644 doc/reference/cally/cally.toml.in
delete mode 120000 doc/reference/cally/logo.svg
delete mode 100644 doc/reference/cally/meson.build
delete mode 100644 doc/reference/cally/urlmap.js
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03106ff1d..725157d6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -762,7 +762,7 @@ reference:
script:
- mkdir references
- cp -r doc/website/* ./references
- - mv build/doc/reference/{cally/cally,clutter/clutter,cogl/cogl,cogl-pango/cogl-pango,meta/meta,mtk/mtk} references/
+ - mv build/doc/reference/{clutter/clutter,cogl/cogl,cogl-pango/cogl-pango,meta/meta,mtk/mtk} references/
artifacts:
expire_in: 1 week
expose_as: 'Documentation'
diff --git a/README.md b/README.md
index fc913748d..fb3c2cf8a 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,6 @@ documentation and API references below first.
- Meta:
- Clutter:
-- Cally:
- Cogl:
- CoglPango:
- Mtk:
diff --git a/clutter/clutter/cally/cally-actor-private.h b/clutter/clutter/cally-actor-private.h
similarity index 97%
rename from clutter/clutter/cally/cally-actor-private.h
rename to clutter/clutter/cally-actor-private.h
index 0de920e33..f700fd1e3 100644
--- a/clutter/clutter/cally/cally-actor-private.h
+++ b/clutter/clutter/cally-actor-private.h
@@ -24,7 +24,7 @@
#pragma once
-#include "cally/cally-actor.h"
+#include "clutter/cally-actor.h"
/*
* Auxiliary define, in order to get the clutter actor from the AtkObject using
diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally-actor.c
similarity index 99%
rename from clutter/clutter/cally/cally-actor.c
rename to clutter/clutter/cally-actor.c
index c11df1a53..723e1184e 100644
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally-actor.c
@@ -75,8 +75,8 @@
#include
-#include "cally/cally-actor.h"
-#include "cally/cally-actor-private.h"
+#include "clutter/cally-actor.h"
+#include "clutter/cally-actor-private.h"
static void cally_actor_initialize (AtkObject *obj,
gpointer data);
diff --git a/clutter/clutter/cally/cally-actor.h b/clutter/clutter/cally-actor.h
similarity index 90%
rename from clutter/clutter/cally/cally-actor.h
rename to clutter/clutter/cally-actor.h
index dadb052a7..6e03dadd3 100644
--- a/clutter/clutter/cally/cally-actor.h
+++ b/clutter/clutter/cally-actor.h
@@ -24,13 +24,13 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
#include
-#include "clutter/clutter.h"
+#include "clutter/clutter-macros.h"
G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally-clone.c b/clutter/clutter/cally-clone.c
similarity index 97%
rename from clutter/clutter/cally/cally-clone.c
rename to clutter/clutter/cally-clone.c
index 83ea2f1d8..428b090f9 100644
--- a/clutter/clutter/cally/cally-clone.c
+++ b/clutter/clutter/cally-clone.c
@@ -68,8 +68,8 @@
*/
#include "config.h"
-#include "cally/cally-clone.h"
-#include "cally/cally-actor-private.h"
+#include "clutter/cally-clone.h"
+#include "clutter/cally-actor-private.h"
/* AtkObject */
static void cally_clone_real_initialize (AtkObject *obj,
diff --git a/clutter/clutter/cally/cally-clone.h b/clutter/clutter/cally-clone.h
similarity index 87%
rename from clutter/clutter/cally/cally-clone.h
rename to clutter/clutter/cally-clone.h
index 15eb03dd2..72db5ab24 100644
--- a/clutter/clutter/cally/cally-clone.h
+++ b/clutter/clutter/cally-clone.h
@@ -20,12 +20,12 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
-#include "clutter/clutter.h"
-#include "cally/cally-actor.h"
+#include "clutter/cally-actor.h"
G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally-root.c b/clutter/clutter/cally-root.c
similarity index 99%
rename from clutter/clutter/cally/cally-root.c
rename to clutter/clutter/cally-root.c
index 0281e5a03..815e4bc2d 100644
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally-root.c
@@ -35,7 +35,7 @@
#include "config.h"
-#include "cally/cally-root.h"
+#include "clutter/cally-root.h"
#include "clutter/clutter-actor.h"
#include "clutter/clutter-stage-private.h"
diff --git a/clutter/clutter/cally/cally-root.h b/clutter/clutter/cally-root.h
similarity index 89%
rename from clutter/clutter/cally/cally-root.h
rename to clutter/clutter/cally-root.h
index d4efb93d0..3ef2728f8 100644
--- a/clutter/clutter/cally/cally-root.h
+++ b/clutter/clutter/cally-root.h
@@ -20,13 +20,13 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
#include
-#include "clutter/clutter.h"
+#include "clutter/clutter-macros.h"
G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally-stage.c
similarity index 96%
rename from clutter/clutter/cally/cally-stage.c
rename to clutter/clutter/cally-stage.c
index d734451cf..6346cccbe 100644
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally-stage.c
@@ -33,8 +33,9 @@
*/
#include "config.h"
-#include "cally/cally-stage.h"
-#include "cally/cally-actor-private.h"
+#include "clutter/cally-stage.h"
+#include "clutter/cally-actor-private.h"
+#include "clutter/clutter-stage.h"
/* AtkObject.h */
static void cally_stage_real_initialize (AtkObject *obj,
diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally-stage.h
similarity index 86%
rename from clutter/clutter/cally/cally-stage.h
rename to clutter/clutter/cally-stage.h
index cf3d9914e..657a34f32 100644
--- a/clutter/clutter/cally/cally-stage.h
+++ b/clutter/clutter/cally-stage.h
@@ -20,12 +20,12 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
-#include "cally/cally-actor.h"
-#include "clutter/clutter.h"
+#include "clutter/cally-actor.h"
+#include "clutter/clutter-macros.h"
G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally-text.c
similarity index 99%
rename from clutter/clutter/cally/cally-text.c
rename to clutter/clutter/cally-text.c
index de9e246e7..26f0680d4 100644
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally-text.c
@@ -37,8 +37,8 @@
#include "config.h"
-#include "cally/cally-text.h"
-#include "cally/cally-actor-private.h"
+#include "clutter/cally-text.h"
+#include "clutter/cally-actor-private.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-text.h"
diff --git a/clutter/clutter/cally/cally-text.h b/clutter/clutter/cally-text.h
similarity index 87%
rename from clutter/clutter/cally/cally-text.h
rename to clutter/clutter/cally-text.h
index eeceacfa2..302f33532 100644
--- a/clutter/clutter/cally/cally-text.h
+++ b/clutter/clutter/cally-text.h
@@ -20,12 +20,11 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
-#include "clutter/clutter.h"
-#include "cally/cally-actor.h"
+#include "clutter/cally-actor.h"
G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally-util.c
similarity index 99%
rename from clutter/clutter/cally/cally-util.c
rename to clutter/clutter/cally-util.c
index 13ded7853..ce0ac810f 100644
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally-util.c
@@ -23,7 +23,7 @@
/**
* CallyUtil:
- *
+ *
* #AtkUtil implementation
*
* #CallyUtil implements #AtkUtil abstract methods. Although it
@@ -40,9 +40,9 @@
#include
#include
-#include "cally/cally-util.h"
-#include "cally/cally-root.h"
-#include "cally/cally-stage.h"
+#include "clutter/cally-util.h"
+#include "clutter/cally-root.h"
+#include "clutter/cally-stage.h"
#include "clutter/clutter.h"
#define DEFAULT_PASSWORD_CHAR '*'
diff --git a/clutter/clutter/cally/cally-util.h b/clutter/clutter/cally-util.h
similarity index 88%
rename from clutter/clutter/cally/cally-util.h
rename to clutter/clutter/cally-util.h
index 41cbc2619..98b56fb91 100644
--- a/clutter/clutter/cally/cally-util.h
+++ b/clutter/clutter/cally-util.h
@@ -20,13 +20,15 @@
#pragma once
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only can be included directly."
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only can be included directly."
#endif
-#include "clutter/clutter.h"
#include
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-stage.h"
+
G_BEGIN_DECLS
#define CALLY_TYPE_UTIL (cally_util_get_type ())
diff --git a/clutter/clutter/cally/ChangeLog.pre-cally-merge b/clutter/clutter/cally/ChangeLog.pre-cally-merge
deleted file mode 100644
index 89e2de9e9..000000000
--- a/clutter/clutter/cally/ChangeLog.pre-cally-merge
+++ /dev/null
@@ -1,986 +0,0 @@
-# DO NOT MODIFY THIS FILE
-#
-# Clutter uses the Git commit log to generate the ChangeLog files when
-# creating the tarball for releases and snapshots. This file is maintained
-# only for historical reasons.
-
-2010-07-05 Alejandro Piņeiro
-
-Cleaning ClutterText
-
- * Removing superfluous g_return_if_fail
- * Removing unused ClutterText::text-changed callback
-
-2010-07-05 Alejandro Piņeiro
-
-Refactoring "window:create" and "window:destroy" emission code
-
-Previously "window:create" and "window:destroy" were emitted on
-CallyUtil. Although it works, and CallyUtil already have callbacks to
-stage_added/removed signals, I think that it is more tidy/clear to do
-that on CallyRoot:
-
- * CallyRoot already has code to manage ClutterStage addition/removal
-
- * In fact, we can see CallyRoot as the object exposing the a11y
- information from ClutterStageManager, so it fits better here.
-
- * CallyUtil callbacks these signals are related to key event
- listeners (key snooper simulation). One of the main CallyUtil
- responsibilities is managing event (connecting, emitting), so I
- would prefer to not start to add/mix more functionalities here.
-
-Ideally it would be better to emit all CallyStage methods from
-CallyStage, but it is clear that "create" and "destroy" are more easy
-to emit from a external object.
-
-2010-06-25 Alejandro Piņeiro
-
-Cleaning clutter-actor
-
-Some cleaning changes:
- * Using CallyActionFunc instead of ACTION_FUNC
- * Removing a extra * on cally-actor-private macro documentation, to
- avoid gtk-doc warnings
- * Using g_strcmp0 instead of strcmp
-
-Changes to be applied on clutter (see CB#2097 and CB#2098), applied
-also here to maintain the sync. My intention is keep this developing line
-until the real integration, in order to make a final independent cally
-release.
-
-2010-06-14 Alejandro Piņeiro
-
-Adding -Wshadow option and solving warnings related
-
-
-2010-06-14 Alejandro Piņeiro
-
-Added dummy padding for future vt expansion
-
-Added dummy padding on the different classes structures, to allow
-future expansion of virtual methods.
-
-I decided to add this on all the classes, although it would be
-really unlikely in some cases (ie, CallyGroup)
-
-2010-06-10 Alejandro Piņeiro
-
-Adding and emitting "window:xxx" methods on CallyStage
-
-Added some window related signals on CallyStage:
-
- * window:activate and window:deactivate emitted from CallyStage
- * window:create and window:destroy emitted from CallyUtil
-
-ClutterStage doesn't fulfill 100% the window concept, but some of
-these signals are important in order to identify the object which
-could emit global/key events.
-
-The current implementation is equivalent to GailWindow one, supposing
-CallyStage as the only window related window. This likely would change
-in any clutter-based toolkit implement a real Window object, so a more
-flexible procedure would be required. But we would solve problems step
-by step.
-
-BTW: as I explain here [1] I really think that the current way to
-implement "window:xxx" signals (not defined in ATK but expected from
-the a11y implementation toolkit) somewhat hacky and undocumented (you
-need to check at-spi2 idls to know that you require to emit this
-events)
-
-Related to bug CB#2147 (Orca doesn't speech out properly non
-printable chars on some environments), as solves this problem
-in a specific case.
-
-[1] https://bugzilla.gnome.org/show_bug.cgi?id=620977#c1
-
-2010-06-04 Alejandro Piņeiro
-
-Avoiding clutter_stage_get_key_focus warning
-
-For any reason, in some cases, a clutter actor doesn't have a stage
-associated. We use the default one as fallback.
-
-2010-06-02 Alejandro Piņeiro
-
-Added a defunct check on cally_group_get_n_children
-
-Some warnings appeared when we tried to get the number
-of children of a defunct object.
-
-2010-06-02 Alejandro Piņeiro
-
-Update TODO file
-
-Use Bugzilla to setting missing features.
-
-2010-06-01 Alejandro Piņeiro
-
-Removing heuristics to decide CallyRectable/CallyTexture role
-
-Previously CallyRectangle and CallyTexture used some heuristics in
-order to decide the default role: ATK_ROLE_IMAGE or
-ATK_PUSH_BUTTON, as in practice most applications using these
-objects as buttons were not applying the proper role.
-
-As this is a hack, and a application responsibility, finally we
-have decided to remove this, so the default role is ATK_ROLE_IMAGE.
-
-Fixes CB#1732 (CallyTexture and CallyRectangle uses some heuristics to
-decide the role)
-
-2010-05-28 Alejandro Piņeiro
-
-Post-release version bump, after release 1.2.0
-
-I wrongly added the last commit on the 1.1 branch, when in fact it
-requires clutter 1.3.3, and on the README it is explained that
-cally versioning is tied to clutter versioning. In order to solve
-that a clutter-1.2 release branch is created, and bumped the version.
-
-This versioning tyding will be obsolete when the integration with
-clutter become a reality, but in the same way, this is the way to
-tidy this thinking in this integration.
-
-2010-04-13 Alejandro Piņeiro
-
-Use clutter_actor_get_accessible
-
-The method clutter_actor_get_accessible was added due work on
-bug 2070, and should be used to get the accessibility object,
-instead of atk_gobject_accessible_for_object
-
-This would allow to implement a11y support directly on
-any clutter based toolkit object (ie StLabel).
-
-2010-05-13 Alejandro Piņeiro
-
-Added CallyClone example
-
-
-2010-05-13 Alejandro Piņeiro
-
-Added a11y support for ClutterClone
-
-Resolved in the most simplified way, just as a image and a
-default description to identify cloned objects.
-
-More information:
-http://lists.o-hand.com/clutter/3797.html
-
-2010-04-14 Alejandro Piņeiro
-
-Remove gail dependency
-
-Removed to avoid gdk/gtk dependency on cally.
-
-Part of bug CB#2072 solution
-
-2010-04-14 Alejandro Piņeiro
-
-Avoid gdk functions filling AtkKeyEventStruct
-
-Now when AtkKeyEventStruct is filled in order to emit any key event
-signal, it is not used any gdk function on the keyval or the
-string fields.
-
-event_string is filled with the printable character if possible, if
-not (Ctrl, Alt, etc) it is set as NULL.
-
-Now the AT should take care of that, at least until we define atk key
-event struct in a more agnostic way (not tied to gdk/gtk). See orca
-bug bgo#616206 as a example.
-
-Part of bug CB#2072 solution.
-
-2010-04-15 Alejandro Piņeiro
-
-Added gail_misc_layout_get_run_attributes implementation
-
-Part of bug CB#2072 solution
-
-2010-04-14 Alejandro Piņeiro
-
-Remove gailutil/gailmisc functions calls
-
-This is because gailutil/gailmisc added a gdk/gtk dependency, and
-this dependency is being removed. New cally-specific implementation
-are required.
-
-Related to bug CB#1733
-
-Part of bug CB#2072 solution
-
-2010-04-13 Alejandro Piņeiro
-
-Fixing the libdir directory in some examples
-
-
-2010-03-26 Alejandro Piņeiro
-
-Previous cally.pc.in update was incomplete
-
-The previous commit was not tested properly, and it was missing one
-detail. Sorry for the noise.
-
-2010-03-26 Alejandro Piņeiro
-
-Update cally.pc.in after module relocation
-
-Previous commit places cally module in a different directory.
-It also corrects where the include directory is placed.
-
-2010-03-15 Alejandro Piņeiro
-
-Use a proper clutter module directory
-
-Use a proper clutter module directory, instead of keep being
-installed on a gtk directory.
-
-Improve the cally-examples-util, in order to keep using
-hardcoded values.
-
-Fixes CB#1737 (Wrong cally module directory)
-
-2010-03-15 Alejandro Piņeiro
-
-Proper UTF-8 headers
-
-
-2010-02-25 Alejandro Piņeiro
-
-Change "--with-dbus" option for "atk-bridge-dir" on examples
-
-The atk-adaptor in the dbus at-spi was renamed to atk-bridge due
-some apps hardcoding the name. So right now the only difference
-is the final directory.
-
-So the option was removed, and atk-bridge-dir added. This also allows
-to use the system atk-bridge or the compiled in any developing environment,
-so it is really more flexible.
-
-See the README (updated with this commit) for more information.
-
-2010-02-19 Alejandro Piņeiro
-
-Added .gitignore file
-
-
-2010-02-19 Alejandro Piņeiro
-
-Release 1.1.1
-
-
-2010-02-19 Alejandro Piņeiro
-
-Using clutter_threads_idle_add instead of the gdk one
-
-The idea is being as less gdk dependent as possible. Right now
-it is inviable to remove the dependency (gailutil and so on) but
-hypothetically, the ideal is remove this dependency in the future,
-and being "clutter pure".
-
-2010-02-15 Alejandro Piņeiro
-
-Check if the state is defunct on cally_text_get_name
-
-Check if the state is defunct on cally_text_get_name, in order
-to avoid warnings cally clutter_text_get_text when the clutter
-object is NULL
-
-2010-01-26 Alejandro Piņeiro
-
-Update on configure.ac after autoupdate call
-
-
-2010-02-02 Alejandro Piņeiro
-
-Try to apply the key modifiers to event->keyval like GDK does
-
-ClutterKeyEvent defines the keyval without taking into account the
-modifiers. GDK defines this keyval taking into account the modifiers.
-
-AtkKeyEventStruct expects the keyval in a GDK fashion, so a
-translation is required.
-
-This patch tries to do that using using
-gdk_keymap_translate_keyboard_state.
-
-This functions only works correctly if gtk has been initialized, so
-the fallback is create the AtkKeyEventStruct with the keyval
-provided by Clutter.
-
-More information:
-http://library.gnome.org/devel/atk/stable/AtkUtil.html#AtkKeyEventStruct
-http://bugzilla.openedhand.com/show_bug.cgi?id=1961
-
-2010-02-02 Alejandro Piņeiro
-
-Filling AtkKeyEventStruct->string used on the atk key event listeners
-
-Finally we use directly gdk_keyval_name. Not the ideal solution, but works,
-and more important, it avoids to reimplement this issue on clutter or cally.
-
-More information on Bug 1952
-
-Fixes http://bugzilla.openedhand.com/show_bug.cgi?id=1952
-
-2010-01-22 Alejandro Piņeiro
-
-Added AM_PROG_CC_C_O option to avoid a warning running configure
-
-
-2010-01-22 Alejandro Piņeiro
-
-Fix clutter version required on the pc files
-
-
-2010-01-22 Alejandro Piņeiro
-
-Check on configure time if any x11 clutter backend is in use
-
-It uses AC_CHECK_LIB in order to check if x11 backend is in use.
-It also modifies cally-actor in order to use the information
-retrieved.
-
-So now cally has a minimum multi-backend support. It only manages
-a x11 (glx or eglx) backend, but at least, it checks it, so you
-can compile cally without this backend. It probably will not work
-properly, but at least you can compile and execute it.
-
-Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1736
-
-2010-01-21 Alejandro Piņeiro
-
-Fix the perspective problems computing the on-screen extensions
-
-Use clutter_actor_get_abs_allocation_vertices and
-clutter_actor_get_transformed_size to get the real on-screen
-position and size, instead of compute that using the geometry
-and the anchor point.
-
-It also update cally-atkcomponent-example, adding a actor inside
-a nested ClutterGroup hierarchy.
-
-Fixes: http://bugzilla.openedhand.com/show_bug.cgi?id=1731
-
-2010-01-13 Alejandro Piņeiro
-
-Added extra button on cally-atkeditabletext-example
-
-Added a button to print the current cursor position, and also
-extend the size of the buttons
-
-2010-01-12 Alejandro Piņeiro
-
-Remove superfluous g_print on CallyStage
-
-
-2009-12-03 Alejandro Piņeiro
-
-Use clutter_stage_manager_peek_stages to avoid a leak
-
-
-2009-12-03 Alejandro Piņeiro
-
-Added ATK_STATE_SELECTABLE_TEXT management
-
-
-2009-11-26 Alejandro Piņeiro
-
-Manage properly ATK_STATE_ACTIVE on CallyStage
-
-* cally/cally-stage.c
-Added private struct
-(cally_stage_class_init),(cally_stage_init),(cally_stage_real_initialize):
-Initialization stuff
-(cally_stage_activate_cb)
-(cally_stage_deactivate_cb): new ClutterStage signal callbacks, change
-the internal value of active, and notify the atk state change
-(cally_stage_ref_state_set): manage ATK_STATE_ACTIVATE
-* examples/cally-atktext-example2.c
-If possible, creates two stage, in order to test ATK_STATE_ACTIVATE
-
-2009-11-24 Alejandro Piņeiro
-
-Focused state change and focused object notification
-
-* cally/cally-actor.h
-(focus_clutter): added virtual method for the focus management
-* cally/cally-actor.c
-(cally_actor_component_interface_init)
-(cally_actor_add_focus_handler)
-(cally_actor_remove_focus_handler):
-Implementation of the AtkComponent methods add_focus_handler and
-remove_focus_handler
-(cally_actor_focus_event): CallyActor specific focus handler, notify
-the state focused change
-(cally_actor_focus_clutter)
-(cally_actor_real_focus_clutter):
-Handlers for the ClutterActor "key-focus-in" and "key-focus-out"
-signals. Emit the signal AtkObject "focus_event" and set the focus
-object with atk_focus_tracker_notify.
-(cally_actor_initialize):
-Connect to the signals "key-focus-in" and "key-focus-out", use
-atk_component_add_focus_handler to add cally_actor_focus_event
-
-Note: The focus management is more simplified that the gail one. The
-main reason is that the focus management in GTK is really more complex
-that the Clutter one.
-
-2009-11-24 Alejandro Piņeiro
-
-Modify cally-atkeditabletext-example.c to manage "activatable" status
-
-
-2009-11-24 Alejandro Piņeiro
-
-Added "activate" action in ClutterText
-
-* cally/cally-actor.h
-* cally/cally-actor.c
-cally_actor_add_action now returns the action id added. Documentation
-added in order to explain the return values and others.
-
-* cally/cally-text.c
-Added action "activate". This action is only available if the ClutterText is
-activatable, so the "activatable" property is tracked in the notify
-
-2009-11-20 Alejandro Piņeiro
-
-Signal event emission
-
-Emits the signals "text_selection_changed", "text_caret_moved",
-"text_changed::insert", "text_changed::delete", and notify the
-ATK_STATE_EDITABLE state change.
-
-It also adds the ATK_STATE_EDITABLE in the ref_state_set, includes a
-finalize to clean the new private data used, and move part of the
-initialization from the _init to the _real_initialization.
-
-2009-12-03 Alejandro Piņeiro
-
-Remove the ATK_STATE_DEFUNCT emission
-
-Remove the ATK_STATE_DEFUNCT emission, as this is already made by
-AtkGObjectAccessible.
-
-It also removes the clutter actor from the private structure, as we
-can use the AtkGObjectAccessible API to obtain it. This makes the code
-more coherent, with respect of the rest of the Cally classes
-implementation.
-
-2009-11-26 Alejandro Piņeiro
-
-Remove ; from the CALLY_GET_CLUTTER_ACTOR macro
-
-
-2009-11-25 Alejandro Piņeiro
-
-TODO cleanup and more implementation notes
-
-* TODO: removed the data that we have in the bugzilla or in the implementation
- notes on the cally source
-* cally/cally-actor.c: complete implementations notes
-* cally/Makefile.am: add a comment related to the public headers, and include
- Makefile.in in the MAINTAINERCLEANFILES
-
-2009-11-13 Alejandro Piņeiro
-
-Adding new tips on CODING_STYLE
-
-
-2009-11-09 Alejandro Piņeiro
-
-AtkEditableText implementation on CallyText
-
-* examples/Makefile.am
-* examples/cally-atkeditabletext-example.c: New example added
-* cally/cally-text.c
-
-Interface AtkEditableText implemented, except some methods:
- * Missing ClipBoard feature on Clutter:
- paste_text
- copy_text
- cut_text
- * Missing a equivalent GtkTextTag on Clutter (so the possibility to
- set run attributes in a range):
- set_run_attributes
-
-Fixes bug CB#1734
-
-2009-11-03 Alejandro Piņeiro
-
-Removed DG_DISABLE_CHECKS and DG_DISABLE_CAST_CHECKS from CFLAGS
-
-* configure.ac: Removed DG_DISABLE_CHECKS and DG_DISABLE_CAST_CHECKS
- from the common CFLAGS options
-* cally/cally-actor.c: fixed cast errors on some return values, not
- detected previously because of the use of relaxed compilation
- options
-
-Problem detected by Mario SÃĄnchez Prada
-
-2009-10-28 Alejandro Piņeiro
-
-Support for multiple stages
-
-* cally-root.c
-* cally-stage.c
-* cally-util.c
-Implemented the support for multiple stages, by tracking the signals
-stage-added and stage-removed of the ClutterStageManager.
-
-In the same way CallyRoot has implement properly the atk_object_initialize,
-and in general now is more tied to ClutterStageManager (CallyRoot is now
-the a11y object of ClutterStageManager), but factory not required anyway,
-as it is instanced on the CallyUtil atk_get_root
-
-Fixes: CB#1754 (Missing multi-stage support)
-
-2009-10-27 Alejandro Piņeiro
-
-Implemented atk_[add/remove]_key_event_listener on CallyUtil
-
-* cally/cally-util.c:
- Implemented atk_[add/remove]_key_event_listener
-* examples/cally-atktext-example2.c:
- Modified in order to install and remove key event listeners,
- for testing purposes
-
-Fixes CB#1852 (AtkUtil implementation misses
-atk_[add/remove]_key_event_listener)
-
-2009-10-21 Alejandro Piņeiro
-
-Implemented atk-[add/remove]-global-event-listener on CallyUtil
-
- * cally/cally-util.c:
- Implemented atk-[add/remove]-global-event-listener on CallyUtil
- * examples/Makefile.am
- * examples/cally-atktext-example2.c
- New example in order to test easier the event emission on focus
- change (not working right now)
-
-2009-10-12 Alejandro Piņeiro
-
-Add --with-dbus option executing the examples
-
-The replacement for atk-bridge on at-spi-dbus has a different name
-(atk-adaptor), and it has not defined the method gnome_accessibility_init.
-The --with-dbus option allow to load the correct library and use the
-correct hook method if you are using at-spi-dbus.
-
-Anyway, take into account that this is just an example, and in a final
-environment, this should be made in a more general way.
-
-More information: CB#1738, CB#1737
-
-2009-09-25 Alejandro Piņeiro
-
-Symplifying shave support.
-
-
-2009-09-25 Alejandro Piņeiro
-
-Cleanup on the compilation and installation process
-
-* cally/Makefile.am:
- Added libcallydir and libcally_HEADERS in order to publish all cally
- headers, as the current policy is use the cally headers as public.
-* configure.ac:
- Change API_VERSION_MAJOR for CALLY_API_VERSION, as was the real
- meaning, and define CALLY_VERSION.
- Change CALLY_OBJ_CFLAGS and CALLY_OBJ_LIBS, used to compile the
- tests, as was not required to compile against the cally module (the
- example only required to compile against Clutter, as the cally
- module was just a module loaded by GModule).
- Support for Shave.
-
-2009-07-31 Alejandro Piņeiro
-
-Be able to run the examples without installing Cally
-
-Before that, the examples searched the cally module from the final installed
-directory. This means that you should install the library to use the examples.
-On development this is not desirable. Now it is loaded from ../cally/.libs
-
-This is a little hackish, but more useful, and in the end, it is just a example.
-Probably a best option could be configure that on the command line.
- $ ./example --cally-dir="mydir"
-
-But just a nitpick.
-
-2009-07-29 Alejandro Piņeiro
-
-Upgrade to cally-1.0, using clutter-1.0
-
-* NEWS
-* TODO: removed several items, waiting to be moved to the bugzilla
-* configure.ac
-* examples/cally-examples-util.c
-
-2009-07-27 Alejandro Piņeiro
-
-Fixed return value of cally_actor_get_index_in_parent
-
-Bug and solutiond pointed by Gerd Kohlberger
-
-2009-06-30 Alejandro Piņeiro
-
-Added the implementation of most AtkText methods for CluttetText (CallyText)
-
-It remains some methods:
- get_default_attributes
- get_character_extents
- get_offset_at_point
-
-The current gail implementation delegate on gailmisc, but this is tied to
-GtkWidget so an equivalent functionality would be implemented (something like
-callymisc), and in the case of get_character_extents, not sure about the layout
-position (see gtk_entry_get_layout_offsets).
-
-I think that worth manage this in a different commit.
-
-In the same way is still missing AtkEditableText support.
-
-2009-07-07 Alejandro Piņeiro
-
-Added CALLY_GET_CLUTTER_ACTOR macro
-
-This macro was created to simplify how do you get the clutter actor object
-related to the cally object. On CallyActor a private attributte maintains it
-(for convenience, as it is heavily used) but outside, atkgobject methods can
-be used. Note that there is a possibility on the future to change it. Two
-options:
- * Add a public method to get the clutter object
- * Use this method on CallyActor too
-
-This macro simplifies this:
-
-CLUTTER_ACTOR (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (cally_object)))
-
-2009-06-24 Alejandro Piņeiro
-
-Renamed examples/cally-util.[ch] to examples/cally-examples-util.[ch]
-
-Renamed examples/cally-util.[ch] to examples/cally-examples-util.[ch] to avoid
-confusion with cally/cally-util.[ch], implementation of the AtkUtil interface
-
-2009-06-23 Alejandro Piņeiro
-
-Adding examples directory
-
-* NEWS: Updates
-* configure.ac
-* Makefile.am
-* cally/Makefile.am
-* examples/Makefile.am: New
-* examples/cally-util.[ch]: New
-* examples/example1.c: New
-Added a directory in order to put examples. In this way we don't require any
-external clutter app to make the basic a11y functionality checks. At this
-moment only an example was added, but all the compiling structure is working.
-By default the examples are not compiled, use "--enable-examples" on configure
-time in order to enable their compilation.
-
-This basic example basically shows several objects, with different depth, in
-order to check that AtkComponent returns the correct screen position.
-
-Other minor changes done on the building infrastructure.
-
-2009-06-23 Alejandro Piņeiro
-
-Fix clutter version required
-
-
-2009-06-23 Alejandro Piņeiro
-
-Solve a problem calling clutter_actor_get_anchor_point
-
-* cally/cally-actor.c:
-(_get_actor_extents): use gfloat instead of gint, as now this clutter_actor_get_anchor_point
-use floats
-
-2009-06-11 Alejandro Piņeiro
-
-Minor fixes
-
- * Update TODO
- * Fix .pc files, to use clutter-0.9 version
-
-2009-05-20 Alejandro Piņeiro
-
-Library renamed from cail to cally
-
-
-2009-05-08 Alejandro Piņeiro
-
-Removed cail-clone-texture.h from cail.h
-
-* cail/cail.h: Removed reference to cail-clone-texture.h
-
-2009-05-08 Alejandro Piņeiro
-
-Upgrade to cail-0.9, using clutter-0.9, first compilable version
-
-* NEWS: new file with the information of the releases
-* TODO: updated
-* configure.ac: updated clutter version to compile against
-* cail/cail-clone-texture.[ch]: Removed as ClutterCloneTexture was removed on Clutter 0.9.0
-* cail/cail-label.[ch]: Removed as ClutterLabel was removed on Clutter 0.9.0
-* cail/Makefile.am: updated due the source files removed
-* cail/cail-actor.c: removed include to
-* cail/cail.c: removed the factories for CailLabel and CailCloneTexture
-
-2009-05-07 Alejandro Piņeiro
-
-Reflect change on the version number policy
-
-* README: correct some typos and explain that the cail version number
-is tied to the clutter version number and how
-* configure.ac
-Set the version number to 0.8.0
-
-2009-05-07 Alejandro Piņeiro
-
-Edit the ChangeLog file, to show that now we are using git
-
-* ChangeLog.SVN: new file, with the ChangeLog used while cail was
-using a Subversion repository
-* ChangeLog: now is empty, and only maintains a reference to use git log
-
-2009-04-29 Alejandro Piņeiro
-
-Coding style review
-
-* CODING_STYLE
-* cail/Makefile.am
-* cail/cail-actor-private.[ch]
-* cail/cail-actor.h
-* cail/cail-clone-texture.[ch]
-* cail/cail-group.[ch]
-* cail/cail-label.[ch]
-* cail/cail-rectangle.[ch]
-* cail/cail-root.[ch]
-* cail/cail-stage.[ch]
-* cail/cail-texture.[ch]
-* cail/cail-util.[ch]
-* cail/cail.c
-
-2009-04-28 Alejandro Piņeiro
-
-Coding style review: cail-actor.c
-
-
-2009-04-21 Alejandro Piņeiro
-
-2009-04-21 Alejandro Pinheiro
-
- * TODO: updated TODO file
-
-2009-04-21 Alejandro Piņeiro
-
-2009-03-06 Alejandro Pinheiro
-
- * AUTHORS: update authors file to public release
-
-2009-03-06 Alejandro Piņeiro
-
-2009-03-06 Alejandro Pinheiro
-
- * debian/control
- Added cdbs dependency, renamed debugging package
- * debian/libcail-common-dbg.dirs: new file
- * debian/libcail-common.dirs
- * debian/libcail-common.install
- Minor changes
-
-2009-03-05 Alejandro Piņeiro
-
-2009-03-05 Alejandro Pinheiro
-
- * TODO
- Added TODO file, in order to list the remaining tasks.
-
-2009-03-05 Alejandro Piņeiro
-
-2009-03-05 Alejandro Pinheiro
-
- * configure.ac
- * cail/cail.c
- * cail/cail-util.c
- * Makefile.am
- Removed all the missing gtk related stuff
-
-2009-03-05 Alejandro Piņeiro
-
-2009-03-05 Alejandro Pinheiro
-
- * cail/cail-actor.c
- (_get_actor_extents): managing too the anchor point to compute the position
- (_get_top_level_origin): reimplemented using x11 functions, removed
- gtk/gdk related functions, and taking into account the relative position
- inside the parent (previous position calculation was wrong if a child
- was not a direct stage child)
- * cail/clutter-gtk/cail-clutter-embed.[ch]
- * cail/clutter-gtk/cail-gtk-factory.h
- Removed, in order to remove any gtk dependency
- * cail/debian/control: removed gtk dependency
-
-2009-03-03 Alejandro Piņeiro
-
-2009-03-03 Alejandro Pinheiro
-
- * cail/cail-actor-private.[ch]: new files to private utility functions
- (_cail_actor_pushable): new function, that checks if a cail actor is
- pushable by checking if the clutter actor related has a handler for
- a release event
- * cail/cail-texture.c
- * cail/cail-clone-texture.c
- * cail/cail-rectangle.c
- Use of new function _cail_actor_pushable
- * cail-actor.c: Added some documentation related to current implementation
- * cail-util.c: Code style review
-
-2009-03-02 Alejandro Piņeiro
-
-2009-03-02 Alejandro Pinheiro
-
- * cail/cail-label.[ch]: new
- * cail/cail.[ch]
- (cail_accessibility_module_init)
- * cail/Makefile.am
- Added CailLabel, a11y object for ClutterLabel
-
-2009-02-27 Alejandro Piņeiro
-
-2009-02-27 Alejandro Pinheiro
-
- * cail/cail-actor.c
- (cail_actor_real_remove_actor)
- Fixed a typo that causes a crash while removing the actor from a
- container
-
-2009-02-26 Alejandro Piņeiro
-
-2009-02-26 Alejandro Pinheiro
-
- * cail/cail-actor.c
- (cail_actor_remove_actor)
- (cail_actor_add_actor)
- Fixed a typo calling klass->add_actor and klass->remove_actor that causes
- a crash in some (container,actor) combinations
-
- (cail_actor_real_add_actor)
- Additional parameter check
-
-2009-02-25 Alejandro Piņeiro
-
-Missing cail-rectangle.[ch] files, according 2009-02-23 entry at Changelog
-
-
-2009-02-23 Alejandro Piņeiro
-
-2009-02-23 Alejandro Pinheiro
-
- * cail/cail-rectangle.[ch]
- * cail/cail.[ch]
- * cail/Makefile.am
-
- Added CailRectangle, a11y object for ClutterRectangle
-
- * cail/cail-group.c
- * cail/cail-texture.c
- * cail/cail-stage.c
-
- Avoid to add a empty private structure, to avoid the glib warning. Anyway
- the pointer to the private structure is still on the .h, to allow future
- add-on.
-
-2009-02-20 Alejandro Piņeiro
-
-2009-02-20 Alejandro Pinheiro
-
- * cail-actor.[ch]
- * cail-group.[ch]
-
- Moved most of the ClutterContainer a11y support from cail-group to
- cail-actor, in order to generalize this support.
-
- * cail-stage.[ch]
- * cail-util.[ch]
- Normalize the private structure to avoid future problems with missing
- gaps
-
-2009-02-20 Alejandro Piņeiro
-
-2009-02-20 Alejandro Pinheiro
-
- * cail/cail-actor.c
- (cail_actor_connect_actor_destroyed): connects to the clutter actor
- destroy signal
- (cail_actor_clutter_actor_destroyed): handler to the clutter actor
- destroy signal, update the priv->actor pointer and notify a state change
-
- This change allows to be sure about the priv->actor correct value, so we
- can use directly priv->actor instead of atk_gobject_accessible_get_object
- in the next functions:
- (cail_actor_get_parent)
- (cail_actor_get_index_in_parent)
- (cail_actor_ref_state_set)
- (cail_actor_get_extents)
-
-2009-02-19 Alejandro Piņeiro
-
-2009-02-19 Alejandro Pinheiro
-
- * cail/cail-texture.[ch]
- * cail/cail-clone-texture.[ch]
- * cail/cail.[ch]
- * cail/Makefile.am
-
- Added CailTexture and CailCloneTexture a11y objects for ClutterTexture
- and ClutterCloneTexture
-
- * cail/cail-util.c
-
- Added private structure
-
-2009-02-18 Alejandro Piņeiro
-
-2009-02-18 Alejandro Pinheiro
-
- * cail/cail-actor.c:
- (cail_actor_get_parent)
- Return the accessible object of the clutter actor if accessible_parent
- is not available. Previously it only took into account the these object
- as a possible parent to return (you can set it with atk_object_set_parent)
-
-2009-02-18 Alejandro Piņeiro
-
-2009-02-18 Alejandro Pinheiro
-
- * cail/cail-group.[ch]: code style review
- * cail/cail-actor.[ch]: implemented basic support for ClutterContainer
-
-2009-02-18 Alejandro Piņeiro
-
-2009-02-18 Alejandro Pinheiro
-
- * debian/control: updating dependencies
-
-2009-02-18 Alejandro Piņeiro
-
-2009-02-18 Alejandro Pinheiro
-
- * configure.ac: added additional compile flags
- * cail/cail-actor.[ch]: Reimplemented support for AtkAction interface
- * cail/cail-root.[ch]: code style review
-
-2009-02-16 Alejandro Piņeiro
-
-2009-02-16 Alejandro Pinheiro
-
- * First release.
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
deleted file mode 100644
index 56e5fe25c..000000000
--- a/clutter/clutter/cally/cally.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* CALLY - The Clutter Accessibility Implementation Library
- *
- * Copyright (C) 2008 Igalia, S.L.
- *
- * Author: Alejandro PiÃąeiro Iglesias
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see .
- */
-
-#pragma once
-
-#define __CALLY_H_INSIDE__
-
-#include "cally/cally-actor.h"
-#include "cally/cally-clone.h"
-#include "cally/cally-root.h"
-#include "cally/cally-stage.h"
-#include "cally/cally-text.h"
-#include "cally/cally-util.h"
-
-#undef __CALLY_H_INSIDE__
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 01b561210..59942e678 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -485,7 +485,7 @@
#include "cogl/cogl.h"
-#include "cally/cally-actor.h"
+#include "clutter/cally-actor.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-action.h"
diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
index be409fca8..8b29104cf 100644
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -37,7 +37,7 @@
#include "config.h"
-#include "cally/cally-clone.h"
+#include "clutter/cally-clone.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-clone.h"
#include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-context.c b/clutter/clutter/clutter-context.c
index 513509eba..0ed0b6a7c 100644
--- a/clutter/clutter/clutter-context.c
+++ b/clutter/clutter/clutter-context.c
@@ -22,7 +22,7 @@
#include
-#include "cally/cally.h"
+#include "clutter/cally-util.h"
#include "clutter/clutter-backend-private.h"
#include "clutter/clutter-color-manager.h"
#include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index c64bf73a7..4eba3158d 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -25,6 +25,7 @@
#include
#include
+#include "clutter/cally-util.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-backend-private.h"
#include "clutter/clutter-context-private.h"
@@ -44,7 +45,6 @@
#include "cogl/cogl.h"
#include "cogl-pango/cogl-pango.h"
-#include "cally/cally.h" /* For accessibility support */
typedef struct
{
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 69acf8c96..c209ee37b 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -41,7 +41,7 @@
#include "clutter/clutter-stage.h"
-#include "cally/cally-stage.h"
+#include "clutter/cally-stage.h"
#include "clutter/clutter-action-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-backend-private.h"
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
index 18311f108..de32b6a19 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -46,7 +46,7 @@
#include "clutter/clutter-text.h"
-#include "cally/cally-text.h"
+#include "clutter/cally-text.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-animatable.h"
#include "clutter/clutter-backend-private.h"
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 010c1f4b7..cffc7bf1d 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -29,6 +29,12 @@
#include "clutter/clutter-types.h"
+#include "clutter/cally-actor.h"
+#include "clutter/cally-clone.h"
+#include "clutter/cally-root.h"
+#include "clutter/cally-stage.h"
+#include "clutter/cally-text.h"
+#include "clutter/cally-root.h"
#include "clutter/clutter-action.h"
#include "clutter/clutter-actor.h"
#include "clutter/clutter-actor-meta.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 721bb246b..339773cb8 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -213,27 +213,26 @@ clutter_nonintrospected_sources = [
clutter_backend_private_headers = []
-cally_headers = [
- 'cally/cally-actor.h',
- 'cally/cally-clone.h',
- 'cally/cally.h',
- 'cally/cally-root.h',
- 'cally/cally-stage.h',
- 'cally/cally-text.h',
- 'cally/cally-util.h',
+clutter_headers += [
+ 'cally-actor.h',
+ 'cally-clone.h',
+ 'cally-root.h',
+ 'cally-stage.h',
+ 'cally-text.h',
+ 'cally-util.h',
]
-cally_sources = [
- 'cally/cally-actor.c',
- 'cally/cally-clone.c',
- 'cally/cally-root.c',
- 'cally/cally-stage.c',
- 'cally/cally-text.c',
- 'cally/cally-util.c',
+clutter_sources += [
+ 'cally-actor.c',
+ 'cally-clone.c',
+ 'cally-root.c',
+ 'cally-stage.c',
+ 'cally-text.c',
+ 'cally-util.c',
]
-cally_private_headers = [
- 'cally/cally-actor-private.h',
+clutter_private_headers += [
+ 'cally-actor-private.h',
]
clutter_built_sources = []
@@ -269,9 +268,6 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
clutter_nonintrospected_sources,
clutter_built_sources,
clutter_built_headers,
- cally_sources,
- cally_headers,
- cally_private_headers,
],
version: '0.0.0',
soversion: 0,
@@ -324,34 +320,11 @@ if have_introspection
extra_args: clutter_introspection_args + ['--c-include=clutter/clutter.h'],
kwargs: introspection_common,
)
-
- libmutter_cally_gir = gnome.generate_gir(libmutter_clutter,
- sources: [
- cally_sources,
- cally_headers,
- ],
- nsversion: libmutter_api_version,
- header: 'cally/cally.h',
- namespace: 'Cally',
- export_packages: [libmutter_clutter_name],
- includes: [
- libmutter_mtk_gir[0],
- libmutter_cogl_gir[0],
- libmutter_cogl_pango_gir[0],
- libmutter_clutter_gir[0],
- ],
- dependencies: [cogl_deps],
- extra_args: clutter_introspection_args,
- kwargs: introspection_common,
- )
endif
install_headers(clutter_headers,
subdir: clutter_clutter_includesubdir)
-install_headers(cally_headers,
- subdir: clutter_includesubdir / 'cally')
-
pkg.generate(libmutter_clutter,
name: 'Mutters Clutter',
filebase: libmutter_clutter_name,
diff --git a/doc/reference/cally/cally.toml.in b/doc/reference/cally/cally.toml.in
deleted file mode 100644
index 2b1a111c5..000000000
--- a/doc/reference/cally/cally.toml.in
+++ /dev/null
@@ -1,41 +0,0 @@
-[library]
-version = "@version@"
-browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
-repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
-website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://mutter.gnome.org/"
-logo_url = "logo.svg"
-authors = "Mutter Development Team"
-license = "GPL-2.0-or-later"
-description = "The Clutter Accessibility Implementation Library"
-dependencies = [ "GObject-2.0", "Atk-1.0" ]
-devhelp = true
-search_index = true
-
- [dependencies."GObject-2.0"]
- name = "GObject"
- description = "The base type system library"
- docs_url = "https://docs.gtk.org/gobject/"
-
- [dependencies."Atk-1.0"]
- name = "Atk"
- description = "The Accessibility toolkit"
- docs_url = "https://docs.gtk.org/atk/"
-
-[theme]
-name = "basic"
-show_index_summary = true
-show_class_hierarchy = true
-
-[source-location]
-base_url = "https://gitlab.gnome.org/GNOME/mutter/-/blob/@vcs_tag@/"
-
-[extra]
-# The same order will be used when generating the index
-content_files = [
-]
-content_images = [
- "logo.svg",
-]
-urlmap_file = "urlmap.js"
-
diff --git a/doc/reference/cally/logo.svg b/doc/reference/cally/logo.svg
deleted file mode 120000
index ffdbeb4c7..000000000
--- a/doc/reference/cally/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../logo.svg
\ No newline at end of file
diff --git a/doc/reference/cally/meson.build b/doc/reference/cally/meson.build
deleted file mode 100644
index 63a420e2d..000000000
--- a/doc/reference/cally/meson.build
+++ /dev/null
@@ -1,35 +0,0 @@
-
-cally_toml = configure_file(
- input: 'cally.toml.in',
- output: 'cally.toml',
- configuration: toml_conf,
- install: true,
- install_dir: docs_dir / 'cally',
-)
-
-custom_target('cally-doc',
- input: [ cally_toml, libmutter_cally_gir[0] ],
- output: 'cally',
- command: [
- gidocgen,
- 'generate',
- gidocgen_common_args,
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../mtk/mtk'),
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../cogl/cogl'),
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../cogl/cogl-pango'),
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../clutter/clutter'),
- '--config=@INPUT0@',
- '--output-dir=@OUTPUT@',
- '--content-dir=@0@'.format(meson.current_source_dir()),
- '@INPUT1@',
- ],
- depends: [
- libmutter_mtk_gir[0],
- libmutter_cogl_gir[0],
- libmutter_cogl_pango_gir[0],
- libmutter_clutter_gir[0],
- ],
- build_by_default: true,
- install: true,
- install_dir: docs_dir,
-)
diff --git a/doc/reference/cally/urlmap.js b/doc/reference/cally/urlmap.js
deleted file mode 100644
index 51a8da1ca..000000000
--- a/doc/reference/cally/urlmap.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-FileCopyrightText: 2021 GNOME Foundation
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// A map between namespaces and base URLs for their online documentation
-baseURLs = [
- [ 'GLib', 'https://docs.gtk.org/glib/' ],
- [ 'GObject', 'https://docs.gtk.org/gobject/' ],
- [ 'Gio', 'https://docs.gtk.org/gio/' ],
- [ 'Atk', 'https://docs.gtk.org/atk/' ],
- [ 'Clutter', 'https://mutter.gnome.org/clutter/' ],
-]
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 4b54d9ffc..6d1d3fd02 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -20,9 +20,8 @@ endif
docs_dir = pkgdatadir / 'doc'
-subdir('cally')
subdir('clutter')
subdir('cogl')
subdir('cogl-pango')
subdir('meta')
-subdir('mtk')
\ No newline at end of file
+subdir('mtk')
diff --git a/doc/reference/meta/meson.build b/doc/reference/meta/meson.build
index bff21c184..097250df6 100644
--- a/doc/reference/meta/meson.build
+++ b/doc/reference/meta/meson.build
@@ -26,7 +26,6 @@ custom_target('meta-doc',
depends: [
libmutter_mtk_gir[0],
libmutter_clutter_gir[0],
- libmutter_cally_gir[0],
libmutter_cogl_pango_gir[0],
libmutter_cogl_gir[0],
],
diff --git a/doc/website/index.html b/doc/website/index.html
index fcced8e5b..7a1ed527f 100644
--- a/doc/website/index.html
+++ b/doc/website/index.html
@@ -108,11 +108,6 @@
-
- Cally
- The Clutter Accessibility Implementation Library.
-
-
Cogl
Hardware acceleration pipeline abstraction layer. Handles things like allocating framebuffer, allocating,
diff --git a/src/tests/clutter/accessibility/cally-atkevents-example.c b/src/tests/clutter/accessibility/cally-atkevents-example.c
index ad5fc03fa..74004bd23 100644
--- a/src/tests/clutter/accessibility/cally-atkevents-example.c
+++ b/src/tests/clutter/accessibility/cally-atkevents-example.c
@@ -29,7 +29,6 @@
*/
#include
#include
-#include
#include "cally-examples-util.h"