summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vtapplet/vt.cpp25
-rw-r--r--core/applets/vtapplet/vt.h1
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;
29#include <unistd.h> 29#include <unistd.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/stat.h> 31#include <sys/stat.h>
32#include <sys/ioctl.h> 32#include <sys/ioctl.h>
33#include <linux/vt.h> 33#include <linux/vt.h>
34 34
35VTApplet::VTApplet ( ) 35VTApplet::VTApplet()
36 : QObject ( 0, "VTApplet" ) 36 :QObject( 0, "VTApplet" ), m_ourVT( 0 )
37{ 37{
38} 38}
39 39
40VTApplet::~VTApplet ( ) 40VTApplet::~VTApplet()
41{ 41{
42} 42}
43 43
44int VTApplet::position ( ) const 44int VTApplet::position() const
45{ 45{
46 return 2; 46 return 2;
47} 47}
48 48
49QString VTApplet::name ( ) const 49QString VTApplet::name() const
50{ 50{
51 return tr( "VT shortcut" ); 51 return tr( "VT shortcut" );
52} 52}
53 53
54QString VTApplet::text ( ) const 54QString VTApplet::text() const
55{ 55{
56 return tr( "Terminal" ); 56 return tr( "Terminal" );
57} 57}
58 58
59/* 59/*
60QString VTApplet::tr( const char* s ) const 60QString VTApplet::tr( const char* s ) const
@@ -65,19 +65,19 @@ QString VTApplet::tr( const char* s ) const
65QString VTApplet::tr( const char* s, const char* p ) const 65QString VTApplet::tr( const char* s, const char* p ) const
66{ 66{
67 return qApp->translate( "VTApplet", s, p ); 67 return qApp->translate( "VTApplet", s, p );
68} 68}
69*/ 69*/
70 70
71QIconSet VTApplet::icon ( ) const 71QIconSet VTApplet::icon() const
72{ 72{
73 QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); 73 QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon );
74 return pix; 74 return pix;
75} 75}
76 76
77QPopupMenu *VTApplet::popup ( QWidget* parent ) const 77QPopupMenu *VTApplet::popup( QWidget* parent ) const
78{ 78{
79 odebug << "VTApplet::popup" << oendl; 79 odebug << "VTApplet::popup" << oendl;
80 80
81 struct vt_stat vtstat; 81 struct vt_stat vtstat;
82#ifdef QT_QWS_DEVFS 82#ifdef QT_QWS_DEVFS
83 int fd = ::open( "/dev/vc/0", O_RDWR ); 83 int fd = ::open( "/dev/vc/0", O_RDWR );
@@ -93,12 +93,14 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
93 { 93 {
94 int id = m_subMenu->insertItem( QString::number( i ), 500+i ); 94 int id = m_subMenu->insertItem( QString::number( i ), 500+i );
95 m_subMenu->setItemChecked( id, id-500 == vtstat.v_active ); 95 m_subMenu->setItemChecked( id, id-500 == vtstat.v_active );
96 } 96 }
97 ::close( fd ); 97 ::close( fd );
98 98
99 m_ourVT = vtstat.v_active;
100
99 connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); 101 connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
100 connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); 102 connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
101 103
102 return m_subMenu; 104 return m_subMenu;
103} 105}
104 106
@@ -111,12 +113,17 @@ void VTApplet::changeVT( int index )
111 int fd = ::open("/dev/vc/0", O_RDWR); 113 int fd = ::open("/dev/vc/0", O_RDWR);
112#else 114#else
113 int fd = ::open("/dev/tty0", O_RDWR); 115 int fd = ::open("/dev/tty0", O_RDWR);
114#endif 116#endif
115 if ( fd == -1 ) return; 117 if ( fd == -1 ) return;
116 ioctl( fd, VT_ACTIVATE, index-500 ); 118 ioctl( fd, VT_ACTIVATE, index-500 );
119 if ( m_ourVT )
120 {
121 odebug << "VTApplet::waiting for user to return to VT " << m_ourVT << oendl;
122 ioctl( fd, VT_WAITACTIVE, m_ourVT );
123 }
117} 124}
118 125
119 126
120void VTApplet::updateMenu() 127void VTApplet::updateMenu()
121{ 128{
122 //odebug << "VTApplet::updateMenu()" << oendl; 129 //odebug << "VTApplet::updateMenu()" << oendl;
@@ -145,13 +152,13 @@ void VTApplet::updateMenu()
145void VTApplet::activated() 152void VTApplet::activated()
146{ 153{
147 odebug << "VTApplet::activated()" << oendl; 154 odebug << "VTApplet::activated()" << oendl;
148} 155}
149 156
150 157
151QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 158QRESULT VTApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
152{ 159{
153 *iface = 0; 160 *iface = 0;
154 if ( uuid == IID_QUnknown ) 161 if ( uuid == IID_QUnknown )
155 *iface = this; 162 *iface = this;
156 else if ( uuid == IID_MenuApplet ) 163 else if ( uuid == IID_MenuApplet )
157 *iface = this; 164 *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:
43 43
44public slots: 44public slots:
45 virtual void changeVT( int index ); 45 virtual void changeVT( int index );
46 virtual void updateMenu(); 46 virtual void updateMenu();
47private: 47private:
48 mutable QPopupMenu* m_subMenu; 48 mutable QPopupMenu* m_subMenu;
49 mutable int m_ourVT;
49}; 50};
50 51
51 52
52#endif 53#endif