From: Benjamin Otte Date: Sat, 31 Jul 2010 10:47:38 +0000 (+0200) Subject: API: remove gdk_colormap_query_color X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d0d2a6f12c758e93fc2778754d254e27c7b39216;p=~andy%2Fgtk API: remove gdk_colormap_query_color --- diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt index ccec2bca9..0b74887c9 100644 --- a/docs/reference/gdk/gdk3-sections.txt +++ b/docs/reference/gdk/gdk3-sections.txt @@ -288,7 +288,6 @@ gdk_colormap_get_system gdk_colormap_alloc_colors gdk_colormap_alloc_color gdk_colormap_free_colors -gdk_colormap_query_color gdk_colormap_get_visual gdk_colormap_get_screen gdk_color_copy diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml index d313f5a3d..28ce9b8c2 100644 --- a/docs/reference/gdk/tmpl/colors.sgml +++ b/docs/reference/gdk/tmpl/colors.sgml @@ -116,16 +116,6 @@ The colormap structure contains the following public fields. @n_colors: - - - - - -@colormap: -@pixel: -@result: - - diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c index 67d0f7c71..77322f02b 100644 --- a/gdk/directfb/gdkcolor-directfb.c +++ b/gdk/directfb/gdkcolor-directfb.c @@ -304,54 +304,6 @@ gdk_colormap_alloc_colors (GdkColormap *colormap, return 0; } -void -gdk_colormap_query_color (GdkColormap *colormap, - gulong pixel, - GdkColor *result) -{ - GdkVisual *visual; - - g_return_if_fail (GDK_IS_COLORMAP (colormap)); - - visual = gdk_colormap_get_visual (colormap); - - switch (visual->type) - { - case GDK_VISUAL_TRUE_COLOR: - result->red = 65535. * - (gdouble)((pixel & visual->red_mask) >> visual->red_shift) / - ((1 << visual->red_prec) - 1); - - result->green = 65535. * - (gdouble)((pixel & visual->green_mask) >> visual->green_shift) / - ((1 << visual->green_prec) - 1); - - result->blue = 65535. * - (gdouble)((pixel & visual->blue_mask) >> visual->blue_shift) / - ((1 << visual->blue_prec) - 1); - break; - - case GDK_VISUAL_STATIC_COLOR: - case GDK_VISUAL_PSEUDO_COLOR: - if (pixel >= 0 && pixel < colormap->size) - { - result->red = colormap->colors[pixel].red; - result->green = colormap->colors[pixel].green; - result->blue = colormap->colors[pixel].blue; - } - else - g_warning ("gdk_colormap_query_color: pixel outside colormap"); - break; - - case GDK_VISUAL_DIRECT_COLOR: - case GDK_VISUAL_GRAYSCALE: - case GDK_VISUAL_STATIC_GRAY: - /* unsupported */ - g_assert_not_reached (); - break; - } -} - IDirectFBPalette * gdk_directfb_colormap_get_palette (GdkColormap *colormap) { diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index b52bfd3ae..bdefe9a47 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -318,7 +318,6 @@ gdk_colormap_new gdk_colormap_get_type G_GNUC_CONST gdk_colormap_alloc_colors gdk_colormap_free_colors -gdk_colormap_query_color gdk_colormap_get_screen #endif #endif diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h index 1312991e1..dfb21cd6c 100644 --- a/gdk/gdkcolor.h +++ b/gdk/gdkcolor.h @@ -110,9 +110,6 @@ gboolean gdk_colormap_alloc_color (GdkColormap *colormap, void gdk_colormap_free_colors (GdkColormap *colormap, const GdkColor *colors, gint n_colors); -void gdk_colormap_query_color (GdkColormap *colormap, - gulong pixel, - GdkColor *result); GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap); diff --git a/gdk/quartz/gdkcolor-quartz.c b/gdk/quartz/gdkcolor-quartz.c index 315dd28be..9a7884d2b 100644 --- a/gdk/quartz/gdkcolor-quartz.c +++ b/gdk/quartz/gdkcolor-quartz.c @@ -140,21 +140,6 @@ gdk_colormap_alloc_colors (GdkColormap *colormap, return 0; } -void -gdk_colormap_query_color (GdkColormap *colormap, - gulong pixel, - GdkColor *result) -{ - result->red = pixel >> 16 & 0xff; - result->red += result->red << 8; - - result->green = pixel >> 8 & 0xff; - result->green += result->green << 8; - - result->blue = pixel & 0xff; - result->blue += result->blue << 8; -} - GdkScreen* gdk_colormap_get_screen (GdkColormap *cmap) { diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c index 5e49907d6..08a16b8e0 100644 --- a/gdk/win32/gdkcolor-win32.c +++ b/gdk/win32/gdkcolor-win32.c @@ -1120,44 +1120,6 @@ gdk_colormap_alloc_colors (GdkColormap *colormap, return nremaining; } -void -gdk_colormap_query_color (GdkColormap *colormap, - gulong pixel, - GdkColor *result) -{ - GdkVisual *visual; - - g_return_if_fail (GDK_IS_COLORMAP (colormap)); - - visual = gdk_colormap_get_visual (colormap); - - switch (visual->type) - { - case GDK_VISUAL_DIRECT_COLOR: - case GDK_VISUAL_TRUE_COLOR: - result->red = 65535. * (double)((pixel & visual->red_mask) >> visual->red_shift) / ((1 << visual->red_prec) - 1); - result->green = 65535. * (double)((pixel & visual->green_mask) >> visual->green_shift) / ((1 << visual->green_prec) - 1); - result->blue = 65535. * (double)((pixel & visual->blue_mask) >> visual->blue_shift) / ((1 << visual->blue_prec) - 1); - break; - - case GDK_VISUAL_STATIC_GRAY: - case GDK_VISUAL_GRAYSCALE: - result->red = result->green = result->blue = 65535. * (double)pixel/((1<depth) - 1); - break; - - case GDK_VISUAL_STATIC_COLOR: - case GDK_VISUAL_PSEUDO_COLOR: - result->red = colormap->colors[pixel].red; - result->green = colormap->colors[pixel].green; - result->blue = colormap->colors[pixel].blue; - break; - - default: - g_assert_not_reached (); - break; - } -} - static gint gdk_colormap_match_color (GdkColormap *cmap, GdkColor *color, diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index 2d4121468..bbfae0d97 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -1009,72 +1009,6 @@ gdk_colormap_alloc_colors (GdkColormap *colormap, return nremaining; } -/** - * gdk_colormap_query_color: - * @colormap: a #GdkColormap - * @pixel: pixel value in hardware display format - * @result: #GdkColor with red, green, blue fields initialized - * - * Locates the RGB color in @colormap corresponding to the given - * hardware pixel @pixel. @pixel must be a valid pixel in the - * colormap; it's a programmer error to call this function with a - * pixel which is not in the colormap. Hardware pixels are normally - * obtained from gdk_colormap_alloc_colors(). - * - * This function is rarely useful; it's used for example to - * implement the eyedropper feature in #GtkColorSelection. - * - **/ -void -gdk_colormap_query_color (GdkColormap *colormap, - gulong pixel, - GdkColor *result) -{ - XColor xcolor; - GdkVisual *visual; - GdkColormapPrivateX11 *private; - - g_return_if_fail (GDK_IS_COLORMAP (colormap)); - - private = GDK_COLORMAP_PRIVATE_DATA (colormap); - - visual = gdk_colormap_get_visual (colormap); - - switch (visual->type) { - case GDK_VISUAL_DIRECT_COLOR: - case GDK_VISUAL_TRUE_COLOR: - result->red = 65535. * (double)((pixel & visual->red_mask) >> visual->red_shift) / ((1 << visual->red_prec) - 1); - result->green = 65535. * (double)((pixel & visual->green_mask) >> visual->green_shift) / ((1 << visual->green_prec) - 1); - result->blue = 65535. * (double)((pixel & visual->blue_mask) >> visual->blue_shift) / ((1 << visual->blue_prec) - 1); - break; - case GDK_VISUAL_STATIC_GRAY: - case GDK_VISUAL_GRAYSCALE: - result->red = result->green = result->blue = 65535. * (double)pixel/((1<depth) - 1); - break; - case GDK_VISUAL_STATIC_COLOR: - xcolor.pixel = pixel; - if (!private->screen->closed) - { - XQueryColor (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap, &xcolor); - result->red = xcolor.red; - result->green = xcolor.green; - result->blue = xcolor.blue; - } - else - result->red = result->green = result->blue = 0; - break; - case GDK_VISUAL_PSEUDO_COLOR: - g_return_if_fail (pixel < colormap->size); - result->red = colormap->colors[pixel].red; - result->green = colormap->colors[pixel].green; - result->blue = colormap->colors[pixel].blue; - break; - default: - g_assert_not_reached (); - break; - } -} - /** * gdk_x11_colormap_foreign_new: * @visual: a #GdkVisual