From: Matthew Garrett <mjg59@srcf.ucam.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] VT: Restore VT fonts on switch
Date: Mon, 21 Jul 2008 15:39:44 -0400 [thread overview]
Message-ID: <E1KL0tq-0001Wk-Ny@critter.phunnypharm.org> (raw)
Not all X drivers save and restore fonts on text VTs. Add code to the
kernel to explicitly save and restore them on VT switches.
Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: Ben Collins <ben.collins@canonical.com>
---
drivers/char/vt_ioctl.c | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 3211afd..b2ac3d1 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -35,6 +35,8 @@
#include <linux/kbd_diacr.h>
#include <linux/selection.h>
+#define max_font_size 65536
+
char vt_dont_switch;
extern struct tty_driver *console_driver;
@@ -1250,6 +1252,7 @@ void vc_SAK(struct work_struct *work)
static void complete_change_console(struct vc_data *vc)
{
unsigned char old_vc_mode;
+ struct vc_data *oldvc = vc_cons[fg_console].d;
last_console = fg_console;
@@ -1258,9 +1261,31 @@ static void complete_change_console(struct vc_data *vc)
* KD_TEXT mode or vice versa, which means we need to blank or
* unblank the screen later.
*/
- old_vc_mode = vc_cons[fg_console].d->vc_mode;
+ old_vc_mode = oldvc->vc_mode;
+
+#if defined(CONFIG_VGA_CONSOLE)
+ if (old_vc_mode == KD_TEXT && oldvc->vc_sw == &vga_con &&
+ oldvc->vc_sw->con_font_get) {
+ if (!oldvc->vc_font.data)
+ oldvc->vc_font.data = kmalloc(max_font_size,
+ GFP_KERNEL);
+ lock_kernel();
+ oldvc->vc_sw->con_font_get(oldvc, &oldvc->vc_font);
+ unlock_kernel();
+ }
+#endif
switch_screen(vc);
+#if defined(CONFIG_VGA_CONSOLE)
+ if (vc->vc_mode == KD_TEXT && vc->vc_sw == &vga_con &&
+ vc->vc_sw->con_font_set) {
+ if (vc->vc_font.data) {
+ lock_kernel();
+ vc->vc_sw->con_font_set(vc, &vc->vc_font, 0);
+ unlock_kernel();
+ }
+ }
+#endif
/*
* This can't appear below a successful kill_pid(). If it did,
* then the *blank_screen operation could occur while X, having
--
1.5.4.3
next reply other threads:[~2008-07-21 20:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-21 19:39 Matthew Garrett [this message]
2008-07-21 20:40 ` [PATCH] VT: Restore VT fonts on switch Alan Cox
2008-08-08 9:32 ` Benjamin Herrenschmidt
2008-07-21 20:43 ` Arjan van de Ven
2008-07-21 20:53 ` Ben Collins
2008-07-21 21:12 ` Alan Cox
2008-07-21 21:37 ` Matthew Garrett
2008-07-21 21:24 ` Alan Cox
2008-08-08 7:49 ` Pavel Machek
2008-07-21 21:23 ` Arjan van de Ven
2008-07-21 21:40 ` Ben Collins
2008-07-21 22:18 ` Arjan van de Ven
2008-07-21 22:29 ` Ben Collins
2008-07-21 20:54 ` Jan Engelhardt
2008-07-22 7:59 ` Arkadiusz Miskiewicz
2008-08-08 7:44 ` Pavel Machek
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=E1KL0tq-0001Wk-Ny@critter.phunnypharm.org \
--to=mjg59@srcf.ucam.org \
--cc=linux-kernel@vger.kernel.org \
/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).