summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-08 23:22:51 (UTC)
committer mickeyl <mickeyl>2004-01-08 23:22:51 (UTC)
commit9fc7d401f1445c5f3d3d74e173dea6de2ea4784a (patch) (unidiff)
tree2c5576c866e8e90a8e5e5efe53e1a5955156b6a5
parentb52dbdb9e992bd891d69601a6425086099e2ea04 (diff)
downloadopie-9fc7d401f1445c5f3d3d74e173dea6de2ea4784a.zip
opie-9fc7d401f1445c5f3d3d74e173dea6de2ea4784a.tar.gz
opie-9fc7d401f1445c5f3d3d74e173dea6de2ea4784a.tar.bz2
turn on the light after opening the hinge when 'display off' is configured as hinge action
NOTE: I think there's a bug in the Embedix kernel which either tells a wrong hinge value after suspend or sends out a double (bogus) keycode event on closing the hinge. How to reproduce: 1.) Configure "suspend" as closeHingeAction 2.) Close Display --> Device Suspends 3.) Open Display --> Device does nothing (needs a kernel patch to wake up automatically, but that's another story) 4.) Wakeup Device --> Device sends F14 to rotateApplet, rotateApplet reads hinge code... it's CLOSED(!) - which is wrong 5.) Device resuspends. 6.) Wakeup again --> Device sends F14 (huh, again?) to rotateApplet. rotateApplet reads hinge code... it's OPEN now - which is ok. Ideas?
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp27
-rw-r--r--core/applets/rotateapplet/rotate.h4
2 files changed, 24 insertions, 7 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 79098d4..d8081a6 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -1,237 +1,254 @@
1/* 1/*
2 This file is part of the OPIE Project 2 This file is part of the OPIE Project
3 Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> 3 Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org>
4 Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> 4 Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net>
5               =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> 5               =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de>
6             .=l. 6             .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This library is free software; you can 8 _;:,     .>    :=|. This library is free software; you can
9.> <,   >  .   <= redistribute it and/or modify it under 9.> <,   >  .   <= redistribute it and/or modify it under
10:=1 )Y*s>-.--   : the terms of the GNU Library General Public 10:=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%+i>       _;_. 14    .%+i>       _;_.
15    .i_,=:_.      -<s. This library is distributed in the hope that 15    .i_,=:_.      -<s. This library is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=| MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=| MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .     .: details. 21++=   -.     .     .: details.
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-= this library; see the file COPYING.LIB. 25    --        :-= this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29*/ 29*/
30 30
31#include "rotate.h" 31#include "rotate.h"
32 32
33/* OPIE */ 33/* OPIE */
34#include <opie/odevice.h> 34#include <opie/odevice.h>
35#include <qpe/applnk.h> 35#include <qpe/applnk.h>
36#include <qpe/config.h> 36#include <qpe/config.h>
37#include <qpe/power.h> 37#include <qpe/power.h>
38#include <qpe/qpeapplication.h> 38#include <qpe/qpeapplication.h>
39#include <qpe/qcopenvelope_qws.h> 39#include <qpe/qcopenvelope_qws.h>
40#include <qpe/resource.h> 40#include <qpe/resource.h>
41using namespace Opie;
41 42
42/* QT */ 43/* QT */
43#include <qiconset.h> 44#include <qiconset.h>
44#include <qpopupmenu.h> 45#include <qpopupmenu.h>
45 46
46using namespace Opie; 47#include <time.h>
47 48
48RotateApplet::RotateApplet() 49RotateApplet::RotateApplet()
49 :QObject( 0, "RotateApplet" ), ref( 0 ), m_flipped( false ) 50 :QObject( 0, "RotateApplet" ), ref( 0 ), m_flipped( false )
50{ 51{
51 52
52#if !defined(QT_NO_COP) 53#if !defined(QT_NO_COP)
53 QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); 54 QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
54 connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ), 55 connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
55 this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); 56 this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
56#endif 57#endif
57 58
58} 59}
59 60
60RotateApplet::~RotateApplet ( ) 61RotateApplet::~RotateApplet ( )
61{} 62{}
62 63
63/** 64/**
64 * Qcop receive method. 65 * Qcop receive method.
65 */ 66 */
66void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) 67void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data )
67{ 68{
68 qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg ); 69 qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg );
69 70
70 if ( ODevice::inst()->hasHingeSensor() ) 71 if ( ODevice::inst()->hasHingeSensor() )
71 { 72 {
73 struct timespec interval;
74 struct timespec remain;
75 interval.tv_sec = 0;
76 interval.tv_nsec = 600;
77 ::nanosleep( &interval, &remain );
72 OHingeStatus status = ODevice::inst()->readHingeSensor(); 78 OHingeStatus status = ODevice::inst()->readHingeSensor();
73 qDebug( "RotateApplet::readHingeSensor = %d", (int) status ); 79 qDebug( "RotateApplet::readHingeSensor = %d", (int) status );
80
81 Config cfg( "apm" );
82 cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
83 int action = cfg.readNumEntry( "CloseHingeAction", 0 );
84
74 if ( status == CASE_CLOSED ) 85 if ( status == CASE_CLOSED )
75 { 86 {
76 Config cfg( "apm" );
77 cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
78 int action = cfg.readNumEntry( "CloseHingeAction", 0 );
79 switch ( action ) 87 switch ( action )
80 { 88 {
81 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break; 89 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break;
82 case 2: /* SUSPEND */ ODevice::inst()->suspend(); break; 90 case 2: /* SUSPEND */ ODevice::inst()->suspend(); break;
83 default: /* IGNORE */ break; 91 default: /* IGNORE */ break;
84 } 92 }
85 qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) );
86 } 93 }
94 else /* status != CASE_CLOSED */
95 {
96 switch ( action )
97 {
98 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break;
99 case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break;
100 default: /* IGNORE */ break;
101 }
102 }
103 qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) );
87 } 104 }
88 105
89 QDataStream stream( data, IO_ReadOnly ); 106 QDataStream stream( data, IO_ReadOnly );
90 if ( msg == "flip()" ) 107 if ( msg == "flip()" )
91 { 108 {
92 activated ( ); 109 activated ( );
93 } 110 }
94 else if ( msg == "rotateDefault()") 111 else if ( msg == "rotateDefault()")
95 { 112 {
96 rotateDefault(); 113 rotateDefault();
97 } 114 }
98} 115}
99 116
100int RotateApplet::position() const 117int RotateApplet::position() const
101{ 118{
102 return 3; 119 return 3;
103} 120}
104 121
105QString RotateApplet::name() const 122QString RotateApplet::name() const
106{ 123{
107 return tr( "Rotate shortcut" ); 124 return tr( "Rotate shortcut" );
108} 125}
109 126
110QString RotateApplet::text() const 127QString RotateApplet::text() const
111{ 128{
112 return tr( "Rotate" ); 129 return tr( "Rotate" );
113} 130}
114 131
115/*QString RotateApplet::tr( const char* s ) const 132/*QString RotateApplet::tr( const char* s ) const
116{ 133{
117 return qApp->translate( "RotateApplet", s, 0 ); 134 return qApp->translate( "RotateApplet", s, 0 );
118} 135}
119 136
120QString RotateApplet::tr( const char* s, const char* p ) const 137QString RotateApplet::tr( const char* s, const char* p ) const
121{ 138{
122 return qApp->translate( "RotateApplet", s, p ); 139 return qApp->translate( "RotateApplet", s, p );
123} 140}
124*/ 141*/
125 142
126QIconSet RotateApplet::icon() const 143QIconSet RotateApplet::icon() const
127{ 144{
128 QPixmap pix; 145 QPixmap pix;
129 QImage img = Resource::loadImage( "Rotation" ); 146 QImage img = Resource::loadImage( "Rotation" );
130 if ( !img.isNull() ) 147 if ( !img.isNull() )
131 pix.convertFromImage( img.smoothScale( 14, 14 ) ); 148 pix.convertFromImage( img.smoothScale( 14, 14 ) );
132 return pix; 149 return pix;
133} 150}
134 151
135QPopupMenu* RotateApplet::popup(QWidget*) const 152QPopupMenu* RotateApplet::popup(QWidget*) const
136{ 153{
137 return 0; 154 return 0;
138} 155}
139 156
140void RotateApplet::rotateDefault() 157void RotateApplet::rotateDefault()
141{ 158{
142 int rot = ODevice::inst()->rotation(); 159 int rot = ODevice::inst()->rotation();
143 160
144 switch (rot) 161 switch (rot)
145 { 162 {
146 case Rot0: rot=0; break; 163 case Rot0: rot=0; break;
147 case Rot90: rot=90; break; 164 case Rot90: rot=90; break;
148 case Rot180: rot=180; break; 165 case Rot180: rot=180; break;
149 case Rot270: rot=270; break; 166 case Rot270: rot=270; break;
150 default: rot=0; break; 167 default: rot=0; break;
151 } 168 }
152 169
153 Config cfg( "qpe" ); 170 Config cfg( "qpe" );
154 cfg.setGroup( "Appearance" ); 171 cfg.setGroup( "Appearance" );
155 172
156 bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true ); 173 bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true );
157 174
158 if ( !rotateEnabled) return; 175 if ( !rotateEnabled) return;
159 176
160 // hide inputs methods before rotation 177 // hide inputs methods before rotation
161 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); 178 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
162 179
163 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); 180 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
164 env << rot; 181 env << rot;
165 182
166 m_flipped = false; 183 m_flipped = false;
167 184
168} 185}
169void RotateApplet::activated() 186void RotateApplet::activated()
170{ 187{
171 int defaultRotation = QPEApplication::defaultRotation(); 188 int defaultRotation = QPEApplication::defaultRotation();
172 int newRotation = defaultRotation; 189 int newRotation = defaultRotation;
173 190
174 Config cfg( "qpe" ); 191 Config cfg( "qpe" );
175 cfg.setGroup( "Appearance" ); 192 cfg.setGroup( "Appearance" );
176 193
177 int rotDirection = cfg.readNumEntry( "rotatedir" ); 194 int rotDirection = cfg.readNumEntry( "rotatedir" );
178 ODirection rot = CW; 195 ODirection rot = CW;
179 196
180 if (rotDirection == -1) 197 if (rotDirection == -1)
181 { 198 {
182 rot = ODevice::inst()->direction(); 199 rot = ODevice::inst()->direction();
183 } 200 }
184 else 201 else
185 { 202 {
186 rot = (ODirection) rotDirection; 203 rot = (ODirection) rotDirection;
187 } 204 }
188 205
189 // hide inputs methods before rotation 206 // hide inputs methods before rotation
190 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); 207 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
191 208
192 if ( m_flipped ) 209 if ( m_flipped )
193 { 210 {
194 // if flipped, flip back to the original state, 211 // if flipped, flip back to the original state,
195 // regardless of rotation direction 212 // regardless of rotation direction
196 newRotation = defaultRotation; 213 newRotation = defaultRotation;
197 } 214 }
198 else 215 else
199 { 216 {
200 if ( rot == CCW ) 217 if ( rot == CCW )
201 { 218 {
202 newRotation = ( defaultRotation + 90 ) % 360; 219 newRotation = ( defaultRotation + 90 ) % 360;
203 } 220 }
204 else if ( rot == CW ) 221 else if ( rot == CW )
205 { 222 {
206 newRotation = ( defaultRotation + 270 ) % 360; 223 newRotation = ( defaultRotation + 270 ) % 360;
207 } 224 }
208 else if ( rot == Flip ) 225 else if ( rot == Flip )
209 { 226 {
210 newRotation = ( defaultRotation + 180 ) % 360; 227 newRotation = ( defaultRotation + 180 ) % 360;
211 } 228 }
212 } 229 }
213 230
214 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); 231 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
215 env << newRotation; 232 env << newRotation;
216 233
217 m_flipped = !m_flipped; 234 m_flipped = !m_flipped;
218} 235}
219 236
220 237
221QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 238QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
222{ 239{
223 *iface = 0; 240 *iface = 0;
224 if ( uuid == IID_QUnknown ) 241 if ( uuid == IID_QUnknown )
225 *iface = this; 242 *iface = this;
226 else if ( uuid == IID_MenuApplet ) 243 else if ( uuid == IID_MenuApplet )
227 *iface = this; 244 *iface = this;
228 245
229 if ( *iface ) 246 if ( *iface )
230 (*iface)->addRef(); 247 (*iface)->addRef();
231 return QS_OK; 248 return QS_OK;
232} 249}
233 250
234Q_EXPORT_INTERFACE() 251Q_EXPORT_INTERFACE()
235{ 252{
236 Q_CREATE_INSTANCE( RotateApplet ) 253 Q_CREATE_INSTANCE( RotateApplet )
237} 254}
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h
index 572b82a..4403c7d 100644
--- a/core/applets/rotateapplet/rotate.h
+++ b/core/applets/rotateapplet/rotate.h
@@ -1,72 +1,72 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org> 3             .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This library is free software; you can 5 _;:,     .>    :=|. This library is free software; you can
6.> <_,   >  .   <= redistribute it and/or modify it under 6.> <_,   >  .   <= redistribute it and/or modify it under
7:=1 )Y*s>-.--   : the terms of the GNU Library General Public 7:=1 )Y*s>-.--   : the terms of the GNU Library General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%+i>       _;_. 11    .%+i>       _;_.
12    .i_,=:_.      -<s. This library is distributed in the hope that 12    .i_,=:_.      -<s. This library is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=| MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=| MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>: PARTICULAR PURPOSE. See the GNU 16  _.=:.       :    :=>: PARTICULAR PURPOSE. See the GNU
17..}^=.=       =       ; Library General Public License for more 17..}^=.=       =       ; Library General Public License for more
18++=   -.     .     .: details. 18++=   -.     .     .: details.
19 :     =  ...= . :.=- 19 :     =  ...= . :.=-
20 -.   .:....=;==+<; You should have received a copy of the GNU 20 -.   .:....=;==+<; You should have received a copy of the GNU
21  -_. . .   )=.  = Library General Public License along with 21  -_. . .   )=.  = Library General Public License along with
22    --        :-= this library; see the file COPYING.LIB. 22    --        :-= this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation, 23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330, 24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29 29
30 30
31#ifndef __OPIE_ROTATE_APPLET_H__ 31#ifndef __OPIE_ROTATE_APPLET_H__
32#define __OPIE_ROTATE_APPLET_H__ 32#define __OPIE_ROTATE_APPLET_H__
33 33
34#include <qpe/menuappletinterface.h> 34#include <qpe/menuappletinterface.h>
35#include <qobject.h> 35#include <qobject.h>
36 36
37#include <qobject.h> 37#include <qobject.h>
38 38
39class RotateApplet : public QObject, public MenuAppletInterface 39class RotateApplet : public QObject, public MenuAppletInterface
40{ 40{
41 41
42 Q_OBJECT 42 Q_OBJECT
43 43
44public: 44public:
45 RotateApplet ( ); 45 RotateApplet ( );
46 virtual ~RotateApplet ( ); 46 virtual ~RotateApplet ( );
47 47
48 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 48 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
49 Q_REFCOUNT 49 Q_REFCOUNT
50 50
51 virtual int position() const; 51 virtual int position() const;
52 52
53 virtual QString name ( ) const; 53 virtual QString name ( ) const;
54 virtual QIconSet icon ( ) const; 54 virtual QIconSet icon ( ) const;
55 virtual QString text ( ) const; 55 virtual QString text ( ) const;
56 /* virtual QString tr( const char* ) const; 56 /* virtual QString tr( const char* ) const;
57 virtual QString tr( const char*, const char* ) const; 57 virtual QString tr( const char*, const char* ) const;
58 */ 58 */
59 virtual QPopupMenu *popup ( QWidget *parent ) const; 59 virtual QPopupMenu *popup ( QWidget *parent ) const;
60 virtual void activated ( ); 60 virtual void activated ( );
61 virtual void rotateDefault ( ); 61 virtual void rotateDefault ( );
62 62
63private slots: 63private slots:
64 void channelReceived( const QCString &msg, const QByteArray & data ); 64 void channelReceived( const QCString &msg, const QByteArray & data );
65 65
66private: 66private:
67 ulong ref; 67 ulong ref;
68 bool m_flipped; 68 bool m_flipped;
69 69
70}; 70};
71 71
72#endif 72#endif