mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
da41393bd7
- Rename X11CompositorWidget to GtkCompositorWidget to handle both X11 and Wayland backends. - Rename X11CompositorWidgetInitData to GtkCompositorWidgetInitData - Implement Wayland support at WindowSurfaceProvider, WindowSurfaceProvider::CreateWindowSurface() is able to create WindowSurfaceWayland. - Initialize Wayland surface provider at nsWindow::Create() MozReview-Commit-ID: 1WvR9nWHa3L --HG-- rename : widget/gtk/X11CompositorWidget.cpp => widget/gtk/GtkCompositorWidget.cpp rename : widget/gtk/X11CompositorWidget.h => widget/gtk/GtkCompositorWidget.h rename : widget/gtk/InProcessX11CompositorWidget.cpp => widget/gtk/InProcessGtkCompositorWidget.cpp rename : widget/gtk/InProcessX11CompositorWidget.h => widget/gtk/InProcessGtkCompositorWidget.h extra : rebase_source : d54186515b066b957d8ad05bb5540db55f2e9415
120 lines
3.1 KiB
C++
120 lines
3.1 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
|
|
|
|
#include "GtkCompositorWidget.h"
|
|
|
|
#include "gfxPlatformGtk.h"
|
|
#include "mozilla/layers/CompositorThread.h"
|
|
#include "mozilla/widget/InProcessCompositorWidget.h"
|
|
#include "mozilla/widget/PlatformWidgetTypes.h"
|
|
#include "nsWindow.h"
|
|
|
|
namespace mozilla {
|
|
namespace widget {
|
|
|
|
GtkCompositorWidget::GtkCompositorWidget(const GtkCompositorWidgetInitData& aInitData,
|
|
const layers::CompositorOptions& aOptions,
|
|
nsWindow* aWindow)
|
|
: CompositorWidget(aOptions)
|
|
, mWidget(aWindow)
|
|
{
|
|
// If we have a nsWindow, then grab the already existing display connection
|
|
// If we don't, then use the init data to connect to the display
|
|
if (aWindow) {
|
|
mXDisplay = aWindow->XDisplay();
|
|
} else {
|
|
mXDisplay = XOpenDisplay(aInitData.XDisplayString().get());
|
|
}
|
|
|
|
#ifdef MOZ_WAYLAND
|
|
if (!mXDisplay) {
|
|
MOZ_RELEASE_ASSERT(aWindow,
|
|
"We're running on Wayland and but without valid nsWindow.");
|
|
mProvider.Initialize(aWindow);
|
|
} else
|
|
#endif
|
|
{
|
|
mXWindow = (Window)aInitData.XWindow();
|
|
|
|
// Grab the window's visual and depth
|
|
XWindowAttributes windowAttrs;
|
|
XGetWindowAttributes(mXDisplay, mXWindow, &windowAttrs);
|
|
|
|
Visual* visual = windowAttrs.visual;
|
|
int depth = windowAttrs.depth;
|
|
|
|
// Initialize the window surface provider
|
|
mProvider.Initialize(
|
|
mXDisplay,
|
|
mXWindow,
|
|
visual,
|
|
depth
|
|
);
|
|
}
|
|
mClientSize = aInitData.InitialClientSize();
|
|
}
|
|
|
|
GtkCompositorWidget::~GtkCompositorWidget()
|
|
{
|
|
mProvider.CleanupResources();
|
|
|
|
// If we created our own display connection, we need to destroy it
|
|
if (!mWidget && mXDisplay) {
|
|
XCloseDisplay(mXDisplay);
|
|
mXDisplay = nullptr;
|
|
}
|
|
}
|
|
|
|
already_AddRefed<gfx::DrawTarget>
|
|
GtkCompositorWidget::StartRemoteDrawing()
|
|
{
|
|
return nullptr;
|
|
}
|
|
void
|
|
GtkCompositorWidget::EndRemoteDrawing()
|
|
{
|
|
}
|
|
|
|
already_AddRefed<gfx::DrawTarget>
|
|
GtkCompositorWidget::StartRemoteDrawingInRegion(LayoutDeviceIntRegion& aInvalidRegion,
|
|
layers::BufferMode* aBufferMode)
|
|
{
|
|
return mProvider.StartRemoteDrawingInRegion(aInvalidRegion,
|
|
aBufferMode);
|
|
}
|
|
|
|
void GtkCompositorWidget::EndRemoteDrawingInRegion(gfx::DrawTarget* aDrawTarget,
|
|
LayoutDeviceIntRegion& aInvalidRegion)
|
|
{
|
|
mProvider.EndRemoteDrawingInRegion(aDrawTarget,
|
|
aInvalidRegion);
|
|
}
|
|
|
|
nsIWidget* GtkCompositorWidget::RealWidget()
|
|
{
|
|
return mWidget;
|
|
}
|
|
|
|
void
|
|
GtkCompositorWidget::NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize)
|
|
{
|
|
mClientSize = aClientSize;
|
|
}
|
|
|
|
LayoutDeviceIntSize
|
|
GtkCompositorWidget::GetClientSize()
|
|
{
|
|
return mClientSize;
|
|
}
|
|
|
|
uintptr_t
|
|
GtkCompositorWidget::GetWidgetKey()
|
|
{
|
|
return reinterpret_cast<uintptr_t>(mWidget);
|
|
}
|
|
|
|
} // namespace widget
|
|
} // namespace mozilla
|