mirror of https://github.com/hyprwm/Hyprland
Compare commits
5 Commits
2f03595e5e
...
0dedbe5fdc
Author | SHA1 | Date |
---|---|---|
|
0dedbe5fdc | |
|
9c5dd59d4b | |
|
d16c6aa1db | |
|
ac11771348 | |
|
846fcd3683 |
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
self,
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
|
@ -68,7 +69,16 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
|
||||||
baseName = baseNameOf (toString name);
|
baseName = baseNameOf (toString name);
|
||||||
in
|
in
|
||||||
! (lib.hasSuffix ".nix" baseName);
|
! (lib.hasSuffix ".nix" baseName);
|
||||||
src = lib.cleanSource ../.;
|
src = lib.cleanSource (
|
||||||
|
if self ? rev
|
||||||
|
then builtins.fetchGit {
|
||||||
|
url = "https://github.com/hyprwm/Hyprland";
|
||||||
|
inherit (self) rev;
|
||||||
|
submodules = true;
|
||||||
|
allRefs = true;
|
||||||
|
}
|
||||||
|
else ../.
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -36,6 +36,7 @@ in {
|
||||||
version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
|
version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
|
||||||
commit = self.rev or "";
|
commit = self.rev or "";
|
||||||
inherit date;
|
inherit date;
|
||||||
|
inherit (inputs) self;
|
||||||
};
|
};
|
||||||
hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
|
hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
|
||||||
hyprland-debug = final.hyprland.override {debug = true;};
|
hyprland-debug = final.hyprland.override {debug = true;};
|
||||||
|
|
|
@ -7,7 +7,9 @@ CWatchdog::~CWatchdog() {
|
||||||
m_bExitThread = true;
|
m_bExitThread = true;
|
||||||
m_bNotified = true;
|
m_bNotified = true;
|
||||||
m_cvWatchdogCondition.notify_all();
|
m_cvWatchdogCondition.notify_all();
|
||||||
m_pWatchdog.reset();
|
|
||||||
|
if (m_pWatchdog && m_pWatchdog->joinable())
|
||||||
|
m_pWatchdog->join();
|
||||||
}
|
}
|
||||||
|
|
||||||
CWatchdog::CWatchdog() {
|
CWatchdog::CWatchdog() {
|
||||||
|
@ -33,8 +35,6 @@ CWatchdog::CWatchdog() {
|
||||||
m_bNotified = false;
|
m_bNotified = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
m_pWatchdog->detach();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CWatchdog::startWatching() {
|
void CWatchdog::startWatching() {
|
||||||
|
|
|
@ -1473,14 +1473,7 @@ void CInputManager::updateCapabilities() {
|
||||||
if (h.expired())
|
if (h.expired())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto cap = h->getCapabilities();
|
caps |= h->getCapabilities();
|
||||||
|
|
||||||
if (cap & HID_INPUT_CAPABILITY_KEYBOARD)
|
|
||||||
caps |= WL_SEAT_CAPABILITY_KEYBOARD;
|
|
||||||
if (cap & HID_INPUT_CAPABILITY_POINTER)
|
|
||||||
caps |= WL_SEAT_CAPABILITY_POINTER;
|
|
||||||
if (cap & HID_INPUT_CAPABILITY_TOUCH)
|
|
||||||
caps |= WL_SEAT_CAPABILITY_TOUCH;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
g_pSeatManager->updateCapabilities(caps);
|
g_pSeatManager->updateCapabilities(caps);
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
|
|
||||||
#define LOGM PROTO::constraints->protoLog
|
#define LOGM PROTO::constraints->protoLog
|
||||||
|
|
||||||
CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime) :
|
CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
|
||||||
resourceL(resource_), locked(true) {
|
resourceL(resource_), locked(true), lifetime(lifetime_) {
|
||||||
if (!resource_->resource())
|
if (!resource_->resource())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -46,8 +46,8 @@ CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWL
|
||||||
sharedConstructions();
|
sharedConstructions();
|
||||||
}
|
}
|
||||||
|
|
||||||
CPointerConstraint::CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime) :
|
CPointerConstraint::CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
|
||||||
resourceC(resource_), locked(false) {
|
resourceC(resource_), locked(false), lifetime(lifetime_) {
|
||||||
if (!resource_->resource())
|
if (!resource_->resource())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ class CWLSurfaceResource;
|
||||||
|
|
||||||
class CPointerConstraint {
|
class CPointerConstraint {
|
||||||
public:
|
public:
|
||||||
CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime);
|
CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime_);
|
||||||
CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime);
|
CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime_);
|
||||||
~CPointerConstraint();
|
~CPointerConstraint();
|
||||||
|
|
||||||
bool good();
|
bool good();
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
|
||||||
CRenderbuffer::~CRenderbuffer() {
|
CRenderbuffer::~CRenderbuffer() {
|
||||||
if (!g_pCompositor)
|
if (!g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_pHyprRenderer->makeEGLCurrent();
|
g_pHyprRenderer->makeEGLCurrent();
|
||||||
|
|
|
@ -9,7 +9,7 @@ CTexture::CTexture() {
|
||||||
}
|
}
|
||||||
|
|
||||||
CTexture::~CTexture() {
|
CTexture::~CTexture() {
|
||||||
if (m_bNonOwning)
|
if (m_bNonOwning || !g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_pHyprRenderer->makeEGLCurrent();
|
g_pHyprRenderer->makeEGLCurrent();
|
||||||
|
|
Loading…
Reference in New Issue