Added default background as a PNG

This commit is contained in:
vaxerski 2022-04-10 14:32:18 +02:00
parent 5046c02cce
commit 3753f83f69
8 changed files with 66 additions and 2 deletions

View file

@ -73,5 +73,9 @@ install:
cp ./example/hyprland.desktop /usr/share/wayland-sessions/ cp ./example/hyprland.desktop /usr/share/wayland-sessions/
cp ./build/Hyprland /usr/bin cp ./build/Hyprland /usr/bin
cp ./hyprctl/hyprctl /usr/bin cp ./hyprctl/hyprctl /usr/bin
mkdir -p /usr/share/hyprland
cp ./assets/wall_2K.png /usr/share/hyprland
cp ./assets/wall_4K.png /usr/share/hyprland
cp ./assets/wall_8K.png /usr/share/hyprland
config: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o config: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o

BIN
assets/wall_2K.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

BIN
assets/wall_4K.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

BIN
assets/wall_8K.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 KiB

View file

@ -115,6 +115,7 @@ void Events::listener_monitorFrame(void* owner, void* data) {
g_pHyprOpenGL->begin(PMONITOR); g_pHyprOpenGL->begin(PMONITOR);
g_pHyprOpenGL->clear(CColor(11, 11, 11, 255)); g_pHyprOpenGL->clear(CColor(11, 11, 11, 255));
g_pHyprOpenGL->clearWithTex(); // will apply the hypr "wallpaper"
g_pHyprRenderer->renderAllClientsForMonitor(PMONITOR->ID, &now); g_pHyprRenderer->renderAllClientsForMonitor(PMONITOR->ID, &now);

View file

@ -25,7 +25,6 @@ void CHyprWLListener::removeCallback() {
if (m_bIsConnected) { if (m_bIsConnected) {
Debug::log(LOG, "Callback %x -> %x, %s removed.", m_pCallback, m_pOwner, m_szAuthor.c_str()); Debug::log(LOG, "Callback %x -> %x, %s removed.", m_pCallback, m_pOwner, m_szAuthor.c_str());
wl_list_remove(&m_sListener.link); wl_list_remove(&m_sListener.link);
wl_list_init(&m_sListener.link);
} }
m_bIsConnected = false; m_bIsConnected = false;
@ -36,6 +35,9 @@ bool CHyprWLListener::isConnected() {
} }
void CHyprWLListener::initCallback(wl_signal* pSignal, std::function<void(void*, void*)> callback, void* pOwner, std::string author) { void CHyprWLListener::initCallback(wl_signal* pSignal, std::function<void(void*, void*)> callback, void* pOwner, std::string author) {
if (m_bIsConnected)
removeCallback();
m_pOwner = pOwner; m_pOwner = pOwner;
m_pCallback = callback; m_pCallback = callback;
m_szAuthor = author; m_szAuthor = author;

View file

@ -127,8 +127,10 @@ void CHyprOpenGLImpl::begin(SMonitor* pMonitor) {
m_iWLROutputFb = m_iCurrentOutputFb; m_iWLROutputFb = m_iCurrentOutputFb;
// ensure a framebuffer for the monitor exists // ensure a framebuffer for the monitor exists
if (m_mMonitorFramebuffers.find(pMonitor) == m_mMonitorFramebuffers.end() || m_mMonitorFramebuffers[pMonitor].m_Size != pMonitor->vecSize) if (m_mMonitorFramebuffers.find(pMonitor) == m_mMonitorFramebuffers.end() || m_mMonitorFramebuffers[pMonitor].m_Size != pMonitor->vecSize) {
m_mMonitorFramebuffers[pMonitor].alloc(pMonitor->vecSize.x, pMonitor->vecSize.y); m_mMonitorFramebuffers[pMonitor].alloc(pMonitor->vecSize.x, pMonitor->vecSize.y);
createBGTextureForMonitor(pMonitor);
}
// bind the Hypr Framebuffer // bind the Hypr Framebuffer
m_mMonitorFramebuffers[pMonitor].bind(); m_mMonitorFramebuffers[pMonitor].bind();
@ -491,6 +493,7 @@ void CHyprOpenGLImpl::makeWindowSnapshot(CWindow* pWindow) {
} }
void CHyprOpenGLImpl::renderSnapshot(CWindow** pWindow) { void CHyprOpenGLImpl::renderSnapshot(CWindow** pWindow) {
RASSERT(m_RenderData.pMonitor, "Tried to render snapshot rect without begin()!");
const auto PWINDOW = *pWindow; const auto PWINDOW = *pWindow;
auto it = m_mWindowFramebuffers.begin(); auto it = m_mWindowFramebuffers.begin();
@ -511,4 +514,55 @@ void CHyprOpenGLImpl::renderSnapshot(CWindow** pWindow) {
wlr_matrix_project_box(matrix, &windowBox, TRANSFORM, 0, PMONITOR->output->transform_matrix); wlr_matrix_project_box(matrix, &windowBox, TRANSFORM, 0, PMONITOR->output->transform_matrix);
renderTexture(it->second.m_cTex, matrix, PWINDOW->m_fAlpha, 0); renderTexture(it->second.m_cTex, matrix, PWINDOW->m_fAlpha, 0);
}
void CHyprOpenGLImpl::createBGTextureForMonitor(SMonitor* pMonitor) {
RASSERT(m_RenderData.pMonitor, "Tried to createBGTex without begin()!");
// release the last tex if exists
const auto PTEX = &m_mMonitorBGTextures[pMonitor];
PTEX->destroyTexture();
PTEX->allocate();
// check if wallpapers exist
if (!std::filesystem::exists("/usr/share/hyprland/wall_8K.png"))
return; // the texture will be empty, oh well. We'll clear with a solid color anyways.
// get the adequate tex
std::string texPath = "/usr/share/hyprland/wall_";
if (pMonitor->vecSize.x > 7000)
texPath += "8K.png";
else if (pMonitor->vecSize.x > 3000)
texPath += "4K.png";
else
texPath += "2K.png";
// create a new one with cairo
const auto CAIROSURFACE = cairo_image_surface_create_from_png(texPath.c_str());
const auto CAIRO = cairo_create(CAIROSURFACE);
// copy the data to an OpenGL texture we have
const auto DATA = cairo_image_surface_get_data(CAIROSURFACE);
glBindTexture(GL_TEXTURE_2D, PTEX->m_iTexID);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pMonitor->vecSize.x, pMonitor->vecSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
cairo_surface_destroy(CAIROSURFACE);
cairo_destroy(CAIRO);
}
void CHyprOpenGLImpl::clearWithTex() {
RASSERT(m_RenderData.pMonitor, "Tried to render BGtex without begin()!");
const auto TRANSFORM = wlr_output_transform_invert(WL_OUTPUT_TRANSFORM_NORMAL);
float matrix[9];
wlr_box box = {0, 0, m_RenderData.pMonitor->vecSize.x, m_RenderData.pMonitor->vecSize.y};
wlr_matrix_project_box(matrix, &box, TRANSFORM, 0, m_RenderData.pMonitor->output->transform_matrix);
renderTexture(m_mMonitorBGTextures[m_RenderData.pMonitor], matrix, 255, 0);
} }

View file

@ -47,6 +47,7 @@ public:
void renderSnapshot(CWindow**); void renderSnapshot(CWindow**);
void clear(const CColor&); void clear(const CColor&);
void clearWithTex();
void scissor(const wlr_box*); void scissor(const wlr_box*);
SCurrentRenderData m_RenderData; SCurrentRenderData m_RenderData;
@ -56,6 +57,7 @@ public:
std::unordered_map<CWindow*, CFramebuffer> m_mWindowFramebuffers; std::unordered_map<CWindow*, CFramebuffer> m_mWindowFramebuffers;
std::unordered_map<SMonitor*, CFramebuffer> m_mMonitorFramebuffers; std::unordered_map<SMonitor*, CFramebuffer> m_mMonitorFramebuffers;
std::unordered_map<SMonitor*, CTexture> m_mMonitorBGTextures;
private: private:
std::list<GLuint> m_lBuffers; std::list<GLuint> m_lBuffers;
@ -75,6 +77,7 @@ private:
GLuint createProgram(const std::string&, const std::string&); GLuint createProgram(const std::string&, const std::string&);
GLuint compileShader(const GLuint&, std::string); GLuint compileShader(const GLuint&, std::string);
void createBGTextureForMonitor(SMonitor*);
}; };
inline std::unique_ptr<CHyprOpenGLImpl> g_pHyprOpenGL; inline std::unique_ptr<CHyprOpenGLImpl> g_pHyprOpenGL;