Shell: sort, align, clean up shell-global.h and shell-util.h

https://bugzilla.gnome.org/show_bug.cgi?id=648755
This commit is contained in:
Dan Winship 2011-03-24 10:54:46 -04:00
parent 61577e176e
commit 8e4a5f1ac5
2 changed files with 104 additions and 94 deletions

View File

@ -29,28 +29,22 @@ GType shell_global_get_type (void) G_GNUC_CONST;
ShellGlobal *shell_global_get (void); ShellGlobal *shell_global_get (void);
typedef enum {
SHELL_CURSOR_DND_IN_DRAG,
SHELL_CURSOR_DND_UNSUPPORTED_TARGET,
SHELL_CURSOR_DND_MOVE,
SHELL_CURSOR_DND_COPY,
SHELL_CURSOR_POINTING_HAND
} ShellCursor;
void shell_global_set_cursor (ShellGlobal *global,
ShellCursor type);
void shell_global_unset_cursor (ShellGlobal *global);
MetaScreen *shell_global_get_screen (ShellGlobal *global); MetaScreen *shell_global_get_screen (ShellGlobal *global);
GdkScreen *shell_global_get_gdk_screen (ShellGlobal *global); GdkScreen *shell_global_get_gdk_screen (ShellGlobal *global);
GList *shell_global_get_window_actors (ShellGlobal *global);
GSList *shell_global_get_monitors (ShellGlobal *global);
MetaRectangle *shell_global_get_primary_monitor (ShellGlobal *global);
int shell_global_get_primary_monitor_index (ShellGlobal *global);
MetaRectangle *shell_global_get_focus_monitor (ShellGlobal *global);
GSettings *shell_global_get_settings (ShellGlobal *global);
guint32 shell_global_get_current_time (ShellGlobal *global);
gboolean shell_global_add_extension_importer (ShellGlobal *global,
const char *target_object_script, /* Input/event handling */
const char *target_property, gboolean shell_global_begin_modal (ShellGlobal *global,
const char *directory, guint32 timestamp);
GError **error); void shell_global_end_modal (ShellGlobal *global,
guint32 timestamp);
typedef enum { typedef enum {
SHELL_STAGE_INPUT_MODE_NONREACTIVE, SHELL_STAGE_INPUT_MODE_NONREACTIVE,
@ -64,26 +58,24 @@ void shell_global_set_stage_input_mode (ShellGlobal *global,
void shell_global_set_stage_input_region (ShellGlobal *global, void shell_global_set_stage_input_region (ShellGlobal *global,
GSList *rectangles); GSList *rectangles);
GList *shell_global_get_window_actors (ShellGlobal *global); /* X utilities */
typedef enum {
SHELL_CURSOR_DND_IN_DRAG,
SHELL_CURSOR_DND_UNSUPPORTED_TARGET,
SHELL_CURSOR_DND_MOVE,
SHELL_CURSOR_DND_COPY,
SHELL_CURSOR_POINTING_HAND
} ShellCursor;
gboolean shell_global_begin_modal (ShellGlobal *global, void shell_global_set_cursor (ShellGlobal *global,
guint32 timestamp); ShellCursor type);
void shell_global_end_modal (ShellGlobal *global, void shell_global_unset_cursor (ShellGlobal *global);
guint32 timestamp);
void shell_global_reexec_self (ShellGlobal *global);
void shell_global_gc (ShellGlobal *global);
void shell_global_maybe_gc (ShellGlobal *global);
GSList *shell_global_get_monitors (ShellGlobal *global);
MetaRectangle *shell_global_get_primary_monitor (ShellGlobal *global);
int shell_global_get_primary_monitor_index (ShellGlobal *global);
MetaRectangle *shell_global_get_focus_monitor (ShellGlobal *global);
guint32 shell_global_create_pointer_barrier (ShellGlobal *global, guint32 shell_global_create_pointer_barrier (ShellGlobal *global,
int x1, int y1, int x2, int y2, int x1,
int y1,
int x2,
int y2,
int directions); int directions);
void shell_global_destroy_pointer_barrier (ShellGlobal *global, void shell_global_destroy_pointer_barrier (ShellGlobal *global,
guint32 barrier); guint32 barrier);
@ -92,19 +84,19 @@ void shell_global_get_pointer (ShellGlobal *global,
int *x, int *x,
int *y, int *y,
ClutterModifierType *mods); ClutterModifierType *mods);
void shell_global_sync_pointer (ShellGlobal *global);
GSettings *shell_global_get_settings (ShellGlobal *global);
guint32 shell_global_get_current_time (ShellGlobal *global); /* JavaScript utilities */
void shell_global_gc (ShellGlobal *global);
GAppLaunchContext *shell_global_create_app_launch_context (ShellGlobal *global); void shell_global_maybe_gc (ShellGlobal *global);
gboolean shell_global_set_property_mutable (ShellGlobal *global, gboolean shell_global_set_property_mutable (ShellGlobal *global,
const char *object, const char *object,
const char *property, const char *property,
gboolean mutable); gboolean mutable);
/* Run-at-leisure API */
void shell_global_begin_work (ShellGlobal *global); void shell_global_begin_work (ShellGlobal *global);
void shell_global_end_work (ShellGlobal *global); void shell_global_end_work (ShellGlobal *global);
@ -115,19 +107,33 @@ void shell_global_run_at_leisure (ShellGlobal *global,
gpointer user_data, gpointer user_data,
GDestroyNotify notify); GDestroyNotify notify);
/* Misc utilities / Shell API */
gboolean shell_global_add_extension_importer (ShellGlobal *global,
const char *target_object_script,
const char *target_property,
const char *directory,
GError **error);
void shell_global_sync_pointer (ShellGlobal *global);
GAppLaunchContext *
shell_global_create_app_launch_context (ShellGlobal *global);
void shell_global_play_theme_sound (ShellGlobal *global, void shell_global_play_theme_sound (ShellGlobal *global,
guint id, guint id,
const char *name); const char *name);
void shell_global_cancel_theme_sound (ShellGlobal *global, void shell_global_cancel_theme_sound (ShellGlobal *global,
guint id); guint id);
void shell_global_notify_error (ShellGlobal *global, void shell_global_notify_error (ShellGlobal *global,
const char *msg, const char *msg,
const char *details); const char *details);
void shell_global_init_xdnd (ShellGlobal *global); void shell_global_init_xdnd (ShellGlobal *global);
void shell_global_reexec_self (ShellGlobal *global);
void shell_global_launch_calendar_server (ShellGlobal *global); void shell_global_launch_calendar_server (ShellGlobal *global);
G_END_DECLS G_END_DECLS

View File

@ -10,8 +10,11 @@ G_BEGIN_DECLS
char *shell_util_get_label_for_uri (const char *text_uri); char *shell_util_get_label_for_uri (const char *text_uri);
GIcon *shell_util_get_icon_for_uri (const char *text_uri); GIcon *shell_util_get_icon_for_uri (const char *text_uri);
GIcon *shell_util_icon_from_string (const char *string, GError **error); GIcon *shell_util_icon_from_string (const char *string,
void shell_util_set_hidden_from_pick (ClutterActor *actor, gboolean hidden); GError **error);
void shell_util_set_hidden_from_pick (ClutterActor *actor,
gboolean hidden);
void shell_util_get_transformed_allocation (ClutterActor *actor, void shell_util_get_transformed_allocation (ClutterActor *actor,
ClutterActorBox *box); ClutterActorBox *box);
@ -19,7 +22,8 @@ void shell_util_get_transformed_allocation (ClutterActor *actor,
char *shell_util_format_date (const char *format, char *shell_util_format_date (const char *format,
gint64 time_ms); gint64 time_ms);
ClutterModifierType shell_get_event_state (ClutterEvent *event); ClutterModifierType
shell_get_event_state (ClutterEvent *event);
gboolean shell_write_string_to_stream (GOutputStream *stream, gboolean shell_write_string_to_stream (GOutputStream *stream,
const char *str, const char *str,