/*****************************************************************************
* x11_window.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: x11_window.cpp,v 1.1 2004/01/03 23:31:34 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
#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() );
// Drag & drop
if( m_dragDrop )
{
- // Register the window as a drop target
+ // Create a Dnd object for this window
m_pDropTarget = new X11DragDrop( getIntf(), m_rDisplay, m_wnd,
playOnDrop );
+ // Register the window as a drop target
Atom xdndAtom = XInternAtom( XDISPLAY, "XdndAware", False );
char xdndVersion = 4;
XChangeProperty( XDISPLAY, m_wnd, xdndAtom, XA_ATOM, 32,
PropModeReplace, (unsigned char *)&xdndVersion, 1 );
- // Store a pointer on the D&D object as a window property.
- storePointer( "DND_OBJECT", (void*)m_pDropTarget );
+ // Store a pointer to be used in X11Loop
+ 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;
if( m_dragDrop )
{
}
-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;
+ union { Atom *p_atom; unsigned char *p_char; } p_args;
+ p_args.p_atom = NULL;
-void X11Window::storePointer( const char *pName, void *pPtr )
-{
- // We don't assume pointers are 32bits, so it's a bit tricky
- unsigned char data[sizeof(void*)];
- memcpy( data, &pPtr, sizeof(void*) );
-
- // Store the pointer on the generic window as a window property.
- Atom prop = XInternAtom( XDISPLAY, pName, False );
- Atom type = XInternAtom( XDISPLAY, "POINTER", False );
- XChangeProperty( XDISPLAY, m_wnd, prop, type, 8, PropModeReplace, data,
- sizeof(GenericWindow*) );
+ 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;
+ }
+
+ 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_on_top;
+
+ XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ),
+ False, SubstructureRedirectMask, (XEvent*)&event );
}
#endif
projects / vlc / blobdiff