1 files changed, 99 insertions, 192 deletions

diff --git a/src/capture/xcomposite.c b/src/capture/xcomposite.c
index f5d2b2f..db41f63 100644
--- a/src/capture/xcomposite.c
+++ b/src/capture/xcomposite.c
@@ -3,6 +3,7 @@
 #include "../../include/utils.h"
 #include "../../include/cursor.h"
 #include "../../include/color_conversion.h"
+#include "../../include/window/window.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -10,19 +11,16 @@
 #include <assert.h>
 
 #include <X11/Xlib.h>
-#include <X11/extensions/Xdamage.h>
-
-#include <libavutil/frame.h>
-#include <libavcodec/avcodec.h>
 
 typedef struct {
     gsr_capture_xcomposite_params params;
-    XEvent xev;
+    Display *display;
 
     bool should_stop;
     bool stop_is_error;
     bool window_resized;
     bool follow_focused_initialized;
+    bool init_new_window;
 
     Window window;
     vec2i window_size;
@@ -35,20 +33,10 @@ typedef struct {
 
     gsr_cursor cursor;
 
-    int damage_event;
-    int damage_error;
-    XID damage;
-    bool damaged;
-
     bool clear_background;
 } gsr_capture_xcomposite;
 
 static void gsr_capture_xcomposite_stop(gsr_capture_xcomposite *self) {
-    if(self->damage) {
-        XDamageDestroy(self->params.egl->x11.dpy, self->damage);
-        self->damage = None;
-    }
-
     window_texture_deinit(&self->window_texture);
     gsr_cursor_deinit(&self->cursor);
 }
@@ -71,55 +59,24 @@ static Window get_focused_window(Display *display, Atom net_active_window_atom)
     return None;
 }
 
-static void gsr_capture_xcomposite_setup_damage(gsr_capture_xcomposite *self, Window window) {
-    if(self->damage_event == 0)
-        return;
-
-    if(self->damage) {
-        XDamageDestroy(self->params.egl->x11.dpy, self->damage);
-        self->damage = None;
-    }
-
-    self->damage = XDamageCreate(self->params.egl->x11.dpy, window, XDamageReportNonEmpty);
-    if(self->damage) {
-        XDamageSubtract(self->params.egl->x11.dpy, self->damage, None, None);
-    } else {
-        fprintf(stderr, "gsr warning: gsr_capture_xcomposite_setup_damage: XDamageCreate failed\n");
-    }
-}
-
-static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+static int gsr_capture_xcomposite_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
     gsr_capture_xcomposite *self = cap->priv;
 
     if(self->params.follow_focused) {
-        self->net_active_window_atom = XInternAtom(self->params.egl->x11.dpy, "_NET_ACTIVE_WINDOW", False);
+        self->net_active_window_atom = XInternAtom(self->display, "_NET_ACTIVE_WINDOW", False);
         if(!self->net_active_window_atom) {
             fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: failed to get _NET_ACTIVE_WINDOW atom\n");
             return -1;
         }
-        self->window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+        self->window = get_focused_window(self->display, self->net_active_window_atom);
     } else {
         self->window = self->params.window;
     }
 
-    if(self->params.track_damage) {
-        if(!XDamageQueryExtension(self->params.egl->x11.dpy, &self->damage_event, &self->damage_error)) {
-            fprintf(stderr, "gsr warning: gsr_capture_xcomposite_start: XDamage is not supported by your X11 server\n");
-            self->damage_event = 0;
-            self->damage_error = 0;
-        }
-    } else {
-        self->damage_event = 0;
-        self->damage_error = 0;
-    }
-
-    self->damaged = true;
-    gsr_capture_xcomposite_setup_damage(self, self->window);
-
     /* TODO: Do these in tick, and allow error if follow_focused */
 
     XWindowAttributes attr;
-    if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr) && !self->params.follow_focused) {
+    if(!XGetWindowAttributes(self->display, self->window, &attr) && !self->params.follow_focused) {
         fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: invalid window id: %lu\n", self->window);
         return -1;
     }
@@ -128,29 +85,17 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
     self->window_size.y = max_int(attr.height, 0);
 
     if(self->params.follow_focused)
-        XSelectInput(self->params.egl->x11.dpy, DefaultRootWindow(self->params.egl->x11.dpy), PropertyChangeMask);
+        XSelectInput(self->display, DefaultRootWindow(self->display), PropertyChangeMask);
 
     // TODO: Get select and add these on top of it and then restore at the end. Also do the same in other xcomposite
-    XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+    XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);
 
