1 files changed, 28 insertions, 13 deletions

diff --git a/src/window/window.c b/src/window/window.c
index 1817a2f..8d63650 100644
--- a/src/window/window.c
+++ b/src/window/window.c
@@ -1028,7 +1028,7 @@ static mgl_clipboard_type atom_type_to_supported_clipboard_type(x11_context *x11
     }
 }
 
-bool mgl_window_get_clipboard(mgl_window *self, mgl_clipboard_callback callback, void *userdata) {
+bool mgl_window_get_clipboard(mgl_window *self, mgl_clipboard_callback callback, void *userdata, uint32_t clipboard_types) {
     assert(callback);
 
     mgl_context *context = mgl_get_context();
@@ -1052,16 +1052,28 @@ bool mgl_window_get_clipboard(mgl_window *self, mgl_clipboard_callback callback,
 
     /* Sorted by preference */
     /* TODO: Support more types (BITMAP?, PIXMAP?) */
-    const Atom supported_clipboard_types[] = {
-        x11_context->utf8_string_atom,
-        XA_STRING,
-        x11_context->text_atom,
-        x11_context->image_png,
-        x11_context->image_jpg,
-        x11_context->image_jpeg,
-        x11_context->image_gif,
-    };
-    const unsigned long num_supported_clipboard_types = sizeof(supported_clipboard_types) / sizeof(supported_clipboard_types[0]);
+    Atom supported_clipboard_types[7];
+
+    int supported_clipboard_type_index = 0;
+    if(clipboard_types & MGL_CLIPBOARD_TYPE_STRING) {
+        supported_clipboard_types[supported_clipboard_type_index++] = x11_context->utf8_string_atom;
+        supported_clipboard_types[supported_clipboard_type_index++] = XA_STRING;
+        supported_clipboard_types[supported_clipboard_type_index++] = x11_context->text_atom;
+    }
+
+    if(clipboard_types & MGL_CLIPBOARD_TYPE_IMAGE_PNG) {
+        supported_clipboard_types[supported_clipboard_type_index++] = x11_context->image_png;
+    }
+
+    if(clipboard_types & MGL_CLIPBOARD_TYPE_IMAGE_JPG) {
+        supported_clipboard_types[supported_clipboard_type_index++] = x11_context->image_jpeg;
+    }
+
+    if(clipboard_types & MGL_CLIPBOARD_TYPE_IMAGE_GIF) {
+        supported_clipboard_types[supported_clipboard_type_index++] = x11_context->image_gif;
+    }
+
+    const unsigned long num_supported_clipboard_types = supported_clipboard_type_index;
 
     Atom requested_clipboard_type = None;
     const Atom XA_TARGETS = XInternAtom(context->connection, "TARGETS", False);
@@ -1073,7 +1085,10 @@ bool mgl_window_get_clipboard(mgl_window *self, mgl_clipboard_callback callback,
     const double timeout_seconds = 5.0;
     while(mgl_clock_get_elapsed_time_seconds(&timeout_timer) < timeout_seconds) {
         while(XCheckTypedWindowEvent(context->connection, self->window, SelectionNotify, &xev)) {
-            if(!xev.xselection.property || !xev.xselection.target || xev.xselection.selection != x11_context->clipboard_atom)
+            if(!xev.xselection.property)
+                return false;
+
+            if(!xev.xselection.target || xev.xselection.selection != x11_context->clipboard_atom)
                 continue;
 
             Atom type = None;
@@ -1201,7 +1216,7 @@ bool mgl_window_get_clipboard_string(mgl_window *self, char **str, size_t *size)
     ClipboardStringCallbackData callback_data;
     callback_data.str = str;
     callback_data.size = size;
-    const bool success = mgl_window_get_clipboard(self, clipboard_copy_string_callback, &callback_data);
+    const bool success = mgl_window_get_clipboard(self, clipboard_copy_string_callback, &callback_data, MGL_CLIPBOARD_TYPE_STRING);
     if(!success) {
         free(*str);
         *size = 0;