#include <QDate>
#include <QMenu>
#include <QWidgetAction>
+#include <QDesktopWidget>
#ifdef Q_WS_X11
# include <X11/Xlib.h>
# include <qx11info_x11.h>
+static void videoSync( void )
+{
+ /* Make sure the X server has processed all requests.
+ * This protects other threads using distinct connections from getting
+ * the video widget window in an inconsistent states. */
+ XSync( QX11Info::display(), False );
+}
+#else
+# define videoSync() (void)0
#endif
#include <math.h>
+class ReparentableWidget : public QWidget
+{
+private:
+ VideoWidget *owner;
+public:
+ ReparentableWidget( VideoWidget *owner ) : owner( owner )
+ {
+ }
+
+protected:
+ void keyPressEvent( QKeyEvent *e )
+ {
+ emit owner->keyPressed( e );
+ }
+};
+
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
{
/* Init */
- p_vout = NULL;
+ reparentable = NULL;
videoSize.rwidth() = -1;
videoSize.rheight() = -1;
/* Set the policy to expand in both directions */
// setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
- /* Black background is more coherent for a Video Widget */
- QPalette plt = palette();
- plt.setColor( QPalette::Window, Qt::black );
- setPalette( plt );
- setAutoFillBackground(true);
-
- /* Indicates that the widget wants to draw directly onto the screen.
- Widgets with this attribute set do not participate in composition
- management */
- setAttribute( Qt::WA_PaintOnScreen, true );
-
- /* The core can ask through a callback to show the video. */
- connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
- this, SLOT(SetSizing(unsigned int, unsigned int )),
- Qt::BlockingQueuedConnection );
-}
-
-void VideoWidget::paintEvent(QPaintEvent *ev)
-{
- QFrame::paintEvent(ev);
-#ifdef Q_WS_X11
- XFlush( QX11Info::display() );
-#endif
+ layout = new QHBoxLayout( this );
+ layout->setContentsMargins( 0, 0, 0, 0 );
+ setLayout( layout );
}
VideoWidget::~VideoWidget()
{
/* Ensure we are not leaking the video output. This would crash. */
- assert( !p_vout );
+ assert( reparentable == NULL );
}
/**
* Request the video to avoid the conflicts
**/
-WId VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
+WId VideoWidget::request( int *pi_x, int *pi_y,
unsigned int *pi_width, unsigned int *pi_height,
bool b_keep_size )
{
msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
+ if( reparentable != NULL )
+ {
+ msg_Dbg( p_intf, "embedded video already in use" );
+ return NULL;
+ }
if( b_keep_size )
{
*pi_width = size().width();
*pi_height = size().height();
}
- emit askVideoWidgetToShow( *pi_width, *pi_height );
- if( p_vout )
- {
- msg_Dbg( p_intf, "embedded video already in use" );
- return NULL;
- }
- p_vout = p_nvout;
+ /* The Qt4 UI needs a fixed a widget ("this"), so that the parent layout is
+ * not messed up when we the video is reparented. Hence, we create an extra
+ * reparentable widget, that will be within the VideoWidget in windowed
+ * mode, and within the root window (NULL parent) in full-screen mode.
+ */
+ reparentable = new ReparentableWidget( this );
+ QLayout *innerLayout = new QHBoxLayout( reparentable );
+ innerLayout->setContentsMargins( 0, 0, 0, 0 );
+
+ /* The owner of the video window needs a stable handle (WinId). Reparenting
+ * in Qt4-X11 changes the WinId of the widget, so we need to create another
+ * dummy widget that stays within the reparentable widget. */
+ QWidget *stable = new QWidget();
+ QPalette plt = palette();
+ plt.setColor( QPalette::Window, Qt::black );
+ stable->setPalette( plt );
+ stable->setAutoFillBackground(true);
+ /* Indicates that the widget wants to draw directly onto the screen.
+ Widgets with this attribute set do not participate in composition
+ management */
+ stable->setAttribute( Qt::WA_PaintOnScreen, true );
+
+ innerLayout->addWidget( stable );
+
+ reparentable->setLayout( innerLayout );
+ layout->addWidget( reparentable );
+
+#ifdef Q_WS_X11
+ /* HACK: Only one X11 client can subscribe to mouse button press events.
+ * VLC currently handles those in the video display.
+ * Force Qt4 to unsubscribe from mouse press and release events. */
+ Display *dpy = QX11Info::display();
+ Window w = stable->winId();
+ XWindowAttributes attr;
+
+ XGetWindowAttributes( dpy, w, &attr );
+ attr.your_event_mask &= ~(ButtonPressMask|ButtonReleaseMask);
+ XSelectInput( dpy, w, attr.your_event_mask );
+#endif
+ videoSync();
#ifndef NDEBUG
- msg_Dbg( p_intf, "embedded video ready (handle %p)", (void *)winId() );
+ msg_Dbg( p_intf, "embedded video ready (handle %p)",
+ (void *)stable->winId() );
#endif
- return winId();
+ return stable->winId();
}
/* Set the Widget to the correct Size */
/* Function has to be called by the parent
- Parent has to care about resizing himself*/
+ Parent has to care about resizing itself */
void VideoWidget::SetSizing( unsigned int w, unsigned int h )
{
+ if (reparentable->windowState() & Qt::WindowFullScreen )
+ return;
msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h );
videoSize.rwidth() = w;
videoSize.rheight() = h;
- if( isHidden() ) show();
+ if( !isVisible() ) show();
updateGeometry(); // Needed for deinterlace
+ videoSync();
+}
+
+void VideoWidget::SetFullScreen( bool b_fs )
+{
+ const Qt::WindowStates curstate = reparentable->windowState();
+ Qt::WindowStates newstate = curstate;
+ Qt::WindowFlags newflags = reparentable->windowFlags();
+
+
+ if( b_fs )
+ {
+ newstate |= Qt::WindowFullScreen;
+ newflags |= Qt::WindowStaysOnTopHint;
+ }
+ else
+ {
+ newstate &= ~Qt::WindowFullScreen;
+ newflags &= ~Qt::WindowStaysOnTopHint;
+ }
+ if( newstate == curstate )
+ return; /* no changes needed */
+
+ if( b_fs )
+ { /* Go full-screen */
+ int numscreen = config_GetInt( p_intf, "qt-fullscreen-screennumber" );
+ /* if user hasn't defined screennumber, or screennumber that is bigger
+ * than current number of screens, take screennumber where current interface
+ * is
+ */
+ if( numscreen == -1 || numscreen > QApplication::desktop()->numScreens() )
+ numscreen = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
+
+ QRect screenres = QApplication::desktop()->screenGeometry( numscreen );
+
+ reparentable->setParent( NULL );
+ reparentable->setWindowState( newstate );
+ reparentable->setWindowFlags( newflags );
+ /* To be sure window is on proper-screen in xinerama */
+ if( !screenres.contains( reparentable->pos() ) )
+ {
+ msg_Dbg( p_intf, "Moving video to correct screen");
+ reparentable->move( QPoint( screenres.x(), screenres.y() ) );
+ }
+ reparentable->show();
+ }
+ else
+ { /* Go windowed */
+ reparentable->setWindowFlags( newflags );
+ reparentable->setWindowState( newstate );
+ layout->addWidget( reparentable );
+ }
+ videoSync();
}
void VideoWidget::release( void )
{
msg_Dbg( p_intf, "Video is not needed anymore" );
- p_vout = NULL;
+ //layout->removeWidget( reparentable );
+
+#ifdef WIN32
+ /* Come back to default thumbnail for Windows 7 taskbar */
+ LPTASKBARLIST3 p_taskbl;
+ OSVERSIONINFO winVer;
+ winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 && winVer.dwMajorVersion > 0 )
+ {
+ CoInitialize( 0 );
+
+ if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_ITaskbarList3,
+ (void **)&p_taskbl) )
+ {
+ p_taskbl->vt->HrInit(p_taskbl);
+
+ HWND hroot = GetAncestor(reparentable->winId(),GA_ROOT);
+
+ if (S_OK != p_taskbl->vt->SetThumbnailClip(p_taskbl, hroot, NULL))
+ msg_Err(p_intf, "SetThumbNailClip failed");
+ msg_Err(p_intf, "Releasing taskbar | root handle = %08x", hroot);
+ p_taskbl->vt->Release(p_taskbl);
+ }
+ CoUninitialize();
+ }
+#endif
+
+ delete reparentable;
+ reparentable = NULL;
videoSize.rwidth() = 0;
videoSize.rheight() = 0;
updateGeometry();
hide();
}
+
QSize VideoWidget::sizeHint() const
{
return videoSize;
label->setMaximumWidth( MAX_BG_SIZE );
label->setMinimumHeight( MIN_BG_SIZE );
label->setMinimumWidth( MIN_BG_SIZE );
+ label->setAlignment( Qt::AlignCenter );
if( QDate::currentDate().dayOfYear() >= 354 )
- label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ label->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
else
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ label->setPixmap( QPixmap( ":/logo/vlc128.png" ) );
QGridLayout *backgroundLayout = new QGridLayout( this );
backgroundLayout->addWidget( label, 0, 1 );
backgroundLayout->setColumnStretch( 2, 1 );
CONNECT( THEMIM->getIM(), artChanged( QString ),
- this, updateArt( QString ) );
+ this, updateArt( const QString& ) );
}
BackgroundWidget::~BackgroundWidget()
label->show();
}
-void BackgroundWidget::updateArt( QString url )
+void BackgroundWidget::updateArt( const QString& url )
{
if( url.isEmpty() )
{
if( QDate::currentDate().dayOfYear() >= 354 )
- label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ label->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
else
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ label->setPixmap( QPixmap( ":/logo/vlc128.png" ) );
}
else
{
- label->setPixmap( QPixmap( url ) );
+ QPixmap pixmap( url );
+ if( pixmap.width() > label->maximumWidth() ||
+ pixmap.height() > label->maximumHeight() )
+ {
+ pixmap = pixmap.scaled( label->maximumWidth(),
+ label->maximumHeight(), Qt::KeepAspectRatio );
+ }
+
+ label->setPixmap( pixmap );
}
}
}
#endif
-SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, const QString text )
- : QLabel( text ), p_intf( _p_intf )
+SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, const QString& text,
+ QWidget *parent )
+ : QLabel( text, parent ), p_intf( _p_intf )
{
- setToolTip( qtr( "Current playback speed.\nRight click to adjust" ) );
- setContextMenuPolicy ( Qt::CustomContextMenu );
+ setToolTip( qtr( "Current playback speed.\nClick to adjust" ) );
/* Create the Speed Control Widget */
speedControl = new SpeedControlWidget( p_intf, this );
widgetAction->setDefaultWidget( speedControl );
speedControlMenu->addAction( widgetAction );
- /* Speed Label behaviour:
- - right click gives the vertical speed slider */
- CONNECT( this, customContextMenuRequested( QPoint ),
- this, showSpeedMenu( QPoint ) );
-
/* Change the SpeedRate in the Status Bar */
CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
CONNECT( THEMIM, inputChanged( input_thread_t * ),
speedControl, activateOnState() );
-}
+}
+SpeedLabel::~SpeedLabel()
+{
+ delete speedControl;
+ delete speedControlMenu;
+}
/****************************************************************************
* Small right-click menu for rate control
****************************************************************************/
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
- speedSlider = new QSlider;
+ speedSlider = new QSlider( this );
speedSlider->setSizePolicy( sizePolicy );
speedSlider->setMaximumSize( QSize( 80, 200 ) );
speedSlider->setOrientation( Qt::Vertical );
}
CoverArtLabel::CoverArtLabel( QWidget *parent, intf_thread_t *_p_i )
- : QLabel( parent ), p_intf( _p_i )
+ : QLabel( parent ), p_intf( _p_i )
{
setContextMenuPolicy( Qt::ActionsContextMenu );
- CONNECT( this, updateRequested(), this, doUpdate() );
- CONNECT( THEMIM->getIM(), artChanged( QString ),
- this, doUpdate( QString ) );
+ CONNECT( this, updateRequested(), this, askForUpdate() );
setMinimumHeight( 128 );
setMinimumWidth( 128 );
setMaximumHeight( 128 );
setMaximumWidth( 128 );
- setScaledContents( true );
+ setScaledContents( false );
+ setAlignment( Qt::AlignCenter );
+
QList< QAction* > artActions = actions();
QAction *action = new QAction( qtr( "Download cover art" ), this );
+ CONNECT( action, triggered(), this, askForUpdate() );
addAction( action );
- CONNECT( action, triggered(), this, doUpdate() );
- doUpdate();
+ showArtUpdate( "" );
}
CoverArtLabel::~CoverArtLabel()
removeAction( act );
}
-void CoverArtLabel::doUpdate( QString url )
+void CoverArtLabel::showArtUpdate( const QString& url )
{
QPixmap pix;
if( !url.isEmpty() && pix.load( url ) )
{
- setPixmap( pix );
+ pix = pix.scaled( maximumWidth(), maximumHeight(),
+ Qt::KeepAspectRatioByExpanding );
}
else
{
- setPixmap( QPixmap( ":/noart.png" ) );
+ pix = QPixmap( ":/noart.png" );
}
+ setPixmap( pix );
}
-void CoverArtLabel::doUpdate()
+void CoverArtLabel::askForUpdate()
{
THEMIM->getIM()->requestArtUpdate();
}
QString amount;
amount.setNum( (int)(100 * f_cache) );
msg_Dbg( p_intf, "New caching: %d", (int)(100*f_cache));
- setText( "Buffering " + amount + "%" );
+ setText( "Buff: " + amount + "%" );
}
projects / vlc / blobdiff