зеркало из https://github.com/mozilla/gecko-dev.git
Bug 384845. Drawing support for windowless plugins in X. Patch by Karl Tomlinson, r+sr=roc,jst
This commit is contained in:
roc+@cs.cmu.edu
Родитель
f4c4c26c85
Коммит
10a1857ebe
|
|
@ -202,6 +202,10 @@ LOCAL_INCLUDES += \
|
|||
$(MOZ_CAIRO_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||
endif
|
||||
|
||||
libs::
|
||||
$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
|
||||
$(INSTALL) $(RESOURCES) $(DIST)/bin/res
|
||||
|
|
|
|||
|
|
@ -141,10 +141,19 @@
|
|||
#include "nsContentCID.h"
|
||||
static NS_DEFINE_CID(kRangeCID, NS_RANGE_CID);
|
||||
|
||||
#ifdef MOZ_X11
|
||||
#include <X11/Xlib.h>
|
||||
/* X headers suck */
|
||||
enum { XKeyPress = KeyPress };
|
||||
#ifdef KeyPress
|
||||
#undef KeyPress
|
||||
#endif
|
||||
#include "gfxXlibNativeRenderer.h"
|
||||
#ifdef MOZ_WIDGET_GTK2
|
||||
#include <gdk/gdkwindow.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include <wtypes.h>
|
||||
|
|
@ -335,7 +344,14 @@ public:
|
|||
//nsIEventListener interface
|
||||
nsEventStatus ProcessEvent(const nsGUIEvent & anEvent);
|
||||
|
||||
void Paint(const nsRect& aDirtyRect, PRUint32 ndc = 0);
|
||||
#ifdef XP_WIN
|
||||
void Paint(const nsRect& aDirtyRect, HDC ndc);
|
||||
#elif defined(XP_MACOSX)
|
||||
void Paint(const nsRect& aDirtyRect);
|
||||
#elif defined(MOZ_X11)
|
||||
void Paint(nsIRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect);
|
||||
#endif
|
||||
|
||||
// nsITimerCallback interface
|
||||
NS_DECL_NSITIMERCALLBACK
|
||||
|
|
@ -389,10 +405,28 @@ private:
|
|||
nsresult DispatchFocusToPlugin(nsIDOMEvent* aFocusEvent);
|
||||
|
||||
nsresult EnsureCachedAttrParamArrays();
|
||||
|
||||
#ifdef MOZ_X11
|
||||
class Renderer : public gfxXlibNativeRenderer {
|
||||
public:
|
||||
Renderer(nsPluginWindow* aWindow, nsIPluginInstance* aInstance,
|
||||
const nsIntRect& aDirtyRect)
|
||||
: mWindow(aWindow), mInstance(aInstance), mDirtyRect(aDirtyRect)
|
||||
{}
|
||||
virtual nsresult NativeDraw(Display* dpy, Drawable drawable, Visual* visual,
|
||||
short offsetX, short offsetY,
|
||||
XRectangle* clipRects, PRUint32 numClipRects);
|
||||
private:
|
||||
nsPluginWindow* mWindow;
|
||||
nsIPluginInstance* mInstance;
|
||||
const nsIntRect& mDirtyRect;
|
||||
};
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && defined(XP_MACOSX))
|
||||
static void ConvertAppUnitsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect);
|
||||
#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && defined(XP_MACOSX)) || defined(MOZ_X11)
|
||||
static void ConvertAppUnitsToPixels(const nsPresContext& aPresContext, const nsRect& aTwipsRect, nsIntRect& aPixelRect);
|
||||
#endif
|
||||
|
||||
// Mac specific code to fix up port position and clip during paint
|
||||
|
|
@ -845,6 +879,10 @@ nsPoint nsObjectFrame::GetWindowOriginInPixels(PRBool aWindowless)
|
|||
// if it's windowless, let's make sure we have our origin set right
|
||||
// it may need to be corrected, like after scrolling
|
||||
if (aWindowless && parentWithView) {
|
||||
// XXX Should this be replaced by nsIView::GetNearestWidget?
|
||||
// The implementation below doesn't handle cases where the widget's origin
|
||||
// doesn't coincide with its view's origin.
|
||||
|
||||
nsIViewManager* parentVM = parentWithView->GetViewManager();
|
||||
|
||||
// Walk up all the views and add up their positions until we
|
||||
|
|
@ -914,7 +952,32 @@ nsObjectFrame::DidReflow(nsPresContext* aPresContext,
|
|||
window->y = origin.y;
|
||||
|
||||
// refresh the plugin port as well
|
||||
window->window = mInstanceOwner->GetPluginPort();
|
||||
#ifdef MOZ_X11
|
||||
if(windowless) {
|
||||
// There is no plugin port window but there are some extra fields to
|
||||
// fill in.
|
||||
nsIWidget* widget = GetWindow();
|
||||
if (widget) {
|
||||
NPSetWindowCallbackStruct* ws_info =
|
||||
NS_STATIC_CAST(NPSetWindowCallbackStruct*, window->ws_info);
|
||||
ws_info->display =
|
||||
NS_STATIC_CAST(Display*, widget->GetNativeData(NS_NATIVE_DISPLAY));
|
||||
#ifdef MOZ_WIDGET_GTK2
|
||||
GdkWindow* gdkWindow =
|
||||
NS_STATIC_CAST(GdkWindow*, widget->GetNativeData(NS_NATIVE_WINDOW));
|
||||
GdkColormap* gdkColormap = gdk_drawable_get_colormap(gdkWindow);
|
||||
ws_info->colormap = gdk_x11_colormap_get_xcolormap(gdkColormap);
|
||||
GdkVisual* gdkVisual = gdk_colormap_get_visual(gdkColormap);
|
||||
ws_info->visual = gdk_x11_visual_get_xvisual(gdkVisual);
|
||||
ws_info->depth = gdkVisual->depth;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
window->window = mInstanceOwner->GetPluginPort();
|
||||
}
|
||||
|
||||
// this will call pi->SetWindow and take care of window subclassing
|
||||
// if needed, see bug 132759
|
||||
|
|
@ -936,7 +999,12 @@ static void PaintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
|
|||
const nsRect& aDirtyRect, nsPoint aPt)
|
||||
{
|
||||
nsIRenderingContext::AutoPushTranslation translate(aCtx, aPt.x, aPt.y);
|
||||
#ifdef MOZ_X11 // FIXME - Bug 385435: Don't others want this too!
|
||||
nsRect relativeDirtyRect = aDirtyRect - aPt;
|
||||
NS_STATIC_CAST(nsObjectFrame*, aFrame)->PaintPlugin(*aCtx, relativeDirtyRect);
|
||||
#else
|
||||
NS_STATIC_CAST(nsObjectFrame*, aFrame)->PaintPlugin(*aCtx, aDirtyRect);
|
||||
#endif
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
@ -1105,6 +1173,15 @@ nsObjectFrame::PaintPlugin(nsIRenderingContext& aRenderingContext,
|
|||
// delegate all painting to the plugin instance.
|
||||
if (mInstanceOwner)
|
||||
mInstanceOwner->Paint(aDirtyRect);
|
||||
#elif defined(MOZ_X11)
|
||||
if (mInstanceOwner)
|
||||
{
|
||||
nsPluginWindow * window;
|
||||
mInstanceOwner->GetWindow(window);
|
||||
|
||||
if (window->type == nsPluginWindowType_Drawable)
|
||||
mInstanceOwner->Paint(aRenderingContext, aDirtyRect);
|
||||
}
|
||||
#elif defined (XP_WIN) // || defined(XP_OS2)
|
||||
// XXX for OS/2 we need to overhaul this for Cairo builds
|
||||
// for now just ignore plugin stuff
|
||||
|
|
@ -1196,6 +1273,11 @@ nsObjectFrame::PaintPlugin(nsIRenderingContext& aRenderingContext,
|
|||
|
||||
origin = GetWindowOriginInPixels(PR_TRUE);
|
||||
nsRect winlessRect = nsRect(origin, nsSize(window->width, window->height));
|
||||
// XXX I don't think we can be certain that the location wrt to
|
||||
// the window only changes when the location wrt to the drawable
|
||||
// changes, but the hdc probably changes on every paint so
|
||||
// doupdatewindow is rarely false, and there is not likely to be
|
||||
// a problem.
|
||||
if (mWindowlessRect != winlessRect) {
|
||||
mWindowlessRect = winlessRect;
|
||||
|
||||
|
|
@ -1220,10 +1302,11 @@ nsObjectFrame::PaintPlugin(nsIRenderingContext& aRenderingContext,
|
|||
inst->SetWindow(window);
|
||||
}
|
||||
|
||||
// FIXME - Bug 385435:
|
||||
// This expects a dirty rect relative to the plugin's rect
|
||||
// XXX I wonder if this breaks if we give the frame a border so the
|
||||
// frame origin and plugin origin are not the same
|
||||
mInstanceOwner->Paint(aDirtyRect, (PRUint32)(HDC)hdc);
|
||||
mInstanceOwner->Paint(aDirtyRect, hdc);
|
||||
|
||||
#ifdef MOZ_CAIRO_GFX
|
||||
RestoreDC(hdc, -1);
|
||||
|
|
@ -3142,12 +3225,12 @@ nsPluginInstanceOwner::Destroy()
|
|||
|
||||
// Paints are handled differently, so we just simulate an update event.
|
||||
|
||||
void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect, PRUint32 ndc)
|
||||
#ifdef XP_MACOSX
|
||||
void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect)
|
||||
{
|
||||
if (!mInstance || !mOwner)
|
||||
return;
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
#ifdef DO_DIRTY_INTERSECT // aDirtyRect isn't always correct, see bug 56128
|
||||
nsPoint rel(aDirtyRect.x, aDirtyRect.y);
|
||||
nsPoint abs(0,0);
|
||||
|
|
@ -3159,9 +3242,9 @@ void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect, PRUint32 ndc)
|
|||
nsRect absDirtyRect = nsRect(abs.x, abs.y, aDirtyRect.width, aDirtyRect.height);
|
||||
|
||||
// Convert to absolute pixel values for the dirty rect
|
||||
nsRect absDirtyRectInPixels;
|
||||
nsIntRect absDirtyRectInPixels;
|
||||
ConvertAppUnitsToPixels(*mOwner->GetPresContext(), absDirtyRect,
|
||||
absDirtyRectInPixels);
|
||||
absDirtyRectInPixels);
|
||||
#endif
|
||||
|
||||
nsCOMPtr<nsIPluginWidget> pluginWidget = do_QueryInterface(mWidget);
|
||||
|
|
@ -3179,13 +3262,19 @@ void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect, PRUint32 ndc)
|
|||
}
|
||||
pluginWidget->EndDrawPlugin();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect, HDC ndc)
|
||||
{
|
||||
if (!mInstance || !mOwner)
|
||||
return;
|
||||
|
||||
nsPluginWindow * window;
|
||||
GetWindow(window);
|
||||
nsRect relDirtyRect = nsRect(aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
|
||||
nsRect relDirtyRectInPixels;
|
||||
nsIntRect relDirtyRectInPixels;
|
||||
ConvertAppUnitsToPixels(*mOwner->PresContext(), relDirtyRect,
|
||||
relDirtyRectInPixels);
|
||||
|
||||
|
|
@ -3203,8 +3292,136 @@ void nsPluginInstanceOwner::Paint(const nsRect& aDirtyRect, PRUint32 ndc)
|
|||
pluginEvent.lParam = (uint32)&drc;
|
||||
PRBool eventHandled = PR_FALSE;
|
||||
mInstance->HandleEvent(&pluginEvent, &eventHandled);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_X11
|
||||
void nsPluginInstanceOwner::Paint(nsIRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect)
|
||||
{
|
||||
if (!mInstance || !mOwner)
|
||||
return;
|
||||
|
||||
nsPluginWindow* window;
|
||||
GetWindow(window);
|
||||
|
||||
nsIntRect dirtyRectInPixels;
|
||||
ConvertAppUnitsToPixels(*mOwner->PresContext(), aDirtyRect,
|
||||
dirtyRectInPixels);
|
||||
// Sanitize the dirty rect so we don't tell plugins that the area outside
|
||||
// the plugin rectangle needs updating.
|
||||
nsIntRect pluginDirtyRect;
|
||||
if (!pluginDirtyRect.IntersectRect(nsIntRect(0, 0, window->width, window->height), dirtyRectInPixels))
|
||||
return;
|
||||
|
||||
Renderer renderer(window, mInstance, pluginDirtyRect);
|
||||
PRUint32 rendererFlags =
|
||||
Renderer::DRAW_SUPPORTS_OFFSET |
|
||||
Renderer::DRAW_SUPPORTS_CLIP_RECT |
|
||||
Renderer::DRAW_SUPPORTS_NONDEFAULT_VISUAL |
|
||||
Renderer::DRAW_SUPPORTS_ALTERNATE_DISPLAY;
|
||||
|
||||
PRBool transparent = PR_TRUE;
|
||||
mInstance->GetValue(nsPluginInstanceVariable_TransparentBool,
|
||||
(void *)&transparent);
|
||||
if (!transparent)
|
||||
rendererFlags |= Renderer::DRAW_IS_OPAQUE;
|
||||
|
||||
gfxContext* ctx =
|
||||
NS_STATIC_CAST(gfxContext*,
|
||||
aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
|
||||
|
||||
// The display used by gfxXlibNativeRenderer will be the one for the cairo
|
||||
// surface (provided that it is an Xlib surface) but the display argument
|
||||
// here needs to be non-NULL for cairo_draw_with_xlib ->
|
||||
// _create_temp_xlib_surface -> DefaultScreen(dpy).
|
||||
NPSetWindowCallbackStruct* ws_info =
|
||||
NS_STATIC_CAST(NPSetWindowCallbackStruct*, window->ws_info);
|
||||
renderer.Draw(ws_info->display, ctx, window->width, window->height,
|
||||
rendererFlags, nsnull);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsPluginInstanceOwner::Renderer::NativeDraw(Display* dpy, Drawable drawable,
|
||||
Visual* visual,
|
||||
short offsetX, short offsetY,
|
||||
XRectangle* clipRects,
|
||||
PRUint32 numClipRects)
|
||||
{
|
||||
// See if the plugin must be notified of new window parameters.
|
||||
PRBool doupdatewindow = PR_FALSE;
|
||||
|
||||
if (mWindow->x != offsetX || mWindow->y != offsetY) {
|
||||
mWindow->x = offsetX;
|
||||
mWindow->y = offsetY;
|
||||
doupdatewindow = PR_TRUE;
|
||||
}
|
||||
|
||||
NS_ASSERTION(numClipRects <= 1, "We don't support multiple clip rectangles!");
|
||||
nsPluginRect newClipRect;
|
||||
if (numClipRects) {
|
||||
newClipRect.left = clipRects[0].x;
|
||||
newClipRect.top = clipRects[0].y;
|
||||
newClipRect.right = clipRects[0].x + clipRects[0].width;
|
||||
newClipRect.bottom = clipRects[0].y + clipRects[0].height;
|
||||
}
|
||||
else {
|
||||
// We should have been given a clip if an offset is -ve.
|
||||
NS_ASSERTION(offsetX >= 0 && offsetY >= 0,
|
||||
"Clip rectangle offsets are negative!");
|
||||
newClipRect.left = offsetX;
|
||||
newClipRect.top = offsetY;
|
||||
newClipRect.right = offsetX + mWindow->width;
|
||||
newClipRect.bottom = offsetY + mWindow->height;
|
||||
}
|
||||
|
||||
if (mWindow->clipRect.left != newClipRect.left ||
|
||||
mWindow->clipRect.top != newClipRect.top ||
|
||||
mWindow->clipRect.right != newClipRect.right ||
|
||||
mWindow->clipRect.bottom != newClipRect.bottom) {
|
||||
mWindow->clipRect = newClipRect;
|
||||
doupdatewindow = PR_TRUE;
|
||||
}
|
||||
|
||||
NPSetWindowCallbackStruct* ws_info =
|
||||
NS_STATIC_CAST(NPSetWindowCallbackStruct*, mWindow->ws_info);
|
||||
if ( ws_info->visual != visual) {
|
||||
// NPAPI needs a colormap but the surface doesn't provide a colormap. If
|
||||
// gfxContent::CurrentSurface is a gfxXlibSurface then the visual here
|
||||
// should be derived from that of the window and so the colormap of the
|
||||
// window should be fine. For other surfaces I don't know what to use.
|
||||
NS_ASSERTION(ws_info->visual == visual,
|
||||
"Visual changed: colormap may not match");
|
||||
ws_info->visual = visual;
|
||||
doupdatewindow = PR_TRUE;
|
||||
}
|
||||
|
||||
if (doupdatewindow)
|
||||
mInstance->SetWindow(mWindow);
|
||||
|
||||
nsPluginEvent pluginEvent;
|
||||
XGraphicsExposeEvent& exposeEvent = pluginEvent.event.xgraphicsexpose;
|
||||
// set the drawing info
|
||||
exposeEvent.type = GraphicsExpose;
|
||||
exposeEvent.display = dpy;
|
||||
exposeEvent.drawable = drawable;
|
||||
exposeEvent.x = mDirtyRect.x + offsetX;
|
||||
exposeEvent.y = mDirtyRect.y + offsetY;
|
||||
exposeEvent.width = mDirtyRect.width;
|
||||
exposeEvent.height = mDirtyRect.height;
|
||||
exposeEvent.count = 0;
|
||||
// information not set:
|
||||
exposeEvent.serial = 0;
|
||||
exposeEvent.send_event = False;
|
||||
exposeEvent.major_code = 0;
|
||||
exposeEvent.minor_code = 0;
|
||||
|
||||
PRBool eventHandled = PR_FALSE;
|
||||
mInstance->HandleEvent(&pluginEvent, &eventHandled);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Here's how we give idle time to plugins.
|
||||
|
||||
|
|
@ -3423,9 +3640,9 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost)
|
|||
mPluginHost = aHost;
|
||||
}
|
||||
|
||||
#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && defined(XP_MACOSX))
|
||||
#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && defined(XP_MACOSX)) || defined(MOZ_X11)
|
||||
// convert frame coordinates from twips to pixels
|
||||
static void ConvertAppUnitsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect)
|
||||
static void ConvertAppUnitsToPixels(const nsPresContext& aPresContext, const nsRect& aTwipsRect, nsIntRect& aPixelRect)
|
||||
{
|
||||
aPixelRect.x = aPresContext.AppUnitsToDevPixels(aTwipsRect.x);
|
||||
aPixelRect.y = aPresContext.AppUnitsToDevPixels(aTwipsRect.y);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче