click in fullscreen leeds to going back to the normal videowidget now

5 files changed, 67 insertions, 56 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 93819f2..22afe19 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -68,13 +68,13 @@ void MediaPlayer::play() {
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
-        //mediaPlayerState->setPaused( TRUE );
+        // mediaPlayerState->setPaused( FALSE );
         return;
     }
 
      if ( mediaPlayerState->paused() ) {
          mediaPlayerState->setPaused( FALSE );
          return;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 238770b..c2080e6 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -81,13 +81,15 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
+
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+    connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
 
     QString skinPath = "opieplayer2/skins/" + skin;
@@ -340,14 +342,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
                     } else {
-                        //  setToggleButton( i, TRUE );
-                        // mediaPlayerState->setPlaying( videoButtons[i].isDown );
+                        return;
                     }
                 }
 
                 case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
                 case VideoNext:       mediaPlayerState->setNext(); return;
                 case VideoPrevious:   mediaPlayerState->setPrev(); return;
@@ -375,26 +376,32 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
+ void VideoWidget::backToNormal() {
+     mediaPlayerState->setFullscreen( FALSE );
+     makeVisible();
+ }
+
 void VideoWidget::makeVisible() {
-  if ( mediaPlayerState->fullscreen() ) {
-    setBackgroundMode( QWidget::NoBackground );
-    showFullScreen();
-    resize( qApp->desktop()->size() );
-    slider->hide();
-    videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
-  } else {
-      showNormal();
-    showMaximized();
-    slider->show();
-    videoFrame->setGeometry( QRect( 10, 20, 220, 160  ) );
-    qApp->processEvents();
-  }
+    if ( mediaPlayerState->fullscreen() ) {
+        setBackgroundMode( QWidget::NoBackground );
+        showFullScreen();
+        resize( qApp->desktop()->size() );
+        slider->hide();
+        videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
+
+    } else {
+        showNormal();
+        showMaximized();
+        slider->show();
+        videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
+        qApp->processEvents();
+    }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index b35558b..990fa5f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -63,12 +63,13 @@ public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setPlaying( bool b);
     void setFullscreen( bool b );
     void makeVisible();
+    void backToNormal();
     void setPosition( long );
     void setLength( long );
     void setView( char );
 
 signals:
     void moreClicked();
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index d65006b..3e28e54 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -1,10 +1,10 @@
 
 /*
                             This file is part of the Opie Project
- 
+
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 LJP <>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
@@ -26,13 +26,13 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
- 
+
 */
 
 #include <qimage.h>
 #include <qpainter.h>
 #include <qgfx_qws.h>
 #include <qdirectpainter_qws.h>
@@ -47,13 +47,13 @@
 
 
 static inline void memcpy_rev ( void *dst, void *src, size_t len )
 {
   ((char *) src ) += len;
 
-  len >>= 1; 
+  len >>= 1;
   while ( len-- )
     *((short int *) dst )++ = *--((short int *) src );
 }
 
 static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
 {
@@ -64,15 +64,15 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
   }
 }
 
 static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step )
 {
   len >>= 1;
-  
+
   ((char *) src ) += ( len * step );
-  
+
   while ( len-- ) {
     ((char *) src ) -= step;
     *((short int *) dst )++ = *((short int *) src );
   }
 }
 
@@ -110,91 +110,91 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
     if ( m_image )
       p. drawImage ( 0, 0, *m_image );
     //qWarning ( "logo\n" );
   }
   else {
 //    qWarning ( "paintevent\n" );
-    
+
     QArray <QRect> qt_bug_workaround_clip_rects;
-    
+
     {
       QDirectPainter dp ( this );
 
       int rot = dp. transformOrientation ( ) + m_rotation;
 
       uchar *fb = dp. frameBuffer ( );
       uchar *frame = m_buff;  // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame;
-      
+
       QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
-      
+
       qt_bug_workaround_clip_rects. resize ( dp. numRects ( ));
 
       for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) {
         const QRect &clip = dp. rect ( i );
-                
+
         qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
-        
-        uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); 
+
+        uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
         uchar *src = frame;
-        
+
         switch ( rot ) {
           case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break;
           case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break;
           case 2: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ) ); break;
           case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break;
         }
 
         uint leftfill = 0;
         uint framefill = 0;
         uint rightfill = 0;
         uint clipwidth = clip. width ( ) * m_bytes_per_pixel;
-        
+
         if ( clip. left ( ) < framerect. left ( ))
           leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
         if ( clip. right ( ) > framerect. right ( ))
           rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
-        
+
         framefill = clipwidth - ( leftfill + rightfill );
 
         for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
           if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
             memset ( dst, 0, clipwidth );
           }
           else {
             if ( leftfill )
               memset ( dst, 0, leftfill );
-              
+
             if ( framefill ) {
               switch ( rot ) {
                 case 0: memcpy ( dst + leftfill, src, framefill );                                  break;
                 case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );     break;
                 case 2: memcpy_rev ( dst + leftfill, src, framefill );                              break;
                 case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
               }
-            } 
+            }
             if ( rightfill )
               memset ( dst + leftfill + framefill, 0, rightfill );
           }
-          
+
           dst += m_bytes_per_line_fb;
-          
+
           switch ( rot ) {
             case 0: src += m_bytes_per_line_frame; break;
             case 1: src -= m_bytes_per_pixel;      break;
             case 2: src -= m_bytes_per_line_frame; break;
             case 3: src += m_bytes_per_pixel;      break;
           }
         }
       }
     }
-    //qWarning ( " ||| painting |||" );   
+    //qWarning ( " ||| painting |||" );
     {
       // QVFB hack by MArtin Jones
       QPainter p ( this );
 
-      for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {  
+      for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
         p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) );
       }
     }
   }
   //qWarning( "painting >>>" );
 }
@@ -228,41 +228,43 @@ void XineVideoWidget::setImage ( uchar* img, int w, int h, int bpl )
 }
 
 void XineVideoWidget::resizeEvent ( QResizeEvent * )
 {
   QSize s = size ( );
   bool fs = ( s == qApp-> desktop ( )-> size ( ));
-    
+
   m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0;
-    
+
   if ( fs && qt_screen-> isTransformed ( )) {
-    s = qt_screen-> mapToDevice ( s );    
+    s = qt_screen-> mapToDevice ( s );
   }
 
 //  qDebug ( "\n\nResize: %dx%d, Rot: %d", s.width(),s.height(),m_rotation );
-  
+
   emit videoResized ( s );
 }
 
 
 void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
 {
   QWidget *p = parentWidget ( );
-  
+
   if ( p ) {
-    QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
-    
-    QApplication::sendEvent ( p, &pme );
+      // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+
+      // QApplication::sendEvent ( p, &pme );
+      //  emit clicked();
   }
 }
 
 void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me )
 {
   QWidget *p = parentWidget ( );
-  
+
   if ( p ) {
-    QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
-    
-    QApplication::sendEvent ( p, &pme );
+      //  QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+
+      // QApplication::sendEvent ( p, &pme );
+     emit clicked();
   }
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index 2fc627d..c5101da 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -44,26 +44,27 @@ public:
     XineVideoWidget( QWidget* parent,  const char* name );
     ~XineVideoWidget();
     QImage *image() { return m_image; };
     void setImage( QImage* image );
     void setImage( uchar* image, int width, int height, int linestep);
     void clear() ;
-    
+
 protected:
     void paintEvent( QPaintEvent* p );
     void resizeEvent ( QResizeEvent *r );
 
-	void mousePressEvent ( QMouseEvent *e );
-	void mouseReleaseEvent ( QMouseEvent *e );
+    void mousePressEvent ( QMouseEvent *e );
+    void mouseReleaseEvent ( QMouseEvent *e );
 
 signals:
-	void videoResized ( const QSize &s );
-    
+    void clicked();
+    void videoResized ( const QSize &s );
+
 private:
-	QRect m_lastframe;
-	QRect m_thisframe;
+    QRect m_lastframe;
+    QRect m_thisframe;
 
     uchar* m_buff;
     int m_bytes_per_line_fb;
     int m_bytes_per_line_frame;
     int m_bytes_per_pixel;
     QImage* m_image;