mirror of
https://git.outfoxxed.me/quickshell/quickshell.git
synced 2026-04-12 06:21:54 +10:00
Compare commits
No commits in common. "d6122277409783377059be6399004eb090a6008e" and "ee1100eb98d5033d8d4b76bf9fb0e720fec4c191" have entirely different histories.
d612227740
...
ee1100eb98
3 changed files with 1 additions and 39 deletions
|
|
@ -87,9 +87,8 @@ include(cmake/util.cmake)
|
||||||
|
|
||||||
add_compile_options(-Wall -Wextra -Wno-vla-cxx-extension)
|
add_compile_options(-Wall -Wextra -Wno-vla-cxx-extension)
|
||||||
|
|
||||||
# pipewire defines these, breaking PCH
|
# pipewire defines this, breaking PCH
|
||||||
add_compile_definitions(_REENTRANT)
|
add_compile_definitions(_REENTRANT)
|
||||||
add_compile_options(-fno-strict-overflow)
|
|
||||||
|
|
||||||
if (FRAME_POINTERS)
|
if (FRAME_POINTERS)
|
||||||
add_compile_options(-fno-omit-frame-pointer)
|
add_compile_options(-fno-omit-frame-pointer)
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
#include "../io/processcore.hpp"
|
#include "../io/processcore.hpp"
|
||||||
#include "generation.hpp"
|
#include "generation.hpp"
|
||||||
#include "iconimageprovider.hpp"
|
#include "iconimageprovider.hpp"
|
||||||
#include "instanceinfo.hpp"
|
|
||||||
#include "paths.hpp"
|
#include "paths.hpp"
|
||||||
#include "qmlscreen.hpp"
|
#include "qmlscreen.hpp"
|
||||||
#include "rootwrapper.hpp"
|
#include "rootwrapper.hpp"
|
||||||
|
|
@ -154,22 +153,6 @@ qint32 QuickshellGlobal::processId() const { // NOLINT
|
||||||
return getpid();
|
return getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QuickshellGlobal::instanceId() const { // NOLINT
|
|
||||||
return InstanceInfo::CURRENT.instanceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString QuickshellGlobal::shellId() const { // NOLINT
|
|
||||||
return InstanceInfo::CURRENT.shellId;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString QuickshellGlobal::appId() const { // NOLINT
|
|
||||||
return InstanceInfo::CURRENT.appId;
|
|
||||||
}
|
|
||||||
|
|
||||||
QDateTime QuickshellGlobal::launchTime() const { // NOLINT
|
|
||||||
return InstanceInfo::CURRENT.launchTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
qsizetype QuickshellGlobal::screensCount(QQmlListProperty<QuickshellScreenInfo>* /*unused*/) {
|
qsizetype QuickshellGlobal::screensCount(QQmlListProperty<QuickshellScreenInfo>* /*unused*/) {
|
||||||
return QuickshellTracked::instance()->screens.size();
|
return QuickshellTracked::instance()->screens.size();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
#include "../io/processcore.hpp"
|
#include "../io/processcore.hpp"
|
||||||
#include "doc.hpp"
|
#include "doc.hpp"
|
||||||
#include "instanceinfo.hpp"
|
|
||||||
#include "qmlscreen.hpp"
|
#include "qmlscreen.hpp"
|
||||||
|
|
||||||
///! Accessor for some options under the Quickshell type.
|
///! Accessor for some options under the Quickshell type.
|
||||||
|
|
@ -84,21 +83,6 @@ class QuickshellGlobal: public QObject {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
/// Quickshell's process id.
|
/// Quickshell's process id.
|
||||||
Q_PROPERTY(qint32 processId READ processId CONSTANT);
|
Q_PROPERTY(qint32 processId READ processId CONSTANT);
|
||||||
/// A unique identifier for this Quickshell instance
|
|
||||||
Q_PROPERTY(QString instanceId READ instanceId CONSTANT)
|
|
||||||
/// The shell ID, used to differentiate between different shell configurations.
|
|
||||||
///
|
|
||||||
/// Defaults to a stable value derived from the config path.
|
|
||||||
/// Can be overridden with `//@ pragma ShellId <id>` in the root qml file.
|
|
||||||
Q_PROPERTY(QString shellId READ shellId CONSTANT)
|
|
||||||
/// The desktop application ID.
|
|
||||||
///
|
|
||||||
/// Defaults to `org.quickshell`.
|
|
||||||
/// Can be overridden with `//@ pragma AppId <id>` in the root qml file
|
|
||||||
/// or the `QS_APP_ID` environment variable.
|
|
||||||
Q_PROPERTY(QString appId READ appId CONSTANT)
|
|
||||||
/// The time at which this Quickshell instance was launched.
|
|
||||||
Q_PROPERTY(QDateTime launchTime READ launchTime CONSTANT)
|
|
||||||
/// All currently connected screens.
|
/// All currently connected screens.
|
||||||
///
|
///
|
||||||
/// This property updates as connected screens change.
|
/// This property updates as connected screens change.
|
||||||
|
|
@ -165,10 +149,6 @@ class QuickshellGlobal: public QObject {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
[[nodiscard]] qint32 processId() const;
|
[[nodiscard]] qint32 processId() const;
|
||||||
[[nodiscard]] QString instanceId() const;
|
|
||||||
[[nodiscard]] QString shellId() const;
|
|
||||||
[[nodiscard]] QString appId() const;
|
|
||||||
[[nodiscard]] QDateTime launchTime() const;
|
|
||||||
|
|
||||||
QQmlListProperty<QuickshellScreenInfo> screens();
|
QQmlListProperty<QuickshellScreenInfo> screens();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue