Skip to content

V
vlc-2-2
Commit 7ed4cf1b authored by Damien Fouilleul's avatar Damien Fouilleul
Browse files
Options

vlcshell.cpp: more X11 fixes

parent 7419fda4
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
mozilla/vlcshell.cpp
View file @ 7ed4cf1b
...@@ -396,21 +396,24 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window ) ...@@ -396,21 +396,24 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
if( window && window->window ) if( window && window->window )
{ {
Window drawable = (Window) window->window; Window drawable = (Window) window->window;
if( !curwin->window || drawable != (Window)curwin->window ) if( !curwin->window || drawable != (Window)curwin->window )
{ {
Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display; Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
XResizeWindow( p_display, drawable, window->width, window->height ); XResizeWindow( p_display, drawable, window->width, window->height );
Widget w = XtWindowToWidget( p_display, drawable ); Widget w = XtWindowToWidget( p_display, drawable );
XtAddEventHandler( w, ExposureMask, FALSE, (XtEventHandler)Redraw, p_plugin ); XtAddEventHandler( w, ExposureMask, FALSE, (XtEventHandler)Redraw, p_plugin );
XtAddEventHandler( w, StructureNotifyMask, FALSE, (XtEventHandler)Resize, p_plugin ); XtAddEventHandler( w, StructureNotifyMask, FALSE, (XtEventHandler)Resize, p_plugin );
/* remember window */ /* set/change parent window */
p_plugin->setWindow(window); libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
Redraw( w, (XtPointer)p_plugin, NULL ); /* remember window */
} p_plugin->setWindow(window);
Redraw( w, (XtPointer)p_plugin, NULL );
}
} }
#endif /* XP_UNIX */ #endif /* XP_UNIX */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment