comment out grabKeyboard stuff till that function works properly

5 files changed, 90 insertions, 11 deletions

diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index ab46a7d..b9e438b 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -45,7 +45,9 @@ extern MediaPlayerState *mediaPlayerState;
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
-    QPEApplication::grabKeyboard();
+
+//    QPEApplication::grabKeyboard();
+    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
@@ -60,8 +62,6 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
 
 MediaPlayer::~MediaPlayer() {
-    QPEApplication::grabKeyboard();
-    QPEApplication::ungrabKeyboard();
 }
 
 
@@ -185,3 +185,35 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
         AudioDevice::decreaseVolume();
 }
 
+void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
+    switch ( e->key() ) {
+////////////////////////////// Zaurus keys
+      case Key_Home:
+          break;
+      case Key_F9: //activity
+          break;
+      case Key_F10: //contacts
+          break;
+      case Key_F11: //menu
+          break;
+      case Key_F12: //home
+          qDebug("Blank here");
+          break;
+      case Key_F13: //mail
+          break;
+    }
+}
+
+void MediaPlayer::doBlank() {
+
+}
+
+void MediaPlayer::doUnblank() {
+
+}
+
+void MediaPlayer::cleanUp() {
+//     QPEApplication::grabKeyboard();
+//     QPEApplication::ungrabKeyboard();
+
+}
diff --git a/core/multimedia/opieplayer/mediaplayer.h b/core/multimedia/opieplayer/mediaplayer.h
index 0354d21..cf9daea 100644
--- a/core/multimedia/opieplayer/mediaplayer.h
+++ b/core/multimedia/opieplayer/mediaplayer.h
@@ -47,8 +47,10 @@ private slots:
 
 protected:
     void timerEvent( QTimerEvent *e );
-//    void keyReleaseEvent( QKeyEvent *e);
-
+    void keyReleaseEvent( QKeyEvent *e);
+    void doBlank();
+    void doUnblank();
+    void cleanUp();
 private:
     int     volumeDirection;
     const DocLnk  *currentFile;
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index faa6e3f..70b7cef 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -19,6 +19,7 @@
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
 #define QTOPIA_INTERNAL_FSLP
+#include <qpe/qcopenvelope_qws.h>
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -62,6 +63,17 @@
 #include "audiowidget.h"
 #include "videowidget.h"
 
+#include <unistd.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/soundcard.h>
+
+// for setBacklight()
+#include <linux/fb.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
@@ -1053,14 +1065,43 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_F9: //activity
-          if(audioUI->isHidden())
-            audioUI->showMaximized();
+//           if(audioUI->isHidden())
+//             audioUI->showMaximized();
           break;
       case Key_F10: //contacts
-          if( videoUI->isHidden())
-            videoUI->showMaximized();
-          
+//           if( videoUI->isHidden())
+//             videoUI->showMaximized();
+          break;
+      case Key_F11: //menu
+          break;
+      case Key_F12: //home
+//           doBlank();
+          break;
+      case Key_F13: //mail
+//           doUnblank();
           break;
         
     }
 }
+
+void PlayListWidget::doBlank() {
+      qDebug("do blanking");
+    fd=open("/dev/fb0",O_RDWR);
+        if (fd != -1) {
+            ioctl(fd,FBIOBLANK,1);
+//            close(fd);
+        }
+}
+
+void PlayListWidget::doUnblank() {
+      // this crashes opieplayer with a segfault
+//      int fd;
+//       fd=open("/dev/fb0",O_RDWR);
+          qDebug("do unblanking");
+       if (fd != -1) {
+          ioctl(fd,FBIOBLANK,0);
+          close(fd);
+      }
+       QCopEnvelope h("QPE/System", "setBacklight(int)");
+       h <<-3;// v[1]; // -3 Force on
+}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 16b9905..f22770f 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -57,6 +57,7 @@ public:
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
+    int fd;
 public slots:
     bool first();
     bool last();
@@ -69,6 +70,9 @@ protected:
 /*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
 void keyReleaseEvent( QKeyEvent *e);
 private:
+    void doBlank();
+    void doUnblank();
+ 
     void initializeStates();
     void readConfig( Config& cfg );
     void writeConfig( Config& cfg ) const;
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index d0cb764..3bce996 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -432,7 +432,7 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
-          hide();
+//           hide();
           break;
       case Key_F11: //menu
           break;