d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix restoring the kbd_mode part of the keyboard state in grab/ungrab.

Browse Source 
Simply change the mode to K_XLATE using a local variable and use the
grab level as a flag to tell screen switches not to change it again,
so that we don't need to switch scp->kbd_mode.  We did the latter,
but didn't have the complications to update the keyboard mode switch
for every screen switch.  sc->kbd_mode remains at its user setting
for all scp's and ungrabbing restores to it.
This commit is contained in:
Bruce Evans 2016-08-15 18:02:37 +00:00
parent 8b2246b349
commit 430320729d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/syscons/syscons.c
View File

@ -1649,6 +1649,7 @@ static void
sc_cngrab(struct consdev *cp)
{
scr_stat *scp;
int kbd_mode;
if (!cold &&
sc_console->sc->cur_scp->index != sc_console->index &&
@ -1670,11 +1671,9 @@ sc_cngrab(struct consdev *cp)
*/
kbdd_enable(scp->sc->kbd);
/* we shall always use the keyboard in the XLATE mode here */
scp->kbd_prev_mode = scp->kbd_mode;
scp->kbd_mode = K_XLATE;
(void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
/* Switch the keyboard to console mode (K_XLATE, polled) on all scp's. */
kbd_mode = K_XLATE;
(void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&kbd_mode);
kbdd_poll(scp->sc->kbd, TRUE);
}
@ -1690,10 +1689,10 @@ sc_cnungrab(struct consdev *cp)
if (--scp->sc->grab_level > 0)
return;
/* Restore keyboard mode (for the current, possibly-changed scp). */
kbdd_poll(scp->sc->kbd, FALSE);
scp->kbd_mode = scp->kbd_prev_mode;
(void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
kbdd_disable(scp->sc->kbd);
}
@ -2667,7 +2666,7 @@ exchange_scr(sc_softc_t *sc)
sc_set_border(scp, scp->border);
/* set up the keyboard for the new screen */
if (sc->old_scp->kbd_mode != scp->kbd_mode)
if (sc->grab_level == 0 && sc->old_scp->kbd_mode != scp->kbd_mode)
(void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode);
update_kbd_state(scp, scp->status, LOCK_MASK);
@ -3412,7 +3411,7 @@ next_code:
if (!(flags & SCGETC_CN))
random_harvest_queue(&c, sizeof(c), 1, RANDOM_KEYBOARD);
if (scp->kbd_mode != K_XLATE)
if (sc->grab_level == 0 && scp->kbd_mode != K_XLATE)
return KEYCHAR(c);
/* if scroll-lock pressed allow history browsing */

1
sys/dev/syscons/syscons.h
View File

@ -306,7 +306,6 @@ typedef struct scr_stat {
int status; /* status (bitfield) */
int kbd_mode; /* keyboard I/O mode */
int kbd_prev_mode; /* keyboard I/O mode */
int cursor_pos; /* cursor buffer position */
int cursor_oldpos; /* cursor old buffer position */