hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 20:29:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

data-device: minor fixups

Browse source 
ref #6543

firefox needs a re-enter after a dnd

don't destroy dnd on an offer destroy, it's not valid
This commit is contained in:
Vaxry 2024-06-16 20:36:55 +02:00
parent 738530e62e
commit 172ee1cada
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/protocols/core/DataDevice.cpp
View file

@ -12,20 +12,8 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS
if (!good()) if (!good())
return; return;
resource->setDestroy([this](CWlDataOffer* r) { resource->setDestroy([this](CWlDataOffer* r) { PROTO::data->destroyResource(this); });
if (!dead && (recvd || accepted)) resource->setOnDestroy([this](CWlDataOffer* r) { PROTO::data->destroyResource(this); });
PROTO::data->completeDrag();
else
PROTO::data->abortDrag();
PROTO::data->destroyResource(this);
});
resource->setOnDestroy([this](CWlDataOffer* r) {
if (!dead && (recvd || accepted))
PROTO::data->completeDrag();
else
PROTO::data->abortDrag();
PROTO::data->destroyResource(this);
});
resource->setAccept([this](CWlDataOffer* r, uint32_t serial, const char* mime) { resource->setAccept([this](CWlDataOffer* r, uint32_t serial, const char* mime) {
if (!source) { if (!source) {
@ -210,7 +198,7 @@ CWLDataDeviceResource::CWLDataDeviceResource(SP<CWlDataDevice> resource_) : reso
pClient = resource->client(); pClient = resource->client();
resource->setSetSelection([this](CWlDataDevice* r, wl_resource* sourceR, uint32_t serial) { resource->setSetSelection([](CWlDataDevice* r, wl_resource* sourceR, uint32_t serial) {
auto source = sourceR ? CWLDataSourceResource::fromResource(sourceR) : CSharedPointer<CWLDataSourceResource>{}; auto source = sourceR ? CWLDataSourceResource::fromResource(sourceR) : CSharedPointer<CWLDataSourceResource>{};
if (!source) { if (!source) {
LOGM(LOG, "Reset selection received"); LOGM(LOG, "Reset selection received");
@ -226,7 +214,7 @@ CWLDataDeviceResource::CWLDataDeviceResource(SP<CWlDataDevice> resource_) : reso
g_pSeatManager->setCurrentSelection(source); g_pSeatManager->setCurrentSelection(source);
}); });
resource->setStartDrag([this](CWlDataDevice* r, wl_resource* sourceR, wl_resource* origin, wl_resource* icon, uint32_t serial) { resource->setStartDrag([](CWlDataDevice* r, wl_resource* sourceR, wl_resource* origin, wl_resource* icon, uint32_t serial) {
auto source = CWLDataSourceResource::fromResource(sourceR); auto source = CWLDataSourceResource::fromResource(sourceR);
if (!source) { if (!source) {
LOGM(ERR, "No source in drag"); LOGM(ERR, "No source in drag");
@ -615,6 +603,7 @@ void CWLDataDeviceProtocol::dropDrag() {
dnd.overriddenCursor = false; dnd.overriddenCursor = false;
g_pInputManager->simulateMouseMovement(); g_pInputManager->simulateMouseMovement();
g_pSeatManager->resendEnterEvents();
} }
bool CWLDataDeviceProtocol::wasDragSuccessful() { bool CWLDataDeviceProtocol::wasDragSuccessful() {
@ -645,6 +634,7 @@ void CWLDataDeviceProtocol::completeDrag() {
dnd.currentSource.reset(); dnd.currentSource.reset();
g_pInputManager->simulateMouseMovement(); g_pInputManager->simulateMouseMovement();
g_pSeatManager->resendEnterEvents();
} }
void CWLDataDeviceProtocol::abortDrag() { void CWLDataDeviceProtocol::abortDrag() {
@ -664,6 +654,7 @@ void CWLDataDeviceProtocol::abortDrag() {
dnd.currentSource.reset(); dnd.currentSource.reset();
g_pInputManager->simulateMouseMovement(); g_pInputManager->simulateMouseMovement();
g_pSeatManager->resendEnterEvents();
} }
void CWLDataDeviceProtocol::renderDND(CMonitor* pMonitor, timespec* when) { void CWLDataDeviceProtocol::renderDND(CMonitor* pMonitor, timespec* when) {