aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt10
-rwxr-xr-xassets/install/lockdead.pngbin0 -> 113201 bytes
-rw-r--r--assets/install/lockdead2.pngbin0 -> 49466 bytes
-rw-r--r--assets/install/meson.build6
-rw-r--r--assets/install/wall0.png (renamed from assets/wall0.png)bin14194868 -> 14194868 bytes
-rw-r--r--assets/install/wall1.png (renamed from assets/wall1.png)bin6144371 -> 6144371 bytes
-rw-r--r--assets/install/wall2.png (renamed from assets/wall2.png)bin28264194 -> 28264194 bytes
-rw-r--r--assets/meson.build7
-rw-r--r--src/managers/SessionLockManager.cpp5
-rw-r--r--src/managers/SessionLockManager.hpp1
-rw-r--r--src/render/OpenGL.cpp119
-rw-r--r--src/render/OpenGL.hpp6
-rw-r--r--src/render/Renderer.cpp53
-rw-r--r--src/render/Renderer.hpp1
14 files changed, 171 insertions, 37 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8ea4797..84a856b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,12 +336,14 @@ install(
install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.desktop
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/wayland-sessions)
-# allow Hyprland to find wallpapers
+# allow Hyprland to find assets
add_compile_definitions(DATAROOTDIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}")
-# wallpapers
-file(GLOB_RECURSE WALLPAPERS "assets/wall*")
-install(FILES ${WALLPAPERS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr)
+# installable assets
+file(GLOB_RECURSE INSTALLABLE_ASSETS "assets/install/*")
+list(FILTER INSTALLABLE_ASSETS EXCLUDE REGEX "meson.build")
+install(FILES ${INSTALLABLE_ASSETS}
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr)
# default config
install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.conf
diff --git a/assets/install/lockdead.png b/assets/install/lockdead.png
new file mode 100755
index 00000000..f8bae225
--- /dev/null
+++ b/assets/install/lockdead.png
Binary files differ
diff --git a/assets/install/lockdead2.png b/assets/install/lockdead2.png
new file mode 100644
index 00000000..3f46c434
--- /dev/null
+++ b/assets/install/lockdead2.png
Binary files differ
diff --git a/assets/install/meson.build b/assets/install/meson.build
new file mode 100644
index 00000000..19b49638
--- /dev/null
+++ b/assets/install/meson.build
@@ -0,0 +1,6 @@
+globber = run_command('sh', '-c', 'find -type f -not -name "*.build"', check: true)
+files = globber.stdout().strip().split('\n')
+
+foreach file : files
+ install_data(file, install_dir: join_paths(get_option('datadir'), 'hypr'), install_tag: 'runtime')
+endforeach
diff --git a/assets/wall0.png b/assets/install/wall0.png
index 73bdeef8..73bdeef8 100644
--- a/assets/wall0.png
+++ b/assets/install/wall0.png
Binary files differ
diff --git a/assets/wall1.png b/assets/install/wall1.png
index 53e4c90d..53e4c90d 100644
--- a/assets/wall1.png
+++ b/assets/install/wall1.png
Binary files differ
diff --git a/assets/wall2.png b/assets/install/wall2.png
index 9ade4720..9ade4720 100644
--- a/assets/wall2.png
+++ b/assets/install/wall2.png
Binary files differ
diff --git a/assets/meson.build b/assets/meson.build
index 47de3d02..0648037a 100644
--- a/assets/meson.build
+++ b/assets/meson.build
@@ -1,7 +1,2 @@
-wallpapers = ['0', '1', '2']
-
-foreach type : wallpapers
- install_data(f'wall@[email protected]', install_dir: join_paths(get_option('datadir'), 'hypr'), install_tag: 'runtime')
-endforeach
-
install_data('hyprland-portals.conf', install_dir: join_paths(get_option('datadir'), 'xdg-desktop-portal'), install_tag: 'runtime')
+subdir('install')
diff --git a/src/managers/SessionLockManager.cpp b/src/managers/SessionLockManager.cpp
index 81e22889..7267b8f2 100644
--- a/src/managers/SessionLockManager.cpp
+++ b/src/managers/SessionLockManager.cpp
@@ -4,6 +4,7 @@
#include "../protocols/FractionalScale.hpp"
#include "../protocols/SessionLock.hpp"
#include <algorithm>
+#include <ranges>
SSessionLockSurface::SSessionLockSurface(SP<CSessionLockSurface> surface_) : surface(surface_) {
pWlrSurface = surface->surface();
@@ -166,3 +167,7 @@ void CSessionLockManager::removeSessionLockSurface(SSessionLockSurface* pSLS) {
bool CSessionLockManager::isSessionLockPresent() {
return m_pSessionLock && !m_pSessionLock->vSessionLockSurfaces.empty();
}
+
+bool CSessionLockManager::anySessionLockSurfacesPresent() {
+ return m_pSessionLock && std::ranges::any_of(m_pSessionLock->vSessionLockSurfaces, [](const auto& surf) { return surf->mapped; });
+}
diff --git a/src/managers/SessionLockManager.hpp b/src/managers/SessionLockManager.hpp
index b01ee288..9b3b882c 100644
--- a/src/managers/SessionLockManager.hpp
+++ b/src/managers/SessionLockManager.hpp
@@ -55,6 +55,7 @@ class CSessionLockManager {
bool isSessionLocked();
bool isSessionLockPresent();
bool isSurfaceSessionLock(SP<CWLSurfaceResource>);
+ bool anySessionLockSurfacesPresent();
void removeSessionLockSurface(SSessionLockSurface*);
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp
index 67c11c23..91849701 100644
--- a/src/render/OpenGL.cpp
+++ b/src/render/OpenGL.cpp
@@ -338,6 +338,8 @@ CHyprOpenGLImpl::CHyprOpenGLImpl() {
initDRMFormats();
+ initAssets();
+
static auto P = g_pHookSystem->hookDynamic("preRender", [&](void* self, SCallbackInfo& info, std::any data) { preRender(std::any_cast<CMonitor*>(data)); });
RASSERT(eglMakeCurrent(m_pEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT), "Couldn't unset current EGL!");
@@ -2614,14 +2616,17 @@ void CHyprOpenGLImpl::renderSplash(cairo_t* const CAIRO, cairo_surface_t* const
cairo_surface_flush(CAIROSURFACE);
}
-void CHyprOpenGLImpl::createBackgroundTexture(const std::string& texPath) {
- const auto CAIROSURFACE = cairo_image_surface_create_from_png(texPath.c_str());
- const auto CAIROFORMAT = cairo_image_surface_get_format(CAIROSURFACE);
+SP<CTexture> CHyprOpenGLImpl::loadAsset(const std::string& file) {
+ const auto CAIROSURFACE = cairo_image_surface_create_from_png(file.c_str());
- m_pBackgroundTexture = makeShared<CTexture>();
+ if (!CAIROSURFACE)
+ return nullptr;
- m_pBackgroundTexture->allocate();
- m_pBackgroundTexture->m_vSize = {cairo_image_surface_get_width(CAIROSURFACE), cairo_image_surface_get_height(CAIROSURFACE)};
+ const auto CAIROFORMAT = cairo_image_surface_get_format(CAIROSURFACE);
+ auto tex = makeShared<CTexture>();
+
+ tex->allocate();
+ tex->m_vSize = {cairo_image_surface_get_width(CAIROSURFACE), cairo_image_surface_get_height(CAIROSURFACE)};
const GLint glIFormat = CAIROFORMAT == CAIRO_FORMAT_RGB96F ?
#ifdef GLES2
@@ -2634,7 +2639,7 @@ void CHyprOpenGLImpl::createBackgroundTexture(const std::string& texPath) {
const GLint glType = CAIROFORMAT == CAIRO_FORMAT_RGB96F ? GL_FLOAT : GL_UNSIGNED_BYTE;
const auto DATA = cairo_image_surface_get_data(CAIROSURFACE);
- glBindTexture(GL_TEXTURE_2D, m_pBackgroundTexture->m_iTexID);
+ glBindTexture(GL_TEXTURE_2D, tex->m_iTexID);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
#ifndef GLES2
@@ -2643,9 +2648,105 @@ void CHyprOpenGLImpl::createBackgroundTexture(const std::string& texPath) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
}
#endif
- glTexImage2D(GL_TEXTURE_2D, 0, glIFormat, m_pBackgroundTexture->m_vSize.x, m_pBackgroundTexture->m_vSize.y, 0, glFormat, glType, DATA);
+ glTexImage2D(GL_TEXTURE_2D, 0, glIFormat, tex->m_vSize.x, tex->m_vSize.y, 0, glFormat, glType, DATA);
+
+ cairo_surface_destroy(CAIROSURFACE);
+
+ return tex;
+}
+
+SP<CTexture> CHyprOpenGLImpl::renderText(const std::string& text, CColor col, int pt, bool italic) {
+ SP<CTexture> tex = makeShared<CTexture>();
+
+ static auto FONT = CConfigValue<std::string>("misc:font_family");
+
+ const auto FONTFAMILY = *FONT;
+ const auto FONTSIZE = pt;
+ const auto COLOR = col;
+
+ auto CAIROSURFACE = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1920, 1080 /* arbitrary, just for size */);
+ auto CAIRO = cairo_create(CAIROSURFACE);
+
+ PangoLayout* layoutText = pango_cairo_create_layout(CAIRO);
+ PangoFontDescription* pangoFD = pango_font_description_new();
+
+ pango_font_description_set_family_static(pangoFD, FONTFAMILY.c_str());
+ pango_font_description_set_absolute_size(pangoFD, FONTSIZE * PANGO_SCALE);
+ pango_font_description_set_style(pangoFD, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+ pango_font_description_set_weight(pangoFD, PANGO_WEIGHT_NORMAL);
+ pango_layout_set_font_description(layoutText, pangoFD);
+
+ cairo_set_source_rgba(CAIRO, COLOR.r, COLOR.g, COLOR.b, COLOR.a);
+
+ int textW = 0, textH = 0;
+ pango_layout_set_text(layoutText, text.c_str(), -1);
+ pango_layout_get_size(layoutText, &textW, &textH);
+ textW /= PANGO_SCALE;
+ textH /= PANGO_SCALE;
+
+ pango_font_description_free(pangoFD);
+ g_object_unref(layoutText);
+ cairo_destroy(CAIRO);
+ cairo_surface_destroy(CAIROSURFACE);
+
+ CAIROSURFACE = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textW, textH);
+ CAIRO = cairo_create(CAIROSURFACE);
+
+ layoutText = pango_cairo_create_layout(CAIRO);
+ pangoFD = pango_font_description_new();
+
+ pango_font_description_set_family_static(pangoFD, FONTFAMILY.c_str());
+ pango_font_description_set_absolute_size(pangoFD, FONTSIZE * PANGO_SCALE);
+ pango_font_description_set_style(pangoFD, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+ pango_font_description_set_weight(pangoFD, PANGO_WEIGHT_NORMAL);
+ pango_layout_set_font_description(layoutText, pangoFD);
+ pango_layout_set_text(layoutText, text.c_str(), -1);
+
+ cairo_set_source_rgba(CAIRO, COLOR.r, COLOR.g, COLOR.b, COLOR.a);
+
+ cairo_move_to(CAIRO, 0, 0);
+ pango_cairo_show_layout(CAIRO, layoutText);
+
+ pango_font_description_free(pangoFD);
+ g_object_unref(layoutText);
+
+ cairo_surface_flush(CAIROSURFACE);
+
+ tex->allocate();
+ tex->m_vSize = {cairo_image_surface_get_width(CAIROSURFACE), cairo_image_surface_get_height(CAIROSURFACE)};
+
+ const auto DATA = cairo_image_surface_get_data(CAIROSURFACE);
+ glBindTexture(GL_TEXTURE_2D, tex->m_iTexID);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+#ifndef GLES2
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
+#endif
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex->m_vSize.x, tex->m_vSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
+ cairo_destroy(CAIRO);
cairo_surface_destroy(CAIROSURFACE);
+
+ return tex;
+}
+
+void CHyprOpenGLImpl::initAssets() {
+ std::string assetsPath = "";
+#ifndef DATAROOTDIR
+ assetsPath = "/usr/share/hypr/";
+#else
+ assetsPath = std::format("{}{}", DATAROOTDIR, "/hypr/");
+#endif
+
+ m_pLockDeadTexture = loadAsset(assetsPath + "lockdead.png");
+ m_pLockDead2Texture = loadAsset(assetsPath + "lockdead2.png");
+
+ m_pLockTtyTextTexture = renderText(std::format("Running on tty {}",
+ g_pCompositor->m_pAqBackend->hasSession() && g_pCompositor->m_pAqBackend->session->vt > 0 ?
+ std::to_string(g_pCompositor->m_pAqBackend->session->vt) :
+ "unknown"),
+ CColor{0.9F, 0.9F, 0.9F, 0.7F}, 20, true);
}
void CHyprOpenGLImpl::createBGTextureForMonitor(CMonitor* pMonitor) {
@@ -2694,7 +2795,7 @@ void CHyprOpenGLImpl::createBGTextureForMonitor(CMonitor* pMonitor) {
return; // the texture will be empty, oh well. We'll clear with a solid color anyways.
}
- createBackgroundTexture(texPath);
+ m_pBackgroundTexture = loadAsset(texPath);
}
// create a new one with cairo
diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp
index f405cb7c..06078a00 100644
--- a/src/render/OpenGL.hpp
+++ b/src/render/OpenGL.hpp
@@ -277,7 +277,7 @@ class CHyprOpenGLImpl {
CShader m_sFinalScreenShader;
CTimer m_tGlobalTimer;
- SP<CTexture> m_pBackgroundTexture;
+ SP<CTexture> m_pBackgroundTexture, m_pLockDeadTexture, m_pLockDead2Texture, m_pLockTtyTextTexture;
void logShaderError(const GLuint&, bool program = false);
GLuint createProgram(const std::string&, const std::string&, bool dynamic = false);
@@ -287,7 +287,9 @@ class CHyprOpenGLImpl {
void initDRMFormats();
void initEGL(bool gbm);
EGLDeviceEXT eglDeviceFromDRMFD(int drmFD);
- void createBackgroundTexture(const std::string& path);
+ SP<CTexture> loadAsset(const std::string& file);
+ SP<CTexture> renderText(const std::string& text, CColor col, int pt, bool italic = false);
+ void initAssets();
//
std::optional<std::vector<uint64_t>> getModsForFormat(EGLint format);
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 33679731..2854a973 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -839,9 +839,7 @@ void CHyprRenderer::renderAllClientsForWorkspace(CMonitor* pMonitor, PHLWORKSPAC
if (g_pSessionLockManager->isSessionLocked() && !g_pSessionLockManager->isSessionLockPresent()) {
// locked with no exclusive, draw only red
- CBox boxe = {0, 0, INT16_MAX, INT16_MAX};
- const float A = g_pSessionLockManager->getRedScreenAlphaForMonitor(pMonitor->ID);
- g_pHyprOpenGL->renderRect(&boxe, CColor(1.0, 0.2, 0.2, A));
+ renderSessionLockMissing(pMonitor);
return;
}
@@ -1001,27 +999,50 @@ void CHyprRenderer::renderLockscreen(CMonitor* pMonitor, timespec* now, const CB
if (g_pSessionLockManager->isSessionLocked()) {
Vector2D translate = {geometry.x, geometry.y};
- float scale = (float)geometry.width / pMonitor->vecPixelSize.x;
const auto PSLS = g_pSessionLockManager->getSessionLockSurfaceForMonitor(pMonitor->ID);
- if (!PSLS) {
- // locked with no surface, fill with red
- const auto ALPHA = g_pSessionLockManager->getRedScreenAlphaForMonitor(pMonitor->ID);
-
- CBox monbox = {translate.x, translate.y, pMonitor->vecTransformedSize.x * scale, pMonitor->vecTransformedSize.y * scale};
- g_pHyprOpenGL->renderRect(&monbox, CColor(1.0, 0.2, 0.2, ALPHA));
-
- if (ALPHA < 1.f) /* animate */
- damageMonitor(pMonitor);
- else
- g_pSessionLockManager->onLockscreenRenderedOnMonitor(pMonitor->ID);
- } else {
+ if (!PSLS)
+ renderSessionLockMissing(pMonitor);
+ else {
renderSessionLockSurface(PSLS, pMonitor, now);
g_pSessionLockManager->onLockscreenRenderedOnMonitor(pMonitor->ID);
}
}
}
+void CHyprRenderer::renderSessionLockMissing(CMonitor* pMonitor) {
+ const auto ALPHA = g_pSessionLockManager->getRedScreenAlphaForMonitor(pMonitor->ID);
+
+ CBox monbox = {{}, pMonitor->vecPixelSize};
+
+ const bool ANY_PRESENT = g_pSessionLockManager->anySessionLockSurfacesPresent();
+
+ if (ANY_PRESENT) {
+ // render image2, without instructions. Lock still "alive", unless texture dead
+ if (g_pHyprOpenGL->m_pLockDead2Texture)
+ g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pLockDead2Texture, &monbox, ALPHA);
+ else
+ g_pHyprOpenGL->renderRect(&monbox, CColor(1.0, 0.2, 0.2, ALPHA));
+ } else {
+ // render image, with instructions. Lock is gone.
+ if (g_pHyprOpenGL->m_pLockDeadTexture) {
+ g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pLockDeadTexture, &monbox, ALPHA);
+
+ // also render text for the tty number
+ if (g_pHyprOpenGL->m_pLockTtyTextTexture) {
+ CBox texbox = {{}, g_pHyprOpenGL->m_pLockTtyTextTexture->m_vSize};
+ g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pLockTtyTextTexture, &texbox, 1.F);
+ }
+ } else
+ g_pHyprOpenGL->renderRect(&monbox, CColor(1.0, 0.2, 0.2, ALPHA));
+ }
+
+ if (ALPHA < 1.f) /* animate */
+ damageMonitor(pMonitor);
+ else
+ g_pSessionLockManager->onLockscreenRenderedOnMonitor(pMonitor->ID);
+}
+
void CHyprRenderer::calculateUVForSurface(PHLWINDOW pWindow, SP<CWLSurfaceResource> pSurface, bool main, const Vector2D& projSize, bool fixMisalignedFSV1) {
if (!pWindow || !pWindow->m_bIsX11) {
Vector2D uvTL;
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index 0b16efea..d00c0a17 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -123,6 +123,7 @@ class CHyprRenderer {
void renderWorkspace(CMonitor* pMonitor, PHLWORKSPACE pWorkspace, timespec* now, const CBox& geometry);
void sendFrameEventsToWorkspace(CMonitor* pMonitor, PHLWORKSPACE pWorkspace, timespec* now); // sends frame displayed events but doesn't actually render anything
void renderAllClientsForWorkspace(CMonitor* pMonitor, PHLWORKSPACE pWorkspace, timespec* now, const Vector2D& translate = {0, 0}, const float& scale = 1.f);
+ void renderSessionLockMissing(CMonitor* pMonitor);
bool commitPendingAndDoExplicitSync(CMonitor* pMonitor);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 14:47:23 +0000