feat(linux): working on buffers

README.md

@@ -1,16 +1,7 @@
-# shell
+# Genesis Shell
 
-Next-gen mobile & desktop compositor
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+A next-gen compositor designed to adapt between mobile and desktop devices.
+Genesis Shell is built using wlroots and Flutter. It runs a Wayland server inside
+of the shell with the help of wlroots. To use it as a regular compositor, it is
+recommended to use cage. Genesis Shell also supports multiple monitors with the
+help of cage.

linux/CMakeLists.txt

@@ -120,6 +120,7 @@ add_executable(${BINARY_NAME}
   "channels/auth.cc"
   "channels/display/backend/wayland.c"
   "channels/display/backend.c"
+  "channels/display/texture.c"
   "channels/display/toplevel.c"
   "channels/display.c"
   "channels/outputs.cc"

linux/application-priv.h

@@ -9,7 +9,9 @@
 struct _GenesisShellApplication {
   GtkApplication parent_instance;
   char** dart_entrypoint_arguments;
+
   GtkWindow* win;
+  FlView* view;
 
   AccountChannel account;
   AuthChannel auth;

linux/application.cc

@@ -25,19 +25,19 @@ static void genesis_shell_application_activate(GApplication* application) {
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
 
-  FlView* view = fl_view_new(project);
-  gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(self->win), GTK_WIDGET(view));
+  self->view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(self->view));
+  gtk_container_add(GTK_CONTAINER(self->win), GTK_WIDGET(self->view));
 
-  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+  fl_register_plugins(FL_PLUGIN_REGISTRY(self->view));
 
-  account_channel_init(&self->account, view);
-  auth_channel_init(&self->auth, view);
-  display_channel_init(&self->display, view);
-  outputs_channel_init(&self->outputs, view);
-  session_channel_init(&self->session, view);
+  account_channel_init(&self->account, self->view);
+  auth_channel_init(&self->auth, self->view);
+  display_channel_init(&self->display, self->view);
+  outputs_channel_init(&self->outputs, self->view);
+  session_channel_init(&self->session, self->view);
 
-  gtk_widget_grab_focus(GTK_WIDGET(view));
+  gtk_widget_grab_focus(GTK_WIDGET(self->view));
 }
 
 // Implements GApplication::local_command_line.

linux/channels/display/backend/wayland.c

@@ -201,8 +201,6 @@ static void handle_global(void* data, struct wl_registry* registry, uint32_t id,
   } else if (strcmp(interface, wl_shm_interface.name) == 0) {
 		self->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
 		wl_shm_add_listener(self->shm, &shm_listener, self);
-  } else {
-    g_message("%s:%d", interface, version);
   }
 }
 
@@ -272,6 +270,5 @@ DisplayChannelBackend* display_channel_backend_wayland_init(GdkWaylandDisplay* d
     }
   }
 
-  g_message("%s", self->drm_render_name);
   return &self->base;
 }

linux/channels/display/texture.c

@@ -0,0 +1,10 @@
+#include "texture.h"
+
+typedef struct _DisplayChannelTexturePrivate {
+  int padding[1];
+} DisplayChannelTexturePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(DisplayChannelTexture, display_channel_texture, display_channel_texture_get_type());
+
+static void display_channel_texture_class_init(DisplayChannelTextureClass* klass) {}
+static void display_channel_texture_init(DisplayChannelTexture* self) {}

linux/channels/display/texture.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <flutter_linux/flutter_linux.h>
+
+G_BEGIN_DECLS
+
+G_DECLARE_FINAL_TYPE(DisplayChannelTexture, display_channel_texture, DISPLAY_CHANNEL, TEXTURE, FlTextureGL);
+
+struct _DisplayChannelTexture {
+  FlTextureGL parent_instance;
+};
+
+#define DISPLAY_CHANNEL_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), display_channel_texture_get_type(), DisplayChannelTexture))
+
+G_END_DECLS

linux/channels/display/toplevel.c

@@ -1,4 +1,6 @@
 #include "../display.h"
+#include "../../application.h"
+#include "../../application-priv.h"
 #include "../../messaging.h"
 
 static FlValue* new_string(const gchar* str) {
@@ -80,13 +82,21 @@ static void xdg_toplevel_commit(struct wl_listener* listener, void* data) {
     return;
   }
 
+  struct wlr_buffer* buffer = self->xdg->base->surface->current.buffer;
+  GenesisShellApplication* app = wl_container_of(self->display->channel, app, display);
+  GdkWindow* win = gtk_widget_get_window(GTK_WIDGET(app->view));
+
   size_t stride = 0;
   uint32_t fmt = 0;
-  void* fb = NULL;
-  wlr_buffer_begin_data_ptr_access(self->xdg->base->surface->current.buffer, WLR_BUFFER_DATA_PTR_ACCESS_READ, &fb, &fmt, &stride);
+  void* fbdata = NULL;
+  wlr_buffer_begin_data_ptr_access(buffer, WLR_BUFFER_DATA_PTR_ACCESS_READ, &fbdata, &fmt, &stride);
+
+  GError* error = NULL;
+  GdkGLContext* ctx = gdk_window_create_gl_context(win, &error);
+  gdk_gl_context_make_current(ctx);
+  gdk_gl_context_clear_current();
 
-  g_message("%p %d %zu", fb, fmt, stride);
-  wlr_buffer_end_data_ptr_access(self->xdg->base->surface->current.buffer);
+  wlr_buffer_end_data_ptr_access(buffer);
 
   // TODO: render the buffer into an OpenGL texture.
 }