From patchwork Wed Jul 18 03:03:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Borowski X-Patchwork-Id: 10531281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 06ADE602C2 for ; Wed, 18 Jul 2018 03:04:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFE4C290C0 for ; Wed, 18 Jul 2018 03:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D076B290F4; Wed, 18 Jul 2018 03:04:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 768FC290C0 for ; Wed, 18 Jul 2018 03:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731417AbeGRDjh (ORCPT ); Tue, 17 Jul 2018 23:39:37 -0400 Received: from tartarus.angband.pl ([89.206.35.136]:37804 "EHLO tartarus.angband.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731567AbeGRDj0 (ORCPT ); Tue, 17 Jul 2018 23:39:26 -0400 Received: from 89-71-158-145.dynamic.chello.pl ([89.71.158.145] helo=umbar.angband.pl) by tartarus.angband.pl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ffckZ-0007zP-KD; Wed, 18 Jul 2018 05:03:41 +0200 Received: from kilobyte by umbar.angband.pl with local (Exim 4.91) (envelope-from ) id 1ffckZ-0000AW-AE; Wed, 18 Jul 2018 05:03:35 +0200 From: Adam Borowski To: Greg Kroah-Hartman , Jiri Slaby , linux-console@vger.kernel.org, Bartlomiej Zolnierkiewicz , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Adam Borowski Date: Wed, 18 Jul 2018 05:03:27 +0200 Message-Id: <20180718030327.579-6-kilobyte@angband.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180718030327.579-1-kilobyte@angband.pl> References: <20180718030152.kdq53mwpdfusvwl5@angband.pl> <20180718030327.579-1-kilobyte@angband.pl> X-SA-Exim-Connect-IP: 89.71.158.145 X-SA-Exim-Mail-From: kilobyte@angband.pl Subject: [PATCH 6/6] vt: support bright backgrounds for \e[48m if unblinking X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on tartarus.angband.pl) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This improves schemes used by fancy new programs. For example, it lets bright powerline segments match, and fixes images shown by catimg being striped to the point of unreadability. Handling of 8-color backgrounds uses stripped 16-color value instead of a dedicated formula; this works worse for dark and better for bright inputs. Signed-off-by: Adam Borowski --- drivers/tty/vt/vt.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index c777f4c91df0..7fcb0ff2dccf 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1555,7 +1555,7 @@ static void rgb_from_256(int i, struct rgb *c) c->r = c->g = c->b = i * 10 - 2312; } -static void rgb_foreground(struct vc_data *vc, const struct rgb *c) +static u8 rgb_to_16(const struct rgb *c) { u8 hue = 0, max = max3(c->r, c->g, c->b); @@ -1566,22 +1566,12 @@ static void rgb_foreground(struct vc_data *vc, const struct rgb *c) if (c->b > max / 2 + 32) hue |= 1; - if (hue == 7 && max <= 0x70) { - hue = 0; - vc->vc_intensity = 2; - } else if (max > 0xc0) - vc->vc_intensity = 2; + if (hue == 7 && max <= 0x70) + return 8; + if (max > 0xc0) + return hue | 8; else - vc->vc_intensity = 1; - - vc->vc_color = (vc->vc_color & 0xf0) | hue; -} - -static void rgb_background(struct vc_data *vc, const struct rgb *c) -{ - /* For backgrounds, err on the dark side. */ - vc->vc_color = (vc->vc_color & 0x0f) - | (c->r&0x80) >> 1 | (c->g&0x80) >> 2 | (c->b&0x80) >> 3; + return hue; } /* @@ -1593,10 +1583,10 @@ static void rgb_background(struct vc_data *vc, const struct rgb *c) * Subcommands 3 (CMY) and 4 (CMYK) are so insane there's no point in * supporting them. */ -static int vc_t416_color(struct vc_data *vc, int i, - void(*set_color)(struct vc_data *vc, const struct rgb *c)) +static int vc_t416_color(struct vc_data *vc, int i, int bgshift) { struct rgb c; + u8 v; i++; if (i > vc->vc_npar) @@ -1615,7 +1605,13 @@ static int vc_t416_color(struct vc_data *vc, int i, } else return i; - set_color(vc, &c); + v = rgb_to_16(&c); + + vc->vc_color = (vc->vc_color & (0xf0 >> bgshift)) | v << bgshift; + if (!bgshift) + vc->vc_intensity = (v & 8 >> 4) + 1; + else if (vc->vc_unblinking) + vc->vc_blink = v & 8 >> 4; return i; } @@ -1695,10 +1691,10 @@ static void csi_m(struct vc_data *vc) vc->vc_reverse = 0; break; case 38: - i = vc_t416_color(vc, i, rgb_foreground); + i = vc_t416_color(vc, i, 0); break; case 48: - i = vc_t416_color(vc, i, rgb_background); + i = vc_t416_color(vc, i, 4); break; case 39: vc->vc_color = (vc->vc_def_color & 0x0f) |