]> git.sesse.net Git - vlc/blobdiff - mozilla/vlcshell.cpp
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* modules/demux/ps.c,ps.h: PSM parsing remotely based on a patch by Pascal Claes.
[vlc] / mozilla / vlcshell.cpp
diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index dd77caaaf6c8b89f5cfbb65ac5a2ed05e8731143..62a021c29aeda57fffd53e25e1a4f56a1fad3f76 100644 (file)
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -2,7 +2,7 @@
  * vlcshell.cpp: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.23 2003/09/20 22:52:27 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,6 +27,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -37,9 +39,19 @@
 #endif
 
 /* Mozilla stuff */
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
 #include <nsISupports.h>
 #include <nsMemory.h>
 #include <npapi.h>
+#include <jri.h>
+
+#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 */
@@ -50,6 +62,13 @@
 #   include <Quickdraw.h>
 #endif
 
+#ifdef XP_UNIX
+    /* X11 stuff */
+#   include <X11/Xlib.h>
+#   include <X11/Intrinsic.h>
+#   include <X11/StringDefs.h>
+#endif
+
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
@@ -59,18 +78,6 @@
 #   define WINDOW_TEXT "(no libvlc)"
 #endif
 
-/* No, I really don't want to use XP_UNIX stuff on MacOSX */
-#ifdef XP_MACOSX
-#undef XP_UNIX
-#endif
-
-#ifdef XP_UNIX
-    /* X11 stuff */
-#   include <X11/Xlib.h>
-#   include <X11/Intrinsic.h>
-#   include <X11/StringDefs.h>
-#endif
-
 /*****************************************************************************
  * Unix-only declarations
 ******************************************************************************/
@@ -94,30 +101,13 @@ static void Redraw( Widget w, XtPointer closure, XEvent *event );
  * Windows-only declarations
  *****************************************************************************/
 #ifdef XP_WIN
