mirror of
https://github.com/kunkundi/crossdesk.git
synced 2025-12-18 04:56:45 +08:00
Compare commits
23 Commits
v1.1.1-202
...
v1.1.3-202
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51409e16c8 | ||
|
|
6ca3b58ae2 | ||
|
|
692e176e34 | ||
|
|
4fb7acaa61 | ||
|
|
c0d6429a54 | ||
|
|
07c7c7f179 | ||
|
|
c5ceeb0d80 | ||
|
|
5ce0a891df | ||
|
|
f94ef49210 | ||
|
|
5d0a4d1385 | ||
|
|
dd482cee60 | ||
|
|
e3c2edfb1c | ||
|
|
f3901d09ea | ||
|
|
2b12749477 | ||
|
|
759488f675 | ||
|
|
4bb4240a9e | ||
|
|
1457247a6a | ||
|
|
97ab9bfca5 | ||
|
|
4dd3c3e073 | ||
|
|
4ba4f17a6b | ||
|
|
f5d0291b5a | ||
|
|
1a64c1afef | ||
|
|
18f4973d0a |
62
.github/workflows/build.yml
vendored
62
.github/workflows/build.yml
vendored
@@ -35,7 +35,7 @@ jobs:
|
|||||||
id: set_deb_version
|
id: set_deb_version
|
||||||
run: |
|
run: |
|
||||||
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
||||||
BUILD_DATE=$(date +%Y%m%d)
|
BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
|
||||||
if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
|
if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
|
||||||
LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
|
LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
|
||||||
else
|
else
|
||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
XMAKE_GLOBALDIR: /data
|
XMAKE_GLOBALDIR: /data
|
||||||
run: |
|
run: |
|
||||||
ls -la $XMAKE_GLOBALDIR
|
ls -la $XMAKE_GLOBALDIR
|
||||||
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --root -y
|
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
|
||||||
xmake b -vy --root crossdesk
|
xmake b -vy --root crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -101,7 +101,7 @@ jobs:
|
|||||||
id: set_deb_version
|
id: set_deb_version
|
||||||
run: |
|
run: |
|
||||||
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
||||||
BUILD_DATE=$(date +%Y%m%d)
|
BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
|
||||||
if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
|
if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
|
||||||
LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
|
LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
|
||||||
else
|
else
|
||||||
@@ -120,7 +120,7 @@ jobs:
|
|||||||
CUDA_PATH: /usr/local/cuda
|
CUDA_PATH: /usr/local/cuda
|
||||||
XMAKE_GLOBALDIR: /data
|
XMAKE_GLOBALDIR: /data
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --root -y
|
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
|
||||||
xmake b -vy --root crossdesk
|
xmake b -vy --root crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -164,7 +164,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
VERSION="${GITHUB_REF##*/}"
|
VERSION="${GITHUB_REF##*/}"
|
||||||
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
||||||
BUILD_DATE=$(date +%Y%m%d)
|
BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
|
||||||
VERSION_NUM="v${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
VERSION_NUM="v${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
||||||
echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_ENV
|
echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_ENV
|
||||||
echo "VERSION_NUM=${VERSION_NUM}"
|
echo "VERSION_NUM=${VERSION_NUM}"
|
||||||
@@ -174,7 +174,7 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.xmake/packages
|
path: ~/.xmake/packages
|
||||||
key: ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ hashFiles('**/xmake.lua') }}
|
key: ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ github.sha }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-
|
${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-
|
||||||
|
|
||||||
@@ -189,7 +189,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build CrossDesk
|
- name: Build CrossDesk
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${VERSION_NUM} -y
|
xmake f --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=true -y
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -229,7 +229,7 @@ jobs:
|
|||||||
$version = $version -replace '^v', ''
|
$version = $version -replace '^v', ''
|
||||||
$version = $version -replace '/', '-'
|
$version = $version -replace '/', '-'
|
||||||
$SHORT_SHA = $env:GITHUB_SHA.Substring(0,7)
|
$SHORT_SHA = $env:GITHUB_SHA.Substring(0,7)
|
||||||
$BUILD_DATE = Get-Date -Format "yyyyMMdd"
|
$BUILD_DATE = ([System.TimeZoneInfo]::ConvertTimeBySystemTimeZoneId((Get-Date), "China Standard Time")).ToString("yyyyMMdd")
|
||||||
echo "VERSION_NUM=v$version-$BUILD_DATE-$SHORT_SHA" >> $env:GITHUB_ENV
|
echo "VERSION_NUM=v$version-$BUILD_DATE-$SHORT_SHA" >> $env:GITHUB_ENV
|
||||||
echo "BUILD_DATE=$BUILD_DATE" >> $env:GITHUB_ENV
|
echo "BUILD_DATE=$BUILD_DATE" >> $env:GITHUB_ENV
|
||||||
|
|
||||||
@@ -237,7 +237,7 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: D:\xmake_global\.xmake\packages
|
path: D:\xmake_global\.xmake\packages
|
||||||
key: ${{ runner.os }}-xmake-deps-intel-${{ hashFiles('**/xmake.lua') }}
|
key: ${{ runner.os }}-xmake-deps-intel-${{ github.sha }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-xmake-deps-intel-
|
${{ runner.os }}-xmake-deps-intel-
|
||||||
|
|
||||||
@@ -298,7 +298,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build CrossDesk
|
- name: Build CrossDesk
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} -y
|
xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} --USE_CUDA=true -y
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -340,11 +340,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
VERSION="${GITHUB_REF##*/}"
|
VERSION="${GITHUB_REF##*/}"
|
||||||
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
|
||||||
BUILD_DATE=$(date +%Y%m%d)
|
BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
|
||||||
BUILD_DATE_ISO=$(date +%Y-%m-%d)
|
BUILD_DATE_ISO=$(TZ=Asia/Shanghai date +%Y-%m-%d)
|
||||||
VERSION_NUM="v${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
VERSION_NUM="${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
||||||
|
VERSION_WITH_V="v${VERSION_NUM}"
|
||||||
VERSION_ONLY="${VERSION#v}"
|
VERSION_ONLY="${VERSION#v}"
|
||||||
echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT
|
echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT
|
||||||
|
echo "VERSION_WITH_V=${VERSION_WITH_V}" >> $GITHUB_OUTPUT
|
||||||
echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
|
echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
|
||||||
echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
|
echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
|
||||||
echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT
|
echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT
|
||||||
@@ -352,11 +354,11 @@ jobs:
|
|||||||
- name: Rename artifacts
|
- name: Rename artifacts
|
||||||
run: |
|
run: |
|
||||||
mkdir -p release
|
mkdir -p release
|
||||||
cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg
|
cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg
|
||||||
cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg
|
cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg
|
||||||
cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb
|
cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
|
||||||
cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb
|
cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
|
||||||
cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe
|
cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe
|
||||||
|
|
||||||
- name: List release files
|
- name: List release files
|
||||||
run: ls -lh release/
|
run: ls -lh release/
|
||||||
@@ -364,8 +366,8 @@ jobs:
|
|||||||
- name: Upload to Versioned GitHub Release
|
- name: Upload to Versioned GitHub Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.version.outputs.VERSION_NUM }}
|
tag_name: ${{ steps.version.outputs.VERSION_WITH_V }}
|
||||||
name: Release v${{ steps.version.outputs.VERSION_NUM }}
|
name: Release ${{ steps.version.outputs.VERSION_WITH_V }}
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
files: release/*
|
files: release/*
|
||||||
@@ -408,24 +410,24 @@ jobs:
|
|||||||
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
|
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
|
||||||
"downloads": {
|
"downloads": {
|
||||||
"windows-x64": {
|
"windows-x64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe",
|
"url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe",
|
||||||
"filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe"
|
"filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe"
|
||||||
},
|
},
|
||||||
"macos-x64": {
|
"macos-x64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg",
|
"url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg",
|
||||||
"filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg"
|
"filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg"
|
||||||
},
|
},
|
||||||
"macos-arm64": {
|
"macos-arm64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg",
|
"url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg",
|
||||||
"filename": "crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg"
|
"filename": "crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg"
|
||||||
},
|
},
|
||||||
"linux-amd64": {
|
"linux-amd64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb",
|
"url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb",
|
||||||
"filename": "crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb"
|
"filename": "crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb"
|
||||||
},
|
},
|
||||||
"linux-arm64": {
|
"linux-arm64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb",
|
"url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb",
|
||||||
"filename": "crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb"
|
"filename": "crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
21
README.md
21
README.md
@@ -11,8 +11,14 @@
|
|||||||
|
|
||||||
[ [English](README_EN.md) / 中文 ]
|
[ [English](README_EN.md) / 中文 ]
|
||||||
|
|
||||||
|
PC 客户端
|
||||||

|

|
||||||
|
|
||||||
|
Web 客户端
|
||||||
|
<p align="center">
|
||||||
|
<img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
|
||||||
|
</p>
|
||||||
|
|
||||||
## 简介
|
## 简介
|
||||||
|
|
||||||
CrossDesk 是一个轻量级的跨平台远程桌面软件,支持 Web 端控制远程设备。
|
CrossDesk 是一个轻量级的跨平台远程桌面软件,支持 Web 端控制远程设备。
|
||||||
@@ -55,7 +61,7 @@ CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频
|
|||||||
Linux环境下需安装以下包:
|
Linux环境下需安装以下包:
|
||||||
|
|
||||||
```
|
```
|
||||||
sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
|
sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxfixes-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
编译
|
编译
|
||||||
@@ -70,7 +76,14 @@ git submodule update
|
|||||||
|
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
编译选项
|
||||||
|
```
|
||||||
|
--USE_CUDA=true/false: 启用 CUDA 硬件编解码,默认不启用
|
||||||
|
--CROSSDESK_VERSION=xxx: 指定 CrossDesk 的版本
|
||||||
|
|
||||||
|
# 示例
|
||||||
|
xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
|
||||||
|
```
|
||||||
运行
|
运行
|
||||||
```
|
```
|
||||||
xmake r crossdesk
|
xmake r crossdesk
|
||||||
@@ -78,13 +91,14 @@ xmake r crossdesk
|
|||||||
|
|
||||||
### 无 CUDA 环境下的开发支持
|
### 无 CUDA 环境下的开发支持
|
||||||
|
|
||||||
对于**未安装 CUDA 环境的 Linux 开发者**,这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖,可在容器中开箱即用,无需额外配置即可直接编译项目。
|
对于**未安装 CUDA 环境的 Linux 开发者,如果希望编译后的成果物拥有硬件编解码能力**,这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖,可在容器中开箱即用,无需额外配置即可直接编译项目。
|
||||||
|
|
||||||
进入容器,下载工程后执行:
|
进入容器,下载工程后执行:
|
||||||
```
|
```
|
||||||
export CUDA_PATH=/usr/local/cuda
|
export CUDA_PATH=/usr/local/cuda
|
||||||
export XMAKE_GLOBALDIR=/data
|
export XMAKE_GLOBALDIR=/data
|
||||||
|
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b --root -vy crossdesk
|
xmake b --root -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -106,6 +120,7 @@ set CUDA_PATH=path_to_cuda_installdir
|
|||||||
```
|
```
|
||||||
重新执行:
|
重新执行:
|
||||||
```
|
```
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -166,7 +181,7 @@ sudo docker run -d \
|
|||||||
-v /path/to/your/certs:/crossdesk-server/certs \
|
-v /path/to/your/certs:/crossdesk-server/certs \
|
||||||
-v /path/to/your/db:/crossdesk-server/db \
|
-v /path/to/your/db:/crossdesk-server/db \
|
||||||
-v /path/to/your/logs:/crossdesk-server/logs \
|
-v /path/to/your/logs:/crossdesk-server/logs \
|
||||||
crossdesk/crossdesk-server:latest
|
crossdesk/crossdesk-server:v1.1.1
|
||||||
```
|
```
|
||||||
|
|
||||||
上述命令中,用户需注意的参数如下:
|
上述命令中,用户需注意的参数如下:
|
||||||
|
|||||||
21
README_EN.md
21
README_EN.md
@@ -11,8 +11,14 @@
|
|||||||
|
|
||||||
[ [中文](README.md) / English ]
|
[ [中文](README.md) / English ]
|
||||||
|
|
||||||
|
PC Client
|
||||||

|

|
||||||
|
|
||||||
|
Web Client
|
||||||
|
<p align="center">
|
||||||
|
<img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
|
||||||
|
</p>
|
||||||
|
|
||||||
# Intro
|
# Intro
|
||||||
|
|
||||||
CrossDesk is a lightweight cross-platform remote desktop software.
|
CrossDesk is a lightweight cross-platform remote desktop software.
|
||||||
@@ -58,7 +64,7 @@ Requirements:
|
|||||||
Following packages need to be installed on Linux:
|
Following packages need to be installed on Linux:
|
||||||
|
|
||||||
```
|
```
|
||||||
sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
|
sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxfixes-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
Build:
|
Build:
|
||||||
@@ -73,7 +79,14 @@ git submodule update
|
|||||||
|
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
Build options:
|
||||||
|
```
|
||||||
|
--USE_CUDA=true/false: enable CUDA acceleration codec, default: false
|
||||||
|
--CROSSDESK_VERSION=xxx: set the version number
|
||||||
|
|
||||||
|
# example:
|
||||||
|
xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
|
||||||
|
```
|
||||||
Run:
|
Run:
|
||||||
```
|
```
|
||||||
xmake r crossdesk
|
xmake r crossdesk
|
||||||
@@ -81,7 +94,7 @@ xmake r crossdesk
|
|||||||
|
|
||||||
#### Development Without CUDA Environment
|
#### Development Without CUDA Environment
|
||||||
|
|
||||||
For **Linux developers who do not have a CUDA environment** installed, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.
|
For **Linux developers who do not have a CUDA environment installed and want to enable hardware codec feature**, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.
|
||||||
This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup.
|
This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup.
|
||||||
|
|
||||||
After entering the container, download the project and run:
|
After entering the container, download the project and run:
|
||||||
@@ -89,6 +102,7 @@ After entering the container, download the project and run:
|
|||||||
export CUDA_PATH=/usr/local/cuda
|
export CUDA_PATH=/usr/local/cuda
|
||||||
export XMAKE_GLOBALDIR=/data
|
export XMAKE_GLOBALDIR=/data
|
||||||
|
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b --root -vy crossdesk
|
xmake b --root -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -111,6 +125,7 @@ set CUDA_PATH=path_to_cuda_installdir:
|
|||||||
```
|
```
|
||||||
Then re-run:
|
Then re-run:
|
||||||
```
|
```
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -174,7 +189,7 @@ sudo docker run -d \
|
|||||||
-v /path/to/your/certs:/crossdesk-server/certs \
|
-v /path/to/your/certs:/crossdesk-server/certs \
|
||||||
-v /path/to/your/db:/crossdesk-server/db \
|
-v /path/to/your/db:/crossdesk-server/db \
|
||||||
-v /path/to/your/logs:/crossdesk-server/logs \
|
-v /path/to/your/logs:/crossdesk-server/logs \
|
||||||
crossdesk/crossdesk-server:v1.1.0
|
crossdesk/crossdesk-server:v1.1.1
|
||||||
```
|
```
|
||||||
|
|
||||||
The parameters you need to pay attention to are as follows:
|
The parameters you need to pay attention to are as follows:
|
||||||
|
|||||||
313
src/app/daemon.cpp
Normal file
313
src/app/daemon.cpp
Normal file
@@ -0,0 +1,313 @@
|
|||||||
|
#include "daemon.h"
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include <chrono>
|
||||||
|
#include <cstring>
|
||||||
|
#include <iostream>
|
||||||
|
#include <thread>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <process.h>
|
||||||
|
#include <tchar.h>
|
||||||
|
#include <windows.h>
|
||||||
|
#elif __APPLE__
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <mach-o/dyld.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#else
|
||||||
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
Daemon* Daemon::instance_ = nullptr;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// get executable file path
|
||||||
|
static std::string GetExecutablePath() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
char path[32768];
|
||||||
|
DWORD length = GetModuleFileNameA(nullptr, path, sizeof(path));
|
||||||
|
if (length > 0 && length < sizeof(path)) {
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#elif __APPLE__
|
||||||
|
char path[PATH_MAX];
|
||||||
|
uint32_t size = sizeof(path);
|
||||||
|
if (_NSGetExecutablePath(path, &size) == 0) {
|
||||||
|
char resolved_path[PATH_MAX];
|
||||||
|
if (realpath(path, resolved_path) != nullptr) {
|
||||||
|
return std::string(resolved_path);
|
||||||
|
}
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
char path[PATH_MAX];
|
||||||
|
ssize_t count = readlink("/proc/self/exe", path, sizeof(path) - 1);
|
||||||
|
if (count != -1) {
|
||||||
|
path[count] = '\0';
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
Daemon::Daemon(const std::string& name)
|
||||||
|
: name_(name)
|
||||||
|
#ifdef _WIN32
|
||||||
|
,
|
||||||
|
running_(false)
|
||||||
|
#else
|
||||||
|
,
|
||||||
|
running_(true)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void Daemon::stop() { running_ = false; }
|
||||||
|
|
||||||
|
bool Daemon::isRunning() const { return running_; }
|
||||||
|
|
||||||
|
bool Daemon::start(MainLoopFunc loop) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#elif __APPLE__
|
||||||
|
// macOS: Use child process monitoring (like Windows) to preserve GUI
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#else
|
||||||
|
// linux: Daemonize first, then run with restart monitoring
|
||||||
|
instance_ = this;
|
||||||
|
|
||||||
|
// check if running from terminal before fork
|
||||||
|
bool from_terminal =
|
||||||
|
(isatty(STDIN_FILENO) != 0) || (isatty(STDOUT_FILENO) != 0);
|
||||||
|
|
||||||
|
// first fork: detach from terminal
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid < 0) {
|
||||||
|
std::cerr << "Failed to fork daemon process" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (pid > 0) _exit(0);
|
||||||
|
|
||||||
|
if (setsid() < 0) {
|
||||||
|
std::cerr << "Failed to create new session" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pid = fork();
|
||||||
|
if (pid < 0) {
|
||||||
|
std::cerr << "Failed to fork daemon process (second fork)" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (pid > 0) _exit(0);
|
||||||
|
|
||||||
|
umask(0);
|
||||||
|
chdir("/");
|
||||||
|
|
||||||
|
// redirect file descriptors: keep stdout/stderr if from terminal, else
|
||||||
|
// redirect to /dev/null
|
||||||
|
int fd = open("/dev/null", O_RDWR);
|
||||||
|
if (fd >= 0) {
|
||||||
|
dup2(fd, STDIN_FILENO);
|
||||||
|
if (!from_terminal) {
|
||||||
|
dup2(fd, STDOUT_FILENO);
|
||||||
|
dup2(fd, STDERR_FILENO);
|
||||||
|
}
|
||||||
|
if (fd > 2) close(fd);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set up signal handlers
|
||||||
|
signal(SIGTERM, [](int) {
|
||||||
|
if (instance_) instance_->stop();
|
||||||
|
});
|
||||||
|
signal(SIGINT, [](int) {
|
||||||
|
if (instance_) instance_->stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ignore SIGPIPE
|
||||||
|
signal(SIGPIPE, SIG_IGN);
|
||||||
|
|
||||||
|
// set up SIGCHLD handler to reap zombie processes
|
||||||
|
struct sigaction sa_chld;
|
||||||
|
sa_chld.sa_handler = [](int) {
|
||||||
|
// reap zombie processes
|
||||||
|
while (waitpid(-1, nullptr, WNOHANG) > 0) {
|
||||||
|
// continue until no more zombie children
|
||||||
|
}
|
||||||
|
};
|
||||||
|
sigemptyset(&sa_chld.sa_mask);
|
||||||
|
sa_chld.sa_flags = SA_RESTART | SA_NOCLDSTOP;
|
||||||
|
sigaction(SIGCHLD, &sa_chld, nullptr);
|
||||||
|
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
static int RunLoopCatchCpp(Daemon::MainLoopFunc& loop) {
|
||||||
|
try {
|
||||||
|
loop();
|
||||||
|
return 0; // normal exit
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
std::cerr << "Exception caught: " << e.what() << std::endl;
|
||||||
|
return 1; // c++ exception
|
||||||
|
} catch (...) {
|
||||||
|
std::cerr << "Unknown exception caught" << std::endl;
|
||||||
|
return 1; // other exception
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int RunLoopWithSEH(Daemon::MainLoopFunc& loop) {
|
||||||
|
__try {
|
||||||
|
return RunLoopCatchCpp(loop);
|
||||||
|
} __except (EXCEPTION_EXECUTE_HANDLER) {
|
||||||
|
// catch system-level crashes (access violation, divide by zero, etc.)
|
||||||
|
DWORD code = GetExceptionCode();
|
||||||
|
std::cerr << "System crash detected (SEH exception code: 0x" << std::hex
|
||||||
|
<< code << std::dec << ")" << std::endl;
|
||||||
|
return 2; // System crash
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// run with restart logic: parent monitors child process and restarts on crash
|
||||||
|
bool Daemon::runWithRestart(MainLoopFunc loop) {
|
||||||
|
int restart_count = 0;
|
||||||
|
std::string exe_path = GetExecutablePath();
|
||||||
|
if (exe_path.empty()) {
|
||||||
|
std::cerr
|
||||||
|
<< "Failed to get executable path, falling back to direct execution"
|
||||||
|
<< std::endl;
|
||||||
|
while (isRunning()) {
|
||||||
|
try {
|
||||||
|
loop();
|
||||||
|
break;
|
||||||
|
} catch (...) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Exception caught, restarting... (attempt "
|
||||||
|
<< restart_count << ")" << std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (isRunning()) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
// windows: use CreateProcess to create child process
|
||||||
|
STARTUPINFOA si = {sizeof(si)};
|
||||||
|
PROCESS_INFORMATION pi = {0};
|
||||||
|
|
||||||
|
std::string cmd_line = "\"" + exe_path + "\" --child";
|
||||||
|
std::vector<char> cmd_line_buf(cmd_line.begin(), cmd_line.end());
|
||||||
|
cmd_line_buf.push_back('\0');
|
||||||
|
|
||||||
|
BOOL success = CreateProcessA(
|
||||||
|
nullptr, // executable file path (specified in command line)
|
||||||
|
cmd_line_buf.data(), // command line arguments
|
||||||
|
nullptr, // process security attributes
|
||||||
|
nullptr, // thread security attributes
|
||||||
|
FALSE, // don't inherit handles
|
||||||
|
0, // creation flags
|
||||||
|
nullptr, // environment variables (inherit from parent)
|
||||||
|
nullptr, // current directory
|
||||||
|
&si, // startup info
|
||||||
|
&pi // process information
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
std::cerr << "Failed to create child process, error: " << GetLastError()
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
restart_count++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD exit_code = 0;
|
||||||
|
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||||
|
GetExitCodeProcess(pi.hProcess, &exit_code);
|
||||||
|
CloseHandle(pi.hProcess);
|
||||||
|
CloseHandle(pi.hThread);
|
||||||
|
|
||||||
|
if (exit_code == 0) {
|
||||||
|
break; // normal exit
|
||||||
|
}
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with code " << exit_code
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
#else
|
||||||
|
// linux: use fork + exec to create child process
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid == 0) {
|
||||||
|
execl(exe_path.c_str(), exe_path.c_str(), "--child", nullptr);
|
||||||
|
_exit(1); // exec failed
|
||||||
|
} else if (pid > 0) {
|
||||||
|
int status = 0;
|
||||||
|
pid_t waited_pid = waitpid(pid, &status, 0);
|
||||||
|
|
||||||
|
if (waited_pid < 0) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "waitpid failed, errno: " << errno
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (WIFEXITED(status)) {
|
||||||
|
int exit_code = WEXITSTATUS(status);
|
||||||
|
if (exit_code == 0) {
|
||||||
|
break; // normal exit
|
||||||
|
}
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with code " << exit_code
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
} else if (WIFSIGNALED(status)) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process crashed with signal " << WTERMSIG(status)
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
} else {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with unknown status, restarting... "
|
||||||
|
"(attempt "
|
||||||
|
<< restart_count << ")" << std::endl;
|
||||||
|
}
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
} else {
|
||||||
|
std::cerr << "Failed to fork child process" << std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
restart_count++;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
39
src/app/daemon.h
Normal file
39
src/app/daemon.h
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* @Author: DI JUNKUN
|
||||||
|
* @Date: 2025-11-19
|
||||||
|
* Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _DAEMON_H_
|
||||||
|
#define _DAEMON_H_
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#define DAEMON_DEFAULT_RESTART_DELAY_MS 1000
|
||||||
|
|
||||||
|
class Daemon {
|
||||||
|
public:
|
||||||
|
using MainLoopFunc = std::function<void()>;
|
||||||
|
|
||||||
|
Daemon(const std::string& name);
|
||||||
|
|
||||||
|
bool start(MainLoopFunc loop);
|
||||||
|
|
||||||
|
void stop();
|
||||||
|
|
||||||
|
bool isRunning() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string name_;
|
||||||
|
bool runWithRestart(MainLoopFunc loop);
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
bool running_;
|
||||||
|
#else
|
||||||
|
static Daemon* instance_;
|
||||||
|
volatile bool running_;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -6,12 +6,61 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "rd_log.h"
|
#include <cstring>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "config_center.h"
|
||||||
|
#include "daemon.h"
|
||||||
|
#include "path_manager.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
|
|
||||||
int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
|
// check if running as child process
|
||||||
|
bool is_child = false;
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
if (strcmp(argv[i], "--child") == 0) {
|
||||||
|
is_child = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_child) {
|
||||||
|
// child process: run render directly
|
||||||
|
crossdesk::Render render;
|
||||||
|
render.Run();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool enable_daemon = false;
|
||||||
|
auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
|
||||||
|
if (path_manager) {
|
||||||
|
std::string cert_path =
|
||||||
|
(path_manager->GetCertPath() / "crossdesk.cn_root.crt").string();
|
||||||
|
std::string cache_path = path_manager->GetCachePath().string();
|
||||||
|
crossdesk::ConfigCenter config_center(cache_path + "/config.ini",
|
||||||
|
cert_path);
|
||||||
|
enable_daemon = config_center.IsEnableDaemon();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enable_daemon) {
|
||||||
|
// start daemon with restart monitoring
|
||||||
|
Daemon daemon("CrossDesk");
|
||||||
|
|
||||||
|
// define main loop function: run render and stop daemon on normal exit
|
||||||
|
Daemon::MainLoopFunc main_loop = [&daemon]() {
|
||||||
|
crossdesk::Render render;
|
||||||
|
render.Run();
|
||||||
|
daemon.stop();
|
||||||
|
};
|
||||||
|
|
||||||
|
// start daemon and return result
|
||||||
|
bool success = daemon.start(main_loop);
|
||||||
|
return success ? 0 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// run without daemon: direct execution
|
||||||
crossdesk::Render render;
|
crossdesk::Render render;
|
||||||
render.Run();
|
render.Run();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
302
src/autostart/autostart.cpp
Normal file
302
src/autostart/autostart.cpp
Normal file
@@ -0,0 +1,302 @@
|
|||||||
|
#include "autostart.h"
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <filesystem>
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <windows.h>
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#include <limits.h>
|
||||||
|
#include <mach-o/dyld.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#elif defined(__linux__)
|
||||||
|
#include <linux/limits.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace crossdesk {
|
||||||
|
|
||||||
|
static std::string get_home_dir() {
|
||||||
|
const char* home = std::getenv("HOME");
|
||||||
|
if (!home) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return std::string(home);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool file_exists(const std::string& path) {
|
||||||
|
return std::filesystem::exists(path) &&
|
||||||
|
std::filesystem::is_regular_file(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
static std::string GetExecutablePath() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
char path[32768];
|
||||||
|
DWORD length = GetModuleFileNameA(nullptr, path, sizeof(path));
|
||||||
|
if (length > 0 && length < sizeof(path)) {
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
char path[1024];
|
||||||
|
uint32_t size = sizeof(path);
|
||||||
|
if (_NSGetExecutablePath(path, &size) == 0) {
|
||||||
|
char resolved_path[PATH_MAX];
|
||||||
|
if (realpath(path, resolved_path) != nullptr) {
|
||||||
|
return std::string(resolved_path);
|
||||||
|
}
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#elif defined(__linux__)
|
||||||
|
char path[PATH_MAX];
|
||||||
|
ssize_t count = readlink("/proc/self/exe", path, sizeof(path) - 1);
|
||||||
|
if (count != -1) {
|
||||||
|
path[count] = '\0';
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Windows
|
||||||
|
#ifdef _WIN32
|
||||||
|
static constexpr const char* WINDOWS_RUN_KEY =
|
||||||
|
"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
|
||||||
|
|
||||||
|
static bool windows_enable(const std::string& appName,
|
||||||
|
const std::string& exePath) {
|
||||||
|
if (exePath.empty() || !std::filesystem::exists(exePath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
HKEY hKey = nullptr;
|
||||||
|
// Use KEY_WRITE to ensure we have write permission
|
||||||
|
LONG result =
|
||||||
|
RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_WRITE, &hKey);
|
||||||
|
if (result != ERROR_SUCCESS) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string regValue = exePath;
|
||||||
|
if (!exePath.empty() && exePath.find(' ') != std::string::npos) {
|
||||||
|
if (exePath.front() != '"' || exePath.back() != '"') {
|
||||||
|
regValue = "\"" + exePath + "\"";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure we close the key even if RegSetValueExA fails
|
||||||
|
result = RegSetValueExA(hKey, appName.c_str(), 0, REG_SZ,
|
||||||
|
reinterpret_cast<const BYTE*>(regValue.c_str()),
|
||||||
|
static_cast<DWORD>(regValue.size() + 1));
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
|
||||||
|
return result == ERROR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool windows_disable(const std::string& appName) {
|
||||||
|
HKEY hKey = nullptr;
|
||||||
|
LONG result =
|
||||||
|
RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_WRITE, &hKey);
|
||||||
|
if (result != ERROR_SUCCESS) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
result = RegDeleteValueA(hKey, appName.c_str());
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
|
||||||
|
// Return true even if the value doesn't exist (already disabled)
|
||||||
|
return result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool windows_exists(const std::string& appName) {
|
||||||
|
HKEY hKey = nullptr;
|
||||||
|
LONG result =
|
||||||
|
RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_READ, &hKey);
|
||||||
|
if (result != ERROR_SUCCESS) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
result = RegQueryValueExA(hKey, appName.c_str(), nullptr, nullptr, nullptr,
|
||||||
|
nullptr);
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
|
||||||
|
return result == ERROR_SUCCESS;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Linux
|
||||||
|
#if defined(__linux__)
|
||||||
|
static std::string linux_desktop_path(const std::string& appName) {
|
||||||
|
std::string home = get_home_dir();
|
||||||
|
if (home.empty()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return home + "/.config/autostart/" + appName + ".desktop";
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool linux_enable(const std::string& appName,
|
||||||
|
const std::string& exePath) {
|
||||||
|
std::string home = get_home_dir();
|
||||||
|
if (home.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::filesystem::path dir =
|
||||||
|
std::filesystem::path(home) / ".config" / "autostart";
|
||||||
|
|
||||||
|
// Create directory if it doesn't exist
|
||||||
|
std::error_code ec;
|
||||||
|
std::filesystem::create_directories(dir, ec);
|
||||||
|
if (ec) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string path = linux_desktop_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::ofstream file(path);
|
||||||
|
if (!file.is_open()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
file << "[Desktop Entry]\n";
|
||||||
|
file << "Type=Application\n";
|
||||||
|
file << "Exec=" << exePath << "\n";
|
||||||
|
file << "Hidden=false\n";
|
||||||
|
file << "NoDisplay=false\n";
|
||||||
|
file << "X-GNOME-Autostart-enabled=true\n";
|
||||||
|
file << "Terminal=false\n";
|
||||||
|
file << "StartupNotify=false\n";
|
||||||
|
file << "Name=" << appName << "\n";
|
||||||
|
file.close();
|
||||||
|
|
||||||
|
return file.good();
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool linux_disable(const std::string& appName) {
|
||||||
|
std::string path = linux_desktop_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::error_code ec;
|
||||||
|
return std::filesystem::remove(path, ec) && !ec;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool linux_exists(const std::string& appName) {
|
||||||
|
std::string path = linux_desktop_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return file_exists(path);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// macOS
|
||||||
|
#ifdef __APPLE__
|
||||||
|
static std::string mac_plist_path(const std::string& appName) {
|
||||||
|
std::string home = get_home_dir();
|
||||||
|
if (home.empty()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return home + "/Library/LaunchAgents/" + appName + ".plist";
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool mac_enable(const std::string& appName, const std::string& exePath) {
|
||||||
|
std::string path = mac_plist_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure LaunchAgents directory exists
|
||||||
|
std::filesystem::path dir =
|
||||||
|
std::filesystem::path(get_home_dir()) / "Library" / "LaunchAgents";
|
||||||
|
std::error_code ec;
|
||||||
|
std::filesystem::create_directories(dir, ec);
|
||||||
|
if (ec) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::ofstream file(path);
|
||||||
|
if (!file.is_open()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
file << R"(<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
|
||||||
|
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>Label</key>
|
||||||
|
<string>)"
|
||||||
|
<< appName << R"(</string>
|
||||||
|
<key>ProgramArguments</key>
|
||||||
|
<array>
|
||||||
|
<string>)"
|
||||||
|
<< exePath << R"(</string>
|
||||||
|
</array>
|
||||||
|
<key>RunAtLoad</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>)";
|
||||||
|
file.close();
|
||||||
|
|
||||||
|
return file.good();
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool mac_disable(const std::string& appName) {
|
||||||
|
std::string path = mac_plist_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::error_code ec;
|
||||||
|
return std::filesystem::remove(path, ec) && !ec;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool mac_exists(const std::string& appName) {
|
||||||
|
std::string path = mac_plist_path(appName);
|
||||||
|
if (path.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return file_exists(path);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
bool EnableAutostart(const std::string& appName) {
|
||||||
|
std::string exePath = GetExecutablePath();
|
||||||
|
if (exePath.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#ifdef _WIN32
|
||||||
|
return windows_enable(appName, exePath);
|
||||||
|
#elif __APPLE__
|
||||||
|
return mac_enable(appName, exePath);
|
||||||
|
#else
|
||||||
|
return linux_enable(appName, exePath);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DisableAutostart(const std::string& appName) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
return windows_disable(appName);
|
||||||
|
#elif __APPLE__
|
||||||
|
return mac_disable(appName);
|
||||||
|
#else
|
||||||
|
return linux_disable(appName);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsAutostartEnabled(const std::string& appName) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
return windows_exists(appName);
|
||||||
|
#elif __APPLE__
|
||||||
|
return mac_exists(appName);
|
||||||
|
#else
|
||||||
|
return linux_exists(appName);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace crossdesk
|
||||||
21
src/autostart/autostart.h
Normal file
21
src/autostart/autostart.h
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* @Author: DI JUNKUN
|
||||||
|
* @Date: 2025-11-18
|
||||||
|
* Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _AUTOSTART_H_
|
||||||
|
#define _AUTOSTART_H_
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace crossdesk {
|
||||||
|
|
||||||
|
bool EnableAutostart(const std::string& appName);
|
||||||
|
|
||||||
|
bool DisableAutostart(const std::string& appName);
|
||||||
|
|
||||||
|
bool IsAutostartEnabled(const std::string& appName);
|
||||||
|
|
||||||
|
} // namespace crossdesk
|
||||||
|
#endif
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
#include "config_center.h"
|
#include "config_center.h"
|
||||||
|
|
||||||
|
#include "autostart.h"
|
||||||
|
#include "rd_log.h"
|
||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
ConfigCenter::ConfigCenter(const std::string& config_path,
|
ConfigCenter::ConfigCenter(const std::string& config_path,
|
||||||
@@ -48,7 +51,9 @@ int ConfigCenter::Load() {
|
|||||||
ini_.GetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
ini_.GetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
||||||
enable_self_hosted_ =
|
enable_self_hosted_ =
|
||||||
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
||||||
|
enable_autostart_ =
|
||||||
|
ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
|
||||||
|
enable_daemon_ = ini_.GetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
||||||
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
||||||
|
|
||||||
@@ -71,6 +76,8 @@ int ConfigCenter::Save() {
|
|||||||
static_cast<long>(signal_server_port_));
|
static_cast<long>(signal_server_port_));
|
||||||
ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
||||||
ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
||||||
|
ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
|
||||||
|
ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
||||||
enable_minimize_to_tray_);
|
enable_minimize_to_tray_);
|
||||||
|
|
||||||
@@ -221,6 +228,41 @@ int ConfigCenter::SetMinimizeToTray(bool enable_minimize_to_tray) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ConfigCenter::SetAutostart(bool enable_autostart) {
|
||||||
|
enable_autostart_ = enable_autostart;
|
||||||
|
bool success = false;
|
||||||
|
if (enable_autostart) {
|
||||||
|
success = EnableAutostart("CrossDesk");
|
||||||
|
} else {
|
||||||
|
success = DisableAutostart("CrossDesk");
|
||||||
|
}
|
||||||
|
|
||||||
|
ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
|
||||||
|
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
||||||
|
if (rc < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
LOG_ERROR("SetAutostart failed");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ConfigCenter::SetDaemon(bool enable_daemon) {
|
||||||
|
enable_daemon_ = enable_daemon;
|
||||||
|
|
||||||
|
ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
|
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
||||||
|
if (rc < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// getters
|
// getters
|
||||||
|
|
||||||
ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() const { return language_; }
|
ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() const { return language_; }
|
||||||
@@ -274,4 +316,8 @@ std::string ConfigCenter::GetDefaultCertFilePath() const {
|
|||||||
bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }
|
bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }
|
||||||
|
|
||||||
bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
|
bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
|
||||||
|
|
||||||
|
bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
|
||||||
|
|
||||||
|
bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
@@ -40,6 +40,8 @@ class ConfigCenter {
|
|||||||
int SetCertFilePath(const std::string& cert_file_path);
|
int SetCertFilePath(const std::string& cert_file_path);
|
||||||
int SetSelfHosted(bool enable_self_hosted);
|
int SetSelfHosted(bool enable_self_hosted);
|
||||||
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
||||||
|
int SetAutostart(bool enable_autostart);
|
||||||
|
int SetDaemon(bool enable_daemon);
|
||||||
|
|
||||||
// read config
|
// read config
|
||||||
|
|
||||||
@@ -60,6 +62,8 @@ class ConfigCenter {
|
|||||||
std::string GetDefaultCertFilePath() const;
|
std::string GetDefaultCertFilePath() const;
|
||||||
bool IsSelfHosted() const;
|
bool IsSelfHosted() const;
|
||||||
bool IsMinimizeToTray() const;
|
bool IsMinimizeToTray() const;
|
||||||
|
bool IsEnableAutostart() const;
|
||||||
|
bool IsEnableDaemon() const;
|
||||||
|
|
||||||
int Load();
|
int Load();
|
||||||
int Save();
|
int Save();
|
||||||
@@ -75,7 +79,7 @@ class ConfigCenter {
|
|||||||
VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_60;
|
VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_60;
|
||||||
VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::H264;
|
VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::H264;
|
||||||
bool hardware_video_codec_ = false;
|
bool hardware_video_codec_ = false;
|
||||||
bool enable_turn_ = false;
|
bool enable_turn_ = true;
|
||||||
bool enable_srtp_ = false;
|
bool enable_srtp_ = false;
|
||||||
std::string signal_server_host_ = "api.crossdesk.cn";
|
std::string signal_server_host_ = "api.crossdesk.cn";
|
||||||
std::string signal_server_host_default_ = "api.crossdesk.cn";
|
std::string signal_server_host_default_ = "api.crossdesk.cn";
|
||||||
@@ -86,6 +90,8 @@ class ConfigCenter {
|
|||||||
std::string cert_file_path_default_ = "";
|
std::string cert_file_path_default_ = "";
|
||||||
bool enable_self_hosted_ = false;
|
bool enable_self_hosted_ = false;
|
||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
|
bool enable_autostart_ = false;
|
||||||
|
bool enable_daemon_ = false;
|
||||||
};
|
};
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
#endif
|
||||||
@@ -51,7 +51,16 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int KeyboardCapturer::Unhook() {
|
int KeyboardCapturer::Unhook() {
|
||||||
|
g_on_key_action = nullptr;
|
||||||
|
g_user_ptr = nullptr;
|
||||||
|
|
||||||
running_ = false;
|
running_ = false;
|
||||||
|
|
||||||
|
if (display_) {
|
||||||
|
XSelectInput(display_, DefaultRootWindow(display_), 0);
|
||||||
|
XFlush(display_);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ static void* g_user_ptr = nullptr;
|
|||||||
|
|
||||||
CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type,
|
CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type,
|
||||||
CGEventRef event, void* userInfo) {
|
CGEventRef event, void* userInfo) {
|
||||||
|
if (!g_on_key_action) {
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
KeyboardCapturer* keyboard_capturer = (KeyboardCapturer*)userInfo;
|
KeyboardCapturer* keyboard_capturer = (KeyboardCapturer*)userInfo;
|
||||||
if (!keyboard_capturer) {
|
if (!keyboard_capturer) {
|
||||||
LOG_ERROR("keyboard_capturer is nullptr");
|
LOG_ERROR("keyboard_capturer is nullptr");
|
||||||
@@ -120,8 +124,25 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int KeyboardCapturer::Unhook() {
|
int KeyboardCapturer::Unhook() {
|
||||||
|
g_on_key_action = nullptr;
|
||||||
|
g_user_ptr = nullptr;
|
||||||
|
|
||||||
|
if (event_tap_) {
|
||||||
|
CGEventTapEnable(event_tap_, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (run_loop_source_) {
|
||||||
|
CFRunLoopRemoveSource(CFRunLoopGetCurrent(), run_loop_source_,
|
||||||
|
kCFRunLoopCommonModes);
|
||||||
CFRelease(run_loop_source_);
|
CFRelease(run_loop_source_);
|
||||||
|
run_loop_source_ = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event_tap_) {
|
||||||
CFRelease(event_tap_);
|
CFRelease(event_tap_);
|
||||||
|
event_tap_ = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,12 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int KeyboardCapturer::Unhook() {
|
int KeyboardCapturer::Unhook() {
|
||||||
|
if (keyboard_hook_) {
|
||||||
|
g_on_key_action = nullptr;
|
||||||
|
g_user_ptr = nullptr;
|
||||||
UnhookWindowsHookEx(keyboard_hook_);
|
UnhookWindowsHookEx(keyboard_hook_);
|
||||||
|
keyboard_hook_ = nullptr;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -20,12 +20,22 @@
|
|||||||
#define INPUT_WINDOW_PADDING_EN 96
|
#define INPUT_WINDOW_PADDING_EN 96
|
||||||
#define SETTINGS_WINDOW_WIDTH_CN 202
|
#define SETTINGS_WINDOW_WIDTH_CN 202
|
||||||
#define SETTINGS_WINDOW_WIDTH_EN 248
|
#define SETTINGS_WINDOW_WIDTH_EN 248
|
||||||
|
#if USE_CUDA
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_CN 405
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_EN 405
|
||||||
|
#else
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#if _WIN32
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
||||||
|
#else
|
||||||
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
||||||
#else
|
#endif
|
||||||
#define SETTINGS_WINDOW_HEIGHT_CN 315
|
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 315
|
|
||||||
#endif
|
#endif
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
|
||||||
@@ -47,6 +57,10 @@
|
|||||||
#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218
|
#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218
|
||||||
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171
|
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171
|
||||||
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
|
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
|
||||||
|
#define ENABLE_AUTOSTART_PADDING_CN 171
|
||||||
|
#define ENABLE_AUTOSTART_PADDING_EN 218
|
||||||
|
#define ENABLE_DAEMON_PADDING_CN 171
|
||||||
|
#define ENABLE_DAEMON_PADDING_EN 218
|
||||||
#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
|
#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
|
||||||
#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
|
#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
|
||||||
#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
|
#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
|
||||||
|
|||||||
@@ -168,8 +168,15 @@ static std::vector<std::string> access_website = {
|
|||||||
static std::vector<std::string> confirm_delete_connection = {
|
static std::vector<std::string> confirm_delete_connection = {
|
||||||
reinterpret_cast<const char*>(u8"确认删除此连接"),
|
reinterpret_cast<const char*>(u8"确认删除此连接"),
|
||||||
"Confirm to delete this connection"};
|
"Confirm to delete this connection"};
|
||||||
#if _WIN32
|
|
||||||
|
|
||||||
|
static std::vector<std::string> enable_autostart = {
|
||||||
|
reinterpret_cast<const char*>(u8"开机自启:"), "Auto Start:"};
|
||||||
|
static std::vector<std::string> enable_daemon = {
|
||||||
|
reinterpret_cast<const char*>(u8"启用守护进程:"), "Enable Daemon:"};
|
||||||
|
static std::vector<std::string> takes_effect_after_restart = {
|
||||||
|
reinterpret_cast<const char*>(u8"重启后生效"),
|
||||||
|
"Takes effect after restart"};
|
||||||
|
#if _WIN32
|
||||||
static std::vector<std::string> minimize_to_tray = {
|
static std::vector<std::string> minimize_to_tray = {
|
||||||
reinterpret_cast<const char*>(u8"退出时最小化到系统托盘:"),
|
reinterpret_cast<const char*>(u8"退出时最小化到系统托盘:"),
|
||||||
"Minimize to system tray when exit:"};
|
"Minimize to system tray when exit:"};
|
||||||
|
|||||||
@@ -260,6 +260,9 @@ int Render::LoadSettingsFromCacheFile() {
|
|||||||
enable_turn_ = config_center_->IsEnableTurn();
|
enable_turn_ = config_center_->IsEnableTurn();
|
||||||
enable_srtp_ = config_center_->IsEnableSrtp();
|
enable_srtp_ = config_center_->IsEnableSrtp();
|
||||||
enable_self_hosted_ = config_center_->IsSelfHosted();
|
enable_self_hosted_ = config_center_->IsSelfHosted();
|
||||||
|
enable_autostart_ = config_center_->IsEnableAutostart();
|
||||||
|
enable_daemon_ = config_center_->IsEnableDaemon();
|
||||||
|
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
||||||
|
|
||||||
language_button_value_last_ = language_button_value_;
|
language_button_value_last_ = language_button_value_;
|
||||||
video_quality_button_value_last_ = video_quality_button_value_;
|
video_quality_button_value_last_ = video_quality_button_value_;
|
||||||
@@ -268,6 +271,8 @@ int Render::LoadSettingsFromCacheFile() {
|
|||||||
enable_turn_last_ = enable_turn_;
|
enable_turn_last_ = enable_turn_;
|
||||||
enable_srtp_last_ = enable_srtp_;
|
enable_srtp_last_ = enable_srtp_;
|
||||||
enable_self_hosted_last_ = enable_self_hosted_;
|
enable_self_hosted_last_ = enable_self_hosted_;
|
||||||
|
enable_autostart_last_ = enable_autostart_;
|
||||||
|
enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
|
||||||
|
|
||||||
LOG_INFO("Load settings from cache file");
|
LOG_INFO("Load settings from cache file");
|
||||||
|
|
||||||
@@ -325,8 +330,9 @@ int Render::ScreenCapturerInit() {
|
|||||||
|
|
||||||
int Render::StartScreenCapturer() {
|
int Render::StartScreenCapturer() {
|
||||||
if (screen_capturer_) {
|
if (screen_capturer_) {
|
||||||
LOG_INFO("Start screen capturer");
|
LOG_INFO("Start screen capturer, show cursor: {}", show_cursor_);
|
||||||
screen_capturer_->Start();
|
|
||||||
|
screen_capturer_->Start(show_cursor_);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1334,6 +1340,7 @@ void Render::ProcessSdlEvent(const SDL_Event& event) {
|
|||||||
is_client_mode_ = false;
|
is_client_mode_ = false;
|
||||||
reload_recent_connections_ = true;
|
reload_recent_connections_ = true;
|
||||||
fullscreen_button_pressed_ = false;
|
fullscreen_button_pressed_ = false;
|
||||||
|
start_keyboard_capturer_ = false;
|
||||||
just_created_ = false;
|
just_created_ = false;
|
||||||
recent_connection_image_save_time_ = SDL_GetTicks();
|
recent_connection_image_save_time_ = SDL_GetTicks();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -316,6 +316,7 @@ class Render {
|
|||||||
bool start_speaker_capturer_ = false;
|
bool start_speaker_capturer_ = false;
|
||||||
bool speaker_capturer_is_started_ = false;
|
bool speaker_capturer_is_started_ = false;
|
||||||
bool start_keyboard_capturer_ = true;
|
bool start_keyboard_capturer_ = true;
|
||||||
|
bool show_cursor_ = false;
|
||||||
bool keyboard_capturer_is_started_ = false;
|
bool keyboard_capturer_is_started_ = false;
|
||||||
bool foucs_on_main_window_ = false;
|
bool foucs_on_main_window_ = false;
|
||||||
bool foucs_on_stream_window_ = false;
|
bool foucs_on_stream_window_ = false;
|
||||||
@@ -447,7 +448,7 @@ class Render {
|
|||||||
int video_frame_rate_button_value_ = 1;
|
int video_frame_rate_button_value_ = 1;
|
||||||
int video_encode_format_button_value_ = 0;
|
int video_encode_format_button_value_ = 0;
|
||||||
bool enable_hardware_video_codec_ = false;
|
bool enable_hardware_video_codec_ = false;
|
||||||
bool enable_turn_ = false;
|
bool enable_turn_ = true;
|
||||||
bool enable_srtp_ = false;
|
bool enable_srtp_ = false;
|
||||||
char signal_server_ip_[256] = "api.crossdesk.cn";
|
char signal_server_ip_[256] = "api.crossdesk.cn";
|
||||||
char signal_server_port_[6] = "9099";
|
char signal_server_port_[6] = "9099";
|
||||||
@@ -459,9 +460,13 @@ class Render {
|
|||||||
int video_frame_rate_button_value_last_ = 0;
|
int video_frame_rate_button_value_last_ = 0;
|
||||||
int video_encode_format_button_value_last_ = 0;
|
int video_encode_format_button_value_last_ = 0;
|
||||||
bool enable_hardware_video_codec_last_ = false;
|
bool enable_hardware_video_codec_last_ = false;
|
||||||
bool enable_turn_last_ = false;
|
bool enable_turn_last_ = true;
|
||||||
bool enable_srtp_last_ = false;
|
bool enable_srtp_last_ = false;
|
||||||
bool enable_self_hosted_last_ = false;
|
bool enable_self_hosted_last_ = false;
|
||||||
|
bool enable_autostart_ = false;
|
||||||
|
bool enable_autostart_last_ = false;
|
||||||
|
bool enable_daemon_ = false;
|
||||||
|
bool enable_daemon_last_ = false;
|
||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
bool enable_minimize_to_tray_last_ = false;
|
bool enable_minimize_to_tray_last_ = false;
|
||||||
char signal_server_ip_self_[256] = "";
|
char signal_server_ip_self_[256] = "";
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#include <cmath>
|
||||||
|
|
||||||
#include "device_controller.h"
|
#include "device_controller.h"
|
||||||
#include "localization.h"
|
#include "localization.h"
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
@@ -101,28 +103,39 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
|
|||||||
last_mouse_event.button.y >= props->stream_render_rect_.y &&
|
last_mouse_event.button.y >= props->stream_render_rect_.y &&
|
||||||
last_mouse_event.button.y <= props->stream_render_rect_.y +
|
last_mouse_event.button.y <= props->stream_render_rect_.y +
|
||||||
props->stream_render_rect_.h) {
|
props->stream_render_rect_.h) {
|
||||||
int scroll_x = event.wheel.x;
|
float scroll_x = event.wheel.x;
|
||||||
int scroll_y = event.wheel.y;
|
float scroll_y = event.wheel.y;
|
||||||
if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
|
if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
|
||||||
scroll_x = -scroll_x;
|
scroll_x = -scroll_x;
|
||||||
scroll_y = -scroll_y;
|
scroll_y = -scroll_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
remote_action.type = ControlType::mouse;
|
remote_action.type = ControlType::mouse;
|
||||||
if (scroll_x == 0) {
|
|
||||||
|
auto roundUp = [](float value) -> int {
|
||||||
|
if (value > 0) {
|
||||||
|
return static_cast<int>(std::ceil(value));
|
||||||
|
} else if (value < 0) {
|
||||||
|
return static_cast<int>(std::floor(value));
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (std::abs(scroll_y) >= std::abs(scroll_x)) {
|
||||||
remote_action.m.flag = MouseFlag::wheel_vertical;
|
remote_action.m.flag = MouseFlag::wheel_vertical;
|
||||||
remote_action.m.s = scroll_y;
|
remote_action.m.s = roundUp(scroll_y);
|
||||||
} else if (scroll_y == 0) {
|
} else {
|
||||||
remote_action.m.flag = MouseFlag::wheel_horizontal;
|
remote_action.m.flag = MouseFlag::wheel_horizontal;
|
||||||
remote_action.m.s = scroll_x;
|
remote_action.m.s = roundUp(scroll_x);
|
||||||
}
|
}
|
||||||
|
|
||||||
render_width = props->stream_render_rect_.w;
|
render_width = props->stream_render_rect_.w;
|
||||||
render_height = props->stream_render_rect_.h;
|
render_height = props->stream_render_rect_.h;
|
||||||
remote_action.m.x =
|
remote_action.m.x =
|
||||||
(float)(event.button.x - props->stream_render_rect_.x) / render_width;
|
(float)(last_mouse_event.button.x - props->stream_render_rect_.x) /
|
||||||
|
render_width;
|
||||||
remote_action.m.y =
|
remote_action.m.y =
|
||||||
(float)(event.button.y - props->stream_render_rect_.y) /
|
(float)(last_mouse_event.button.y - props->stream_render_rect_.y) /
|
||||||
render_height;
|
render_height;
|
||||||
|
|
||||||
std::string msg = remote_action.to_json();
|
std::string msg = remote_action.to_json();
|
||||||
@@ -225,8 +238,6 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
|
|||||||
props->video_height_ = video_frame->height;
|
props->video_height_ = video_frame->height;
|
||||||
props->video_size_ = video_frame->size;
|
props->video_size_ = video_frame->size;
|
||||||
|
|
||||||
LOG_ERROR("receive: {}x{}", props->video_width_, props->video_height_);
|
|
||||||
|
|
||||||
if (need_to_update_render_rect) {
|
if (need_to_update_render_rect) {
|
||||||
render->UpdateRenderRect();
|
render->UpdateRenderRect();
|
||||||
}
|
}
|
||||||
@@ -464,6 +475,13 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
|
|||||||
#else
|
#else
|
||||||
render->start_mouse_controller_ = true;
|
render->start_mouse_controller_ = true;
|
||||||
#endif
|
#endif
|
||||||
|
if (std::all_of(render->connection_status_.begin(),
|
||||||
|
render->connection_status_.end(), [](const auto& kv) {
|
||||||
|
return kv.first.find("web") != std::string::npos;
|
||||||
|
})) {
|
||||||
|
render->show_cursor_ = true;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ConnectionStatus::Closed: {
|
case ConnectionStatus::Closed: {
|
||||||
@@ -486,6 +504,14 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
|
|||||||
|
|
||||||
render->connection_status_.erase(remote_id);
|
render->connection_status_.erase(remote_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (std::all_of(render->connection_status_.begin(),
|
||||||
|
render->connection_status_.end(), [](const auto& kv) {
|
||||||
|
return kv.first.find("web") == std::string::npos;
|
||||||
|
})) {
|
||||||
|
render->show_cursor_ = false;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -8,8 +8,10 @@
|
|||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
void Hyperlink(const std::string& label, const std::string& url) {
|
void Hyperlink(const std::string& label, const std::string& url,
|
||||||
|
const float window_width) {
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 255, 255));
|
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 255, 255));
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.1f);
|
||||||
ImGui::Text("%s", label.c_str());
|
ImGui::Text("%s", label.c_str());
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
@@ -67,7 +69,8 @@ int Render::AboutWindow() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string text = localization::version[localization_language_index_] +
|
std::string text = localization::version[localization_language_index_] +
|
||||||
": CrossDesk v" + version;
|
": CrossDesk " + version;
|
||||||
|
ImGui::SetCursorPosX(about_window_width_ * 0.1f);
|
||||||
ImGui::Text("%s", text.c_str());
|
ImGui::Text("%s", text.c_str());
|
||||||
|
|
||||||
if (update_available_) {
|
if (update_available_) {
|
||||||
@@ -76,14 +79,16 @@ int Render::AboutWindow() {
|
|||||||
": " + latest_version_;
|
": " + latest_version_;
|
||||||
std::string access_website =
|
std::string access_website =
|
||||||
localization::access_website[localization_language_index_];
|
localization::access_website[localization_language_index_];
|
||||||
Hyperlink(latest_version, "https://crossdesk.cn");
|
Hyperlink(latest_version, "https://crossdesk.cn", about_window_width_);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::Text("");
|
ImGui::Text("");
|
||||||
|
|
||||||
std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved.";
|
std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved.";
|
||||||
std::string license_text = "Licensed under GNU LGPL v3.";
|
std::string license_text = "Licensed under GNU LGPL v3.";
|
||||||
|
ImGui::SetCursorPosX(about_window_width_ * 0.1f);
|
||||||
ImGui::Text("%s", copyright_text.c_str());
|
ImGui::Text("%s", copyright_text.c_str());
|
||||||
|
ImGui::SetCursorPosX(about_window_width_ * 0.1f);
|
||||||
ImGui::Text("%s", license_text.c_str());
|
ImGui::Text("%s", license_text.c_str());
|
||||||
|
|
||||||
ImGui::SetCursorPosX(about_window_width_ * 0.42f);
|
ImGui::SetCursorPosX(about_window_width_ * 0.42f);
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ int Render::SettingWindow() {
|
|||||||
video_encode_format_items, IM_ARRAYSIZE(video_encode_format_items));
|
video_encode_format_items, IM_ARRAYSIZE(video_encode_format_items));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if USE_CUDA && !defined(__aarch64__) && !defined(__arm__)
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -176,6 +177,7 @@ int Render::SettingWindow() {
|
|||||||
ImGui::Checkbox("##enable_hardware_video_codec",
|
ImGui::Checkbox("##enable_hardware_video_codec",
|
||||||
&enable_hardware_video_codec_);
|
&enable_hardware_video_codec_);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
@@ -233,6 +235,53 @@ int Render::SettingWindow() {
|
|||||||
ImGui::SetCursorPosY(settings_items_offset);
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
ImGui::Checkbox("##enable_self_hosted", &enable_self_hosted_);
|
ImGui::Checkbox("##enable_self_hosted", &enable_self_hosted_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImGui::Separator();
|
||||||
|
|
||||||
|
{
|
||||||
|
settings_items_offset += settings_items_padding;
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset + 4);
|
||||||
|
|
||||||
|
ImGui::Text("%s",
|
||||||
|
localization::enable_autostart[localization_language_index_]
|
||||||
|
.c_str());
|
||||||
|
|
||||||
|
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_AUTOSTART_PADDING_CN);
|
||||||
|
} else {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_AUTOSTART_PADDING_EN);
|
||||||
|
}
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
|
ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::Separator();
|
||||||
|
|
||||||
|
{
|
||||||
|
settings_items_offset += settings_items_padding;
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset + 4);
|
||||||
|
|
||||||
|
ImGui::Text(
|
||||||
|
"%s",
|
||||||
|
localization::enable_daemon[localization_language_index_].c_str());
|
||||||
|
|
||||||
|
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_CN);
|
||||||
|
} else {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_EN);
|
||||||
|
}
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
|
ImGui::Checkbox("##enable_daemon_", &enable_daemon_);
|
||||||
|
if (ImGui::IsItemHovered()) {
|
||||||
|
ImGui::BeginTooltip();
|
||||||
|
ImGui::SetWindowFontScale(0.5f);
|
||||||
|
ImGui::Text("%s", localization::takes_effect_after_restart
|
||||||
|
[localization_language_index_]
|
||||||
|
.c_str());
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::EndTooltip();
|
||||||
|
}
|
||||||
|
}
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
@@ -347,6 +396,29 @@ int Render::SettingWindow() {
|
|||||||
}
|
}
|
||||||
enable_self_hosted_last_ = enable_self_hosted_;
|
enable_self_hosted_last_ = enable_self_hosted_;
|
||||||
|
|
||||||
|
if (enable_autostart_) {
|
||||||
|
config_center_->SetAutostart(true);
|
||||||
|
} else {
|
||||||
|
config_center_->SetAutostart(false);
|
||||||
|
}
|
||||||
|
enable_autostart_last_ = enable_autostart_;
|
||||||
|
|
||||||
|
if (enable_daemon_) {
|
||||||
|
config_center_->SetDaemon(true);
|
||||||
|
} else {
|
||||||
|
config_center_->SetDaemon(false);
|
||||||
|
}
|
||||||
|
enable_daemon_last_ = enable_daemon_;
|
||||||
|
|
||||||
|
#if _WIN32
|
||||||
|
if (enable_minimize_to_tray_) {
|
||||||
|
config_center_->SetMinimizeToTray(true);
|
||||||
|
} else {
|
||||||
|
config_center_->SetMinimizeToTray(false);
|
||||||
|
}
|
||||||
|
enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
|
||||||
|
#endif
|
||||||
|
|
||||||
settings_window_pos_reset_ = true;
|
settings_window_pos_reset_ = true;
|
||||||
|
|
||||||
// Recreate peer instance
|
// Recreate peer instance
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#include "screen_capturer_x11.h"
|
#include "screen_capturer_x11.h"
|
||||||
|
|
||||||
|
#include <X11/extensions/Xfixes.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
@@ -36,9 +38,21 @@ int ScreenCapturerX11::Init(const int fps, cb_desktop_data cb) {
|
|||||||
XRRCrtcInfo* crtc_info =
|
XRRCrtcInfo* crtc_info =
|
||||||
XRRGetCrtcInfo(display_, screen_res_, output_info->crtc);
|
XRRGetCrtcInfo(display_, screen_res_, output_info->crtc);
|
||||||
|
|
||||||
display_info_list_.push_back(
|
std::string name(output_info->name);
|
||||||
DisplayInfo((void*)display_, output_info->name, true, crtc_info->x,
|
|
||||||
crtc_info->y, crtc_info->width, crtc_info->height));
|
if (name.empty()) {
|
||||||
|
name = "Display" + std::to_string(i + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// clean display name, remove non-alphanumeric characters
|
||||||
|
name.erase(
|
||||||
|
std::remove_if(name.begin(), name.end(),
|
||||||
|
[](unsigned char c) { return !std::isalnum(c); }),
|
||||||
|
name.end());
|
||||||
|
|
||||||
|
display_info_list_.push_back(DisplayInfo(
|
||||||
|
(void*)display_, name, true, crtc_info->x, crtc_info->y,
|
||||||
|
crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height));
|
||||||
|
|
||||||
XRRFreeCrtcInfo(crtc_info);
|
XRRFreeCrtcInfo(crtc_info);
|
||||||
}
|
}
|
||||||
@@ -86,8 +100,9 @@ int ScreenCapturerX11::Destroy() {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ScreenCapturerX11::Start() {
|
int ScreenCapturerX11::Start(bool show_cursor) {
|
||||||
if (running_) return 0;
|
if (running_) return 0;
|
||||||
|
show_cursor_ = show_cursor;
|
||||||
running_ = true;
|
running_ = true;
|
||||||
paused_ = false;
|
paused_ = false;
|
||||||
thread_ = std::thread([this]() {
|
thread_ = std::thread([this]() {
|
||||||
@@ -144,6 +159,20 @@ void ScreenCapturerX11::OnFrame() {
|
|||||||
AllPlanes, ZPixmap);
|
AllPlanes, ZPixmap);
|
||||||
if (!image) return;
|
if (!image) return;
|
||||||
|
|
||||||
|
// if enable show cursor, draw cursor
|
||||||
|
if (show_cursor_) {
|
||||||
|
Window root_return, child_return;
|
||||||
|
int root_x, root_y, win_x, win_y;
|
||||||
|
unsigned int mask;
|
||||||
|
if (XQueryPointer(display_, root_, &root_return, &child_return, &root_x,
|
||||||
|
&root_y, &win_x, &win_y, &mask)) {
|
||||||
|
if (root_x >= left_ && root_x < left_ + width_ && root_y >= top_ &&
|
||||||
|
root_y < top_ + height_) {
|
||||||
|
DrawCursor(image, root_x - left_, root_y - top_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool needs_copy = image->bytes_per_line != width_ * 4;
|
bool needs_copy = image->bytes_per_line != width_ * 4;
|
||||||
std::vector<uint8_t> argb_buf;
|
std::vector<uint8_t> argb_buf;
|
||||||
uint8_t* src_argb = nullptr;
|
uint8_t* src_argb = nullptr;
|
||||||
@@ -174,4 +203,82 @@ void ScreenCapturerX11::OnFrame() {
|
|||||||
|
|
||||||
XDestroyImage(image);
|
XDestroyImage(image);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ScreenCapturerX11::DrawCursor(XImage* image, int x, int y) {
|
||||||
|
if (!display_ || !image) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// check XFixes extension
|
||||||
|
int event_base, error_base;
|
||||||
|
if (!XFixesQueryExtension(display_, &event_base, &error_base)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
XFixesCursorImage* cursor_image = XFixesGetCursorImage(display_);
|
||||||
|
if (!cursor_image) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int cursor_width = cursor_image->width;
|
||||||
|
int cursor_height = cursor_image->height;
|
||||||
|
|
||||||
|
int draw_x = x - cursor_image->xhot;
|
||||||
|
int draw_y = y - cursor_image->yhot;
|
||||||
|
|
||||||
|
// draw cursor on image
|
||||||
|
for (int cy = 0; cy < cursor_height; ++cy) {
|
||||||
|
for (int cx = 0; cx < cursor_width; ++cx) {
|
||||||
|
int img_x = draw_x + cx;
|
||||||
|
int img_y = draw_y + cy;
|
||||||
|
|
||||||
|
if (img_x < 0 || img_x >= image->width || img_y < 0 ||
|
||||||
|
img_y >= image->height) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long cursor_pixel = cursor_image->pixels[cy * cursor_width + cx];
|
||||||
|
unsigned char a = (cursor_pixel >> 24) & 0xFF;
|
||||||
|
|
||||||
|
// if alpha is 0, skip
|
||||||
|
if (a == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long img_pixel = XGetPixel(image, img_x, img_y);
|
||||||
|
|
||||||
|
unsigned char img_r = (img_pixel >> 16) & 0xFF;
|
||||||
|
unsigned char img_g = (img_pixel >> 8) & 0xFF;
|
||||||
|
unsigned char img_b = img_pixel & 0xFF;
|
||||||
|
|
||||||
|
unsigned char cursor_r = (cursor_pixel >> 16) & 0xFF;
|
||||||
|
unsigned char cursor_g = (cursor_pixel >> 8) & 0xFF;
|
||||||
|
unsigned char cursor_b = cursor_pixel & 0xFF;
|
||||||
|
|
||||||
|
// alpha mix
|
||||||
|
unsigned char final_r, final_g, final_b;
|
||||||
|
if (a == 255) {
|
||||||
|
// if alpha is 255, use cursor color
|
||||||
|
final_r = cursor_r;
|
||||||
|
final_g = cursor_g;
|
||||||
|
final_b = cursor_b;
|
||||||
|
} else {
|
||||||
|
float alpha = a / 255.0f;
|
||||||
|
float inv_alpha = 1.0f - alpha;
|
||||||
|
final_r =
|
||||||
|
static_cast<unsigned char>(cursor_r * alpha + img_r * inv_alpha);
|
||||||
|
final_g =
|
||||||
|
static_cast<unsigned char>(cursor_g * alpha + img_g * inv_alpha);
|
||||||
|
final_b =
|
||||||
|
static_cast<unsigned char>(cursor_b * alpha + img_b * inv_alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set pixel
|
||||||
|
unsigned long new_pixel = (final_r << 16) | (final_g << 8) | final_b;
|
||||||
|
XPutPixel(image, img_x, img_y, new_pixel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
XFree(cursor_image);
|
||||||
|
}
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/extensions/Xrandr.h>
|
#include <X11/extensions/Xrandr.h>
|
||||||
|
#include <X11/extensions/Xfixes.h>
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
@@ -30,7 +31,7 @@ class ScreenCapturerX11 : public ScreenCapturer {
|
|||||||
public:
|
public:
|
||||||
int Init(const int fps, cb_desktop_data cb) override;
|
int Init(const int fps, cb_desktop_data cb) override;
|
||||||
int Destroy() override;
|
int Destroy() override;
|
||||||
int Start() override;
|
int Start(bool show_cursor) override;
|
||||||
int Stop() override;
|
int Stop() override;
|
||||||
|
|
||||||
int Pause(int monitor_index) override;
|
int Pause(int monitor_index) override;
|
||||||
@@ -54,6 +55,7 @@ class ScreenCapturerX11 : public ScreenCapturer {
|
|||||||
std::atomic<bool> running_{false};
|
std::atomic<bool> running_{false};
|
||||||
std::atomic<bool> paused_{false};
|
std::atomic<bool> paused_{false};
|
||||||
std::atomic<int> monitor_index_{0};
|
std::atomic<int> monitor_index_{0};
|
||||||
|
std::atomic<bool> show_cursor_{true};
|
||||||
int fps_ = 60;
|
int fps_ = 60;
|
||||||
cb_desktop_data callback_;
|
cb_desktop_data callback_;
|
||||||
std::vector<DisplayInfo> display_info_list_;
|
std::vector<DisplayInfo> display_info_list_;
|
||||||
@@ -61,6 +63,9 @@ class ScreenCapturerX11 : public ScreenCapturer {
|
|||||||
// 缓冲区
|
// 缓冲区
|
||||||
std::vector<uint8_t> y_plane_;
|
std::vector<uint8_t> y_plane_;
|
||||||
std::vector<uint8_t> uv_plane_;
|
std::vector<uint8_t> uv_plane_;
|
||||||
|
|
||||||
|
// 鼠标光标相关
|
||||||
|
void DrawCursor(XImage* image, int x, int y);
|
||||||
};
|
};
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
#endif
|
||||||
@@ -28,8 +28,8 @@ int ScreenCapturerSck::Destroy() {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ScreenCapturerSck::Start() {
|
int ScreenCapturerSck::Start(bool show_cursor) {
|
||||||
screen_capturer_sck_impl_->Start();
|
screen_capturer_sck_impl_->Start(show_cursor);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ class ScreenCapturerSck : public ScreenCapturer {
|
|||||||
public:
|
public:
|
||||||
int Init(const int fps, cb_desktop_data cb) override;
|
int Init(const int fps, cb_desktop_data cb) override;
|
||||||
int Destroy() override;
|
int Destroy() override;
|
||||||
int Start() override;
|
int Start(bool show_cursor) override;
|
||||||
int Stop() override;
|
int Stop() override;
|
||||||
|
|
||||||
int Pause(int monitor_index) override;
|
int Pause(int monitor_index) override;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
|
|||||||
public:
|
public:
|
||||||
int Init(const int fps, cb_desktop_data cb) override;
|
int Init(const int fps, cb_desktop_data cb) override;
|
||||||
|
|
||||||
int Start() override;
|
int Start(bool show_cursor) override;
|
||||||
|
|
||||||
int SwitchTo(int monitor_index) override;
|
int SwitchTo(int monitor_index) override;
|
||||||
|
|
||||||
@@ -80,6 +80,7 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
|
|||||||
int width_ = 0;
|
int width_ = 0;
|
||||||
int height_ = 0;
|
int height_ = 0;
|
||||||
int fps_ = 60;
|
int fps_ = 60;
|
||||||
|
bool show_cursor_ = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Called by SckHelper when shareable content is returned by ScreenCaptureKit. `content` will be
|
// Called by SckHelper when shareable content is returned by ScreenCaptureKit. `content` will be
|
||||||
@@ -225,13 +226,17 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
|||||||
CGRect bounds = CGDisplayBounds(display_id);
|
CGRect bounds = CGDisplayBounds(display_id);
|
||||||
bool is_primary = CGDisplayIsMain(display_id);
|
bool is_primary = CGDisplayIsMain(display_id);
|
||||||
|
|
||||||
std::string name;
|
std::string name = GetDisplayName(display_id);
|
||||||
name = GetDisplayName(display_id);
|
|
||||||
|
|
||||||
if (name.empty()) {
|
if (name.empty()) {
|
||||||
name = "Display" + std::to_string(unnamed_count++);
|
name = "Display" + std::to_string(unnamed_count++);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// clean display name, remove non-alphanumeric characters
|
||||||
|
name.erase(
|
||||||
|
std::remove_if(name.begin(), name.end(), [](unsigned char c) { return !std::isalnum(c); }),
|
||||||
|
name.end());
|
||||||
|
|
||||||
DisplayInfo info((void *)(uintptr_t)display_id, name, is_primary,
|
DisplayInfo info((void *)(uintptr_t)display_id, name, is_primary,
|
||||||
static_cast<int>(bounds.origin.x), static_cast<int>(bounds.origin.y),
|
static_cast<int>(bounds.origin.x), static_cast<int>(bounds.origin.y),
|
||||||
static_cast<int>(bounds.origin.x + bounds.size.width),
|
static_cast<int>(bounds.origin.x + bounds.size.width),
|
||||||
@@ -246,7 +251,8 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ScreenCapturerSckImpl::Start() {
|
int ScreenCapturerSckImpl::Start(bool show_cursor) {
|
||||||
|
show_cursor_ = show_cursor;
|
||||||
StartOrReconfigureCapturer();
|
StartOrReconfigureCapturer();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -328,7 +334,7 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
|
|||||||
excludingWindows:@[]];
|
excludingWindows:@[]];
|
||||||
SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
|
SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
|
||||||
config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
||||||
config.showsCursor = false;
|
config.showsCursor = show_cursor_;
|
||||||
config.width = filter.contentRect.size.width * filter.pointPixelScale;
|
config.width = filter.contentRect.size.width * filter.pointPixelScale;
|
||||||
config.height = filter.contentRect.size.height * filter.pointPixelScale;
|
config.height = filter.contentRect.size.height * filter.pointPixelScale;
|
||||||
config.captureResolution = SCCaptureResolutionAutomatic;
|
config.captureResolution = SCCaptureResolutionAutomatic;
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class ScreenCapturer {
|
|||||||
public:
|
public:
|
||||||
virtual int Init(const int fps, cb_desktop_data cb) = 0;
|
virtual int Init(const int fps, cb_desktop_data cb) = 0;
|
||||||
virtual int Destroy() = 0;
|
virtual int Destroy() = 0;
|
||||||
virtual int Start() = 0;
|
virtual int Start(bool show_cursor) = 0;
|
||||||
virtual int Stop() = 0;
|
virtual int Stop() = 0;
|
||||||
virtual int Pause(int monitor_index) = 0;
|
virtual int Pause(int monitor_index) = 0;
|
||||||
virtual int Resume(int monitor_index) = 0;
|
virtual int Resume(int monitor_index) = 0;
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ int ScreenCapturerWgc::Init(const int fps, cb_desktop_data cb) {
|
|||||||
|
|
||||||
int ScreenCapturerWgc::Destroy() { return 0; }
|
int ScreenCapturerWgc::Destroy() { return 0; }
|
||||||
|
|
||||||
int ScreenCapturerWgc::Start() {
|
int ScreenCapturerWgc::Start(bool show_cursor) {
|
||||||
if (running_ == true) {
|
if (running_ == true) {
|
||||||
LOG_ERROR("Screen capturer already running");
|
LOG_ERROR("Screen capturer already running");
|
||||||
return 0;
|
return 0;
|
||||||
@@ -172,7 +172,7 @@ int ScreenCapturerWgc::Start() {
|
|||||||
if (sessions_[i].running_) {
|
if (sessions_[i].running_) {
|
||||||
LOG_ERROR("Session {} is already running", i);
|
LOG_ERROR("Session {} is already running", i);
|
||||||
} else {
|
} else {
|
||||||
sessions_[i].session_->Start();
|
sessions_[i].session_->Start(show_cursor);
|
||||||
|
|
||||||
if (i != 0) {
|
if (i != 0) {
|
||||||
sessions_[i].session_->Pause();
|
sessions_[i].session_->Pause();
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class ScreenCapturerWgc : public ScreenCapturer,
|
|||||||
|
|
||||||
int Init(const int fps, cb_desktop_data cb) override;
|
int Init(const int fps, cb_desktop_data cb) override;
|
||||||
int Destroy() override;
|
int Destroy() override;
|
||||||
int Start() override;
|
int Start(bool show_cursor) override;
|
||||||
int Stop() override;
|
int Stop() override;
|
||||||
|
|
||||||
int Pause(int monitor_index) override;
|
int Pause(int monitor_index) override;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class WgcSession {
|
|||||||
|
|
||||||
virtual void RegisterObserver(wgc_session_observer* observer) = 0;
|
virtual void RegisterObserver(wgc_session_observer* observer) = 0;
|
||||||
|
|
||||||
virtual int Start() = 0;
|
virtual int Start(bool show_cursor) = 0;
|
||||||
virtual int Stop() = 0;
|
virtual int Stop() = 0;
|
||||||
|
|
||||||
virtual int Pause() = 0;
|
virtual int Pause() = 0;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ void WgcSessionImpl::RegisterObserver(wgc_session_observer* observer) {
|
|||||||
observer_ = observer;
|
observer_ = observer;
|
||||||
}
|
}
|
||||||
|
|
||||||
int WgcSessionImpl::Start() {
|
int WgcSessionImpl::Start(bool show_cursor) {
|
||||||
std::lock_guard locker(lock_);
|
std::lock_guard locker(lock_);
|
||||||
|
|
||||||
if (is_running_) return 0;
|
if (is_running_) return 0;
|
||||||
@@ -91,7 +91,7 @@ int WgcSessionImpl::Start() {
|
|||||||
|
|
||||||
capture_session_.StartCapture();
|
capture_session_.StartCapture();
|
||||||
|
|
||||||
capture_session_.IsCursorCaptureEnabled(false);
|
capture_session_.IsCursorCaptureEnabled(show_cursor);
|
||||||
|
|
||||||
error = 0;
|
error = 0;
|
||||||
} catch (winrt::hresult_error) {
|
} catch (winrt::hresult_error) {
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class WgcSessionImpl : public WgcSession {
|
|||||||
|
|
||||||
void RegisterObserver(wgc_session_observer* observer) override;
|
void RegisterObserver(wgc_session_observer* observer) override;
|
||||||
|
|
||||||
int Start() override;
|
int Start(bool show_cursor) override;
|
||||||
int Stop() override;
|
int Stop() override;
|
||||||
|
|
||||||
int Pause() override;
|
int Pause() override;
|
||||||
|
|||||||
Submodule submodules/minirtc updated: 29ae03237f...0008123221
21
xmake.lua
21
xmake.lua
@@ -7,6 +7,12 @@ option("CROSSDESK_VERSION")
|
|||||||
set_description("Set CROSSDESK_VERSION for build")
|
set_description("Set CROSSDESK_VERSION for build")
|
||||||
option_end()
|
option_end()
|
||||||
|
|
||||||
|
option("USE_CUDA")
|
||||||
|
set_default(false)
|
||||||
|
set_showmenu(true)
|
||||||
|
set_description("Use CUDA for hardware codec acceleration")
|
||||||
|
option_end()
|
||||||
|
|
||||||
add_rules("mode.release", "mode.debug")
|
add_rules("mode.release", "mode.debug")
|
||||||
set_languages("c++17")
|
set_languages("c++17")
|
||||||
set_encodings("utf-8")
|
set_encodings("utf-8")
|
||||||
@@ -16,6 +22,8 @@ set_encodings("utf-8")
|
|||||||
-- add_cxxflags("/W4", "/WX")
|
-- add_cxxflags("/W4", "/WX")
|
||||||
|
|
||||||
add_defines("UNICODE")
|
add_defines("UNICODE")
|
||||||
|
add_defines("USE_CUDA=" .. (is_config("USE_CUDA", true) and "1" or "0"))
|
||||||
|
|
||||||
if is_mode("debug") then
|
if is_mode("debug") then
|
||||||
add_defines("CROSSDESK_DEBUG")
|
add_defines("CROSSDESK_DEBUG")
|
||||||
end
|
end
|
||||||
@@ -37,7 +45,7 @@ elseif is_os("linux") then
|
|||||||
add_links("pulse-simple", "pulse")
|
add_links("pulse-simple", "pulse")
|
||||||
add_requires("libyuv")
|
add_requires("libyuv")
|
||||||
add_syslinks("pthread", "dl")
|
add_syslinks("pthread", "dl")
|
||||||
add_links("SDL3", "asound", "X11", "Xtst", "Xrandr")
|
add_links("SDL3", "asound", "X11", "Xtst", "Xrandr", "Xfixes")
|
||||||
add_cxflags("-Wno-unused-variable")
|
add_cxflags("-Wno-unused-variable")
|
||||||
elseif is_os("macosx") then
|
elseif is_os("macosx") then
|
||||||
add_links("SDL3")
|
add_links("SDL3")
|
||||||
@@ -133,9 +141,15 @@ target("thumbnail")
|
|||||||
add_files("src/thumbnail/*.cpp")
|
add_files("src/thumbnail/*.cpp")
|
||||||
add_includedirs("src/thumbnail", {public = true})
|
add_includedirs("src/thumbnail", {public = true})
|
||||||
|
|
||||||
target("config_center")
|
target("autostart")
|
||||||
set_kind("object")
|
set_kind("object")
|
||||||
add_deps("rd_log")
|
add_deps("rd_log")
|
||||||
|
add_files("src/autostart/*.cpp")
|
||||||
|
add_includedirs("src/autostart", {public = true})
|
||||||
|
|
||||||
|
target("config_center")
|
||||||
|
set_kind("object")
|
||||||
|
add_deps("rd_log", "autostart")
|
||||||
add_files("src/config_center/*.cpp")
|
add_files("src/config_center/*.cpp")
|
||||||
add_includedirs("src/config_center", {public = true})
|
add_includedirs("src/config_center", {public = true})
|
||||||
|
|
||||||
@@ -173,4 +187,5 @@ target("gui")
|
|||||||
target("crossdesk")
|
target("crossdesk")
|
||||||
set_kind("binary")
|
set_kind("binary")
|
||||||
add_deps("rd_log", "common", "gui")
|
add_deps("rd_log", "common", "gui")
|
||||||
add_files("src/app/main.cpp")
|
add_files("src/app/*.cpp")
|
||||||
|
add_includedirs("src/app", {public = true})
|
||||||
Reference in New Issue
Block a user