brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c3c89332f6
mutter/clutter/clutter-main.c

3557 lines
101 KiB
C
Raw Normal View History

Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Authored By Matthew Allum <mallum@openedhand.com>
*
* Copyright (C) 2006 OpenedHand
*
* 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
Remove mentions of the FSF address Since using addresses that might change is something that finally the FSF acknowledge as a plausible scenario (after changing address twice), the license blurb in the source files should use the URI for getting the license in case the library did not come with it. Not that URIs cannot possibly change, but at least it's easier to set up a redirection at the same place. As a side note: this commit closes the oldes bug in Clutter's bug report tool. http://bugzilla.openedhand.com/show_bug.cgi?id=521
2010-03-01 12:56:10 +00:00
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
*/
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
2006-06-22 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-clone-texture.c: * clutter/clutter-color.c: * clutter/clutter-event.c: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/clutter-main.c: * clutter/clutter-media.c: * clutter/clutter-rectangle.c: * clutter/clutter-stage.c: * clutter/clutter-texture.c: * clutter/clutter-timeline.c: * clutter/clutter-util.c: * clutter/clutter-video-texture.c: * configure.ac: Documentation updates - add section headers.
2006-06-21 22:34:25 +00:00
/**
* SECTION:clutter-main
80% coverage
2006-06-22 14:36:05 +00:00
* @short_description: Various 'global' clutter functions.
2006-06-22 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-clone-texture.c: * clutter/clutter-color.c: * clutter/clutter-event.c: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/clutter-main.c: * clutter/clutter-media.c: * clutter/clutter-rectangle.c: * clutter/clutter-stage.c: * clutter/clutter-texture.c: * clutter/clutter-timeline.c: * clutter/clutter-util.c: * clutter/clutter-video-texture.c: * configure.ac: Documentation updates - add section headers.
2006-06-21 22:34:25 +00:00
*
80% coverage
2006-06-22 14:36:05 +00:00
* Functions to retrieve various global Clutter resources and other utility
* functions for mainloops, events and threads
docs: Document Clutter's threading model Be explicit on how to deal with threads and Clutter.
2009-12-02 14:15:43 +00:00
*
* <refsect2 id="clutter-Threading-Model">
* <title>Threading Model</title>
* <para>Clutter is <emphasis>thread-aware</emphasis>: all operations
* performed by Clutter are assumed to be under the big Clutter lock,
* which is created when the threading is initialized through
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
* clutter_init().</para>
docs: Document Clutter's threading model Be explicit on how to deal with threads and Clutter.
2009-12-02 14:15:43 +00:00
* <example id="example-Thread-Init">
* <title>Thread Initialization</title>
* <para>The code below shows how to correctly initialize Clutter
* in a multi-threaded environment. These operations are mandatory for
* applications that wish to use threads with Clutter.</para>
* <programlisting>
* int
* main (int argc, char *argv[])
* {
* /&ast; initialize Clutter &ast;/
* clutter_init (&amp;argc, &amp;argv);
*
* /&ast; program code &ast;/
*
* /&ast; acquire the main lock &ast;/
* clutter_threads_enter ();
*
* /&ast; start the main loop &ast;/
* clutter_main ();
*
* /&ast; release the main lock &ast;/
* clutter_threads_leave ();
*
* /&ast; clean up &ast;/
* return 0;
* }
* </programlisting>
* </example>
* <para>This threading model has the caveat that it is only safe to call
* Clutter's API when the lock has been acquired &mdash; which happens
* between pairs of clutter_threads_enter() and clutter_threads_leave()
* calls.</para>
* <para>The only safe and portable way to use the Clutter API in a
* multi-threaded environment is to never access the API from a thread that
* did not call clutter_init() and clutter_main().</para>
* <para>The common pattern for using threads with Clutter is to use worker
spelling fix: timeour -> timeout
2011-10-03 14:56:26 +00:00
* threads to perform blocking operations and then install idle or timeout
docs: Document Clutter's threading model Be explicit on how to deal with threads and Clutter.
2009-12-02 14:15:43 +00:00
* sources with the result when the thread finished.</para>
* <para>Clutter provides thread-aware variants of g_idle_add() and
* g_timeout_add() that acquire the Clutter lock before invoking the provided
* callback: clutter_threads_add_idle() and
* clutter_threads_add_timeout().</para>
docs: Include test-threads.c in the API reference We can use the test-threads.c interactive test as part of the documentation on how to use threads with Clutter.
2011-10-13 09:42:30 +00:00
* <para>The example below shows how to use a worker thread to perform a
* blocking operation, and perform UI updates using the main loop.</para>
* <example id="worker-thread-example">
* <title>A worker thread example</title>
* <programlisting>
Move examples from tests/interactive to a new top-level The example code that is meant to be XIncluded into the API reference should not be part of the interactive test suite: it's code that it is meant to be used as a reference implementation - whereas the interactive test suite should be allowed to be lean and test behaviour even in nasty ways. In short: the test suite should not be the place where we show off idiomatic code for educational purposes.
2012-05-01 17:30:10 +00:00
* <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/threads.c">
docs: Include test-threads.c in the API reference We can use the test-threads.c interactive test as part of the documentation on how to use threads with Clutter.
2011-10-13 09:42:30 +00:00
* <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
* </xi:include>
* </programlisting>
* </example>
docs: Document Clutter's threading model Be explicit on how to deal with threads and Clutter.
2009-12-02 14:15:43 +00:00
* </refsect2>
2006-06-22 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-clone-texture.c: * clutter/clutter-color.c: * clutter/clutter-event.c: * clutter/clutter-group.c: * clutter/clutter-label.c: * clutter/clutter-main.c: * clutter/clutter-media.c: * clutter/clutter-rectangle.c: * clutter/clutter-stage.c: * clutter/clutter-texture.c: * clutter/clutter-timeline.c: * clutter/clutter-util.c: * clutter/clutter-video-texture.c: * configure.ac: Documentation updates - add section headers.
2006-06-21 22:34:25 +00:00
*/
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#ifdef HAVE_CONFIG_H
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
#include "config.h"
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#endif
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
#include <stdlib.h>
* clutter/clutter-main.c: (pre_parse_hook): Call setlocale on init * clutter/x11/clutter-event-x11.c: (translate_key_event): Fix typo and use the same buffer size as xev
2008-06-10 14:01:43 +00:00
#include <glib/gi18n-lib.h>
* clutter/clutter-main.c: Include <locale.h> for setlocale()
2008-06-10 21:25:23 +00:00
#include <locale.h>
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
#include "clutter-actor-private.h"
Clean up clutter-private.h/4 Move the private Backend API to a separate header. This also allows us to finally move the class vtable and instance structure to a separate file and plug the visibility hole that left the Backend class bare for everyone to poke into.
2010-10-21 10:49:37 +00:00
#include "clutter-backend-private.h"
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#include "clutter-config.h"
Clean up clutter-private.h/4 Move the private Backend API to a separate header. This also allows us to finally move the class vtable and instance structure to a separate file and plug the visibility hole that left the Backend class bare for everyone to poke into.
2010-10-21 10:49:37 +00:00
#include "clutter-debug.h"
#include "clutter-device-manager-private.h"
Fix missing/redundant declarations
2012-03-07 12:34:06 +00:00
#include "clutter-event-private.h"
Clean up clutter-private.h/4 Move the private Backend API to a separate header. This also allows us to finally move the class vtable and instance structure to a separate file and plug the visibility hole that left the Backend class bare for everyone to poke into.
2010-10-21 10:49:37 +00:00
#include "clutter-feature.h"
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
#include "clutter-main.h"
Use a single master "clock" to drive timelines Currently, all timelines install a timeout inside the TimeoutPool they share. Every time the main loop spins, all the timeouts are updated. This, in turn, will usually lead to redraws being queued on the stages. This behaviour leads to the potential starvation of timelines and to excessive redraws. One lesson learned from the games developers is that the scenegraph should be prepared in its entirety before the GL paint sequence is initiated. This means making sure that every ::new-frame signal handler is called before clutter_redraw() is invoked. In order to do so a TimeoutPool is not enough: we need a master clock. The clock will be responsible for advancing all the active timelines created inside a scene, but only when the stage is being redrawn. The sequence is: + queue_redraw() is invoked on an actor and bubbles up to the stage + if no redraw() has already been scheduled, install an idle handler with a known priority + inside the idle handler: - advance the master clock, which will in turn advance every playing timeline by the amount of milliseconds elapsed since the last redraw; this will make every playing timeline emit the ::new-frame signal - queue a relayout - call the redraw() method of the backend This way we trade multiple timeouts with a single frame source that only runs if a timeline is playing and queues redraws on the various stages.
2009-03-21 20:39:32 +00:00
#include "clutter-master-clock.h"
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
#include "clutter-private.h"
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
#include "clutter-profile.h"
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
#include "clutter-settings-private.h"
Store the motion event deliver flag in ClutterStage Once upon a time, the land of Clutter had a stage singleton. It was created automatically at initialization time and stayed around even after the main loop was terminated. The singleton was content in being all there was. There also was a global API to handle the configuration of the stage singleton that would affect the behaviour on other classes, signals and properties. Then, an evil wizard came along and locked the stage singleton in his black tower, and twisted it until it was possible to create new stages. These new stages were pesky, and didn't have the same semantics of the singleton: they didn't stay around when closed, or terminate the main loop on delete events. The evil wizard also started moving all the stage-related API from the global context into class-specific methods. Finally, the evil wizard cast a spell, and the stage singleton was demoted to creation on demand - and until somebody called the clutter_stage_get_default() function, the singleton remained in a limbo of NULL pointers and undefined memory areas. There was a last bit - literally - of information still held by the global API; a tiny, little flag that disabled per-actor motion events. The evil wizard added private accessors for it, and stored it inside the stage private structure, in preparation for a deprecation that would come in a future development cycle. The evil wizard looked down upon the land of Clutter from the height of his black tower; the lay of the land had been reshaped into a crucible of potential, and the last dregs of the original force of creation were either molted into new, useful shapes, or blasted away by the sheer fury of his will. All was good.
2011-02-18 17:19:04 +00:00
#include "clutter-stage-manager.h"
Clean up clutter-private.h/4 Move the private Backend API to a separate header. This also allows us to finally move the class vtable and instance structure to a separate file and plug the visibility hole that left the Backend class bare for everyone to poke into.
2010-10-21 10:49:37 +00:00
#include "clutter-stage-private.h"
#include "clutter-version.h" /* For flavour define */
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#ifdef CLUTTER_WINDOWING_OSX
#include "osx/clutter-backend-osx.h"
#endif
#ifdef CLUTTER_WINDOWING_WIN32
#include "win32/clutter-backend-win32.h"
#endif
#ifdef CLUTTER_WINDOWING_GDK
#include "gdk/clutter-backend-gdk.h"
#endif
#ifdef CLUTTER_WINDOWING_X11
#include "x11/clutter-backend-x11.h"
#endif
#ifdef CLUTTER_WINDOWING_EGL
#include "egl/clutter-backend-eglnative.h"
#endif
#ifdef CLUTTER_WINDOWING_WAYLAND
#include "wayland/clutter-backend-wayland.h"
#endif
Adds a --with-system-cogl config option for Clutter This makes it possible to build Clutter against a standalone build of Cogl instead of having the Clutter build traverse into the clutter/cogl subdirectory.
2011-02-22 15:51:13 +00:00
#include <cogl/cogl.h>
Fix include location for cogl-pango.h In Cogl, cogl-pango.h has moved to <cogl-pango/cogl-pango.h>. When using the experimental 2.0 API (which Clutter does) it is no longer possible to include it under the old name of <cogl/cogl-pango.h> so we need to update the include location.
2011-05-16 15:04:27 +00:00
#include <cogl-pango/cogl-pango.h>
2007-05-28 Matthew Allum <mallum@openedhand.com> * clutter/clutter-backend.c: * clutter/clutter-backend.h: * clutter/glx/clutter-stage-glx.c: * clutter/glx/clutter-backend-glx.c: Fix up rendering pipeline removing clutter_backend_XXX_stage_paint and adding clutter_backend_XXX_redraw instead. Duplicates less code in backends, avoids clutter_actor_paint() getting called before stage is set up (viewport wise) and unbreaks things like picking. * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/clutter-stage.c: (clutter_stage_get_actor_at_pos): Redo picking functionality a different way (via color indexing) as to provide more flexibility, possibly speed and more likely work with GL/ES (doesn't currently however - not sure why). * clutter/clutter-group.c: Add groups own 'pick' method. * clutter/cogl/cogl.h: * clutter/cogl/gl/cogl.c: * clutter/cogl/gles/cogl.c: Move clipping funtionality into cogl. * clutter/cogl/gles/cogl-defines.h: Hack around missing BGR format in GL/ES. * clutter/egl/clutter-backend-egl.c: * clutter/egl/clutter-backend-egl.h: * clutter/egl/clutter-stage-egl.c: * clutter/sdl/clutter-backend-sdl.c: * clutter/sdl/clutter-backend-sdl.h: * clutter/sdl/clutter-event-sdl.c: * clutter/sdl/clutter-stage-sdl.c: Update backends to newer API. Add basic mouse event translation to SDL.
2007-05-28 18:49:34 +00:00
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
#include "cally.h" /* For accessibility support */
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
/* main context */
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static ClutterMainContext *ClutterCntx = NULL;
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
G_LOCK_DEFINE_STATIC (ClutterCntx);
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
/* main lock and locking/unlocking functions */
Use a static mutex for the default Clutter lock The Big Clutter Lock™ can now be a static GMutex, since GLib supports them. We can also drop a bunch of checks given the recent changes in GLib threading API.
2011-10-07 14:08:27 +00:00
static GMutex clutter_threads_mutex;
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static GCallback clutter_threads_lock = NULL;
static GCallback clutter_threads_unlock = NULL;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
Make disable text mipmapping a command line switch The environment variable to disable mipmapping should also be a command line switch, and be handled like the rest of Clutter's environment variables/command line switches.
2009-02-23 13:08:59 +00:00
/* command line options */
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static gboolean clutter_is_initialized = FALSE;
static gboolean clutter_show_fps = FALSE;
static gboolean clutter_fatal_warnings = FALSE;
Make disable text mipmapping a command line switch The environment variable to disable mipmapping should also be a command line switch, and be handled like the rest of Clutter's environment variables/command line switches.
2009-02-23 13:08:59 +00:00
static gboolean clutter_disable_mipmap_text = FALSE;
Make fuzzy picking a command line switch The CLUTTER_FUZZY_PICK environment variable is the last one used by Clutter without a corresponding command line switch.
2009-02-23 13:17:06 +00:00
static gboolean clutter_use_fuzzy_picking = FALSE;
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
static gboolean clutter_enable_accessibility = TRUE;
main: Add a sync-to-vblank global flag It replaces the per-backend CLUTTER_VBLANK environment variable.
2011-11-04 16:35:38 +00:00
static gboolean clutter_sync_to_vblank = TRUE;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static guint clutter_default_fps = 60;
2007-10-26 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --clutter-default-fps run-time switch and CLUTTER_DEFAULT_FPS environment variable support for setting the default frame-rate at run-time.
2007-10-26 15:47:39 +00:00
Fix compilation warning by using the correct type
2010-11-15 15:36:41 +00:00
static ClutterTextDirection clutter_text_direction = CLUTTER_TEXT_DIRECTION_LTR;
Make disable text mipmapping a command line switch The environment variable to disable mipmapping should also be a command line switch, and be handled like the rest of Clutter's environment variables/command line switches.
2009-02-23 13:08:59 +00:00
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static guint clutter_main_loop_level = 0;
static GSList *main_loops = NULL;
Cosmetic fixes
2011-10-10 14:42:36 +00:00
/* debug flags */
guint clutter_debug_flags = 0;
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
guint clutter_paint_debug_flags = 0;
Cosmetic fixes
2011-10-10 14:42:36 +00:00
guint clutter_pick_debug_flags = 0;
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
Cosmetic fixes
2011-10-10 14:42:36 +00:00
/* profile flags */
guint clutter_profile_flags = 0;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2.0: Remove unnecessary symbols
2012-08-27 09:09:57 +00:00
static const guint clutter_major_version = CLUTTER_MAJOR_VERSION;
static const guint clutter_minor_version = CLUTTER_MINOR_VERSION;
static const guint clutter_micro_version = CLUTTER_MICRO_VERSION;
Add run-time version checks Just like CLUTTER_CHECK_VERSION does version checking at compile time, we need a way to verify the version of the library that we are linking against. This is mostly needed for language bindings and for run-time loadable modules -- when we'll get those.
2009-10-30 11:02:35 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#ifdef CLUTTER_ENABLE_DEBUG
static const GDebugKey clutter_debug_keys[] = {
{ "misc", CLUTTER_DEBUG_MISC },
{ "actor", CLUTTER_DEBUG_ACTOR },
{ "texture", CLUTTER_DEBUG_TEXTURE },
{ "event", CLUTTER_DEBUG_EVENT },
{ "paint", CLUTTER_DEBUG_PAINT },
Add some debugging notes for picking This adds a new CLUTTER_DEBUG option for picking. Currently this just reports the position for each pick and whether it is clipped or not.
2010-08-23 10:33:22 +00:00
{ "pick", CLUTTER_DEBUG_PICK },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
{ "pango", CLUTTER_DEBUG_PANGO },
2007-04-28 Matthew Allum <mallum@openedhand.com> * clutter/Makefile.am: * clutter/clutter-debug.h: * clutter/clutter-fixed.h: * clutter/clutter-main.c: * clutter/cogl/gles/Makefile.am: * clutter/cogl/gles/cogl-defines.h: * clutter/cogl/gles/cogl.c: * clutter/egl/clutter-backend-egl.c: * clutter/egl/clutter-backend-egl.h: * clutter/egl/clutter-stage-egl.c: * configure.ac: Populate most stubs for cogl GL/ES implementation. (against vincent - see http://svn.o-hand.com/repos/misc/ogles) Add various fixups to EGL backend. Code builds and runs (on 16bpp) but yet displays much (is close!) * clutter/pango/pangoclutter-render.c: comment out some rouge glBegin/end calls.
2007-04-28 00:37:11 +00:00
{ "backend", CLUTTER_DEBUG_BACKEND },
2007-06-08 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-debug.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-timeline.c: Add 'schedule' debug flag and new CLUTTER_TIMESTAMP macro. * clutter/clutter-texture.c: * clutter/clutter-texture.h: * clutter/cogl/cogl.h: * clutter/cogl/gl/cogl-defines.h: * clutter/cogl/gles/cogl-defines.h: * clutter/cogl/gl/cogl.c: * clutter/cogl/gles/cogl.c: Add initial experiemental YUV texture support. Move texture rect size checks into cogl. Better handle moving texture data from video -> system memory (if support available).
2007-06-07 23:51:53 +00:00
{ "scheduler", CLUTTER_DEBUG_SCHEDULER },
2007-10-08 Emmanuele Bassi <ebassi@openedhand.com> Initial implementation of the UI definition files. (#424) * clutter/json/Makefile.am: * clutter/json/*.[ch]: In-tree copy of JSON-GLib, a GLib-based JSON parser/generator library. We use it in-tree because we might need to change the API. Ideally, we'd depend on it. * clutter/clutter.h: * clutter/clutter-script-private.h: * clutter/clutter-script.[ch]: ClutterScript, the scenegraph generator class. It parses JSON streams in form of buffers and files and builds the scene. * clutter/clutter-debug.h: * clutter/clutter-main.c: Add a "script" debug flag * clutter/Makefile.am: Build glue. * tests/Makefile.am: * tests/test-script.c: Add a test case for the ClutterScript. * configure.ac: Depend on GLib 2.14, so we can use the g_hash_table_get_key() and g_hash_table_get_values() functions for the time being; we can probably reimplement those, but we are going to need 2.14 anyway if we are going to implement a list model using GSequence.
2007-10-08 15:03:22 +00:00
{ "script", CLUTTER_DEBUG_SCRIPT },
2007-12-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-score.h: Rearrange declarations. * clutter/clutter-score.c: More documentation in the long description of the ClutterScore section. * clutter/clutter-debug.h: * clutter/clutter-main.c: Add the CLUTTER_DEBUG_SHADER flag, for debugging the shader calls. * clutter/clutter-feature.h: Fix the documentation of the feature flags. * clutter/Makefile.am: Remove trailing whitespace.
2007-12-05 21:15:19 +00:00
{ "shader", CLUTTER_DEBUG_SHADER },
Add debug annotations for the layout process If we need to check that the layout sequence is correct in terms of order of execution and with respect to caching, then having a CLUTTER_DEBUG_LAYOUT debug flag would make things easier.
2009-04-15 16:25:50 +00:00
{ "animation", CLUTTER_DEBUG_ANIMATION },
Optimize culling by doing culling in eye-coordinates This implements a variation of frustum culling whereby we convert screen space clip rectangles into eye space mini-frustums so that we don't have to repeatedly transform actor paint-volumes all the way into screen coordinates to perform culling, we just have to apply the modelview transform and then determine each points distance from the planes that make up the clip frustum. By avoiding the projective transform, perspective divide and viewport scale for each point culled this makes culling much cheaper.
2011-02-01 18:32:08 +00:00
{ "layout", CLUTTER_DEBUG_LAYOUT },
actor: add oob-transform opt to catch out-of-band transforms Out-of-band transforms are considered to be all actor transforms done directly with the Cogl API instead of via ClutterActor::apply_transform. By running with CLUTTER_DEBUG=oob-transform then Clutter will explicitly try to detect when un-expected transforms have been applied to the modelview matrix stack. Out-of-band transforms can lead to awkward bugs in Clutter applications because Clutter itself doesn't know about them and this can disrupt Clutter's input handling and calculations of actor paint-volumes which can lead to visual artifacts. Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-09-19 11:36:52 +00:00
{ "clipping", CLUTTER_DEBUG_CLIPPING },
Add paint-deform-tiles option to CLUTTER_DEBUG To make easier to visualize the triangles in a ClutterDeformEffect https://bugzilla.gnome.org/show_bug.cgi?id=660354
2011-09-28 12:24:57 +00:00
{ "oob-transforms", CLUTTER_DEBUG_OOB_TRANSFORMS },
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
};
#endif /* CLUTTER_ENABLE_DEBUG */
static const GDebugKey clutter_pick_debug_keys[] = {
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
{ "nop-picking", CLUTTER_DEBUG_NOP_PICKING },
debug: Move paint-deform-tiles to CLUTTER_PAINT The CLUTTER_DEBUG class of debugging flags is meant for debugging notes, while the CLUTTER_PAINT debugging flags are for changing the output of the paint cycle. Painting the DeformEffect tiles should go in the latter.
2011-10-13 10:38:27 +00:00
{ "dump-pick-buffers", CLUTTER_DEBUG_DUMP_PICK_BUFFERS },
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
};
static const GDebugKey clutter_paint_debug_keys[] = {
Adds initial clipped redraw support to Clutter A new (internal only currently) API, _clutter_actor_queue_clipped_redraw can be used to queue a redraw along with a clip rectangle in actor coordinates. This clip rectangle propagates up to the stage and clutter backend which may optionally use the information to optimize stage redraws. The GLX backend in particular may scissor the next redraw to the clip rectangle and use GLX_MESA_copy_sub_buffer to present the stage subregion. The intention is that any actors that can naturally determine the bounds of updates should queue clipped redraws to reduce the cost of updating small regions of the screen. Notes: » If GLX_MESA_copy_sub_buffer isn't available then the GLX backend ignores any clip rectangles. » queuing multiple clipped redraws will result in the bounding box of each clip rectangle being used. » If a clipped redraw has a height > 300 pixels then it's promoted into a full stage redraw, so that the GPU doesn't end up blocking too long waiting for the vsync to reach the optimal position to avoid tearing. » Note: no empirical data was used to come up with this threshold so we may need to tune this. » Currently only ClutterX11TexturePixmap makes use of this new API. This is done via a new "queue-damage-redraw" signal that is emitted when the pixmap is updated. The default handler queues a clipped redraw with the assumption that the pixmap is being painted as a rectangle covering the actors transformed allocation. If you subclass ClutterX11TexturePixmap and change how it's painted you now also need to override the signal handler and queue your own redraw. Technically this is a semantic break, but it's assumed that no one is currently doing this. This still leaves a few unsolved issues with regards to optimizing sub stage redraws that need to be addressed in further work so this can only be considered a stepping stone a this point: » Because we have no reliable way to determine if the painting of any given actor is being modified any optimizations implemented using _clutter_actor_queue_redraw_with_clip must be overridable by a subclass, and technically must be opt-in for existing classes to avoid a change in semantics. E.g. consider that a user connects to the paint signal for ClutterTexture and paints a circle instead of a rectangle. In this case any original logic to queue clipped redraws would be incorrect. » Currently only the implementation of an actor has enough information with which to queue clipped redraws. E.g. It is not possible for generic code in clutter-actor.c to queue a clipped redraw when hiding an actor because actors have no way to report a "paint box". (remember actors can draw outside their allocation and actors with depth may also be projected outside of their allocation) » The current plan is to add a actor_class->get_paint_cuboid() virtual so actors can report a bounding cube for everything they would draw in their current state and use that to queue clipped redraws against the stage by projecting the paint cube into stage coordinates. » Our heuristics for promoting clipped redraws into full redraws to avoid blocking the GPU while we wait for the vsync need improving: » vsync issues aren't relevant for redirected/composited applications so they should use different heuristics. In this case we instead need to trade off the cost of blitting when using glXCopySubBuffer vs promoting to a full redraw and flipping instead.
2009-11-30 17:47:55 +00:00
{ "disable-swap-events", CLUTTER_DEBUG_DISABLE_SWAP_EVENTS },
{ "disable-clipped-redraws", CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS },
paint volumes: CLUTTER_PAINT=paint-volumes debug option This adds a debug option to visualize the paint volumes of all actors. When CLUTTER_PAINT=paint-volumes is exported in the environment before running a Clutter application then all actors will have their bounding volume drawn in green with a label corresponding to the actors type.
2010-09-07 17:50:29 +00:00
{ "redraws", CLUTTER_DEBUG_REDRAWS },
{ "paint-volumes", CLUTTER_DEBUG_PAINT_VOLUMES },
clutter-actor: Add a debug flag for disabling offscreen redirect This adds CLUTTER_PAINT=disable-offscreen-redirect to help diagnose problems with the correct opacity changes. This just makes it so that it never installs the flatten effect so it will never automatically redirect an actor offscreen.
2011-06-06 17:22:20 +00:00
{ "disable-culling", CLUTTER_DEBUG_DISABLE_CULLING },
Add a CLUTTER_PAINT debug option to enable continous redrawing When testing the performance of an application, it's often useful to force it to continuously redraw instead of going idle to help measure the frame rate. This just adds a CLUTTER_PAINT=continuous-redraw which causes the master clock to queue a redraw on all of the stages just before it prepares its source. Reviewed-by: Robert Bragg <robert@linux.intel.com> Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-09-23 14:12:44 +00:00
{ "disable-offscreen-redirect", CLUTTER_DEBUG_DISABLE_OFFSCREEN_REDIRECT },
debug: Move paint-deform-tiles to CLUTTER_PAINT The CLUTTER_DEBUG class of debugging flags is meant for debugging notes, while the CLUTTER_PAINT debugging flags are for changing the output of the paint cycle. Painting the DeformEffect tiles should go in the latter.
2011-10-13 10:38:27 +00:00
{ "continuous-redraw", CLUTTER_DEBUG_CONTINUOUS_REDRAW },
{ "paint-deform-tiles", CLUTTER_DEBUG_PAINT_DEFORM_TILES },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
};
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options As we have for debugging, this adds the ability to control profiling flags either via the command line or an environment variable. The first option added is CLUTTER_PROFILE=disable-report This also changes the reporting to be opt-out so you don't need to export CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use CLUTTER_PROFILE=disable-report to disable it if desired.
2010-01-06 18:15:13 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
static const GDebugKey clutter_profile_keys[] = {
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
{"picking-only", CLUTTER_PROFILE_PICKING_ONLY },
{"disable-report", CLUTTER_PROFILE_DISABLE_REPORT }
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options As we have for debugging, this adds the ability to control profiling flags either via the command line or an environment variable. The first option added is CLUTTER_PROFILE=disable-report This also changes the reporting to be opt-out so you don't need to export CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use CLUTTER_PROFILE=disable-report to disable it if desired.
2010-01-06 18:15:13 +00:00
};
#endif /* CLUTTER_ENABLE_DEBUG */
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
static void
clutter_threads_impl_lock (void)
{
g_mutex_lock (&clutter_threads_mutex);
}
static void
clutter_threads_impl_unlock (void)
{
main: Do not release the lock if it hasn't been acquired On various systems, trying to release a mutex that hasn't been acquired will result in a run-time error. In order to avoid this, we trylock() the Big Clutter Lock™ and immediately unlock() it, regardless of the result; if the lock was already acquired, trylock() will immediately fail, and we can release it; if the lock was not acquired, trylock() will succeed, and we can release the lock immediately. This is necessary to maintain binary compatibility and invariants for Clutter applications doing: clutter_init() clutter_threads_enter() ... clutter_main() ... clutter_threads_leave() instead of the correct: clutter_init() clutter_threads_enter() ... clutter_threads_leave() clutter_main() clutter_threads_enter() ... clutter_threads_leave() With Clutter ≥ 1.12, the idiomatic form is: clutter_init() ... clutter_main() given that the public Big Clutter Lock™ acquire/release API has been deprecated, and nobody should take the lock outside of Clutter itself. https://bugzilla.gnome.org/show_bug.cgi?id=679439
2012-09-26 08:45:46 +00:00
/* we need to trylock here, in case the lock hasn't been acquired; on
* various systems trying to release a mutex that hasn't been acquired
* will cause a run-time error. trylock() will either fail, in which
* case we can release the lock we own; or it will succeeds, in which
* case we need to release the lock we just acquired. so we ignore the
* returned value.
*
* see: https://bugs.gnome.org/679439
*/
g_mutex_trylock (&clutter_threads_mutex);
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
g_mutex_unlock (&clutter_threads_mutex);
}
static inline void
clutter_threads_init_default (void)
{
g_mutex_init (&clutter_threads_mutex);
Bug 662071-[Win32]-Don't init the Big Clutter Lock Since the Windows GUI system is assuming multithreadedness, initializing locks after entering the GUI portion on Windows is likely to cause problems[1][2], which results many Clutter programs to crash due to releasing resources that they did not own. [1]: Multi-threaded use of GTK+ on Win32 in README.win32 of GTK+ source package [2]: Explanation of Windows GUI system regarding its multithreadness assumptions- http://mail.gnome.org/archives/gtk-list/2011-June/msg00005.html
2011-10-24 16:13:53 +00:00
#ifndef CLUTTER_WINDOWING_WIN32
/* we don't need nor want locking functions on Windows.here
* as Windows GUI system assumes multithreadedness
* see bug: https://bugzilla.gnome.org/show_bug.cgi?id=662071
*/
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
if (clutter_threads_lock == NULL)
clutter_threads_lock = clutter_threads_impl_lock;
if (clutter_threads_unlock == NULL)
clutter_threads_unlock = clutter_threads_impl_unlock;
Bug 662071-[Win32]-Don't init the Big Clutter Lock Since the Windows GUI system is assuming multithreadedness, initializing locks after entering the GUI portion on Windows is likely to cause problems[1][2], which results many Clutter programs to crash due to releasing resources that they did not own. [1]: Multi-threaded use of GTK+ on Win32 in README.win32 of GTK+ source package [2]: Explanation of Windows GUI system regarding its multithreadness assumptions- http://mail.gnome.org/archives/gtk-list/2011-June/msg00005.html
2011-10-24 16:13:53 +00:00
#endif /* CLUTTER_WINDOWING_WIN32 */
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
}
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
#define ENVIRONMENT_GROUP "Environment"
#define DEBUG_GROUP "Debug"
static void
clutter_config_read_from_key_file (GKeyFile *keyfile)
{
GError *key_error = NULL;
gboolean bool_value;
gint int_value;
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
gchar *str_value;
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
if (!g_key_file_has_group (keyfile, ENVIRONMENT_GROUP))
return;
bool_value =
g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
"ShowFps",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_show_fps = bool_value;
bool_value =
g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
"DisableMipmappedText",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_disable_mipmap_text = bool_value;
bool_value =
g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
"UseFuzzyPicking",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_use_fuzzy_picking = bool_value;
bool_value =
g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
"EnableAccessibility",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_enable_accessibility = bool_value;
main: Add a sync-to-vblank global flag It replaces the per-backend CLUTTER_VBLANK environment variable.
2011-11-04 16:35:38 +00:00
bool_value =
g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
"SyncToVblank",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_sync_to_vblank = bool_value;
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
int_value =
g_key_file_get_integer (keyfile, ENVIRONMENT_GROUP,
"DefaultFps",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
clutter_default_fps = int_value;
str_value =
g_key_file_get_string (keyfile, ENVIRONMENT_GROUP,
"TextDirection",
&key_error);
if (key_error != NULL)
g_clear_error (&key_error);
else
{
if (g_strcmp0 (str_value, "rtl") == 0)
clutter_text_direction = CLUTTER_TEXT_DIRECTION_RTL;
else
clutter_text_direction = CLUTTER_TEXT_DIRECTION_LTR;
}
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
g_free (str_value);
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
}
#ifdef CLUTTER_ENABLE_DEBUG
static void
clutter_debug_read_from_key_file (GKeyFile *keyfile)
{
GError *key_error = NULL;
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
gchar *value;
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
if (!g_key_file_has_group (keyfile, DEBUG_GROUP))
return;
value = g_key_file_get_value (keyfile, DEBUG_GROUP,
"Debug",
&key_error);
if (key_error == NULL)
{
clutter_debug_flags |=
g_parse_debug_string (value,
clutter_debug_keys,
G_N_ELEMENTS (clutter_debug_keys));
}
else
g_clear_error (&key_error);
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
g_free (value);
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
value = g_key_file_get_value (keyfile, DEBUG_GROUP,
"PaintDebug",
&key_error);
if (key_error == NULL)
{
clutter_paint_debug_flags |=
g_parse_debug_string (value,
clutter_paint_debug_keys,
G_N_ELEMENTS (clutter_paint_debug_keys));
}
else
g_clear_error (&key_error);
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
g_free (value);
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
value = g_key_file_get_value (keyfile, DEBUG_GROUP,
"PickDebug",
&key_error);
if (key_error == NULL)
{
clutter_pick_debug_flags |=
g_parse_debug_string (value,
clutter_pick_debug_keys,
G_N_ELEMENTS (clutter_pick_debug_keys));
}
else
g_clear_error (&key_error);
Do not leak strings from GKeyFile The string getters always copy, so we need to free the returned values.
2011-10-11 21:43:54 +00:00
g_free (value);
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
}
#endif
static void
clutter_config_read_from_file (const gchar *config_path)
{
ClutterSettings *settings = clutter_settings_get_default ();
GKeyFile *key_file = g_key_file_new ();
GError *error = NULL;
g_key_file_load_from_file (key_file, config_path, G_KEY_FILE_NONE, &error);
if (error == NULL)
{
main: Add a debug note when reading the settings file So that's easier to track in the debug log.
2011-11-09 09:09:37 +00:00
CLUTTER_NOTE (MISC, "Reading configuration from '%s'", config_path);
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
clutter_config_read_from_key_file (key_file);
#ifdef CLUTTER_ENABLE_DEBUG
clutter_debug_read_from_key_file (key_file);
#endif
_clutter_settings_read_from_key_file (settings, key_file);
}
else
{
g_warning ("Unable to read configuration settings from '%s': %s",
config_path,
error->message);
g_error_free (error);
}
g_key_file_free (key_file);
}
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
static void
clutter_config_read (void)
{
gchar *config_path;
config_path = g_build_filename (CLUTTER_SYSCONFDIR,
2.0: Bump clutter-1.0 to clutter-2.0 Some places in the build system do not (or cannot) use the macro-ified CLUTTER_API_VERSION, so we need to fix them up manually.
2012-10-07 19:11:43 +00:00
"clutter-2.0",
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
"settings.ini",
NULL);
if (g_file_test (config_path, G_FILE_TEST_EXISTS))
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
clutter_config_read_from_file (config_path);
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
g_free (config_path);
config_path = g_build_filename (g_get_user_config_dir (),
2.0: Bump clutter-1.0 to clutter-2.0 Some places in the build system do not (or cannot) use the macro-ified CLUTTER_API_VERSION, so we need to fix them up manually.
2012-10-07 19:11:43 +00:00
"clutter-2.0",
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
"settings.ini",
NULL);
if (g_file_test (config_path, G_FILE_TEST_EXISTS))
Add more sections to the Clutter configuration file On top of the existing "Settings" group in the settings.ini file we should have two more groups: Environment - contains all the configuration possible through environment variables Debug - contains all the possible debug variables
2011-10-11 14:28:47 +00:00
clutter_config_read_from_file (config_path);
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
g_free (config_path);
}
Deprecate some more old, useless API We still ship clutter_get_show_fps() and clutter_get_debug_enabled() as public entry points. Yet another case of missing API review prior to the 1.0 release, so really the bucket stops around my desk. Let's deprecate these two useless functions, and reduce the API footprint of Clutter.
2011-11-15 17:58:25 +00:00
gboolean
_clutter_context_get_show_fps (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
return context->show_fps;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
2.0: Remove deprecated symbols from the tree And fix the fallout.
2012-10-07 20:48:02 +00:00
guint
_clutter_context_get_frame_rate (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
return context->frame_rate;
}
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
/**
* clutter_get_accessibility_enabled:
*
* Returns whether Clutter has accessibility support enabled. As
* least, a value of TRUE means that there are a proper AtkUtil
* implementation available
*
* Return value: %TRUE if Clutter has accessibility support enabled
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
*/
gboolean
clutter_get_accessibility_enabled (void)
{
return cally_get_cally_initialized ();
}
Add method clutter_disable_accessibility () https://bugzilla.gnome.org/show_bug.cgi?id=691468
2013-03-01 09:58:54 +00:00
/**
* clutter_disable_accessibility:
*
* Disable loading the accessibility support. It has the same effect
* as setting the environment variable
* CLUTTER_DISABLE_ACCESSIBILITY. For the same reason, this method
* should be called before clutter_init().
*/
void
clutter_disable_accessibility (void)
{
if (clutter_is_initialized)
{
g_warning ("clutter_disable_accessibility() can only be called before "
"initializing Clutter.");
return;
}
clutter_enable_accessibility = FALSE;
}
stage: Move _clutter_do_pick to clutter-stage.c This moves the implementation of _clutter_do_pick to clutter-stage.c and renames it _clutter_stage_do_pick. This function can be compared to _clutter_stage_do_update/redraw in that it prepares for and starts a traversal of a scenegraph descending from a given stage. Since it is desirable that this function should have access to the private state of the stage it is awkward to maintain outside of clutter-stage.c. Besides moving _clutter_do_pick this patch is also able to remove the following private state accessors from clutter-stage-private.h: _clutter_stage_set_pick_buffer_valid, _clutter_stage_get_pick_buffer_valid, _clutter_stage_increment_picks_per_frame_counter, _clutter_stage_reset_picks_per_frame_counter and _clutter_stage_get_picks_per_frame_counter.
2011-03-15 13:17:04 +00:00
ClutterActor *
Make the pick id pool per Stage The id pool used for the actor's id should be a per-stage field. At some point, we might have a Stage mapped to multiple framebuffers, or each Stage mapped to a different framebuffer; also, on backend with low color precision we don't want to exhaust the size of the available ids with a global pool. Finally, it's yet another thing we can remove from the global Clutter context. Having the id pool allocated per-stage, and the pick id assigned on Actor:mapped will make the whole pick-id more reliable and future proof. http://bugzilla.clutter-project.org/show_bug.cgi?id=2633 https://bugzilla.gnome.org/show_bug.cgi?id=647876
2011-04-11 13:11:39 +00:00
_clutter_get_actor_by_id (ClutterStage *stage,
guint32 actor_id)
Intern clutter_get_actor_by_gid() implementation As the prelude to deprecation of the function in 1.8, let's move the implementation to an internal function, and use that instead of the public facing one.
2011-02-09 14:53:20 +00:00
{
Make the pick id pool per Stage The id pool used for the actor's id should be a per-stage field. At some point, we might have a Stage mapped to multiple framebuffers, or each Stage mapped to a different framebuffer; also, on backend with low color precision we don't want to exhaust the size of the available ids with a global pool. Finally, it's yet another thing we can remove from the global Clutter context. Having the id pool allocated per-stage, and the pick id assigned on Actor:mapped will make the whole pick-id more reliable and future proof. http://bugzilla.clutter-project.org/show_bug.cgi?id=2633 https://bugzilla.gnome.org/show_bug.cgi?id=647876
2011-04-11 13:11:39 +00:00
if (stage == NULL)
{
ClutterMainContext *context = _clutter_context_get_default ();
Intern clutter_get_actor_by_gid() implementation As the prelude to deprecation of the function in 1.8, let's move the implementation to an internal function, and use that instead of the public facing one.
2011-02-09 14:53:20 +00:00
Make the pick id pool per Stage The id pool used for the actor's id should be a per-stage field. At some point, we might have a Stage mapped to multiple framebuffers, or each Stage mapped to a different framebuffer; also, on backend with low color precision we don't want to exhaust the size of the available ids with a global pool. Finally, it's yet another thing we can remove from the global Clutter context. Having the id pool allocated per-stage, and the pick id assigned on Actor:mapped will make the whole pick-id more reliable and future proof. http://bugzilla.clutter-project.org/show_bug.cgi?id=2633 https://bugzilla.gnome.org/show_bug.cgi?id=647876
2011-04-11 13:11:39 +00:00
return _clutter_id_pool_lookup (context->id_pool, actor_id);
}
Intern clutter_get_actor_by_gid() implementation As the prelude to deprecation of the function in 1.8, let's move the implementation to an internal function, and use that instead of the public facing one.
2011-02-09 14:53:20 +00:00
Make the pick id pool per Stage The id pool used for the actor's id should be a per-stage field. At some point, we might have a Stage mapped to multiple framebuffers, or each Stage mapped to a different framebuffer; also, on backend with low color precision we don't want to exhaust the size of the available ids with a global pool. Finally, it's yet another thing we can remove from the global Clutter context. Having the id pool allocated per-stage, and the pick id assigned on Actor:mapped will make the whole pick-id more reliable and future proof. http://bugzilla.clutter-project.org/show_bug.cgi?id=2633 https://bugzilla.gnome.org/show_bug.cgi?id=647876
2011-04-11 13:11:39 +00:00
return _clutter_stage_get_actor_by_pick_id (stage, actor_id);
Intern clutter_get_actor_by_gid() implementation As the prelude to deprecation of the function in 1.8, let's move the implementation to an internal function, and use that instead of the public facing one.
2011-02-09 14:53:20 +00:00
}
Made it possible to do picking when the colors stored in the framebuffer are only approximately the correct value. * clutter/clutter-actor.c: (init_bits): initialize constants about how many bits are available/will be used for r,g,b components. (_clutter_pix_to_id): now own function, compute an id from a pixel into its own function (used from _clutter_do_pick). (_clutter_id_to_col): now own function, computes the color to use for a given id. (clutter_actor_paint): use clutter_id_to_col. * clutter/clutter-main.c: (_clutter_do_pick): use _clutter_pix_to_id (clutter_main): re-enable invocation of fruity app shell.
2008-05-13 18:40:14 +00:00
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
void
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
_clutter_id_to_color (guint id_,
ClutterColor *col)
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
{
ClutterMainContext *ctx;
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
gint red, green, blue;
ctx = _clutter_context_get_default ();
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
Initialize color masks lazily When we don't use a window system drawable, we can't query the color masks at context initialization time. Do it lazily so we're sure to have a current context with a valid framebuffer.
2010-09-27 17:25:50 +00:00
if (ctx->fb_g_mask == 0)
{
/* Figure out framebuffer masks used for pick */
cogl_get_bitmasks (&ctx->fb_r_mask,
&ctx->fb_g_mask,
&ctx->fb_b_mask, NULL);
ctx->fb_r_mask_used = ctx->fb_r_mask;
ctx->fb_g_mask_used = ctx->fb_g_mask;
ctx->fb_b_mask_used = ctx->fb_b_mask;
/* XXX - describe what "fuzzy picking" is */
if (clutter_use_fuzzy_picking)
{
ctx->fb_r_mask_used--;
ctx->fb_g_mask_used--;
ctx->fb_b_mask_used--;
}
}
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
/* compute the numbers we'll store in the components */
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
red = (id_ >> (ctx->fb_g_mask_used+ctx->fb_b_mask_used))
Clean up whitespace, indentation and comments
2009-12-11 20:17:58 +00:00
& (0xff >> (8-ctx->fb_r_mask_used));
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
green = (id_ >> ctx->fb_b_mask_used)
Clean up whitespace, indentation and comments
2009-12-11 20:17:58 +00:00
& (0xff >> (8-ctx->fb_g_mask_used));
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
blue = (id_)
Clean up whitespace, indentation and comments
2009-12-11 20:17:58 +00:00
& (0xff >> (8-ctx->fb_b_mask_used));
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
/* shift left bits a bit and add one, this circumvents
* at least some potential rounding errors in GL/GLES
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
* driver / hw implementation.
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
*/
if (ctx->fb_r_mask_used != ctx->fb_r_mask)
Bug 1230 - Pick fails on low precision color buffers * clutter/clutter-main.c (_clutter_id_to_color): When using fuzzy picking to pick a color for an actor, it would previously set the fuzzy bit and then all but the most significant of the remaining unused bits. This meant that for 16-bit displays it would end up with a strange pattern for the unused bits like 1011 which could cause it to round up. Now it just sets all but the most significant of all of the unused bits giving a pattern like 0111. Thanks to Guy Zadickario for the patch.
2008-11-06 12:03:05 +00:00
red = red * 2;
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
if (ctx->fb_g_mask_used != ctx->fb_g_mask)
Bug 1230 - Pick fails on low precision color buffers * clutter/clutter-main.c (_clutter_id_to_color): When using fuzzy picking to pick a color for an actor, it would previously set the fuzzy bit and then all but the most significant of the remaining unused bits. This meant that for 16-bit displays it would end up with a strange pattern for the unused bits like 1011 which could cause it to round up. Now it just sets all but the most significant of all of the unused bits giving a pattern like 0111. Thanks to Guy Zadickario for the patch.
2008-11-06 12:03:05 +00:00
green = green * 2;
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
if (ctx->fb_b_mask_used != ctx->fb_b_mask)
Bug 1230 - Pick fails on low precision color buffers * clutter/clutter-main.c (_clutter_id_to_color): When using fuzzy picking to pick a color for an actor, it would previously set the fuzzy bit and then all but the most significant of the remaining unused bits. This meant that for 16-bit displays it would end up with a strange pattern for the unused bits like 1011 which could cause it to round up. Now it just sets all but the most significant of all of the unused bits giving a pattern like 0111. Thanks to Guy Zadickario for the patch.
2008-11-06 12:03:05 +00:00
blue = blue * 2;
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
/* shift up to be full 8bit values */
Bug 1230 - Pick fails on low precision color buffers * clutter/clutter-main.c (_clutter_id_to_color): When using fuzzy picking to pick a color for an actor, it would previously set the fuzzy bit and then all but the most significant of the remaining unused bits. This meant that for 16-bit displays it would end up with a strange pattern for the unused bits like 1011 which could cause it to round up. Now it just sets all but the most significant of all of the unused bits giving a pattern like 0111. Thanks to Guy Zadickario for the patch.
2008-11-06 12:03:05 +00:00
red = (red << (8 - ctx->fb_r_mask)) | (0x7f >> (ctx->fb_r_mask_used));
green = (green << (8 - ctx->fb_g_mask)) | (0x7f >> (ctx->fb_g_mask_used));
blue = (blue << (8 - ctx->fb_b_mask)) | (0x7f >> (ctx->fb_b_mask_used));
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
col->red = red;
col->green = green;
col->blue = blue;
col->alpha = 0xff;
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
[debug] Guard the use of gdk_pixbuf for pick debugging by #ifdef USE_GDKPIXBUF gdk is an optional clutter dependency, so the pick buffer debugging option needs some guards so we don't break, for example, the OSX builds. This also adds a comment for the bit fiddling done on the pick colors used to ensure the pick colors are more distinguished while debugging. (we swap the nibbles of each color component so that pick buffers don't just look black.)
2009-10-05 15:46:24 +00:00
/* XXX: We rotate the nibbles of the colors here so that there is a
* visible variation between colors of sequential actor identifiers;
* otherwise pick buffers dumped to an image will pretty much just look
* black.
*/
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
if (G_UNLIKELY (clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS))
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
{
Clean up whitespace, indentation and comments
2009-12-11 20:17:58 +00:00
col->red = (col->red << 4) | (col->red >> 4);
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
col->green = (col->green << 4) | (col->green >> 4);
Clean up whitespace, indentation and comments
2009-12-11 20:17:58 +00:00
col->blue = (col->blue << 4) | (col->blue >> 4);
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
}
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
}
stage: Move _clutter_do_pick to clutter-stage.c This moves the implementation of _clutter_do_pick to clutter-stage.c and renames it _clutter_stage_do_pick. This function can be compared to _clutter_stage_do_update/redraw in that it prepares for and starts a traversal of a scenegraph descending from a given stage. Since it is desirable that this function should have access to the private state of the stage it is awkward to maintain outside of clutter-stage.c. Besides moving _clutter_do_pick this patch is also able to remove the following private state accessors from clutter-stage-private.h: _clutter_stage_set_pick_buffer_valid, _clutter_stage_get_pick_buffer_valid, _clutter_stage_increment_picks_per_frame_counter, _clutter_stage_reset_picks_per_frame_counter and _clutter_stage_get_picks_per_frame_counter.
2011-03-15 13:17:04 +00:00
guint
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
_clutter_pixel_to_id (guchar pixel[4])
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
{
ClutterMainContext *ctx;
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
gint red, green, blue;
guint retval;
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
ctx = _clutter_context_get_default ();
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
/* reduce the pixel components to the number of bits actually used of the
* 8bits.
*/
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
if (G_UNLIKELY (clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS))
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
{
guchar tmp;
[debug] Guard the use of gdk_pixbuf for pick debugging by #ifdef USE_GDKPIXBUF gdk is an optional clutter dependency, so the pick buffer debugging option needs some guards so we don't break, for example, the OSX builds. This also adds a comment for the bit fiddling done on the pick colors used to ensure the pick colors are more distinguished while debugging. (we swap the nibbles of each color component so that pick buffers don't just look black.)
2009-10-05 15:46:24 +00:00
/* XXX: In _clutter_id_to_color we rotated the nibbles of the colors so
* that there is a visible variation between colors of sequential actor
* identifiers (otherwise pick buffers dumped to an image will pretty
* much just look black.) Here we reverse that rotation.
*/
[debug] Adds a dump-pick-buffers CLUTTER_DEBUG option Now if you export CLUTTER_DEBUG=dump-pick-buffers clutter will write out a png, e.g. pick-buffer-00000.png, each time _clutter_to_pick() is called. It's a rather crude way to debug the picking (realtime visualization in a second stage would probably be nicer) but it we've used this approach successfully numerous times when debugging Clutter picking issues so it makes sense to have a debug option for it.
2009-09-24 11:49:17 +00:00
tmp = ((pixel[0] << 4) | (pixel[0] >> 4));
red = tmp >> (8 - ctx->fb_r_mask);
tmp = ((pixel[1] << 4) | (pixel[1] >> 4));
green = tmp >> (8 - ctx->fb_g_mask);
tmp = ((pixel[2] << 4) | (pixel[2] >> 4));
blue = tmp >> (8 - ctx->fb_b_mask);
}
else
{
red = pixel[0] >> (8 - ctx->fb_r_mask);
green = pixel[1] >> (8 - ctx->fb_g_mask);
blue = pixel[2] >> (8 - ctx->fb_b_mask);
}
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
/* divide potentially by two if 'fuzzy' */
red = red >> (ctx->fb_r_mask - ctx->fb_r_mask_used);
green = green >> (ctx->fb_g_mask - ctx->fb_g_mask_used);
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
blue = blue >> (ctx->fb_b_mask - ctx->fb_b_mask_used);
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
/* combine the correct per component values into the final id */
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
retval = blue
+ (green << ctx->fb_b_mask_used)
+ (red << (ctx->fb_b_mask_used + ctx->fb_g_mask_used));
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
More ISO C90 warning fixes in Clutter This time, in Clutter core. The ObjC standard library provides a type called 'id', which obviously requires any library to either drop the useful shadowed variable warning or stop using 'id' as a variable name. Yes, it's almost unbearably stupid. Well, at least it's not 'index' in string.h, or 'y2' in math.h.
2011-02-15 11:50:26 +00:00
return retval;
2008-05-14 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-main.c: * clutter/clutter-private.h: Rejid Øyvind's previous commit a little moving more into clutter-main.c and using ClutterContext. Also Refactor clutter_init & clutter_init_with_args to share same core init code.
2008-05-13 23:02:45 +00:00
}
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
static CoglPangoFontMap *
clutter_context_get_pango_fontmap (void)
Always have a valid font map Every time we request a CoglPangoFontMap, either internally or externally, we should have one available. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2010-06-09 10:53:58 +00:00
{
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
ClutterMainContext *self;
Always have a valid font map Every time we request a CoglPangoFontMap, either internally or externally, we should have one available. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2010-06-09 10:53:58 +00:00
CoglPangoFontMap *font_map;
gdouble resolution;
gboolean use_mipmapping;
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
self = _clutter_context_get_default ();
Always have a valid font map Every time we request a CoglPangoFontMap, either internally or externally, we should have one available. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2010-06-09 10:53:58 +00:00
if (G_LIKELY (self->font_map != NULL))
return self->font_map;
font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new ());
resolution = clutter_backend_get_resolution (self->backend);
cogl_pango_font_map_set_resolution (font_map, resolution);
use_mipmapping = !clutter_disable_mipmap_text;
cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping);
self->font_map = font_map;
return self->font_map;
}
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
static ClutterTextDirection
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
clutter_get_text_direction (void)
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
{
Remove some compiler warnings Some issues found using clang as the compiler.
2011-10-11 22:42:23 +00:00
ClutterTextDirection dir = CLUTTER_TEXT_DIRECTION_LTR;
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
const gchar *direction;
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
direction = g_getenv ("CLUTTER_TEXT_DIRECTION");
if (direction && *direction != '\0')
{
if (strcmp (direction, "rtl") == 0)
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
dir = CLUTTER_TEXT_DIRECTION_RTL;
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
else if (strcmp (direction, "ltr") == 0)
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
dir = CLUTTER_TEXT_DIRECTION_LTR;
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
}
else
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
{
clutter-main: Reword translator comment for default:LTR This makes it much clearer, and fixes some typos in the original. https://bugzilla.gnome.org/show_bug.cgi?id=659893
2011-09-23 01:22:53 +00:00
/* Translators: Leave this UNTRANSLATED if your language is
* left-to-right. If your language is right-to-left
* (e.g. Hebrew, Arabic), translate it to "default:RTL".
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
*
clutter-main: Reword translator comment for default:LTR This makes it much clearer, and fixes some typos in the original. https://bugzilla.gnome.org/show_bug.cgi?id=659893
2011-09-23 01:22:53 +00:00
* Do NOT translate it to non-English e.g. "predefinito:LTR"! If
* it isn't default:LTR or default:RTL it will not work.
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
*/
char *e = _("default:LTR");
if (strcmp (e, "default:RTL") == 0)
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
dir = CLUTTER_TEXT_DIRECTION_RTL;
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
else if (strcmp (e, "default:LTR") == 0)
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
dir = CLUTTER_TEXT_DIRECTION_LTR;
Allow localizations to change the text direction The locale translators of Clutter are also the ones that should set the default direction of the text in a Clutter user interface. This commit adds a translatable string that defines the direction of the text; the translation authors will change it to the correct value and that will determine the default direction. The default text direction can be overridden by using the CLUTTER_TEXT_DIRECTION environment variable, or by using the --clutter-text-direction command line switch. In any other case, the locale will determine the text direction, as it should.
2009-01-06 12:35:19 +00:00
else
g_warning ("Whoever translated default:LTR did so wrongly.");
}
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
Add debug note for text direction It would be nice to have the text direction inside the debug log.
2012-09-19 10:39:41 +00:00
CLUTTER_NOTE (MISC, "Text direction: %s",
dir == CLUTTER_TEXT_DIRECTION_RTL ? "rtl" : "ltr");
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
return dir;
}
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
static void
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
update_pango_context (ClutterBackend *backend,
PangoContext *context)
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
{
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
ClutterSettings *settings;
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
PangoFontDescription *font_desc;
[backend] Constify font options The font options accessors in ClutterBackend only deal with const cairo_font_options_t values, since: - set_font_options() will copy the font options - get_font_options() will return a pointer to the internal font options Not using const in these cases makes the API confusing and might lead to erroneous calls to cairo_font_options_destroy().
2009-02-26 15:32:48 +00:00
const cairo_font_options_t *font_options;
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
gchar *font_name;
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
PangoDirection pango_dir;
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
gdouble resolution;
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
settings = clutter_settings_get_default ();
Clean up the update_pango_context() function Logically split the various operations with whitespace so that it's clear what does what.
2009-01-05 16:48:46 +00:00
/* update the text direction */
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
if (clutter_text_direction == CLUTTER_TEXT_DIRECTION_RTL)
pango_dir = PANGO_DIRECTION_RTL;
else
pango_dir = PANGO_DIRECTION_LTR;
pango_context_set_base_dir (context, pango_dir);
Clean up the update_pango_context() function Logically split the various operations with whitespace so that it's clear what does what.
2009-01-05 16:48:46 +00:00
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
g_object_get (settings, "font-name", &font_name, NULL);
Clean up the update_pango_context() function Logically split the various operations with whitespace so that it's clear what does what.
2009-01-05 16:48:46 +00:00
/* get the configuration for the PangoContext from the backend */
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
font_options = clutter_backend_get_font_options (backend);
resolution = clutter_backend_get_resolution (backend);
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
font_desc = pango_font_description_from_string (font_name);
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
if (resolution < 0)
resolution = 96.0; /* fall back */
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
pango_context_set_font_description (context, font_desc);
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
pango_cairo_context_set_font_options (context, font_options);
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
pango_cairo_context_set_resolution (context, resolution);
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
pango_font_description_free (font_desc);
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
g_free (font_name);
Update the PangoContext on backend changes When the ClutterBackend notifies of changes in the resolution or font options, update the PangoContext stored by Clutter's main context. This allows changing the backend font-related settings at runtime.
2008-12-23 14:34:16 +00:00
}
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
PangoContext *
Continue hiding the ClutterMainContext We should strive to make the main context as transparent as possible, and hide accessing its data through private functions.
2011-02-18 12:07:07 +00:00
_clutter_context_get_pango_context (void)
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
{
Continue hiding the ClutterMainContext We should strive to make the main context as transparent as possible, and hide accessing its data through private functions.
2011-02-18 12:07:07 +00:00
ClutterMainContext *self = _clutter_context_get_default ();
Revert the logic of the PangoContext check The branch that creates the global PangoContext should only run if there is no global PangoContext already.
2009-01-05 16:44:52 +00:00
if (G_UNLIKELY (self->pango_context == NULL))
Store the PangoContext inside the main context The PangoContext should be stored once, and inside the main Clutter context. Each actor for which clutter_actor_get_pango_context() has been called will hold a reference on the Pango context as well. This makes it possible to update the text rendering for Clutter by using only public API.
2008-12-23 14:27:41 +00:00
{
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
PangoContext *context;
Continue hiding the ClutterMainContext We should strive to make the main context as transparent as possible, and hide accessing its data through private functions.
2011-02-18 12:07:07 +00:00
context = _clutter_context_create_pango_context ();
Store the PangoContext inside the main context The PangoContext should be stored once, and inside the main Clutter context. Each actor for which clutter_actor_get_pango_context() has been called will hold a reference on the Pango context as well. This makes it possible to update the text rendering for Clutter by using only public API.
2008-12-23 14:27:41 +00:00
self->pango_context = context;
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
g_signal_connect (self->backend, "resolution-changed",
G_CALLBACK (update_pango_context),
self->pango_context);
g_signal_connect (self->backend, "font-changed",
G_CALLBACK (update_pango_context),
self->pango_context);
Store the PangoContext inside the main context The PangoContext should be stored once, and inside the main Clutter context. Each actor for which clutter_actor_get_pango_context() has been called will hold a reference on the Pango context as well. This makes it possible to update the text rendering for Clutter by using only public API.
2008-12-23 14:27:41 +00:00
}
Lazily create the Pango fontmap The Pango fontmap needed by Clutter should be initialized the first time we need a PangoContext, not on initialization.
2009-12-03 17:36:03 +00:00
else
update_pango_context (self->backend, self->pango_context);
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
return self->pango_context;
}
PangoContext *
Continue hiding the ClutterMainContext We should strive to make the main context as transparent as possible, and hide accessing its data through private functions.
2011-02-18 12:07:07 +00:00
_clutter_context_create_pango_context (void)
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
{
Always have a valid font map Every time we request a CoglPangoFontMap, either internally or externally, we should have one available. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2010-06-09 10:53:58 +00:00
CoglPangoFontMap *font_map;
Rename the PangoContext creation functions The _clutter_context_create_pango_context() should create a new context; the function returning the PangoContext stored inside the MainContext structure should be named _get_pango_context() instead.
2009-01-05 15:27:33 +00:00
PangoContext *context;
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
font_map = clutter_context_get_pango_fontmap ();
Lazily create the Pango fontmap The Pango fontmap needed by Clutter should be initialized the first time we need a PangoContext, not on initialization.
2009-12-03 17:36:03 +00:00
Always have a valid font map Every time we request a CoglPangoFontMap, either internally or externally, we should have one available. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2010-06-09 10:53:58 +00:00
context = cogl_pango_font_map_create_context (font_map);
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
update_pango_context (clutter_get_default_backend (), context);
Set the default language on the Pango context When creating the Pango context we should also set the language to be the default Pango language.
2009-11-30 16:15:19 +00:00
pango_context_set_language (context, pango_language_get_default ());
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> Bug #960 - PangoContext creation code should not be duplicated * clutter/clutter-private.h: * clutter/clutter-main.c: (_clutter_context_create_pango_context): Abstract the creation of the PangoContext inside its own function, to avoid code and bugs duplication. (Tommi Komulainen) * clutter/clutter-entry.c (clutter_entry_init): Use the newly added PangoContext creation function. * clutter/clutter-label.c (clutter_label_init): Ditto as above.
2008-06-13 09:10:39 +00:00
return context;
}
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
/**
* clutter_main_quit:
*
More documentation
2006-06-22 09:12:40 +00:00
* Terminates the Clutter mainloop.
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
*/
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
void
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
clutter_main_quit (void)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
g_return_if_fail (main_loops != NULL);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
g_main_loop_quit (main_loops->data);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
/**
* clutter_main_level:
*
More documentation
2006-06-22 09:12:40 +00:00
* Retrieves the depth of the Clutter mainloop.
*
* Return value: The level of the mainloop.
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
*/
gint
clutter_main_level (void)
{
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
return clutter_main_loop_level;
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
}
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
static gint (*prev_poll) (GPollFD *ufds, guint nfsd, gint timeout_) = NULL;
static gint
timed_poll (GPollFD *ufds,
guint nfsd,
gint timeout_)
{
gint ret;
CLUTTER_STATIC_TIMER (poll_timer,
"Mainloop", /* parent */
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
"Mainloop Idle",
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
"The time spent idle in poll()",
0 /* no application private data */);
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
CLUTTER_TIMER_START (uprof_get_mainloop_context (), poll_timer);
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
ret = prev_poll (ufds, nfsd, timeout_);
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
CLUTTER_TIMER_STOP (uprof_get_mainloop_context (), poll_timer);
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
return ret;
}
#endif
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
/**
* clutter_main:
*
More documentation
2006-06-22 09:12:40 +00:00
* Starts the Clutter mainloop.
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
*/
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
void
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
clutter_main (void)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
GMainLoop *loop;
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
if (!_clutter_context_is_initialized ())
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
{
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
g_warning ("Called clutter_main() but Clutter wasn't initialised. "
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
"You must call clutter_init() first.");
return;
}
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
clutter_main_loop_level++;
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
profiling: Adds initial UProf support across clutter UProf is a small library that aims to help applications/libraries provide domain specific reports about performance. It currently provides high precision timer primitives (rdtsc on x86) and simple counters, the ability to link statistics between optional components at runtime and makes report generation easy. This adds initial accounting for: - Total mainloop time - Painting - Picking - Layouting - Idle time The timing done by uprof is of wall clock time. It's not based on stochastic samples we simply sample a counter at the start and end. When dealing with the complexities of GPU drivers and with various kinds of IO this form of profiling can be quite enlightening as it will be able to represent where your application is blocking unlike tools such as sysprof. To enable uprof accounting you must configure Clutter with --enable-profile and have uprof-0.2 installed from git://git.moblin.org/uprof If you want to see a report of statistics when Clutter applications exit you should export CLUTTER_PROFILE_OUTPUT_REPORT=1 before running them. Just a final word of caution; this stuff is new and the manual nature of adding uprof instrumentation means it is prone to some errors when modifying code. This just means that when you question strange results don't rule out a mistake in the instrumentation. Obviously though we hope the benfits out weigh e.g. by focusing on very key stats and by having automatic reporting.
2009-03-30 15:41:02 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
if (!prev_poll)
{
prev_poll = g_main_context_get_poll_func (NULL);
g_main_context_set_poll_func (NULL, timed_poll);
}
#endif
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
loop = g_main_loop_new (NULL, TRUE);
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
main_loops = g_slist_prepend (main_loops, loop);
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
if (g_main_loop_is_running (main_loops->data))
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
{
Deprecate clutter_threads_enter()/leave() Acquiring the Clutter lock to mark critical sections is not portable, and not recommended to implement threaded applications with Clutter. The recommended pattern is to use worker threads, and schedule UI updates inside idle or timeout handlers within the main loop. We should enforce this pattern by deprecating the threads_enter()/leave() functions. For compatibility concerns, we need internal API to acquire the main lock during frame processing dispatch. https://bugzilla.gnome.org/show_bug.cgi?id=679450
2012-07-05 13:30:26 +00:00
_clutter_threads_release_lock ();
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
g_main_loop_run (loop);
Deprecate clutter_threads_enter()/leave() Acquiring the Clutter lock to mark critical sections is not portable, and not recommended to implement threaded applications with Clutter. The recommended pattern is to use worker threads, and schedule UI updates inside idle or timeout handlers within the main loop. We should enforce this pattern by deprecating the threads_enter()/leave() functions. For compatibility concerns, we need internal API to acquire the main lock during frame processing dispatch. https://bugzilla.gnome.org/show_bug.cgi?id=679450
2012-07-05 13:30:26 +00:00
_clutter_threads_acquire_lock ();
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
}
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
main_loops = g_slist_remove (main_loops, loop);
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
g_main_loop_unref (loop);
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
clutter_main_loop_level--;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
/**
Add some more introspection annotations
2010-09-06 15:11:46 +00:00
* clutter_threads_set_lock_functions: (skip)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* @enter_fn: function called when aquiring the Clutter main lock
* @leave_fn: function called when releasing the Clutter main lock
*
* Allows the application to replace the standard method that
* Clutter uses to protect its data structures. Normally, Clutter
* creates a single #GMutex that is locked by clutter_threads_enter(),
* and released by clutter_threads_leave(); using this function an
* application provides, instead, a function @enter_fn that is
* called by clutter_threads_enter() and a function @leave_fn that is
* called by clutter_threads_leave().
*
* The functions must provide at least same locking functionality
* as the default implementation, but can also do extra application
* specific processing.
*
* As an example, consider an application that has its own recursive
* lock that when held, holds the Clutter lock as well. When Clutter
* unlocks the Clutter lock when entering a recursive main loop, the
* application must temporarily release its lock as well.
*
* Most threaded Clutter apps won't need to use this method.
*
Cosmetic fixes
2011-10-10 14:42:36 +00:00
* This method must be called before clutter_init(), and cannot
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* be called multiple times.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*/
void
clutter_threads_set_lock_functions (GCallback enter_fn,
GCallback leave_fn)
{
g_return_if_fail (clutter_threads_lock == NULL &&
clutter_threads_unlock == NULL);
clutter_threads_lock = enter_fn;
clutter_threads_unlock = leave_fn;
}
Deprecate ClutterFrameSource The FrameSource API hasn't been used internally since 1.0; since it's not part of the paint clock, it is of limited use.
2010-11-06 20:00:39 +00:00
gboolean
_clutter_threads_dispatch (gpointer data)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
{
ClutterThreadsDispatch *dispatch = data;
gboolean ret = FALSE;
Deprecate clutter_threads_enter()/leave() Acquiring the Clutter lock to mark critical sections is not portable, and not recommended to implement threaded applications with Clutter. The recommended pattern is to use worker threads, and schedule UI updates inside idle or timeout handlers within the main loop. We should enforce this pattern by deprecating the threads_enter()/leave() functions. For compatibility concerns, we need internal API to acquire the main lock during frame processing dispatch. https://bugzilla.gnome.org/show_bug.cgi?id=679450
2012-07-05 13:30:26 +00:00
_clutter_threads_acquire_lock ();
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
if (!g_source_is_destroyed (g_main_current_source ()))
ret = dispatch->func (dispatch->data);
Deprecate clutter_threads_enter()/leave() Acquiring the Clutter lock to mark critical sections is not portable, and not recommended to implement threaded applications with Clutter. The recommended pattern is to use worker threads, and schedule UI updates inside idle or timeout handlers within the main loop. We should enforce this pattern by deprecating the threads_enter()/leave() functions. For compatibility concerns, we need internal API to acquire the main lock during frame processing dispatch. https://bugzilla.gnome.org/show_bug.cgi?id=679450
2012-07-05 13:30:26 +00:00
_clutter_threads_release_lock ();
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
return ret;
}
Deprecate ClutterFrameSource The FrameSource API hasn't been used internally since 1.0; since it's not part of the paint clock, it is of limited use.
2010-11-06 20:00:39 +00:00
void
_clutter_threads_dispatch_free (gpointer data)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
{
ClutterThreadsDispatch *dispatch = data;
Remove the threads locking in the dispatchers destruction notification The GLib main loop allows destroying sources while still in the dispatcher function, so whether the Clutter threading lock is being held or not is actually unpredictable by the library. This might be fixed in GLib, so we just do what GTK+ does for the time being and wait. See bug: http://bugzilla.gnome.org/show_bug.cgi?id=459555
2007-08-22 10:12:15 +00:00
/* XXX - we cannot hold the thread lock here because the main loop
* might destroy a source while still in the dispatcher function; so
* knowing whether the lock is being held or not is not known a priori.
*
* see bug: http://bugzilla.gnome.org/show_bug.cgi?id=459555
*/
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
if (dispatch->notify)
dispatch->notify (dispatch->data);
g_slice_free (ClutterThreadsDispatch, dispatch);
}
/**
* clutter_threads_add_idle_full:
* @priority: the priority of the timeout source. Typically this will be in the
* range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE
* @func: function to call
* @data: data to pass to the function
* @notify: functio to call when the idle source is removed
*
* Adds a function to be called whenever there are no higher priority
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* events pending. If the function returns %FALSE it is automatically
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* removed from the list of event sources and will not be called again.
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* This function can be considered a thread-safe variant of g_idle_add_full():
* it will call @function while holding the Clutter lock. It is logically
* equivalent to the following implementation:
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* |[
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* static gboolean
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* idle_safe_callback (gpointer data)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* {
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* SafeClosure *closure = data;
* gboolean res = FALSE;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* /&ast; mark the critical section &ast;/
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* clutter_threads_enter();
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* /&ast; the callback does not need to acquire the Clutter
* &ast; lock itself, as it is held by the this proxy handler
* &ast;/
* res = closure->callback (closure->data);
*
* clutter_threads_leave();
*
* return res;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* }
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* static gulong
* add_safe_idle (GSourceFunc callback,
* gpointer data)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* {
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* SafeClosure *closure = g_new0 (SafeClosure, 1);
*
* closure-&gt;callback = callback;
* closure-&gt;data = data;
*
Cosmetic fixes
2011-10-10 14:42:36 +00:00
* return g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* idle_safe_callback,
* closure,
* g_free)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* }
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
*]|
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* This function should be used by threaded applications to make sure
* that @func is emitted under the Clutter threads lock and invoked
* from the same thread that started the Clutter main loop. For instance,
* it can be used to update the UI using the results from a worker
* thread:
*
* |[
* static gboolean
* update_ui (gpointer data)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* {
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* SomeClosure *closure = data;
*
* /&ast; it is safe to call Clutter API from this function because
* &ast; it is invoked from the same thread that started the main
* &ast; loop and under the Clutter thread lock
* &ast;/
* clutter_label_set_text (CLUTTER_LABEL (closure-&gt;label),
* closure-&gt;text);
*
* g_object_unref (closure-&gt;label);
* g_free (closure);
*
* return FALSE;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* }
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
*
* /&ast; within another thread &ast;/
* closure = g_new0 (SomeClosure, 1);
* /&ast; always take a reference on GObject instances &ast;/
* closure-&gt;label = g_object_ref (my_application-&gt;label);
* closure-&gt;text = g_strdup (processed_text_to_update_the_label);
*
* clutter_threads_add_idle_full (G_PRIORITY_HIGH_IDLE,
* update_ui,
* closure,
* NULL);
* ]|
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
Further annotation fixes
2010-09-08 15:41:47 +00:00
* Rename to: clutter_threads_add_idle
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* Return value: the ID (greater than 0) of the event source.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*/
guint
clutter_threads_add_idle_full (gint priority,
GSourceFunc func,
gpointer data,
GDestroyNotify notify)
{
ClutterThreadsDispatch *dispatch;
g_return_val_if_fail (func != NULL, 0);
dispatch = g_slice_new (ClutterThreadsDispatch);
dispatch->func = func;
dispatch->data = data;
dispatch->notify = notify;
return g_idle_add_full (priority,
Deprecate ClutterFrameSource The FrameSource API hasn't been used internally since 1.0; since it's not part of the paint clock, it is of limited use.
2010-11-06 20:00:39 +00:00
_clutter_threads_dispatch, dispatch,
_clutter_threads_dispatch_free);
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
}
/**
Further annotation fixes
2010-09-08 15:41:47 +00:00
* clutter_threads_add_idle: (skip)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* @func: function to call
* @data: data to pass to the function
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* Simple wrapper around clutter_threads_add_idle_full() using the
* default priority.
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
* Return value: the ID (greater than 0) of the event source.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*/
guint
clutter_threads_add_idle (GSourceFunc func,
gpointer data)
{
g_return_val_if_fail (func != NULL, 0);
return clutter_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
func, data,
NULL);
}
/**
* clutter_threads_add_timeout_full:
* @priority: the priority of the timeout source. Typically this will be in the
* range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
* @interval: the time between calls to the function, in milliseconds
* @func: function to call
* @data: data to pass to the function
* @notify: function to call when the timeout source is removed
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* Sets a function to be called at regular intervals holding the Clutter
* threads lock, with the given priority. The function is called repeatedly
* until it returns %FALSE, at which point the timeout is automatically
* removed and the function will not be called again. The @notify function
* is called when the timeout is removed.
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* The first call to the function will be at the end of the first @interval.
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
* It is important to note that, due to how the Clutter main loop is
* implemented, the timing will not be accurate and it will not try to
Cosmetic fixes
2011-10-10 14:42:36 +00:00
* "keep up" with the interval.
2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Rework and improve the documentation of the thread-safe timeout and idle source installer functions.
2008-08-04 10:36:37 +00:00
*
* See also clutter_threads_add_idle_full().
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*
Further annotation fixes
2010-09-08 15:41:47 +00:00
* Rename to: clutter_threads_add_timeout
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* Return value: the ID (greater than 0) of the event source.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*/
guint
clutter_threads_add_timeout_full (gint priority,
guint interval,
GSourceFunc func,
gpointer data,
GDestroyNotify notify)
{
ClutterThreadsDispatch *dispatch;
g_return_val_if_fail (func != NULL, 0);
dispatch = g_slice_new (ClutterThreadsDispatch);
dispatch->func = func;
dispatch->data = data;
dispatch->notify = notify;
return g_timeout_add_full (priority,
interval,
Deprecate ClutterFrameSource The FrameSource API hasn't been used internally since 1.0; since it's not part of the paint clock, it is of limited use.
2010-11-06 20:00:39 +00:00
_clutter_threads_dispatch, dispatch,
_clutter_threads_dispatch_free);
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
}
/**
Further annotation fixes
2010-09-08 15:41:47 +00:00
* clutter_threads_add_timeout: (skip)
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
* @interval: the time between calls to the function, in milliseconds
* @func: function to call
* @data: data to pass to the function
*
* Simple wrapper around clutter_threads_add_timeout_full().
*
* Return value: the ID (greater than 0) of the event source.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
*/
guint
clutter_threads_add_timeout (guint interval,
GSourceFunc func,
gpointer data)
{
g_return_val_if_fail (func != NULL, 0);
return clutter_threads_add_timeout_full (G_PRIORITY_DEFAULT,
interval,
func, data,
NULL);
}
Deprecate clutter_threads_enter()/leave() Acquiring the Clutter lock to mark critical sections is not portable, and not recommended to implement threaded applications with Clutter. The recommended pattern is to use worker threads, and schedule UI updates inside idle or timeout handlers within the main loop. We should enforce this pattern by deprecating the threads_enter()/leave() functions. For compatibility concerns, we need internal API to acquire the main lock during frame processing dispatch. https://bugzilla.gnome.org/show_bug.cgi?id=679450
2012-07-05 13:30:26 +00:00
void
_clutter_threads_acquire_lock (void)
{
if (clutter_threads_lock != NULL)
(* clutter_threads_lock) ();
}
void
_clutter_threads_release_lock (void)
{
if (clutter_threads_unlock != NULL)
(* clutter_threads_unlock) ();
}
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
void
_clutter_context_lock (void)
{
G_LOCK (ClutterCntx);
}
void
_clutter_context_unlock (void)
{
G_UNLOCK (ClutterCntx);
}
Allow checking initialization without side-effects The _clutter_context_get_default() function will automatically create the main Clutter context; if we just want to check whether Clutter has been initialized this will complicate matters, by requiring a call to g_type_init() inside the client code. Instead, we should simply provide an internal API that checks whether the main Clutter context exists and if it has been initialized, without any side effect.
2009-06-19 13:09:42 +00:00
gboolean
_clutter_context_is_initialized (void)
{
if (ClutterCntx == NULL)
return FALSE;
return ClutterCntx->is_initialized;
}
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
static ClutterBackend *
clutter_create_backend (void)
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
{
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
const char *backend = g_getenv ("CLUTTER_BACKEND");
ClutterBackend *retval = NULL;
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend != NULL)
backend = g_intern_string (backend);
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#ifdef CLUTTER_WINDOWING_OSX
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_OSX))
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
retval = g_object_new (CLUTTER_TYPE_BACKEND_OSX, NULL);
else
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#endif
#ifdef CLUTTER_WINDOWING_WIN32
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WIN32))
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL);
else
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#endif
clutter: Prefer the X11 backend to the Wayland one If clutter is built with both X11 and Wayland support, prefer the (more complete for now) X11 backend. This matches GTK+'s current ordering. This allows distributions to ship a clutter version with both backends built, and using an envvar to switch to the wayland backend and test applications. In the future, applications would be able to choose which backend they prefer and in which order. https://bugzilla.gnome.org/show_bug.cgi?id=695838
2013-03-14 11:31:52 +00:00
#ifdef CLUTTER_WINDOWING_X11
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
else
#endif
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#ifdef CLUTTER_WINDOWING_WAYLAND
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WAYLAND))
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
retval = g_object_new (CLUTTER_TYPE_BACKEND_WAYLAND, NULL);
else
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#endif
#ifdef CLUTTER_WINDOWING_EGL
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL))
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
else
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#endif
#ifdef CLUTTER_WINDOWING_GDK
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
else
Implement multi-backend support The Clutter backend split is opaque enough that should allow us to just build all possible backends inside the same shared object, and select the wanted backend at initialization time. This requires some work in the build system, as well as the initialization code, to remove duplicate functions that might cause conflicts at build and link time. We also need to defer all the checks of the internal state of the platform-specific API to run-time type checks.
2011-09-21 17:05:03 +00:00
#endif
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend == NULL)
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
g_error ("No default Clutter backend found.");
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
else
g_error ("Unsupported Clutter backend: '%s'", backend);
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
return retval;
}
static ClutterMainContext *
clutter_context_get_default_unlocked (void)
{
if (G_UNLIKELY (ClutterCntx == NULL))
{
ClutterMainContext *ctx;
ClutterCntx = ctx = g_new0 (ClutterMainContext, 1);
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
ctx->is_initialized = FALSE;
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
/* create the windowing system backend */
ctx->backend = clutter_create_backend ();
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com> * clutter.symbols: Update * clutter/clutter-actor.h: Rename the angle argument for set_rotationx() to avoid gtk-doc complaining * clutter/clutter-main.h: * clutter/clutter-main.c: (clutter_set_motion_events_enabled): Rename for consistency (clutter_get_motion_events_frequency), (clutter_set_motion_events_frequency): Add accessors for the default motion events deliver frequency. (clutter_do_event): Throttle down motion events delivery using the motion events frequency setting, to avoid excessive redraws. (#608) (clutter_context_get_default): Enable per-actor motion events, at least for now. * tests/test-events.c (red_button_cb): * tests/test-grab.c (green_press_cb): Update.
2007-11-19 16:30:56 +00:00
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
/* create the default settings object, and store a back pointer to
* the backend singleton
*/
ctx->settings = clutter_settings_get_default ();
_clutter_settings_set_backend (ctx->settings, ctx->backend);
Clean up the backend creation Move it to its own function.
2011-10-17 12:25:15 +00:00
ctx->motion_events_per_actor = TRUE;
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
ctx->last_repaint_id = 1;
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
}
return ClutterCntx;
}
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
ClutterMainContext *
_clutter_context_get_default (void)
{
ClutterMainContext *retval;
_clutter_context_lock ();
retval = clutter_context_get_default_unlocked ();
_clutter_context_unlock ();
return retval;
}
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
static gboolean
clutter_arg_direction_cb (const char *key,
const char *value,
gpointer user_data)
{
clutter_text_direction =
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
(strcmp (value, "rtl") == 0) ? CLUTTER_TEXT_DIRECTION_RTL
: CLUTTER_TEXT_DIRECTION_LTR;
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
return TRUE;
}
2007-06-08 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-debug.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-timeline.c: Add 'schedule' debug flag and new CLUTTER_TIMESTAMP macro. * clutter/clutter-texture.c: * clutter/clutter-texture.h: * clutter/cogl/cogl.h: * clutter/cogl/gl/cogl-defines.h: * clutter/cogl/gles/cogl-defines.h: * clutter/cogl/gl/cogl.c: * clutter/cogl/gles/cogl.c: Add initial experiemental YUV texture support. Move texture rect size checks into cogl. Better handle moving texture data from video -> system memory (if support available).
2007-06-07 23:51:53 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#ifdef CLUTTER_ENABLE_DEBUG
static gboolean
clutter_arg_debug_cb (const char *key,
const char *value,
gpointer user_data)
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
{
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
clutter_debug_flags |=
g_parse_debug_string (value,
clutter_debug_keys,
G_N_ELEMENTS (clutter_debug_keys));
return TRUE;
}
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
static gboolean
clutter_arg_no_debug_cb (const char *key,
const char *value,
gpointer user_data)
{
clutter_debug_flags &=
~g_parse_debug_string (value,
clutter_debug_keys,
G_N_ELEMENTS (clutter_debug_keys));
return TRUE;
}
#endif /* CLUTTER_ENABLE_DEBUG */
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options As we have for debugging, this adds the ability to control profiling flags either via the command line or an environment variable. The first option added is CLUTTER_PROFILE=disable-report This also changes the reporting to be opt-out so you don't need to export CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use CLUTTER_PROFILE=disable-report to disable it if desired.
2010-01-06 18:15:13 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
static gboolean
clutter_arg_profile_cb (const char *key,
const char *value,
gpointer user_data)
{
clutter_profile_flags |=
g_parse_debug_string (value,
clutter_profile_keys,
G_N_ELEMENTS (clutter_profile_keys));
return TRUE;
}
static gboolean
clutter_arg_no_profile_cb (const char *key,
const char *value,
gpointer user_data)
{
clutter_profile_flags &=
~g_parse_debug_string (value,
clutter_profile_keys,
G_N_ELEMENTS (clutter_profile_keys));
return TRUE;
}
#endif /* CLUTTER_ENABLE_PROFILE */
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
GQuark
clutter_init_error_quark (void)
{
return g_quark_from_static_string ("clutter-init-error-quark");
}
static ClutterInitError
clutter_init_real (GError **error)
{
ClutterMainContext *ctx;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
ClutterBackend *backend;
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
clutter-main: start mainloop timer on clutter_init() By creating and starting the timer on clutter_main() an assumption is made that that is how the main loop will be run for all clutter applications. With more and more applications moving to GApplication, this assumption no longer holds true. Moving to clutter_init() means we are starting the timer earlier than we should, and by not stopping it when the main loop quits we are taking a measure that is later than we should. I believe it is safe to consider those are close enough to the actual beginning and quitting of the main loop in practice. https://bugzilla.gnome.org/show_bug.cgi?id=728521
2014-04-18 18:10:42 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
CLUTTER_STATIC_TIMER (mainloop_timer,
NULL, /* no parent */
"Mainloop",
"The time spent in the clutter mainloop",
0 /* no application private data */);
#endif
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
/* Note, creates backend if not already existing, though parse args will
* have likely created it
*/
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
ctx = _clutter_context_get_default ();
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
backend = ctx->backend;
if (!ctx->options_parsed)
{
glx: Create the dummy Window with the GLX context Since we must guarantee that Cogl has a GL context to query, it is too late to use the "dummy Window" trick from within the get_features() virtual function implementation. Instead, we can create a dummy Window from create_context() itself and leave it around - basically trading a default stage with a dummy X window. We need to have the dummy X window around all the time so that the GLX context can be selected and made current.
2009-12-03 20:49:54 +00:00
if (error)
g_set_error (error, CLUTTER_INIT_ERROR,
CLUTTER_INIT_ERROR_INTERNAL,
"When using clutter_get_option_group_without_init() "
"you must parse options before calling clutter_init()");
else
g_critical ("When using clutter_get_option_group_without_init() "
"you must parse options before calling clutter_init()");
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
return CLUTTER_INIT_ERROR_INTERNAL;
}
/*
* Call backend post parse hooks.
*/
2008-10-31 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1200 - Crash with invalid DISPLAY * clutter/clutter-main.c: Use the ClutterBackend wrapper API instead of directly checking the class structure. * clutter/glx/clutter-backend-glx.c: Return the correct value in case of failure. * clutter/x11/clutter-backend-x11.c: Bail out if XOpenDisplay() failed.
2008-10-31 12:48:26 +00:00
if (!_clutter_backend_post_parse (backend, error))
return CLUTTER_INIT_ERROR_BACKEND;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
debug: CLUTTER_DEBUG_REDRAWS: disable clipped redraws This ensures that clipped redraws are disabled when using CLUTTER_PAINT=redraws. This may seem unintuitive given that this option is for debugging clipped redraws, but we can't draw an outline outside the clip region and anything we draw inside the clip region is liable to leave a trailing mess on the screen since it won't be cleared up by later clipped redraws.
2010-09-07 22:07:52 +00:00
/* If we are displaying the regions that would get redrawn with clipped
* redraws enabled we actually have to disable the clipped redrawing
* because otherwise we end up with nasty trails of rectangles everywhere.
*/
if (clutter_paint_debug_flags & CLUTTER_DEBUG_REDRAWS)
clutter_paint_debug_flags |= CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS;
paint volumes: CLUTTER_PAINT=paint-volumes debug option This adds a debug option to visualize the paint volumes of all actors. When CLUTTER_PAINT=paint-volumes is exported in the environment before running a Clutter application then all actors will have their bounding volume drawn in green with a label corresponding to the actors type.
2010-09-07 17:50:29 +00:00
/* The same is true when drawing the outlines of paint volumes... */
if (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_VOLUMES)
debug: disable culling with CLUTTER_PAINT=paint-volumes When using CLUTTER_PAINT=paint-volumes to visualize the paint-volumes of actors we were already disabling clipped-redraws because we are drawing extra geometry that the actors don't know about but we didn't disable culling. This was resulting in actors disappearing while using this debug option.
2011-06-16 16:24:26 +00:00
{
clutter_paint_debug_flags |=
CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS | CLUTTER_DEBUG_DISABLE_CULLING;
}
paint volumes: CLUTTER_PAINT=paint-volumes debug option This adds a debug option to visualize the paint volumes of all actors. When CLUTTER_PAINT=paint-volumes is exported in the environment before running a Clutter application then all actors will have their bounding volume drawn in green with a label corresponding to the actors type.
2010-09-07 17:50:29 +00:00
glx: Create the dummy Window with the GLX context Since we must guarantee that Cogl has a GL context to query, it is too late to use the "dummy Window" trick from within the get_features() virtual function implementation. Instead, we can create a dummy Window from create_context() itself and leave it around - basically trading a default stage with a dummy X window. We need to have the dummy X window around all the time so that the GLX context can be selected and made current.
2009-12-03 20:49:54 +00:00
/* this will take care of initializing Cogl's state and
* query the GL machinery for features
Delay default stage creation The default stage creation should be delayed as much as possible, ideally at the end of the init() process.
2009-12-03 17:13:44 +00:00
*/
Add error reporting for create_context() failures We kind of assume that stuff will break well before during the ClutterBackend::create_context() implementation if we fail to create a GL context. We do, however, have error reporting in place inside the Backend API to catch those cases. Unfortunately, since we switched to lazy initialization of the Stage, there can be a case of GL context creation failure that still leads to a successful initialization - and a segmentation fault later on. This is clearly Not Good™. Let's try to catch a failure in all the places calling create_context() and report back to the user the error in a meaningful way, before crashing and burning.
2010-03-17 17:28:20 +00:00
if (!_clutter_feature_init (error))
return CLUTTER_INIT_ERROR_BACKEND;
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
profiling: Allow limiting statisics just to picking This suspends and resumes all uprof timers and counters except while dealing with picking, so as to give more focused statistics. Be aware that there are still some issues with this profile option since there are a few special case counters and timers that shouldn't be suspended; noteably the frame counters are incorrect so the per frame stats can't be trusted.
2009-04-17 11:15:56 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
/* We need to be absolutely sure that uprof has been initialized
* before calling _clutter_uprof_init. uprof_init (NULL, NULL)
* will be a NOP if it has been initialized but it will also
* mean subsequent parsing of the UProf GOptionGroup will have no
* affect.
*
* Sadly GOptionGroup based library initialization is extremly
* fragile by design because GOptionGroups have no notion of
* dependencies and our post_parse_hook may be called before
* the cogl or uprof groups get parsed.
*/
uprof_init (NULL, NULL);
_clutter_uprof_init ();
profiling: Adds initial UProf accounting to Cogl This adds gives Cogl a dedicated UProf context which will be linked together with Clutter's context during clutter_init_real(). Initial timers cover _cogl_journal_flush and _cogl_journal_log_quad You can explicitly ask for a report of Cogl statistics by exporting COGL_PROFILE_OUTPUT_REPORT=1 but since the context is linked with Clutter's the statisitcs will also be shown in the automatic Clutter reports.
2009-07-03 15:22:35 +00:00
clutter-main: start mainloop timer on clutter_init() By creating and starting the timer on clutter_main() an assumption is made that that is how the main loop will be run for all clutter applications. With more and more applications moving to GApplication, this assumption no longer holds true. Moving to clutter_init() means we are starting the timer earlier than we should, and by not stopping it when the main loop quits we are taking a measure that is later than we should. I believe it is safe to consider those are close enough to the actual beginning and quitting of the main loop in practice. https://bugzilla.gnome.org/show_bug.cgi?id=728521
2014-04-18 18:10:42 +00:00
CLUTTER_TIMER_START (uprof_get_mainloop_context (), mainloop_timer);
profiling: Allow limiting statisics just to picking This suspends and resumes all uprof timers and counters except while dealing with picking, so as to give more focused statistics. Be aware that there are still some issues with this profile option since there are a few special case counters and timers that shouldn't be suspended; noteably the frame counters are incorrect so the per frame stats can't be trusted.
2009-04-17 11:15:56 +00:00
if (clutter_profile_flags & CLUTTER_PROFILE_PICKING_ONLY)
_clutter_profile_suspend ();
#endif
Fully integrates CoglMaterial throughout the rest of Cogl This glues CoglMaterial in as the fundamental way that Cogl describes how to fill in geometry. It adds cogl_set_source (), which is used to set the material which will be used by all subsequent drawing functions It adds cogl_set_source_texture as a convenience for setting up a default material with a single texture layer, and cogl_set_source_color is now also a convenience for setting up a material with a solid fill. "drawing functions" include, cogl_rectangle, cogl_texture_rectangle, cogl_texture_multiple_rectangles, cogl_texture_polygon (though the cogl_texture_* funcs have been renamed; see below for details), cogl_path_fill/stroke and cogl_vertex_buffer_draw*. cogl_texture_rectangle, cogl_texture_multiple_rectangles and cogl_texture_polygon no longer take a texture handle; instead the current source material is referenced. The functions have also been renamed to: cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords and cogl_polygon respectivly. Most code that previously did: cogl_texture_rectangle (tex_handle, x, y,...); needs to be changed to now do: cogl_set_source_texture (tex_handle); cogl_rectangle_with_texture_coords (x, y,....); In the less likely case where you were blending your source texture with a color like: cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */ cogl_texture_rectangle (tex_handle, x, y,...); you will need your own material to do that: mat = cogl_material_new (); cogl_material_set_color4ub (r,g,b,a); cogl_material_set_layer (mat, 0, tex_handle)); cogl_set_source_material (mat); Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use cog_rectangle_with_texure_coords since these are the coordinates that cogl_rectangle will use. For cogl_texture_polygon; as well as dropping the texture handle, the n_vertices and vertices arguments were transposed for consistency. So code previously written as: cogl_texture_polygon (tex_handle, 3, verts, TRUE); need to be written as: cogl_set_source_texture (tex_handle); cogl_polygon (verts, 3, TRUE); All of the unit tests have been updated to now use the material API and test-cogl-material has been renamed to test-cogl-multitexture since any textured quad is now technically a test of CoglMaterial but this test specifically creates a material with multiple texture layers. Note: The GLES backend has not been updated yet; that will be done in a following commit.
2009-01-23 16:15:40 +00:00
clutter_text_direction = clutter_get_text_direction ();
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
/* Initiate event collection */
_clutter_backend_init_events (ctx->backend);
clutter_is_initialized = TRUE;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
ctx->is_initialized = TRUE;
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
/* Initialize a11y */
if (clutter_enable_accessibility)
cally_accessibility_init ();
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
return CLUTTER_INIT_SUCCESS;
}
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
static GOptionEntry clutter_args[] = {
{ "clutter-show-fps", 0, 0, G_OPTION_ARG_NONE, &clutter_show_fps,
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
N_("Show frames per second"), NULL },
2007-10-26 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --clutter-default-fps run-time switch and CLUTTER_DEFAULT_FPS environment variable support for setting the default frame-rate at run-time.
2007-10-26 15:47:39 +00:00
{ "clutter-default-fps", 0, 0, G_OPTION_ARG_INT, &clutter_default_fps,
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
N_("Default frame rate"), "FPS" },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --g-fatal-warnings switch for abort()-ing on warnings and criticals.
2006-11-21 22:35:48 +00:00
{ "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &clutter_fatal_warnings,
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
N_("Make all warnings fatal"), NULL },
Add the ability to set the text direction The direction of the text depends on the locale, and it is the basic setting needed to enable internationalization of user interfaces. This commit allows setting the direction of the PangoContext instance used by Clutter by using the CLUTTER_TEXT_DIRECTION environment variable, or by passing the --clutter-text-direction command line argument. Valid values are: ltr - for left-to-right locales rtl - for right-to-left locales The default is LTR. Ideally, this should be a value set by the localization teams on the PO file, but this step requires some build system surgery to allow the translation of the Clutter strings.
2008-12-23 16:40:26 +00:00
{ "clutter-text-direction", 0, 0, G_OPTION_ARG_CALLBACK,
clutter_arg_direction_cb,
Merge the ClutterText actor Merge branch 'text-actor' * text-actor: (108 commits) Re-align ClutterText header file [text] Fix cursor sizing Comments and whitespace fixes to ClutterText [docs] Add newly added :single-line-mode accessors Update the ignore file [tests] Add text field interactive test [text] Add single-line-mode to ClutterText [text] Fix the deletion actions [text] Use cached length when possible [tests] Add unit for the ClutterText:password-char property [docs] Update the Text section [text] Coalesce text visibility and password character Allow localizations to change the text direction Clean up the update_pango_context() function Pass the PangoContext, not the MainContext Revert the logic of the PangoContext check Remove the binding pool entry from the list Remove BindingPool::list_actions() Add ClutterActor::create_pango_context() Rename the PangoContext creation functions ...
2009-01-07 12:06:33 +00:00
N_("Direction for the text"), "DIRECTION" },
Make disable text mipmapping a command line switch The environment variable to disable mipmapping should also be a command line switch, and be handled like the rest of Clutter's environment variables/command line switches.
2009-02-23 13:08:59 +00:00
{ "clutter-disable-mipmapped-text", 0, 0, G_OPTION_ARG_NONE,
&clutter_disable_mipmap_text,
N_("Disable mipmapping on text"), NULL },
Make fuzzy picking a command line switch The CLUTTER_FUZZY_PICK environment variable is the last one used by Clutter without a corresponding command line switch.
2009-02-23 13:17:06 +00:00
{ "clutter-use-fuzzy-picking", 0, 0, G_OPTION_ARG_NONE,
&clutter_use_fuzzy_picking,
N_("Use 'fuzzy' picking"), NULL },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#ifdef CLUTTER_ENABLE_DEBUG
{ "clutter-debug", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_debug_cb,
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
N_("Clutter debugging flags to set"), "FLAGS" },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
{ "clutter-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_no_debug_cb,
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
N_("Clutter debugging flags to unset"), "FLAGS" },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#endif /* CLUTTER_ENABLE_DEBUG */
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options As we have for debugging, this adds the ability to control profiling flags either via the command line or an environment variable. The first option added is CLUTTER_PROFILE=disable-report This also changes the reporting to be opt-out so you don't need to export CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use CLUTTER_PROFILE=disable-report to disable it if desired.
2010-01-06 18:15:13 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
{ "clutter-profile", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_profile_cb,
N_("Clutter profiling flags to set"), "FLAGS" },
{ "clutter-no-profile", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_no_profile_cb,
N_("Clutter profiling flags to unset"), "FLAGS" },
#endif /* CLUTTER_ENABLE_PROFILE */
Initialize accessibility support on clutter_init Initialize the accessibility support calling cally_accessibility_init Take into account that this is required to at least be sure that CallyUtil class is available. It also modifies cally_accessibility_module_init in order to return if the initialization was fine (and the name, removing the module word). It also removes the gnome accessibility hooks, as it is not anymore module code. Solves CB#2098
2010-04-26 17:33:49 +00:00
{ "clutter-enable-accessibility", 0, 0, G_OPTION_ARG_NONE, &clutter_enable_accessibility,
N_("Enable accessibility"), NULL },
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
{ NULL, },
};
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
/* pre_parse_hook: initialise variables depending on environment
* variables; these variables might be overridden by the command
* line arguments that are going to be parsed after.
*/
static gboolean
pre_parse_hook (GOptionContext *context,
GOptionGroup *group,
gpointer data,
GError **error)
{
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
ClutterMainContext *clutter_context;
ClutterBackend *backend;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
const char *env_string;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
if (clutter_is_initialized)
return TRUE;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
* clutter/clutter-main.c: (pre_parse_hook): Call setlocale on init * clutter/x11/clutter-event-x11.c: (translate_key_event): Fix typo and use the same buffer size as xev
2008-06-10 14:01:43 +00:00
if (setlocale (LC_ALL, "") == NULL)
g_warning ("Locale not supported by C library.\n"
"Using the fallback 'C' locale.");
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
Add a configuration file for ClutterSettings ClutterSettings should be able to load its initial state by using configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows Clutter to have a system (and user) configuration on platforms that do not have XSETTINGS bridges.
2011-10-11 13:42:31 +00:00
/* read the configuration file, if it exists; the configuration file
* determines the initial state of the settings, so that command line
* arguments can override them.
*/
clutter_config_read ();
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
clutter_context = _clutter_context_get_default ();
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
Privatize all ClutterIdPool functions The clutter-id-pool.h header is private and not installed; yet, all the clutter_id_pool_* symbols are public. Let's correct this oversight we've been stringing along since forever.
2011-02-18 15:53:27 +00:00
clutter_context->id_pool = _clutter_id_pool_new (256);
2007-10-08 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-private.h: * clutter/clutter-main.c: Add a hash to global clutter context mapping all parented actor id's to actors. Add clutter_get_actor_by_id() call. Convert picking machinery to use above. (performance/simpler composite actor creation) * clutter/clutter-stage.c: (clutter_stage_fullscreen), (clutter_stage_unfullscreen), (clutter_stage_event): Only set the fullscreen property on stage state fullscreen event(#545) Experimental as could be painful to implement on non X backends.
2007-10-08 16:18:33 +00:00
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
backend = clutter_context->backend;
g_assert (CLUTTER_IS_BACKEND (backend));
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
#ifdef CLUTTER_ENABLE_DEBUG
env_string = g_getenv ("CLUTTER_DEBUG");
if (env_string != NULL)
{
clutter_debug_flags =
g_parse_debug_string (env_string,
clutter_debug_keys,
G_N_ELEMENTS (clutter_debug_keys));
env_string = NULL;
}
#endif /* CLUTTER_ENABLE_DEBUG */
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
profiling: Parse --clutter-profile and CLUTTER_PROFILE= options As we have for debugging, this adds the ability to control profiling flags either via the command line or an environment variable. The first option added is CLUTTER_PROFILE=disable-report This also changes the reporting to be opt-out so you don't need to export CLUTTER_PROFILE_OUTPUT_REPORT=1 to see a report but you can use CLUTTER_PROFILE=disable-report to disable it if desired.
2010-01-06 18:15:13 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
env_string = g_getenv ("CLUTTER_PROFILE");
if (env_string != NULL)
{
clutter_profile_flags =
g_parse_debug_string (env_string,
clutter_profile_keys,
G_N_ELEMENTS (clutter_profile_keys));
env_string = NULL;
}
#endif /* CLUTTER_ENABLE_PROFILE */
debug: Split debugging notes from behavioural modifiers Some of the ClutterDebugFlags are not meant as a logging facility: they actually change Clutter's behaviour at run-time. It would be useful to have this distinction ratified, and thus split ClutterDebugFlags into two: one DebugFlags for logging facilities and another set of flags for behavioural changes. This split is warranted because: • it should be possible to do "CLUTTER_DEBUG=all" and only have log messages on the output • it should be possible to use behavioural modifiers even on a Clutter that has been compiled without debugging messages support The commit adds two new debugging flags: ClutterPickDebugFlags - controlled by the CLUTTER_PICK environment variable ClutterPaintDebugFlags - controlled by the CLUTTER_PAINT environment variable The PickDebugFlags are: nop-picking dump-pick-buffers While the PaintDebugFlags is: disable-swap-events The mechanism is equivalent to the CLUTTER_DEBUG environment variable, but it does not depend on the debug level selected when configuring and compiling Clutter. The picking and painting debugging flags are initialized at clutter_init() time. http://bugzilla.openedhand.com/show_bug.cgi?id=1991
2010-02-16 20:08:35 +00:00
env_string = g_getenv ("CLUTTER_PICK");
if (env_string != NULL)
{
clutter_pick_debug_flags =
g_parse_debug_string (env_string,
clutter_pick_debug_keys,
G_N_ELEMENTS (clutter_pick_debug_keys));
env_string = NULL;
}
env_string = g_getenv ("CLUTTER_PAINT");
if (env_string != NULL)
{
clutter_paint_debug_flags =
g_parse_debug_string (env_string,
clutter_paint_debug_keys,
G_N_ELEMENTS (clutter_paint_debug_keys));
env_string = NULL;
}
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
env_string = g_getenv ("CLUTTER_SHOW_FPS");
if (env_string)
clutter_show_fps = TRUE;
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-color.h: * clutter-color.c: Reimplement ClutterColor as a boxed type; add convenience API for color handling, like: add, subtract, shade, HSL color-space conversion, packing and unpacking. * clutter-private.h: Update ClutterMainContext, and export the main context pointer here. * clutter-rectangle.h: * clutter-rectangle.c: Update the color-related code; make clutter_rectangle_new() and empty constructor and provide clutter_rectangle_new_with_color(); provide color setter and getter API. * clutter-label.h: * clutter-label.c: Rename the "font" property to "font-name"; update the color-related code to the new ClutterColor object; rename clutter_label_new() to clutter_label_new_with_text(), and add setters and getters for the properties. * clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers generators. * clutter-stage.h: * clutter-stage.c: Rework the API: provide a default constructor for a singleton object, named clutter_stage_get_default(), which supercedes the clutter_stage() function in clutter-main; provide new events: button-press-event, button-release-event, key-press-event and key-release-event; update the color-related code; (clutter_stage_snapshot): Allow negative width and height when taking a snapshot (meaning: use full width/height). (clutter_stage_get_element_at_pos): Rename clutter_stage_pick(). * clutter-element.c (clutter_element_paint): Clean up the stage and color related code. * clutter-event.h: * clutter-event.c: Add generic ClutterAnyEvent type; add clutter_event_new(), clutter_event_copy() and clutter_event_free(); make ClutterEvent a boxed type. * clutter-main.h: * clutter-main.c: Remove clutter_stage(); add clutter_main_quit(), for cleanly quitting from clutter_main(); add multiple mainloops support; allocate the ClutterCntx instead of adding it to the stack; re-work the ClutterEvent dispatching. * clutter-group.c (clutter_group_add), (clutter_group_remove): Keep a reference on the element when added to a ClutterGroup. * examples/rects.py * examples/test.c: * examples/test-text.c: * examples/video-cube.c: * examples/super-oh.c: * examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
2007-10-26 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --clutter-default-fps run-time switch and CLUTTER_DEFAULT_FPS environment variable support for setting the default frame-rate at run-time.
2007-10-26 15:47:39 +00:00
env_string = g_getenv ("CLUTTER_DEFAULT_FPS");
if (env_string)
{
gint default_fps = g_ascii_strtoll (env_string, NULL, 10);
clutter_default_fps = CLAMP (default_fps, 1, 1000);
}
Make disable text mipmapping a command line switch The environment variable to disable mipmapping should also be a command line switch, and be handled like the rest of Clutter's environment variables/command line switches.
2009-02-23 13:08:59 +00:00
env_string = g_getenv ("CLUTTER_DISABLE_MIPMAPPED_TEXT");
if (env_string)
clutter_disable_mipmap_text = TRUE;
Make fuzzy picking a command line switch The CLUTTER_FUZZY_PICK environment variable is the last one used by Clutter without a corresponding command line switch.
2009-02-23 13:17:06 +00:00
env_string = g_getenv ("CLUTTER_FUZZY_PICK");
if (env_string)
clutter_use_fuzzy_picking = TRUE;
main: Add a sync-to-vblank global flag It replaces the per-backend CLUTTER_VBLANK environment variable.
2011-11-04 16:35:38 +00:00
env_string = g_getenv ("CLUTTER_VBLANK");
if (g_strcmp0 (env_string, "none") == 0)
clutter_sync_to_vblank = FALSE;
2008-10-31 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1200 - Crash with invalid DISPLAY * clutter/clutter-main.c: Use the ClutterBackend wrapper API instead of directly checking the class structure. * clutter/glx/clutter-backend-glx.c: Return the correct value in case of failure. * clutter/x11/clutter-backend-x11.c: Bail out if XOpenDisplay() failed.
2008-10-31 12:48:26 +00:00
return _clutter_backend_pre_parse (backend, error);
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
}
/* post_parse_hook: initialise the context and data structures
* and opens the X display
*/
static gboolean
post_parse_hook (GOptionContext *context,
GOptionGroup *group,
gpointer data,
GError **error)
{
ClutterMainContext *clutter_context;
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
ClutterBackend *backend;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --g-fatal-warnings switch for abort()-ing on warnings and criticals.
2006-11-21 22:35:48 +00:00
if (clutter_is_initialized)
return TRUE;
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
clutter_context = _clutter_context_get_default ();
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
backend = clutter_context->backend;
g_assert (CLUTTER_IS_BACKEND (backend));
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --g-fatal-warnings switch for abort()-ing on warnings and criticals.
2006-11-21 22:35:48 +00:00
if (clutter_fatal_warnings)
{
GLogLevelFlags fatal_mask;
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
}
2007-10-26 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --clutter-default-fps run-time switch and CLUTTER_DEFAULT_FPS environment variable support for setting the default frame-rate at run-time.
2007-10-26 15:47:39 +00:00
clutter_context->frame_rate = clutter_default_fps;
Deprecate some more old, useless API We still ship clutter_get_show_fps() and clutter_get_debug_enabled() as public entry points. Yet another case of missing API review prior to the 1.0 release, so really the bucket stops around my desk. Let's deprecate these two useless functions, and reduce the API footprint of Clutter.
2011-11-15 17:58:25 +00:00
clutter_context->show_fps = clutter_show_fps;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
clutter_context->options_parsed = TRUE;
2007-10-26 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c: Add a --clutter-default-fps run-time switch and CLUTTER_DEFAULT_FPS environment variable support for setting the default frame-rate at run-time.
2007-10-26 15:47:39 +00:00
Deprecate some more old, useless API We still ship clutter_get_show_fps() and clutter_get_debug_enabled() as public entry points. Yet another case of missing API review prior to the 1.0 release, so really the bucket stops around my desk. Let's deprecate these two useless functions, and reduce the API footprint of Clutter.
2011-11-15 17:58:25 +00:00
/* If not asked to defer display setup, call clutter_init_real(),
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
* which in turn calls the backend post parse hooks.
*/
if (!clutter_context->defer_display_setup)
On error, return FALSE in the post_parse hook Anything that is not CLUTTER_INIT_SUCCESS is to be considered an error. This fixes the Clutter initialization sequence to actually error out on pre-conditions and backend initialization failures.
2011-03-04 23:56:12 +00:00
return clutter_init_real (error) == CLUTTER_INIT_SUCCESS;
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
return TRUE;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
}
/**
Add some more introspection annotations
2010-09-06 15:11:46 +00:00
* clutter_get_option_group: (skip)
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*
* Returns a #GOptionGroup for the command line arguments recognized
* by Clutter. You should add this group to your #GOptionContext with
* g_option_context_add_group(), if you are using g_option_context_parse()
* to parse your commandline arguments.
*
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> * clutter/clutter-main.c: Properly document the clutter_get_option_group() function and the invariant that after parsing Clutter's option group the library will be initialized. (Thanks to Tomas Frydrych for pointing this out)
2008-09-19 11:38:48 +00:00
* Calling g_option_context_parse() with Clutter's #GOptionGroup will result
* in Clutter's initialization. That is, the following code:
*
* |[
* g_option_context_set_main_group (context, clutter_get_option_group ());
* res = g_option_context_parse (context, &amp;argc, &amp;argc, NULL);
* ]|
*
* is functionally equivalent to:
*
* |[
* clutter_init (&amp;argc, &amp;argv);
* ]|
*
* After g_option_context_parse() on a #GOptionContext containing the
* Clutter #GOptionGroup has returned %TRUE, Clutter is guaranteed to be
* initialized.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer full): a #GOptionGroup for the commandline arguments
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
* recognized by Clutter
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*/
GOptionGroup *
clutter_get_option_group (void)
{
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
ClutterMainContext *context;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
GOptionGroup *group;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
clutter_base_init ();
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
group = g_option_group_new ("clutter",
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
_("Clutter Options"),
_("Show Clutter Options"),
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
NULL,
NULL);
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
g_option_group_set_parse_hooks (group, pre_parse_hook, post_parse_hook);
g_option_group_add_entries (group, clutter_args);
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
2007-03-22 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: Remove inclusion of backend-specific headers; update the main context object; add the declarations for the event queue functions. * clutter/clutter-backend.[ch]: Add the abstract ClutterBackend object, which holds backend-specific settings, the main stage, and the event queue. Every backend must implement a subclass of ClutterBackend and ClutterStage. * clutter/clutter-feature.c: Protect the GLX specific calls behing #ifdef HAVE_CLUTTER_GLX. * clutter/clutter-actor.c: * clutter/clutter-group.c: * clutter/clutter-clone-texture.c: Include GL/gl.h * clutter/clutter-event.[ch]: Update public API and implement the event queue private API; hold a reference on the event objects; move out the keysym-to-unicode table; add the new event types. * clutter/clutter-color.h: Include clutter-fixed.h * clutter/clutter-main.c: Update API; get the main stage from the backend object; process the event received from the queue; lock/unlock the main mutex if we have one; move the initialisation process sooner in the init sequence, in order to have the backend object when we check for options; call the backed vfuncs in the pre/post parse hooks. * clutter/clutter-stage.c: Make ClutterStage and abstract class, implemented by the backends. * clutter/clutter/glx/clutter-glx.h: * clutter/clutter/glx/clutter-backend-glx.[ch]: * clutter/clutter/glx/clutter-event-glx.c: * clutter/clutter/glx/clutter-stage-glx.[ch]: * clutter/clutter/glx/Makefile.am: Add the GLX backend. * clutter/clutter/egl/clutter-backend-egl.[ch]: * clutter/clutter/egl/clutter-event-egl.c: * clutter/clutter/egl/clutter-stage-egl.[ch]: * clutter/clutter/egl/Makefile.am: Add the stub for a EGL backend. * examples/*.c: Update for the new API.
2007-03-22 18:21:59 +00:00
/* add backend-specific options */
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-private.h: * clutter/clutter-backend.h: Move the backend functions into the private header. * clutter/glx/clutter-stage-glx.c: * clutter/glx/clutter-event-glx.c: * clutter/clutter-main.c: * clutter/clutter-stage.c: Update the calls to the private backend functions. * clutter/clutter-backend.[ch]: Add an ::init_features vfunc to ClutterBackend.
2007-03-23 17:55:13 +00:00
_clutter_backend_add_options (context->backend, group);
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
return group;
}
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
/**
Add some more introspection annotations
2010-09-06 15:11:46 +00:00
* clutter_get_option_group_without_init: (skip)
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
*
* Returns a #GOptionGroup for the command line arguments recognized
* by Clutter. You should add this group to your #GOptionContext with
* g_option_context_add_group(), if you are using g_option_context_parse()
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
* to parse your commandline arguments.
*
* Unlike clutter_get_option_group(), calling g_option_context_parse() with
* the #GOptionGroup returned by this function requires a subsequent explicit
* call to clutter_init(); use this function when needing to set foreign
* display connection with clutter_x11_set_display(), or with
* <function>gtk_clutter_init()</function>.
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer full): a #GOptionGroup for the commandline arguments
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
* recognized by Clutter
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
*/
GOptionGroup *
clutter_get_option_group_without_init (void)
{
ClutterMainContext *context;
GOptionGroup *group;
clutter_base_init ();
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
context->defer_display_setup = TRUE;
group = clutter_get_option_group ();
return group;
}
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
/* Note that the gobject-introspection annotations for the argc/argv
* parameters do not produce the right result; however, they do
* allow the common case of argc=NULL, argv=NULL to work.
*/
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
/**
* clutter_init_with_args:
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* @argc: (inout): a pointer to the number of command line arguments
Use the (allow-none) annotation for clutter_init* We accept NULL for some parameters in the initialization functions. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-07-02 12:15:42 +00:00
* @argv: (array length=argc) (inout) (allow-none): a pointer to the array
* of command line arguments
* @parameter_string: (allow-none): a string which is displayed in the
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
* first line of <option>--help</option> output, after
2006-12-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.c: Move the apidoc out.
2006-12-05 05:16:52 +00:00
* <literal><replaceable>programname</replaceable> [OPTION...]</literal>
introspection: assorted annotation fixes ported from Vala https://bugzilla.gnome.org/show_bug.cgi?id=677778
2012-06-12 22:41:39 +00:00
* @entries: (array) (allow-none): a %NULL terminated array of
* #GOptionEntry<!-- -->s describing the options of your program
Use the (allow-none) annotation for clutter_init* We accept NULL for some parameters in the initialization functions. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-07-02 12:15:42 +00:00
* @translation_domain: (allow-none): a translation domain to use for
* translating the <option>--help</option> output for the options in
* @entries with gettext(), or %NULL
* @error: (allow-none): a return location for a #GError
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*
* This function does the same work as clutter_init(). Additionally,
* it allows you to add your own command line options, and it
* automatically generates nicely formatted <option>--help</option>
* output. Note that your program will be terminated after writing
* out the help output. Also note that, in case of error, the
* error message will be placed inside @error instead of being
* printed on the display.
*
docs: Document the behaviour in case of init failure Or, better, the fact that the behaviour of any Clutter function will be undefined in case the initialization fails. The value returned by clutter_init() and friends has to be handled properly.
2011-10-21 20:19:27 +00:00
* Just like clutter_init(), if this function returns an error code then
* any subsequent call to any other Clutter API will result in undefined
* behaviour - including segmentation faults.
*
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
* Return value: %CLUTTER_INIT_SUCCESS if Clutter has been successfully
* initialised, or other values or #ClutterInitError in case of
* error.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*/
ClutterInitError
clutter_init_with_args (int *argc,
char ***argv,
2008-10-21 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1197 - Missing const for clutter_init_with_args * * clutter/clutter-main.[ch] (clutter_init_with_args): Constify the string parameters. (Owen Taylor)
2008-10-21 18:48:13 +00:00
const char *parameter_string,
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
GOptionEntry *entries,
2008-10-21 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1197 - Missing const for clutter_init_with_args * * clutter/clutter-main.[ch] (clutter_init_with_args): Constify the string parameters. (Owen Taylor)
2008-10-21 18:48:13 +00:00
const char *translation_domain,
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
GError **error)
{
GOptionContext *context;
GOptionGroup *group;
gboolean res;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
ClutterMainContext *ctx;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
if (clutter_is_initialized)
return CLUTTER_INIT_SUCCESS;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
clutter_base_init ();
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
ctx = _clutter_context_get_default ();
2007-06-19 Matthew Allum <mallum@openedhand.com> * TODO: Sync up a little. * clutter/clutter-main.c: Set a default window title based on g_prgname(). * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Alter draw_to_pixbuf to return a pixbuf * configure.ac: Only full in gdk-pixbuf-xlib as a GLX backend dep. * tests/test-entry.c: Fix a couple of warnings.
2007-06-19 14:10:25 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (!ctx->defer_display_setup)
{
Disable g_set_prgname() Apparently, calling g_set_prgname() multiple times is not allowed anymore, and hence clutter_init_* calls should not do that. Though this is really GLib's fault - and a massive nuisance for us - we should prolly comply to avoid the test suite dying on us.
2010-01-03 20:12:49 +00:00
#if 0
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (argc && *argc > 0 && *argv)
g_set_prgname ((*argv)[0]);
Disable g_set_prgname() Apparently, calling g_set_prgname() multiple times is not allowed anymore, and hence clutter_init_* calls should not do that. Though this is really GLib's fault - and a massive nuisance for us - we should prolly comply to avoid the test suite dying on us.
2010-01-03 20:12:49 +00:00
#endif
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
context = g_option_context_new (parameter_string);
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
Add runtime debug messages for COGL Clutter is able to show debug messages written using the CLUTTER_NOTE() macro at runtime, either by using an environment variable: CLUTTER_DEBUG=... or by using a command line switch: --clutter-debug=... --clutter-no-debug=... Both are parsed during the initialization process by using the GOption API. COGL would benefit from having the same support. In order to do this, we need a cogl_get_option_group() function in COGL that sets up a GOptionGroup for COGL and adds a pre-parse hook that will check the COGL_DEBUG environment variable. The OptionGroup will also install two command line switches: --cogl-debug --cogl-no-debug With the same semantics of the Clutter ones. During Clutter initialization, the COGL option group will be attached to the GOptionContext used to parse the command line options passed to a Clutter application. Every debug message written using: COGL_NOTE (SECTION, "message format", arguments); Will then be printed only if SECTION was enabled at runtime. This whole machinery, like the equivalent one in Clutter, depends on a compile time switch, COGL_ENABLE_DEBUG, which is enabled at the same time as CLUTTER_ENABLE_DEBUG. Having two different symbols allows greater granularity.
2009-02-23 12:47:02 +00:00
group = clutter_get_option_group ();
g_option_context_add_group (context, group);
group = cogl_get_option_group ();
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
g_option_context_add_group (context, group);
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
/* Note: That due to the implementation details of glib's goption
* parsing; cogl and uprof will not actually have there arguments
* parsed before the post_parse_hook is called! */
#ifdef CLUTTER_ENABLE_PROFILE
group = uprof_get_option_group ();
g_option_context_add_group (context, group);
#endif
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (entries)
g_option_context_add_main_entries (context, entries, translation_domain);
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
res = g_option_context_parse (context, argc, argv, error);
g_option_context_free (context);
/* if res is FALSE, the error is filled for
* us by g_option_context_parse()
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1033 - Manually parsing command line options prevents initializing clutter * clutter/clutter-main.c: (post_parse_hook), (clutter_init_with_args), (clutter_parse_args), (clutter_init): Move the initialization of Clutter at the end of the post-parse hook of Clutter's GOptionGroup. Clutter must be initialized at the end of the argument parsing.
2008-09-19 13:22:12 +00:00
*/
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (!res)
{
/* if there has been an error in the initialization, the
* error id will be preserved inside the GError code
*/
if (error && *error)
return (*error)->code;
else
return CLUTTER_INIT_ERROR_INTERNAL;
}
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
return CLUTTER_INIT_SUCCESS;
}
else
return clutter_init_real (error);
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
}
static gboolean
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
clutter_parse_args (int *argc,
char ***argv,
GError **error)
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
{
GOptionContext *option_context;
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
GOptionGroup *clutter_group, *cogl_group;
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
GOptionGroup *uprof_group;
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
#endif
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
GError *internal_error = NULL;
gboolean ret = TRUE;
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
if (clutter_is_initialized)
return TRUE;
option_context = g_option_context_new (NULL);
g_option_context_set_ignore_unknown_options (option_context, TRUE);
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
g_option_context_set_help_enabled (option_context, FALSE);
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
/* Initiate any command line options from the backend */
clutter_group = clutter_get_option_group ();
g_option_context_set_main_group (option_context, clutter_group);
Add runtime debug messages for COGL Clutter is able to show debug messages written using the CLUTTER_NOTE() macro at runtime, either by using an environment variable: CLUTTER_DEBUG=... or by using a command line switch: --clutter-debug=... --clutter-no-debug=... Both are parsed during the initialization process by using the GOption API. COGL would benefit from having the same support. In order to do this, we need a cogl_get_option_group() function in COGL that sets up a GOptionGroup for COGL and adds a pre-parse hook that will check the COGL_DEBUG environment variable. The OptionGroup will also install two command line switches: --cogl-debug --cogl-no-debug With the same semantics of the Clutter ones. During Clutter initialization, the COGL option group will be attached to the GOptionContext used to parse the command line options passed to a Clutter application. Every debug message written using: COGL_NOTE (SECTION, "message format", arguments); Will then be printed only if SECTION was enabled at runtime. This whole machinery, like the equivalent one in Clutter, depends on a compile time switch, COGL_ENABLE_DEBUG, which is enabled at the same time as CLUTTER_ENABLE_DEBUG. Having two different symbols allows greater granularity.
2009-02-23 12:47:02 +00:00
cogl_group = cogl_get_option_group ();
g_option_context_add_group (option_context, cogl_group);
profile: Update to uprof-0.3 dep for --enable-profile When building with --enable-profile we now depend on the uprof-0.3 developer release which brings a few improvements: » It lets us "fix" how we initialize uprof so that instead of using a shared object constructor/destructor (which was a hack used when first adding uprof support to Clutter) we can now initialize as part of clutter's normal initialization code. As a side note though, I found that the way Clutter initializes has some quite serious problems whenever it involves GOptionGroups. It is not able to guarantee the initialization of dependencies like uprof and Cogl. For this reason we still use the contructor/destructor approach to initialize uprof in Cogl. » uprof-0.3 provides a better API for adding custom columns when reporting timer and counter statistics which lets us remove quite a lot of manual report generation code in clutter-profile.c. » uprof-0.3 provides a shared context for tracking mainloop timer statistics. This means any mainloop based library following the same "Mainloop" timer naming convention can use the shared context and no matter who ends up owning the final mainloop the statistics will always be in the same place. This allows profiling of Clutter with an external mainloop such as with the Mutter compositor. » uprof-0.3 can export statistics over dbus and comes with an ncurses based ui to vizualize timer and counter stats live. The latest version of uprof can be cloned from: git://github.com/rib/UProf.git
2010-06-21 14:36:46 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
uprof_group = uprof_get_option_group ();
g_option_context_add_group (option_context, uprof_group);
#endif
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
if (!g_option_context_parse (option_context, argc, argv, &internal_error))
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
{
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
g_propagate_error (error, internal_error);
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
ret = FALSE;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
}
2006-06-08 Matthew Allum <mallum@openedhand.com> * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/clutter-stage.c: Rework and fix offscreen rendering, also rejig GLX context handling, moving mostly into stage. Require at least OpenGL 1.2 ( CLAMP_TO_EDGE ) * clutter/clutter-texture.c: Explicity set props on _init() as to avoid nasty can_create bug failing miserably in certain situations. Switch to CLAMP_TO_EDGE for textures to avoid tile seams. Add some more GL error checks. * clutter/clutter-label.c: Extra debug info * configure.ac: Require gdk-pixbuf-xlib-2.0
2006-06-08 21:28:05 +00:00
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
g_option_context_free (option_context);
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
2007-01-23 Matthew Allum <mallum@openedhand.com> * Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
2007-01-23 20:29:11 +00:00
return ret;
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
}
2006-11-15 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.h: * clutter/clutter-actor.c: Add new API clutter_actor_move_by(), clutter_actor_get_size() * clutter/clutter-alpha.c: * clutter/clutter-alpha.h: Add clutter alpha sine func * clutter/clutter-behaviours.h: * clutter/clutter-behaviours.c: Add a basic scale behaviour (needs work) * examples/behave.c: (main): More playing with new behaviour functionality * clutter/clutter-feature.c: * clutter/clutter-feature.h: * clutter/clutter-main.c: Add new experimental sync to vblank code Set env CLUTTER_VBLANK=none to disable.
2006-11-15 21:19:01 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
/**
* clutter_init:
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* @argc: (inout): The number of arguments in @argv
Use the (allow-none) annotation for clutter_init* We accept NULL for some parameters in the initialization functions. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-07-02 12:15:42 +00:00
* @argv: (array length=argc) (inout) (allow-none): A pointer to an array
* of arguments.
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
* Initialises everything needed to operate with Clutter and parses some
* standard command line options; @argc and @argv are adjusted accordingly
* so your own code will never see those standard arguments.
*
* It is safe to call this function multiple times.
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
* <note>This function will not abort in case of errors during
* initialization; clutter_init() will print out the error message on
* stderr, and will return an error code. It is up to the application
* code to handle this case. If you need to display the error message
* yourself, you can use clutter_init_with_args(), which takes a #GError
* pointer.</note>
*
docs: Document the behaviour in case of init failure Or, better, the fact that the behaviour of any Clutter function will be undefined in case the initialization fails. The value returned by clutter_init() and friends has to be handled properly.
2011-10-21 20:19:27 +00:00
* If this function fails, and returns an error code, any subsequent
* Clutter API will have undefined behaviour - including segmentation
* faults and assertion failures. Make sure to handle the returned
* #ClutterInitError enumeration value.
*
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
* Return value: a #ClutterInitError value
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
*/
ClutterInitError
clutter_init (int *argc,
char ***argv)
{
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
ClutterMainContext *ctx;
GError *error = NULL;
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
ClutterInitError res;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
if (clutter_is_initialized)
return CLUTTER_INIT_SUCCESS;
Merge clutter.git/threading branch
2007-08-08 10:20:14 +00:00
clutter_base_init ();
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
ctx = _clutter_context_get_default ();
2007-06-19 Matthew Allum <mallum@openedhand.com> * TODO: Sync up a little. * clutter/clutter-main.c: Set a default window title based on g_prgname(). * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/egl/clutter-stage-egl.c: * clutter/glx/clutter-stage-glx.c: * clutter/sdl/clutter-stage-sdl.c: Alter draw_to_pixbuf to return a pixbuf * configure.ac: Only full in gdk-pixbuf-xlib as a GLX backend dep. * tests/test-entry.c: Fix a couple of warnings.
2007-06-19 14:10:25 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (!ctx->defer_display_setup)
2007-04-28 Matthew Allum <mallum@openedhand.com> * clutter/Makefile.am: * clutter/clutter-debug.h: * clutter/clutter-fixed.h: * clutter/clutter-main.c: * clutter/cogl/gles/Makefile.am: * clutter/cogl/gles/cogl-defines.h: * clutter/cogl/gles/cogl.c: * clutter/egl/clutter-backend-egl.c: * clutter/egl/clutter-backend-egl.h: * clutter/egl/clutter-stage-egl.c: * configure.ac: Populate most stubs for cogl GL/ES implementation. (against vincent - see http://svn.o-hand.com/repos/misc/ogles) Add various fixups to EGL backend. Code builds and runs (on 16bpp) but yet displays much (is close!) * clutter/pango/pangoclutter-render.c: comment out some rouge glBegin/end calls.
2007-04-28 00:37:11 +00:00
{
Disable g_set_prgname() Apparently, calling g_set_prgname() multiple times is not allowed anymore, and hence clutter_init_* calls should not do that. Though this is really GLib's fault - and a massive nuisance for us - we should prolly comply to avoid the test suite dying on us.
2010-01-03 20:12:49 +00:00
#if 0
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
if (argc && *argc > 0 && *argv)
g_set_prgname ((*argv)[0]);
Disable g_set_prgname() Apparently, calling g_set_prgname() multiple times is not allowed anymore, and hence clutter_init_* calls should not do that. Though this is really GLib's fault - and a massive nuisance for us - we should prolly comply to avoid the test suite dying on us.
2010-01-03 20:12:49 +00:00
#endif
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com> * configure.ac: Enable debug messages also when --enable-debug is set to "minimum". * clutter/Makefile.am: * clutter/clutter-debug.h: Move all debugging macros inside this private header; make all debug macros depend on the CLUTTER_ENABLE_DEBUG compile time define, controlled by the --enable-debug configure switch; add G_LOG_DOMAIN define. * clutter/clutter-main.c: Clean up the debug stuff; add command line argument parsing using GOption; the debug messages now are triggered like this: CLUTTER_DEBUG=section:section:... clutter-app or like this: clutter-app --clutter-debug=section:section:... where "section" is one of the sections listed in clutter-main.c, or "all", for all sections; each section is bound to a flag, which can be used to define a domain when adding a debug note using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is just a wrapper around that, under the CLUTTER_DEBUG_MISC domain; CLUTTER_NOTE() is used like this: CLUTTER_NOTE (DOMAIN, log-function); where log function is g_printerr(), g_message(), g_warning(), g_critical() or directly g_log() - for instance: CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph)); will print the warning only if the "pango" flag has been set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug command line argument. similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps command line switch; also, the --display and --screen command line switches have been added: the first overrides the DISPLAY envvar and the second controls the X screen used by Clutter to get the root window on the display. * clutter/clutter-main.h: * clutter/clutter-main.c: Add extended support for GOption in Clutter; use clutter_init_with_args() to let Clutter parse your own command line arguments; use instead clutter_get_option_group() to get the GOptionGroup used by Clutter if you want to do the parsing yourself with g_option_context_parse(). The init sequence has been verified, updated and moved into common functions where possible. * clutter/pango/pangoclutter-render.c: * clutter/*.c: Include "clutter-debug.h" where needed; use CLUTTER_NOTE() instead of CLUTTER_DBG(). * examples/super-oh.c: Use the new clutter_init_with_args() function, and add a --num-hands command line switch to the SuperOH example code controlling the number of hands at runtime.
2006-11-21 21:27:53 +00:00
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
/* parse_args will trigger backend creation and things like
* DISPLAY connection etc.
*/
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
if (!clutter_parse_args (argc, argv, &error))
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
{
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
g_critical ("Unable to initialize Clutter: %s", error->message);
g_error_free (error);
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
res = CLUTTER_INIT_ERROR_INTERNAL;
}
else
res = CLUTTER_INIT_SUCCESS;
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
}
else
Clean up argument parsing GError handling Pass a GError in, so that clutter_init() can effectively print out a critical warning on initialization failure, like it used to do in the olden days.
2011-03-04 23:55:02 +00:00
{
res = clutter_init_real (&error);
if (error != NULL)
{
g_critical ("Unable to initialize Clutter: %s", error->message);
g_error_free (error);
}
}
return res;
Merge gobject-branch into trunk
2006-05-29 08:59:36 +00:00
}
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.c: Pop and peek the event queue from the tail - it's a queue, not a stack.
2007-03-23 09:44:21 +00:00
gboolean
2007-10-01 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.[ch]: Remove the ::event-after signal class handler, as it's not meant to be overridden by sub-classes. (clutter_actor_class_init): Make every event-related signal return a boolean: return TRUE in a signal handler to block the emission. The value is accumulated automatically by the signal API. (clutter_actor_event): If ::event returns TRUE, skip to emitting ::event-after. Return the value accumulated by the signal emission chain. * clutter/clutter-private.h: Rename _clutter_boolean_accumlator(). * clutter/clutter-main.c (clutter_do_event): If clutter_actor_event() returns TRUE then stop the event emission chain from child to parent. * clutter/clutter-stage.c (clutter_stage_event): Behave like clutter_actor_event(). (clutter_stage_get_key_focus), (clutter_stage_set_key_focus): Avoid a nasty circular reference issue: if the actor passed to set_key_focus is NULL then the stage has the key focus. * tests/test-events.c: Update the events test with the API changes.
2007-10-02 14:03:36 +00:00
_clutter_boolean_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.c: Pop and peek the event queue from the tail - it's a queue, not a stack.
2007-03-23 09:44:21 +00:00
{
gboolean continue_emission;
gboolean signal_handled;
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.c: Pop and peek the event queue from the tail - it's a queue, not a stack.
2007-03-23 09:44:21 +00:00
signal_handled = g_value_get_boolean (handler_return);
g_value_set_boolean (return_accu, signal_handled);
continue_emission = !signal_handled;
Fix delete-event signal handler Use the right marshaller signature (boolean:boxed) for the delete-event signal handlers. Add a debug note in clutter_main_do_event() to track the signal return. Test the delete-event handler inside test.c.
2007-04-19 15:27:46 +00:00
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.c: Pop and peek the event queue from the tail - it's a queue, not a stack.
2007-03-23 09:44:21 +00:00
return continue_emission;
}
Add base initialisation function Add a semi-private function, called clutter_base_init(), which initialises the basic Clutter functionalities (at the moment, just the GLib type system) without calling in the backend-specific code. This function is only useful for gtk-doc, to introspect the library when generating documentation for signals, properties and class hierarchy. Also, change the documentation build system to use clutter_base_init() when launching the scanner program.
2007-05-16 15:00:41 +00:00
Add rotate action Allow rotation of an actor using 2 points (touch or pointers) events. Also refactor the accumulators from various actions. https://bugzilla.gnome.org/show_bug.cgi?id=678587
2012-06-22 01:38:21 +00:00
gboolean
_clutter_boolean_continue_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
gboolean continue_emission;
continue_emission = g_value_get_boolean (handler_return);
g_value_set_boolean (return_accu, continue_emission);
return continue_emission;
}
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
static void
event_click_count_generate (ClutterEvent *event)
{
/* multiple button click detection */
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
static gint click_count = 0;
static gint previous_x = -1;
static gint previous_y = -1;
static guint32 previous_time = 0;
static gint previous_button_number = -1;
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
ClutterInputDevice *device = NULL;
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
ClutterSettings *settings;
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
guint double_click_time;
guint double_click_distance;
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
Do not use deprecated API internally
2010-09-10 13:27:37 +00:00
settings = clutter_settings_get_default ();
g_object_get (settings,
"double-click-distance", &double_click_distance,
"double-click-time", &double_click_time,
NULL);
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
device = clutter_event_get_device (event);
if (device != NULL)
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
{
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
click_count = device->click_count;
previous_x = device->previous_x;
previous_y = device->previous_y;
previous_time = device->previous_time;
previous_button_number = device->previous_button_number;
CLUTTER_NOTE (EVENT,
"Restoring previous click count:%d (device:%d, time:%u)",
click_count,
clutter_input_device_get_device_id (device),
previous_time);
}
else
{
CLUTTER_NOTE (EVENT,
"Restoring previous click count:%d (time:%u)",
click_count,
previous_time);
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
}
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
switch (clutter_event_type (event))
reverted accidental commit
2007-11-20 17:05:23 +00:00
{
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
case CLUTTER_BUTTON_PRESS:
/* check if we are in time and within distance to increment an
* existing click count
*/
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
if (event->button.button == previous_button_number &&
event->button.time < (previous_time + double_click_time) &&
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
(ABS (event->button.x - previous_x) <= double_click_distance) &&
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
(ABS (event->button.y - previous_y) <= double_click_distance))
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
{
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
CLUTTER_NOTE (EVENT, "Increase click count (button: %d, time: %u)",
event->button.button,
event->button.time);
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
click_count += 1;
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
}
else /* start a new click count*/
{
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
CLUTTER_NOTE (EVENT, "Reset click count (button: %d, time: %u)",
event->button.button,
event->button.time);
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
click_count = 1;
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
previous_button_number = event->button.button;
}
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
previous_x = event->button.x;
previous_y = event->button.y;
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
previous_time = event->button.time;
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
/* fallthrough */
case CLUTTER_BUTTON_RELEASE:
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
event->button.click_count = click_count;
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
break;
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
* clutter/clutter-main.c: (event_click_count_generate): generalized click_count generation code. * tests/test-events.c: (input_cb): extended test to report click_count for release and scroll events as well as press events.
2007-11-20 17:14:05 +00:00
default:
event: Do not generate click count for SCROLL events The ClutterScrollEvent structure does not have a click count field, so Clutter should not generate the click count for events of type CLUTTER_SCROLL.
2010-02-04 18:29:47 +00:00
g_assert_not_reached ();
break;
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
}
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
if (event->type == CLUTTER_BUTTON_PRESS && device != NULL)
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
{
event: Clean up click-count detection Avoid a few indirections and direct access to the Event and InputDevice structures.
2009-12-07 23:13:52 +00:00
CLUTTER_NOTE (EVENT, "Storing click count: %d (device:%d, time:%u)",
click_count,
clutter_input_device_get_device_id (device),
previous_time);
device->click_count = click_count;
device->previous_x = previous_x;
device->previous_y = previous_y;
device->previous_time = previous_time;
device->previous_button_number = previous_button_number;
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
}
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
}
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
static inline void
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
emit_event_chain (ClutterEvent *event)
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
static gboolean lock = FALSE;
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
Move all picking-related operations inside InputDevice The InputDevice objects stores pointer coordinates, state, stage and the actor under the cursor, so if the current backend provides us with one attached to the Event structure then we want the InputDevice itself to update its state and give us the ClutterActor underneath the pointer's cursor.
2010-01-08 17:51:00 +00:00
if (event->any.source == NULL)
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.c: Remove the usage of g_return_if_fail() from static functions: either assert or use g_warning() to check internal state, as g_return_if_fail() can be compiled out. * clutter/clutter-main.c: Ditto as above.
2008-02-25 12:24:56 +00:00
{
Use a dynamic array for the actors when delivering events Instead of using a fixed size array for storing the scenegraph sub-node during event delivery we should use a GPtrArray. The benefits are: - a smaller allocation - no undocumented yet binding constraint on the scenegraph size
2009-02-23 15:22:08 +00:00
CLUTTER_NOTE (EVENT, "No source set, discarding event");
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.c: Remove the usage of g_return_if_fail() from static functions: either assert or use g_warning() to check internal state, as g_return_if_fail() can be compiled out. * clutter/clutter-main.c: Ditto as above.
2008-02-25 12:24:56 +00:00
return;
}
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.c: Remove the usage of g_return_if_fail() from static functions: either assert or use g_warning() to check internal state, as g_return_if_fail() can be compiled out. * clutter/clutter-main.c: Ditto as above.
2008-02-25 12:24:56 +00:00
/* reentrancy check */
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-main.c (emit_event): Fix the last commit which inverted a condition.
2008-02-25 16:50:50 +00:00
if (lock != FALSE)
Add a warning for recursive emit_event When event delivery is invoked by synthetic events through clutter_do_event from inside an event handler clutter was silently ignoring it, this warning will hopefully help resolving some issues.
2009-02-27 17:59:16 +00:00
{
Clean up crossing event synthesis code Clutter should just require that the windowing system used by a backend adds a device to the stage when the device enters, and removes it from the stage when the device leaves; with this information, we can synthesize every crossing event and update the device state without other intervention from the backend-specific code. The generation of additional crossing events for actors that are covering the stage at the coordinates of the crossing event should be delegated to the event processing code. The x11 and win32 backends need to be modified to relay the enter and leave events from the windowing system.
2011-01-27 17:26:16 +00:00
g_warning ("Tried emitting event during event delivery, bailing out.");
Add a warning for recursive emit_event When event delivery is invoked by synthetic events through clutter_do_event from inside an event handler clutter was silently ignoring it, this warning will hopefully help resolving some issues.
2009-02-27 17:59:16 +00:00
return;
}
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.c: Remove the usage of g_return_if_fail() from static functions: either assert or use g_warning() to check internal state, as g_return_if_fail() can be compiled out. * clutter/clutter-main.c: Ditto as above.
2008-02-25 12:24:56 +00:00
lock = TRUE;
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
_clutter_actor_handle_event (event->any.source, event);
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
lock = FALSE;
}
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
/*
* Emits a pointer event after having prepared the event for delivery (setting
* source, computing click_count, generating enter/leave etc.).
*/
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
static inline void
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
emit_pointer_event (ClutterEvent *event,
ClutterInputDevice *device)
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
{
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
ClutterMainContext *context = _clutter_context_get_default ();
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
if (context->pointer_grab_actor == NULL &&
(device == NULL || device->pointer_grab_actor == NULL))
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
{
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
/* no grab, time to capture and bubble */
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
emit_event_chain (event);
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
}
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
else
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
{
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
if (context->pointer_grab_actor != NULL)
{
/* global grab */
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
}
else if (device != NULL && device->pointer_grab_actor != NULL)
{
/* per device grab */
clutter_actor_event (device->pointer_grab_actor, event, FALSE);
}
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
}
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
}
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
static inline void
emit_touch_event (ClutterEvent *event,
ClutterInputDevice *device)
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
ClutterActor *grab_actor = NULL;
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
if (device->sequence_grab_actors != NULL)
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
grab_actor = g_hash_table_lookup (device->sequence_grab_actors,
event->touch.sequence);
}
if (grab_actor != NULL)
{
/* per-device sequence grab */
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
clutter_actor_event (grab_actor, event, FALSE);
}
else
{
/* no grab, time to capture and bubble */
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
emit_event_chain (event);
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
}
}
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
static inline void
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
emit_keyboard_event (ClutterEvent *event,
ClutterInputDevice *device)
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
{
device: Make InputDevice an object and subclass it for X11 ClutterInputDevice should be a type that we can subclass per-backend to add functionality.
2009-11-23 16:07:16 +00:00
ClutterMainContext *context = _clutter_context_get_default ();
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (context->keyboard_grab_actor == NULL &&
(device == NULL || device->keyboard_grab_actor == NULL))
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
/* no grab, time to capture and bubble */
emit_event_chain (event);
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
}
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
else
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
{
if (context->keyboard_grab_actor != NULL)
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
/* global key grab */
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
clutter_actor_event (context->keyboard_grab_actor, event, FALSE);
}
else if (device != NULL && device->keyboard_grab_actor != NULL)
{
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
/* per-device key grab */
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
clutter_actor_event (context->keyboard_grab_actor, event, FALSE);
}
}
* clutter/clutter-main.c: (generate_enter_leave_events), (clutter_do_event): moved the generation of enter/leave events to a utility function.
2007-11-15 17:30:30 +00:00
}
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
static gboolean
is_off_stage (ClutterActor *stage,
gfloat x,
gfloat y)
{
Clean up crossing event synthesis code Clutter should just require that the windowing system used by a backend adds a device to the stage when the device enters, and removes it from the stage when the device leaves; with this information, we can synthesize every crossing event and update the device state without other intervention from the backend-specific code. The generation of additional crossing events for actors that are covering the stage at the coordinates of the crossing event should be delegated to the event processing code. The x11 and win32 backends need to be modified to relay the enter and leave events from the windowing system.
2011-01-27 17:26:16 +00:00
gfloat width, height;
clutter_actor_get_size (stage, &width, &height);
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
return (x < 0 ||
y < 0 ||
Clean up crossing event synthesis code Clutter should just require that the windowing system used by a backend adds a device to the stage when the device enters, and removes it from the stage when the device leaves; with this information, we can synthesize every crossing event and update the device state without other intervention from the backend-specific code. The generation of additional crossing events for actors that are covering the stage at the coordinates of the crossing event should be delegated to the event processing code. The x11 and win32 backends need to be modified to relay the enter and leave events from the windowing system.
2011-01-27 17:26:16 +00:00
x >= width ||
y >= height);
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
}
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
/**
docs: Annotation fixes The introspection scanner has become slightly more annoying, in the hope that people start fixing their annotations. As it turns out, it was the right move.
2012-04-30 16:12:12 +00:00
* clutter_do_event:
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
* @event: a #ClutterEvent.
*
Add some more sanity checks to clutter_do_event() Silently ignore events on stages during destruction; but print out a warning if clutter_do_event() is being called with a stage-less event.
2011-02-03 11:30:10 +00:00
* Processes an event.
*
* The @event must be a valid #ClutterEvent and have a #ClutterStage
* associated to it.
*
* This function is only useful when embedding Clutter inside another
* toolkit, and it should never be called by applications.
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
*/
void
clutter_do_event (ClutterEvent *event)
Compress events as part of the frame cycle Instead of trying to guess about which motion events are extraneous, queue up all events until we process a frame. This allows us to look ahead and reliably compress consecutive sequence of motion events. clutter-main.c: Feed received events to the stage for queueing. Remove old compression code. Remove clutter_get_motion_events_frequency() clutter_set_motion_events_frequency() clutter-stage.c: Keep a queue of pending events. clutter-master-clock.c: Add processng of queued events to the clock source dispatch function. http://bugzilla.openedhand.com/show_bug.cgi?id=1637 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-06-06 23:10:41 +00:00
{
Add some more sanity checks to clutter_do_event() Silently ignore events on stages during destruction; but print out a warning if clutter_do_event() is being called with a stage-less event.
2011-02-03 11:30:10 +00:00
/* we need the stage for the event */
if (event->any.stage == NULL)
{
g_warning ("%s: Event does not have a stage: discarding.", G_STRFUNC);
return;
}
/* stages in destruction do not process events */
if (CLUTTER_ACTOR_IN_DESTRUCTION (event->any.stage))
Compress events as part of the frame cycle Instead of trying to guess about which motion events are extraneous, queue up all events until we process a frame. This allows us to look ahead and reliably compress consecutive sequence of motion events. clutter-main.c: Feed received events to the stage for queueing. Remove old compression code. Remove clutter_get_motion_events_frequency() clutter_set_motion_events_frequency() clutter-stage.c: Keep a queue of pending events. clutter-master-clock.c: Add processng of queued events to the clock source dispatch function. http://bugzilla.openedhand.com/show_bug.cgi?id=1637 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-06-06 23:10:41 +00:00
return;
/* Instead of processing events when received, we queue them up to
* handle per-frame before animations, layout, and drawing.
*
* This gives us the chance to reliably compress motion events
* because we've "looked ahead" and know all motion events that
* will occur before drawing the frame.
*/
_clutter_stage_queue_event (event->any.stage, event);
}
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
static void
_clutter_process_event_details (ClutterActor *stage,
ClutterMainContext *context,
ClutterEvent *event)
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
{
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
ClutterInputDevice *device = clutter_event_get_device (event);
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
switch (event->type)
{
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
case CLUTTER_NOTHING:
event->any.source = stage;
break;
case CLUTTER_KEY_PRESS:
case CLUTTER_KEY_RELEASE:
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
{
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
ClutterActor *actor = NULL;
* clutter/clutter-main.c: (clutter_do_event): allow motion events only delivered to stage to be chaugt in the capture phase as well as the bubbling phase.
2007-10-16 16:35:02 +00:00
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
/* check that we're not a synthetic event with source set */
if (event->any.source == NULL)
{
actor = clutter_stage_get_key_focus (CLUTTER_STAGE (stage));
event->any.source = actor;
2008-02-25 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-actor.c: Remove the usage of g_return_if_fail() from static functions: either assert or use g_warning() to check internal state, as g_return_if_fail() can be compiled out. * clutter/clutter-main.c: Ditto as above.
2008-02-25 12:24:56 +00:00
if (G_UNLIKELY (actor == NULL))
{
g_warning ("No key focus set, discarding");
return;
}
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
}
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
emit_keyboard_event (event, device);
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
}
break;
Clean up crossing event synthesis code Clutter should just require that the windowing system used by a backend adds a device to the stage when the device enters, and removes it from the stage when the device leaves; with this information, we can synthesize every crossing event and update the device state without other intervention from the backend-specific code. The generation of additional crossing events for actors that are covering the stage at the coordinates of the crossing event should be delegated to the event processing code. The x11 and win32 backends need to be modified to relay the enter and leave events from the windowing system.
2011-01-27 17:26:16 +00:00
case CLUTTER_ENTER:
/* if we're entering from outside the stage we need
* to check whether the pointer is actually on another
* actor, and emit an additional pointer event
*/
if (event->any.source == stage &&
event->crossing.related == NULL)
{
ClutterActor *actor = NULL;
emit_pointer_event (event, device);
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
actor = _clutter_input_device_update (device, NULL, FALSE);
Clean up crossing event synthesis code Clutter should just require that the windowing system used by a backend adds a device to the stage when the device enters, and removes it from the stage when the device leaves; with this information, we can synthesize every crossing event and update the device state without other intervention from the backend-specific code. The generation of additional crossing events for actors that are covering the stage at the coordinates of the crossing event should be delegated to the event processing code. The x11 and win32 backends need to be modified to relay the enter and leave events from the windowing system.
2011-01-27 17:26:16 +00:00
if (actor != stage)
{
ClutterEvent *crossing;
/* we emit the exact same event on the actor */
crossing = clutter_event_copy (event);
crossing->crossing.related = stage;
crossing->crossing.source = actor;
emit_pointer_event (crossing, device);
clutter_event_free (crossing);
}
}
else
emit_pointer_event (event, device);
break;
case CLUTTER_LEAVE:
/* same as CLUTTER_ENTER above: when leaving the stage
* we need to also emit a CLUTTER_LEAVE event on the
* actor currently underneath the device, unless it's the
* stage
*/
if (event->any.source == stage &&
event->crossing.related == NULL &&
device->cursor_actor != stage)
{
ClutterEvent *crossing;
crossing = clutter_event_copy (event);
crossing->crossing.related = stage;
crossing->crossing.source = device->cursor_actor;
emit_pointer_event (crossing, device);
clutter_event_free (crossing);
}
emit_pointer_event (event, device);
break;
case CLUTTER_DESTROY_NOTIFY:
case CLUTTER_DELETE:
event->any.source = stage;
/* the stage did not handle the event, so we just quit */
clutter_stage_event (CLUTTER_STAGE (stage), event);
break;
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
case CLUTTER_MOTION:
Store the motion event deliver flag in ClutterStage Once upon a time, the land of Clutter had a stage singleton. It was created automatically at initialization time and stayed around even after the main loop was terminated. The singleton was content in being all there was. There also was a global API to handle the configuration of the stage singleton that would affect the behaviour on other classes, signals and properties. Then, an evil wizard came along and locked the stage singleton in his black tower, and twisted it until it was possible to create new stages. These new stages were pesky, and didn't have the same semantics of the singleton: they didn't stay around when closed, or terminate the main loop on delete events. The evil wizard also started moving all the stage-related API from the global context into class-specific methods. Finally, the evil wizard cast a spell, and the stage singleton was demoted to creation on demand - and until somebody called the clutter_stage_get_default() function, the singleton remained in a limbo of NULL pointers and undefined memory areas. There was a last bit - literally - of information still held by the global API; a tiny, little flag that disabled per-actor motion events. The evil wizard added private accessors for it, and stored it inside the stage private structure, in preparation for a deprecation that would come in a future development cycle. The evil wizard looked down upon the land of Clutter from the height of his black tower; the lay of the land had been reshaped into a crucible of potential, and the last dregs of the original force of creation were either molted into new, useful shapes, or blasted away by the sheer fury of his will. All was good.
2011-02-18 17:19:04 +00:00
/* only the stage gets motion events if they are enabled */
stage: Make per-actor motion event delivery accessors public Complete the quest of commit bc548dc86271d38918d310c26c9c59de76218d16 by making the ClutterStage methods for controlling the per-actor motion and crossing event delivery public, and deprecating the global ones.
2011-06-20 10:41:28 +00:00
if (!clutter_stage_get_motion_events_enabled (CLUTTER_STAGE (stage)) &&
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
event->any.source == NULL)
* clutter/clutter-event.h: made ClutterEventAny have a source field, rearanged other structs to have source in the same position. * clutter/clutter-event.c: (clutter_event_get_source): modified to use the any event. (clutter_event_free): removed unused variable. * clutter/clutter-main.c: (deliver_event), (clutter_do_event): reduced amount of code. As well as deliver button-release events to the stage.
2007-11-12 19:12:02 +00:00
{
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
/* Only stage gets motion events */
event->any.source = stage;
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
/* global grabs */
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
if (context->pointer_grab_actor != NULL)
* clutter/clutter-event.h: made ClutterEventAny have a source field, rearanged other structs to have source in the same position. * clutter/clutter-event.c: (clutter_event_get_source): modified to use the any event. (clutter_event_free): removed unused variable. * clutter/clutter-main.c: (deliver_event), (clutter_do_event): reduced amount of code. As well as deliver button-release events to the stage.
2007-11-12 19:12:02 +00:00
{
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
clutter_actor_event (context->pointer_grab_actor,
Store the motion event deliver flag in ClutterStage Once upon a time, the land of Clutter had a stage singleton. It was created automatically at initialization time and stayed around even after the main loop was terminated. The singleton was content in being all there was. There also was a global API to handle the configuration of the stage singleton that would affect the behaviour on other classes, signals and properties. Then, an evil wizard came along and locked the stage singleton in his black tower, and twisted it until it was possible to create new stages. These new stages were pesky, and didn't have the same semantics of the singleton: they didn't stay around when closed, or terminate the main loop on delete events. The evil wizard also started moving all the stage-related API from the global context into class-specific methods. Finally, the evil wizard cast a spell, and the stage singleton was demoted to creation on demand - and until somebody called the clutter_stage_get_default() function, the singleton remained in a limbo of NULL pointers and undefined memory areas. There was a last bit - literally - of information still held by the global API; a tiny, little flag that disabled per-actor motion events. The evil wizard added private accessors for it, and stored it inside the stage private structure, in preparation for a deprecation that would come in a future development cycle. The evil wizard looked down upon the land of Clutter from the height of his black tower; the lay of the land had been reshaped into a crucible of potential, and the last dregs of the original force of creation were either molted into new, useful shapes, or blasted away by the sheer fury of his will. All was good.
2011-02-18 17:19:04 +00:00
event,
FALSE);
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
break;
}
else if (device != NULL && device->pointer_grab_actor != NULL)
{
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
clutter_actor_event (device->pointer_grab_actor,
Store the motion event deliver flag in ClutterStage Once upon a time, the land of Clutter had a stage singleton. It was created automatically at initialization time and stayed around even after the main loop was terminated. The singleton was content in being all there was. There also was a global API to handle the configuration of the stage singleton that would affect the behaviour on other classes, signals and properties. Then, an evil wizard came along and locked the stage singleton in his black tower, and twisted it until it was possible to create new stages. These new stages were pesky, and didn't have the same semantics of the singleton: they didn't stay around when closed, or terminate the main loop on delete events. The evil wizard also started moving all the stage-related API from the global context into class-specific methods. Finally, the evil wizard cast a spell, and the stage singleton was demoted to creation on demand - and until somebody called the clutter_stage_get_default() function, the singleton remained in a limbo of NULL pointers and undefined memory areas. There was a last bit - literally - of information still held by the global API; a tiny, little flag that disabled per-actor motion events. The evil wizard added private accessors for it, and stored it inside the stage private structure, in preparation for a deprecation that would come in a future development cycle. The evil wizard looked down upon the land of Clutter from the height of his black tower; the lay of the land had been reshaped into a crucible of potential, and the last dregs of the original force of creation were either molted into new, useful shapes, or blasted away by the sheer fury of his will. All was good.
2011-02-18 17:19:04 +00:00
event,
FALSE);
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
break;
}
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
/* Trigger handlers on stage in both capture .. */
if (!clutter_actor_event (stage, event, TRUE))
{
/* and bubbling phase */
clutter_actor_event (stage, event, FALSE);
* clutter/clutter-event.h: made ClutterEventAny have a source field, rearanged other structs to have source in the same position. * clutter/clutter-event.c: (clutter_event_get_source): modified to use the any event. (clutter_event_free): removed unused variable. * clutter/clutter-main.c: (deliver_event), (clutter_do_event): reduced amount of code. As well as deliver button-release events to the stage.
2007-11-12 19:12:02 +00:00
}
break;
}
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
/* fallthrough from motion */
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE:
case CLUTTER_SCROLL:
{
ClutterActor *actor;
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
gfloat x, y;
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
clutter_event_get_coords (event, &x, &y);
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
/* Only do a pick to find the source if source is not already set
* (as it could be in a synthetic event)
*/
if (event->any.source == NULL)
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
{
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
/* emulate X11 the implicit soft grab; the implicit soft grab
* keeps relaying motion events when the stage is left with a
* pointer button pressed. since this is what happens when we
* disable per-actor motion events we need to maintain the same
* behaviour when the per-actor motion events are enabled as
* well
*/
if (is_off_stage (stage, x, y))
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
{
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
if (event->type == CLUTTER_BUTTON_RELEASE)
{
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
CLUTTER_NOTE (EVENT,
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
"Release off stage received at %.2f, %.2f",
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
x, y);
event->button.source = stage;
event: Off-stage button releases have a click count of 1 The ButtonRelease off-stage should not have a click count of 0 but a click count initialized to 1.
2009-12-09 00:00:49 +00:00
event->button.click_count = 1;
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
emit_pointer_event (event, device);
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
}
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
else if (event->type == CLUTTER_MOTION)
{
CLUTTER_NOTE (EVENT,
"Motion off stage received at %.2f, %2.f",
x, y);
event->motion.source = stage;
emit_pointer_event (event, device);
}
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
break;
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
}
2007-10-10 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-main.c: * tests/test-events.c: Add basic W3 DOM event 'capture' like functionality.
2007-10-10 13:04:34 +00:00
Move all picking-related operations inside InputDevice The InputDevice objects stores pointer coordinates, state, stage and the actor under the cursor, so if the current backend provides us with one attached to the Event structure then we want the InputDevice itself to update its state and give us the ClutterActor underneath the pointer's cursor.
2010-01-08 17:51:00 +00:00
/* if the backend provides a device then we should
* already have everything we need to update it and
* get the actor underneath
*/
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
if (device != NULL)
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
actor = _clutter_input_device_update (device, NULL, TRUE);
Rework the emission of LEAVE/ENTER event pairs The LEAVE/ENTER event pairs should be queued during the InputDevice update process, when we change the actor under the device pointer. This commit cleans up the event emission code inside clutter-main.c and the logic of the event processing.
2009-11-24 16:33:03 +00:00
else
Move all picking-related operations inside InputDevice The InputDevice objects stores pointer coordinates, state, stage and the actor under the cursor, so if the current backend provides us with one attached to the Event structure then we want the InputDevice itself to update its state and give us the ClutterActor underneath the pointer's cursor.
2010-01-08 17:51:00 +00:00
{
CLUTTER_NOTE (EVENT, "No device found: picking");
stage: Move _clutter_do_pick to clutter-stage.c This moves the implementation of _clutter_do_pick to clutter-stage.c and renames it _clutter_stage_do_pick. This function can be compared to _clutter_stage_do_update/redraw in that it prepares for and starts a traversal of a scenegraph descending from a given stage. Since it is desirable that this function should have access to the private state of the stage it is awkward to maintain outside of clutter-stage.c. Besides moving _clutter_do_pick this patch is also able to remove the following private state accessors from clutter-stage-private.h: _clutter_stage_set_pick_buffer_valid, _clutter_stage_get_pick_buffer_valid, _clutter_stage_increment_picks_per_frame_counter, _clutter_stage_reset_picks_per_frame_counter and _clutter_stage_get_picks_per_frame_counter.
2011-03-15 13:17:04 +00:00
actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
x, y,
CLUTTER_PICK_REACTIVE);
Move all picking-related operations inside InputDevice The InputDevice objects stores pointer coordinates, state, stage and the actor under the cursor, so if the current backend provides us with one attached to the Event structure then we want the InputDevice itself to update its state and give us the ClutterActor underneath the pointer's cursor.
2010-01-08 17:51:00 +00:00
}
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
if (actor == NULL)
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
break;
event: Unify the off-stage motion events delivery behaviour When we disable the per-actor events delivery Clutter replicates the X11 implicit soft grab for motion events with off-stage. The implicit grab is done whenever the pointer of a device leaves a window with a button still pressed; with the implicit grab in place the window still receives motion events even after the LeaveNotify - until the button is released. The implicit grab is not honoured in the per-actor event deliver case, though, so we have a mismatch between two in theory equivalent cases. Luckily, the fix is pretty trivial: when we check for a motion event with a stage set but without an actor set, and that has off-stage coordinates, we arbitrarily set the source to be the stage of the event and emit the pointer event.
2010-02-01 15:47:50 +00:00
event->any.source = actor;
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
}
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
else
* clutter/clutter-main.c: (clutter_do_event): avoid computing source of events if it is already set (for synthetic events.) * clutter/clutter-event.c: Add more information to the documentation of clutter_event_put.
2007-11-20 17:03:53 +00:00
{
/* use the source already set in the synthetic event */
actor = event->any.source;
}
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
Remove Units from the public API With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
2009-05-06 15:44:47 +00:00
CLUTTER_NOTE (EVENT,
"Reactive event received at %.2f, %.2f - actor: %p",
x, y,
actor);
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
event: Do not generate click count for SCROLL events The ClutterScrollEvent structure does not have a click count field, so Clutter should not generate the click count for events of type CLUTTER_SCROLL.
2010-02-04 18:29:47 +00:00
/* button presses and releases need a click count */
if (event->type == CLUTTER_BUTTON_PRESS ||
event->type == CLUTTER_BUTTON_RELEASE)
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
{
/* Generate click count */
event_click_count_generate (event);
}
Bug 1013 - Per device grabs are not obeyed in pointer device propagation. * clutter/clutter-event.c: (clutter_event_get_device_id): swap arguments of g_return_val_if_fail around. * clutter/clutter-event.h: added *device field to crossing events as well. * clutter/clutter-main.c: (emit_pointer_event): added a device argument and check for per device grabs if this device is passed. (clutter_do_event): pass the device if present for all pointer event emissions. (generate_enter_leave_events): copy the device from the motion events when generating enter/leave events.
2008-07-01 11:51:20 +00:00
emit_pointer_event (event, device);
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
break;
}
event: Add ClutterTouchEvent The ClutterTouchEvent structure contains the data relative to a touch event.
2012-03-19 13:47:19 +00:00
case CLUTTER_TOUCH_UPDATE:
events: honour clutter_stage_set_motion_events_enabled() for touch events When dragging/scrolling using touch events, we want the same behaviour than for motion events. We need to honor the user's calls to clutter_stage_set_motion_events_enabled() to deactive event bubbling/captured sequences on the actor located under the pointer and just transmit events to the stage/grab actor. https://bugzilla.gnome.org/show_bug.cgi?id=680751
2012-07-28 13:36:23 +00:00
/* only the stage gets motion events if they are enabled */
if (!clutter_stage_get_motion_events_enabled (CLUTTER_STAGE (stage)) &&
event->any.source == NULL)
{
ClutterActor *grab_actor = NULL;
/* Only stage gets motion events */
event->any.source = stage;
/* global grabs */
if (device->sequence_grab_actors != NULL)
{
grab_actor = g_hash_table_lookup (device->sequence_grab_actors,
event->touch.sequence);
}
if (grab_actor != NULL)
{
clutter_actor_event (grab_actor, event, FALSE);
break;
}
/* Trigger handlers on stage in both capture .. */
if (!clutter_actor_event (stage, event, TRUE))
{
/* and bubbling phase */
clutter_actor_event (stage, event, FALSE);
}
break;
}
/* fallthrough from motion */
case CLUTTER_TOUCH_BEGIN:
events: process CLUTTER_TOUCH_CANCEL These events might be emitted from the window manager/compositor, they need to be transmitted to widgets. https://bugzilla.gnome.org/show_bug.cgi?id=680752
2012-07-28 13:48:56 +00:00
case CLUTTER_TOUCH_CANCEL:
event: Add ClutterTouchEvent The ClutterTouchEvent structure contains the data relative to a touch event.
2012-03-19 13:47:19 +00:00
case CLUTTER_TOUCH_END:
events: Deliver touch events to actors https://bugzilla.gnome.org/show_bug.cgi?id=677390
2012-06-04 11:15:13 +00:00
{
ClutterActor *actor;
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
ClutterEventSequence *sequence;
events: Deliver touch events to actors https://bugzilla.gnome.org/show_bug.cgi?id=677390
2012-06-04 11:15:13 +00:00
gfloat x, y;
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
sequence =
clutter_event_get_event_sequence (event);
if (event->type == CLUTTER_TOUCH_BEGIN)
input-device: don't reset a device's stage until all touch points are gone 803b3bafb617c2df703aa8b834ff0df2f0c5c26c introduced a new issue for multi touch events. In the case where 2 touch events for 2 different touch points are processed in the same iteration, a call to _clutter_stage_remove_device() when processing the first event will remove the stage setting of the InputDevice. That means Clutter will skip the second event, because it can't find a stage to which relate the event, so no related actor and so no emission. To fix this we move the _clutter_stage_(add/remove)_device() calls into the input device. This way the input device can find out exactly when to call these functions (i.e. when no touch point were previously active or when no touch point remain active). https://bugzilla.gnome.org/show_bug.cgi?id=682362
2012-08-21 14:26:30 +00:00
_clutter_input_device_add_event_sequence (device, event);
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
events: Deliver touch events to actors https://bugzilla.gnome.org/show_bug.cgi?id=677390
2012-06-04 11:15:13 +00:00
clutter_event_get_coords (event, &x, &y);
/* Only do a pick to find the source if source is not already set
* (as it could be in a synthetic event)
*/
if (event->any.source == NULL)
{
events: Deliver touch events that continue off stage (soft grab) If a button press happen on stage and the pointer is moved outside the stage while holding the mouse button, the motion and release events are still delivered to actors. Do the same X11 soft grab emulation for touch events. https://bugzilla.gnome.org/show_bug.cgi?id=685589
2012-10-05 12:34:20 +00:00
/* same as the mouse events above, emulate the X11 implicit
* soft grab */
if (is_off_stage (stage, x, y))
{
CLUTTER_NOTE (EVENT,
"Touch %s off stage received at %.2f, %.2f",
events: Fix and improve some touch events debug notes
2012-11-20 16:37:53 +00:00
event->type == CLUTTER_TOUCH_UPDATE ? "update" :
event->type == CLUTTER_TOUCH_END ? "end" :
event->type == CLUTTER_TOUCH_CANCEL ? "cancel" :
events: Deliver touch events that continue off stage (soft grab) If a button press happen on stage and the pointer is moved outside the stage while holding the mouse button, the motion and release events are still delivered to actors. Do the same X11 soft grab emulation for touch events. https://bugzilla.gnome.org/show_bug.cgi?id=685589
2012-10-05 12:34:20 +00:00
"?", x, y);
events: Use the correct union field when setting the stage on touch events
2012-11-20 16:34:52 +00:00
event->touch.source = stage;
events: Deliver touch events that continue off stage (soft grab) If a button press happen on stage and the pointer is moved outside the stage while holding the mouse button, the motion and release events are still delivered to actors. Do the same X11 soft grab emulation for touch events. https://bugzilla.gnome.org/show_bug.cgi?id=685589
2012-10-05 12:34:20 +00:00
emit_touch_event (event, device);
if (event->type == CLUTTER_TOUCH_END)
_clutter_input_device_remove_event_sequence (device, event);
break;
}
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
if (device != NULL)
actor = _clutter_input_device_update (device, sequence, TRUE);
else
events: Fix and improve some touch events debug notes
2012-11-20 16:37:53 +00:00
{
CLUTTER_NOTE (EVENT, "No device found: picking");
actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
x, y,
CLUTTER_PICK_REACTIVE);
}
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
events: Deliver touch events to actors https://bugzilla.gnome.org/show_bug.cgi?id=677390
2012-06-04 11:15:13 +00:00
if (actor == NULL)
break;
event->any.source = actor;
}
else
{
/* use the source already set in the synthetic event */
actor = event->any.source;
}
CLUTTER_NOTE (EVENT,
"Reactive event received at %.2f, %.2f - actor: %p",
x, y,
actor);
input-device: add APIs to grab sequences of touch events https://bugzilla.gnome.org/show_bug.cgi?id=678279
2012-06-16 23:44:44 +00:00
emit_touch_event (event, device);
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
if (event->type == CLUTTER_TOUCH_END)
input-device: don't reset a device's stage until all touch points are gone 803b3bafb617c2df703aa8b834ff0df2f0c5c26c introduced a new issue for multi touch events. In the case where 2 touch events for 2 different touch points are processed in the same iteration, a call to _clutter_stage_remove_device() when processing the first event will remove the stage setting of the InputDevice. That means Clutter will skip the second event, because it can't find a stage to which relate the event, so no related actor and so no emission. To fix this we move the _clutter_stage_(add/remove)_device() calls into the input device. This way the input device can find out exactly when to call these functions (i.e. when no touch point were previously active or when no touch point remain active). https://bugzilla.gnome.org/show_bug.cgi?id=682362
2012-08-21 14:26:30 +00:00
_clutter_input_device_remove_event_sequence (device, event);
input-device: add enter/leave events generation for touch events This patch brings 'enter-event' and 'leave-event' generation for touch based devices. This leads to adding a new API to retrieve coordinates of a touch point. https://bugzilla.gnome.org/show_bug.cgi?id=679797
2012-07-11 15:21:28 +00:00
events: Deliver touch events to actors https://bugzilla.gnome.org/show_bug.cgi?id=677390
2012-06-04 11:15:13 +00:00
break;
}
* clutter/clutter-main.c: (emit_event): renamed from deliver_event, (emit_pointer_event): utility function to emit pointer event signals (which takes pointer grab into account). (emit_keyboard_event): utility function to emit keyboard event signals (which takes keyboard grab into account). (clutter_do_event): use the above utility functions, also reindented the source.
2007-11-16 13:41:07 +00:00
case CLUTTER_STAGE_STATE:
/* fullscreen / focus - forward to stage */
event->any.source = stage;
clutter_stage_event (CLUTTER_STAGE (stage), event);
break;
case CLUTTER_CLIENT_MESSAGE:
break;
event: Add ClutterTouchEvent The ClutterTouchEvent structure contains the data relative to a touch event.
2012-03-19 13:47:19 +00:00
case CLUTTER_EVENT_LAST:
break;
2007-10-03 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-private.h: * clutter/eglnative/clutter-event-egl.c: * clutter/eglx/clutter-event-egl.c: * clutter/glx/clutter-event-glx.c: * clutter/sdl/clutter-event-sdl.c: Remove seperate double/triple click events and replace with a click_count member. Move calculating click counts from backend to do_event() Initial implementation of ENTER/LEAVE events. * tests/test-events.c: Add code to test above. * tests/test-behave.c: Sync with newer API. * clutter/clutter-score.c: Silence a warning.
2007-10-03 09:28:16 +00:00
}
}
Deprecate clutter_redraw() It's just a badly named proxy to clutter_stage_ensure_redraw().
2011-10-10 14:48:43 +00:00
/*
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
* _clutter_process_event
* @event: a #ClutterEvent.
*
* Does the actual work of processing an event that was queued earlier
* out of clutter_do_event().
*/
void
_clutter_process_event (ClutterEvent *event)
{
analysis: ClutterMain • Remove unused variables. • Do not pre-initialize ClutterActor's GType; pre-emptive optimizations like these are more black magic than real optimization.
2010-02-11 15:13:40 +00:00
ClutterMainContext *context;
ClutterActor *stage;
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
context = _clutter_context_get_default ();
analysis: ClutterMain • Remove unused variables. • Do not pre-initialize ClutterActor's GType; pre-emptive optimizations like these are more black magic than real optimization.
2010-02-11 15:13:40 +00:00
stage = CLUTTER_ACTOR (event->any.stage);
if (stage == NULL)
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
{
events: Fix and improve some touch events debug notes
2012-11-20 16:37:53 +00:00
CLUTTER_NOTE (EVENT, "Discarding event without a stage set");
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
return;
}
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
events: Make _clutter_process_event() reentrant The _clutter_process_event() function may get called while already servicing a _clutter_process_event() invocation (eg. when generating ENTER events before emitting TOUCH_BEGIN). In these cases clutter_get_current_event() would return NULL after the inner call to _clutter_process_event() has finished, thereafter making the current event inaccessible during the remaining portion of the outer event emission. By stacking the current events in ClutterMainContext instead of simply replacing them we do not lose track of the real current event. Also update clutter_get_current_event_time() to be consistent from a reentrancy perspective. https://bugzilla.gnome.org/show_bug.cgi?id=688457
2012-11-16 15:33:00 +00:00
/* push events on a stack, so that we don't need to
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
* add an event parameter to all signals that can be emitted within
* an event chain
*/
events: Make _clutter_process_event() reentrant The _clutter_process_event() function may get called while already servicing a _clutter_process_event() invocation (eg. when generating ENTER events before emitting TOUCH_BEGIN). In these cases clutter_get_current_event() would return NULL after the inner call to _clutter_process_event() has finished, thereafter making the current event inaccessible during the remaining portion of the outer event emission. By stacking the current events in ClutterMainContext instead of simply replacing them we do not lose track of the real current event. Also update clutter_get_current_event_time() to be consistent from a reentrancy perspective. https://bugzilla.gnome.org/show_bug.cgi?id=688457
2012-11-16 15:33:00 +00:00
context->current_event = g_slist_prepend (context->current_event, event);
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
_clutter_process_event_details (stage, context, event);
actor: Move event chain emission into ClutterActor By moving the function that builds the event emission chain we can avoid a bunch of checks and function calls.
2012-06-24 08:58:12 +00:00
events: Make _clutter_process_event() reentrant The _clutter_process_event() function may get called while already servicing a _clutter_process_event() invocation (eg. when generating ENTER events before emitting TOUCH_BEGIN). In these cases clutter_get_current_event() would return NULL after the inner call to _clutter_process_event() has finished, thereafter making the current event inaccessible during the remaining portion of the outer event emission. By stacking the current events in ClutterMainContext instead of simply replacing them we do not lose track of the real current event. Also update clutter_get_current_event_time() to be consistent from a reentrancy perspective. https://bugzilla.gnome.org/show_bug.cgi?id=688457
2012-11-16 15:33:00 +00:00
context->current_event = g_slist_delete_link (context->current_event, context->current_event);
Add clutter_get_current_event When getting signals from higher level toolkits, occasionally one wants access to the underlying event; say for a Button widget's "clicked" signal, to get the keyboard state. Rather than having all of the highlevel widgets emit ClutterEvent just for the more unusual use cases, add a global function to access the event state. http://bugzilla.openedhand.com/show_bug.cgi?id=1888 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-11-12 22:33:15 +00:00
}
Add base initialisation function Add a semi-private function, called clutter_base_init(), which initialises the basic Clutter functionalities (at the moment, just the GLib type system) without calling in the backend-specific code. This function is only useful for gtk-doc, to introspect the library when generating documentation for signals, properties and class hierarchy. Also, change the documentation build system to use clutter_base_init() when launching the scanner program.
2007-05-16 15:00:41 +00:00
void
clutter_base_init (void)
{
static gboolean initialised = FALSE;
if (!initialised)
{
initialised = TRUE;
Add P_() macro for translating property strings The P_() macro adds a context for the property nick and blurb. In order to make xgettext recognize it, we need to drop glib-gettexize inside the autogen.sh script and ship a modified Makefile.in.in with Clutter.
2010-06-03 11:56:17 +00:00
bindtextdomain (GETTEXT_PACKAGE, CLUTTER_LOCALEDIR);
Bug 1397 - Allow localizing the command line help Clutter has a set of command line options that are added to every application by means of clutter_init() or by obtaining the Clutter GOptionGroup and using g_option_context_parse(). Thus, every Clutter application will automatically have an --help command line switch showing the list of options and their description. At the moment, Clutter does not enable localization of the help, thus making it less than useful on non-English locales. This patch enables the machinery to create a localization file and load it when initializing Clutter, by means of the GLib macros and locale.h API we already use. Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-01-06 12:11:07 +00:00
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
Put g_type_init() under a version check GLib 2.36 will deprecate g_type_init() in favour of automatic initialization through a constructor function. We need to add the version check to avoid a compiler warning.
2012-12-15 18:44:26 +00:00
#if !GLIB_CHECK_VERSION (2, 35, 1)
Add base initialisation function Add a semi-private function, called clutter_base_init(), which initialises the basic Clutter functionalities (at the moment, just the GLib type system) without calling in the backend-specific code. This function is only useful for gtk-doc, to introspect the library when generating documentation for signals, properties and class hierarchy. Also, change the documentation build system to use clutter_base_init() when launching the scanner program.
2007-05-16 15:00:41 +00:00
/* initialise GLib type system */
g_type_init ();
Put g_type_init() under a version check GLib 2.36 will deprecate g_type_init() in favour of automatic initialization through a constructor function. We need to add the version check to avoid a compiler warning.
2012-12-15 18:44:26 +00:00
#endif
Deprecate clutter_threads_init() GLib deprecated g_thread_init(), and threading support is initialized by GObject, so Clutter already runs with threading support enabled. We can drop the clutter_threads_init() call requirement, and initialize the Big Clutter Lock™ on clutter_init(). This reduces the things that have to be done when dealing with threads with Clutter, and the things that can possibly go wrong.
2011-10-07 14:53:50 +00:00
/* initialise the Big Clutter Lock™ if necessary */
clutter_threads_init_default ();
Add base initialisation function Add a semi-private function, called clutter_base_init(), which initialises the basic Clutter functionalities (at the moment, just the GLib type system) without calling in the backend-specific code. This function is only useful for gtk-doc, to introspect the library when generating documentation for signals, properties and class hierarchy. Also, change the documentation build system to use clutter_base_init() when launching the scanner program.
2007-05-16 15:00:41 +00:00
}
}
2007-10-08 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-private.h: * clutter/clutter-main.c: Add a hash to global clutter context mapping all parented actor id's to actors. Add clutter_get_actor_by_id() call. Convert picking machinery to use above. (performance/simpler composite actor creation) * clutter/clutter-stage.c: (clutter_stage_fullscreen), (clutter_stage_unfullscreen), (clutter_stage_event): Only set the fullscreen property on stage state fullscreen event(#545) Experimental as could be painful to implement on non X backends.
2007-10-08 16:18:33 +00:00
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
static void
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
on_grab_actor_destroy (ClutterActor *actor,
ClutterInputDevice *device)
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
{
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (device == NULL)
{
ClutterMainContext *context = _clutter_context_get_default ();
2008-09-23 Tomas Frydrych <tf@linux.intel.com> * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/x11/clutter-backend-x11.c: (clutter_get_option_group_without_init): Function to obtain clutter option group without opening display (for use with foreign display and gtk_clutter_init). Bug 1033. Stripped trailing whitespace.
2008-09-23 07:03:35 +00:00
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (context->pointer_grab_actor == actor)
clutter_ungrab_pointer ();
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (context->keyboard_grab_actor == actor)
clutter_ungrab_keyboard ();
return;
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
}
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
switch (device->device_type)
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
{
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
case CLUTTER_POINTER_DEVICE:
device->pointer_grab_actor = NULL;
break;
case CLUTTER_KEYBOARD_DEVICE:
device->keyboard_grab_actor = NULL;
break;
default:
g_assert_not_reached ();
2008-06-23 Matthew Allum <mallum@openedhand.com> * clutter/clutter-actor.c: * clutter/clutter-actor.h: * clutter/clutter-event.c: * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/eglx/clutter-stage-egl.c: * clutter/fruity/clutter-backend-fruity.c: * clutter/fruity/clutter-backend-fruity.h: * clutter/fruity/clutter-fruity.c: * clutter/glx/clutter-stage-glx.c: * clutter/x11/clutter-backend-x11.c: * clutter/x11/clutter-backend-x11.h: * clutter/x11/clutter-event-x11.c: * clutter/x11/clutter-stage-x11.h: * clutter/x11/clutter-x11.h: * configure.ac: * tests/Makefile.am: * tests/test-devices.c: Merge of 'xinput' branch giving initial basic support of multiple input devices.
2008-06-23 09:55:42 +00:00
}
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
}
/**
* clutter_grab_pointer:
* @actor: a #ClutterActor
*
* Grabs pointer events, after the grab is done all pointer related events
* (press, motion, release, enter, leave and scroll) are delivered to this
[docs] Note that grabs are evil Grabs are an entirely evil way to override the whole event delivery machinery that Clutter has in place. A pointer grab can be effectively replaced by a much more reliable ::captured-event signal handler, for instance. Sometimes, grabs are a necessary evil -- and that is why Clutter exposes them in the API; that should not fool anyone into thinking that they should be used unless strictly necessary.
2009-03-03 22:51:17 +00:00
* actor directly without passing through both capture and bubble phases of
* the event delivery chain. The source set in the event will be the actor
* that would have received the event if the pointer grab was not in effect.
*
* <note><para>Grabs completely override the entire event delivery chain
* done by Clutter. Pointer grabs should only be used as a last resource;
* using the #ClutterActor::captured-event signal should always be the
* preferred way to intercept event delivery to reactive actors.</para></note>
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
*
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
* This function should rarely be used.
*
* If a grab is required, you are strongly encouraged to use a specific
* input device by calling clutter_input_device_grab().
2008-06-27 Emmanuele Bassi <ebassi@openedhand.com> * clutter/clutter-event.h: * clutter/clutter-main.c: * clutter/x11/clutter-backend-x11.c: Add further documentation, and increase the coverage to 94%.
2008-06-27 21:13:19 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
*/
void
clutter_grab_pointer (ClutterActor *actor)
{
ClutterMainContext *context;
g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor));
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
if (context->pointer_grab_actor == actor)
return;
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (context->pointer_grab_actor != NULL)
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
{
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
g_signal_handlers_disconnect_by_func (context->pointer_grab_actor,
G_CALLBACK (on_grab_actor_destroy),
NULL);
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
context->pointer_grab_actor = NULL;
}
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (actor != NULL)
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
{
context->pointer_grab_actor = actor;
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
g_signal_connect (context->pointer_grab_actor, "destroy",
G_CALLBACK (on_grab_actor_destroy),
NULL);
}
}
/**
* clutter_input_device_grab:
* @device: a #ClutterInputDevice
* @actor: a #ClutterActor
*
* Acquires a grab on @actor for the given @device.
*
* Any event coming from @device will be delivered to @actor, bypassing
* the usual event delivery mechanism, until the grab is released by
* calling clutter_input_device_ungrab().
*
* The grab is client-side: even if the windowing system used by the Clutter
* backend has the concept of "device grabs", Clutter will not use them.
*
* Only #ClutterInputDevice of types %CLUTTER_POINTER_DEVICE and
* %CLUTTER_KEYBOARD_DEVICE can hold a grab.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
*/
void
clutter_input_device_grab (ClutterInputDevice *device,
ClutterActor *actor)
{
ClutterActor **grab_actor;
g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
g_return_if_fail (CLUTTER_IS_ACTOR (actor));
switch (device->device_type)
{
case CLUTTER_POINTER_DEVICE:
grab_actor = &(device->pointer_grab_actor);
break;
case CLUTTER_KEYBOARD_DEVICE:
grab_actor = &(device->keyboard_grab_actor);
break;
default:
g_critical ("Only pointer and keyboard devices can grab an actor");
return;
}
if (*grab_actor != NULL)
{
g_signal_handlers_disconnect_by_func (*grab_actor,
G_CALLBACK (on_grab_actor_destroy),
device);
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
}
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
*grab_actor = actor;
g_signal_connect (*grab_actor,
"destroy",
G_CALLBACK (on_grab_actor_destroy),
device);
}
/**
* clutter_input_device_ungrab:
* @device: a #ClutterInputDevice
*
* Releases the grab on the @device, if one is in place.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
*/
void
clutter_input_device_ungrab (ClutterInputDevice *device)
{
ClutterActor **grab_actor;
g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
switch (device->device_type)
{
case CLUTTER_POINTER_DEVICE:
grab_actor = &(device->pointer_grab_actor);
break;
case CLUTTER_KEYBOARD_DEVICE:
grab_actor = &(device->keyboard_grab_actor);
break;
default:
return;
}
if (*grab_actor == NULL)
return;
g_signal_handlers_disconnect_by_func (*grab_actor,
G_CALLBACK (on_grab_actor_destroy),
device);
*grab_actor = NULL;
}
/**
* clutter_input_device_get_grabbed_actor:
* @device: a #ClutterInputDevice
*
* Retrieves a pointer to the #ClutterActor currently grabbing all
* the events coming from @device.
*
* Return value: (transfer none): a #ClutterActor, or %NULL
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
*/
ClutterActor *
clutter_input_device_get_grabbed_actor (ClutterInputDevice *device)
{
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL);
switch (device->device_type)
{
case CLUTTER_POINTER_DEVICE:
return device->pointer_grab_actor;
case CLUTTER_KEYBOARD_DEVICE:
return device->keyboard_grab_actor;
default:
g_critical ("Only pointer and keyboard devices can grab an actor");
}
return NULL;
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
}
/**
* clutter_ungrab_pointer:
*
* Removes an existing grab of the pointer.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
*/
void
clutter_ungrab_pointer (void)
{
clutter_grab_pointer (NULL);
}
/**
* clutter_get_pointer_grab:
*
* Queries the current pointer grab of clutter.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer none): the actor currently holding the pointer grab, or NULL if there is no grab.
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
*/
ClutterActor *
clutter_get_pointer_grab (void)
{
ClutterMainContext *context;
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
* clutter/clutter-main.[ch]: added clutter_grab_pointer, clutter_ungrab_pointer and clutter_get_pointer_grab, in clutter_do_event deliver pointer related events only to the actor with the pointer grab if a grab exists. * clutter/clutter-private.h: added pointer_grab_actor to context. * tests/Makefile.am: * tests/test-grab.c: added test for testing the pointer grab.
2007-11-15 17:08:48 +00:00
return context->pointer_grab_actor;
}
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
/**
* clutter_grab_keyboard:
* @actor: a #ClutterActor
*
[docs] Note that grabs are evil Grabs are an entirely evil way to override the whole event delivery machinery that Clutter has in place. A pointer grab can be effectively replaced by a much more reliable ::captured-event signal handler, for instance. Sometimes, grabs are a necessary evil -- and that is why Clutter exposes them in the API; that should not fool anyone into thinking that they should be used unless strictly necessary.
2009-03-03 22:51:17 +00:00
* Grabs keyboard events, after the grab is done keyboard
* events (#ClutterActor::key-press-event and #ClutterActor::key-release-event)
* are delivered to this actor directly. The source set in the event will be
* the actor that would have received the event if the keyboard grab was not
* in effect.
*
* Like pointer grabs, keyboard grabs should only be used as a last
* resource.
*
* See also clutter_stage_set_key_focus() and clutter_actor_grab_key_focus()
* to perform a "soft" key grab and assign key focus to a specific actor.
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
*/
void
clutter_grab_keyboard (ClutterActor *actor)
{
ClutterMainContext *context;
g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor));
2008-02-20 Tomas Frydrych <tf@openedhand.com> * clutter/x11/clutter-x11.h: * clutter/x11/clutter-backend-x11.c: (clutter_x11_set_display): Function to set X display connection prior to calling clutter_init(); stripped loads of trailing space.
2008-02-20 14:16:54 +00:00
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
if (context->keyboard_grab_actor == actor)
return;
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (context->keyboard_grab_actor != NULL)
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
{
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
g_signal_handlers_disconnect_by_func (context->keyboard_grab_actor,
G_CALLBACK (on_grab_actor_destroy),
NULL);
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
context->keyboard_grab_actor = NULL;
}
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
if (actor != NULL)
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
{
context->keyboard_grab_actor = actor;
Clean up grab implementation The grab API is a relic of Clutter 0.6, and hasn't been through proper vetting in a *long* time — mostly due to the fact that we don't really like grabs, and point to the ::captured-event as a way to implement "soft grabs" in toolkits and applications. The implementation of full and device grabs uses weak references on actors instead of using the ::destroy signal, which is meant exactly for the case of releasing pointers to actors when they are disposed. The API naming scheme is also fairly broken, especially for device-related grabs. Finally, keyboard device grabs are just not implemented. We can, in one go, clean up this mess and deprecate a bunch of badly named API by introducing generic device grab/ungrab methods on ClutterInputDevice, and re-implement the current API on top of them.
2011-10-10 15:45:20 +00:00
g_signal_connect (context->keyboard_grab_actor, "destroy",
G_CALLBACK (on_grab_actor_destroy),
NULL);
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
}
}
/**
* clutter_ungrab_keyboard:
*
* Removes an existing grab of the keyboard.
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
*/
void
clutter_ungrab_keyboard (void)
{
clutter_grab_keyboard (NULL);
}
/**
* clutter_get_keyboard_grab:
*
* Queries the current keyboard grab of clutter.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer none): the actor currently holding the keyboard grab, or NULL if there is no grab.
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
*/
ClutterActor *
clutter_get_keyboard_grab (void)
{
ClutterMainContext *context;
Hide clutter_context_get_default() The clutter_context_get_default() function is private, but shared across Clutter. For this reason, it should be prefixed by '_' so that the symbol is hidden from the shared object.
2009-06-17 16:59:54 +00:00
context = _clutter_context_get_default ();
* clutter/clutter-main.[ch]: added clutter_grab_keyboard, clutter_ungrab_keyboard and clutter_get_keyboard_grab, in clutter_do_event deliver keyboard related events only to the actor with the keyboard grab if a grab exists. * clutter/clutter-private.h: added keyboard_grab_actor to context. * tests/test-grab.c: added testing for testing the keyboard grab.
2007-11-15 18:00:24 +00:00
return context->keyboard_grab_actor;
}
2007-11-19 Emmanuele Bassi <ebassi@openedhand.com> * clutter.symbols: Update * clutter/clutter-actor.h: Rename the angle argument for set_rotationx() to avoid gtk-doc complaining * clutter/clutter-main.h: * clutter/clutter-main.c: (clutter_set_motion_events_enabled): Rename for consistency (clutter_get_motion_events_frequency), (clutter_set_motion_events_frequency): Add accessors for the default motion events deliver frequency. (clutter_do_event): Throttle down motion events delivery using the motion events frequency setting, to avoid excessive redraws. (#608) (clutter_context_get_default): Enable per-actor motion events, at least for now. * tests/test-events.c (red_button_cb): * tests/test-grab.c (green_press_cb): Update.
2007-11-19 16:30:56 +00:00
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1215 - Move the Pango renderer to the public API * clutter/pango/*: Rename PangoClutter -> CoglPango. * clutter/Makefile.am: * clutter/clutter-backend.c: * clutter/clutter-entry.c: * clutter/clutter-label.c: * clutter/clutter-main.[ch]: * clutter/clutter-private.h: Update the users of the Pango renderer API. * README: Update release notes.
2008-10-30 17:11:29 +00:00
/**
* clutter_get_font_map:
*
* Retrieves the #PangoFontMap instance used by Clutter.
* You can use the global font map object with the COGL
* Pango API.
*
Add gobject-introspection annotations Add annotations such as (transfer-none) (out) (element-type ClutterActor), and so forth to the doc comments as appropriate. The annotations added here are a combination of the annotations previously in gir-repository for Clutter and annotations found in a review of all return values with that were being parsed with a transfer of "full". http://bugzilla.openedhand.com/show_bug.cgi?id=1452 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2009-02-17 00:25:20 +00:00
* Return value: (transfer none): the #PangoFontMap instance. The returned
* value is owned by Clutter and it should never be unreferenced.
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1215 - Move the Pango renderer to the public API * clutter/pango/*: Rename PangoClutter -> CoglPango. * clutter/Makefile.am: * clutter/clutter-backend.c: * clutter/clutter-entry.c: * clutter/clutter-label.c: * clutter/clutter-main.[ch]: * clutter/clutter-private.h: Update the users of the Pango renderer API. * README: Update release notes.
2008-10-30 17:11:29 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1215 - Move the Pango renderer to the public API * clutter/pango/*: Rename PangoClutter -> CoglPango. * clutter/Makefile.am: * clutter/clutter-backend.c: * clutter/clutter-entry.c: * clutter/clutter-label.c: * clutter/clutter-main.[ch]: * clutter/clutter-private.h: Update the users of the Pango renderer API. * README: Update release notes.
2008-10-30 17:11:29 +00:00
*/
PangoFontMap *
clutter_get_font_map (void)
{
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
return PANGO_FONT_MAP (clutter_context_get_pango_fontmap ());
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> Bug 1215 - Move the Pango renderer to the public API * clutter/pango/*: Rename PangoClutter -> CoglPango. * clutter/Makefile.am: * clutter/clutter-backend.c: * clutter/clutter-entry.c: * clutter/clutter-label.c: * clutter/clutter-main.[ch]: * clutter/clutter-private.h: Update the users of the Pango renderer API. * README: Update release notes.
2008-10-30 17:11:29 +00:00
}
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
typedef struct _ClutterRepaintFunction
{
guint id;
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
ClutterRepaintFlags flags;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
GSourceFunc func;
gpointer data;
GDestroyNotify notify;
} ClutterRepaintFunction;
/**
* clutter_threads_remove_repaint_func:
* @handle_id: an unsigned integer greater than zero
*
* Removes the repaint function with @handle_id as its id
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*/
void
clutter_threads_remove_repaint_func (guint handle_id)
{
ClutterRepaintFunction *repaint_func;
ClutterMainContext *context;
GList *l;
g_return_if_fail (handle_id > 0);
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
_clutter_context_lock ();
context = clutter_context_get_default_unlocked ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
l = context->repaint_funcs;
while (l != NULL)
{
repaint_func = l->data;
if (repaint_func->id == handle_id)
{
context->repaint_funcs =
g_list_remove_link (context->repaint_funcs, l);
g_list_free (l);
if (repaint_func->notify)
repaint_func->notify (repaint_func->data);
g_slice_free (ClutterRepaintFunction, repaint_func);
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
break;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
}
l = l->next;
}
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
_clutter_context_unlock ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
}
/**
* clutter_threads_add_repaint_func:
* @func: the function to be called within the paint cycle
* @data: data to be passed to the function, or %NULL
* @notify: function to be called when removing the repaint
* function, or %NULL
*
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* Adds a function to be called whenever Clutter is processing a new
* frame.
*
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
* If the function returns %FALSE it is automatically removed from the
* list of repaint functions and will not be called again.
*
* This function is guaranteed to be called from within the same thread
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* that called clutter_main(), and while the Clutter lock is being held;
* the function will be called within the main loop, so it is imperative
* that it does not block, otherwise the frame time budget may be lost.
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*
* A repaint function is useful to ensure that an update of the scenegraph
* is performed before the scenegraph is repainted; for instance, uploading
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* a frame from a video into a #ClutterTexture. By default, a repaint
* function added using this function will be invoked prior to the frame
* being processed.
*
* Adding a repaint function does not automatically ensure that a new
* frame will be queued.
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*
* When the repaint function is removed (either because it returned %FALSE
* or because clutter_threads_remove_repaint_func() has been called) the
* @notify function will be called, if any is set.
*
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* See also: clutter_threads_add_repaint_func_full()
*
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
* Return value: the ID (greater than 0) of the repaint function. You
* can use the returned integer to remove the repaint function by
* calling clutter_threads_remove_repaint_func().
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*/
guint
clutter_threads_add_repaint_func (GSourceFunc func,
gpointer data,
GDestroyNotify notify)
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
{
return clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_PRE_PAINT,
func,
data, notify);
}
/**
* clutter_threads_add_repaint_func_full:
* @flags: flags for the repaint function
* @func: the function to be called within the paint cycle
* @data: data to be passed to the function, or %NULL
* @notify: function to be called when removing the repaint
* function, or %NULL
*
* Adds a function to be called whenever Clutter is processing a new
* frame.
*
* If the function returns %FALSE it is automatically removed from the
* list of repaint functions and will not be called again.
*
* This function is guaranteed to be called from within the same thread
* that called clutter_main(), and while the Clutter lock is being held;
* the function will be called within the main loop, so it is imperative
* that it does not block, otherwise the frame time budget may be lost.
*
* A repaint function is useful to ensure that an update of the scenegraph
* is performed before the scenegraph is repainted; for instance, uploading
* a frame from a video into a #ClutterTexture. The @flags passed to this
* function will determine the section of the frame processing that will
* result in @func being called.
*
* Adding a repaint function does not automatically ensure that a new
* frame will be queued.
*
* When the repaint function is removed (either because it returned %FALSE
* or because clutter_threads_remove_repaint_func() has been called) the
* @notify function will be called, if any is set.
*
* Return value: the ID (greater than 0) of the repaint function. You
* can use the returned integer to remove the repaint function by
* calling clutter_threads_remove_repaint_func().
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
*/
guint
clutter_threads_add_repaint_func_full (ClutterRepaintFlags flags,
GSourceFunc func,
gpointer data,
GDestroyNotify notify)
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
{
ClutterMainContext *context;
ClutterRepaintFunction *repaint_func;
g_return_val_if_fail (func != NULL, 0);
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
_clutter_context_lock ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
context = clutter_context_get_default_unlocked ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
repaint_func = g_slice_new (ClutterRepaintFunction);
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
repaint_func->id = context->last_repaint_id++;
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
/* mask out QUEUE_REDRAW_ON_ADD, since we're going to consume it */
repaint_func->flags = flags & ~CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
repaint_func->func = func;
repaint_func->data = data;
repaint_func->notify = notify;
context->repaint_funcs = g_list_prepend (context->repaint_funcs,
repaint_func);
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
_clutter_context_unlock ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
if ((flags & CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD) != 0)
{
ClutterMasterClock *master_clock = _clutter_master_clock_get_default ();
_clutter_master_clock_ensure_next_iteration (master_clock);
}
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
return repaint_func->id;
}
/*
* _clutter_run_repaint_functions:
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* @flags: only run the repaint functions matching the passed flags
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*
* Executes the repaint functions added using the
* clutter_threads_add_repaint_func() function.
*
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
* Must be called with the Clutter thread lock held.
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
*/
void
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
_clutter_run_repaint_functions (ClutterRepaintFlags flags)
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
{
Clean up usage of CLUTTER_CONTEXT and remove the macro Only allow access to the ClutterMainContext through the private _clutter_context_get_default() function, so we can easily grep it and remove the unwanted usage of the global context.
2011-02-18 15:47:35 +00:00
ClutterMainContext *context = _clutter_context_get_default ();
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
ClutterRepaintFunction *repaint_func;
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
GList *invoke_list, *reinvoke_list, *l;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
if (context->repaint_funcs == NULL)
return;
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
/* steal the list */
invoke_list = context->repaint_funcs;
context->repaint_funcs = NULL;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
reinvoke_list = NULL;
/* consume the whole list while we execute the functions */
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
while (invoke_list != NULL)
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
{
gboolean res = FALSE;
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
repaint_func = invoke_list->data;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
l = invoke_list;
invoke_list = g_list_remove_link (invoke_list, invoke_list);
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
g_list_free (l);
Improve repaint functions It is sometimes useful to be able to have better control on when a repaint function is called. Currently, all repaint functions are called prior to the stages update phase of the frame processing. We can introduce flags to represent the point in the frame update process in which we wish Clutter called the repaint function. As a bonus, we can also add a flag that causes adding a repaint function to spin the master clock.
2012-03-06 12:09:00 +00:00
if ((repaint_func->flags & flags) != 0)
res = repaint_func->func (repaint_func->data);
else
res = TRUE;
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
if (res)
reinvoke_list = g_list_prepend (reinvoke_list, repaint_func);
else
{
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
if (repaint_func->notify != NULL)
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
repaint_func->notify (repaint_func->data);
g_slice_free (ClutterRepaintFunction, repaint_func);
}
}
Lock the main context when modifying the repaint functions list The repaint functions list can (and should) be manipulated from different threads, but it currently doesn't prevent multiple threads from accessing it concurrently. We should have a simple lock and take it when adding and removing elements from the list; the invocation is still performed under the Big Clutter Lock™, so it doesn't require special handling.
2011-09-01 16:12:46 +00:00
if (context->repaint_funcs != NULL)
{
context->repaint_funcs = g_list_concat (context->repaint_funcs,
g_list_reverse (reinvoke_list));
}
else
context->repaint_funcs = g_list_reverse (reinvoke_list);
Add repaint functions Sometimes it is necessary for third party code to have a function called during the redraw process, so that you can update the scenegraph before it is painted.
2009-03-30 12:49:03 +00:00
}
Add run-time version checks Just like CLUTTER_CHECK_VERSION does version checking at compile time, we need a way to verify the version of the library that we are linking against. This is mostly needed for language bindings and for run-time loadable modules -- when we'll get those.
2009-10-30 11:02:35 +00:00
/**
* clutter_check_version:
* @major: major version, like 1 in 1.2.3
* @minor: minor version, like 2 in 1.2.3
* @micro: micro version, like 3 in 1.2.3
*
* Run-time version check, to check the version the Clutter library
* that an application is currently linked against
*
* This is the run-time equivalent of the compile-time %CLUTTER_CHECK_VERSION
* pre-processor macro
*
* Return value: %TRUE if the version of the Clutter library is
* greater than (@major, @minor, @micro), and %FALSE otherwise
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Add run-time version checks Just like CLUTTER_CHECK_VERSION does version checking at compile time, we need a way to verify the version of the library that we are linking against. This is mostly needed for language bindings and for run-time loadable modules -- when we'll get those.
2009-10-30 11:02:35 +00:00
*/
gboolean
clutter_check_version (guint major,
guint minor,
guint micro)
{
return (clutter_major_version > major ||
(clutter_major_version == major &&
clutter_minor_version > minor) ||
(clutter_major_version == major &&
clutter_minor_version == minor &&
clutter_micro_version >= micro));
}
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
Remove clutter_set_default_text_direction() Setting the default text direction programmatically is wrong: it is a value dependent on the locale or by the environment.
2009-12-07 19:00:55 +00:00
/**
* clutter_get_default_text_direction:
*
* Retrieves the default direction for the text. The text direction is
docs: Fixes for cross-references
2011-09-12 12:12:14 +00:00
* determined by the locale and/or by the <varname>CLUTTER_TEXT_DIRECTION</varname>
* environment variable.
Remove clutter_set_default_text_direction() Setting the default text direction programmatically is wrong: it is a value dependent on the locale or by the environment.
2009-12-07 19:00:55 +00:00
*
* The default text direction can be overridden on a per-actor basis by using
docs: Fixes for cross-references
2011-09-12 12:12:14 +00:00
* clutter_actor_set_text_direction().
Remove clutter_set_default_text_direction() Setting the default text direction programmatically is wrong: it is a value dependent on the locale or by the environment.
2009-12-07 19:00:55 +00:00
*
* Return value: the default text direction
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Remove clutter_set_default_text_direction() Setting the default text direction programmatically is wrong: it is a value dependent on the locale or by the environment.
2009-12-07 19:00:55 +00:00
*/
Use the newly added ClutterTextDirection enumeration Instead of using PangoDirection directly we should use the ClutterTextDirection enumeration. We also need a pair of accessor functions for setting and getting the default text direction.
2009-11-06 16:50:53 +00:00
ClutterTextDirection
clutter_get_default_text_direction (void)
{
return clutter_text_direction;
}
Avoid direct access to the main context events queue The GQueue that stores the global events queue is handled all over the place: • the structure is created in _clutter_backend_init_events(); • the queue is handled in clutter-event.c, clutter-stage.c and clutter-backend.c; • ClutterStage::dispose cleans up the events associated with the stage being destroyed; • the queue is destroyed in ClutterBackend::dispose. Since we need to have access to it in different places we cannot put it inside ClutterBackendPrivate, hence it should stay in ClutterMainContext; but we should still manage it from just one place - preferably by the ClutterEvent API only.
2011-02-09 12:38:10 +00:00
/*< private >
* clutter_clear_events_queue:
*
* Clears the events queue stored in the main context.
*/
void
_clutter_clear_events_queue (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
if (context->events_queue != NULL)
{
g_queue_foreach (context->events_queue,
(GFunc) clutter_event_free,
NULL);
g_queue_free (context->events_queue);
context->events_queue = NULL;
}
}
Wrap id-pool access The ClutterIdPool is held by the ClutterMainContext; we should hide its direct usage into sensible private API.
2011-02-18 15:46:13 +00:00
guint32
_clutter_context_acquire_id (gpointer key)
{
ClutterMainContext *context = _clutter_context_get_default ();
Privatize all ClutterIdPool functions The clutter-id-pool.h header is private and not installed; yet, all the clutter_id_pool_* symbols are public. Let's correct this oversight we've been stringing along since forever.
2011-02-18 15:53:27 +00:00
return _clutter_id_pool_add (context->id_pool, key);
Wrap id-pool access The ClutterIdPool is held by the ClutterMainContext; we should hide its direct usage into sensible private API.
2011-02-18 15:46:13 +00:00
}
void
_clutter_context_release_id (guint32 id_)
{
ClutterMainContext *context = _clutter_context_get_default ();
Do not use return with void functions https://bugzilla.gnome.org/show_bug.cgi?id=654718
2011-07-18 12:51:17 +00:00
_clutter_id_pool_remove (context->id_pool, id_);
Wrap id-pool access The ClutterIdPool is held by the ClutterMainContext; we should hide its direct usage into sensible private API.
2011-02-18 15:46:13 +00:00
}
Avoid direct access to the main context events queue The GQueue that stores the global events queue is handled all over the place: • the structure is created in _clutter_backend_init_events(); • the queue is handled in clutter-event.c, clutter-stage.c and clutter-backend.c; • ClutterStage::dispose cleans up the events associated with the stage being destroyed; • the queue is destroyed in ClutterBackend::dispose. Since we need to have access to it in different places we cannot put it inside ClutterBackendPrivate, hence it should stay in ClutterMainContext; but we should still manage it from just one place - preferably by the ClutterEvent API only.
2011-02-09 12:38:10 +00:00
void
_clutter_clear_events_queue_for_stage (ClutterStage *stage)
{
ClutterMainContext *context = _clutter_context_get_default ();
GList *l, *next;
if (context->events_queue == NULL)
return;
/* Remove any pending events for this stage from the event queue */
for (l = context->events_queue->head; l; l = next)
{
ClutterEvent *event = l->data;
next = l->next;
if (event->any.stage == stage)
{
g_queue_delete_link (context->events_queue, l);
clutter_event_free (event);
}
}
}
Continue hiding the ClutterMainContext We should strive to make the main context as transparent as possible, and hide accessing its data through private functions.
2011-02-18 12:07:07 +00:00
ClutterPickMode
_clutter_context_get_pick_mode (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
return context->pick_mode;
}
Wrap shader stack into private functions The shader stack held by ClutterMainContext should only be accessed using functions, and not directly. Since it's a stack, we can use stack-like operations: push, pop and peek.
2011-02-18 15:44:17 +00:00
void
_clutter_context_push_shader_stack (ClutterActor *actor)
{
ClutterMainContext *context = _clutter_context_get_default ();
context->shaders = g_slist_prepend (context->shaders, actor);
}
ClutterActor *
_clutter_context_peek_shader_stack (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
if (context->shaders != NULL)
return context->shaders->data;
return NULL;
}
ClutterActor *
_clutter_context_pop_shader_stack (ClutterActor *actor)
{
ClutterMainContext *context = _clutter_context_get_default ();
context->shaders = g_slist_remove (context->shaders, actor);
return _clutter_context_peek_shader_stack ();
}
stage: Maintain the motion event delivery invariants It is possible, by calling clutter_set_motion_events_enabled() prior to the creation of any stage, to control the per-actor motion event delivery flag on each newly created stage. Since we deprecated the global accessor functions in favour of the per-Stage ones, we need to remove the call to clutter_get_motion_events_enabled() inside the ClutterStage instance initialization, and replace it with an internal function. This code will go away when we can finally break API and remove the deprecated functions.
2011-06-20 12:53:09 +00:00
gboolean
_clutter_context_get_motion_events_enabled (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
return context->motion_events_per_actor;
}
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
/**
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
* clutter_check_windowing_backend:
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
* @backend_type: the name of the backend to check
*
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
* Checks the run-time name of the Clutter windowing system backend, using
* the symbolic macros like %CLUTTER_WINDOWING_WIN32 or
* %CLUTTER_WINDOWING_X11.
*
* This function should be used in conjuction with the compile-time macros
* inside applications and libraries that are using the platform-specific
* windowing system API, to ensure that they are running on the correct
* windowing system; for instance:
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
*
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
* |[
* &num;ifdef CLUTTER_WINDOWING_X11
* if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
* {
* /&ast; it is safe to use the clutter_x11_* API &ast;/
* }
* else
* &num;endif
* &num;ifdef CLUTTER_WINDOWING_WIN32
* if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32))
* {
* /&ast; it is safe to use the clutter_win32_* API &ast;/
* }
* else
* &num;endif
* g_error ("Unknown Clutter backend.");
* ]|
*
* Return value: %TRUE if the current Clutter windowing system backend is
* the one checked, and %FALSE otherwise
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
*
2.0: Remove all Since: annotations We're starting from scratch.
2012-08-27 08:48:36 +00:00
*
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
*/
gboolean
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
clutter_check_windowing_backend (const char *backend_type)
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
{
ClutterMainContext *context = _clutter_context_get_default ();
g_return_val_if_fail (backend_type != NULL, FALSE);
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
backend_type = g_intern_string (backend_type);
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
#ifdef CLUTTER_WINDOWING_OSX
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend_type == I_(CLUTTER_WINDOWING_OSX) &&
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
CLUTTER_IS_BACKEND_OSX (context->backend))
return TRUE;
else
#endif
#ifdef CLUTTER_WINDOWING_WIN32
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend_type == I_(CLUTTER_WINDOWING_WIN32) &&
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
CLUTTER_IS_BACKEND_WIN32 (context->backend))
return TRUE;
else
#endif
#ifdef CLUTTER_WINDOWING_WAYLAND
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend_type == I_(CLUTTER_WINDOWING_WAYLAND) &&
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
CLUTTER_IS_BACKEND_WAYLAND (context->backend))
return TRUE;
else
#endif
#ifdef CLUTTER_WINDOWING_EGL
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
if (backend_type == I_(CLUTTER_WINDOWING_EGL) &&
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
CLUTTER_IS_BACKEND_EGL_NATIVE (context->backend))
return TRUE;
else
#endif
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
#ifdef CLUTTER_WINDOWING_GDK
if (backend_type == I_(CLUTTER_WINDOWING_GDK) &&
CLUTTER_IS_BACKEND_GDK (context->backend))
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
return TRUE;
else
#endif
Clean up the windowing system defines Instead of defining new symbols for the windowing systems enabled at configure time, we can reuse the same symbols for both the compile time and run time checks, e.g.: #ifdef CLUTTER_WINDOWING_X11 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) /* use the clutter_x11_* API */ else #endif #ifdef CLUTTER_WINDOWING_WIN32 if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32)) /* use the clutter_win32_* API */ #endif This scheme allows us to ensure that the input system namespace is free for us to use and select at run time in later versions of Clutter.
2011-10-17 15:03:19 +00:00
#ifdef CLUTTER_WINDOWING_X11
if (backend_type == I_(CLUTTER_WINDOWING_X11) &&
CLUTTER_IS_BACKEND_X11 (context->backend))
Allow checking the backend type at run-time Portable code should be allowed to check type backend currently being used, so that it can use platform-specific API (not just Clutter's). We don't want to go down the GDK route, with public types for ClutterBackend and ClutterStageWindow implementations, and use the type system, e.g.: #ifdef GDK_WINDOWING_X11 if (GDK_IS_WINDOW_X11 (window)) use_x11_api (window); else #endif #ifdef GDK_WINDOWING_WIN32 if (GDK_IS_WINDOW_WIN32 (window)) use_win32_api (window); else #endif g_critical ("Unsupported backend"); This system would make us expose the backend system, and we want to still reserve us the option to change the backend system to increase its granularity — e.g. choosing different input event systems regardless of the windowing system. This commit adds a simple function that checks the backend type against a symbolic constant — the same constant string that can be used to select the backend at run-time through the CLUTTER_BACKEND environment variable.
2011-09-26 12:14:26 +00:00
return TRUE;
else
#endif
return FALSE;
}
main: Add a sync-to-vblank global flag It replaces the per-backend CLUTTER_VBLANK environment variable.
2011-11-04 16:35:38 +00:00
gboolean
_clutter_get_sync_to_vblank (void)
{
return clutter_sync_to_vblank;
}
Rework debug output Make it consistent across the various build options (with or without profiling enabled), and add a timestamp using the monotonic clock to every debug message.
2011-11-15 17:39:49 +00:00
void
_clutter_debug_messagev (const char *format,
va_list var_args)
{
debug: Group debug messages by timestamps Instead of showing the full timestamp for debugging messages that happen within a second, showing the delta from the previous full timestamp can be more useful when debugging; this allows immediately seeing the time difference, instead of doing the math in our heads.
2012-06-07 10:51:33 +00:00
static gint64 last_debug_stamp;
Rework debug output Make it consistent across the various build options (with or without profiling enabled), and add a timestamp using the monotonic clock to every debug message.
2011-11-15 17:39:49 +00:00
gchar *stamp, *fmt;
debug: Group debug messages by timestamps Instead of showing the full timestamp for debugging messages that happen within a second, showing the delta from the previous full timestamp can be more useful when debugging; this allows immediately seeing the time difference, instead of doing the math in our heads.
2012-06-07 10:51:33 +00:00
gint64 cur_time, debug_stamp;
cur_time = g_get_monotonic_time ();
/* if the last debug message happened less than a second ago, just
* show the increments instead of the full timestamp
*/
if (last_debug_stamp == 0 ||
cur_time - last_debug_stamp >= G_USEC_PER_SEC)
{
debug_stamp = cur_time;
last_debug_stamp = debug_stamp;
stamp = g_strdup_printf ("[%16" G_GINT64_FORMAT "]", debug_stamp);
}
else
{
debug_stamp = cur_time - last_debug_stamp;
stamp = g_strdup_printf ("[%+16" G_GINT64_FORMAT "]", debug_stamp);
}
Rework debug output Make it consistent across the various build options (with or without profiling enabled), and add a timestamp using the monotonic clock to every debug message.
2011-11-15 17:39:49 +00:00
fmt = g_strconcat (stamp, ":", format, NULL);
g_free (stamp);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, fmt, var_args);
debug: Clean up profile/debug symbols Since we have a _clutter_debug_message() function compiled in unconditionally we have no further need for the equivalent conditional version defined in clutter-profile.[ch]: we can simply do the work in one function.
2011-11-18 17:44:42 +00:00
#ifdef CLUTTER_ENABLE_PROFILE
if (_clutter_uprof_context != NULL)
Fix building with profiling enabled There was an #ifdef'd section of code for profiling that was using the wrong variable name so it would not build. Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-11-28 16:27:57 +00:00
uprof_context_vtrace_message (_clutter_uprof_context, format, var_args);
debug: Clean up profile/debug symbols Since we have a _clutter_debug_message() function compiled in unconditionally we have no further need for the equivalent conditional version defined in clutter-profile.[ch]: we can simply do the work in one function.
2011-11-18 17:44:42 +00:00
#endif
Rework debug output Make it consistent across the various build options (with or without profiling enabled), and add a timestamp using the monotonic clock to every debug message.
2011-11-15 17:39:49 +00:00
g_free (fmt);
}
void
_clutter_debug_message (const char *format, ...)
{
va_list args;
va_start (args, format);
_clutter_debug_messagev (format, args);
va_end (args);
}
Add diagnostic mode GLib has a "diagnostic mode" switch that can be checked to enable debug messages on deprecated properties and signals, as these are purely run-time constructs, and as such cannot be caught by compiler warnings. The diagnostic mode is toggled by a simple environment variable, and can be used to ease porting of application code. We can use something similar to mark deprecated virtual functions and other run-time constructs; to avoid collisions, we should use our own environment variable, CLUTTER_ENABLE_DIAGNOSTIC.
2011-12-20 15:17:54 +00:00
gboolean
_clutter_diagnostic_enabled (void)
{
static const char *clutter_enable_diagnostic = NULL;
if (G_UNLIKELY (clutter_enable_diagnostic == NULL))
{
clutter_enable_diagnostic = g_getenv ("CLUTTER_ENABLE_DIAGNOSTIC");
if (clutter_enable_diagnostic == NULL)
clutter_enable_diagnostic = "0";
}
return *clutter_enable_diagnostic != '0';
}
void
_clutter_diagnostic_message (const char *format, ...)
{
va_list args;
char *fmt;
fmt = g_strconcat ("[DIAGNOSTIC]: ", format, NULL);
va_start (args, format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, fmt, args);
va_end (args);
g_free (fmt);
}
Reference in New Issue Copy Permalink