-#   define VOUT_PLUGINS "directx,dummy"
-#   define AOUT_PLUGINS "none" /* "directx,waveout,dummy" */
-
-HINSTANCE g_hDllInstance = NULL;
-
-BOOL WINAPI DllMain( HINSTANCE hinstDLL, /* handle of DLL module */
-                     DWORD fdwReason,    /* reason for calling the 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;
-}
+#   define VOUT_PLUGINS "directx,wingdi,dummy"
+#   define AOUT_PLUGINS "directx,waveout,dummy"
 
+#if defined(XP_WIN) && !USE_LIBVLC
 LRESULT CALLBACK Manage( HWND, UINT, WPARAM, LPARAM );
 #endif
+#endif
 
 /******************************************************************************
  * UNIX-only API calls
@@ -206,7 +196,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
     if (pouetEvent->what == 6)
     {
         value.i_int = 1;
-        VLC_Set( p_plugin->i_vlc, "drawableredraw", value );
+        VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", value );
         return true;
     }
 
@@ -302,11 +292,10 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
         ppsz_argv[2] = plugin_path;
 
 #elif defined(XP_WIN)
-        char *ppsz_argv[] = { "vlc", "--plugin-path", NULL };
+        char *ppsz_argv[] = { NULL, "-vv" };
         HKEY h_key;
-        DWORD i_type, i_data;
+        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 )
         {
@@ -315,14 +304,14 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
              {
                  if( i_type == REG_SZ )
                  {
-                     strcat( p_data, "\\plugins" );
-                     ppsz_argv[2] = p_data;
+                     strcat( p_data, "\\vlc" );
+                     ppsz_argv[0] = p_data;
                  }
              }
              RegCloseKey( h_key );
         }
 
-        if( !ppsz_argv[2] ) ppsz_argv[2] = ".";
+        if( !ppsz_argv[0] ) ppsz_argv[0] = "vlc";
 
 #else
         char *ppsz_argv[] =
@@ -353,11 +342,11 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
     }
 
     value.psz_string = "dummy";
-    VLC_Set( p_plugin->i_vlc, "conf::intf", value );
+    VLC_VariableSet( p_plugin->i_vlc, "conf::intf", value );
     value.psz_string = VOUT_PLUGINS;
-    VLC_Set( p_plugin->i_vlc, "conf::vout", value );
+    VLC_VariableSet( p_plugin->i_vlc, "conf::vout", value );
     value.psz_string = AOUT_PLUGINS;
-    VLC_Set( p_plugin->i_vlc, "conf::aout", value );
+    VLC_VariableSet( p_plugin->i_vlc, "conf::aout", value );
 
 #else
     p_plugin->i_vlc = 1;
@@ -403,7 +392,15 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
             if( !strcmp( argv[i], "yes" ) )
             {
                 value.b_bool = VLC_TRUE;
-                VLC_Set( p_plugin->i_vlc, "conf::loop", value );
+                VLC_VariableSet( p_plugin->i_vlc, "conf::loop", value );
+            }
+        }
+        else if( !strcmp( argn[i], "fullscreen" ) )
+        {
+            if( !strcmp( argv[i], "yes" ) )
+            {
+                value.b_bool = VLC_TRUE;
+                VLC_VariableSet( p_plugin->i_vlc, "conf::fullscreen", value );
             }
         }
 #endif
@@ -431,7 +428,7 @@ NPError NPP_Destroy( NPP instance, NPSavedData** save )
         if( p_plugin->i_vlc )
         {
 #if USE_LIBVLC
-            VLC_Stop( p_plugin->i_vlc );
+            VLC_CleanUp( p_plugin->i_vlc );
             VLC_Destroy( p_plugin->i_vlc );
 #endif
             p_plugin->i_vlc = 0;
@@ -481,12 +478,12 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
 
 #ifdef XP_MACOSX
     value.i_int = ((NP_Port*) (window->window))->port;
-    VLC_Set( p_plugin->i_vlc, "drawable", value );
+    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_Set( p_plugin->i_vlc, "drawableportx", valueportx );
-    VLC_Set( p_plugin->i_vlc, "drawableporty", valueporty );
+    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;
@@ -497,14 +494,14 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
     valueb.i_int = window->clipRect.bottom;
     valuer.i_int = window->clipRect.right;
 
-    VLC_Set( p_plugin->i_vlc, "drawablet", valuet );
-    VLC_Set( p_plugin->i_vlc, "drawablel", valuel );
-    VLC_Set( p_plugin->i_vlc, "drawableb", valueb );
-    VLC_Set( p_plugin->i_vlc, "drawabler", valuer );
-    VLC_Set( p_plugin->i_vlc, "drawablex", valuex );
-    VLC_Set( p_plugin->i_vlc, "drawabley", valuey );
-    VLC_Set( p_plugin->i_vlc, "drawablew", valuew );
-    VLC_Set( p_plugin->i_vlc, "drawableh", valueh );
+    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_VarialbeSet( 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;
 
@@ -530,7 +527,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
 #else
     /* FIXME: this cast sucks */
     value.i_int = (int) (ptrdiff_t) (void *) window->window;
-    VLC_Set( p_plugin->i_vlc, "drawable", value );
+    VLC_VariableSet( p_plugin->i_vlc, "drawable", value );
 #endif
 
 #endif
@@ -549,8 +546,10 @@ NPError NPP_SetWindow( NPP instance, NPWindow* 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
             p_plugin->pf_wndproc = NULL;
             p_plugin->p_hwnd = NULL;
         }
@@ -565,24 +564,31 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
         {
             /* Same window, but something may have changed. First we
              * update the plugin structure, then we redraw the window */
-            InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
             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
             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
         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
+
     p_plugin->p_hwnd = (HWND)window->window;
     SetProp( p_plugin->p_hwnd, "w00t", (HANDLE)p_plugin );
     InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
@@ -804,14 +810,13 @@ void NPP_Print( NPP instance, NPPrint* printInfo )
 /******************************************************************************
  * Windows-only methods
  *****************************************************************************/
-#ifdef XP_WIN
+#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 )
     {
-#if !USE_LIBVLC
         case WM_PAINT:
         {
             PAINTSTRUCT paintstruct;
@@ -828,7 +833,6 @@ LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
             EndPaint( p_hwnd, &paintstruct );
             break;
         }
-#endif
         default:
             p_plugin->pf_wndproc( p_hwnd, i_msg, wpar, lpar );
             break;
Unnamed repository; edit this file 'description' to name the repository.