From bf3f519eb76bfa8d5f7d71f882b7b803c699aee1 Mon Sep 17 00:00:00 2001 From: Felix Dick Date: Sun, 25 Sep 2022 20:07:48 +0200 Subject: Remove trailing whitespace. --- src/events/Events.hpp | 6 +++--- src/events/Layers.cpp | 4 ++-- src/events/Misc.cpp | 8 ++++---- src/events/Monitors.cpp | 4 ++-- src/events/Popups.cpp | 4 ++-- src/events/Windows.cpp | 22 +++++++++++----------- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/events') diff --git a/src/events/Events.hpp b/src/events/Events.hpp index 8ccf3f13..77de4ed5 100644 --- a/src/events/Events.hpp +++ b/src/events/Events.hpp @@ -67,7 +67,7 @@ namespace Events { LISTENER(mouseButton); LISTENER(mouseAxis); LISTENER(mouseFrame); - + LISTENER(newInput); // Virt Ptr @@ -77,7 +77,7 @@ namespace Events { DYNLISTENFUNC(keyboardKey); DYNLISTENFUNC(keyboardMod); DYNLISTENFUNC(keyboardDestroy); - + DYNLISTENFUNC(commitConstraint); LISTENER(newConstraint); DYNLISTENFUNC(setConstraintRegion); @@ -156,4 +156,4 @@ namespace Events { LISTENER(holdBegin); LISTENER(holdEnd); -}; \ No newline at end of file +}; diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index a98d5d70..975f2d20 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -244,7 +244,7 @@ void Events::listener_commitLayerSurface(void* owner, void* data) { if (layersurface->layerSurface->current.committed != 0) { if (layersurface->layer != layersurface->layerSurface->current.layer) { - + for (auto it = PMONITOR->m_aLayerSurfaceLists[layersurface->layer].begin(); it != PMONITOR->m_aLayerSurfaceLists[layersurface->layer].end(); it++) { if (it->get() == layersurface) { PMONITOR->m_aLayerSurfaceLists[layersurface->layerSurface->current.layer].emplace_back(std::move(*it)); @@ -270,4 +270,4 @@ void Events::listener_commitLayerSurface(void* owner, void* data) { layersurface->geometry = {layersurface->geometry.x, layersurface->geometry.y, layersurface->layerSurface->surface->current.width, layersurface->layerSurface->surface->current.height}; g_pHyprRenderer->damageSurface(layersurface->layerSurface->surface, layersurface->position.x, layersurface->position.y); -} \ No newline at end of file +} diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp index 6b02026f..8e02579e 100644 --- a/src/events/Misc.cpp +++ b/src/events/Misc.cpp @@ -87,7 +87,7 @@ void Events::listener_requestDrag(wl_listener* listener, void* data) { } void Events::listener_startDrag(wl_listener* listener, void* data) { - + if (g_pInputManager->m_sDrag.drag) return; // don't handle multiple drags @@ -167,7 +167,7 @@ void Events::listener_commitDragIcon(void* owner, void* data) { void Events::listener_InhibitActivate(wl_listener* listener, void* data) { Debug::log(LOG, "Activated exclusive for %x.", g_pCompositor->m_sSeat.exclusiveClient); - + g_pInputManager->refocus(); g_pCompositor->m_sSeat.exclusiveClient = g_pCompositor->m_sWLRInhibitMgr->active_client; } @@ -195,7 +195,7 @@ void Events::listener_powerMgrSetMode(wl_listener* listener, void* data) { const auto EVENT = (wlr_output_power_v1_set_mode_event*)data; wlr_output_enable(EVENT->output, EVENT->mode == 1); - + if (!wlr_output_commit(EVENT->output)) Debug::log(ERR, "Couldn't set power mode"); } @@ -210,4 +210,4 @@ void Events::listener_newTextInput(wl_listener* listener, void* data) { Debug::log(LOG, "New TextInput added!"); g_pInputManager->m_sIMERelay.onNewTextInput((wlr_text_input_v3*)data); -} \ No newline at end of file +} diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 6484f4d1..d6c00e4c 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -99,7 +99,7 @@ void Events::listener_monitorFrame(void* owner, void* data) { Debug::log(WARN, "Attempted to render frame on inactive session!"); return; // cannot draw on session inactive (different tty) } - + if (!PMONITOR->m_bEnabled) return; @@ -218,7 +218,7 @@ void Events::listener_monitorFrame(void* owner, void* data) { if (PMONITOR->forceFullFrames > 10) PMONITOR->forceFullFrames = 0; } - + // TODO: this is getting called with extents being 0,0,0,0 should it be? // potentially can save on resources. diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp index d5eb9513..74865f95 100644 --- a/src/events/Popups.cpp +++ b/src/events/Popups.cpp @@ -120,7 +120,7 @@ void Events::listener_newPopupFromPopupXDG(void* owner, void* data) { SXDGPopup* PPOPUP = (SXDGPopup*)owner; ASSERT(PPOPUP); - + if (PPOPUP->parentWindow) Debug::log(LOG, "New popup created from XDG Window popup %x -> %s", PPOPUP, PPOPUP->parentWindow->m_szTitle.c_str()); else @@ -201,4 +201,4 @@ void Events::listener_destroyPopupXDG(void* owner, void* data) { } g_pCompositor->m_vXDGPopups.erase(std::remove_if(g_pCompositor->m_vXDGPopups.begin(), g_pCompositor->m_vXDGPopups.end(), [&](std::unique_ptr& el) { return el.get() == PPOPUP; })); -} \ No newline at end of file +} diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 3fbaddb1..95bc6c75 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -301,7 +301,7 @@ void Events::listener_mapWindow(void* owner, void* data) { if (!PWINDOW->m_bIsX11) { PWINDOW->hyprListener_commitWindow.initCallback(&PWINDOW->m_uSurface.xdg->surface->events.commit, &Events::listener_commitWindow, PWINDOW, "XDG Window Late"); - PWINDOW->hyprListener_setTitleWindow.initCallback(&PWINDOW->m_uSurface.xdg->toplevel->events.set_title, &Events::listener_setTitleWindow, PWINDOW, "XDG Window Late"); + PWINDOW->hyprListener_setTitleWindow.initCallback(&PWINDOW->m_uSurface.xdg->toplevel->events.set_title, &Events::listener_setTitleWindow, PWINDOW, "XDG Window Late"); PWINDOW->hyprListener_newPopupXDG.initCallback(&PWINDOW->m_uSurface.xdg->events.new_popup, &Events::listener_newPopupXDG, PWINDOW, "XDG Window Late"); PWINDOW->hyprListener_requestMaximize.initCallback(&PWINDOW->m_uSurface.xdg->toplevel->events.request_maximize, &Events::listener_requestMaximize, PWINDOW, "XDG Window Late"); PWINDOW->hyprListener_requestMinimize.initCallback(&PWINDOW->m_uSurface.xdg->toplevel->events.request_minimize, &Events::listener_requestMinimize, PWINDOW, "XDG Window Late"); @@ -313,7 +313,7 @@ void Events::listener_mapWindow(void* owner, void* data) { PWINDOW->hyprListener_activateX11.initCallback(&PWINDOW->m_uSurface.xwayland->events.request_activate, &Events::listener_activateX11, PWINDOW, "XWayland Window Late"); PWINDOW->hyprListener_configureX11.initCallback(&PWINDOW->m_uSurface.xwayland->events.request_configure, &Events::listener_configureX11, PWINDOW, "XWayland Window Late"); PWINDOW->hyprListener_setTitleWindow.initCallback(&PWINDOW->m_uSurface.xwayland->events.set_title, &Events::listener_setTitleWindow, PWINDOW, "XWayland Window Late"); - + if (PWINDOW->m_iX11Type == 2) PWINDOW->hyprListener_setGeometryX11U.initCallback(&PWINDOW->m_uSurface.xwayland->events.set_geometry, &Events::listener_unmanagedSetGeometry, PWINDOW, "XWayland Window Late"); } @@ -375,8 +375,8 @@ void Events::listener_mapWindow(void* owner, void* data) { } Debug::log(LOG, "Map request dispatched, monitor %s, xywh: %f %f %f %f", PMONITOR->szName.c_str(), PWINDOW->m_vRealPosition.goalv().x, PWINDOW->m_vRealPosition.goalv().y, PWINDOW->m_vRealSize.goalv().x, PWINDOW->m_vRealSize.goalv().y); - - auto workspaceID = requestedWorkspace != "" ? requestedWorkspace : PWORKSPACE->m_szName; + + auto workspaceID = requestedWorkspace != "" ? requestedWorkspace : PWORKSPACE->m_szName; g_pEventManager->postEvent(SHyprIPCEvent{"openwindow", getFormat("%x,%s,%s,%s", PWINDOW, workspaceID.c_str(), g_pXWaylandManager->getAppIDClass(PWINDOW).c_str(), PWINDOW->m_szTitle.c_str())}); } @@ -384,7 +384,7 @@ void Events::listener_unmapWindow(void* owner, void* data) { CWindow* PWINDOW = (CWindow*)owner; Debug::log(LOG, "Window %x unmapped (class %s)", PWINDOW, g_pXWaylandManager->getAppIDClass(PWINDOW).c_str()); - + g_pEventManager->postEvent(SHyprIPCEvent{"closewindow", getFormat("%x", PWINDOW)}); if (!PWINDOW->m_bIsX11) { @@ -458,7 +458,7 @@ void Events::listener_unmapWindow(void* owner, void* data) { Debug::log(LOG, "Destroying the SubSurface tree of unmapped window %x", PWINDOW); SubsurfaceTree::destroySurfaceTree(PWINDOW->m_pSurfaceTree); - + PWINDOW->m_pSurfaceTree = nullptr; PWINDOW->m_bFadingOut = true; @@ -475,7 +475,7 @@ void Events::listener_unmapWindow(void* owner, void* data) { if (!PWINDOW->m_bX11DoesntWantBorders) // don't animate out if they weren't animated in. PWINDOW->m_vRealPosition = PWINDOW->m_vRealPosition.vec() + Vector2D(0.01f, 0.01f); // it has to be animated, otherwise onWindowPostCreateClose will ignore it - + // anims g_pAnimationManager->onWindowPostCreateClose(PWINDOW, true); PWINDOW->m_fAlpha = 0.f; @@ -493,7 +493,7 @@ void Events::listener_commitWindow(void* owner, void* data) { if (!PWINDOW->m_bMappedX11 || PWINDOW->m_bHidden || (PWINDOW->m_bIsX11 && !PWINDOW->m_bMappedX11)) return; - g_pHyprRenderer->damageSurface(g_pXWaylandManager->getWindowSurface(PWINDOW), PWINDOW->m_vRealPosition.goalv().x, PWINDOW->m_vRealPosition.goalv().y); + g_pHyprRenderer->damageSurface(g_pXWaylandManager->getWindowSurface(PWINDOW), PWINDOW->m_vRealPosition.goalv().x, PWINDOW->m_vRealPosition.goalv().y); // Debug::log(LOG, "Window %x committed", PWINDOW); // SPAM! } @@ -567,7 +567,7 @@ void Events::listener_fullscreenWindow(void* owner, void* data) { PWINDOW->updateToplevel(); Debug::log(LOG, "Window %x fullscreen to %i", PWINDOW, PWINDOW->m_bIsFullscreen); - + g_pXWaylandManager->setWindowFullscreen(PWINDOW, PWINDOW->m_bIsFullscreen); } @@ -645,7 +645,7 @@ void Events::listener_unmanagedSetGeometry(void* owner, void* data) { if (abs(std::floor(POS.x) - PWINDOW->m_uSurface.xwayland->x) > 2 || abs(std::floor(POS.y) - PWINDOW->m_uSurface.xwayland->y) > 2 || abs(std::floor(SIZ.x) - PWINDOW->m_uSurface.xwayland->width) > 2 || abs(std::floor(SIZ.y) - PWINDOW->m_uSurface.xwayland->height) > 2) { Debug::log(LOG, "Unmanaged window %x requests geometry update to %i %i %i %i", PWINDOW, (int)PWINDOW->m_uSurface.xwayland->x, (int)PWINDOW->m_uSurface.xwayland->y, (int)PWINDOW->m_uSurface.xwayland->width, (int)PWINDOW->m_uSurface.xwayland->height); - + g_pHyprRenderer->damageWindow(PWINDOW); PWINDOW->m_vRealPosition.setValueAndWarp(Vector2D(PWINDOW->m_uSurface.xwayland->x, PWINDOW->m_uSurface.xwayland->y)); @@ -725,4 +725,4 @@ void Events::listener_requestResize(void* owner, void* data) { // ignore wlr_xdg_surface_schedule_configure(PWINDOW->m_uSurface.xdg); -} \ No newline at end of file +} -- cgit v1.2.3