Skip to content

Commit

Permalink
Merge branch 'nightly' into vite-vue-3
Browse files Browse the repository at this point in the history
  • Loading branch information
TheElixZammuto authored Nov 12, 2023
2 parents 6dc504b + 0a56394 commit 79c500b
Show file tree
Hide file tree
Showing 19 changed files with 126 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ jobs:
# install newer tar from focal... appimagelint fails on 18.04 without this
echo "original tar version"
tar --version
wget -O tar.deb http://security.ubuntu.com/ubuntu/pool/main/t/tar/tar_1.30+dfsg-7ubuntu0.20.04.2_amd64.deb
wget -O tar.deb http://security.ubuntu.com/ubuntu/pool/main/t/tar/tar_1.30+dfsg-7ubuntu0.20.04.3_amd64.deb
sudo apt-get -y install -f ./tar.deb
echo "new tar version"
tar --version
Expand Down
7 changes: 6 additions & 1 deletion cmake/packaging/linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ endif()

# desktop file
# todo - validate desktop files with `desktop-file-validate`
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.desktop"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
if(NOT ${SUNSHINE_BUILD_APPIMAGE})
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine_terminal.desktop"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
endif()
if(${SUNSHINE_BUILD_FLATPAK})
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine_kms.desktop"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
Expand Down
2 changes: 1 addition & 1 deletion cmake/packaging/windows.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ set(CPACK_NSIS_DELETE_ICONS_EXTRA
# Checking for previous installed versions
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")

set(CPACK_NSIS_HELP_LINK "https://sunshinestream.readthedocs.io/about/installation.html")
set(CPACK_NSIS_HELP_LINK "https://sunshinestream.readthedocs.io/en/latest/about/installation.html")
set(CPACK_NSIS_URL_INFO_ABOUT "${CMAKE_PROJECT_HOMEPAGE_URL}")
set(CPACK_NSIS_CONTACT "${CMAKE_PROJECT_HOMEPAGE_URL}/support")

Expand Down
2 changes: 2 additions & 0 deletions cmake/prep/special_package_configuration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ elseif (UNIX)
elseif(${SUNSHINE_BUILD_FLATPAK})
configure_file(packaging/linux/flatpak/sunshine.desktop sunshine.desktop @ONLY)
configure_file(packaging/linux/flatpak/sunshine_kms.desktop sunshine_kms.desktop @ONLY)
configure_file(packaging/linux/sunshine_terminal.desktop sunshine_terminal.desktop @ONLY)
else()
configure_file(packaging/linux/sunshine.desktop sunshine.desktop @ONLY)
configure_file(packaging/linux/sunshine_terminal.desktop sunshine_terminal.desktop @ONLY)
endif()

# configure metadata file
Expand Down
17 changes: 17 additions & 0 deletions docs/source/about/advanced_usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,23 @@ gamepad
.. code-block:: text
gamepad = auto
ds4_back_as_touchpad_click
^^^^^^^^^^^^^^^^^^^^^^^^^^

**Description**
.. Hint:: Only applies when gamepad is set to ds4 manually. Unused in other gamepad modes.

Allow Select/Back inputs to also trigger DS4 touchpad click. Useful for clients looking to emulate touchpad click
on Xinput devices.

**Default**
``enabled``

**Example**
.. code-block:: text
ds4_back_as_touchpad_click = enabled
back_button_timeout
^^^^^^^^^^^^^^^^^^^
Expand Down
7 changes: 0 additions & 7 deletions docs/source/about/third_party_packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ Third Party Packages

.. Danger:: These packages are not maintained by LizardByte. Use at your own risk.

AOSC
----

.. image:: https://img.shields.io/badge/dynamic/xml.svg?color=orange&label=AOSC&style=for-the-badge&prefix=v&query=%2F%2Ftr%5B%40id%3D%27aosc%27%5D%2Ftd%5B3%5D%2Fspan%2Fa&url=https%3A%2F%2Frepology.org%2Fproject%2Fsunshine%2Fversions&logo=data:image/png;base64,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
:alt: AOSC Version
:target: https://packages.aosc.io/packages/sunshine

AUR
---

Expand Down
3 changes: 2 additions & 1 deletion packaging/linux/AppImage/sunshine.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Exec=sunshine
Version=1.0
Comment=@PROJECT_DESCRIPTION@
Icon=sunshine
Categories=Utility;
Keywords=gamestream;stream;moonlight;remote play;
Categories=AudioVideo;Network;RemoteAccess;
Terminal=true
X-AppImage-Name=sunshine
X-AppImage-Version=@PROJECT_VERSION@
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/Arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Edit on github: https://github.com/LizardByte/Sunshine/tree/nightly/packaging/linux/aur/PKGBUILD
# Edit on github: https://github.com/LizardByte/Sunshine/blob/nightly/packaging/linux/Arch/PKGBUILD
# Reference: https://wiki.archlinux.org/title/PKGBUILD

pkgname='sunshine'
Expand Down
15 changes: 13 additions & 2 deletions packaging/linux/flatpak/sunshine.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,16 @@ Exec=flatpak run dev.lizardbyte.sunshine
Version=1.0
Comment=@PROJECT_DESCRIPTION@
Icon=sunshine
Categories=Utility;
Terminal=true
Keywords=gamestream;stream;moonlight;remote play;
Categories=AudioVideo;Network;RemoteAccess;
Actions=RunInTerminal;KMS;

[Desktop Action RunInTerminal]
Name=Run in Terminal
Icon=application-x-executable
Exec=gio launch @CMAKE_INSTALL_PREFIX@/share/applications/sunshine_terminal.desktop

[Desktop Action KMS]
Name=Run in Terminal (KMS)
Icon=application-x-executable
Exec=gio launch @CMAKE_INSTALL_PREFIX@/share/applications/sunshine_kms.desktop
7 changes: 2 additions & 5 deletions packaging/linux/flatpak/sunshine_kms.desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[Desktop Entry]
Type=Application
Name=@PROJECT_NAME@ (KMS)
Exec=sudo -i PULSE_SERVER=unix:$(pactl info | awk '/Server String/{print$3}') flatpak run dev.lizardbyte.sunshine
Version=1.0
Comment=@PROJECT_DESCRIPTION@
Icon=sunshine
Categories=Utility;
Terminal=true
Type=Application
NoDisplay=true
12 changes: 9 additions & 3 deletions packaging/linux/sunshine.desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[Desktop Entry]
Type=Application
Name=@PROJECT_NAME@
Exec=sunshine
Exec=/usr/bin/env systemctl start --u sunshine
Version=1.0
Comment=@PROJECT_DESCRIPTION@
Icon=sunshine
Categories=Utility;
Terminal=true
Keywords=gamestream;stream;moonlight;remote play;
Categories=AudioVideo;Network;RemoteAccess;
Actions=RunInTerminal;

[Desktop Action RunInTerminal]
Name=Run in Terminal
Icon=application-x-executable
Exec=gio launch @CMAKE_INSTALL_PREFIX@/share/applications/sunshine_terminal.desktop
6 changes: 6 additions & 0 deletions packaging/linux/sunshine_terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Desktop Entry]
Name=@PROJECT_NAME@
Exec=sunshine
Terminal=true
Type=Application
NoDisplay=true
3 changes: 3 additions & 0 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ namespace config {
"1280x720"s,
"1920x1080"s,
"2560x1080"s,
"2560x1440"s,
"3440x1440"s,
"1920x1200"s,
"3840x2160"s,
Expand All @@ -418,6 +419,7 @@ namespace config {
platf::supported_gamepads().front().data(),
platf::supported_gamepads().front().size(),
}, // Default gamepad
true, // back as touchpad click enabled (manual DS4 only)

true, // keyboard enabled
true, // mouse enabled
Expand Down Expand Up @@ -1041,6 +1043,7 @@ namespace config {
}

string_restricted_f(vars, "gamepad"s, input.gamepad, platf::supported_gamepads());
bool_f(vars, "ds4_back_as_touchpad_click", input.ds4_back_as_touchpad_click);

bool_f(vars, "mouse", input.mouse);
bool_f(vars, "keyboard", input.keyboard);
Expand Down
1 change: 1 addition & 0 deletions src/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ namespace config {
std::chrono::duration<double> key_repeat_period;

std::string gamepad;
bool ds4_back_as_touchpad_click;

bool keyboard;
bool mouse;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/windows/PolicyConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @brief Undocumented COM-interface IPolicyConfig.
* @details Use for setting default audio render endpoint.
* @author EreTIk
* @see http://eretik.omegahg.com/
* @see https://kitere.github.io/
*/

#pragma once
Expand Down
2 changes: 1 addition & 1 deletion src/platform/windows/audio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ namespace platf::audio {
wave_format.Format.wBitsPerSample = 16;
wave_format.Format.nBlockAlign = wave_format.Format.nChannels * wave_format.Format.wBitsPerSample / 8;
wave_format.Format.nAvgBytesPerSec = wave_format.Format.nSamplesPerSec * wave_format.Format.nBlockAlign;
wave_format.Format.cbSize = sizeof(wave_format);
wave_format.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);

wave_format.Samples.wValidBitsPerSample = 16;
wave_format.dwChannelMask = format.channel_mask;
Expand Down
5 changes: 4 additions & 1 deletion src/platform/windows/input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ namespace platf {
BOOST_LOG(info) << "Gamepad " << id.globalIndex << " will be Xbox 360 controller (manual selection)"sv;
selectedGamepadType = Xbox360Wired;
}
else if (config::input.gamepad == "ps4"sv || config::input.gamepad == "ds4"sv) {
else if (config::input.gamepad == "ds4"sv) {
BOOST_LOG(info) << "Gamepad " << id.globalIndex << " will be DualShock 4 controller (manual selection)"sv;
selectedGamepadType = DualShock4Wired;
}
Expand Down Expand Up @@ -1334,6 +1334,9 @@ namespace platf {
// Allow either PS4/PS5 clickpad button or Xbox Series X share button to activate DS4 clickpad
if (gamepad_state.buttonFlags & (TOUCHPAD_BUTTON | MISC_BUTTON)) buttons |= DS4_SPECIAL_BUTTON_TOUCHPAD;

// Manual DS4 emulation: check if BACK button should also trigger DS4 touchpad click
if (config::input.gamepad == "ds4"sv && config::input.ds4_back_as_touchpad_click && (gamepad_state.buttonFlags & BACK)) buttons |= DS4_SPECIAL_BUTTON_TOUCHPAD;

return (DS4_SPECIAL_BUTTONS) buttons;
}

Expand Down
Loading

0 comments on commit 79c500b

Please sign in to comment.