From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: oblique Newsgroups: gmane.emacs.bugs Subject: bug#14078: [PATCH] Fix 256 color mapping in rxvt.el Date: Thu, 28 Mar 2013 22:02:43 +0200 Message-ID: <1364500963-3251-1-git-send-email-psyberbits@gmail.com> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1364501140 18016 80.91.229.3 (28 Mar 2013 20:05:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Mar 2013 20:05:40 +0000 (UTC) To: 14078@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 28 21:06:07 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 1ULJ5I-0006Ga-3w for geb-bug-gnu-emacs@m.gmane.org; Thu, 28 Mar 2013 21:06:04 +0100 Original-Received: from localhost ([::1]:41238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ4t-0005oi-Qm for geb-bug-gnu-emacs@m.gmane.org; Thu, 28 Mar 2013 16:05:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ4o-0005fy-5e for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:05:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULJ4l-0002Gr-0E for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:05:34 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ4k-0002Gn-Ta for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:05:30 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1ULJ7C-00081q-EV for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: oblique Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 28 Mar 2013 20:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 14078 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.136450123630797 (code B ref -1); Thu, 28 Mar 2013 20:08:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 28 Mar 2013 20:07:16 +0000 Original-Received: from localhost ([127.0.0.1]:49956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULJ6R-00080f-Td for submit@debbugs.gnu.org; Thu, 28 Mar 2013 16:07:16 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50637) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULJ6P-00080W-Oq for submit@debbugs.gnu.org; Thu, 28 Mar 2013 16:07:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULJ3u-0001ei-7b for submit@debbugs.gnu.org; Thu, 28 Mar 2013 16:04:41 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:50794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ3u-0001ee-4T for submit@debbugs.gnu.org; Thu, 28 Mar 2013 16:04:38 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ3q-0003mI-HE for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:04:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULJ3k-0001cD-Er for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:04:34 -0400 Original-Received: from mail-ee0-f46.google.com ([74.125.83.46]:53970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULJ3k-0001by-8E for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 16:04:28 -0400 Original-Received: by mail-ee0-f46.google.com with SMTP id e49so4969681eek.19 for ; Thu, 28 Mar 2013 13:04:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=mL75IIkLW+YNOrO0//M3vqAfl1EAr+SmAOWQHxR5Yv0=; b=Q4Wo0L8/NFKwstLl57iFIYv//gypenMUVdhXKyWz4fhQhv2Ax5vUCJadnLM+CyfWmR XYmFxZoz++v/BaTY5lGy0PZdIm1j0h9B9s+HahEtNgP+AJ/mkcCoSGrVoKcbwiN/nDMC 9qshUKLcVXXCa2se8eDdo7tMIpJtBFoaG61Q3aIybPwGTjSiT3Ag7pClFlpFac+b1T0N cLGEma6bdYla6SuTKhJYB066GRJSA42y6zgKu6vWTaE+mZTqqyi5QA4RxfVD1q3ddor5 xj139aLqPjJCZ+XE3Nt4wvlhnDVnrtruSNcm8FujK5R2y45H1JhX4xZkV55SZbjJLG4D CndA== X-Received: by 10.15.36.67 with SMTP id h43mr69580991eev.5.1364501066853; Thu, 28 Mar 2013 13:04:26 -0700 (PDT) Original-Received: from localhost.localdomain (93-77-145.netrun.cytanet.com.cy. [93.109.77.145]) by mx.google.com with ESMTPS id 44sm17023eek.5.2013.03.28.13.04.24 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 13:04:25 -0700 (PDT) X-Mailer: git-send-email 1.8.1.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.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:72969 Archived-At: Color mapping was wrong, I use the same way xterm.el does it. --- lisp/term/rxvt.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 0e026a8..6a62cff 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -201,7 +201,7 @@ (defun rxvt-rgb-convert-to-16bit (prim) "Convert an 8-bit primary color value PRIM to a corresponding 16-bit value." - (min 65535 (round (* (/ prim 255.0) 65535.0)))) + (logior prim (lsh prim 8))) (defun rxvt-register-default-colors () "Register the default set of colors for rxvt or compatible emulator. @@ -233,9 +233,10 @@ for the currently selected frame." (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) (mapcar 'rxvt-rgb-convert-to-16bit - (list (round (* r 42.5)) - (round (* g 42.5)) - (round (* b 42.5))))) + (list (if (zerop r) 0 (+ (* r 40) 55)) + (if (zerop g) 0 (+ (* g 40) 55)) + (if (zerop b) 0 (+ (* b 40) 55))))) + (setq b (1+ b)) (if (> b 5) (setq g (1+ g) -- 1.8.1.5