From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 04:32:26 +0000 (+0000)
Subject: [terminal] drop next_active_vt
X-Git-Tag: 0.8.0~53^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7efc4f2500fd56503c60cb29b6d76e0009dc388;p=thirdparty%2Fplymouth.git

[terminal] drop next_active_vt

When we activate our VT, now we actually have it in VT_PROCESS not the
VT we started from, we get the proper signal so don't need an ioctl to
wait until its active.

If we were to leave our VT, we'd get the opposite signal as well and
we don't really care whether we actually get to the other VT, just
that we leave ours.

And this code was in the wrong place anyway.
---

diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index e0baf2e0..3e54075a 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -65,7 +65,6 @@ struct _ply_terminal
   char *name;
   int   fd;
   int   vt_number;
-  int   next_active_vt;
 
   ply_list_t *vt_change_closures;
   ply_fd_watch_t *fd_watch;
@@ -336,12 +335,6 @@ on_leave_vt (ply_terminal_t *terminal)
 {
   ioctl (terminal->fd, VT_RELDISP, 1);
 
-  if (terminal->next_active_vt > 0)
-    {
-      ioctl (terminal->fd, VT_WAITACTIVE, terminal->next_active_vt);
-      terminal->next_active_vt = 0;
-    }
-
   terminal->is_active = false;
   do_active_vt_changed (terminal);
 }
@@ -688,8 +681,6 @@ set_active_vt (ply_terminal_t *terminal,
   if (ioctl (terminal->fd, VT_ACTIVATE, vt_number) < 0)
     return false;
 
-  terminal->next_active_vt = vt_number;
-
   return true;
 }