make it possible to disable single-file includes by defining

[platform/upstream/glib.git] / glib / gmain.h

diff --git a/glib/gmain.h b/glib/gmain.h
index 5a224bc..6d400b2 100644 (file)
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_MAIN_H__
 #define __G_MAIN_H__
 
@@ -32,7 +36,9 @@ typedef struct _GSourceCallbackFuncs  GSourceCallbackFuncs;
 typedef struct _GSourceFuncs           GSourceFuncs;
 
 typedef gboolean (*GSourceFunc)       (gpointer data);
-
+typedef void     (*GChildWatchFunc)   (GPid     pid,
+                                      gint     status,
+                                      gpointer data);
 struct _GSource
 {
   /*< private >*/
@@ -118,7 +124,11 @@ typedef gint       (*GPollFunc)    (GPollFD *ufds,
 
 struct _GPollFD
 {
+#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
+  gint64       fd;
+#else
   gint         fd;
+#endif
   gushort      events;
   gushort      revents;
 };
@@ -134,7 +144,7 @@ struct _GPollFD
 /* GMainContext: */
 
 GMainContext *g_main_context_new       (void);
-void          g_main_context_ref       (GMainContext *context);
+GMainContext *g_main_context_ref       (GMainContext *context);
 void          g_main_context_unref     (GMainContext *context);
 GMainContext *g_main_context_default   (void);
 
@@ -157,6 +167,7 @@ GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *conte
 void     g_main_context_wakeup  (GMainContext *context);
 gboolean g_main_context_acquire (GMainContext *context);
 void     g_main_context_release (GMainContext *context);
+gboolean g_main_context_is_owner (GMainContext *context);
 gboolean g_main_context_wait    (GMainContext *context,
                                 GCond        *cond,
                                 GMutex       *mutex);
@@ -174,17 +185,21 @@ gint     g_main_context_check    (GMainContext *context,
                                  gint          n_fds);
 void     g_main_context_dispatch (GMainContext *context);
 
-void      g_main_context_set_poll_func (GMainContext *context,
-                                       GPollFunc     func);
+void     g_main_context_set_poll_func (GMainContext *context,
+                                      GPollFunc     func);
 GPollFunc g_main_context_get_poll_func (GMainContext *context);
 
 /* Low level functions for use by source implementations
  */
-void g_main_context_add_poll      (GMainContext *context,
-                                  GPollFD      *fd,
-                                  gint          priority);
-void g_main_context_remove_poll   (GMainContext *context,
-                                  GPollFD      *fd);
+void     g_main_context_add_poll    (GMainContext *context,
+                                    GPollFD      *fd,
+                                    gint          priority);
+void     g_main_context_remove_poll (GMainContext *context,
+                                    GPollFD      *fd);
+
+gint     g_main_depth               (void);
+GSource *g_main_current_source      (void);
+
 
 /* GMainLoop: */
 
@@ -218,11 +233,14 @@ guint    g_source_get_id          (GSource        *source);
 
 GMainContext *g_source_get_context (GSource       *source);
 
-void g_source_set_callback          (GSource              *source,
-                                    GSourceFunc           func,
-                                    gpointer              data,
-                                    GDestroyNotify        notify);
+void     g_source_set_callback    (GSource        *source,
+                                  GSourceFunc     func,
+                                  gpointer        data,
+                                  GDestroyNotify  notify);
 
+void     g_source_set_funcs       (GSource        *source,
+                                   GSourceFuncs   *funcs);
+gboolean g_source_is_destroyed    (GSource        *source);
 
 /* Used to implement g_source_connect_closure and internally*/
 void g_source_set_callback_indirect (GSource              *source,
@@ -243,8 +261,10 @@ void     g_source_get_current_time (GSource        *source,
 
 /* Specific source types
  */
-GSource *g_idle_source_new    (void);
-GSource *g_timeout_source_new (guint         interval);
+GSource *g_idle_source_new        (void);
+GSource *g_child_watch_source_new (GPid pid);
+GSource *g_timeout_source_new     (guint interval);
+GSource *g_timeout_source_new_seconds (guint interval);
 
 /* Miscellaneous functions
  */
@@ -278,25 +298,42 @@ gboolean g_source_remove_by_user_data        (gpointer       user_data);
 gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
                                              gpointer       user_data);
 
-/* Idles and timeouts */
-guint          g_timeout_add_full      (gint           priority,
-                                        guint          interval, 
-                                        GSourceFunc    function,
-                                        gpointer       data,
-                                        GDestroyNotify notify);
-guint          g_timeout_add           (guint          interval,
-                                        GSourceFunc    function,
-                                        gpointer       data);
-guint          g_idle_add              (GSourceFunc    function,
-                                        gpointer       data);
-guint          g_idle_add_full         (gint           priority,
-                                        GSourceFunc    function,
-                                        gpointer       data,
-                                        GDestroyNotify notify);
-gboolean       g_idle_remove_by_data   (gpointer       data);
+/* Idles, child watchers and timeouts */
+guint    g_timeout_add_full         (gint            priority,
+                                    guint           interval,
+                                    GSourceFunc     function,
+                                    gpointer        data,
+                                    GDestroyNotify  notify);
+guint    g_timeout_add              (guint           interval,
+                                    GSourceFunc     function,
+                                    gpointer        data);
+guint    g_timeout_add_seconds_full (gint            priority,
+                                     guint           interval,
+                                     GSourceFunc     function,
+                                     gpointer        data,
+                                     GDestroyNotify  notify);
+guint    g_timeout_add_seconds      (guint           interval,
+                                    GSourceFunc     function,
+                                    gpointer        data);
+guint    g_child_watch_add_full     (gint            priority,
+                                    GPid            pid,
+                                    GChildWatchFunc function,
+                                    gpointer        data,
+                                    GDestroyNotify  notify);
+guint    g_child_watch_add          (GPid            pid,
+                                    GChildWatchFunc function,
+                                    gpointer        data);
+guint    g_idle_add                 (GSourceFunc     function,
+                                    gpointer        data);
+guint    g_idle_add_full            (gint            priority,
+                                    GSourceFunc     function,
+                                    gpointer        data,
+                                    GDestroyNotify  notify);
+gboolean g_idle_remove_by_data      (gpointer        data);
 
 /* Hook for GClosure / GSource integration. Don't touch */
 GLIB_VAR GSourceFuncs g_timeout_funcs;
+GLIB_VAR GSourceFuncs g_child_watch_funcs;
 GLIB_VAR GSourceFuncs g_idle_funcs;
 
 G_END_DECLS