summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-30 15:18:25 (UTC)
committer harlekin <harlekin>2002-08-30 15:18:25 (UTC)
commit2e1362616524463697dfe2693178a698ccc713ec (patch) (unidiff)
treefd7d05256716b33de05705451105336dfcc29571
parenta4ad4c4ec7227d7ac0e62da71972f35672a6692f (diff)
downloadopie-2e1362616524463697dfe2693178a698ccc713ec.zip
opie-2e1362616524463697dfe2693178a698ccc713ec.tar.gz
opie-2e1362616524463697dfe2693178a698ccc713ec.tar.bz2
some more debug stuff out
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 367ef3b..583f2da 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -158,158 +158,158 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
158 if ( msg == "stabChanged()" ) { 158 if ( msg == "stabChanged()" ) {
159 // qDebug("Pcmcia: stabchanged"); 159 // qDebug("Pcmcia: stabchanged");
160 if ( getStatusPcmcia() ) { 160 if ( getStatusPcmcia() ) {
161 repaint( FALSE ); 161 repaint( FALSE );
162 } 162 }
163 } else if ( msg == "mtabChanged()" ) { 163 } else if ( msg == "mtabChanged()" ) {
164 qDebug("CARDMONAPPLET: mtabchanged"); 164 qDebug("CARDMONAPPLET: mtabchanged");
165 if ( getStatusSd() ) { 165 if ( getStatusSd() ) {
166 repaint( FALSE ); 166 repaint( FALSE );
167 } 167 }
168 } 168 }
169} 169}
170 170
171bool CardMonitor::getStatusPcmcia( int showPopUp ) { 171bool CardMonitor::getStatusPcmcia( int showPopUp ) {
172 172
173 bool cardWas0 = cardInPcmcia0; // remember last state 173 bool cardWas0 = cardInPcmcia0; // remember last state
174 bool cardWas1 = cardInPcmcia1; 174 bool cardWas1 = cardInPcmcia1;
175 175
176 QString fileName; 176 QString fileName;
177 177
178 // one of these 3 files should exist 178 // one of these 3 files should exist
179 if ( QFile::exists( "/var/run/stab" ) ) { 179 if ( QFile::exists( "/var/run/stab" ) ) {
180 fileName = "/var/run/stab"; 180 fileName = "/var/run/stab";
181 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) { 181 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) {
182 fileName = "/var/state/pcmcia/stab"; 182 fileName = "/var/state/pcmcia/stab";
183 } else { 183 } else {
184 fileName = "/var/lib/pcmcia/stab"; 184 fileName = "/var/lib/pcmcia/stab";
185 } 185 }
186 186
187 QFile f( fileName ); 187 QFile f( fileName );
188 188
189 if ( f.open( IO_ReadOnly ) ) { 189 if ( f.open( IO_ReadOnly ) ) {
190 QStringList list; 190 QStringList list;
191 QTextStream stream ( &f ); 191 QTextStream stream ( &f );
192 QString streamIn; 192 QString streamIn;
193 streamIn = stream.read(); 193 streamIn = stream.read();
194 list = QStringList::split( "\n", streamIn ); 194 list = QStringList::split( "\n", streamIn );
195 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) { 195 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
196 if( (*line).startsWith( "Socket 0:" ) ){ 196 if( (*line).startsWith( "Socket 0:" ) ){
197 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){ 197 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){
198 cardInPcmcia0 = FALSE; 198 cardInPcmcia0 = FALSE;
199 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){ 199 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
200 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 ); 200 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );
201 cardInPcmcia0Name.stripWhiteSpace(); 201 cardInPcmcia0Name.stripWhiteSpace();
202 cardInPcmcia0 = TRUE; 202 cardInPcmcia0 = TRUE;
203 show(); 203 show();
204 line++; 204 line++;
205 int pos=(*line).find('\t' ) + 1; 205 int pos=(*line).find('\t' ) + 1;
206 cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); 206 cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
207 } 207 }
208 } else if( (*line).startsWith( "Socket 1:" ) ){ 208 } else if( (*line).startsWith( "Socket 1:" ) ){
209 if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) { 209 if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) {
210 cardInPcmcia1 = FALSE; 210 cardInPcmcia1 = FALSE;
211 } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) { 211 } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) {
212 cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 ); 212 cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 );
213 cardInPcmcia1Name.stripWhiteSpace(); 213 cardInPcmcia1Name.stripWhiteSpace();
214 cardInPcmcia1 = TRUE; 214 cardInPcmcia1 = TRUE;
215 show(); 215 show();
216 line++; 216 line++;
217 int pos=(*line).find('\t') + 1; 217 int pos=(*line).find('\t') + 1;
218 cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos ); 218 cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
219 } 219 }
220 } 220 }
221 } 221 }
222 f.close(); 222 f.close();
223 223
224 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) { 224 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) {
225 QString text = QString::null; 225 QString text = QString::null;
226 QString what = QString::null; 226 QString what = QString::null;
227 if(cardWas0 != cardInPcmcia0) { 227 if(cardWas0 != cardInPcmcia0) {
228 if(cardInPcmcia0) { 228 if(cardInPcmcia0) {
229 text += tr( "New card: " ); 229 text += tr( "New card: " );
230 what="on"; 230 what="on";
231 } else { 231 } else {
232 text += tr( "Ejected: " ); 232 text += tr( "Ejected: " );
233 what="off"; 233 what="off";
234 } 234 }
235 text += cardInPcmcia0Name; 235 text += cardInPcmcia0Name;
236 popUp( text, "cardmon/" + cardInPcmcia0Type ); 236 popUp( text, "cardmon/" + cardInPcmcia0Type );
237 } 237 }
238 238
239 if( cardWas1 != cardInPcmcia1) { 239 if( cardWas1 != cardInPcmcia1) {
240 if( cardInPcmcia1) { 240 if( cardInPcmcia1) {
241 text += tr( "New card: " ); 241 text += tr( "New card: " );
242 what = "on"; 242 what = "on";
243 } else { 243 } else {
244 text += tr( "Ejected: " ); 244 text += tr( "Ejected: " );
245 what = "off"; 245 what = "off";
246 } 246 }
247 text += cardInPcmcia1Name; 247 text += cardInPcmcia1Name;
248 popUp( text, "cardmon/" + cardInPcmcia1Type ); 248 popUp( text, "cardmon/" + cardInPcmcia1Type );
249 } 249 }
250 QSound::play( Resource::findSound( "cardmon/card" + what) ); 250 QSound::play( Resource::findSound( "cardmon/card" + what) );
251 } 251 }
252 } else { 252 } else {
253 // no file found 253 // no file found
254 qDebug("no file found"); 254 qDebug( "no file found" );
255 cardInPcmcia0 = FALSE; 255 cardInPcmcia0 = FALSE;
256 cardInPcmcia1 = FALSE; 256 cardInPcmcia1 = FALSE;
257 } 257 }
258 return ( (cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); 258 return ( (cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
259} 259}
260 260
261 261
262bool CardMonitor::getStatusSd( int showPopUp ) { 262bool CardMonitor::getStatusSd( int showPopUp ) {
263 263
264 bool cardWas = cardInSd; // remember last state 264 bool cardWas = cardInSd; // remember last state
265 265
266#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 266#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
267 struct mntent *me; 267 struct mntent *me;
268 FILE *mntfp = setmntent( "/etc/mtab", "r" ); 268 FILE *mntfp = setmntent( "/etc/mtab", "r" );
269 269
270 if ( mntfp ) { 270 if ( mntfp ) {
271 while ( ( me = getmntent( mntfp ) ) != 0 ) { 271 while ( ( me = getmntent( mntfp ) ) != 0 ) {
272 QString fs = me->mnt_fsname; 272 QString fs = me->mnt_fsname;
273 qDebug( fs ); 273 //qDebug( fs );
274 if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) { 274 if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) {
275 cardInSd = TRUE; 275 cardInSd = TRUE;
276 show(); 276 show();
277 } else { 277 } else {
278 cardInSd = FALSE; 278 cardInSd = FALSE;
279 } 279 }
280 } 280 }
281 endmntent( mntfp ); 281 endmntent( mntfp );
282 } 282 }
283 283
284 if( !showPopUp && cardWas != cardInSd ) { 284 if( !showPopUp && cardWas != cardInSd ) {
285 QString text = QString::null; 285 QString text = QString::null;
286 QString what = QString::null; 286 QString what = QString::null;
287 if( cardInSd ) { 287 if( cardInSd ) {
288 text += "SD Inserted"; 288 text += "SD Inserted";
289 what = "on"; 289 what = "on";
290 } else { 290 } else {
291 text += "SD Removed"; 291 text += "SD Removed";
292 what = "off"; 292 what = "off";
293 } 293 }
294 qDebug("TEXT: " + text ); 294 //qDebug("TEXT: " + text );
295 QSound::play( Resource::findSound( "cardmon/card" + what ) ); 295 QSound::play( Resource::findSound( "cardmon/card" + what ) );
296 popUp( text, "cardmon/ide" ); // XX add SD pic 296 popUp( text, "cardmon/ide" ); // XX add SD pic
297 } 297 }
298#else 298#else
299#error "Not on Linux" 299#error "Not on Linux"
300#endif 300#endif
301 return ( ( cardWas == cardInSd) ? FALSE : TRUE ); 301 return ( ( cardWas == cardInSd) ? FALSE : TRUE );
302} 302}
303 303
304void CardMonitor::paintEvent( QPaintEvent * ) { 304void CardMonitor::paintEvent( QPaintEvent * ) {
305 305
306 QPainter p( this ); 306 QPainter p( this );
307 307
308 if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { 308 if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
309 p.drawPixmap( 0, 0, pm ); 309 p.drawPixmap( 0, 0, pm );
310 show(); 310 show();
311 } else { 311 } else {
312 p.eraseRect( rect() ); 312 p.eraseRect( rect() );
313 hide(); 313 hide();
314 } 314 }
315} 315}