summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/vtapplet/vt.cpp39
-rw-r--r--core/applets/vtapplet/vt.h1
2 files changed, 30 insertions, 10 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
@@ -29,14 +29,6 @@
#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 )
{
@@ -92,7 +84,7 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
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 )
{
@@ -102,6 +94,7 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
::close( fd );
connect( submenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
+ connect( submenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
return submenu;
}
@@ -109,13 +102,39 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
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()" );
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
@@ -43,6 +43,7 @@ public:
public slots:
virtual void changeVT( int index );
+ virtual void updateMenu();
private:
ulong ref;