hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-02 13:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

update wlroots dep

Browse source
This commit is contained in:
vaxerski 2023-02-03 12:43:43 +00:00
parent 129e99a6f6
commit a46abd8b1a
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/events/Windows.cpp
View file

@ -816,7 +816,7 @@ void Events::listener_activateXDG(wl_listener* listener, void* data) {
Debug::log(LOG, "Activate request for surface at %x", E->surface); Debug::log(LOG, "Activate request for surface at %x", E->surface);
if (!wlr_surface_is_xdg_surface(E->surface)) if (!wlr_xdg_surface_try_from_wlr_surface(E->surface))
return; return;
const auto PWINDOW = g_pCompositor->getWindowFromSurface(E->surface); const auto PWINDOW = g_pCompositor->getWindowFromSurface(E->surface);

10
src/managers/XWaylandManager.cpp
View file

@ -35,16 +35,16 @@ void CHyprXWaylandManager::activateSurface(wlr_surface* pSurface, bool activate)
if (!pSurface) if (!pSurface)
return; return;
if (wlr_surface_is_xdg_surface(pSurface)) { if (wlr_xdg_surface_try_from_wlr_surface(pSurface)) {
const auto PSURF = wlr_xdg_surface_from_wlr_surface(pSurface); const auto PSURF = wlr_xdg_surface_try_from_wlr_surface(pSurface);
if (PSURF && PSURF->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) { if (PSURF && PSURF->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_set_activated(PSURF->toplevel, activate); wlr_xdg_toplevel_set_activated(PSURF->toplevel, activate);
} }
} else if (wlr_surface_is_xwayland_surface(pSurface)) { } else if (wlr_xwayland_surface_try_from_wlr_surface(pSurface)) {
wlr_xwayland_surface_activate(wlr_xwayland_surface_from_wlr_surface(pSurface), activate); wlr_xwayland_surface_activate(wlr_xwayland_surface_try_from_wlr_surface(pSurface), activate);
if (activate) if (activate)
wlr_xwayland_surface_restack(wlr_xwayland_surface_from_wlr_surface(pSurface), nullptr, XCB_STACK_MODE_ABOVE); wlr_xwayland_surface_restack(wlr_xwayland_surface_try_from_wlr_surface(pSurface), nullptr, XCB_STACK_MODE_ABOVE);
} }
} }

8
src/managers/input/InputMethodRelay.cpp
View file

@ -144,8 +144,8 @@ void CInputMethodRelay::updateInputPopup(SIMEPopup* pPopup) {
Vector2D parentPos; Vector2D parentPos;
Vector2D parentSize; Vector2D parentSize;
if (wlr_surface_is_layer_surface(PFOCUSEDSURFACE)) { if (wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE)) {
const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_from_wlr_surface(PFOCUSEDSURFACE)); const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE));
if (PLS) { if (PLS) {
parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition; parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition;
@ -243,8 +243,8 @@ void CInputMethodRelay::damagePopup(SIMEPopup* pPopup) {
const auto PFOCUSEDSURFACE = PFOCUSEDTI->pWlrInput->focused_surface; const auto PFOCUSEDSURFACE = PFOCUSEDTI->pWlrInput->focused_surface;
if (wlr_surface_is_layer_surface(PFOCUSEDSURFACE)) { if (wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE)) {
const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_from_wlr_surface(PFOCUSEDSURFACE)); const auto PLS = g_pCompositor->getLayerSurfaceFromWlr(wlr_layer_surface_v1_try_from_wlr_surface(PFOCUSEDSURFACE));
if (PLS) { if (PLS) {
parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition; parentPos = Vector2D(PLS->geometry.x, PLS->geometry.y) + g_pCompositor->getMonitorFromID(PLS->monitorID)->vecPosition;

2
src/render/Renderer.cpp
View file

@ -37,7 +37,7 @@ void renderSurface(struct wlr_surface* surface, int x, int y, void* data) {
rounding -= 1; // to fix a border issue rounding -= 1; // to fix a border issue
if (RDATA->surface && surface == RDATA->surface) { if (RDATA->surface && surface == RDATA->surface) {
if (wlr_surface_is_xwayland_surface(surface) && !wlr_xwayland_surface_from_wlr_surface(surface)->has_alpha && RDATA->fadeAlpha * RDATA->alpha == 1.f) { if (wlr_xwayland_surface_try_from_wlr_surface(surface) && !wlr_xwayland_surface_try_from_wlr_surface(surface)->has_alpha && RDATA->fadeAlpha * RDATA->alpha == 1.f) {
g_pHyprOpenGL->renderTexture(TEXTURE, &windowBox, RDATA->fadeAlpha * RDATA->alpha, rounding, true); g_pHyprOpenGL->renderTexture(TEXTURE, &windowBox, RDATA->fadeAlpha * RDATA->alpha, rounding, true);
} else { } else {
if (RDATA->blur) if (RDATA->blur)

2
subprojects/wlroots

@ -1 +1 @@
Subproject commit 5f264a7d6c8af27d41ff440c05262b022c055593 Subproject commit 677a3f2f8847ed2de49dd60868f9d9487a546f58