isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: Move deprecated symbols to a separate header

Browse Source 
The number of deprecations in clutter-main.h makes the header harder to
parse, and more confusing. We can use a separate header under the
deprecated subdirectory to hold all the deprecated symbols.
This commit is contained in:
Emmanuele Bassi 2011-11-02 12:32:09 +00:00
parent 6e28121ff3
commit a39be454cf
3 changed files with 105 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/Makefile.am
View File

@ -242,6 +242,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-behaviour-scale.h \ $(srcdir)/deprecated/clutter-behaviour-scale.h \
$(srcdir)/deprecated/clutter-fixed.h \ $(srcdir)/deprecated/clutter-fixed.h \
$(srcdir)/deprecated/clutter-frame-source.h \ $(srcdir)/deprecated/clutter-frame-source.h \
$(srcdir)/deprecated/clutter-main-deprecated.h \
$(srcdir)/deprecated/clutter-timeout-pool.h \ $(srcdir)/deprecated/clutter-timeout-pool.h \
$(srcdir)/deprecated/clutter-score.h \ $(srcdir)/deprecated/clutter-score.h \
$(srcdir)/deprecated/clutter-shader.h \ $(srcdir)/deprecated/clutter-shader.h \

161
clutter/clutter-main.h
View File

@ -77,126 +77,69 @@ GQuark clutter_init_error_quark (void);
#define CLUTTER_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 50) #define CLUTTER_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 50)
/* Initialisation */ /* Initialisation */
void clutter_base_init (void); void clutter_base_init (void);
ClutterInitError clutter_init (int *argc, ClutterInitError clutter_init (int *argc,
char ***argv) char ***argv) G_GNUC_WARN_UNUSED_RESULT;
G_GNUC_WARN_UNUSED_RESULT; ClutterInitError clutter_init_with_args (int *argc,
ClutterInitError clutter_init_with_args (int *argc, char ***argv,
char ***argv, const char *parameter_string,
const char *parameter_string, GOptionEntry *entries,
GOptionEntry *entries, const char *translation_domain,
const char *translation_domain, GError **error) G_GNUC_WARN_UNUSED_RESULT;
GError **error)
G_GNUC_WARN_UNUSED_RESULT; GOptionGroup * clutter_get_option_group (void);
GOptionGroup * clutter_get_option_group (void); GOptionGroup * clutter_get_option_group_without_init (void);
GOptionGroup * clutter_get_option_group_without_init (void);
/* Mainloop */ /* Mainloop */
void clutter_main (void); void clutter_main (void);
void clutter_main_quit (void); void clutter_main_quit (void);
gint clutter_main_level (void); gint clutter_main_level (void);
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) void clutter_do_event (ClutterEvent *event);
CLUTTER_DEPRECATED_FOR(clutter_stage_ensure_redraw)
void clutter_redraw (ClutterStage *stage);
#endif
void clutter_do_event (ClutterEvent *event);
/* Debug utility functions */ /* Debug utility functions */
gboolean clutter_get_debug_enabled (void); gboolean clutter_get_debug_enabled (void);
gboolean clutter_get_show_fps (void); gboolean clutter_get_show_fps (void);
gulong clutter_get_timestamp (void); gulong clutter_get_timestamp (void);
gboolean clutter_get_accessibility_enabled (void); gboolean clutter_get_accessibility_enabled (void);
/* Threading functions */ /* Threading functions */
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) void clutter_threads_enter (void);
CLUTTER_DEPRECATED void clutter_threads_leave (void);
void clutter_threads_init (void); void clutter_threads_set_lock_functions (GCallback enter_fn,
#endif GCallback leave_fn);
guint clutter_threads_add_idle (GSourceFunc func,
gpointer data);
guint clutter_threads_add_idle_full (gint priority,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
guint clutter_threads_add_timeout (guint interval,
GSourceFunc func,
gpointer data);
guint clutter_threads_add_timeout_full (gint priority,
guint interval,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
guint clutter_threads_add_repaint_func (GSourceFunc func,
gpointer data,
GDestroyNotify notify);
void clutter_threads_remove_repaint_func (guint handle_id);
void clutter_threads_enter (void); void clutter_set_default_frame_rate (guint frames_per_sec);
void clutter_threads_leave (void); guint clutter_get_default_frame_rate (void);
void clutter_threads_set_lock_functions (GCallback enter_fn,
GCallback leave_fn);
guint clutter_threads_add_idle (GSourceFunc func,
gpointer data);
guint clutter_threads_add_idle_full (gint priority,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
guint clutter_threads_add_timeout (guint interval,
GSourceFunc func,
gpointer data);
guint clutter_threads_add_timeout_full (gint priority,
guint interval,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) void clutter_grab_pointer (ClutterActor *actor);
CLUTTER_DEPRECATED void clutter_ungrab_pointer (void);
guint clutter_threads_add_frame_source (guint fps, ClutterActor * clutter_get_pointer_grab (void);
GSourceFunc func, void clutter_grab_keyboard (ClutterActor *actor);
gpointer data); void clutter_ungrab_keyboard (void);
CLUTTER_DEPRECATED ClutterActor * clutter_get_keyboard_grab (void);
guint clutter_threads_add_frame_source_full (gint priority,
guint fps,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
#endif /* CLUTTER_DISABLE_DEPRECATED */
guint clutter_threads_add_repaint_func (GSourceFunc func, PangoFontMap * clutter_get_font_map (void);
gpointer data,
GDestroyNotify notify);
void clutter_threads_remove_repaint_func (guint handle_id);
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) ClutterTextDirection clutter_get_default_text_direction (void);
CLUTTER_DEPRECATED_FOR(clutter_stage_set_motion_events_enabled)
void clutter_set_motion_events_enabled (gboolean enable);
CLUTTER_DEPRECATED_FOR(clutter_stage_get_motion_events_enabled)
gboolean clutter_get_motion_events_enabled (void);
#endif /* CLUTTER_DISABLE_DEPRECATED */
void clutter_set_default_frame_rate (guint frames_per_sec);
guint clutter_get_default_frame_rate (void);
void clutter_grab_pointer (ClutterActor *actor);
void clutter_ungrab_pointer (void);
ClutterActor * clutter_get_pointer_grab (void);
void clutter_grab_keyboard (ClutterActor *actor);
void clutter_ungrab_keyboard (void);
ClutterActor * clutter_get_keyboard_grab (void);
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
CLUTTER_DEPRECATED_FOR(cogl_pango_font_map_clear_glyph_cache)
void clutter_clear_glyph_cache (void);
CLUTTER_DEPRECATED_FOR(clutter_backend_set_font_options)
void clutter_set_font_flags (ClutterFontFlags flags);
CLUTTER_DEPRECATED_FOR(clutter_backend_get_font_options)
ClutterFontFlags clutter_get_font_flags (void);
#endif /* CLUTTER_DISABLE_DEPRECATED */
#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
CLUTTER_DEPRECATED_FOR(clutter_device_manager_get_device)
ClutterInputDevice *clutter_get_input_device_for_id (gint id_);
CLUTTER_DEPRECATED_FOR(clutter_input_device_grab)
void clutter_grab_pointer_for_device (ClutterActor *actor,
gint id_);
CLUTTER_DEPRECATED_FOR(clutter_input_device_ungrab)
void clutter_ungrab_pointer_for_device (gint id_);
#endif /* CLUTTER_DISABLE_DEPRECATED */
PangoFontMap * clutter_get_font_map (void);
ClutterTextDirection clutter_get_default_text_direction (void);
G_END_DECLS G_END_DECLS

52
clutter/deprecated/clutter-main-deprecated.h Normal file
View File

@ -0,0 +1,52 @@
#ifndef __CLUTTER_MAIN_DEPRECATED_H__
#define __CLUTTER_MAIN_DEPRECATED_H__
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
CLUTTER_DEPRECATED
void clutter_threads_init (void);
CLUTTER_DEPRECATED
guint clutter_threads_add_frame_source (guint fps,
GSourceFunc func,
gpointer data);
CLUTTER_DEPRECATED
guint clutter_threads_add_frame_source_full (gint priority,
guint fps,
GSourceFunc func,
gpointer data,
GDestroyNotify notify);
CLUTTER_DEPRECATED_FOR(clutter_stage_set_motion_events_enabled)
void clutter_set_motion_events_enabled (gboolean enable);
CLUTTER_DEPRECATED_FOR(clutter_stage_get_motion_events_enabled)
gboolean clutter_get_motion_events_enabled (void);
CLUTTER_DEPRECATED_FOR(clutter_stage_ensure_redraw)
void clutter_redraw (ClutterStage *stage);
CLUTTER_DEPRECATED_FOR(cogl_pango_font_map_clear_glyph_cache)
void clutter_clear_glyph_cache (void);
CLUTTER_DEPRECATED_FOR(clutter_backend_set_font_options)
void clutter_set_font_flags (ClutterFontFlags flags);
CLUTTER_DEPRECATED_FOR(clutter_backend_get_font_options)
ClutterFontFlags clutter_get_font_flags (void);
CLUTTER_DEPRECATED_FOR(clutter_device_manager_get_device)
ClutterInputDevice * clutter_get_input_device_for_id (gint id_);
CLUTTER_DEPRECATED_FOR(clutter_input_device_grab)
void clutter_grab_pointer_for_device (ClutterActor *actor,
gint id_);
CLUTTER_DEPRECATED_FOR(clutter_input_device_ungrab)
void clutter_ungrab_pointer_for_device (gint id_);
G_END_DECLS
#endif /* __CLUTTER_MAIN_DEPRECATED_H__ */