It's all in the changelog. Well, almost all.

[~andy/gtk] / gdk / gdk.h

diff --git a/gdk/gdk.h b/gdk/gdk.h
index b8f1487e7b6fb6e89e4335a5ca74f11b9350f0c7..67fadaf197adbe5c14de46aa62d697025a1218e6 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -35,9 +35,8 @@ void   gdk_exit            (int     error_code);
 gchar* gdk_set_locale      (void);
 
 gint gdk_events_pending  (void);
-gint gdk_event_get       (GdkEvent     *event,
-                         GdkEventFunc  pred,
-                         gpointer      data);
+GdkEvent *gdk_event_get  (void);
+GdkEvent *gdk_event_get_graphics_expose (GdkWindow *window);
 void gdk_event_put       (GdkEvent     *event);
 
 GdkEvent *gdk_event_copy (GdkEvent *event);
@@ -50,6 +49,7 @@ void gdk_set_use_xshm    (gint  use_xshm);
 gint gdk_get_debug_level (void);
 gint gdk_get_show_events (void);
 gint gdk_get_use_xshm    (void);
+gchar *gdk_get_display (void);
 
 guint32 gdk_time_get      (void);
 guint32 gdk_timer_get     (void);
@@ -57,11 +57,16 @@ void    gdk_timer_set     (guint32 milliseconds);
 void    gdk_timer_enable  (void);
 void    gdk_timer_disable (void);
 
-gint gdk_input_add    (gint              source,
-                      GdkInputCondition condition,
-                      GdkInputFunction  function,
-                      gpointer          data);
-void gdk_input_remove (gint              tag);
+gint gdk_input_add_interp (gint              source,
+                          GdkInputCondition condition,
+                          GdkInputFunction  function,
+                          gpointer          data,
+                          GdkDestroyNotify  destroy);
+gint gdk_input_add        (gint              source,
+                          GdkInputCondition condition,
+                          GdkInputFunction  function,
+                          gpointer          data);
+void gdk_input_remove     (gint              tag);
 
 gint gdk_pointer_grab   (GdkWindow *     window,
                         gint            owner_events,
@@ -162,7 +167,15 @@ void          gdk_window_lower       (GdkWindow    *window);
 
 void          gdk_window_set_user_data   (GdkWindow       *window,
                                          gpointer         user_data);
+void          gdk_window_set_override_redirect(GdkWindow  *window,
+                                              gboolean override_redirect);
 
+void          gdk_window_add_filter     (GdkWindow     *window,
+                                        GdkFilterFunc  function,
+                                        gpointer       data);
+void          gdk_window_remove_filter  (GdkWindow     *window,
+                                        GdkFilterFunc  function,
+                                        gpointer       data);
 
 /* 
  * This allows for making shaped (partially transparent) windows
@@ -347,8 +360,11 @@ GdkPixmap* gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
                                         GdkBitmap **mask,
                                         GdkColor   *transparent_color,
                                         gchar     **data);
-void       gdk_pixmap_destroy           (GdkPixmap  *pixmap);
+GdkPixmap *gdk_pixmap_ref               (GdkPixmap  *pixmap);
+void       gdk_pixmap_unref             (GdkPixmap  *pixmap);
 
+GdkBitmap *gdk_bitmap_ref               (GdkBitmap  *pixmap);
+void       gdk_bitmap_unref             (GdkBitmap  *pixmap);
 
 
 /* Images
@@ -380,10 +396,8 @@ void       gdk_image_destroy   (GdkImage     *image);
  */
 GdkColormap* gdk_colormap_new     (GdkVisual   *visual,
                                   gint         allocate);
-void         gdk_colormap_destroy (GdkColormap *colormap);
-
-GdkColormap* gdk_colormap_ref (GdkColormap *cmap);
-void         gdk_colormap_unref (GdkColormap *cmap);
+GdkColormap* gdk_colormap_ref     (GdkColormap *cmap);
+void         gdk_colormap_unref   (GdkColormap *cmap);
 
 GdkColormap* gdk_colormap_get_system       (void);
 gint         gdk_colormap_get_system_size  (void);
@@ -421,9 +435,8 @@ gint gdk_color_equal     (GdkColor      *colora,
  */
 GdkFont* gdk_font_load      (const gchar    *font_name);
 GdkFont* gdk_fontset_load   (gchar    *fontset_name);
-void     gdk_font_free      (GdkFont  *font);
-void     gdk_fontset_free   (GdkFont  *font);
 GdkFont* gdk_font_ref       (GdkFont  *font);
+void     gdk_font_unref     (GdkFont  *font);
 gint     gdk_font_id        (GdkFont  *font);
 gint     gdk_font_equal     (GdkFont  *fonta,
                             GdkFont  *fontb);
@@ -646,6 +659,62 @@ GdkEventMask gdk_ic_get_events  (GdkIC ic);
 /* Miscellaneous */
 void gdk_event_send_clientmessage_toall(GdkEvent *event);
 
+/* Color Context */
+
+GdkColorContext *gdk_color_context_new                   (GdkVisual   *visual,
+                                                          GdkColormap *colormap);
+
+GdkColorContext *gdk_color_context_new_mono              (GdkVisual   *visual,
+                                                          GdkColormap *colormap);
+
+void             gdk_color_context_free                   (GdkColorContext *cc);
+
+gulong           gdk_color_context_get_pixel             (GdkColorContext *cc,
+                                                          gushort          red,
+                                                          gushort          green,
+                                                          gushort          blue,
+                                                          gint            *failed);
+void             gdk_color_context_get_pixels            (GdkColorContext *cc,
+                                                          gushort         *reds,
+                                                          gushort         *greens,
+                                                          gushort         *blues,
+                                                          gint             ncolors,
+                                                          gulong          *colors,
+                                                          gint            *nallocated);
+void             gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
+                                                          gushort         *reds,
+                                                          gushort         *greens,
+                                                          gushort         *blues,
+                                                          gint             ncolors,
+                                                          gint            *used,
+                                                          gulong          *colors,
+                                                          gint            *nallocated);
+
+gint             gdk_color_context_query_color            (GdkColorContext *cc,
+                                                          GdkColor        *color);
+gint             gdk_color_context_query_colors           (GdkColorContext *cc,
+                                                          GdkColor        *colors,
+                                                          gint             num_colors);
+
+gint             gdk_color_context_add_palette            (GdkColorContext *cc,
+                                                          GdkColor        *palette,
+                                                          gint             num_palette);
+
+void             gdk_color_context_init_dither            (GdkColorContext *cc);
+void             gdk_color_context_free_dither            (GdkColorContext *cc);
+
+gulong           gdk_color_context_get_pixel_from_palette (GdkColorContext *cc,
+                                                          gushort         *red,
+                                                          gushort         *green,
+                                                          gushort         *blue,
+                                                          gint            *failed);
+guchar           gdk_color_context_get_index_from_palette (GdkColorContext *cc,
+                                                          gint            *red,
+                                                          gint            *green,
+                                                          gint            *blue,
+                                                          gint            *failed);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */