DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace FlRenderer::get_visual() with more generic FlRenderer::setup_window_attr() (#20833)

Browse Source
This commit is contained in:
William Wold 2020-08-27 19:31:34 -07:00 committed by GitHub
parent 808f9c27e2
commit 1a034bde75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shell/platform/linux/fl_renderer.cc
View File

@ -121,23 +121,14 @@ static gboolean setup_gdk_window(FlRenderer* self,
gint window_attributes_mask = GDK_WA_X | GDK_WA_Y;
EGLint visual_id;
if (!eglGetConfigAttrib(priv->egl_display, priv->egl_config,
EGL_NATIVE_VISUAL_ID, &visual_id)) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
"Failed to determine EGL configuration visual");
return FALSE;
if (FL_RENDERER_GET_CLASS(self)->setup_window_attr) {
if (!FL_RENDERER_GET_CLASS(self)->setup_window_attr(
self, widget, priv->egl_display, priv->egl_config,
&window_attributes, &window_attributes_mask, error)) {
return FALSE;
}
}
window_attributes.visual = FL_RENDERER_GET_CLASS(self)->get_visual(
self, gtk_widget_get_screen(widget), visual_id);
if (window_attributes.visual == nullptr) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
"Failed to find visual 0x%x", visual_id);
return FALSE;
}
window_attributes_mask |= GDK_WA_VISUAL;
GdkWindow* window =
gdk_window_new(gtk_widget_get_parent_window(widget), &window_attributes,
window_attributes_mask);

15
shell/platform/linux/fl_renderer.h
View File

@ -35,10 +35,17 @@ G_DECLARE_DERIVABLE_TYPE(FlRenderer, fl_renderer, FL, RENDERER, GObject)
struct _FlRendererClass {
GObjectClass parent_class;
// Virtual method called to get the visual that matches the given ID.
GdkVisual* (*get_visual)(FlRenderer* renderer,
GdkScreen* screen,
EGLint visual_id);
/**
* Virtual method called before creating a GdkWindow for the widget.
* Does not need to be implemented.
*/
gboolean (*setup_window_attr)(FlRenderer* renderer,
GtkWidget* widget,
EGLDisplay egl_display,
EGLConfig egl_config,
GdkWindowAttr* window_attributes,
gint* mask,
GError** error);
/**
* Virtual method called after a GDK window has been created.

42
shell/platform/linux/fl_renderer_x11.cc
View File

@ -21,11 +21,40 @@ static void fl_renderer_x11_dispose(GObject* object) {
G_OBJECT_CLASS(fl_renderer_x11_parent_class)->dispose(object);
}
// Implements FlRenderer::get_visual.
static GdkVisual* fl_renderer_x11_get_visual(FlRenderer* renderer,
GdkScreen* screen,
EGLint visual_id) {
return gdk_x11_screen_lookup_visual(GDK_X11_SCREEN(screen), visual_id);
// Implements FlRenderer::setup_window_attr.
static gboolean fl_renderer_x11_setup_window_attr(
FlRenderer* renderer,
GtkWidget* widget,
EGLDisplay egl_display,
EGLConfig egl_config,
GdkWindowAttr* window_attributes,
gint* mask,
GError** error) {
EGLint visual_id;
if (!eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID,
&visual_id)) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
"Failed to determine EGL configuration visual");
return FALSE;
}
GdkX11Screen* screen = GDK_X11_SCREEN(gtk_widget_get_screen(widget));
if (!screen) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
"Widget is not on an X11 screen");
return FALSE;
}
window_attributes->visual = gdk_x11_screen_lookup_visual(screen, visual_id);
if (window_attributes->visual == nullptr) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
"Failed to find visual 0x%x", visual_id);
return FALSE;
}
*mask |= GDK_WA_VISUAL;
return TRUE;
}
// Implements FlRenderer::set_window.
@ -88,7 +117,8 @@ static gboolean fl_renderer_x11_create_surfaces(FlRenderer* renderer,
static void fl_renderer_x11_class_init(FlRendererX11Class* klass) {
G_OBJECT_CLASS(klass)->dispose = fl_renderer_x11_dispose;
FL_RENDERER_CLASS(klass)->get_visual = fl_renderer_x11_get_visual;
FL_RENDERER_CLASS(klass)->setup_window_attr =
fl_renderer_x11_setup_window_attr;
FL_RENDERER_CLASS(klass)->set_window = fl_renderer_x11_set_window;
FL_RENDERER_CLASS(klass)->create_display = fl_renderer_x11_create_display;
FL_RENDERER_CLASS(klass)->create_surfaces = fl_renderer_x11_create_surfaces;

8
shell/platform/linux/testing/mock_renderer.cc
View File

@ -10,13 +10,6 @@ struct _FlMockRenderer {
G_DEFINE_TYPE(FlMockRenderer, fl_mock_renderer, fl_renderer_get_type())
// Implements FlRenderer::get_visual.
static GdkVisual* fl_mock_renderer_get_visual(FlRenderer* renderer,
GdkScreen* screen,
EGLint visual_id) {
return static_cast<GdkVisual*>(g_object_new(GDK_TYPE_VISUAL, nullptr));
}
// Implements FlRenderer::create_display.
static EGLDisplay fl_mock_renderer_create_display(FlRenderer* renderer) {
return eglGetDisplay(EGL_DEFAULT_DISPLAY);
@ -36,7 +29,6 @@ static gboolean fl_mock_renderer_create_surfaces(FlRenderer* renderer,
}
static void fl_mock_renderer_class_init(FlMockRendererClass* klass) {
FL_RENDERER_CLASS(klass)->get_visual = fl_mock_renderer_get_visual;
FL_RENDERER_CLASS(klass)->create_display = fl_mock_renderer_create_display;
FL_RENDERER_CLASS(klass)->create_surfaces = fl_mock_renderer_create_surfaces;
}