From: Max Staudt <mstaudt@suse.de>
To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org
Cc: mstaudt@suse.de, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, tiwai@suse.com, oneukum@suse.com,
msrb@suse.com, sndirsch@suse.com, michal@markovi.net,
philm@manjaro.org, bernhard.rosenkranzer@linaro.org,
kernel.max@enpas.org
Subject: [RFC PATCH v3 07/13] vt: Add keyboard hook to disable bootsplash
Date: Wed, 17 Jan 2018 20:54:29 +0000 [thread overview]
Message-ID: <20180117205435.2860-8-mstaudt@suse.de> (raw)
In-Reply-To: <20180117205435.2860-1-mstaudt@suse.de>
Let's disable the splash if the user presses ESC or F1-F12 on a VT.
The F1-F12 check is to disable the splash on VT switches.
Signed-off-by: Max Staudt <mstaudt@suse.de>
---
drivers/tty/vt/keyboard.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index f4166263bb3a..a248429194bb 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -47,6 +47,8 @@
#include <asm/irq_regs.h>
+#include <linux/bootsplash.h>
+
extern void ctrl_alt_del(void);
/*
@@ -1353,6 +1355,28 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
}
#endif
+ /* Trap keys when bootsplash is shown */
+ if (bootsplash_would_render_now()) {
+ /* Deactivate bootsplash on ESC or Alt+Fxx VT switch */
+ if (keycode >= KEY_F1 && keycode <= KEY_F12) {
+ bootsplash_disable();
+
+ /*
+ * No return here since we want to actually
+ * perform the VT switch.
+ */
+ } else {
+ if (keycode = KEY_ESC)
+ bootsplash_disable();
+
+ /*
+ * Just drop any other keys.
+ * Their effect would be hidden by the splash.
+ */
+ return;
+ }
+ }
+
if (kbd->kbdmode = VC_MEDIUMRAW) {
/*
* This is extended medium raw mode, with keys above 127
--
2.12.3
next prev parent reply other threads:[~2018-01-17 20:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 20:54 [RFC PATCH v3 00/13] Kernel based bootsplash Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 01/13] bootsplash: Initial implementation showing black screen Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 02/13] bootsplash: Add file reading and picture rendering Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 03/13] bootsplash: Flush framebuffer after drawing Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 04/13] bootsplash: Add corner positioning Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 05/13] bootsplash: Add animation support Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 06/13] vt: Redraw bootsplash fully on console_unblank Max Staudt
2018-01-17 20:54 ` Max Staudt [this message]
2018-01-17 20:54 ` [RFC PATCH v3 08/13] sysrq: Disable bootsplash on SAK Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 09/13] fbcon: Disable bootsplash on oops Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 10/13] Documentation: Add bootsplash main documentation Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 11/13] bootsplash: sysfs entries to load and unload files Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 12/13] tools/bootsplash: Add a basic splash file creation tool Max Staudt
2018-01-17 20:54 ` [RFC PATCH v3 13/13] tools/bootsplash: Add script and data to create sample file Max Staudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180117205435.2860-8-mstaudt@suse.de \
--to=mstaudt@suse.de \
--cc=b.zolnierkie@samsung.com \
--cc=bernhard.rosenkranzer@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel.max@enpas.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal@markovi.net \
--cc=msrb@suse.com \
--cc=oneukum@suse.com \
--cc=philm@manjaro.org \
--cc=sndirsch@suse.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).