| -rw-r--r-- | core/applets/vtapplet/vt.cpp | 25 | ||||
| -rw-r--r-- | core/applets/vtapplet/vt.h | 1 |
2 files changed, 17 insertions, 9 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 @@ -29,32 +29,32 @@ using namespace Opie::Core; #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> #include <linux/vt.h> -VTApplet::VTApplet ( ) - : QObject ( 0, "VTApplet" ) +VTApplet::VTApplet() + :QObject( 0, "VTApplet" ), m_ourVT( 0 ) { } -VTApplet::~VTApplet ( ) +VTApplet::~VTApplet() { } -int VTApplet::position ( ) const +int VTApplet::position() const { return 2; } -QString VTApplet::name ( ) const +QString VTApplet::name() const { return tr( "VT shortcut" ); } -QString VTApplet::text ( ) const +QString VTApplet::text() const { return tr( "Terminal" ); } /* QString VTApplet::tr( const char* s ) const @@ -65,19 +65,19 @@ QString VTApplet::tr( const char* s ) const QString VTApplet::tr( const char* s, const char* p ) const { return qApp->translate( "VTApplet", s, p ); } */ -QIconSet VTApplet::icon ( ) const +QIconSet VTApplet::icon() const { QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); return pix; } -QPopupMenu *VTApplet::popup ( QWidget* parent ) const +QPopupMenu *VTApplet::popup( QWidget* parent ) const { odebug << "VTApplet::popup" << oendl; struct vt_stat vtstat; #ifdef QT_QWS_DEVFS int fd = ::open( "/dev/vc/0", O_RDWR ); @@ -93,12 +93,14 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const { int id = m_subMenu->insertItem( QString::number( i ), 500+i ); m_subMenu->setItemChecked( id, id-500 == vtstat.v_active ); } ::close( fd ); + m_ourVT = vtstat.v_active; + connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); return m_subMenu; } @@ -111,12 +113,17 @@ void VTApplet::changeVT( int index ) int fd = ::open("/dev/vc/0", O_RDWR); #else int fd = ::open("/dev/tty0", O_RDWR); #endif if ( fd == -1 ) return; 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 ); + } } void VTApplet::updateMenu() { //odebug << "VTApplet::updateMenu()" << oendl; @@ -145,13 +152,13 @@ void VTApplet::updateMenu() void VTApplet::activated() { odebug << "VTApplet::activated()" << oendl; } -QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) +QRESULT VTApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_MenuApplet ) *iface = this; 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 @@ -43,10 +43,11 @@ public: public slots: virtual void changeVT( int index ); virtual void updateMenu(); private: mutable QPopupMenu* m_subMenu; + mutable int m_ourVT; }; #endif |