From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?=C5=81ukasz?= Stelmach Newsgroups: gmane.emacs.bugs Subject: bug#15837: [PATCH] Pass colours using rgb: instead of rgbi: Date: Fri, 8 Nov 2013 19:41:05 +0100 Message-ID: <1383936065-16824-1-git-send-email-stlman@poczta.fm> References: <87mwle21zh.fsf%stlman@poczta.fm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1383936449 1258 80.91.229.3 (8 Nov 2013 18:47:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Nov 2013 18:47:29 +0000 (UTC) Cc: =?UTF-8?Q?=C5=81ukasz?= Stelmach To: 15837@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 08 19:47:34 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ver5h-0003q0-P1 for geb-bug-gnu-emacs@m.gmane.org; Fri, 08 Nov 2013 19:47:33 +0100 Original-Received: from localhost ([::1]:47590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ver5h-0005O6-EH for geb-bug-gnu-emacs@m.gmane.org; Fri, 08 Nov 2013 13:47:33 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ver1Q-0003NQ-P2 for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2013 13:47:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ver0M-000884-MZ for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2013 13:43:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ver0M-00087x-Ja for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2013 13:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ver0L-0001Hw-RK for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2013 13:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?=C5=81ukasz?= Stelmach Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2013 18:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15837 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15837-submit@debbugs.gnu.org id=B15837.13839360974906 (code B ref 15837); Fri, 08 Nov 2013 18:42:01 +0000 Original-Received: (at 15837) by debbugs.gnu.org; 8 Nov 2013 18:41:37 +0000 Original-Received: from localhost ([127.0.0.1]:41961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Veqzw-0001H2-J6 for submit@debbugs.gnu.org; Fri, 08 Nov 2013 13:41:36 -0500 Original-Received: from smtpo.poczta.interia.pl ([217.74.65.153]:35158) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Veqzt-0001Gf-Cw for 15837@debbugs.gnu.org; Fri, 08 Nov 2013 13:41:34 -0500 Original-Received: from localhost (89-77-18-4.dynamic.chello.pl [89.77.18.4]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by www.poczta.fm (INTERIA.PL) with ESMTPSA; Fri, 8 Nov 2013 19:41:25 +0100 (CET) X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <87mwle21zh.fsf%stlman@poczta.fm> X-Interia-Antivirus: OK X-IPL-SAS-SPAS: -0.5999999046 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1383936087; bh=Jpr3ad38mkWg/wog3Z/fbLZSucDhHOo4LJ6KldCijz4=; h=Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus:X-IPL-SAS-SPAS; b=O+yBrmnN43lbOGmhCiQZdxCDUGsp1W8CZoT0nOfe3XhtXBnpyO2bao2PYXbju3inF m+6rJGv5EsH7xfR2SPdDZVEYY9QLSqanZevStq+3Ev0N/IJiiHa2kyd98kbeIZjTvs A2XePIK6Tqr8mlEvCxhCZx/uI//k/OvYbVPZrDb0= X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-Spam-Score: 0.0 (/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:80151 Archived-At: 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 --- 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