MrGlockenspiel / activate-linux

The "Activate Windows" watermark ported to Linux
GNU General Public License v3.0
4.4k stars 92 forks source link

Implement optional backend support, fix few other issues #141

Closed ahmubashshir closed 2 years ago

ahmubashshir commented 2 years ago
ahmubashshir commented 2 years ago

@MrGlockenspiel, this pr fixes #128 too 😀 But you have to reset again to merge painlessly 😫

Here you go

# to revert
git revert 6005530
git revert 872f0ca
git revert 9abd809 -m1
# to drop offending commits
git reset --hard c937437

# use either revert or reset, not both.
MrGlockenspiel commented 2 years ago

thank you so much, especially for the instructions because i can barely wrap my head around git sometimes

MrGlockenspiel commented 2 years ago

@ahmubashshir im not sure if i broke something or what but the wayland backend is causing issues, specifically with wlr-layer-shell-unstable-v1.h seeming to not generate

ahmubashshir commented 2 years ago

@MrGlockenspiel it's generated on the fly... as it's an intermediate dependency(dependency of wayland.o), it's generated before compiling wayland.c and removed after compilation automatically.

It's done this way so that it can be generated automatically each time.

wayland/wlr-layer-shell-unstable-v1.h

clean up

ahmubashshir commented 2 years ago

@MrGlockenspiel You probably didn't drop the offending commits... Apply this patch with git apply to fix this (run git apply, paste the patch, press D to close input and apply this patch).

diff --git a/src/wayland/wayland.c b/src/wayland/wayland.c
index 5833e36..92137fe 100644
--- a/src/wayland/wayland.c
+++ b/src/wayland/wayland.c
@@ -12,7 +12,7 @@

 #include <cairo.h>

-#include <wlr-layer-shell-unstable-v1.h>
+#include "wlr-layer-shell-unstable-v1.h"

 #include "wayland.h"
 #include "log.h"

compilation

MrGlockenspiel commented 2 years ago

ok yeah it works now :sweat_smile: