upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vt(4): Always call vt_window_switch() in vtterm_cnungrab()

Browse source 
[Why]
This ensures that vtterm_cnungrab() is the mirror of vtterm_cngrab().
And the latter always call vt_window_switch() and thus the backend's
vd_postswitch().

This makes sure that whatever the backend did during vtterm_cngrab(), it
can undo it during vtterm_cnungrab().

Reviewed by:	manu
Approved by:	manu
Differential Revision:	https://reviews.freebsd.org/D42752

(cherry picked from commit f18b3ce0b7be0b24a743ec59077ca8e7929a353c)
This commit is contained in:
Jean-Sébastien Pédron 2023-11-24 18:30:35 +01:00 committed by Vladimir Kondratyev
parent 2567cf1925
commit fc00c03779
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/dev/vt/vt_core.c
View file

@ -2046,7 +2046,7 @@ static void
vtterm_cnungrab(struct terminal *tm)
{
struct vt_device *vd;
struct vt_window *vw;
struct vt_window *vw, *grabwindow;
vw = tm->tm_softc;
vd = vw->vw_device;
@ -2055,10 +2055,19 @@ vtterm_cnungrab(struct terminal *tm)
if (vtterm_cnungrab_noswitch(vd, vw) != 0)
return;
if (!cold && vd->vd_grabwindow != vw)
vt_window_switch(vd->vd_grabwindow);
/*
* We set `vd_grabwindow` to NULL before calling vt_window_switch()
* because it allows the underlying vt(4) backend to distinguish a
* "grab" from an "ungrab" of the console.
*
* This is used by `vt_drmfb` in drm-kmod to call either
* fb_debug_enter() or fb_debug_leave() appropriately.
*/
grabwindow = vd->vd_grabwindow;
vd->vd_grabwindow = NULL;
if (!cold)
vt_window_switch(grabwindow);
}
static void