mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:28:36 +00:00
724e70642d
- Bug 1247955 - Add telemetry for compacting GC r=terrence (71fc631b20) - Bug 1200133 - Part1 - Change mochitest using TV Simulator Service. r=seanlin (bbddf95aae) - bit of Bug 1230674 - part 3, (253d2ab0ce) - Bug 1144103 - Support screen recording r=mwu (694cd8f580) - Bug 1237914 - Remove layers.screen-recording.enabled r=mwu (22edbe0944) - Bug 1231042 - clean current composition task and related flag when screen off. r=mchang (45c996e32b) - Bug 1137151: Marked destructor of |nsWindow| as protected, r=mwu (6ebb963472) - Bug 1187503 - use external surface size on CompositorOGL r=nical (8481425ca9) - Bug 1238876 - Move StartRemoteDrawing() implementation from nsWindow to nsScreenGonk r=mwu (9b7a2066d2) - Bug 1006688 - Support capture screen via adb r=mwu (d651416c44) - Bug 1244044 - remember display status; r=jerry (d8a252f081) - Bug 1247570 - unbreak widget/gonk/nativewindow/FakeSurfaceComposer.cpp r=gwagner (de01fd3084) - Bug 1020199 - Make sure APZ works with nested oop iframe. r=kats, r=dvander. (8f4285b97f) - Bug 1235858 - Record the time stamp, use it for crash reports. r=botond (98d999aa25) - Bug 1247671: Increase the crash logging length to 16 by default (+ small white space change in the comments) r=dvander (8a0995cb1c) - Bug 867501 - Pref allows JS locale to be set to US English/C. r=khuey (8d6e5df33d) - Bug 1207972: Move to using USER_INTERACTIVE and JOB_INTERACTIVE by default for the Windows content sandbox. r=tabraldes (494ecebd8e) - Bug 1234673 - Avoid users from locales ar, fa, he, ur for e10s rollout to beta. r=jimm (adf49af577) - Bug 1234675 - Ability to disable e10s for users with addons. r=Mossop (6abaeba541) - Bug 1233837 support migration wizard override from distribution.ini, r=bsmedberg (98c95ecc4b) - Bug 884831 - GTK3 - crash at browser end [@ XFreeColormap() ], r=karlt (13d9067ab0) - Bug 1215078 - [Wayland] Configure display for Wayland session. r=karlt (c4417d3534) - Bug 1111701 - Remove E10S_AUTOSTART histogram. r=dexter (56625e7353) - Bug 1239520 - Enabled e10s on all configurations except release. r=billm (48c760a1f8) - Bug 1241294 - Update E10S_AUTOSTART_STATUS telemetry probe (and rename it to E10S_STATUS). r=vladan (7217e4c9d3) - Bug 1241959 - Add a description of e10s blocked status to about:support. r=jimm (b6cb2e6dac) - Bug 1165818: Remove temporary Nightly only MozTemp-* clean-up code. r=jimm (fdb11aed0e) - Bug 1243882 - Block e10s for locales based on Firefox's locale, not the OS. r=ehsan (873b09db0f) - Bug 1235437 - Add annotation for major graphics preferences. r=bgirard (2e147567be) - Bug 1237404 - Part 1. Exposing some functionality in gfxCrashReporterUtils. r=benwa (dc08c3ba92) - Bug 1237404 - Part 2. Optimizing the main thread scenario. r=benwa (e5b6704b57) - Bug 1237770: Disable D3D9 on XP with E10S. r=jrmuizel (6424700126) - Bug 1210351 - Limit maximum computed tile size to 512x512. r=snorp (162839caf7) - Bug 1221073 - Increase max tile size to 1024 again. r=mstange (29e8513390) - Bug 990017. Prevent skia accelerated canvas backends from rendering content. r=jmuizelaar (b257281035) - Bug 1178385. Add a pref to force enable hw video decode. r=milan (f69cde6047) - Bug 1230196 - Allow release channel to run e10s. r=billm (ab5d0a464c) - Bug 1231915 - Ignore the APZ pref if MOZ_ANDROID_APZ is enabled, since the pref doesn't cover all the relevant code. r=rbarker (3984b57173) - Bug 1187464 - Part 1. We can get the wrong texture source type, so deal with it. Carry r=mstange (0d47ffdd65) - Bug 1187464 - Part 2. RTTI for TextureSource debug purposes. Carry r=botond (af8b92042d) - Bug 1187464 - Part 3. Check if GetSurface returned null. r=mstange (ab7de5dabb) - Bug 1165407 - Properly flush the log stream after logging it. r=botond (6dd38e7e7a) - Bug 1239844 - Log hexadecimal values in a more standard way. r=dholbert (aa7de36cfd) - Bug 1241769 - Use Singleton pattern to nsScreenManagerGonk r=mwu (bb0c30ce80) - Bug 1229262 - Fix nsScreenGonk's thread safety r=mwu (6c60907ce9) - Bug 1165161 - stop bootAnim with "browser-ui-startup-complete" event. r=mwu (e40ddb816a) - Bug 1230397 - Write safe mode pref on the main thread r=dbaron (0538d0353f) - Bug 1172805 - Fix enum comparison warnings in nsAppShell. r=mwu (e77ec14fed) - Bug 1215494 - Don't set b2g.safe_mode pref in child process. r=fabrice (3264d2c872) - Bug 1192949 - Fix nsScreenGonk::SetMirroringScreen() r=mwu (39abf13ff4) - Bug 1243413 - If a plugin window is hidden in an adjacent scroll frame due to APZ scroll state changes, make sure to show the plugin window after the scroll operation complete. r=kats (302f14476f) - Bug 1187322 - Fix bustage. (5fe8e7b3e8) - Bug 241788 - mozilla::Tokenizer - token type for \n should whitespace if given in constructor r=honzab (d4da4354c8) - Bug 1237827 - Be sure to clear LayerComposite::mLayerComposited between each composite. r=mattwoodrow (cc02aef817) - Bug 1244943 - Make PostProcessLayers aware of preserve-3d. r=mattwoodrow (48fadfdcf7) - Bug 1229317 - Allow preserve-3d and opacity to be combined on the root element of a preserve-3d chain. r=roc (030c042699) - Bug 1231564 - Don't take the compositor side layer-tree snapshot until after compositing. r=dvander (c0164b6464) - Bug 1247445 - Rename Layer::GetEffectiveVisibleRegion GetLocalVisibleRegion. r=botond (35125c3f71) - Bug 945613 - Part 3: #ifdef pragma for gcc >= 4.7.0. r=ehsan (67786ad3f8) - Bug 1227210: Ensure the mask and the surface are in the right space when being blended. r=mattwoodrow (6745cd99f8) - Bug 1229587 part 1 - Disable C4464 warning newly added in VS2015u1. r=keeler (65cf58d55d) - Bug 1229587 part 2 - Use verbose format to disable C4061 to workaround bug of VS2015u1. r=keeler (8f8fb5190f) - Bug 1189891 - Avoid including <cstring> from pkix/Input.h. r=bsmith (7202ad2de7) - Bug 1207499 - Part 9: Remove use of expression closure from storage/. r=mak (cf0f139799) - Bug 1230549 - Storage should pass more eslint rules. r=yoric (91e007dacb) - Bug 1230549 - Make Storage pass basic eslint. r=yoric (37c88987e8) - Bug 1237601 - Centralize storage xpcshell promise helpers (support patch). r=bkelly (ebee41dfae) - Bug 1237601 - Perform storage close synchronously if async thread cannot be started. r=bkelly (855430997d) - bug 1227008 use GtkPaperSize in GtkPageSetup directly, instead of maintaining a separate copy r=acomminos (cf1bade905) - Bug 1205643 - Move scrollbar borders to slider to receive button events. r=karlt (76ece6a2fd) - Bug 1141207 add gtk_print_settings_foreach to mozgtk.c. r=karlt (aee4b94e27) - Bug 1206516 - Use temporary widget to construct style context for GtkInfoBar. r=karlt (1ce56b1799) - bug 1205199 keep the socket alive as long as the plug window r=acomminos (bf1e4585da) - Bug 1242135 - Annotate intentional and fix unintentional switch fallthroughs in widget/gtk/. r=karlt (102180ea0a) - Bug 1221610 - Remove ToIntMargin(). r=jrmuizel. (5d234b1dd6) - Bug 1238582 - Skip simulated OOM check in the case where we're growing within reserved space; r=Waldo (2d00fa9605) - Bug 1242812 - Only check for simulated OOM in vectors when growing beyond reserved size r=Waldo (98ad0de5ff) - Bug 1144745 - scale border returned by GetWidgetBorder(), r=karlt (8639c7b240) - Bug 1184936 - Need convert from UTF8 for printer name. r=karlt (99e2863372) - Bug 569295 - limit the number of bytes we attempt to upload to the storage servers. r=rnewman (8072be50bb) - Bug 779430, try to not flush layout while we're in process to restore a bfcached document, r=bz (47d01dd107) - Bug 1241579 - Convert services/ to use channel.open2() (r=sicking) (fd6ee21f67) - Bug 1228510 - initialize 2 more variables. r=bas (e3d144854a) - Bug 1229577 - Rename NewSurfaceDescriptorGralloc into SurfaceDescriptorGralloc. r=sotaro (99b8d621e4) - Bug 1241665 - Correctly convert IOSurfaces to SourceSurfaces in MacIOSurfaceTextureSourceBasic and MacIOSurfaceTextureData. r=mattwoodrow (54ce8c1582) - Bug 1241665 - Move IOSurface YCbCr conversion code to a new file MacIOSurfaceHelpers.cpp. r=mattwoodrow (aeb7f341cf) - Bug 1191161 - p1 - Merge WrapEntireClassForJNI into WrapElementForJNI, r=jchen (684111ca72) - Bug 1246775 - use already_AddRefed in PersistentBufferProvider interface. r=bas (373a63f129) - Bug 1232231 - BorrowDrawTarget can return nullptr - be ready for it. r=nical (0156e1c412) - Bug 1227224 - Further improvements to generic tree traversal algorithms. r=botond (f71854fea6) - Bug 1234047 - Always reuse an existing TextureClient in IMFYCbCrImage if one exist. r=Bas (4c995d1668) - Bug 1240668 - Duplicate GonkNativeHandle::NhObj in ImageClientSingle::UpdateImage() r=nical (ed213d6f07) - Bug 1213095 - Inline the DispatchRepaintRequest function. r=botond (33d14a377c) - Bug 1213095 - Don't allow RequestContentRepaint to mutate the provided FrameMetrics. r=botond (676e6082b5) - Bug 1213095 - Ensure that stale FrameMetrics do not clobber more recent metrics for paint requests. r=botond (b6e75b0e37) - Bug 1238040 - Update telemetry measures for checkerboarding. r=botond,vladan (e41963fce5) - Bug 1238042 - Expose the checkerboard reports out to JS. r=ehsan,botond (986bb53bc5) - Bug 1238137 - Define a telemetry histogram for tracking the input methods used to trigger scrolling. r=kats (9e366c56a5) - remove unused (b0dc04a498) - Bug 1238137 - Telemetry pings for APZ-driven scroll input methods. r=kats (3f026677bd) - Bug 1241371. Properly update mLastUpdateImagesPos on scrollframes when the image visibility pass encounters them. r=mats (128edd5957) - Bug 1241371. Don't schedule an image visibility update every time display port margins change. r=kats (9927515115) - Bug 990916 - When setting a displayport, schedule a timer to remove it as well. r=tnikkel (ddd943226d) - Bug 990916 - Track if a scrollframe is a scroll parent for something else. r=tnikkel (7128db6038) - Bug 1245285 - part 1, Remove unused mRepaintInterval from AsyncPanZoomAnimation r=botond (ec516fe9f0) - Bug 1245285 - part 2, Prevent Zoom and Overscroll animations from repainting durring animation r=botond (6a66a0005a) - Bug 1245285 - part 3, Remove unused repaint_interval prefs r=botond (9987a58743) - Bug 1243413 - Avoid hiding windowed plugins that aren't contained within the active scroll frame. r=roc (f059ce95da) - Bug 1104356 - When doing a smooth scroll on a non-APZ'd scrollframe, fall back to the main thread machinery. r=kip (44d75dc20f) - Bug 990916 - On displayport expiry, trigger another round of expiry up the ancestor chain. r=tnikkel (8ce9a22429) - Bug 1245925 - Don't allow expiring the displayport on root scrollframes. r=tnikkel (2ec6218e2e) - Bug 1236040 - When updating the scroll position, only schedule image visibility checks if the display port has changed. r=tn (aedac7070f) - Bug 1234725. Don't change the dirty rect to the display port when building display lists for documents. r=mstange (6ff3e41934) - Fix crash trying to allocate textures for oversize scrollbars. (bug 1214261, r=mstange) (b4b4fa368d) - Bug 1234877 - Whether a scroll frame is async scrollable is determined by mWillBuildScrollableLayer, not by usingDisplayPort. r=tn (2daacb63f5) - Bug 1241917 - Restrict subframe's displayport base to root composition bounds. r=tn (7e50ff6bae) - Bug 1246443. Don't make nsLayoutUtils::MaybeCreateDisplayPort also set the displayport base anymore. r=botond (2970d8f2a6) - Bug 1246443 - Only restrict displayport base to root composition bounds if content has displayport; r=tnikkel (a841dedff4) - Bug 1208985 - Use height for scroll-snap-points-y percentage values; r=kip (17ce448e8b) - Bug 1238040 - Add a telemetry probe for potential checkerboarding duration. r=botond,vladan (bdf18d520b) - Bug 1240622 - Guard mCheckerboardEvent with a mutex to avoid races. r=botond (b81534272c) - Bug 1240202 - Rename APZOverscrollHandoffTester to APZScrollHandoffTester. r=kats (3c165a103d) - Bug 1240202 - Change input event generation utilities used by APZ gtests to take points instead of loose coordinates. r=kats (e29de86c33) - Bug 1240202 - Avoid getting stuck in overscroll when the screen is tapped during an overscroll animation. r=kats (3822391d27) - Bug 1225045: Fix stagefright include paths for ANDROID_VERSION >= 17, r=gps (1eabe097b5)
357 lines
12 KiB
C++
357 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:expandtab:shiftwidth=2:tabstop=2:
|
|
*/
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/**
|
|
* This file is the Gtk2 implementation of plugin native window.
|
|
*/
|
|
|
|
#include "nsDebug.h"
|
|
#include "nsPluginNativeWindowGtk.h"
|
|
#include "nsNPAPIPlugin.h"
|
|
#include "npapi.h"
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
#include <gdk/gdk.h>
|
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
#include <gtk/gtkx.h>
|
|
#else
|
|
#include "gtk2xtbin.h"
|
|
#endif
|
|
#include "mozilla/X11Util.h"
|
|
|
|
static void plug_added_cb(GtkWidget *widget, gpointer data);
|
|
static gboolean plug_removed_cb (GtkWidget *widget, gpointer data);
|
|
static void socket_unrealize_cb (GtkWidget *widget, gpointer data);
|
|
|
|
nsPluginNativeWindowGtk::nsPluginNativeWindowGtk() : nsPluginNativeWindow()
|
|
{
|
|
// initialize the struct fields
|
|
window = nullptr;
|
|
x = 0;
|
|
y = 0;
|
|
width = 0;
|
|
height = 0;
|
|
memset(&clipRect, 0, sizeof(clipRect));
|
|
ws_info = &mWsInfo;
|
|
type = NPWindowTypeWindow;
|
|
mSocketWidget = 0;
|
|
mWsInfo.type = 0;
|
|
mWsInfo.display = nullptr;
|
|
mWsInfo.visual = nullptr;
|
|
mWsInfo.colormap = 0;
|
|
mWsInfo.depth = 0;
|
|
}
|
|
|
|
nsPluginNativeWindowGtk::~nsPluginNativeWindowGtk()
|
|
{
|
|
if(mSocketWidget) {
|
|
gtk_widget_destroy(mSocketWidget);
|
|
}
|
|
}
|
|
|
|
nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
|
|
*aPluginNativeWindow = new nsPluginNativeWindowGtk();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult PLUG_DeletePluginNativeWindow(nsPluginNativeWindow * aPluginNativeWindow)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
|
|
nsPluginNativeWindowGtk *p = (nsPluginNativeWindowGtk *)aPluginNativeWindow;
|
|
delete p;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsPluginNativeWindowGtk::CallSetWindow(RefPtr<nsNPAPIPluginInstance> &aPluginInstance)
|
|
{
|
|
if (aPluginInstance) {
|
|
if (type == NPWindowTypeWindow &&
|
|
XRE_IsContentProcess()) {
|
|
// In this case, most of the initialization code here has already happened
|
|
// in the chrome process. The window we have in content is the XID of the
|
|
// socket widget we need to hand to plugins.
|
|
SetWindow((XID)window);
|
|
} else if (type == NPWindowTypeWindow) {
|
|
if (!mSocketWidget) {
|
|
nsresult rv;
|
|
|
|
// The documentation on the types for many variables in NP(N|P)_GetValue
|
|
// is vague. Often boolean values are NPBool (1 byte), but
|
|
// https://developer.mozilla.org/en/XEmbed_Extension_for_Mozilla_Plugins
|
|
// treats NPPVpluginNeedsXEmbed as PRBool (int), and
|
|
// on x86/32-bit, flash stores to this using |movl 0x1,&needsXEmbed|.
|
|
// thus we can't use NPBool for needsXEmbed, or the three bytes above
|
|
// it on the stack would get clobbered. so protect with the larger bool.
|
|
int needsXEmbed = 0;
|
|
rv = aPluginInstance->GetValueFromPlugin(NPPVpluginNeedsXEmbed, &needsXEmbed);
|
|
// If the call returned an error code make sure we still use our default value.
|
|
if (NS_FAILED(rv)) {
|
|
needsXEmbed = 0;
|
|
}
|
|
#ifdef DEBUG
|
|
printf("nsPluginNativeWindowGtk: NPPVpluginNeedsXEmbed=%d\n", needsXEmbed);
|
|
#endif
|
|
|
|
bool isOOPPlugin = aPluginInstance->GetPlugin()->GetLibrary()->IsOOP();
|
|
if (needsXEmbed || isOOPPlugin) {
|
|
bool enableXtFocus = !needsXEmbed;
|
|
rv = CreateXEmbedWindow(enableXtFocus);
|
|
}
|
|
else {
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
rv = CreateXtWindow();
|
|
#else
|
|
return NS_ERROR_FAILURE;
|
|
#endif
|
|
}
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
if (!mSocketWidget) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Make sure to resize and re-place the window if required.
|
|
SetAllocation();
|
|
// Need to reset "window" each time as nsPluginFrame::DidReflow sets it
|
|
// to the ancestor window.
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
if (GTK_IS_XTBIN(mSocketWidget)) {
|
|
// Point the NPWindow structures window to the actual X window
|
|
SetWindow(GTK_XTBIN(mSocketWidget)->xtwindow);
|
|
}
|
|
else { // XEmbed or OOP&Xt
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
}
|
|
#else
|
|
// Gtk3 supports only OOP by GtkSocket
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
#endif
|
|
|
|
#ifdef DEBUG
|
|
printf("nsPluginNativeWindowGtk: call SetWindow with xid=%p\n", (void *)window);
|
|
#endif
|
|
} // NPWindowTypeWindow
|
|
aPluginInstance->SetWindow(this);
|
|
} else if (mPluginInstance) {
|
|
mPluginInstance->SetWindow(nullptr);
|
|
}
|
|
|
|
SetPluginInstance(aPluginInstance);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsPluginNativeWindowGtk::CreateXEmbedWindow(bool aEnableXtFocus) {
|
|
NS_ASSERTION(!mSocketWidget,"Already created a socket widget!");
|
|
GdkDisplay *display = gdk_display_get_default();
|
|
GdkWindow *parent_win = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
mSocketWidget = gtk_socket_new();
|
|
|
|
//attach the socket to the container widget
|
|
gtk_widget_set_parent_window(mSocketWidget, parent_win);
|
|
|
|
// enable/disable focus event handlers,
|
|
// see plugin_window_filter_func() for details
|
|
g_object_set_data(G_OBJECT(mSocketWidget), "enable-xt-focus", (void *)aEnableXtFocus);
|
|
|
|
g_signal_connect(mSocketWidget, "plug_added",
|
|
G_CALLBACK(plug_added_cb), nullptr);
|
|
|
|
// Make sure to handle the plug_removed signal. If we don't the
|
|
// socket will automatically be destroyed when the plug is
|
|
// removed, which means we're destroying it more than once.
|
|
// SYNTAX ERROR.
|
|
g_signal_connect(mSocketWidget, "plug_removed",
|
|
G_CALLBACK(plug_removed_cb), nullptr);
|
|
|
|
g_signal_connect(mSocketWidget, "unrealize",
|
|
G_CALLBACK(socket_unrealize_cb), nullptr);
|
|
|
|
g_signal_connect(mSocketWidget, "destroy",
|
|
G_CALLBACK(gtk_widget_destroyed), &mSocketWidget);
|
|
|
|
gpointer user_data = nullptr;
|
|
gdk_window_get_user_data(parent_win, &user_data);
|
|
|
|
GtkContainer *container = GTK_CONTAINER(user_data);
|
|
gtk_container_add(container, mSocketWidget);
|
|
gtk_widget_realize(mSocketWidget);
|
|
|
|
// The GtkSocket has a visible window, but the plugin's XEmbed plug will
|
|
// cover this window. Normally GtkSockets let the X server paint their
|
|
// background and this would happen immediately (before the plug is
|
|
// created). Setting the background to None prevents the server from
|
|
// painting this window, avoiding flicker.
|
|
// TODO GTK3
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
gdk_window_set_back_pixmap(gtk_widget_get_window(mSocketWidget), nullptr, FALSE);
|
|
#endif
|
|
|
|
// Resize before we show
|
|
SetAllocation();
|
|
|
|
gtk_widget_show(mSocketWidget);
|
|
|
|
gdk_flush();
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
|
|
// Fill out the ws_info structure.
|
|
// (The windowless case is done in nsPluginFrame.cpp.)
|
|
GdkWindow *gdkWindow = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
if(!gdkWindow)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
mWsInfo.display = GDK_WINDOW_XDISPLAY(gdkWindow);
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
mWsInfo.colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(gdkWindow));
|
|
GdkVisual* gdkVisual = gdk_drawable_get_visual(gdkWindow);
|
|
mWsInfo.depth = gdkVisual->depth;
|
|
#else
|
|
mWsInfo.colormap = None;
|
|
GdkVisual* gdkVisual = gdk_window_get_visual(gdkWindow);
|
|
mWsInfo.depth = gdk_visual_get_depth(gdkVisual);
|
|
#endif
|
|
mWsInfo.visual = GDK_VISUAL_XVISUAL(gdkVisual);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsPluginNativeWindowGtk::SetAllocation() {
|
|
if (!mSocketWidget)
|
|
return;
|
|
|
|
GtkAllocation new_allocation;
|
|
new_allocation.x = 0;
|
|
new_allocation.y = 0;
|
|
new_allocation.width = width;
|
|
new_allocation.height = height;
|
|
gtk_widget_size_allocate(mSocketWidget, &new_allocation);
|
|
}
|
|
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
nsresult nsPluginNativeWindowGtk::CreateXtWindow() {
|
|
NS_ASSERTION(!mSocketWidget,"Already created a socket widget!");
|
|
|
|
#ifdef DEBUG
|
|
printf("About to create new xtbin of %i X %i from %p...\n",
|
|
width, height, (void*)window);
|
|
#endif
|
|
GdkDisplay *display = gdk_display_get_default();
|
|
GdkWindow *gdkWindow = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
mSocketWidget = gtk_xtbin_new(gdkWindow, 0);
|
|
// Check to see if creating the xtbin failed for some reason.
|
|
// if it did, we can't go any further.
|
|
if (!mSocketWidget)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
g_signal_connect(mSocketWidget, "destroy",
|
|
G_CALLBACK(gtk_widget_destroyed), &mSocketWidget);
|
|
|
|
gtk_widget_set_size_request(mSocketWidget, width, height);
|
|
|
|
#ifdef DEBUG
|
|
printf("About to show xtbin(%p)...\n", (void*)mSocketWidget); fflush(nullptr);
|
|
#endif
|
|
gtk_widget_show(mSocketWidget);
|
|
#ifdef DEBUG
|
|
printf("completed gtk_widget_show(%p)\n", (void*)mSocketWidget); fflush(nullptr);
|
|
#endif
|
|
|
|
// Fill out the ws_info structure.
|
|
GtkXtBin* xtbin = GTK_XTBIN(mSocketWidget);
|
|
// The xtbin has its own Display structure.
|
|
mWsInfo.display = xtbin->xtdisplay;
|
|
mWsInfo.colormap = xtbin->xtclient.xtcolormap;
|
|
mWsInfo.visual = xtbin->xtclient.xtvisual;
|
|
mWsInfo.depth = xtbin->xtclient.xtdepth;
|
|
// Leave mWsInfo.type = 0 - Who knows what this is meant to be?
|
|
|
|
XFlush(mWsInfo.display);
|
|
|
|
return NS_OK;
|
|
}
|
|
#endif
|
|
|
|
static void
|
|
plug_window_finalize_cb(gpointer socket, GObject* plug_window)
|
|
{
|
|
g_object_unref(socket);
|
|
}
|
|
|
|
static void
|
|
plug_added_cb(GtkWidget *socket, gpointer data)
|
|
{
|
|
// The plug window has been embedded, and gtk_socket_add_window() has added
|
|
// a filter to the socket's plug_window, passing the socket as data for the
|
|
// filter, so the socket must live as long as events may be received on the
|
|
// plug window.
|
|
//
|
|
// https://git.gnome.org/browse/gtk+/tree/gtk/gtksocket.c?h=3.18.7#n1124
|
|
g_object_ref(socket);
|
|
// When the socket is unrealized, perhaps during gtk_widget_destroy() from
|
|
// ~nsPluginNativeWindowGtk, the plug is removed. The plug in the child
|
|
// process then destroys its widget and window. When the browser process
|
|
// receives the DestroyNotify event for the plug window, GDK releases its
|
|
// reference to plugWindow. This is typically the last reference and so the
|
|
// weak ref callback triggers release of the socket.
|
|
GdkWindow* plugWindow = gtk_socket_get_plug_window(GTK_SOCKET(socket));
|
|
g_object_weak_ref(G_OBJECT(plugWindow), plug_window_finalize_cb, socket);
|
|
}
|
|
|
|
/* static */
|
|
gboolean
|
|
plug_removed_cb (GtkWidget *widget, gpointer data)
|
|
{
|
|
// Gee, thanks for the info!
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
socket_unrealize_cb(GtkWidget *widget, gpointer data)
|
|
{
|
|
// Unmap and reparent any child windows that GDK does not yet know about.
|
|
// (See bug 540114 comment 10.)
|
|
GdkWindow* socket_window = gtk_widget_get_window(widget);
|
|
GdkDisplay* gdkDisplay = gdk_display_get_default();
|
|
Display* display = GDK_DISPLAY_XDISPLAY(gdkDisplay);
|
|
|
|
// Ignore X errors that may happen if windows get destroyed (possibly
|
|
// requested by the plugin) between XQueryTree and when we operate on them.
|
|
gdk_error_trap_push();
|
|
|
|
Window root, parent;
|
|
Window* children;
|
|
unsigned int nchildren;
|
|
if (!XQueryTree(display, gdk_x11_window_get_xid(socket_window),
|
|
&root, &parent, &children, &nchildren))
|
|
return;
|
|
|
|
for (unsigned int i = 0; i < nchildren; ++i) {
|
|
Window child = children[i];
|
|
if (!gdk_x11_window_lookup_for_display(gdkDisplay, child)) {
|
|
// This window is not known to GDK.
|
|
XUnmapWindow(display, child);
|
|
XReparentWindow(display, child, DefaultRootWindow(display), 0, 0);
|
|
}
|
|
}
|
|
|
|
if (children) XFree(children);
|
|
|
|
mozilla::FinishX(display);
|
|
#if (MOZ_WIDGET_GTK == 3)
|
|
gdk_error_trap_pop_ignored();
|
|
#else
|
|
gdk_error_trap_pop();
|
|
#endif
|
|
}
|