From e7c8e7b5312dd8e05991ae9a7301f5749bf259c7 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 5 Nov 2012 14:18:41 +0100 Subject: uterm: vt: allow VT-deactivation to fail If we dispatch VT-deactivation to child-processes, we might allow them to abort the VT-switch, so the upper layer (uterm_vt) must also allow us to abort the VT-switch. During shutdown, we need to force the deactivation to guarantee that a VT is inactive during shutdown. Signed-off-by: David Herrmann --- src/kmscon_seat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/kmscon_seat.c') diff --git a/src/kmscon_seat.c b/src/kmscon_seat.c index 1d5c302..117b7e9 100644 --- a/src/kmscon_seat.c +++ b/src/kmscon_seat.c @@ -281,13 +281,14 @@ static void seat_remove_display(struct kmscon_seat *seat, free(d); } -static int seat_vt_event(struct uterm_vt *vt, unsigned int event, void *data) +static int seat_vt_event(struct uterm_vt *vt, struct uterm_vt_event *ev, + void *data) { struct kmscon_seat *seat = data; struct shl_dlist *iter; struct kmscon_display *d; - switch (event) { + switch (ev->action) { case UTERM_VT_ACTIVATE: seat->awake = true; if (seat->cb) -- cgit v1.2.3