summaryrefslogtreecommitdiff
path: root/src/helpers
diff options
context:
space:
mode:
authorxDarksome <dev@darkso.me>2022-08-21 16:03:51 +0300
committerGitHub <noreply@github.com>2022-08-21 16:03:51 +0300
commit0f25f3aee36c4f312a3fb36a7abb63fe78f5254e (patch)
tree7fed1128dccc2de8eac672d4ca57eaaedd2af323 /src/helpers
parent776750ee3473fd0ca44969a9a1c79679e5805a0f (diff)
parent5e1f2539cb24b10cad50eba4c3131190022d5ee0 (diff)
Merge branch 'hyprwm:main' into main
Diffstat (limited to 'src/helpers')
-rw-r--r--src/helpers/MiscFunctions.cpp51
-rw-r--r--src/helpers/MiscFunctions.hpp4
-rw-r--r--src/helpers/WLClasses.hpp3
-rw-r--r--src/helpers/Workspace.hpp3
4 files changed, 29 insertions, 32 deletions
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index b7285637..405a53d8 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -40,6 +40,28 @@ static const float transforms[][9] = {{
},
};
+std::string absolutePath(const std::string& rawpath, const std::string& currentPath) {
+ auto value = rawpath;
+
+ if (value[0] == '.') {
+ auto currentDir = currentPath.substr(0, currentPath.find_last_of('/'));
+
+ if (value[1] == '.') {
+ auto parentDir = currentDir.substr(0, currentDir.find_last_of('/'));
+ value.replace(0, 2, parentDir);
+ } else {
+ value.replace(0, 1, currentDir);
+ }
+ }
+
+ if (value[0] == '~') {
+ static const char* const ENVHOME = getenv("HOME");
+ value.replace(0, 1, std::string(ENVHOME));
+ }
+
+ return value;
+}
+
void addWLSignal(wl_signal* pSignal, wl_listener* pListener, void* pOwner, std::string ownerString) {
ASSERT(pSignal);
ASSERT(pListener);
@@ -53,35 +75,6 @@ void handleNoop(struct wl_listener *listener, void *data) {
// Do nothing
}
-void wlr_signal_emit_safe(struct wl_signal *signal, void *data) {
- struct wl_listener cursor;
- struct wl_listener end;
-
- /* Add two special markers: one cursor and one end marker. This way, we know
- * that we've already called listeners on the left of the cursor and that we
- * don't want to call listeners on the right of the end marker. The 'it'
- * function can remove any element it wants from the list without troubles.
- * wl_list_for_each_safe tries to be safe but it fails: it works fine
- * if the current item is removed, but not if the next one is. */
- wl_list_insert(&signal->listener_list, &cursor.link);
- cursor.notify = handleNoop;
- wl_list_insert(signal->listener_list.prev, &end.link);
- end.notify = handleNoop;
-
- while (cursor.link.next != &end.link) {
- struct wl_list *pos = cursor.link.next;
- struct wl_listener *l = wl_container_of(pos, l, link);
-
- wl_list_remove(&cursor.link);
- wl_list_insert(pos, &cursor.link);
-
- l->notify(l, data);
- }
-
- wl_list_remove(&cursor.link);
- wl_list_remove(&end.link);
-}
-
std::string getFormat(const char *fmt, ...) {
char* outputStr = nullptr;
diff --git a/src/helpers/MiscFunctions.hpp b/src/helpers/MiscFunctions.hpp
index a40471a9..bbfb8ca2 100644
--- a/src/helpers/MiscFunctions.hpp
+++ b/src/helpers/MiscFunctions.hpp
@@ -2,8 +2,8 @@
#include "../includes.hpp"
+std::string absolutePath(const std::string&, const std::string&);
void addWLSignal(wl_signal*, wl_listener*, void* pOwner, std::string ownerString);
-void wlr_signal_emit_safe(struct wl_signal *signal, void *data);
std::string getFormat(const char *fmt, ...); // Basically Debug::log to a string
std::string escapeJSONStrings(const std::string& str);
void scaleBox(wlr_box*, float);
@@ -17,4 +17,4 @@ std::string execAndGet(const char*);
float getPlusMinusKeywordResult(std::string in, float relative);
-void matrixProjection(float mat[9], int w, int h, wl_output_transform tr); \ No newline at end of file
+void matrixProjection(float mat[9], int w, int h, wl_output_transform tr);
diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp
index 6b0787bb..4c769202 100644
--- a/src/helpers/WLClasses.hpp
+++ b/src/helpers/WLClasses.hpp
@@ -103,6 +103,7 @@ struct SKeyboard {
xkb_layout_index_t activeLayout = 0;
std::string name = "";
+ std::string xkbFilePath = "";
SStringRuleNames currentRules;
int repeatRate = 0;
@@ -316,4 +317,4 @@ struct SIMEPopup {
bool operator==(const SIMEPopup& other) {
return pSurface == other.pSurface;
}
-}; \ No newline at end of file
+};
diff --git a/src/helpers/Workspace.hpp b/src/helpers/Workspace.hpp
index 5a3a24ba..3faebdd8 100644
--- a/src/helpers/Workspace.hpp
+++ b/src/helpers/Workspace.hpp
@@ -18,6 +18,9 @@ public:
int m_iID = -1;
std::string m_szName = "";
uint64_t m_iMonitorID = -1;
+ // Previous workspace ID is stored during a workspace change, allowing travel
+ // to the previous workspace.
+ int m_iPrevWorkspaceID = -1;
bool m_bHasFullscreenWindow = false;
eFullscreenMode m_efFullscreenMode = FULLSCREEN_FULL;