/*****************************************************************************
* x11_window.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: x11_window.cpp,v 1.2 2004/01/18 00:25:02 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef X11_SKINS
#include <X11/Xatom.h>
#include "../src/generic_window.hpp"
+#include "../src/vlcproc.hpp"
#include "x11_window.hpp"
#include "x11_display.hpp"
#include "x11_graphics.hpp"
X11Window::X11Window( intf_thread_t *pIntf, GenericWindow &rWindow,
- X11Display &rDisplay, bool dragDrop, bool playOnDrop ):
- OSWindow( pIntf ), m_rDisplay( rDisplay ), m_dragDrop( dragDrop )
+ X11Display &rDisplay, bool dragDrop, bool playOnDrop,
+ X11Window *pParentWindow ):
+ OSWindow( pIntf ), m_rDisplay( rDisplay ), m_pParent( pParentWindow ),
+ m_dragDrop( dragDrop )
{
- Window root = DefaultRootWindow( XDISPLAY );
+ Window parent;
+ if (pParentWindow)
+ {
+ parent = pParentWindow->m_wnd;
+ }
+ else
+ {
+ parent = DefaultRootWindow( XDISPLAY );
+ }
XSetWindowAttributes attr;
// Create the window
- m_wnd = XCreateWindow( XDISPLAY, root, 0, 0, 1, 1, 0, 0,
+ m_wnd = XCreateWindow( XDISPLAY, parent, 0, 0, 1, 1, 0, 0,
InputOutput, CopyFromParent, 0, &attr );
+ // Set the colormap for 8bpp mode
+ if( XPIXELSIZE == 1 )
+ {
+ XSetWindowColormap( XDISPLAY, m_wnd, m_rDisplay.getColormap() );
+ }
+
// Select events received by the window
- XSelectInput( XDISPLAY, m_wnd, ExposureMask|KeyPressMask|PointerMotionMask|
- ButtonPressMask|ButtonReleaseMask|LeaveWindowMask|
- FocusChangeMask );
+ XSelectInput( XDISPLAY, m_wnd, ExposureMask|KeyPressMask|
+ PointerMotionMask|ButtonPressMask|ButtonReleaseMask|
+ LeaveWindowMask|FocusChangeMask );
// Store a pointer on the generic window in a map
X11Factory *pFactory = (X11Factory*)X11Factory::instance( getIntf() );
unsigned long flags;
unsigned long functions;
unsigned long decorations;
- long input_mode;
+ signed long input_mode;
unsigned long status;
} motifWmHints;
Atom hints_atom = XInternAtom( XDISPLAY, "_MOTIF_WM_HINTS", False );
motifWmHints.decorations = 0;
XChangeProperty( XDISPLAY, m_wnd, hints_atom, hints_atom, 32,
PropModeReplace, (unsigned char *)&motifWmHints,
- sizeof( motifWmHints ) / sizeof( long ) );
+ sizeof( motifWmHints ) / sizeof( uint32_t ) );
// Drag & drop
if( m_dragDrop )
pFactory->m_dndMap[m_wnd] = m_pDropTarget;
}
- // Change the window title XXX
+ // Change the window title
XStoreName( XDISPLAY, m_wnd, "VLC" );
+
+ // Associate the window to the main "parent" window
+ XSetTransientForHint( XDISPLAY, m_wnd, m_rDisplay.getMainWindow() );
+
+ // Set this window as a vout
+ if( m_pParent )
+ {
+ VlcProc::instance( getIntf() )->registerVoutWindow( (void*)m_wnd );
+ }
+
}
X11Window::~X11Window()
{
+ if( m_pParent )
+ {
+ VlcProc::instance( getIntf() )->unregisterVoutWindow( (void*)m_wnd );
+ }
+
X11Factory *pFactory = (X11Factory*)X11Factory::instance( getIntf() );
pFactory->m_windowMap[m_wnd] = NULL;
pFactory->m_dndMap[m_wnd] = NULL;
}
-void X11Window::show( int left, int top )
+void X11Window::show( int left, int top ) const
{
// Map the window
XMapRaised( XDISPLAY, m_wnd );
}
-void X11Window::hide()
+void X11Window::hide() const
{
// Unmap the window
XUnmapWindow( XDISPLAY, m_wnd );
}
-void X11Window::moveResize( int left, int top, int width, int height )
+void X11Window::moveResize( int left, int top, int width, int height ) const
{
XMoveResizeWindow( XDISPLAY, m_wnd, left, top, width, height );
}
-void X11Window::raise()
+void X11Window::raise() const
{
XRaiseWindow( XDISPLAY, m_wnd );
}
-void X11Window::setOpacity( uint8_t value )
+void X11Window::setOpacity( uint8_t value ) const
{
// Sorry, the opacity cannot be changed :)
}
-void X11Window::toggleOnTop( bool onTop )
+void X11Window::toggleOnTop( bool onTop ) const
{
- // XXX TODO
+ int i_ret, i_format;
+ unsigned long i, i_items, i_bytesafter;
+ Atom net_wm_supported, net_wm_state, net_wm_state_on_top,net_wm_state_above;
+ union { Atom *p_atom; unsigned char *p_char; } p_args;
+
+ p_args.p_atom = NULL;
+
+ net_wm_supported = XInternAtom( XDISPLAY, "_NET_SUPPORTED", False );
+
+ i_ret = XGetWindowProperty( XDISPLAY, DefaultRootWindow( XDISPLAY ),
+ net_wm_supported,
+ 0, 16384, False, AnyPropertyType,
+ &net_wm_supported,
+ &i_format, &i_items, &i_bytesafter,
+ (unsigned char **)&p_args );
+
+ if( i_ret != Success || i_items == 0 ) return; /* Not supported */
+
+ net_wm_state = XInternAtom( XDISPLAY, "_NET_WM_STATE", False );
+ net_wm_state_on_top = XInternAtom( XDISPLAY, "_NET_WM_STATE_STAYS_ON_TOP",
+ False );
+
+ for( i = 0; i < i_items; i++ )
+ {
+ if( p_args.p_atom[i] == net_wm_state_on_top ) break;
+ }
+
+ if( i == i_items )
+ { /* use _NET_WM_STATE_ABOVE if window manager
+ * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
+
+ net_wm_state_above = XInternAtom( XDISPLAY, "_NET_WM_STATE_ABOVE",
+ False);
+ for( i = 0; i < i_items; i++ )
+ {
+ if( p_args.p_atom[i] == net_wm_state_above ) break;
+ }
+
+ XFree( p_args.p_atom );
+ if( i == i_items )
+ return; /* Not supported */
+
+ /* Switch "on top" status */
+ XClientMessageEvent event;
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
+
+ event.type = ClientMessage;
+ event.message_type = net_wm_state;
+ event.display = XDISPLAY;
+ event.window = m_wnd;
+ event.format = 32;
+ event.data.l[ 0 ] = onTop; /* set property */
+ event.data.l[ 1 ] = net_wm_state_above;
+
+ XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ),
+ False, SubstructureRedirectMask, (XEvent*)&event );
+ return;
+ }
+
+ XFree( p_args.p_atom );
+
+ /* Switch "on top" status */
+ XClientMessageEvent event;
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
+
+ event.type = ClientMessage;
+ event.message_type = net_wm_state;
+ event.display = XDISPLAY;
+ event.window = m_wnd;
+ event.format = 32;
+ event.data.l[ 0 ] = onTop; /* set property */
+ event.data.l[ 1 ] = net_wm_state_on_top;
+
+ XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ),
+ False, SubstructureRedirectMask, (XEvent*)&event );
}
#endif
projects / vlc / blobdiff