3 files changed, 207 insertions, 218 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 748ae1f..d8a0694 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -92,9 +92,9 @@ Lib::Lib(XineVideoWidget* widget) {
     if (m_wid != 0 ) {
         printf("!0\n" );
         resize ( m_wid-> size ( ));
         ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
-        m_wid-> setImage ( new QImage ( Resource::loadImage("") ) );
+        m_wid-> setLogo ( new QImage ( Resource::loadImage("")));
         m_wid->repaint();
     }
     null_display_handler( m_videoOutput,
                           xine_display_frame,
@@ -225,10 +225,8 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
     if (!m_video ) {
         qWarning("not showing video now");
         return;
     }
-//    qWarning("called draw frame %d %d",  width,  height);
-
-    m_wid->setImage( frame, width, height, bytes );
-//    m_wid->repaint(false);
+//    qWarning( "called draw frame %d %d", width, height );
 
+    m_wid-> setVideoFrame ( frame, width, height, bytes );
 }
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index d06d62a..9b26d41 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -1,10 +1,9 @@
 
 /*
                             This file is part of the Opie Project
-
-                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
-                             Copyright (c)  2002 LJP <>
+ 
+                             Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
@@ -28,9 +27,9 @@
     --        :-=`           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>
@@ -44,230 +43,221 @@
 #include <qpe/resource.h>
 
 #include "xinevideowidget.h"
 
+// 0 deg rot: copy a line from src to dst (use libc memcpy)
+
+// 180 deg rot: copy a line from src to dst reversed
 
 static inline void memcpy_rev ( void *dst, void *src, size_t len )
 {
-  ((char *) src ) += len;
+        ((char *) src) += len;
 
-  len >>= 1;
-  while ( len-- )
-    *((short int *) dst )++ = *--((short int *) src );
+        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 )
+// 90 deg rot: copy a column from src to dst
+
+static inline void memcpy_step ( void *dst, void *src, size_t len, size_t linestep )
 {
-  len >>= 1;
-  while ( len-- ) {
-    *((short int *) dst )++ = *((short int *) src );
-    ((char *) src ) += step;
-  }
+        len >>= 1;
+        while ( len-- ) {
+                *((short int *) dst) ++ = *((short int *) src);
+                ((char * ) src) += linestep;
+        }
 }
 
-static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step )
+// 270 deg rot: copy a column from src to dst reversed
+
+static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t linestep )
 {
-  len >>= 1;
+        len >>= 1;
 
-  ((char *) src ) += ( len * step );
+        ((char *) src) += ( len * linestep );
 
-  while ( len-- ) {
-    ((char *) src ) -= step;
-    *((short int *) dst )++ = *((short int *) src );
-  }
+        while ( len-- ) {
+                ((char *) src) -= linestep;
+                *((short int *) dst) ++ = *((short int *) src);
+        }
 }
 
 
 XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name )
-    : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
+                : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
 {
-  setBackgroundMode ( NoBackground );
+        setBackgroundMode ( NoBackground );
 
-  m_image             = 0;
-  m_buff              = 0;
-  m_bytes_per_line_fb = qt_screen-> linestep ( );
-  m_bytes_per_pixel   = ( qt_screen->depth() + 7 ) / 8;
-  m_rotation          = 0;
+        m_logo = 0;
+        m_buff = 0;
+        m_bytes_per_line_fb = qt_screen-> linestep ( );
+        m_bytes_per_pixel = ( qt_screen-> depth ( ) + 7 ) / 8;
+        m_rotation = 0;
 }
 
 
 XineVideoWidget::~XineVideoWidget ( )
 {
-  delete m_image;
+        delete m_logo;
 }
 
 void XineVideoWidget::clear ( )
 {
-  m_buff = 0;
-  repaint ( false );
+        m_buff = 0;
+        repaint ( false );
 }
 
 void XineVideoWidget::paintEvent ( QPaintEvent * )
 {
-  //qWarning( "painting <<<" );
-  if ( m_buff == 0 ) {
-    QPainter p ( this );
-    p. fillRect ( rect ( ), black );
-    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 *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;
-          default: 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;
-                  default: 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;
-              default: break;
-              }
-          }
-      }
-    }
-    //qWarning ( " ||| painting |||" );
-    {
-        // QVFB hack by MArtin Jones
-        QPainter p ( this );
-
-        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 >>>" );
-}
-
-
-void XineVideoWidget::setImage ( QImage* image )
-{
-  delete m_image;
-  m_image = image;
-}
-
-void XineVideoWidget::setImage ( uchar* img, int w, int h, int bpl )
-{
-  bool rot90 = (( -m_rotation ) & 1 );
-
-  if ( rot90 ) {
-    int d = w;
-    w = h;
-    h = d;
-  }
-
-  m_lastframe = m_thisframe;
-  m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
-
-//  qDebug ( "Frame: %d,%d - %dx%d", ( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
-
-  m_buff                 = img;
-  m_bytes_per_line_frame = bpl;
-
-  repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false );
-}
-
-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 );
-  }
-
-//  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 ( m_buff == 0 ) {
+                QPainter p ( this );
+                p. fillRect ( rect ( ), black );
+                if ( m_logo )
+                        p. drawImage ( 0, 0, *m_logo );
+        }
+        else {
+                // Qt needs to be notified which areas were really updated .. strange
+                QArray <QRect> qt_bug_workaround_clip_rects;
+
+                {
+                        QDirectPainter dp ( this );
+
+                        int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation
+
+                        uchar *fb = dp. frameBuffer ( );
+                        uchar *frame = m_buff;
+
+                        // where is the video frame in fb coordinates
+                        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 ); // clip x/y in the fb
+                                uchar *src = frame;
+
+                                // Adjust the start the source data based on the rotation (xine 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;
+                                        default: break;
+                                }
+
+                                // all of the following widths/heights are fb relative (0deg rotation)
+
+                                uint leftfill = 0;   // black border on the "left" side of the video frame
+                                uint framefill = 0;  // "width" of the video frame
+                                uint rightfill = 0;  // black border on the "right" side of the video frame
+                                uint clipwidth = clip. width ( ) * m_bytes_per_pixel;  // "width" of the current clip rect
+
+                                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 ( ))) {
+                                                // "above" or "below" the video -> black
+                                                memset ( dst, 0, clipwidth );
+                                        }
+                                        else {
+                                                if ( leftfill )
+                                                        memset ( dst, 0, leftfill ); // "left" border -> black
+
+                                                if ( framefill ) { // blit in the video frame
+                                                        // see above for an explanation of the different memcpys
+
+                                                        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;
+                                                                default: break;
+                                                        }
+                                                        if ( rightfill )
+                                                                memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black
+                                                }
+
+                                                dst += m_bytes_per_line_fb; // advance one line in the framebuffer
+
+                                                // advance one "line" in the xine frame data
+                                                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;
+                                                        default: break;
+                                                }
+                                        }
+                                }
+
+                                {
+                                        // QVFB hack by Martin Jones
+                                        // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter
+
+                                        QPainter p ( this );
+
+                                        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 ));
+                                        }
+                                }
+                        }
+                }
+
+                QImage *XineVideoWidget::logo ( ) const {
+                        return m_logo;
+                }
 
-  if ( p ) {
-      // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+                void XineVideoWidget::setLogo ( QImage * image ) {
+                        delete m_logo;
+                        m_logo = image;
+                }
 
-      // QApplication::sendEvent ( p, &pme );
-      //  emit clicked();
-  }
-}
-
-void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
-{
-  QWidget *p = parentWidget ( );
+                void XineVideoWidget::setVideoFrame ( uchar * img, int w, int h, int bpl ) {
+                        bool rot90 = (( -m_rotation ) & 1 );
 
-  if ( p ) {
-      //  QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+                        if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height
+                                int d = w;
+                                w = h;
+                                h = d;
+                        }
 
-      // QApplication::sendEvent ( p, &pme );
-     emit clicked();
-  }
-}
+                        m_lastframe = m_thisframe;
+                        m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
+
+                        m_buff = img;
+                        m_bytes_per_line_frame = bpl;
+
+                        // only repaint the area that *really* needs to be repainted
+
+                        repaint ((
+                }
+
+                void XineVideoWidget::resizeEvent ( QResizeEvent * ) {
+                        QSize s = size ( );
+                        bool fs = ( s == qApp-> desktop ( ) -> size ( ));
+
+                        // if we are in fullscreen mode, do not rotate the video
+                        // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!)
+
+                        m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0;
+
+                        if ( fs && qt_screen-> isTransformed ( ))
+                                s = qt_screen-> mapToDevice ( s );
+
+                        emit videoResized ( s );
+                }
+
+
+                void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * ) {
+                        emit clicked ( );
+                }
 
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index c5101da..33f1470 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -1,9 +1,8 @@
 /*
                             This file is part of the Opie Project
 
-                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
-                             Copyright (c)  2002 LJP <>
+                             Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
@@ -37,37 +36,39 @@
 
 #include "lib.h"
 
 class QImage;
+
+
 class XineVideoWidget : public QWidget {
     Q_OBJECT
+    
 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() ;
+    XineVideoWidget ( QWidget* parent,  const char* name );
+    ~XineVideoWidget ( );
+    QImage *logo ( ) const;
+    void setLogo ( QImage *image );
+    void setVideoFrame ( uchar *image, int width, int height, int linestep );
+    void clear ( );
 
 protected:
-    void paintEvent( QPaintEvent* p );
+    void paintEvent( QPaintEvent *p );
     void resizeEvent ( QResizeEvent *r );
 
-    void mousePressEvent ( QMouseEvent *e );
     void mouseReleaseEvent ( QMouseEvent *e );
 
 signals:
-    void clicked();
+    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;
-    int m_rotation;
+    uchar  *m_buff;
+    int     m_bytes_per_line_fb;
+    int     m_bytes_per_line_frame;
+    int     m_bytes_per_pixel;
+    QImage *m_logo;
+    int     m_rotation;
 };