author | mickeyl <mickeyl> | 2005-06-20 15:48:41 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-20 15:48:41 (UTC) |
commit | 53e05ad30759aefd977e301c84b8b60a78819c76 (patch) (unidiff) | |
tree | 0a98e76e6d37c958dae43537dd371de320a6510f | |
parent | 3b02e2a868535628090567ed612d9fdb5b247f61 (diff) | |
download | opie-53e05ad30759aefd977e301c84b8b60a78819c76.zip opie-53e05ad30759aefd977e301c84b8b60a78819c76.tar.gz opie-53e05ad30759aefd977e301c84b8b60a78819c76.tar.bz2 |
an attempt to fix #1377
-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 | |||
@@ -24,25 +24,25 @@ using namespace Opie::Core; | |||
24 | /* QT */ | 24 | /* QT */ |
25 | #include <qpopupmenu.h> | 25 | #include <qpopupmenu.h> |
26 | 26 | ||
27 | /* STD */ | 27 | /* STD */ |
28 | #include <fcntl.h> | 28 | #include <fcntl.h> |
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 | ||
35 | VTApplet::VTApplet ( ) | 35 | VTApplet::VTApplet ( ) |
36 | : QObject ( 0, "VTApplet" ) | 36 | :QObject( 0, "VTApplet" ), m_ourVT( 0 ) |
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | VTApplet::~VTApplet ( ) | 40 | VTApplet::~VTApplet ( ) |
41 | { | 41 | { |
42 | } | 42 | } |
43 | 43 | ||
44 | int VTApplet::position ( ) const | 44 | int VTApplet::position ( ) const |
45 | { | 45 | { |
46 | return 2; | 46 | return 2; |
47 | } | 47 | } |
48 | 48 | ||
@@ -87,42 +87,49 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const | |||
87 | if ( fd == -1 ) return 0; | 87 | if ( fd == -1 ) return 0; |
88 | if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0; | 88 | if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0; |
89 | 89 | ||
90 | m_subMenu = new QPopupMenu( parent ); | 90 | m_subMenu = new QPopupMenu( parent ); |
91 | m_subMenu->setCheckable( true ); | 91 | m_subMenu->setCheckable( true ); |
92 | for ( int i = 1; i < 10; ++i ) | 92 | for ( int i = 1; i < 10; ++i ) |
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 | ||
105 | 107 | ||
106 | void VTApplet::changeVT( int index ) | 108 | void VTApplet::changeVT( int index ) |
107 | { | 109 | { |
108 | //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl; | 110 | //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl; |
109 | 111 | ||
110 | #ifdef QT_QWS_DEVFS | 112 | #ifdef QT_QWS_DEVFS |
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 | ||
120 | void VTApplet::updateMenu() | 127 | void VTApplet::updateMenu() |
121 | { | 128 | { |
122 | //odebug << "VTApplet::updateMenu()" << oendl; | 129 | //odebug << "VTApplet::updateMenu()" << oendl; |
123 | 130 | ||
124 | int fd = ::open( "/dev/console", O_RDONLY ); | 131 | int fd = ::open( "/dev/console", O_RDONLY ); |
125 | if ( fd == -1 ) return; | 132 | if ( fd == -1 ) return; |
126 | 133 | ||
127 | for ( int i = 1; i < 10; ++i ) | 134 | for ( int i = 1; i < 10; ++i ) |
128 | { | 135 | { |
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 | |||
@@ -37,16 +37,17 @@ public: | |||
37 | virtual QString text ( ) const; | 37 | virtual QString text ( ) const; |
38 | //virtual QString tr( const char* ) const; | 38 | //virtual QString tr( const char* ) const; |
39 | //virtual QString tr( const char*, const char* ) const; | 39 | //virtual QString tr( const char*, const char* ) const; |
40 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 40 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
41 | 41 | ||
42 | virtual void activated (); | 42 | virtual void activated (); |
43 | 43 | ||
44 | public slots: | 44 | public slots: |
45 | virtual void changeVT( int index ); | 45 | virtual void changeVT( int index ); |
46 | virtual void updateMenu(); | 46 | virtual void updateMenu(); |
47 | private: | 47 | private: |
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 |