From owner-svn-src-head@freebsd.org Wed Sep 25 13:21:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53301126DD7; Wed, 25 Sep 2019 13:21:08 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46ddx01Xtcz3NZQ; Wed, 25 Sep 2019 13:21:08 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1244C183D9; Wed, 25 Sep 2019 13:21:08 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8PDL7qA011444; Wed, 25 Sep 2019 13:21:07 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8PDL7o9011443; Wed, 25 Sep 2019 13:21:07 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201909251321.x8PDL7o9011443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Wed, 25 Sep 2019 13:21:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352680 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 352680 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Sep 2019 13:21:08 -0000 Author: tsoome Date: Wed Sep 25 13:21:07 2019 New Revision: 352680 URL: https://svnweb.freebsd.org/changeset/base/352680 Log: kernel: terminal_init() should check for teken colors from kenv Check for teken.fg_color and teken.bg_color and prepare the color attributes accordingly. When white background is used, make it light to improve visibility. When black background is used, make kernel messages light. Modified: head/sys/kern/subr_terminal.c Modified: head/sys/kern/subr_terminal.c ============================================================================== --- head/sys/kern/subr_terminal.c Wed Sep 25 13:04:34 2019 (r352679) +++ head/sys/kern/subr_terminal.c Wed Sep 25 13:21:07 2019 (r352680) @@ -124,13 +124,13 @@ static teken_funcs_t terminal_drawmethods = { }; /* Kernel message formatting. */ -static const teken_attr_t kernel_message = { +static teken_attr_t kernel_message = { .ta_fgcolor = TCHAR_FGCOLOR(TERMINAL_KERN_ATTR), .ta_bgcolor = TCHAR_BGCOLOR(TERMINAL_KERN_ATTR), .ta_format = TCHAR_FORMAT(TERMINAL_KERN_ATTR) }; -static const teken_attr_t default_message = { +static teken_attr_t default_message = { .ta_fgcolor = TCHAR_FGCOLOR(TERMINAL_NORM_ATTR), .ta_bgcolor = TCHAR_BGCOLOR(TERMINAL_NORM_ATTR), .ta_format = TCHAR_FORMAT(TERMINAL_NORM_ATTR) @@ -168,10 +168,33 @@ static const teken_attr_t default_message = { static void terminal_init(struct terminal *tm) { + int fg, bg; if (tm->tm_flags & TF_CONS) mtx_init(&tm->tm_mtx, "trmlck", NULL, MTX_SPIN); + teken_init(&tm->tm_emulator, &terminal_drawmethods, tm); + + TUNABLE_INT_FETCH("teken.fg_color", &fg); + TUNABLE_INT_FETCH("teken.bg_color", &bg); + + if (fg != -1) { + default_message.ta_fgcolor = fg; + kernel_message.ta_fgcolor = fg; + } + if (bg != -1) { + default_message.ta_bgcolor = bg; + kernel_message.ta_bgcolor = bg; + } + + if (default_message.ta_bgcolor == TC_WHITE) { + default_message.ta_bgcolor |= TC_LIGHT; + kernel_message.ta_bgcolor |= TC_LIGHT; + } + + if (default_message.ta_bgcolor == TC_BLACK && + default_message.ta_fgcolor < TC_NCOLORS) + kernel_message.ta_fgcolor |= TC_LIGHT; teken_set_defattr(&tm->tm_emulator, &default_message); }