[UI+Backend] Added wayland support and fixed config names.

CMakeLists.txt

@@ -97,7 +97,7 @@ add_executable(KittehPlayer ${SOURCES} ${qml_QRC})
 
 # Use the Qml/Quick modules from Qt 5.
 target_link_libraries(KittehPlayer ${MPV_LIBRARIES} ${X11_LIBRARIES} ${Xext_LIBRARIES} Qt5::X11Extras)
-
+include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras)
 
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)

src/MpvPlayerBackend.cpp

@@ -1,7 +1,6 @@
 #include <clocale>
 #include <stdbool.h>
 #include <stdexcept>
-
 #include "MpvPlayerBackend.h"
 
 #include "utils.hpp"
@@ -20,6 +19,8 @@
 #include <QX11Info>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <QtX11Extras/QX11Info>
+#include <qpa/qplatformnativeinterface.h>
 #endif
 
 namespace {
@@ -33,7 +34,7 @@ wakeup(void* ctx)
 void
 on_mpv_redraw(void* ctx)
 {
-  MpvPlayerBackend::on_update(ctx);
+    QMetaObject::invokeMethod(reinterpret_cast<MpvPlayerBackend*>(ctx), "update");
 }
 
 static void*
@@ -74,8 +75,22 @@ public:
         { MPV_RENDER_PARAM_API_TYPE,
           const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL) },
         { MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params },
+        { MPV_RENDER_PARAM_INVALID, nullptr },
         { MPV_RENDER_PARAM_INVALID, nullptr }
       };
+#if __linux__
+    if (QGuiApplication::platformName().contains("xcb")) {
+        params[2].type = MPV_RENDER_PARAM_X11_DISPLAY;
+        params[2].data = QX11Info::display();
+        qDebug() << "On Xorg.";
+    } else if (QGuiApplication::platformName().contains("wayland")) {
+        QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
+        params[2].type = MPV_RENDER_PARAM_WL_DISPLAY;
+        params[2].data = native->nativeResourceForWindow("display", nullptr);
+        qDebug() << "On wayland.";
+    }
+#endif
+      
       if (mpv_render_context_create(&obj->mpv_gl, obj->mpv, params) < 0)
         throw std::runtime_error("failed to initialize mpv GL context");
       mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj);
@@ -95,23 +110,15 @@ public:
                           .h = fbo->height(),
                           .internal_format = 0 };
     int flip_y{ 0 };
-#ifdef __linux__
-    Display* dpy = QX11Info::display();
-#endif
     mpv_render_param params[] = {
-      // Specify the default framebuffer (0) as target. This will
-      // render onto the entire screen. If you want to show the video
-      // in a smaller rectangle or apply fancy transformations, you'll
-      // need to render into a separate FBO and draw it manually.
       { MPV_RENDER_PARAM_OPENGL_FBO, &mpfbo },
-#ifdef __linux__
-      { MPV_RENDER_PARAM_X11_DISPLAY, dpy },
-#endif
 
       // Flip rendering (needed due to flipped GL coordinate system).
       { MPV_RENDER_PARAM_FLIP_Y, &flip_y },
       { MPV_RENDER_PARAM_INVALID, nullptr }
     };
+
+    
     // See render_gl.h on what OpenGL environment mpv expects, and
     // other API details.
     mpv_render_context_render(obj->mpv_gl, params);

src/qml/main.qml

@@ -51,7 +51,7 @@ Window {
 
     Settings {
         id: youTubeAppearance
-        category: "Appearance"
+        category: "YouTubeAppearance"
         property string mainBackground: "#9C000000"
         property string progressBackgroundColor: "#3CFFFFFF"
         property string progressCachedColor: "white"
@@ -63,7 +63,7 @@ Window {
 
     Settings {
         id: nicoNicoAppearance
-        category: "Appearance"
+        category: "NicoNicoAppearance"
         property string mainBackground: "#9C000000"
         property string progressBackgroundColor: "#444"
         property string progressCachedColor: "white"

src/utils.cpp

@@ -68,9 +68,11 @@ SetScreensaver(WId wid, bool on)
   QProcess xdgScreensaver;
   xdgScreensaver.setProcessChannelMode(QProcess::ForwardedChannels);
   if (on) {
+    qDebug() << "Enabling screensaver.";
     xdgScreensaver.start("xdg-screensaver",
                          QStringList() << "resume" << QString::number(wid));
   } else {
+    qDebug() << "Disabling screensaver.";
     xdgScreensaver.start("xdg-screensaver",
                          QStringList() << "suspend" << QString::number(wid));
   }