cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

text-input-v3: atomically enable/disable on commit

Browse source
This commit is contained in:
Vaxry 2024-05-09 14:27:48 +01:00
parent c98acaed62
commit d7aed240db
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/protocols/TextInputV3.cpp
View file

@ -8,7 +8,6 @@ void CTextInputV3::SState::reset() {
surrounding.updated = false; surrounding.updated = false;
contentType.updated = false; contentType.updated = false;
box.updated = false; box.updated = false;
enabled = false;
} }
CTextInputV3::CTextInputV3(SP<CZwpTextInputV3> resource_) : resource(resource_) { CTextInputV3::CTextInputV3(SP<CZwpTextInputV3> resource_) : resource(resource_) {
@ -21,9 +20,18 @@ CTextInputV3::CTextInputV3(SP<CZwpTextInputV3> resource_) : resource(resource_)
resource->setOnDestroy([this](CZwpTextInputV3* r) { PROTO::textInputV3->destroyTextInput(this); }); resource->setOnDestroy([this](CZwpTextInputV3* r) { PROTO::textInputV3->destroyTextInput(this); });
resource->setCommit([this](CZwpTextInputV3* r) { resource->setCommit([this](CZwpTextInputV3* r) {
bool wasEnabled = current.enabled;
current = pending; current = pending;
events.onCommit.emit();
serial++; serial++;
if (wasEnabled && !current.enabled) {
current.reset();
events.disable.emit();
} else if (!wasEnabled && current.enabled)
events.enable.emit();
else
events.onCommit.emit();
}); });
resource->setSetSurroundingText([this](CZwpTextInputV3* r, const char* text, int32_t cursor, int32_t anchor) { resource->setSetSurroundingText([this](CZwpTextInputV3* r, const char* text, int32_t cursor, int32_t anchor) {
@ -46,13 +54,9 @@ CTextInputV3::CTextInputV3(SP<CZwpTextInputV3> resource_) : resource(resource_)
pending.box.cursorBox = {x, y, w, h}; pending.box.cursorBox = {x, y, w, h};
}); });
resource->setEnable([this](CZwpTextInputV3* r) { resource->setEnable([this](CZwpTextInputV3* r) { pending.enabled = true; });
events.enable.emit();
pending.enabled = true;
});
resource->setDisable([this](CZwpTextInputV3* r) { resource->setDisable([this](CZwpTextInputV3* r) {
events.disable.emit();
pending.enabled = false; pending.enabled = false;
pending.reset(); pending.reset();
}); });