diff --git a/Cargo.lock b/Cargo.lock index f1cd557d..a05cbfce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2314,7 +2314,7 @@ dependencies = [ [[package]] name = "weylus" -version = "0.11.4" +version = "2024.8.1" dependencies = [ "autopilot", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 12bd8dd4..5921e5b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "weylus" -version = "0.11.4" +version = "2024.8.1" authors = ["HMH "] license = "AGPL-3.0-or-later" edition = "2021" diff --git a/Readme.md b/Readme.md index b381caac..72db0788 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,22 @@ -# Weylus +# Weylus Community Edition + +## Note for MacOS + +After unzipping, run: + + sudo xattr -dr com.apple.quarantine ~/Downloads/Weylus.app + +## Community Edition adds these patches + +* Commits from Weylus master that improve Wayland compabability. +* [bunch of improvements: MacOS Stylus, Virtual Key, Reconnect, etc.](https://github.com/H-M-H/Weylus/pull/276) +* [Always render square QR code so it can be read](https://github.com/H-M-H/Weylus/pull/236) +* [fix scroll direction problems in uinput](https://github.com/H-M-H/Weylus/pull/215) +* [Use WinAPI to simulate pointermovements](https://github.com/H-M-H/Weylus/pull/128) +* [Linux build fixes](https://github.com/electronstudio2/Weylus/tree/build-fixes) + + + ![Build](https://github.com/H-M-H/Weylus/workflows/Build/badge.svg) Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer! diff --git a/io.github.electronstudio.WeylusCommunityEdition.metainfo.xml b/io.github.electronstudio.WeylusCommunityEdition.metainfo.xml new file mode 100644 index 00000000..162aeda9 --- /dev/null +++ b/io.github.electronstudio.WeylusCommunityEdition.metainfo.xml @@ -0,0 +1,56 @@ + + + io.github.electronstudio.WeylusCommunityEdition + + Weylus Community Edition + Use your tablet as graphic tablet/touch screen on your computer + + CC0-1.0 + AGPL-3.0-or-later + + + pointing + keyboard + touch + tablet + + + +

+ Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer! +

+

Control your mouse with your tablet

+

Mirror your screen to your tablet

+

Send keyboard input using physical keyboards

+

Hardware accelerated video encoding

+

Support for a stylus/pen (supports pressure and tilt)

+

Multi-touch: Try it with software that supports multi-touch, like Krita, and see for yourself!

+

Capturing specific windows and only drawing to them

+

Faster screen mirroring

+

Tablet as second screen

+ + + + + https://raw.githubusercontent.com/electronstudio2/Weylus/community-edition-patches/screenshot.png + The one and only window + + + + https://github.com/electronstudio/WeylusCommunityEdition + + + + io.github.electronstudio.WeylusCommunityEdition.desktop + + H-M-H + + + + + +

Support for flatpak build

+ + + + \ No newline at end of file diff --git a/io.github.electronstudio.WeylusCommunityEdition.svg b/io.github.electronstudio.WeylusCommunityEdition.svg new file mode 100644 index 00000000..926aa228 --- /dev/null +++ b/io.github.electronstudio.WeylusCommunityEdition.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/patch_community_edition.sh b/patch_community_edition.sh new file mode 100755 index 00000000..98f3b928 --- /dev/null +++ b/patch_community_edition.sh @@ -0,0 +1,56 @@ +git clone https://github.com/H-M-H/Weylus.git +cd Weylus +echo "CONTRIBUTORS merge=ours" >.gitattributes +git config --global merge.ours.driver true + +git remote add qdlmcfresh https://github.com/qdlmcfresh/Weylus.git +git fetch qdlmcfresh stylus_windows +git merge qdlmcfresh/stylus_windows -m "merged qdlmcfresh" + +git remote add qdlmcfreshcompat https://github.com/electronstudio2/WeylusQdlmcFreshLyonbotCompat.git +git fetch qdlmcfreshcompat stylus_windows +git merge qdlmcfreshcompat/stylus_windows -m "merged qdlmcfresh compatability" + +git remote add OmegaRogue https://github.com/OmegaRogue/Weylus.git +git fetch OmegaRogue master +git merge OmegaRogue/master -m "merged OmegaRogue" + +git remote add scribblemaniac https://github.com/scribblemaniac/Weylus.git +git fetch scribblemaniac fix-qr-code +git merge scribblemaniac/fix-qr-code -m "merged scribblemaniac" + +# This one no longer seems necessary? Breaks mac build with vendored ffmpeg. +#git remote add Diordany https://github.com/Diordany/Weylus.git +#git fetch Diordany pr-func-proto +#git merge Diordany/pr-func-proto -m "merged Diordany" + + +# This needs a fix for windows currently +#git remote add lyonbot https://github.com/lyonbot/Weylus.git +#git fetch lyonbot pr +#git merge lyonbot/pr -m "merged lyonbot" +# The fixed version +git remote add lyonbot https://github.com/electronstudio2/WeylusLyonbotWindowsFixes.git +git fetch lyonbot pr +git merge lyonbot/pr -m "merged lyonbot" + +git remote add electronstudio2 https://github.com/electronstudio2/Weylus.git +git fetch electronstudio2 build-fixes +git merge electronstudio2/build-fixes -m "merged build-fixes" + + +sed -i '/<<<<<<< HEAD/,/=======/d' .github/workflows/build.yml +sed -i '/>>>>>>> electronstudio2\/build-fixes/d' .github/workflows/build.yml + +sed -i '/<<<<<<< HEAD/d' build.rs +sed -i '/=======/,/>>>>>>> electronstudio2\/build-fixes/d' build.rs +sed -i '/>>>>>>> electronstudio2\/build-fixes/d' build.rs + +git add build.rs .github/workflows/build.yml +git commit -m 'resolve conflict' + +git fetch electronstudio2 community-edition-patches +git merge electronstudio2/community-edition-patches -m "merged community-edition-patches" + +git remote add wce https://github.com/electronstudio/WeylusCommunityEdition.git +###git push -u wce master --force diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 00000000..0b7d237f Binary files /dev/null and b/screenshot.png differ diff --git a/weylus.desktop b/weylus.desktop index 574be920..38b96a69 100755 --- a/weylus.desktop +++ b/weylus.desktop @@ -5,6 +5,6 @@ Comment=Use your tablet as graphic tablet/touch screen on your computer. TryExec=weylus Exec=weylus Terminal=false -Icon=input-tablet +Icon=io.github.electronstudio.WeylusCommunityEdition Categories=Office;Graphics;Education;Presentation; StartupWMClass=weylus