-    if(!self->params.egl->eglExportDMABUFImageQueryMESA) {
-        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: could not find eglExportDMABUFImageQueryMESA\n");
+    if(window_texture_init(&self->window_texture, self->display, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
+        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", (long)self->window);
         return -1;
     }
 
-    if(!self->params.egl->eglExportDMABUFImageMESA) {
-        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: could not find eglExportDMABUFImageMESA\n");
-        return -1;
-    }
-
-    /* Disable vsync */
-    self->params.egl->eglSwapInterval(self->params.egl->egl_display, 0);
-    if(window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
-        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", self->window);
-        return -1;
-    }
-
-    if(gsr_cursor_init(&self->cursor, self->params.egl, self->params.egl->x11.dpy) != 0) {
+    if(gsr_cursor_init(&self->cursor, self->params.egl, self->display) != 0) {
         gsr_capture_xcomposite_stop(self);
         return -1;
     }
@@ -163,104 +108,45 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
     self->params.egl->glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &self->texture_size.y);
     self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
 
-    vec2i video_size = self->texture_size;
-
-    if(self->params.region_size.x > 0 && self->params.region_size.y > 0)
-        video_size = self->params.region_size;
-
-    video_codec_context->width = FFALIGN(video_size.x, 2);
-    video_codec_context->height = FFALIGN(video_size.y, 2);
-
-    frame->width = video_codec_context->width;
-    frame->height = video_codec_context->height;
+    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
+        capture_metadata->width = self->texture_size.x;
+        capture_metadata->height = self->texture_size.y;
+    } else {
+        capture_metadata->width = self->params.output_resolution.x;
+        capture_metadata->height = self->params.output_resolution.y;
+    }
 
     self->window_resize_timer = clock_get_monotonic_seconds();
     return 0;
 }
 
-static void gsr_capture_xcomposite_tick(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_xcomposite_tick(gsr_capture *cap) {
     gsr_capture_xcomposite *self = cap->priv;
 
-    bool init_new_window = false;
-    while(XPending(self->params.egl->x11.dpy)) {
-        XNextEvent(self->params.egl->x11.dpy, &self->xev);
-
-        switch(self->xev.type) {
-            case DestroyNotify: {
-                /* Window died (when not following focused window), so we stop recording */
-                if(!self->params.follow_focused && self->xev.xdestroywindow.window == self->window) {
-                    self->should_stop = true;
-                    self->stop_is_error = false;
-                }
-                break;
-            }
-            case Expose: {
-                /* Requires window texture recreate */
-                if(self->xev.xexpose.count == 0 && self->xev.xexpose.window == self->window) {
-                    self->window_resize_timer = clock_get_monotonic_seconds();
-                    self->window_resized = true;
-                }
-                break;
-            }
-            case ConfigureNotify: {
-                /* Window resized */
-                if(self->xev.xconfigure.window == self->window && (self->xev.xconfigure.width != self->window_size.x || self->xev.xconfigure.height != self->window_size.y)) {
-                    self->window_size.x = max_int(self->xev.xconfigure.width, 0);
-                    self->window_size.y = max_int(self->xev.xconfigure.height, 0);
-                    self->window_resize_timer = clock_get_monotonic_seconds();
-                    self->window_resized = true;
-                }
-                break;
-            }
-            case PropertyNotify: {
-                /* Focused window changed */
-                if(self->params.follow_focused && self->xev.xproperty.atom == self->net_active_window_atom) {
-                    init_new_window = true;
-                }
-                break;
-            }
-        }
-
-        if(self->damage_event && self->xev.type == self->damage_event + XDamageNotify) {
-            XDamageNotifyEvent *de = (XDamageNotifyEvent*)&self->xev;
-            XserverRegion region = XFixesCreateRegion(self->params.egl->x11.dpy, NULL, 0);
-            // Subtract all the damage, repairing the window
-            XDamageSubtract(self->params.egl->x11.dpy, de->damage, None, region);
-            XFixesDestroyRegion(self->params.egl->x11.dpy, region);
-            self->damaged = true;
-        }
-
-        if(gsr_cursor_update(&self->cursor, &self->xev)) {
-            if(self->params.record_cursor && self->cursor.visible) {
-                self->damaged = true;
-            }
-        }
-    }
-
     if(self->params.follow_focused && !self->follow_focused_initialized) {
-        init_new_window = true;
+        self->init_new_window = true;
     }
 
-    if(init_new_window) {
-        Window focused_window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+    if(self->init_new_window) {
+        self->init_new_window = false;
+        Window focused_window = get_focused_window(self->display, self->net_active_window_atom);
         if(focused_window != self->window || !self->follow_focused_initialized) {
             self->follow_focused_initialized = true;
-            XSelectInput(self->params.egl->x11.dpy, self->window, 0);
+            XSelectInput(self->display, self->window, 0);
             self->window = focused_window;
-            XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+            XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);
 
             XWindowAttributes attr;
             attr.width = 0;
             attr.height = 0;
-            if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr))
+            if(!XGetWindowAttributes(self->display, self->window, &attr))
                 fprintf(stderr, "gsr error: gsr_capture_xcomposite_tick failed: invalid window id: %lu\n", self->window);
 
             self->window_size.x = max_int(attr.width, 0);
             self->window_size.y = max_int(attr.height, 0);
 
             window_texture_deinit(&self->window_texture);
-            window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this
+            window_texture_init(&self->window_texture, self->display, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this
 
             self->texture_size.x = 0;
             self->texture_size.y = 0;
@@ -272,7 +158,6 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap, AVCodecContext *video_
 
             self->window_resized = false;
             self->clear_background = true;
-            gsr_capture_xcomposite_setup_damage(self, self->window);
         }
     }
 
@@ -296,18 +181,49 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap, AVCodecContext *video_
         self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
 
         self->clear_background = true;
-        gsr_capture_xcomposite_setup_damage(self, self->window);
     }
 }
 
-static bool gsr_capture_xcomposite_is_damaged(gsr_capture *cap) {
+static void gsr_capture_xcomposite_on_event(gsr_capture *cap, gsr_egl *egl) {
     gsr_capture_xcomposite *self = cap->priv;
-    return self->damage_event ? self->damaged : true;
-}
+    XEvent *xev = gsr_window_get_event_data(egl->window);
+    switch(xev->type) {
+        case DestroyNotify: {
+            /* Window died (when not following focused window), so we stop recording */
+            if(!self->params.follow_focused && xev->xdestroywindow.window == self->window) {
+                self->should_stop = true;
+                self->stop_is_error = false;
+            }
+            break;
+        }
+        case Expose: {
+            /* Requires window texture recreate */
+            if(xev->xexpose.count == 0 && xev->xexpose.window == self->window) {
+                self->window_resize_timer = clock_get_monotonic_seconds();
+                self->window_resized = true;
+            }
+            break;
+        }
+        case ConfigureNotify: {
+            /* Window resized */
+            if(xev->xconfigure.window == self->window && (xev->xconfigure.width != self->window_size.x || xev->xconfigure.height != self->window_size.y)) {
+                self->window_size.x = max_int(xev->xconfigure.width, 0);
+                self->window_size.y = max_int(xev->xconfigure.height, 0);
+                self->window_resize_timer = clock_get_monotonic_seconds();
+                self->window_resized = true;
+            }
+            break;
+        }
+        case PropertyNotify: {
+            /* Focused window changed */
+            if(self->params.follow_focused && xev->xproperty.atom == self->net_active_window_atom) {
+                self->init_new_window = true;
+            }
+            break;
+        }
+    }
 
-static void gsr_capture_xcomposite_clear_damage(gsr_capture *cap) {
-    gsr_capture_xcomposite *self = cap->priv;
-    self->damaged = false;
+    gsr_cursor_on_event(&self->cursor, xev);
 }
 
 static bool gsr_capture_xcomposite_should_stop(gsr_capture *cap, bool *err) {
@@ -323,70 +239,62 @@ static bool gsr_capture_xcomposite_should_stop(gsr_capture *cap, bool *err) {
     return false;
 }
 
-static int gsr_capture_xcomposite_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
+static int gsr_capture_xcomposite_capture(gsr_capture *cap, gsr_capture_metadata *capture_metdata, gsr_color_conversion *color_conversion) {
     gsr_capture_xcomposite *self = cap->priv;
-    (void)frame;
-
-    //self->params.egl->glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    self->params.egl->glClear(0);
 
     if(self->clear_background) {
         self->clear_background = false;
         gsr_color_conversion_clear(color_conversion);
     }
 
-    const int target_x = max_int(0, frame->width / 2 - self->texture_size.x / 2);
-    const int target_y = max_int(0, frame->height / 2 - self->texture_size.y / 2);
+    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
+    vec2i output_size = is_scaled ? self->params.output_resolution : self->texture_size;
+    output_size = scale_keep_aspect_ratio(self->texture_size, output_size);
 
-    const vec2i cursor_pos = {
-        target_x + self->cursor.position.x - self->cursor.hotspot.x,
-        target_y + self->cursor.position.y - self->cursor.hotspot.y
-    };
+    const vec2i target_pos = { max_int(0, capture_metdata->width / 2 - output_size.x / 2), max_int(0, capture_metdata->height / 2 - output_size.y / 2) };
+
+    //self->params.egl->glFlush();
+    //self->params.egl->glFinish();
 
     gsr_color_conversion_draw(color_conversion, window_texture_get_opengl_texture_id(&self->window_texture),
-        (vec2i){target_x, target_y}, self->texture_size,
-        (vec2i){0, 0}, self->texture_size,
-        0.0f, false);
+        target_pos, output_size,
+        (vec2i){0, 0}, self->texture_size, self->texture_size,
+        GSR_ROT_0, GSR_SOURCE_COLOR_RGB, false, false);
 
     if(self->params.record_cursor && self->cursor.visible) {
-        gsr_cursor_tick(&self->cursor, self->window);
+        const vec2d scale = {
+            self->texture_size.x == 0 ? 0 : (double)output_size.x / (double)self->texture_size.x,
+            self->texture_size.y == 0 ? 0 : (double)output_size.y / (double)self->texture_size.y
+        };
 
-        const bool cursor_inside_window =
-            cursor_pos.x + self->cursor.size.x >= target_x &&
-            cursor_pos.x <= target_x + self->texture_size.x &&
-            cursor_pos.y + self->cursor.size.y >= target_y &&
-            cursor_pos.y <= target_y + self->texture_size.y;
+        gsr_cursor_tick(&self->cursor, self->window);
 
-        if(cursor_inside_window) {
-            self->params.egl->glEnable(GL_SCISSOR_TEST);
-            self->params.egl->glScissor(target_x, target_y, self->texture_size.x, self->texture_size.y);
+        const vec2i cursor_pos = {
+            target_pos.x + (self->cursor.position.x - self->cursor.hotspot.x) * scale.x,
+            target_pos.y + (self->cursor.position.y - self->cursor.hotspot.y) * scale.y
+        };
 
-            gsr_color_conversion_draw(color_conversion, self->cursor.texture_id,
-                cursor_pos, self->cursor.size,
-                (vec2i){0, 0}, self->cursor.size,
-                0.0f, false);
+        if(cursor_pos.x < target_pos.x || cursor_pos.x + self->cursor.size.x > target_pos.x + output_size.x || cursor_pos.y < target_pos.y || cursor_pos.y + self->cursor.size.y > target_pos.y + output_size.y)
+            self->clear_background = true;
 
-            self->params.egl->glDisable(GL_SCISSOR_TEST);
-        }
+        gsr_color_conversion_draw(color_conversion, self->cursor.texture_id,
+            cursor_pos, (vec2i){self->cursor.size.x * scale.x, self->cursor.size.y * scale.y},
+            (vec2i){0, 0}, self->cursor.size, self->cursor.size,
+            GSR_ROT_0, GSR_SOURCE_COLOR_RGB, false, true);
     }
 
-    self->params.egl->eglSwapBuffers(self->params.egl->egl_display, self->params.egl->egl_surface);
-
-    // TODO: Do video encoder specific conversion here
-
     //self->params.egl->glFlush();
     //self->params.egl->glFinish();
 
     return 0;
 }
 
-static gsr_source_color gsr_capture_xcomposite_get_source_color(gsr_capture *cap) {
-    (void)cap;
-    return GSR_SOURCE_COLOR_RGB;
+static uint64_t gsr_capture_xcomposite_get_window_id(gsr_capture *cap) {
+    gsr_capture_xcomposite *self = cap->priv;
+    return self->window;
 }
 
-static void gsr_capture_xcomposite_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_xcomposite_destroy(gsr_capture *cap) {
     if(cap->priv) {
         gsr_capture_xcomposite_stop(cap->priv);
         free(cap->priv);
@@ -412,17 +320,16 @@ gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *
     }
 
     cap_xcomp->params = *params;
+    cap_xcomp->display = gsr_window_get_display(params->egl->window);
     
     *cap = (gsr_capture) {
         .start = gsr_capture_xcomposite_start,
+        .on_event = gsr_capture_xcomposite_on_event,
         .tick = gsr_capture_xcomposite_tick,
-        .is_damaged = gsr_capture_xcomposite_is_damaged,
-        .clear_damage = gsr_capture_xcomposite_clear_damage,
         .should_stop = gsr_capture_xcomposite_should_stop,
         .capture = gsr_capture_xcomposite_capture,
-        .capture_end = NULL,
-        .get_source_color = gsr_capture_xcomposite_get_source_color,
         .uses_external_image = NULL,
+        .get_window_id = gsr_capture_xcomposite_get_window_id,
         .destroy = gsr_capture_xcomposite_destroy,
         .priv = cap_xcomp
     };