From 6580558f287d7b7aa8fdb0dc9805114493c54e4e Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 21 Oct 2023 19:51:18 +0200 Subject: [PATCH] Basic wayland setup --- app/SysTray-X/SysTray-X-app/SysTray-X-app.pro | 4 ++++ app/SysTray-X/SysTray-X-app/windowctrl-unix.h | 1 + .../SysTray-X-lib-wayland.pro | 23 +++++++++++++++++++ .../systray-x-lib-wayland.cpp | 20 ++++++++++++++++ .../systray-x-lib-wayland.h | 14 +++++++++++ .../SysTray-X-lib-x11/SysTray-X-lib-x11.pro | 2 -- app/SysTray-X/SysTray-X.pro | 1 + 7 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 app/SysTray-X/SysTray-X-lib-wayland/SysTray-X-lib-wayland.pro create mode 100644 app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.cpp create mode 100644 app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.h diff --git a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro index 312f230..df6f9e1 100644 --- a/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro +++ b/app/SysTray-X/SysTray-X-app/SysTray-X-app.pro @@ -72,10 +72,14 @@ unix:!macx: { QMAKE_CFLAGS += -I$${_PRO_FILE_PWD_}/../SysTray-X-lib-x11 QMAKE_CXXFLAGS += -I$${_PRO_FILE_PWD_}/../SysTray-X-lib-x11 + QMAKE_CFLAGS += -I$${_PRO_FILE_PWD_}/../SysTray-X-lib-wayland + QMAKE_CXXFLAGS += -I$${_PRO_FILE_PWD_}/../SysTray-X-lib-wayland + # # Add local libs # LIBS += -L../SysTray-X-lib-x11 -lSysTray-X-x11 + LIBS += -L../SysTray-X-lib-wayland -lSysTray-X-wayland # # Add system libs diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h index def2df2..66067c0 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h +++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h @@ -9,6 +9,7 @@ */ #include "preferences.h" #include "systray-x-lib-x11.h" +#include "systray-x-lib-wayland.h" /* * System includes diff --git a/app/SysTray-X/SysTray-X-lib-wayland/SysTray-X-lib-wayland.pro b/app/SysTray-X/SysTray-X-lib-wayland/SysTray-X-lib-wayland.pro new file mode 100644 index 0000000..e4e8a11 --- /dev/null +++ b/app/SysTray-X/SysTray-X-lib-wayland/SysTray-X-lib-wayland.pro @@ -0,0 +1,23 @@ +# +# Remove core Qt libs +# +QT -= core gui + +TARGET = SysTray-X-wayland +TEMPLATE = lib + +CONFIG += staticlib + +include(../SysTray-X.pri) + +# +# Clear Qt dependencies +# +QMAKE_INCDIR = +QMAKE_INCDIR_QT = +QMAKE_LIBDIR_QT = + + +SOURCES += systray-x-lib-wayland.cpp + +HEADERS += systray-x-lib-wayland.h diff --git a/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.cpp b/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.cpp new file mode 100644 index 0000000..d679d6f --- /dev/null +++ b/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.cpp @@ -0,0 +1,20 @@ +#include "systray-x-lib-wayland.h" + +/* + * System includes + */ +#include +#include +#include + +/* + * Wayland includes + */ + + + +void dummy() +{ + +} + diff --git a/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.h b/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.h new file mode 100644 index 0000000..ea50dff --- /dev/null +++ b/app/SysTray-X/SysTray-X-lib-wayland/systray-x-lib-wayland.h @@ -0,0 +1,14 @@ +#ifndef SYSTRAY_X_LIB_WAYLAND_H +#define SYSTRAY_X_LIB_WAYLAND_H + +typedef int qint32; /* 32 bit signed */ +typedef unsigned int quint32; /* 32 bit unsigned */ +typedef unsigned long long quint64; /* 64 bit unsigned */ + + +/** + * @brief Dummy. Dummy method. + */ +void Dummy(); + +#endif // SYSTRAY_X_LIB_WAYLAND_H diff --git a/app/SysTray-X/SysTray-X-lib-x11/SysTray-X-lib-x11.pro b/app/SysTray-X/SysTray-X-lib-x11/SysTray-X-lib-x11.pro index 7605446..058aa21 100644 --- a/app/SysTray-X/SysTray-X-lib-x11/SysTray-X-lib-x11.pro +++ b/app/SysTray-X/SysTray-X-lib-x11/SysTray-X-lib-x11.pro @@ -10,8 +10,6 @@ CONFIG += staticlib include(../SysTray-X.pri) -DEFINES += SysTray_X_X11_LIBRARY - # # Clear Qt dependencies # diff --git a/app/SysTray-X/SysTray-X.pro b/app/SysTray-X/SysTray-X.pro index 031011b..3c9ffaa 100644 --- a/app/SysTray-X/SysTray-X.pro +++ b/app/SysTray-X/SysTray-X.pro @@ -11,6 +11,7 @@ include( SysTray-X.pri ) # unix: { SUBDIRS += SysTray-X-lib-x11 +SUBDIRS += SysTray-X-lib-wayland } #SUBDIRS += SysTray-X-lib-win SUBDIRS += SysTray-X-app