mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-08 10:05:59 +01:00
Fix some typos (#1907)
Signed-off-by: Alexander Seiler <seileralex@gmail.com>
This commit is contained in:
parent
d6241a3086
commit
60527ab180
10 changed files with 23 additions and 23 deletions
|
@ -413,7 +413,7 @@ void CWindow::applyDynamicRule(const SWindowRule& r) {
|
||||||
} else if (r.szRule == "forcergbx") {
|
} else if (r.szRule == "forcergbx") {
|
||||||
m_sAdditionalConfigData.forceRGBX = true;
|
m_sAdditionalConfigData.forceRGBX = true;
|
||||||
} else if (r.szRule == "opaque") {
|
} else if (r.szRule == "opaque") {
|
||||||
if (!m_sAdditionalConfigData.forceOpaqueOverriden)
|
if (!m_sAdditionalConfigData.forceOpaqueOverridden)
|
||||||
m_sAdditionalConfigData.forceOpaque = true;
|
m_sAdditionalConfigData.forceOpaque = true;
|
||||||
} else if (r.szRule.find("rounding") == 0) {
|
} else if (r.szRule.find("rounding") == 0) {
|
||||||
try {
|
try {
|
||||||
|
@ -470,7 +470,7 @@ void CWindow::updateDynamicRules() {
|
||||||
m_sAdditionalConfigData.forceNoBlur = false;
|
m_sAdditionalConfigData.forceNoBlur = false;
|
||||||
m_sAdditionalConfigData.forceNoBorder = false;
|
m_sAdditionalConfigData.forceNoBorder = false;
|
||||||
m_sAdditionalConfigData.forceNoShadow = false;
|
m_sAdditionalConfigData.forceNoShadow = false;
|
||||||
if (!m_sAdditionalConfigData.forceOpaqueOverriden)
|
if (!m_sAdditionalConfigData.forceOpaqueOverridden)
|
||||||
m_sAdditionalConfigData.forceOpaque = false;
|
m_sAdditionalConfigData.forceOpaque = false;
|
||||||
m_sAdditionalConfigData.forceNoAnims = false;
|
m_sAdditionalConfigData.forceNoAnims = false;
|
||||||
m_sAdditionalConfigData.animationStyle = std::string("");
|
m_sAdditionalConfigData.animationStyle = std::string("");
|
||||||
|
|
|
@ -111,7 +111,7 @@ struct SWindowAdditionalConfigData {
|
||||||
CWindowOverridableVar<int> rounding = -1; // -1 means no
|
CWindowOverridableVar<int> rounding = -1; // -1 means no
|
||||||
CWindowOverridableVar<bool> forceNoBlur = false;
|
CWindowOverridableVar<bool> forceNoBlur = false;
|
||||||
CWindowOverridableVar<bool> forceOpaque = false;
|
CWindowOverridableVar<bool> forceOpaque = false;
|
||||||
CWindowOverridableVar<bool> forceOpaqueOverriden = false; // if true, a rule will not change the forceOpaque state. This is for the force opaque dispatcher.
|
CWindowOverridableVar<bool> forceOpaqueOverridden = false; // if true, a rule will not change the forceOpaque state. This is for the force opaque dispatcher.
|
||||||
CWindowOverridableVar<bool> forceAllowsInput = false;
|
CWindowOverridableVar<bool> forceAllowsInput = false;
|
||||||
CWindowOverridableVar<bool> forceNoAnims = false;
|
CWindowOverridableVar<bool> forceNoAnims = false;
|
||||||
CWindowOverridableVar<bool> forceNoBorder = false;
|
CWindowOverridableVar<bool> forceNoBorder = false;
|
||||||
|
|
|
@ -611,8 +611,8 @@ void CConfigManager::handleBezier(const std::string& command, const std::string&
|
||||||
|
|
||||||
void CConfigManager::setAnimForChildren(SAnimationPropertyConfig* const ANIM) {
|
void CConfigManager::setAnimForChildren(SAnimationPropertyConfig* const ANIM) {
|
||||||
for (auto& [name, anim] : animationConfig) {
|
for (auto& [name, anim] : animationConfig) {
|
||||||
if (anim.pParentAnimation == ANIM && !anim.overriden) {
|
if (anim.pParentAnimation == ANIM && !anim.overridden) {
|
||||||
// if a child isnt overriden, set the values of the parent
|
// if a child isnt overridden, set the values of the parent
|
||||||
anim.pValues = ANIM->pValues;
|
anim.pValues = ANIM->pValues;
|
||||||
|
|
||||||
setAnimForChildren(&anim);
|
setAnimForChildren(&anim);
|
||||||
|
@ -635,7 +635,7 @@ void CConfigManager::handleAnimation(const std::string& command, const std::stri
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PANIM->second.overriden = true;
|
PANIM->second.overridden = true;
|
||||||
PANIM->second.pValues = &PANIM->second;
|
PANIM->second.pValues = &PANIM->second;
|
||||||
|
|
||||||
// on/off
|
// on/off
|
||||||
|
|
|
@ -53,7 +53,7 @@ struct SMonitorAdditionalReservedArea {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct SAnimationPropertyConfig {
|
struct SAnimationPropertyConfig {
|
||||||
bool overriden = true;
|
bool overridden = true;
|
||||||
|
|
||||||
std::string internalBezier = "";
|
std::string internalBezier = "";
|
||||||
std::string internalStyle = "";
|
std::string internalStyle = "";
|
||||||
|
|
|
@ -486,7 +486,7 @@ std::string animationsRequest(HyprCtl::eHyprCtlOutputFormat format) {
|
||||||
ret += "animations:\n";
|
ret += "animations:\n";
|
||||||
|
|
||||||
for (auto& ac : g_pConfigManager->getAnimationConfig()) {
|
for (auto& ac : g_pConfigManager->getAnimationConfig()) {
|
||||||
ret += getFormat("\n\tname: %s\n\t\toverriden: %i\n\t\tbezier: %s\n\t\tenabled: %i\n\t\tspeed: %.2f\n\t\tstyle: %s\n", ac.first.c_str(), (int)ac.second.overriden,
|
ret += getFormat("\n\tname: %s\n\t\toverriden: %i\n\t\tbezier: %s\n\t\tenabled: %i\n\t\tspeed: %.2f\n\t\tstyle: %s\n", ac.first.c_str(), (int)ac.second.overridden,
|
||||||
ac.second.internalBezier.c_str(), ac.second.internalEnabled, ac.second.internalSpeed, ac.second.internalStyle.c_str());
|
ac.second.internalBezier.c_str(), ac.second.internalEnabled, ac.second.internalSpeed, ac.second.internalStyle.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -503,13 +503,13 @@ std::string animationsRequest(HyprCtl::eHyprCtlOutputFormat format) {
|
||||||
ret += getFormat(R"#(
|
ret += getFormat(R"#(
|
||||||
{
|
{
|
||||||
"name": "%s",
|
"name": "%s",
|
||||||
"overriden": %s,
|
"overridden": %s,
|
||||||
"bezier": "%s",
|
"bezier": "%s",
|
||||||
"enabled": %s,
|
"enabled": %s,
|
||||||
"speed": %.2f,
|
"speed": %.2f,
|
||||||
"style": "%s"
|
"style": "%s"
|
||||||
},)#",
|
},)#",
|
||||||
ac.first.c_str(), ac.second.overriden ? "true" : "false", ac.second.internalBezier.c_str(), ac.second.internalEnabled ? "true" : "false",
|
ac.first.c_str(), ac.second.overridden ? "true" : "false", ac.second.internalBezier.c_str(), ac.second.internalEnabled ? "true" : "false",
|
||||||
ac.second.internalSpeed, ac.second.internalStyle.c_str());
|
ac.second.internalSpeed, ac.second.internalStyle.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -933,7 +933,7 @@ std::string dispatchSetProp(std::string request) {
|
||||||
} else if (PROP == "forceopaque") {
|
} else if (PROP == "forceopaque") {
|
||||||
PWINDOW->m_sAdditionalConfigData.forceOpaque.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
PWINDOW->m_sAdditionalConfigData.forceOpaque.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
||||||
} else if (PROP == "forceopaqueoverriden") {
|
} else if (PROP == "forceopaqueoverriden") {
|
||||||
PWINDOW->m_sAdditionalConfigData.forceOpaqueOverriden.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
PWINDOW->m_sAdditionalConfigData.forceOpaqueOverridden.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
||||||
} else if (PROP == "forceallowsinput") {
|
} else if (PROP == "forceallowsinput") {
|
||||||
PWINDOW->m_sAdditionalConfigData.forceAllowsInput.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
PWINDOW->m_sAdditionalConfigData.forceAllowsInput.forceSetIgnoreLocked(configStringToInt(VAL), lock);
|
||||||
} else if (PROP == "forcenoanims") {
|
} else if (PROP == "forcenoanims") {
|
||||||
|
|
|
@ -44,7 +44,7 @@ void Events::listener_change(wl_listener* listener, void* data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Events::listener_newOutput(wl_listener* listener, void* data) {
|
void Events::listener_newOutput(wl_listener* listener, void* data) {
|
||||||
// new monitor added, let's accomodate for that.
|
// new monitor added, let's accommodate for that.
|
||||||
const auto OUTPUT = (wlr_output*)data;
|
const auto OUTPUT = (wlr_output*)data;
|
||||||
|
|
||||||
// for warping the cursor on launch
|
// for warping the cursor on launch
|
||||||
|
|
|
@ -67,7 +67,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
|
||||||
// Foreign Toplevel
|
// Foreign Toplevel
|
||||||
PWINDOW->createToplevelHandle();
|
PWINDOW->createToplevelHandle();
|
||||||
|
|
||||||
// checks if the window wants borders and sets the appriopriate flag
|
// checks if the window wants borders and sets the appropriate flag
|
||||||
g_pXWaylandManager->checkBorders(PWINDOW);
|
g_pXWaylandManager->checkBorders(PWINDOW);
|
||||||
|
|
||||||
// registers the animated vars and stuff
|
// registers the animated vars and stuff
|
||||||
|
@ -808,7 +808,7 @@ void Events::listener_fullscreenWindow(void* owner, void* data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable the maximize flag when we recieve a de-fullscreen request
|
// Disable the maximize flag when we receive a de-fullscreen request
|
||||||
PWINDOW->m_bWasMaximized &= REQUESTED->fullscreen;
|
PWINDOW->m_bWasMaximized &= REQUESTED->fullscreen;
|
||||||
|
|
||||||
requestedFullState = REQUESTED->fullscreen;
|
requestedFullState = REQUESTED->fullscreen;
|
||||||
|
|
|
@ -385,7 +385,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
|
||||||
|
|
||||||
// Should never happen, as we check in the ConfigManager, but oh well
|
// Should never happen, as we check in the ConfigManager, but oh well
|
||||||
if (DISPATCHER == m_mDispatchers.end()) {
|
if (DISPATCHER == m_mDispatchers.end()) {
|
||||||
Debug::log(ERR, "Inavlid handler in a keybind! (handler %s does not exist)", k.handler.c_str());
|
Debug::log(ERR, "Invalid handler in a keybind! (handler %s does not exist)", k.handler.c_str());
|
||||||
} else {
|
} else {
|
||||||
// call the dispatcher
|
// call the dispatcher
|
||||||
Debug::log(LOG, "Keybind triggered, calling dispatcher (%d, %s, %d)", modmask, key.c_str(), keysym);
|
Debug::log(LOG, "Keybind triggered, calling dispatcher (%d, %s, %d)", modmask, key.c_str(), keysym);
|
||||||
|
@ -1924,7 +1924,7 @@ void CKeybindManager::toggleOpaque(std::string unused) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
PWINDOW->m_sAdditionalConfigData.forceOpaque = !PWINDOW->m_sAdditionalConfigData.forceOpaque;
|
PWINDOW->m_sAdditionalConfigData.forceOpaque = !PWINDOW->m_sAdditionalConfigData.forceOpaque;
|
||||||
PWINDOW->m_sAdditionalConfigData.forceOpaqueOverriden = true;
|
PWINDOW->m_sAdditionalConfigData.forceOpaqueOverridden = true;
|
||||||
|
|
||||||
g_pHyprRenderer->damageWindow(PWINDOW);
|
g_pHyprRenderer->damageWindow(PWINDOW);
|
||||||
}
|
}
|
||||||
|
|
|
@ -309,8 +309,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
|
||||||
setCursorIconOnBorder(pFoundWindow);
|
setCursorIconOnBorder(pFoundWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we're on an input deco, reset cursor. Don't on overriden
|
// if we're on an input deco, reset cursor. Don't on overridden
|
||||||
// if (!m_bCursorImageOverriden) {
|
// if (!m_bCursorImageOverridden) {
|
||||||
// if (!VECINRECT(m_vLastCursorPosFloored, pFoundWindow->m_vRealPosition.vec().x, pFoundWindow->m_vRealPosition.vec().y,
|
// if (!VECINRECT(m_vLastCursorPosFloored, pFoundWindow->m_vRealPosition.vec().x, pFoundWindow->m_vRealPosition.vec().y,
|
||||||
// pFoundWindow->m_vRealPosition.vec().x + pFoundWindow->m_vRealSize.vec().x, pFoundWindow->m_vRealPosition.vec().y + pFoundWindow->m_vRealSize.vec().y)) {
|
// pFoundWindow->m_vRealPosition.vec().x + pFoundWindow->m_vRealSize.vec().x, pFoundWindow->m_vRealPosition.vec().y + pFoundWindow->m_vRealSize.vec().y)) {
|
||||||
// wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
|
// wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
|
||||||
|
@ -405,7 +405,7 @@ void CInputManager::processMouseRequest(wlr_seat_pointer_request_set_cursor_even
|
||||||
g_pHyprRenderer->m_bWindowRequestedCursorHide = false;
|
g_pHyprRenderer->m_bWindowRequestedCursorHide = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_bCursorImageOverriden) {
|
if (m_bCursorImageOverridden) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1339,14 +1339,14 @@ void CInputManager::destroySwitch(SSwitchDevice* pDevice) {
|
||||||
|
|
||||||
void CInputManager::setCursorImageUntilUnset(std::string name) {
|
void CInputManager::setCursorImageUntilUnset(std::string name) {
|
||||||
wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, name.c_str(), g_pCompositor->m_sWLRCursor);
|
wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, name.c_str(), g_pCompositor->m_sWLRCursor);
|
||||||
m_bCursorImageOverriden = true;
|
m_bCursorImageOverridden = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CInputManager::unsetCursorImage() {
|
void CInputManager::unsetCursorImage() {
|
||||||
if (!m_bCursorImageOverriden)
|
if (!m_bCursorImageOverridden)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_bCursorImageOverriden = false;
|
m_bCursorImageOverridden = false;
|
||||||
if (!g_pHyprRenderer->m_bWindowRequestedCursorHide)
|
if (!g_pHyprRenderer->m_bWindowRequestedCursorHide)
|
||||||
wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
|
wlr_xcursor_manager_set_cursor_image(g_pCompositor->m_sWLRXCursorMgr, "left_ptr", g_pCompositor->m_sWLRCursor);
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,7 @@ class CInputManager {
|
||||||
bool m_bLastInputTouch = false;
|
bool m_bLastInputTouch = false;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_bCursorImageOverriden = false;
|
bool m_bCursorImageOverridden = false;
|
||||||
eBorderIconDirection m_eBorderIconDirection = BORDERICON_NONE;
|
eBorderIconDirection m_eBorderIconDirection = BORDERICON_NONE;
|
||||||
|
|
||||||
// for click behavior override
|
// for click behavior override
|
||||||
|
|
Loading…
Reference in a new issue