feat: better true color detection

Author: fathyb

.cargo/config.toml

@@ -0,0 +1,3 @@
+/build
+!/build/browser
+/chromium

.dockerignore

@@ -1,63 +1,22 @@
-FROM debian:11 AS build-env
-
-ARG WORKDIR
-WORKDIR ${WORKDIR} 
-
-ENV PATH="${PATH}:/depot_tools"
-ENV CCACHE_DIR="${WORKDIR}/.ccache"
-ENV GIT_CACHE_PATH="${WORKDIR}/.git_cache"
-ENV DEBIAN_FRONTEND=noninteractive
-ENV CHROMIUM_BUILDTOOLS_PATH="${WORKDIR}/electron/src/buildtools"
-ENV CCACHE_DIR="${WORKDIR}/.ccache"
-ENV CCACHE_CPP2=yes
-ENV CCACHE_SLOPPINESS=time_macros
-RUN apt-get update && \
-        apt-get install -y git sudo curl ccache python3 bzip2 xz-utils \
-        binutils binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf binutils-mips64el-linux-gnuabi64 binutils-mipsel-linux-gnu bison bzip2 cdbs curl dbus-x11 devscripts dpkg-dev elfutils fakeroot flex git-core gperf libasound2 libasound2-dev libatk1.0-0 libatspi2.0-0 libatspi2.0-dev libbluetooth-dev libbrlapi-dev libbrlapi0.8 libbz2-1.0 libbz2-dev libc6 libc6-dev libcairo2 libcairo2-dev libcap-dev libcap2 libcups2 libcups2-dev libcurl4-gnutls-dev libdrm-dev libdrm2 libegl1 libelf-dev libevdev-dev libevdev2 libexpat1 libffi-dev libffi7 libfontconfig1 libfreetype6 libgbm-dev libgbm1 libgl1 libglib2.0-0 libglib2.0-dev libglu1-mesa-dev libgtk-3-0 libgtk-3-dev libinput-dev libinput10 libjpeg-dev libkrb5-dev libnspr4 libnspr4-dev libnss3 libnss3-dev libpam0g libpam0g-dev libpango-1.0-0 libpangocairo-1.0-0 libpci-dev libpci3 libpcre3 libpixman-1-0 libpng16-16 libpulse-dev libpulse0 libsctp-dev libspeechd-dev libspeechd2 libsqlite3-0 libsqlite3-dev libssl-dev libstdc++6 libudev-dev libudev1 libuuid1 libva-dev libvulkan-dev libvulkan1 libwayland-egl1 libwayland-egl1-mesa libwww-perl libx11-6 libx11-xcb1 libxau6 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3 libxi6 libxinerama1 libxkbcommon-dev libxrandr2 libxrender1 libxshmfence-dev libxslt1-dev libxss-dev libxt-dev libxtst-dev libxtst6 locales mesa-common-dev openbox p7zip patch perl pkg-config rpm ruby subversion uuid-dev wdiff x11-utils xcompmgr xz-utils zip zlib1g zstd && \
-    curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
-    apt-get install -y nodejs && \
-    git clone --depth 1 --single-branch https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot_tools && \
-    ccache --max-size=256G
-
-# Release binaries
-# ================
-FROM --platform=$BUILDPLATFORM debian:11 AS carbonyl-binaries
-
-RUN apt-get update && apt-get install -y unzip
+FROM debian:bullseye-slim
+
+RUN groupadd -r carbonyl && useradd -r -g carbonyl carbonyl && \
+    apt-get update && \
+    apt-get install -y \
+        libasound2 libatk-bridge2.0-0 libatk1.0-0 libatomic1 libatspi2.0-0 \
+        libbrotli1 libc6 libcairo2 libcups2 libdbus-1-3 libdouble-conversion3 \
+        libdrm2 libevent-2.1-7 libexpat1 libflac8 libfontconfig1 libfreetype6 \
+        libgbm1 libgcc-s1 libglib2.0-0 libjpeg62-turbo libjsoncpp24 liblcms2-2 \
+        libminizip1 libnspr4 libnss3 libopenjp2-7 libopus0 libpango-1.0-0 \
+        libpng16-16 libpulse0 libre2-9 libsnappy1v5 libstdc++6 libwebp6 \
+        libwebpdemux2 libwebpmux3 libwoff1 libx11-6 libxcb1 libxcomposite1 \
+        libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxml2 libxnvctrl0 \
+        libxrandr2 libxslt1.1 zlib1g libgtk-3-0 && \
+    rm -rf /var/lib/apt/lists/*
+
+USER carbonyl
 
 ARG TARGETARCH
-COPY electron/src/out/release-$TARGETARCH/dist.zip /runtime.zip
-RUN unzip /runtime.zip -d /runtime
-
-# TypeScript build
-# ================
-FROM --platform=$BUILDPLATFORM node:18 AS carbonyl-js 
-
-WORKDIR /app
-COPY package.json yarn.lock /app/
-RUN yarn
-
-COPY tsconfig.json /app/
-COPY src /app/src
-RUN yarn tsc -b
-
-# Main image
-# ==========
-FROM node:18
-
-RUN apt-get update && \
-    apt-get install --yes \
-        libglib2.0-0 libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 libgtk-3-0 libgbm1 libasound2 \
-        xvfb x11-xkb-utils xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic x11-apps \
-        fonts-arphic-ukai fonts-arphic-uming fonts-ipafont-mincho fonts-ipafont-gothic fonts-unfonts-core fonts-noto-core
-
-WORKDIR /app
-COPY package.json yarn.lock /app/
-RUN yarn --production
-
-COPY --from=carbonyl-js /app/build /app/build
-COPY --from=carbonyl-binaries /runtime /app/build/runtime
-COPY /scripts/docker-entrypoint.sh /app/scripts/docker-entrypoint.sh
-
-ENTRYPOINT ["/app/scripts/docker-entrypoint.sh"]
+COPY build/browser/${TARGETARCH:-amd64} /carbonyl
 
+ENTRYPOINT ["/carbonyl/carbonyl", "--no-sandbox", "--disable-dev-shm-usage"]

Dockerfile

@@ -1,11 +1,12 @@
 solutions = [
   {
     "name": "src",
-    "url": "https://chromium.googlesource.com/chromium/src.git@111.0.5539.1",
+    "url": "https://chromium.googlesource.com/chromium/src.git@111.0.5511.1",
     "managed": False,
     "custom_deps": {},
     "custom_vars": {
       "use_rust": True,
+      "checkout_pgo_profiles": True, 
     }
   },
 ]

chromium/.gclient

@@ -0,0 +1,81 @@
+#include "carbonyl/src/browser/bridge.h"
+
+#include <memory>
+#include <iostream>
+#include <stdio.h>
+
+#include "third_party/skia/include/core/SkColor.h"
+
+extern "C" {
+
+void* carbonyl_renderer_create();
+void carbonyl_renderer_clear_text(void* renderer);
+void carbonyl_input_listen(void* renderer, void* delegate);
+void carbonyl_renderer_draw_text(
+    void* renderer,
+    const char* utf8,
+    const struct carbonyl_bridge_rect* rect,
+    const struct carbonyl_bridge_color* color
+);
+void carbonyl_renderer_draw_background(
+    void* renderer,
+    const unsigned char* pixels,
+    size_t pixels_size,
+    const struct carbonyl_bridge_rect* rect
+);
+
+}
+
+namespace carbonyl {
+
+namespace {
+    static std::unique_ptr<Renderer> globalInstance;
+}
+
+Renderer::Renderer(void* ptr): ptr_(ptr) {}
+
+Renderer* Renderer::Main() {
+    if (!globalInstance) {
+        globalInstance = std::make_unique<Renderer>(
+            carbonyl_renderer_create()
+        );
+    }
+
+    return globalInstance.get();
+}
+void Renderer::Listen(void* delegate) {
+    carbonyl_input_listen(ptr_, delegate);
+}
+
+void Renderer::ClearText() {
+    carbonyl_renderer_clear_text(ptr_);
+}
+
+void Renderer::DrawText(const std::string& text, const gfx::RectF& bounds, uint32_t sk_color) {
+    struct carbonyl_bridge_rect rect;
+    struct carbonyl_bridge_color color;
+
+    rect.origin.x = bounds.x();
+    rect.origin.y = bounds.y();
+    rect.size.width = bounds.width();
+    rect.size.height = bounds.height();
+
+    color.r = SkColorGetR(sk_color);
+    color.g = SkColorGetG(sk_color);
+    color.b = SkColorGetB(sk_color);
+
+    carbonyl_renderer_draw_text(ptr_, text.c_str(), &rect, &color);
+}
+
+void Renderer::DrawBackgrond(const unsigned char* pixels, size_t pixels_size, const gfx::Rect& bounds) {
+    struct carbonyl_bridge_rect rect;
+
+    rect.origin.x = bounds.x();
+    rect.origin.y = bounds.y();
+    rect.size.width = bounds.width();
+    rect.size.height = bounds.height();
+
+    carbonyl_renderer_draw_background(ptr_, pixels, pixels_size, &rect);
+}
+
+}

src/mojom/BUILD.gn src/browser/BUILD.gn

@@ -0,0 +1,60 @@
+#ifndef CARBONYL_SRC_BROWSER_BRIDGE_H_
+#define CARBONYL_SRC_BROWSER_BRIDGE_H_
+
+#include <cstdint>
+
+#include "ui/gfx/geometry/rect_f.h"
+
+extern "C" {
+
+struct carbonyl_bridge_size {
+    unsigned int width;
+    unsigned int height;
+};
+struct carbonyl_bridge_point {
+    unsigned int x;
+    unsigned int y;
+};
+struct carbonyl_bridge_rect {
+    struct carbonyl_bridge_point origin;
+    struct carbonyl_bridge_size size;
+};
+struct carbonyl_bridge_color {
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+struct carbonyl_bridge_browser_delegate {
+    void (*shutdown) ();
+    void (*scroll) (int);
+    void (*key_press) (char);
+    void (*mouse_up) (unsigned int, unsigned int);
+    void (*mouse_down) (unsigned int, unsigned int);
+    void (*mouse_move) (unsigned int, unsigned int);
+};
+
+void carbonyl_shell_main();
+void carbonyl_output_get_size(struct carbonyl_bridge_size* size);
+
+} /* end extern "C" */
+
+namespace carbonyl {
+
+class Renderer {
+public:
+    Renderer(void* ptr);
+
+    static Renderer* Main();
+
+    void Listen(void* delegate);
+    void ClearText();
+    void DrawText(const std::string& text, const gfx::RectF& bounds, uint32_t color);
+    void DrawBackgrond(const unsigned char* pixels, size_t pixels_size, const gfx::Rect& bounds);
+
+private:
+    void* ptr_;
+};
+
+}
+
+#endif  // CARBONYL_SRC_BROWSER_BRIDGE_H_