bug#15837: [PATCH] Pass colours using rgb: instead of rgbi:

[Jan Djärv]

Applied, thanks.

        Jan D.

8 nov 2013 kl. 19:41 skrev Łukasz Stelmach <stlman@poczta.fm>:

> X procedures apply gamma correction to RGBi values which makes colours
> obtained from Gtk+ 3.0 and displayed by Emacs look different than in
> other Gtk applications.
> 
> Signed-off-by: Łukasz Stelmach <stlman@poczta.fm>
> ---
> src/gtkutil.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gtkutil.c b/src/gtkutil.c
> index 7e304d4..b8d8610 100644
> --- a/src/gtkutil.c
> +++ b/src/gtkutil.c
> @@ -596,14 +596,17 @@ xg_check_special_colors (struct frame *f,
>     GtkStyleContext *gsty
>       = gtk_widget_get_style_context (FRAME_GTK_OUTER_WIDGET (f));
>     GdkRGBA col;
> -    char buf[sizeof "rgbi://" + 3 * (DBL_MAX_10_EXP + sizeof "-1.000000" - 
> 1)];
> +    char buf[sizeof "rgb:rrrr/gggg/bbbb" ];
>     int state = GTK_STATE_FLAG_SELECTED|GTK_STATE_FLAG_FOCUSED;
>     if (get_fg)
>       gtk_style_context_get_color (gsty, state, &col);
>     else
>       gtk_style_context_get_background_color (gsty, state, &col);
> 
> -    sprintf (buf, "rgbi:%lf/%lf/%lf", col.red, col.green, col.blue);
> +    sprintf (buf, "rgb:%04x/%04x/%04x",
> +             (int)(col.red * 65535),
> +             (int)(col.green * 65535),
> +             (int)(col.blue * 65535));
>     success_p = (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
>                             buf, color)
>                != 0);
> -- 
> 1.8.1.5
> 
> 
>