kdebase/nsplugins/viewer

[George Staikos]

CVS commit by staikos: 

Another size related hack.  This seems to make everyone happy.  Now mplayer
plugin loads and operates as well as Crossover.  The new approach is to set
the canvas to 1600x1200 if the size is unspecified (this works around
Crossover problems with resizing to larger than the original canvas setting),
but telling the plugin that it is 0x0, which is what some plugins expect.  It
seems that all plugins can scale upwards, but many have troubles scaling down.

That being said, the trailers on apple.com still don't work, but it appears to
be mplayer specific now.  I think mplayer is actually crashing, but even if not,
it's giving a lot of errors in the console.  The trailer shows up momentarily
as a very small video in the top-left of the view, then just disappears
silently.  Playing local files works fine (.wmv, .mpg, .mov, etc).

Hopefully this patch finally makes everyone happy.  I have successfully tested:
flash6
realplugin
mplayerplugin
crossover
djvu
tclplug
acrobat plugin
swfdec mozilla plugin

Remains to be tested: plugger (if it's even worth it...)

And they all seem to work well now.  I can't find many problems other than the
missing jre which is probably not going to be solved any time soon (so no
real live connect support).  I would like to backport the changes from the past
5-6 days to the 3.1-branch.  I'll do so tonight if I don't hear any negative
feedback.

CCMAIL: j.spaandonk at chello.nl, kdekorte at yahoo.com, fgouget at codeweavers.com, kfm-devel at mail.kde.org


  M +8 -2      nsplugin.cpp   1.94


--- kdebase/nsplugins/viewer/nsplugin.cpp  #1.93:1.94
@@ -521,4 +521,10 @@ NSPluginInstance::NSPluginInstance(NPP p
    kdDebug(1431) << "ndata = " << _npp->ndata << endl;
 
+   if (width == 0)
+      width = 1600;
+
+   if (height == 0)
+      height = 1200;
+
    // create drawing area
    Arg args[5];
@@ -1203,6 +1209,6 @@ DCOPRef NSPluginClass::newInstance( QStr
    char **_argv = new char*[argc];
    QString src = url;
-   int width = 1600;
-   int height = 1200;
+   int width = 0;
+   int height = 0;
    QString baseURL = url;