mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: clang-format

Browse Source
This commit is contained in:
Almamu 2024-05-11 17:38:25 +02:00
parent 7ae8810561
commit 8a8741dbff
2 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/WallpaperEngine/Application/CWallpaperApplication.cpp
View File

@ -263,64 +263,72 @@ void CWallpaperApplication::show () {
const char* XDG_SESSION_TYPE = getenv ("XDG_SESSION_TYPE"); const char* XDG_SESSION_TYPE = getenv ("XDG_SESSION_TYPE");
if (!XDG_SESSION_TYPE) { if (!XDG_SESSION_TYPE) {
sLog.exception("Cannot read environment variable XDG_SESSION_TYPE, window server detection failed. Please ensure proper values are set"); sLog.exception (
"Cannot read environment variable XDG_SESSION_TYPE, window server detection failed. Please ensure proper values are set");
} }
#ifdef ENABLE_WAYLAND #ifdef ENABLE_WAYLAND
bool isWayland = strncmp("wayland", XDG_SESSION_TYPE, strlen("wayland")) == 0; bool isWayland = strncmp ("wayland", XDG_SESSION_TYPE, strlen ("wayland")) == 0;
#endif // ENABLE_WAYLAND #endif // ENABLE_WAYLAND
#ifdef ENABLE_X11 #ifdef ENABLE_X11
bool isX11 = strncmp("x11", XDG_SESSION_TYPE, strlen("x11")) == 0; bool isX11 = strncmp ("x11", XDG_SESSION_TYPE, strlen ("x11")) == 0;
#endif // ENABLE_X11 #endif // ENABLE_X11
if (this->m_context.settings.render.mode == CApplicationContext::DESKTOP_BACKGROUND) { if (this->m_context.settings.render.mode == CApplicationContext::DESKTOP_BACKGROUND) {
#ifdef ENABLE_WAYLAND #ifdef ENABLE_WAYLAND
if (isWayland) { if (isWayland) {
videoDriver = new WallpaperEngine::Render::Drivers::CWaylandOpenGLDriver (this->m_context, *this); videoDriver = new WallpaperEngine::Render::Drivers::CWaylandOpenGLDriver (this->m_context, *this);
inputContext = new WallpaperEngine::Input::CInputContext ( inputContext =
new WallpaperEngine::Input::Drivers::CWaylandMouseInput (reinterpret_cast<WallpaperEngine::Render::Drivers::CWaylandOpenGLDriver*>(videoDriver))); new WallpaperEngine::Input::CInputContext (new WallpaperEngine::Input::Drivers::CWaylandMouseInput (
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CWaylandFullScreenDetector(this->m_context); reinterpret_cast<WallpaperEngine::Render::Drivers::CWaylandOpenGLDriver*> (videoDriver)));
this->fullScreenDetector =
new WallpaperEngine::Render::Drivers::Detectors::CWaylandFullScreenDetector (this->m_context);
} }
#endif // ENABLE_WAYLAND #endif // ENABLE_WAYLAND
#ifdef ENABLE_X11 #ifdef ENABLE_X11
#ifdef ENABLE_WAYLAND #ifdef ENABLE_WAYLAND
else else
#endif // ENABLE_WAYLAND #endif // ENABLE_WAYLAND
if (isX11) if (isX11) {
{ videoDriver =
videoDriver = new WallpaperEngine::Render::Drivers::CGLFWOpenGLDriver ("wallpaperengine", this->m_context, *this); new WallpaperEngine::Render::Drivers::CGLFWOpenGLDriver ("wallpaperengine", this->m_context, *this);
inputContext = new WallpaperEngine::Input::CInputContext ( inputContext =
new WallpaperEngine::Input::Drivers::CGLFWMouseInput (reinterpret_cast <Render::Drivers::CGLFWOpenGLDriver*>(videoDriver))); new WallpaperEngine::Input::CInputContext (new WallpaperEngine::Input::Drivers::CGLFWMouseInput (
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector (this->m_context, *reinterpret_cast <Render::Drivers::CGLFWOpenGLDriver*>(videoDriver)); reinterpret_cast<Render::Drivers::CGLFWOpenGLDriver*> (videoDriver)));
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector (
this->m_context, *reinterpret_cast<Render::Drivers::CGLFWOpenGLDriver*> (videoDriver));
} }
#endif // ENABLE_X11 #endif // ENABLE_X11
else { else {
sLog.exception("Cannot run in background mode, window server could not be detected. XDG_SESSION_TYPE must be wayland or x11"); sLog.exception (
"Cannot run in background mode, window server could not be detected. XDG_SESSION_TYPE must be wayland or x11");
} }
} else { } else {
videoDriver = new WallpaperEngine::Render::Drivers::CGLFWOpenGLDriver ("wallpaperengine", this->m_context, *this); videoDriver =
new WallpaperEngine::Render::Drivers::CGLFWOpenGLDriver ("wallpaperengine", this->m_context, *this);
#ifdef ENABLE_WAYLAND #ifdef ENABLE_WAYLAND
if (isWayland) { if (isWayland) {
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CWaylandFullScreenDetector(this->m_context); this->fullScreenDetector =
new WallpaperEngine::Render::Drivers::Detectors::CWaylandFullScreenDetector (this->m_context);
} }
#endif // ENABLE_WAYLAND #endif // ENABLE_WAYLAND
#ifdef ENABLE_X11 #ifdef ENABLE_X11
#ifdef ENABLE_WAYLAND #ifdef ENABLE_WAYLAND
else else
#endif // ENABLE_WAYLAND #endif // ENABLE_WAYLAND
if(isX11) if (isX11) {
{ this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector (
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CX11FullScreenDetector (this->m_context, *reinterpret_cast <Render::Drivers::CGLFWOpenGLDriver*>(videoDriver)); this->m_context, *reinterpret_cast<Render::Drivers::CGLFWOpenGLDriver*> (videoDriver));
} }
#endif // ENABLE_X11 #endif // ENABLE_X11
else { else {
this->fullScreenDetector = new WallpaperEngine::Render::Drivers::Detectors::CFullScreenDetector (this->m_context); this->fullScreenDetector =
new WallpaperEngine::Render::Drivers::Detectors::CFullScreenDetector (this->m_context);
} }
inputContext = new WallpaperEngine::Input::CInputContext ( inputContext = new WallpaperEngine::Input::CInputContext (new WallpaperEngine::Input::Drivers::CGLFWMouseInput (
new WallpaperEngine::Input::Drivers::CGLFWMouseInput (reinterpret_cast <Render::Drivers::CGLFWOpenGLDriver*>(videoDriver))); reinterpret_cast<Render::Drivers::CGLFWOpenGLDriver*> (videoDriver)));
} }
if (this->m_context.settings.audio.audioprocessing) { if (this->m_context.settings.audio.audioprocessing) {
@ -330,8 +338,8 @@ void CWallpaperApplication::show () {
} }
// audio playing detector // audio playing detector
WallpaperEngine::Audio::Drivers::Detectors::CPulseAudioPlayingDetector audioDetector ( WallpaperEngine::Audio::Drivers::Detectors::CPulseAudioPlayingDetector audioDetector (this->m_context,
this->m_context, *this->fullScreenDetector); *this->fullScreenDetector);
// initialize sdl audio driver // initialize sdl audio driver
audioDriver = audioDriver =
new WallpaperEngine::Audio::Drivers::CSDLAudioDriver (this->m_context, audioDetector, *this->audioRecorder); new WallpaperEngine::Audio::Drivers::CSDLAudioDriver (this->m_context, audioDetector, *this->audioRecorder);

5
src/WallpaperEngine/Render/Drivers/CGLFWOpenGLDriver.cpp
View File

@ -14,7 +14,8 @@ void CustomGLFWErrorHandler (int errorCode, const char* reason) {
sLog.error ("GLFW error ", errorCode, ": ", reason); sLog.error ("GLFW error ", errorCode, ": ", reason);
} }
CGLFWOpenGLDriver::CGLFWOpenGLDriver (const char* windowTitle, CApplicationContext& context, CWallpaperApplication& app) : CGLFWOpenGLDriver::CGLFWOpenGLDriver (const char* windowTitle, CApplicationContext& context,
CWallpaperApplication& app) :
m_frameCounter (0), m_frameCounter (0),
m_context (context), m_context (context),
CVideoDriver (app) { CVideoDriver (app) {
@ -74,7 +75,7 @@ CGLFWOpenGLDriver::CGLFWOpenGLDriver (const char* windowTitle, CApplicationConte
} }
#else #else
else { else {
sLog.exception("Trying to start GLFW in background mode without X11 support installed. Bailing out"); sLog.exception ("Trying to start GLFW in background mode without X11 support installed. Bailing out");
} }
#endif #endif
} }