FEATURE: vtapplet now indicates which virtual terminals are occupied

2 files changed, 31 insertions, 11 deletions

diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index 6200447..4cc2d60 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -8,56 +8,48 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
 #include "vt.h"
 
-class VTPopupMenu : public QPopupMenu
-{
-  public:
-    VTPopupMenu( QWidget * parent=0, const char * name=0 ) : QPopupMenu( parent, name ) {};
-
-  virtual void activated() { qDebug( "VTPopupMenu::activated()" ); }
-};
-
 VTApplet::VTApplet ( )
         : QObject ( 0, "VTApplet" ), ref ( 0 )
 {
 }
 
 VTApplet::~VTApplet ( )
 {
 }
 
 int VTApplet::position ( ) const
 {
     return 2;
 }
 
 QString VTApplet::name ( ) const
 {
         return tr( "VT shortcut" );
 }
 
 QString VTApplet::text ( ) const
 {
         return tr( "Terminal" );
 }
 
@@ -67,76 +59,103 @@ QString VTApplet::tr( const char* s ) const
     return qApp->translate( "VTApplet", s, 0 );
 }
 
 QString VTApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "VTApplet", s, p );
 }
 */
 
 QIconSet VTApplet::icon ( ) const
 {
         QPixmap pix;
         QImage img = Resource::loadImage ( "terminal" );
 
         if ( !img. isNull ( ))
                 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
         return pix;
 }
 
 QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 {
     qDebug( "VTApplet::popup" );
 
     struct vt_stat vtstat;
-    int fd = ::open("/dev/tty0", O_RDWR);
+    int fd = ::open( "/dev/tty0", O_RDWR );
     if ( fd == -1 ) return 0;
     if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0;
 
-    submenu = new VTPopupMenu( parent );
+    submenu = new QPopupMenu( parent );
     submenu->setCheckable( true );
     for ( int i = 1; i < 10; ++i )
     {
         int id = submenu->insertItem( QString::number( i ), 500+i );
         submenu->setItemChecked( id, id-500 == vtstat.v_active );
     }
     ::close( fd );
 
     connect( submenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
+    connect( submenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
 
     return submenu;
 }
 
 
 void VTApplet::changeVT( int index )
 {
-    qDebug( "VTApplet::changeVT( %d )", index-500 );
+    //qDebug( "VTApplet::changeVT( %d )", index-500 );
+
     int fd = ::open("/dev/tty0", O_RDWR);
     if ( fd == -1 ) return;
     ioctl( fd, VT_ACTIVATE, index-500 );
 }
 
 
+void VTApplet::updateMenu()
+{
+    //qDebug( "VTApplet::updateMenu()" );
+
+    int fd = ::open( "/dev/console", O_RDONLY );
+    if ( fd == -1 ) return;
+
+    for ( int i = 1; i < 10; ++i )
+    {
+        int result = ioctl( fd, VT_DISALLOCATE, i );
+
+        /*
+        if ( result == -1 )
+            qDebug( "VT %d disallocated == free", i );
+        else
+            qDebug( "VT %d _not_ disallocated == busy", i );
+        */
+
+        submenu->setItemEnabled( 500+i, result == -1 );
+    }
+
+    ::close( fd );
+}
+
+
 void VTApplet::activated()
 {
     qDebug( "VTApplet::activated()" );
 }
 
 
 QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
 
         if ( *iface )
                 (*iface)-> addRef ( );
         return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
         Q_CREATE_INSTANCE( VTApplet )
 }
 
diff --git a/core/applets/vtapplet/vt.h b/core/applets/vtapplet/vt.h
index 2df9791..6bdb9e0 100644
--- a/core/applets/vtapplet/vt.h
+++ b/core/applets/vtapplet/vt.h
@@ -22,32 +22,33 @@ class VTApplet : public QObject, public MenuAppletInterface
 {
 
     Q_OBJECT
 
 public:
     VTApplet ( );
     virtual ~VTApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
 
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     //virtual QString tr( const char* ) const;
     //virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
 
     virtual void activated ();
 
 public slots:
     virtual void changeVT( int index );
+    virtual void updateMenu();
 
 private:
     ulong ref;
 };
 
 static QPopupMenu* submenu;
 
 #endif