X11Display &rDisplay, bool dragDrop, bool playOnDrop,
X11Window *pParentWindow, GenericWindow::WindowType_t type ):
OSWindow( pIntf ), m_rDisplay( rDisplay ), m_pParent( pParentWindow ),
- m_dragDrop( dragDrop )
+ m_dragDrop( dragDrop ), m_type ( type )
{
XSetWindowAttributes attr;
unsigned long valuemask;
attr.event_mask = ExposureMask | StructureNotifyMask;
attr.background_pixel = BlackPixel( XDISPLAY, i_screen );
attr.backing_store = Always;
- attr.override_redirect = True;
- valuemask = CWBackingStore | CWOverrideRedirect |
- CWBackPixel | CWEventMask;
+ valuemask = CWBackingStore | CWBackPixel | CWEventMask;
+
+ if( NET_WM_STATE_FULLSCREEN == None )
+ {
+ attr.override_redirect = True;
+ valuemask = valuemask | CWOverrideRedirect;
+ }
name_type = "Fullscreen";
}
}
// Create the window
- m_wnd = XCreateWindow( XDISPLAY, m_wnd_parent, -10, 0, 1, 1, 0, 0,
+ m_wnd = XCreateWindow( XDISPLAY, m_wnd_parent, -10, 0, 10, 10, 0, 0,
InputOutput, CopyFromParent, valuemask, &attr );
// wait for X server to process the previous commands
Window new_parent =
OSHandle ? (Window) OSHandle : DefaultRootWindow( XDISPLAY );
+ XReparentWindow( XDISPLAY, m_wnd, new_parent, x, y);
if( w && h )
XResizeWindow( XDISPLAY, m_wnd, w, h );
- XReparentWindow( XDISPLAY, m_wnd, new_parent, x, y);
m_wnd_parent = new_parent;
}
void X11Window::show() const
{
// Map the window
- XMapRaised( XDISPLAY, m_wnd );
+ if( m_type == GenericWindow::VoutWindow )
+ {
+ XLowerWindow( XDISPLAY, m_wnd );
+ XMapWindow( XDISPLAY, m_wnd );
+ }
+ else if( m_type == GenericWindow::FullscreenWindow )
+ {
+ XMapRaised( XDISPLAY, m_wnd );
+ setFullscreen();
+ // toggleOnTop( true );
+ }
+ else
+ {
+ XMapRaised( XDISPLAY, m_wnd );
+ }
}
XUnmapWindow( XDISPLAY, m_wnd );
}
-
void X11Window::moveResize( int left, int top, int width, int height ) const
{
if( width && height )
void X11Window::setOpacity( uint8_t value ) const
{
- Atom opaq = XInternAtom(XDISPLAY, "_NET_WM_WINDOW_OPACITY", False);
+ if( NET_WM_WINDOW_OPACITY == None )
+ return;
+
if( 255==value )
- XDeleteProperty(XDISPLAY, m_wnd, opaq);
+ XDeleteProperty(XDISPLAY, m_wnd, NET_WM_WINDOW_OPACITY);
else
{
uint32_t opacity = value * ((uint32_t)-1/255);
- XChangeProperty(XDISPLAY, m_wnd, opaq, XA_CARDINAL, 32,
+ XChangeProperty(XDISPLAY, m_wnd, NET_WM_WINDOW_OPACITY, XA_CARDINAL, 32,
PropModeReplace, (unsigned char *) &opacity, 1L);
}
XSync( XDISPLAY, False );
}
-void X11Window::toggleOnTop( bool onTop ) const
+void X11Window::setFullscreen( ) const
{
- 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( NET_WM_STATE_FULLSCREEN != None )
{
- 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 */
+ XClientMessageEvent event;
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
- 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;
- }
+ event.type = ClientMessage;
+ event.message_type = NET_WM_STATE;
+ event.display = XDISPLAY;
+ event.window = m_wnd;
+ event.format = 32;
+ event.data.l[ 0 ] = 1;
+ event.data.l[ 1 ] = NET_WM_STATE_FULLSCREEN;
- XFree( p_args.p_atom );
- if( i == i_items )
- return; /* Not supported */
+ XSendEvent( XDISPLAY,
+ DefaultRootWindow( XDISPLAY ),
+ False, SubstructureNotifyMask|SubstructureRedirectMask,
+ (XEvent*)&event );
+ }
+}
+
+void X11Window::toggleOnTop( bool onTop ) const
+{
+ if( NET_WM_STAYS_ON_TOP != None )
+ {
/* Switch "on top" status */
XClientMessageEvent event;
memset( &event, 0, sizeof( XClientMessageEvent ) );
event.type = ClientMessage;
- event.message_type = net_wm_state;
+ 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;
+ event.data.l[ 1 ] = NET_WM_STAYS_ON_TOP;
XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ),
- False, SubstructureRedirectMask, (XEvent*)&event );
- return;
+ False, SubstructureNotifyMask|SubstructureRedirectMask, (XEvent*)&event );
}
+ else if( NET_WM_STATE_ABOVE != None )
+ {
+ /* Switch "above" state */
+ XClientMessageEvent event;
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
- 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;
+ 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 );
+ XSendEvent( XDISPLAY, DefaultRootWindow( XDISPLAY ),
+ False, SubstructureNotifyMask|SubstructureRedirectMask, (XEvent*)&event );
+ }
}
#endif
projects / vlc / blobdiff