/*****************************************************************************
- * vlcshell.c: a VideoLAN Client plugin for Mozilla
+ * vlcshell.cpp: a VLC plugin for Mozilla
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.2 2002/09/30 11:05:41 sam Exp $
+ * Copyright (C) 2002-2005 VideoLAN
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
+/* XXX: disable VLC here */
+#define USE_LIBVLC 1
+
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
/* vlc stuff */
-#include <vlc/vlc.h>
-#include "config.h"
+#ifdef USE_LIBVLC
+# include <vlc/vlc.h>
+#endif
/* Mozilla stuff */
+#ifdef HAVE_MOZILLA_CONFIG_H
+# include <mozilla-config.h>
+#endif
+#include <nsISupports.h>
+#include <nsMemory.h>
#include <npapi.h>
-#ifdef WIN32
+/* This is from mozilla java, do we really need it? */
+#if 0
+#include <jri.h>
+#endif
-#else
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
+
+#ifdef XP_WIN
+ /* Windows stuff */
+#endif
+
+#ifdef XP_MACOSX
+ /* Mac OS X stuff */
+# include <Quickdraw.h>
+#endif
+
+#ifdef XP_UNIX
/* X11 stuff */
# include <X11/Xlib.h>
# include <X11/Intrinsic.h>
#include "vlcpeer.h"
#include "vlcplugin.h"
+#if USE_LIBVLC
+# define WINDOW_TEXT "(no picture)"
+#else
+# define WINDOW_TEXT "(no libvlc)"
+#endif
+
+/* Enable/disable debugging printf's for X11 resizing */
+#undef X11_RESIZE_DEBUG
+
/*****************************************************************************
* Unix-only declarations
******************************************************************************/
-#ifndef WIN32
+#ifdef XP_UNIX
+# define VOUT_PLUGINS "xvideo,x11,dummy"
+# define AOUT_PLUGINS "oss,dummy"
+
static void Redraw( Widget w, XtPointer closure, XEvent *event );
+static void Resize( Widget w, XtPointer closure, XEvent *event );
+#endif
+
+/*****************************************************************************
+ * MacOS-only declarations
+******************************************************************************/
+#ifdef XP_MACOSX
+# define VOUT_PLUGINS "macosx"
+# define AOUT_PLUGINS "macosx"
+
#endif
/*****************************************************************************
* Windows-only declarations
*****************************************************************************/
-#ifdef WIN32
-HINSTANCE g_hDllInstance = NULL;
+#ifdef XP_WIN
+# define VOUT_PLUGINS "directx,wingdi,dummy"
+# define AOUT_PLUGINS "directx,waveout,dummy"
-BOOL WINAPI
-DllMain( HINSTANCE hinstDLL, // handle of DLL module
- DWORD fdwReason, // reason for calling function
- LPVOID lpvReserved)
-{
- switch (fdwReason) {
- case DLL_PROCESS_ATTACH:
- g_hDllInstance = hinstDLL;
- break;
- case DLL_THREAD_ATTACH:
- case DLL_PROCESS_DETACH:
- case DLL_THREAD_DETACH:
- break;
- }
- return TRUE;
-}
+#if defined(XP_WIN) && !USE_LIBVLC
+LRESULT CALLBACK Manage( HWND, UINT, WPARAM, LPARAM );
+#endif
#endif
/******************************************************************************
NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
{
+
static nsIID nsid = VLCINTF_IID;
+ static char psz_desc[1000];
switch( variable )
{
return NPERR_NO_ERROR;
case NPPVpluginDescriptionString:
- *((char **)value) = PLUGIN_DESCRIPTION;
+#if USE_LIBVLC
+ snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, VLC_Version() );
+#else /* USE_LIBVLC */
+ snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, "(disabled)" );
+#endif /* USE_LIBVLC */
+ psz_desc[1000-1] = 0;
+ *((char **)value) = psz_desc;
return NPERR_NO_ERROR;
+
+ default:
+ /* go on... */
+ break;
}
if( instance == NULL )
return NPERR_NO_ERROR;
}
+/******************************************************************************
+ * Mac-only API calls
+ *****************************************************************************/
+#ifdef XP_MACOSX
+int16 NPP_HandleEvent( NPP instance, void * event )
+{
+ VlcPlugin *p_plugin = (VlcPlugin*)instance->pdata;
+ vlc_value_t value;
+
+ if( instance == NULL )
+ {
+ return false;
+ }
+
+ EventRecord *pouetEvent = (EventRecord*)event;
+
+ if (pouetEvent->what == 6)
+ {
+ value.i_int = 1;
+ VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", value );
+ return true;
+ }
+
+ Boolean eventHandled = false;
+
+ return eventHandled;
+}
+#endif /* XP_MACOSX */
+
/******************************************************************************
* General Plug-in Calls
*****************************************************************************/
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
char* argn[], char* argv[], NPSavedData* saved )
{
- int i_ret;
int i;
- char *ppsz_foo[] =
- {
- "vlc"
- /*, "--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins"*/
- , "--vout", "xvideo,x11,dummy"
- , "--aout", "dsp"
- , "--intf", "dummy"
- /*, "--noaudio"*/
- /*, "-q"*/
- , "-v"
- };
+#if USE_LIBVLC
+ vlc_value_t value;
+ int i_ret;
+
+#endif /* USE_LIBVLC */
if( instance == NULL )
{
instance->pdata = p_plugin;
- p_plugin->fMode = mode;
- p_plugin->fWindow = NULL;
+#ifdef XP_WIN
+ p_plugin->p_hwnd = NULL;
+ p_plugin->pf_wndproc = NULL;
+#endif /* XP_WIN */
+
+#ifdef XP_UNIX
p_plugin->window = 0;
+ p_plugin->p_display = NULL;
+#endif /* XP_UNIX */
+
+ p_plugin->p_npwin = NULL;
+ p_plugin->i_npmode = mode;
+ p_plugin->i_width = 0;
+ p_plugin->i_height = 0;
- p_plugin->p_vlc = vlc_create_r();
- if( p_plugin->p_vlc == NULL )
+#if USE_LIBVLC
+ p_plugin->i_vlc = VLC_Create();
+ if( p_plugin->i_vlc < 0 )
{
+ p_plugin->i_vlc = 0;
delete p_plugin;
p_plugin = NULL;
return NPERR_GENERIC_ERROR;
}
- i_ret = vlc_init_r( p_plugin->p_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
+ {
+#ifdef XP_MACOSX
+ char *home_user;
+ char *directory;
+ char *plugin_path;
+ char *ppsz_argv[] = { "vlc", "--plugin-path", NULL };
+
+ home_user = strdup( getenv("HOME") );
+ directory = strdup( "/Library/Internet Plug-Ins/VLC Plugin.plugin/"
+ "Contents/MacOS/modules" );
+ plugin_path = malloc( strlen( directory ) + strlen( home_user ) );
+ memcpy( plugin_path , home_user , strlen(home_user) );
+ memcpy( plugin_path + strlen( home_user ) , directory ,
+ strlen( directory ) );
+
+ ppsz_argv[2] = plugin_path;
+
+#elif defined(XP_WIN)
+ char *ppsz_argv[] = { NULL, "-vv" };
+ HKEY h_key;
+ DWORD i_type, i_data = MAX_PATH + 1;
+ char p_data[MAX_PATH + 1];
+ if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\VideoLAN\\VLC",
+ 0, KEY_READ, &h_key ) == ERROR_SUCCESS )
+ {
+ if( RegQueryValueEx( h_key, "InstallDir", 0, &i_type,
+ (LPBYTE)p_data, &i_data ) == ERROR_SUCCESS )
+ {
+ if( i_type == REG_SZ )
+ {
+ strcat( p_data, "\\vlc" );
+ ppsz_argv[0] = p_data;
+ }
+ }
+ RegCloseKey( h_key );
+ }
+
+ if( !ppsz_argv[0] ) ppsz_argv[0] = "vlc";
+
+#else /* XP_MACOSX */
+ char *ppsz_argv[] =
+ {
+ "vlc"
+ /*, "--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins"*/
+ };
+
+#endif /* XP_MACOSX */
+
+ /* HACK: special case for loop, to have it set before playlist startup
+ */
+ for( i = 0; i < argc ; i++ )
+ {
+ if( !strcmp( argn[i], "loop" ) )
+ {
+ if( !strcmp( argv[i], "yes" ) )
+ {
+ value.b_bool = VLC_TRUE;
+ VLC_VariableSet( p_plugin->i_vlc, "conf::loop", value );
+ }
+ }
+ }
+
+ i_ret = VLC_Init( p_plugin->i_vlc, sizeof(ppsz_argv)/sizeof(char*),
+ ppsz_argv );
+
+#ifdef XP_MACOSX
+ free( home_user );
+ free( directory );
+ free( plugin_path );
+#endif /* XP_MACOSX */
+ }
+
if( i_ret )
{
- vlc_destroy_r( p_plugin->p_vlc );
- p_plugin->p_vlc = NULL;
+ VLC_Destroy( p_plugin->i_vlc );
+ p_plugin->i_vlc = 0;
delete p_plugin;
p_plugin = NULL;
return NPERR_GENERIC_ERROR;
}
- vlc_set_r( p_plugin->p_vlc, "vout", "xvideo,x11,dummy" );
- vlc_set_r( p_plugin->p_vlc, "intf", "dummy" );
+ value.psz_string = "dummy";
+ VLC_VariableSet( p_plugin->i_vlc, "conf::intf", value );
+ value.psz_string = VOUT_PLUGINS;
+ VLC_VariableSet( p_plugin->i_vlc, "conf::vout", value );
+ value.psz_string = AOUT_PLUGINS;
+ VLC_VariableSet( p_plugin->i_vlc, "conf::aout", value );
+
+#else /* USE_LIBVLC */
+ p_plugin->i_vlc = 1;
+
+#endif /* USE_LIBVLC */
- p_plugin->b_stream = 0;
- p_plugin->b_autoplay = 0;
+ p_plugin->b_stream = VLC_FALSE;
+ p_plugin->b_autoplay = VLC_FALSE;
p_plugin->psz_target = NULL;
for( i = 0; i < argc ; i++ )
p_plugin->b_autoplay = 1;
}
}
- else if( !strcmp( argn[i], "loop" ) )
+ else if( !strcmp( argn[i], "autostart" ) )
+ {
+ if( !strcmp( argv[i], "1" ) || !strcmp( argv[i], "true" ) )
+ {
+ p_plugin->b_autoplay = 1;
+ }
+ }
+ else if( !strcmp( argn[i], "filename" ) )
+ {
+ p_plugin->psz_target = argv[i];
+ }
+ else if( !strcmp( argn[i], "src" ) )
+ {
+ p_plugin->psz_target = argv[i];
+ }
+
+#if USE_LIBVLC
+ else if( !strcmp( argn[i], "fullscreen" ) )
{
if( !strcmp( argv[i], "yes" ) )
{
- vlc_set_r( p_plugin->p_vlc, "loop", "1" );
+ value.b_bool = VLC_TRUE;
+ VLC_VariableSet( p_plugin->i_vlc, "conf::fullscreen", value );
}
}
+ else if( !strcmp( argn[i], "mute" ) )
+ {
+ if( !strcmp( argv[i], "yes" ) )
+ {
+ VLC_VolumeMute( p_plugin->i_vlc );
+ }
+ }
+#endif /* USE_LIBVLC */
}
if( p_plugin->psz_target )
return NPERR_NO_ERROR;
}
+#ifdef XP_WIN
+/* This is really ugly but there is a deadlock when stopping a stream
+ * (in VLC_CleanUp()) because the video output is a child of the drawable but
+ * is in a different thread. */
+static void HackStopVout( VlcPlugin* p_plugin )
+{
+ MSG msg;
+ HWND hwnd;
+ vlc_value_t value;
+
+ VLC_VariableGet( p_plugin->i_vlc, "drawable", &value );
+
+ hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 );
+ if( !hwnd ) return;
+
+ PostMessage( hwnd, WM_CLOSE, 0, 0 );
+
+ do
+ {
+ while( PeekMessage( &msg, (HWND)value.i_int, 0, 0, PM_REMOVE ) )
+ {
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ }
+ if( FindWindowEx( (HWND)value.i_int, 0, 0, 0 ) ) Sleep( 10 );
+ }
+ while( (hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 )) );
+}
+#endif /* XP_WIN */
+
NPError NPP_Destroy( NPP instance, NPSavedData** save )
{
if( instance == NULL )
if( p_plugin != NULL )
{
- if( p_plugin->p_vlc != NULL )
+ if( p_plugin->i_vlc )
{
- vlc_stop_r( p_plugin->p_vlc );
- vlc_destroy_r( p_plugin->p_vlc );
- p_plugin->p_vlc = NULL;
+#if USE_LIBVLC
+# ifdef XP_WIN
+ HackStopVout( p_plugin );
+# endif /* XP_WIN */
+ VLC_CleanUp( p_plugin->i_vlc );
+ VLC_Destroy( p_plugin->i_vlc );
+#endif /* USE_LIBVLC */
+ p_plugin->i_vlc = 0;
}
if( p_plugin->psz_target )
NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
- char psz_window[32];
+ vlc_value_t value;
+#ifdef XP_MACOSX
+ vlc_value_t valuex;
+ vlc_value_t valuey;
+ vlc_value_t valuew;
+ vlc_value_t valueh;
+ vlc_value_t valuet;
+ vlc_value_t valuel;
+ vlc_value_t valueb;
+ vlc_value_t valuer;
+ vlc_value_t valueportx;
+ vlc_value_t valueporty;
+ Rect black_rect;
+ char * text;
+#endif /* XP_MACOSX */
if( instance == NULL )
{
VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
/* Write the window ID for vlc */
- sprintf( psz_window, "%li", (long int)window->window );
- vlc_set_r( p_plugin->p_vlc, "x11-drawable", psz_window );
- vlc_set_r( p_plugin->p_vlc, "xvideo-drawable", psz_window );
+#if USE_LIBVLC
+
+#ifdef XP_MACOSX
+ value.i_int = ((NP_Port*) (window->window))->port;
+ VLC_VariableSet( p_plugin->i_vlc, "drawable", value );
+
+ valueportx.i_int = ((NP_Port*) (window->window))->portx;
+ valueporty.i_int = ((NP_Port*) (window->window))->porty;
+ VLC_VariableSet( p_plugin->i_vlc, "drawableportx", valueportx );
+ VLC_VariableSet( p_plugin->i_vlc, "drawableporty", valueporty );
+
+ valuex.i_int = window->x;
+ valuey.i_int = window->y;
+ valuew.i_int = window->width;
+ valueh.i_int = window->height;
+ valuet.i_int = window->clipRect.top;
+ valuel.i_int = window->clipRect.left;
+ valueb.i_int = window->clipRect.bottom;
+ valuer.i_int = window->clipRect.right;
+
+ VLC_VariableSet( p_plugin->i_vlc, "drawablet", valuet );
+ VLC_VariableSet( p_plugin->i_vlc, "drawablel", valuel );
+ VLC_VariableSet( p_plugin->i_vlc, "drawableb", valueb );
+ VLC_VariableSet( p_plugin->i_vlc, "drawabler", valuer );
+ VLC_VariableSet( p_plugin->i_vlc, "drawablex", valuex );
+ VLC_VariableSet( p_plugin->i_vlc, "drawabley", valuey );
+ VLC_VariableSet( p_plugin->i_vlc, "drawablew", valuew );
+ VLC_VariableSet( p_plugin->i_vlc, "drawableh", valueh );
+
+ p_plugin->window = window;
+
+ /* draw the beautiful "No Picture" */
+
+ black_rect.top = valuet.i_int - valuey.i_int;
+ black_rect.left = valuel.i_int - valuex.i_int;
+ black_rect.bottom = valueb.i_int - valuey.i_int;
+ black_rect.right = valuer.i_int - valuex.i_int;
+
+ SetPort( value.i_int );
+ SetOrigin( valueportx.i_int , valueporty.i_int );
+ ForeColor(blackColor);
+ PenMode( patCopy );
+ PaintRect( &black_rect );
+
+ ForeColor(whiteColor);
+ text = strdup( WINDOW_TEXT );
+ MoveTo( valuew.i_int / 2 - 40 , valueh.i_int / 2 );
+ DrawText( text , 0 , strlen(text) );
+ free(text);
+
+#else /* XP_MACOSX */
+ /* FIXME: this cast sucks */
+ value.i_int = (int) (ptrdiff_t) (void *) window->window;
+ VLC_VariableSet( p_plugin->i_vlc, "drawable", value );
+#endif /* XP_MACOSX */
+
+#endif /* USE_LIBVLC */
/*
* PLUGIN DEVELOPERS:
* size changes, etc.
*/
- Widget netscape_widget;
+#ifdef XP_WIN
+ if( !window || !window->window )
+ {
+ /* Window was destroyed. Invalidate everything. */
+ if( p_plugin->p_npwin )
+ {
+#if !USE_LIBVLC
+ SetWindowLong( p_plugin->p_hwnd, GWL_WNDPROC,
+ (LONG)p_plugin->pf_wndproc );
+#endif /* !USE_LIBVLC */
+ p_plugin->pf_wndproc = NULL;
+ p_plugin->p_hwnd = NULL;
+ }
- p_plugin->window = (Window) window->window;
- p_plugin->x = window->x;
- p_plugin->y = window->y;
- p_plugin->width = window->width;
- p_plugin->height = window->height;
- p_plugin->display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+ p_plugin->p_npwin = window;
+ return NPERR_NO_ERROR;
+ }
- netscape_widget = XtWindowToWidget(p_plugin->display, p_plugin->window);
- XtAddEventHandler(netscape_widget, ExposureMask, FALSE, (XtEventHandler)Redraw, p_plugin);
- Redraw(netscape_widget, (XtPointer)p_plugin, NULL);
+ if( p_plugin->p_npwin )
+ {
+ if( p_plugin->p_hwnd == (HWND)window->window )
+ {
+ /* Same window, but something may have changed. First we
+ * update the plugin structure, then we redraw the window */
+ p_plugin->i_width = window->width;
+ p_plugin->i_height = window->height;
+ p_plugin->p_npwin = window;
+#if !USE_LIBVLC
+ InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
+ UpdateWindow( p_plugin->p_hwnd );
+#endif /* !USE_LIBVLC */
+ return NPERR_NO_ERROR;
+ }
+
+ /* Window has changed. Destroy the one we have, and go
+ * on as if it was a real initialization. */
+#if !USE_LIBVLC
+ SetWindowLong( p_plugin->p_hwnd, GWL_WNDPROC,
+ (LONG)p_plugin->pf_wndproc );
+#endif /* !USE_LIBVLC */
+ p_plugin->pf_wndproc = NULL;
+ p_plugin->p_hwnd = NULL;
+ }
+
+#if !USE_LIBVLC
+ p_plugin->pf_wndproc = (WNDPROC)SetWindowLong( (HWND)window->window,
+ GWL_WNDPROC, (LONG)Manage );
+#endif /* !USE_LIBVLC */
+
+ p_plugin->p_hwnd = (HWND)window->window;
+ SetProp( p_plugin->p_hwnd, "w00t", (HANDLE)p_plugin );
+ InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
+ UpdateWindow( p_plugin->p_hwnd );
+#endif /* XP_WIN */
- p_plugin->fWindow = window;
+ p_plugin->i_width = window->width;
+ p_plugin->i_height = window->height;
+ p_plugin->p_npwin = window;
+
+#ifdef XP_UNIX
+ p_plugin->window = (Window) window->window;
+ p_plugin->p_display =
+ ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+
+ XResizeWindow( p_plugin->p_display, p_plugin->window,
+ p_plugin->i_width, p_plugin->i_height );
+ Widget w = XtWindowToWidget( p_plugin->p_display, p_plugin->window );
+ XtAddEventHandler( w, ExposureMask, FALSE,
+ (XtEventHandler)Redraw, p_plugin );
+ XtAddEventHandler( w, StructureNotifyMask, FALSE,
+ (XtEventHandler)Resize, p_plugin );
+ Redraw( w, (XtPointer)p_plugin, NULL );
+#endif /* XP_UNIX */
-#if 1
if( !p_plugin->b_stream )
{
int i_mode = PLAYLIST_APPEND;
if( p_plugin->psz_target )
{
- vlc_add_target_r( p_plugin->p_vlc, p_plugin->psz_target,
- i_mode, PLAYLIST_END );
- p_plugin->b_stream = 1;
+#if USE_LIBVLC
+ VLC_AddTarget( p_plugin->i_vlc, p_plugin->psz_target,
+ 0, 0, PLAYLIST_INSERT, 0 );
+#endif
+ p_plugin->b_stream = VLC_TRUE;
}
}
-#endif
return NPERR_NO_ERROR;
}
VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
#endif
- fprintf(stderr, "NPP_NewStream - FILE mode !!\n");
+ /* fprintf(stderr, "NPP_NewStream - FILE mode !!\n"); */
/* We want a *filename* ! */
*stype = NP_ASFILE;
#if 0
- if( p_plugin->b_stream == 0 )
+ if( !p_plugin->b_stream )
{
p_plugin->psz_target = strdup( stream->url );
- p_plugin->b_stream = 1;
+ p_plugin->b_stream = VLC_TRUE;
}
#endif
{
VlcPlugin* p_plugin;
- fprintf(stderr, "NPP_WriteReady\n");
+ /* fprintf(stderr, "NPP_WriteReady\n"); */
if (instance != NULL)
{
int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
int32 len, void *buffer )
{
- fprintf(stderr, "NPP_Write %i\n", len);
+ /* fprintf(stderr, "NPP_Write %i\n", (int)len); */
if( instance != NULL )
{
return;
}
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
-
- fprintf(stderr, "NPP_StreamAsFile\n");
- vlc_add_target_r( p_plugin->p_vlc, fname,
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
-}
+ /* fprintf(stderr, "NPP_StreamAsFile %s\n", fname); */
-#if 0
-void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
-{
- fprintf(stderr,"filename : %s\n", fname);
- ((VlcPlugin*) instance->pdata)->SetFileName(fname);
+#if USE_LIBVLC
+ VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
- fprintf(stderr,"SetFileNeme ok. \n");
+ VLC_AddTarget( p_plugin->i_vlc, fname, 0, 0,
+ PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
+#endif /* USE_LIBVLC */
}
-#endif
void NPP_URLNotify( NPP instance, const char* url,
}
}
+/******************************************************************************
+ * Windows-only methods
+ *****************************************************************************/
+#if defined(XP_WIN) && !USE_LIBVLC
+LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
+{
+ VlcPlugin* p_plugin = (VlcPlugin*) GetProp( p_hwnd, "w00t" );
+
+ switch( i_msg )
+ {
+ case WM_PAINT:
+ {
+ PAINTSTRUCT paintstruct;
+ HDC hdc;
+ RECT rect;
+
+ hdc = BeginPaint( p_hwnd, &paintstruct );
+
+ GetClientRect( p_hwnd, &rect );
+ FillRect( hdc, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH) );
+ TextOut( hdc, p_plugin->i_width / 2 - 40, p_plugin->i_height / 2,
+ WINDOW_TEXT, strlen(WINDOW_TEXT) );
+
+ EndPaint( p_hwnd, &paintstruct );
+ break;
+ }
+ default:
+ p_plugin->pf_wndproc( p_hwnd, i_msg, wpar, lpar );
+ break;
+ }
+ return 0;
+}
+#endif /* XP_WIN */
+
/******************************************************************************
* UNIX-only methods
*****************************************************************************/
-#ifndef WIN32
+#ifdef XP_UNIX
static void Redraw( Widget w, XtPointer closure, XEvent *event )
{
VlcPlugin* p_plugin = (VlcPlugin*)closure;
GC gc;
XGCValues gcv;
- const char * psz_text = "(no picture)";
- gcv.foreground = BlackPixel( p_plugin->display, 0 );
- gc = XCreateGC( p_plugin->display, p_plugin->window, GCForeground, &gcv );
+ gcv.foreground = BlackPixel( p_plugin->p_display, 0 );
+ gc = XCreateGC( p_plugin->p_display, p_plugin->window, GCForeground, &gcv );
- XFillRectangle( p_plugin->display, p_plugin->window, gc,
- 0, 0, p_plugin->width, p_plugin->height );
+ XFillRectangle( p_plugin->p_display, p_plugin->window, gc,
+ 0, 0, p_plugin->i_width, p_plugin->i_height );
- gcv.foreground = WhitePixel( p_plugin->display, 0 );
- XChangeGC( p_plugin->display, gc, GCForeground, &gcv );
+ gcv.foreground = WhitePixel( p_plugin->p_display, 0 );
+ XChangeGC( p_plugin->p_display, gc, GCForeground, &gcv );
- XDrawString( p_plugin->display, p_plugin->window, gc,
- p_plugin->width / 2 - 40, p_plugin->height / 2,
- psz_text, strlen(psz_text) );
+ XDrawString( p_plugin->p_display, p_plugin->window, gc,
+ p_plugin->i_width / 2 - 40, p_plugin->i_height / 2,
+ WINDOW_TEXT, strlen(WINDOW_TEXT) );
- XFreeGC( p_plugin->display, gc );
+ XFreeGC( p_plugin->p_display, gc );
}
-#endif
+
+static void Resize ( Widget w, XtPointer closure, XEvent *event )
+{
+ VlcPlugin* p_plugin = (VlcPlugin*)closure;
+ int i_ret;
+ Window root_return, parent_return, * children_return;
+ Window base_window;
+ unsigned int i_nchildren;
+
+#ifdef X11_RESIZE_DEBUG
+ XWindowAttributes attr;
+
+ if( event && event->type == ConfigureNotify )
+ {
+ fprintf( stderr, "vlcshell::Resize() ConfigureNotify %d x %d, "
+ "send_event ? %s\n", event->xconfigure.width,
+ event->xconfigure.height,
+ event->xconfigure.send_event ? "TRUE" : "FALSE" );
+ }
+#endif /* X11_RESIZE_DEBUG */
+
+ i_ret = XResizeWindow( p_plugin->p_display, p_plugin->window,
+ p_plugin->i_width, p_plugin->i_height );
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr,
+ "vlcshell::Resize() XResizeWindow(owner) returned %d\n", i_ret );
+
+ XGetWindowAttributes ( p_plugin->p_display, p_plugin->window, &attr );
+
+ /* X is asynchronous, so the current size reported here is not
+ necessarily the requested size as the Resize request may not
+ yet have been handled by the plugin host */
+ fprintf( stderr, "vlcshell::Resize() current (owner) size %d x %d\n",
+ attr.width, attr.height );
+#endif /* X11_RESIZE_DEBUG */
+
+ XQueryTree( p_plugin->p_display, p_plugin->window,
+ &root_return, &parent_return, &children_return,
+ &i_nchildren );
+
+ if( i_nchildren > 0 )
+ {
+ /* XXX: Make assumptions related to the window parenting structure in
+ vlc/modules/video_output/x11/xcommon.c */
+ base_window = children_return[i_nchildren - 1];
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr, "vlcshell::Resize() got %d children\n", i_nchildren );
+ fprintf( stderr, "vlcshell::Resize() got base_window %p\n",
+ base_window );
+#endif /* X11_RESIZE_DEBUG */
+
+ i_ret = XResizeWindow( p_plugin->p_display, base_window,
+ p_plugin->i_width, p_plugin->i_height );
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr,
+ "vlcshell::Resize() XResizeWindow(base) returned %d\n",
+ i_ret );
+
+ XGetWindowAttributes( p_plugin->p_display, base_window, &attr );
+
+ fprintf( stderr, "vlcshell::Resize() new size %d x %d\n",
+ attr.width, attr.height );
+#endif /* X11_RESIZE_DEBUG */
+ }
+}
+
+#endif /* XP_UNIX */
projects / vlc / blobdiff