chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
69bd386
)
vconsole: copy font to tty1-15
author
Kay Sievers
<kay@vrfy.org>
Tue, 15 Jan 2013 14:57:12 +0000
(15:57 +0100)
committer
Kay Sievers
<kay@vrfy.org>
Tue, 15 Jan 2013 15:32:32 +0000
(16:32 +0100)
src/vconsole/vconsole-setup.c
patch
|
blob
|
history
diff --git
a/src/vconsole/vconsole-setup.c
b/src/vconsole/vconsole-setup.c
index d8cdb7c609bf810fd2974511b0d15525b7073893..679dc1aafb77cba7e532a22ee476c3ec5affd261 100644
(file)
--- a/
src/vconsole/vconsole-setup.c
+++ b/
src/vconsole/vconsole-setup.c
@@
-158,47
+158,47
@@
static int font_load(const char *vc, const char *font, const char *map, const ch
return 0;
}
return 0;
}
-static void font_copy_to_all_vts(int fd, int from_vt) {
- struct vt_stat vts;
- unsigned short bits;
+/*
+ * A newly allocated VT uses the font from the active VT. Here
+ * we update all possibly already allocated VTs with the configured
+ * font. It also allows to restart systemd-vconsole-setup.service,
+ * to apply a new font to all VTs.
+ */
+static void font_copy_to_all_vcs(int fd) {
+ struct vt_stat vcs;
int i;
int r;
int i;
int r;
- /* get 16 bit mask of used VT numbers */
- zero(v
t
s);
- r = ioctl(fd, VT_GETSTATE, &v
t
s);
+ /* get
active, and
16 bit mask of used VT numbers */
+ zero(v
c
s);
+ r = ioctl(fd, VT_GETSTATE, &v
c
s);
if (r < 0)
return;
if (r < 0)
return;
- bits = vts.v_state;
- for (i = 1; i <= 16; i++) {
- char vtname[16];
- int vtfd;
+ for (i = 1; i <= 15; i++) {
+ char vcname[16];
+ int vcfd;
struct console_font_op cfo;
struct console_font_op cfo;
- bool used;
- /* skip unused VTs */
- used = bits & 1;
- bits >>= 1;
- if (!used)
+ if (i == vcs.v_active)
continue;
continue;
- if (i == from_vt)
+ /* skip unused VTs above tty6 to avoid allocating them */
+ if (i > 6 && ((vcs.v_state >> i) & 1) == 0)
continue;
continue;
- snprintf(v
tname , sizeof(vt
name), "/dev/tty%i", i);
- v
tfd = open_terminal(vt
name, O_RDWR|O_CLOEXEC);
- if (v
t
fd < 0)
+ snprintf(v
cname , sizeof(vc
name), "/dev/tty%i", i);
+ v
cfd = open_terminal(vc
name, O_RDWR|O_CLOEXEC);
+ if (v
c
fd < 0)
continue;
continue;
- /* copy font from
from_vt to this VT
*/
+ /* copy font from
active VT, where the font was uploaded to
*/
zero(cfo);
cfo.op = KD_FONT_OP_COPY;
zero(cfo);
cfo.op = KD_FONT_OP_COPY;
- /* the index numbers seem to start at 0 for tty1 */
- cfo.height = from_vt - 1;
- ioctl(vtfd, KDFONTOP, &cfo);
+ cfo.height = vcs.v_active-1; /* tty1 == index 0 */
+ ioctl(vcfd, KDFONTOP, &cfo);
- close_nointr_nofail(v
t
fd);
+ close_nointr_nofail(v
c
fd);
}
}
}
}
@@
-212,7
+212,7
@@
int main(int argc, char **argv) {
int fd = -1;
bool utf8;
pid_t font_pid = 0, keymap_pid = 0;
int fd = -1;
bool utf8;
pid_t font_pid = 0, keymap_pid = 0;
-
int font_copy_from_vt = 0
;
+
bool font_copy = false
;
int r = EXIT_FAILURE;
log_set_target(LOG_TARGET_AUTO);
int r = EXIT_FAILURE;
log_set_target(LOG_TARGET_AUTO);
@@
-224,8
+224,8
@@
int main(int argc, char **argv) {
if (argv[1])
vc = argv[1];
else {
if (argv[1])
vc = argv[1];
else {
- vc = "/dev/tty
1
";
- font_copy
_from_vt = 1
;
+ vc = "/dev/tty
0
";
+ font_copy
= true
;
}
fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
}
fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
@@
-287,8
+287,8
@@
finish:
if (font_pid > 0) {
wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
if (font_pid > 0) {
wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
- if (font_copy
_from_vt > 0
)
- font_copy_to_all_v
ts(fd, font_copy_from_vt
);
+ if (font_copy)
+ font_copy_to_all_v
cs(fd
);
}
free(vc_keymap);
}
free(vc_keymap);