| -rw-r--r-- | core/applets/vtapplet/vt.cpp | 9 | ||||
| -rw-r--r-- | core/applets/vtapplet/vt.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index 0d4e657..7885f83 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp @@ -35,3 +35,3 @@ using namespace Opie::Core; VTApplet::VTApplet ( ) - : QObject ( 0, "VTApplet" ) + :QObject( 0, "VTApplet" ), m_ourVT( 0 ) { @@ -98,2 +98,4 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const + m_ourVT = vtstat.v_active; + connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); @@ -116,2 +118,7 @@ void VTApplet::changeVT( int index ) ioctl( fd, VT_ACTIVATE, index-500 ); + if ( m_ourVT ) + { + odebug << "VTApplet::waiting for user to return to VT " << m_ourVT << oendl; + ioctl( fd, VT_WAITACTIVE, m_ourVT ); + } } diff --git a/core/applets/vtapplet/vt.h b/core/applets/vtapplet/vt.h index 4c92ddd..4fa73e5 100644 --- a/core/applets/vtapplet/vt.h +++ b/core/applets/vtapplet/vt.h @@ -48,2 +48,3 @@ private: mutable QPopupMenu* m_subMenu; + mutable int m_ourVT; }; |