mirror of
https://github.com/kunkundi/crossdesk.git
synced 2025-12-17 20:47:01 +08:00
Compare commits
33 Commits
web-client
...
fix/macos-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6c72fe558 | ||
|
|
a964c6bbf5 | ||
|
|
239da373d0 | ||
|
|
217cfb091d | ||
|
|
3c3c7b9ae0 | ||
|
|
f14bdb7fe8 | ||
|
|
c0a98f97c3 | ||
|
|
0ab6686eb8 | ||
|
|
76b475450b | ||
|
|
5d1e1b5667 | ||
|
|
c3b8b1374a | ||
|
|
7c940d6b15 | ||
|
|
86501b05dd | ||
|
|
01ebed9b37 | ||
|
|
2188adb1f1 | ||
|
|
51409e16c8 | ||
|
|
6ca3b58ae2 | ||
|
|
692e176e34 | ||
|
|
4fb7acaa61 | ||
|
|
c0d6429a54 | ||
|
|
07c7c7f179 | ||
|
|
c5ceeb0d80 | ||
|
|
5ce0a891df | ||
|
|
f94ef49210 | ||
|
|
5d0a4d1385 | ||
|
|
dd482cee60 | ||
|
|
e3c2edfb1c | ||
|
|
f3901d09ea | ||
|
|
2b12749477 | ||
|
|
759488f675 | ||
|
|
4bb4240a9e | ||
|
|
1457247a6a | ||
|
|
97ab9bfca5 |
27
.github/workflows/build.yml
vendored
27
.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,8 +340,8 @@ 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="${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
VERSION_NUM="${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
|
||||||
VERSION_WITH_V="v${VERSION_NUM}"
|
VERSION_WITH_V="v${VERSION_NUM}"
|
||||||
VERSION_ONLY="${VERSION#v}"
|
VERSION_ONLY="${VERSION#v}"
|
||||||
@@ -408,6 +408,9 @@ jobs:
|
|||||||
{
|
{
|
||||||
"version": "${{ steps.version.outputs.VERSION_ONLY }}",
|
"version": "${{ steps.version.outputs.VERSION_ONLY }}",
|
||||||
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
|
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
|
||||||
|
"releaseName": "",
|
||||||
|
"releaseNotes": "",
|
||||||
|
"tagName": "${{ steps.version.outputs.VERSION_WITH_V }}",
|
||||||
"downloads": {
|
"downloads": {
|
||||||
"windows-x64": {
|
"windows-x64": {
|
||||||
"url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe",
|
"url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe",
|
||||||
|
|||||||
140
.github/workflows/update-version-json.yml
vendored
Normal file
140
.github/workflows/update-version-json.yml
vendored
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
name: Update version.json from Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published, edited]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update-version-json:
|
||||||
|
name: Update version.json with release information
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract version from tag
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
TAG_NAME="${{ github.event.release.tag_name }}"
|
||||||
|
VERSION_ONLY="${TAG_NAME#v}"
|
||||||
|
echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_OUTPUT
|
||||||
|
echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Extract date from tag if available (format: v1.2.3-20251113-abc)
|
||||||
|
if [[ "${TAG_NAME}" =~ -([0-9]{8})- ]]; then
|
||||||
|
DATE_STR="${BASH_REMATCH[1]}"
|
||||||
|
BUILD_DATE_ISO="${DATE_STR:0:4}-${DATE_STR:4:2}-${DATE_STR:6:2}"
|
||||||
|
else
|
||||||
|
# Use release published date
|
||||||
|
BUILD_DATE_ISO=$(echo "${{ github.event.release.published_at }}" | cut -d'T' -f1)
|
||||||
|
fi
|
||||||
|
echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Install jq
|
||||||
|
run: sudo apt-get update && sudo apt-get install -y jq
|
||||||
|
|
||||||
|
- name: Get release information
|
||||||
|
id: release_info
|
||||||
|
run: |
|
||||||
|
# Use jq to properly escape JSON
|
||||||
|
RELEASE_BODY="${{ github.event.release.body }}"
|
||||||
|
RELEASE_NAME="${{ github.event.release.name }}"
|
||||||
|
|
||||||
|
# Handle empty values
|
||||||
|
if [ -z "$RELEASE_BODY" ]; then
|
||||||
|
RELEASE_BODY=""
|
||||||
|
fi
|
||||||
|
if [ -z "$RELEASE_NAME" ]; then
|
||||||
|
RELEASE_NAME=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Save to temporary files for proper handling
|
||||||
|
echo -n "$RELEASE_BODY" > /tmp/release_body.txt
|
||||||
|
echo -n "$RELEASE_NAME" > /tmp/release_name.txt
|
||||||
|
|
||||||
|
# Use jq to escape JSON strings
|
||||||
|
RELEASE_BODY_JSON=$(jq -Rs . < /tmp/release_body.txt)
|
||||||
|
RELEASE_NAME_JSON=$(jq -Rs . < /tmp/release_name.txt)
|
||||||
|
|
||||||
|
echo "RELEASE_BODY=${RELEASE_BODY_JSON}" >> $GITHUB_OUTPUT
|
||||||
|
echo "RELEASE_NAME=${RELEASE_NAME_JSON}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Download current version.json from server
|
||||||
|
id: download_version
|
||||||
|
continue-on-error: true
|
||||||
|
run: |
|
||||||
|
# Try to download current version.json from server
|
||||||
|
curl -f -s "https://version.crossdesk.cn/version.json" -o version.json || echo "Failed to download, will create new one"
|
||||||
|
|
||||||
|
- name: Generate or update version.json
|
||||||
|
run: |
|
||||||
|
# If version.json exists, try to preserve downloads section
|
||||||
|
if [ -f version.json ] && jq -e '.downloads' version.json > /dev/null 2>&1; then
|
||||||
|
EXISTING_DOWNLOADS=$(jq -c '.downloads' version.json)
|
||||||
|
if [ "$EXISTING_DOWNLOADS" != "null" ] && [ "$EXISTING_DOWNLOADS" != "{}" ]; then
|
||||||
|
DOWNLOADS_JSON="$EXISTING_DOWNLOADS"
|
||||||
|
else
|
||||||
|
DOWNLOADS_JSON=""
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
DOWNLOADS_JSON=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If downloads is empty, use default structure
|
||||||
|
if [ -z "$DOWNLOADS_JSON" ]; then
|
||||||
|
DOWNLOADS_JSON=$(cat << DOWNLOADS_EOF
|
||||||
|
{
|
||||||
|
"windows-x64": {
|
||||||
|
"url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe",
|
||||||
|
"filename": "crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe"
|
||||||
|
},
|
||||||
|
"macos-x64": {
|
||||||
|
"url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg",
|
||||||
|
"filename": "crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg"
|
||||||
|
},
|
||||||
|
"macos-arm64": {
|
||||||
|
"url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.TAG_NAME }}.pkg",
|
||||||
|
"filename": "crossdesk-macos-arm64-${{ steps.version.outputs.TAG_NAME }}.pkg"
|
||||||
|
},
|
||||||
|
"linux-amd64": {
|
||||||
|
"url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.TAG_NAME }}.deb",
|
||||||
|
"filename": "crossdesk-linux-amd64-${{ steps.version.outputs.TAG_NAME }}.deb"
|
||||||
|
},
|
||||||
|
"linux-arm64": {
|
||||||
|
"url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.TAG_NAME }}.deb",
|
||||||
|
"filename": "crossdesk-linux-arm64-${{ steps.version.outputs.TAG_NAME }}.deb"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DOWNLOADS_EOF
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Generate version.json using cat and heredoc
|
||||||
|
cat > version.json << EOF
|
||||||
|
{
|
||||||
|
"version": "${{ steps.version.outputs.VERSION_ONLY }}",
|
||||||
|
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
|
||||||
|
"releaseName": ${{ steps.release_info.outputs.RELEASE_NAME }},
|
||||||
|
"releaseNotes": ${{ steps.release_info.outputs.RELEASE_BODY }},
|
||||||
|
"tagName": "${{ steps.version.outputs.TAG_NAME }}",
|
||||||
|
"downloads": ${DOWNLOADS_JSON}
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat version.json
|
||||||
|
|
||||||
|
- name: Upload version.json to server
|
||||||
|
uses: burnett01/rsync-deployments@5.2
|
||||||
|
with:
|
||||||
|
switches: -avzr --delete
|
||||||
|
path: version.json
|
||||||
|
remote_path: /var/www/html/version/
|
||||||
|
remote_host: ${{ secrets.SERVER_HOST }}
|
||||||
|
remote_user: ${{ secrets.SERVER_USER }}
|
||||||
|
remote_key: ${{ secrets.SERVER_KEY }}
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,10 +1,10 @@
|
|||||||
# Xmake cache
|
# Xmake cache
|
||||||
.xmake/
|
.xmake/
|
||||||
build/
|
build/
|
||||||
|
certs/
|
||||||
|
|
||||||
# MacOS Cache
|
# MacOS Cache
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
# VSCode cache
|
# VSCode cache
|
||||||
.vscode
|
.vscode
|
||||||
continuous-desk.code-workspace
|
|
||||||
28
README.md
28
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
|
||||||
```
|
```
|
||||||
|
|
||||||
上述命令中,用户需注意的参数如下:
|
上述命令中,用户需注意的参数如下:
|
||||||
@@ -300,10 +315,10 @@ Generation complete. Deployment files::
|
|||||||
Server certificate: crossdesk.cn_bundle.crt
|
Server certificate: crossdesk.cn_bundle.crt
|
||||||
```
|
```
|
||||||
|
|
||||||
#### 服务端
|
### 服务端
|
||||||
将 **crossdesk.cn.key** 和 **crossdesk.cn_bundle.crt** 放置到 **/path/to/your/certs** 目录下。
|
将 **crossdesk.cn.key** 和 **crossdesk.cn_bundle.crt** 放置到 **/path/to/your/certs** 目录下。
|
||||||
|
|
||||||
#### 客户端
|
### 客户端
|
||||||
1. 点击右上角设置进入设置页面。<br>
|
1. 点击右上角设置进入设置页面。<br>
|
||||||
<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
|
<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
|
||||||
|
|
||||||
@@ -316,5 +331,8 @@ Generation complete. Deployment files::
|
|||||||
7. 勾选使用**自托管服务器配置**,点击确认配置生效。<br><br>
|
7. 勾选使用**自托管服务器配置**,点击确认配置生效。<br><br>
|
||||||
<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
|
<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
|
||||||
|
|
||||||
|
### Web 客户端
|
||||||
|
详情见项目 [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
|
||||||
|
|
||||||
# 常见问题
|
# 常见问题
|
||||||
见 [常见问题](https://github.com/kunkundi/crossdesk/blob/self-hosted-server/docs/FAQ.md) 。
|
见 [常见问题](https://github.com/kunkundi/crossdesk/blob/self-hosted-server/docs/FAQ.md) 。
|
||||||
|
|||||||
28
README_EN.md
28
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:
|
||||||
@@ -308,10 +323,10 @@ Generation complete. Deployment files::
|
|||||||
Server certificate: crossdesk.cn_bundle.crt
|
Server certificate: crossdesk.cn_bundle.crt
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Server Side
|
### Server Side
|
||||||
Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/your/certs** directory.
|
Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/your/certs** directory.
|
||||||
|
|
||||||
#### Client Side
|
### Client Side
|
||||||
1. Click the settings icon in the top-right corner to enter the settings page.<br>
|
1. Click the settings icon in the top-right corner to enter the settings page.<br>
|
||||||
<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
|
<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
|
||||||
|
|
||||||
@@ -324,5 +339,8 @@ Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/y
|
|||||||
4. Check the option to use **Self-Hosted Server Configuration**.<br><br>
|
4. Check the option to use **Self-Hosted Server Configuration**.<br><br>
|
||||||
<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
|
<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
|
||||||
|
|
||||||
|
### Web Client
|
||||||
|
See [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
|
||||||
|
|
||||||
# FAQ
|
# FAQ
|
||||||
See [FAQ](https://github.com/kunkundi/crosssesk/blob/self-hosted-server/docs/FAQ.md) .
|
See [FAQ](https://github.com/kunkundi/crosssesk/blob/self-hosted-server/docs/FAQ.md) .
|
||||||
|
|||||||
49
scripts/macosx/pkg_arm64.sh
Normal file → Executable file
49
scripts/macosx/pkg_arm64.sh
Normal file → Executable file
@@ -86,29 +86,66 @@ pkgbuild \
|
|||||||
--component "${APP_BUNDLE}" \
|
--component "${APP_BUNDLE}" \
|
||||||
build_pkg_temp/${APP_NAME}-component.pkg
|
build_pkg_temp/${APP_NAME}-component.pkg
|
||||||
|
|
||||||
mkdir -p scripts
|
mkdir -p build_pkg_scripts
|
||||||
|
|
||||||
cat > scripts/postinstall <<'EOF'
|
cat > build_pkg_scripts/postinstall <<'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
IDENTIFIER="cn.crossdesk.app"
|
||||||
|
|
||||||
|
# 获取当前登录用户
|
||||||
USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
|
USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
|
||||||
HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
|
HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
|
||||||
|
|
||||||
|
# 复制证书文件
|
||||||
DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
|
DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
|
||||||
|
|
||||||
mkdir -p "$DEST"
|
mkdir -p "$DEST"
|
||||||
cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
|
cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
|
||||||
|
|
||||||
|
# 清除应用的权限授权,以便重新授权
|
||||||
|
# 使用 tccutil 重置录屏权限和辅助功能权限
|
||||||
|
if command -v tccutil >/dev/null 2>&1; then
|
||||||
|
# 重置录屏权限
|
||||||
|
tccutil reset ScreenCapture "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置辅助功能权限
|
||||||
|
tccutil reset Accessibility "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置摄像头权限(如果需要)
|
||||||
|
tccutil reset Camera "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置麦克风权限(如果需要)
|
||||||
|
tccutil reset Microphone "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 为所有用户清除权限(可选,如果需要)
|
||||||
|
# 遍历所有用户目录并清除权限
|
||||||
|
for USER_DIR in /Users/*; do
|
||||||
|
if [ -d "$USER_DIR" ] && [ "$USER_DIR" != "/Users/Shared" ]; then
|
||||||
|
USER_NAME=$(basename "$USER_DIR")
|
||||||
|
# 跳过系统用户
|
||||||
|
if [ "$USER_NAME" != "Shared" ] && [ -d "$USER_DIR/Library" ]; then
|
||||||
|
# 删除 TCC 数据库中的相关条目(需要管理员权限)
|
||||||
|
TCC_DB="$USER_DIR/Library/Application Support/com.apple.TCC/TCC.db"
|
||||||
|
if [ -f "$TCC_DB" ]; then
|
||||||
|
# 使用 sqlite3 删除相关权限记录(如果可用)
|
||||||
|
if command -v sqlite3 >/dev/null 2>&1; then
|
||||||
|
sqlite3 "$TCC_DB" "DELETE FROM access WHERE client='$IDENTIFIER' AND service IN ('kTCCServiceScreenCapture', 'kTCCServiceAccessibility');" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
chmod +x scripts/postinstall
|
chmod +x build_pkg_scripts/postinstall
|
||||||
|
|
||||||
pkgbuild \
|
pkgbuild \
|
||||||
--root "${CERTS_SOURCE}" \
|
--root "${CERTS_SOURCE}" \
|
||||||
--identifier "${IDENTIFIER}.certs" \
|
--identifier "${IDENTIFIER}.certs" \
|
||||||
--version "${APP_VERSION}" \
|
--version "${APP_VERSION}" \
|
||||||
--install-location "/Library/Application Support/CrossDesk/certs" \
|
--install-location "/Library/Application Support/CrossDesk/certs" \
|
||||||
--scripts scripts \
|
--scripts build_pkg_scripts \
|
||||||
build_pkg_temp/${APP_NAME}-certs.pkg
|
build_pkg_temp/${APP_NAME}-certs.pkg
|
||||||
|
|
||||||
productbuild \
|
productbuild \
|
||||||
@@ -118,7 +155,7 @@ productbuild \
|
|||||||
|
|
||||||
echo "PKG package created: ${PKG_NAME}"
|
echo "PKG package created: ${PKG_NAME}"
|
||||||
|
|
||||||
rm -rf build_pkg_temp scripts ${APP_BUNDLE}
|
rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
|
||||||
|
|
||||||
echo "PKG package created successfully."
|
echo "PKG package created successfully."
|
||||||
echo "package ${APP_BUNDLE}"
|
echo "package ${APP_BUNDLE}"
|
||||||
|
|||||||
49
scripts/macosx/pkg_x64.sh
Normal file → Executable file
49
scripts/macosx/pkg_x64.sh
Normal file → Executable file
@@ -86,29 +86,66 @@ pkgbuild \
|
|||||||
--component "${APP_BUNDLE}" \
|
--component "${APP_BUNDLE}" \
|
||||||
build_pkg_temp/${APP_NAME}-component.pkg
|
build_pkg_temp/${APP_NAME}-component.pkg
|
||||||
|
|
||||||
mkdir -p scripts
|
mkdir -p build_pkg_scripts
|
||||||
|
|
||||||
cat > scripts/postinstall <<'EOF'
|
cat > build_pkg_scripts/postinstall <<'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
IDENTIFIER="cn.crossdesk.app"
|
||||||
|
|
||||||
|
# 获取当前登录用户
|
||||||
USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
|
USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
|
||||||
HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
|
HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
|
||||||
|
|
||||||
|
# 复制证书文件
|
||||||
DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
|
DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
|
||||||
|
|
||||||
mkdir -p "$DEST"
|
mkdir -p "$DEST"
|
||||||
cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
|
cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
|
||||||
|
|
||||||
|
# 清除应用的权限授权,以便重新授权
|
||||||
|
# 使用 tccutil 重置录屏权限和辅助功能权限
|
||||||
|
if command -v tccutil >/dev/null 2>&1; then
|
||||||
|
# 重置录屏权限
|
||||||
|
tccutil reset ScreenCapture "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置辅助功能权限
|
||||||
|
tccutil reset Accessibility "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置摄像头权限(如果需要)
|
||||||
|
tccutil reset Camera "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
# 重置麦克风权限(如果需要)
|
||||||
|
tccutil reset Microphone "$IDENTIFIER" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 为所有用户清除权限(可选,如果需要)
|
||||||
|
# 遍历所有用户目录并清除权限
|
||||||
|
for USER_DIR in /Users/*; do
|
||||||
|
if [ -d "$USER_DIR" ] && [ "$USER_DIR" != "/Users/Shared" ]; then
|
||||||
|
USER_NAME=$(basename "$USER_DIR")
|
||||||
|
# 跳过系统用户
|
||||||
|
if [ "$USER_NAME" != "Shared" ] && [ -d "$USER_DIR/Library" ]; then
|
||||||
|
# 删除 TCC 数据库中的相关条目(需要管理员权限)
|
||||||
|
TCC_DB="$USER_DIR/Library/Application Support/com.apple.TCC/TCC.db"
|
||||||
|
if [ -f "$TCC_DB" ]; then
|
||||||
|
# 使用 sqlite3 删除相关权限记录(如果可用)
|
||||||
|
if command -v sqlite3 >/dev/null 2>&1; then
|
||||||
|
sqlite3 "$TCC_DB" "DELETE FROM access WHERE client='$IDENTIFIER' AND service IN ('kTCCServiceScreenCapture', 'kTCCServiceAccessibility');" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
chmod +x scripts/postinstall
|
chmod +x build_pkg_scripts/postinstall
|
||||||
|
|
||||||
pkgbuild \
|
pkgbuild \
|
||||||
--root "${CERTS_SOURCE}" \
|
--root "${CERTS_SOURCE}" \
|
||||||
--identifier "${IDENTIFIER}.certs" \
|
--identifier "${IDENTIFIER}.certs" \
|
||||||
--version "${APP_VERSION}" \
|
--version "${APP_VERSION}" \
|
||||||
--install-location "/Library/Application Support/CrossDesk/certs" \
|
--install-location "/Library/Application Support/CrossDesk/certs" \
|
||||||
--scripts scripts \
|
--scripts build_pkg_scripts \
|
||||||
build_pkg_temp/${APP_NAME}-certs.pkg
|
build_pkg_temp/${APP_NAME}-certs.pkg
|
||||||
|
|
||||||
productbuild \
|
productbuild \
|
||||||
@@ -118,7 +155,7 @@ productbuild \
|
|||||||
|
|
||||||
echo "PKG package created: ${PKG_NAME}"
|
echo "PKG package created: ${PKG_NAME}"
|
||||||
|
|
||||||
rm -rf build_pkg_temp scripts ${APP_BUNDLE}
|
rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
|
||||||
|
|
||||||
echo "PKG package created successfully."
|
echo "PKG package created successfully."
|
||||||
echo "package ${APP_BUNDLE}"
|
echo "package ${APP_BUNDLE}"
|
||||||
|
|||||||
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;
|
||||||
}
|
}
|
||||||
@@ -53,6 +53,7 @@ int ConfigCenter::Load() {
|
|||||||
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
||||||
enable_autostart_ =
|
enable_autostart_ =
|
||||||
ini_.GetBoolValue(section_, "enable_autostart", 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_);
|
||||||
|
|
||||||
@@ -76,6 +77,7 @@ int ConfigCenter::Save() {
|
|||||||
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_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_);
|
||||||
|
|
||||||
@@ -249,6 +251,18 @@ int ConfigCenter::SetAutostart(bool enable_autostart) {
|
|||||||
return 0;
|
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_; }
|
||||||
@@ -304,4 +318,6 @@ 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::IsEnableAutostart() const { return enable_autostart_; }
|
||||||
|
|
||||||
|
bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
@@ -41,6 +41,7 @@ class ConfigCenter {
|
|||||||
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 SetAutostart(bool enable_autostart);
|
||||||
|
int SetDaemon(bool enable_daemon);
|
||||||
|
|
||||||
// read config
|
// read config
|
||||||
|
|
||||||
@@ -62,6 +63,7 @@ class ConfigCenter {
|
|||||||
bool IsSelfHosted() const;
|
bool IsSelfHosted() const;
|
||||||
bool IsMinimizeToTray() const;
|
bool IsMinimizeToTray() const;
|
||||||
bool IsEnableAutostart() const;
|
bool IsEnableAutostart() const;
|
||||||
|
bool IsEnableDaemon() const;
|
||||||
|
|
||||||
int Load();
|
int Load();
|
||||||
int Save();
|
int Save();
|
||||||
@@ -77,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";
|
||||||
@@ -89,6 +91,7 @@ class ConfigCenter {
|
|||||||
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_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,12 +124,23 @@ 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_) {
|
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_) {
|
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() {
|
||||||
UnhookWindowsHookEx(keyboard_hook_);
|
if (keyboard_hook_) {
|
||||||
|
g_on_key_action = nullptr;
|
||||||
|
g_user_ptr = nullptr;
|
||||||
|
UnhookWindowsHookEx(keyboard_hook_);
|
||||||
|
keyboard_hook_ = nullptr;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -20,6 +20,15 @@
|
|||||||
#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
|
||||||
|
#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
|
#if _WIN32
|
||||||
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
||||||
@@ -27,6 +36,7 @@
|
|||||||
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
||||||
#endif
|
#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
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
|
||||||
@@ -49,6 +59,8 @@
|
|||||||
#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_CN 171
|
||||||
#define ENABLE_AUTOSTART_PADDING_EN 218
|
#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
|
||||||
@@ -61,5 +73,19 @@
|
|||||||
#define SETTINGS_OK_BUTTON_PADDING_EN 83
|
#define SETTINGS_OK_BUTTON_PADDING_EN 83
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78
|
#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91
|
#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91
|
||||||
|
#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162
|
||||||
|
#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 130
|
||||||
|
#elif __APPLE__
|
||||||
|
#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 100
|
||||||
|
#else
|
||||||
|
#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 100
|
||||||
|
#endif
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90
|
||||||
|
#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210
|
||||||
#endif
|
#endif
|
||||||
@@ -158,12 +158,18 @@ static std::vector<std::string> no_such_id = {
|
|||||||
|
|
||||||
static std::vector<std::string> about = {
|
static std::vector<std::string> about = {
|
||||||
reinterpret_cast<const char*>(u8"关于"), "About"};
|
reinterpret_cast<const char*>(u8"关于"), "About"};
|
||||||
|
static std::vector<std::string> notification = {
|
||||||
|
reinterpret_cast<const char*>(u8"通知"), "Notification"};
|
||||||
static std::vector<std::string> new_version_available = {
|
static std::vector<std::string> new_version_available = {
|
||||||
reinterpret_cast<const char*>(u8"新版本可用"), "New Version Available"};
|
reinterpret_cast<const char*>(u8"新版本可用"), "New Version Available"};
|
||||||
static std::vector<std::string> version = {
|
static std::vector<std::string> version = {
|
||||||
reinterpret_cast<const char*>(u8"版本"), "Version"};
|
reinterpret_cast<const char*>(u8"版本"), "Version"};
|
||||||
|
static std::vector<std::string> release_date = {
|
||||||
|
reinterpret_cast<const char*>(u8"发布日期: "), "Release Date: "};
|
||||||
static std::vector<std::string> access_website = {
|
static std::vector<std::string> access_website = {
|
||||||
reinterpret_cast<const char*>(u8"访问官网: "), "Access Website: "};
|
reinterpret_cast<const char*>(u8"访问官网: "), "Access Website: "};
|
||||||
|
static std::vector<std::string> update = {
|
||||||
|
reinterpret_cast<const char*>(u8"更新"), "Update"};
|
||||||
|
|
||||||
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"确认删除此连接"),
|
||||||
@@ -171,12 +177,30 @@ static std::vector<std::string> confirm_delete_connection = {
|
|||||||
|
|
||||||
static std::vector<std::string> enable_autostart = {
|
static std::vector<std::string> enable_autostart = {
|
||||||
reinterpret_cast<const char*>(u8"开机自启:"), "Auto Start:"};
|
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
|
#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:"};
|
||||||
static std::vector<LPCWSTR> exit_program = {L"退出", L"Exit"};
|
static std::vector<LPCWSTR> exit_program = {L"退出", L"Exit"};
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __APPLE__
|
||||||
|
static std::vector<std::string> request_permissions = {
|
||||||
|
reinterpret_cast<const char*>(u8"权限请求"), "Request Permissions"};
|
||||||
|
static std::vector<std::string> screen_recording_permission = {
|
||||||
|
reinterpret_cast<const char*>(u8"屏幕录制权限"),
|
||||||
|
"Screen Recording Permission"};
|
||||||
|
static std::vector<std::string> accessibility_permission = {
|
||||||
|
reinterpret_cast<const char*>(u8"辅助功能权限"),
|
||||||
|
"Accessibility Permission"};
|
||||||
|
static std::vector<std::string> permission_required_message = {
|
||||||
|
reinterpret_cast<const char*>(u8"该应用需要授权以下权限:"),
|
||||||
|
"The application requires the following permissions:"};
|
||||||
|
#endif
|
||||||
} // namespace localization
|
} // namespace localization
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
#endif
|
||||||
@@ -101,12 +101,21 @@ int Render::RemoteWindow() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check every 1 second for rejoin
|
||||||
if (need_to_rejoin_) {
|
if (need_to_rejoin_) {
|
||||||
need_to_rejoin_ = false;
|
auto now = std::chrono::steady_clock::now();
|
||||||
for (const auto& [_, props] : client_properties_) {
|
auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
if (props->rejoin_) {
|
now - last_rejoin_check_time_)
|
||||||
ConnectTo(props->remote_id_, props->remote_password_,
|
.count();
|
||||||
props->remember_password_);
|
|
||||||
|
if (elapsed >= 1000) {
|
||||||
|
last_rejoin_check_time_ = now;
|
||||||
|
need_to_rejoin_ = false;
|
||||||
|
for (const auto& [_, props] : client_properties_) {
|
||||||
|
if (props->rejoin_) {
|
||||||
|
ConnectTo(props->remote_id_, props->remote_password_,
|
||||||
|
props->remember_password_);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ SDL_HitTestResult Render::HitTestCallback(SDL_Window* window,
|
|||||||
return SDL_HITTEST_NORMAL;
|
return SDL_HITTEST_NORMAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Render::Render() {}
|
Render::Render() : last_rejoin_check_time_(std::chrono::steady_clock::now()) {}
|
||||||
|
|
||||||
Render::~Render() {}
|
Render::~Render() {}
|
||||||
|
|
||||||
@@ -261,6 +261,7 @@ int Render::LoadSettingsFromCacheFile() {
|
|||||||
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_autostart_ = config_center_->IsEnableAutostart();
|
||||||
|
enable_daemon_ = config_center_->IsEnableDaemon();
|
||||||
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
||||||
|
|
||||||
language_button_value_last_ = language_button_value_;
|
language_button_value_last_ = language_button_value_;
|
||||||
@@ -735,6 +736,51 @@ int Render::SetupFontAndStyle() {
|
|||||||
static const ImWchar icon_ranges[] = {ICON_MIN_FA, ICON_MAX_FA, 0};
|
static const ImWchar icon_ranges[] = {ICON_MIN_FA, ICON_MAX_FA, 0};
|
||||||
io.Fonts->AddFontFromMemoryTTF(fa_solid_900_ttf, fa_solid_900_ttf_len, 30.0f,
|
io.Fonts->AddFontFromMemoryTTF(fa_solid_900_ttf, fa_solid_900_ttf_len, 30.0f,
|
||||||
&config, icon_ranges);
|
&config, icon_ranges);
|
||||||
|
|
||||||
|
// Load system Chinese font as fallback
|
||||||
|
config.MergeMode = false;
|
||||||
|
config.FontDataOwnedByAtlas = false;
|
||||||
|
system_chinese_font_ = nullptr;
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
// Windows: Try Microsoft YaHei (微软雅黑) first, then SimSun (宋体)
|
||||||
|
const char* font_paths[] = {"C:/Windows/Fonts/msyh.ttc",
|
||||||
|
"C:/Windows/Fonts/msyhbd.ttc",
|
||||||
|
"C:/Windows/Fonts/simsun.ttc", nullptr};
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
// macOS: Try PingFang SC first, then STHeiti
|
||||||
|
const char* font_paths[] = {"/System/Library/Fonts/PingFang.ttc",
|
||||||
|
"/System/Library/Fonts/STHeiti Light.ttc",
|
||||||
|
"/System/Library/Fonts/STHeiti Medium.ttc",
|
||||||
|
nullptr};
|
||||||
|
#else
|
||||||
|
// Linux: Try common Chinese fonts
|
||||||
|
const char* font_paths[] = {
|
||||||
|
"/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
|
||||||
|
"/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
|
||||||
|
"/usr/share/fonts/truetype/arphic/uming.ttc",
|
||||||
|
"/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc", nullptr};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
for (int i = 0; font_paths[i] != nullptr; i++) {
|
||||||
|
std::ifstream font_file(font_paths[i], std::ios::binary);
|
||||||
|
if (font_file.good()) {
|
||||||
|
font_file.close();
|
||||||
|
system_chinese_font_ = io.Fonts->AddFontFromFileTTF(
|
||||||
|
font_paths[i], 32.0f, &config, io.Fonts->GetGlyphRangesChineseFull());
|
||||||
|
if (system_chinese_font_ != nullptr) {
|
||||||
|
LOG_INFO("Loaded system Chinese font: {}", font_paths[i]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no system font found, use default font
|
||||||
|
if (system_chinese_font_ == nullptr) {
|
||||||
|
system_chinese_font_ = io.Fonts->AddFontDefault(&config);
|
||||||
|
LOG_WARN("System Chinese font not found, using default font");
|
||||||
|
}
|
||||||
|
|
||||||
io.Fonts->Build();
|
io.Fonts->Build();
|
||||||
ImGui::StyleColorsLight();
|
ImGui::StyleColorsLight();
|
||||||
|
|
||||||
@@ -847,6 +893,14 @@ int Render::DrawMainWindow() {
|
|||||||
|
|
||||||
MainWindow();
|
MainWindow();
|
||||||
|
|
||||||
|
UpdateNotificationWindow();
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
if (show_request_permission_window_) {
|
||||||
|
RequestPermissionWindow();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
|
|
||||||
// Rendering
|
// Rendering
|
||||||
@@ -912,8 +966,25 @@ int Render::DrawStreamWindow() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int Render::Run() {
|
int Render::Run() {
|
||||||
latest_version_ = CheckUpdate();
|
latest_version_info_ = CheckUpdate();
|
||||||
update_available_ = IsNewerVersion(CROSSDESK_VERSION, latest_version_);
|
if (!latest_version_info_.empty() &&
|
||||||
|
latest_version_info_.contains("version") &&
|
||||||
|
latest_version_info_["version"].is_string()) {
|
||||||
|
latest_version_ = latest_version_info_["version"];
|
||||||
|
if (latest_version_info_.contains("releaseNotes") &&
|
||||||
|
latest_version_info_["releaseNotes"].is_string()) {
|
||||||
|
release_notes_ = latest_version_info_["releaseNotes"];
|
||||||
|
} else {
|
||||||
|
release_notes_ = "";
|
||||||
|
}
|
||||||
|
update_available_ = IsNewerVersion(CROSSDESK_VERSION, latest_version_);
|
||||||
|
if (update_available_) {
|
||||||
|
show_update_notification_window_ = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
latest_version_ = "";
|
||||||
|
update_available_ = false;
|
||||||
|
}
|
||||||
|
|
||||||
path_manager_ = std::make_unique<PathManager>("CrossDesk");
|
path_manager_ = std::make_unique<PathManager>("CrossDesk");
|
||||||
if (path_manager_) {
|
if (path_manager_) {
|
||||||
@@ -940,6 +1011,8 @@ int Render::Run() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
InitializeLogger();
|
InitializeLogger();
|
||||||
|
LOG_INFO("CrossDesk version: {}", CROSSDESK_VERSION);
|
||||||
|
|
||||||
InitializeSettings();
|
InitializeSettings();
|
||||||
InitializeSDL();
|
InitializeSDL();
|
||||||
InitializeModules();
|
InitializeModules();
|
||||||
@@ -1339,6 +1412,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 {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
@@ -151,6 +152,7 @@ class Render {
|
|||||||
int CreateStreamRenderWindow();
|
int CreateStreamRenderWindow();
|
||||||
int TitleBar(bool main_window);
|
int TitleBar(bool main_window);
|
||||||
int MainWindow();
|
int MainWindow();
|
||||||
|
int UpdateNotificationWindow();
|
||||||
int StreamWindow();
|
int StreamWindow();
|
||||||
int LocalWindow();
|
int LocalWindow();
|
||||||
int RemoteWindow();
|
int RemoteWindow();
|
||||||
@@ -165,6 +167,8 @@ class Render {
|
|||||||
bool ConnectionStatusWindow(
|
bool ConnectionStatusWindow(
|
||||||
std::shared_ptr<SubStreamWindowProperties>& props);
|
std::shared_ptr<SubStreamWindowProperties>& props);
|
||||||
int ShowRecentConnections();
|
int ShowRecentConnections();
|
||||||
|
void Hyperlink(const std::string& label, const std::string& url,
|
||||||
|
const float window_width);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int ConnectTo(const std::string& remote_id, const char* password,
|
int ConnectTo(const std::string& remote_id, const char* password,
|
||||||
@@ -184,6 +188,14 @@ class Render {
|
|||||||
int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
|
int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
|
||||||
void DrawConnectionStatusText(
|
void DrawConnectionStatusText(
|
||||||
std::shared_ptr<SubStreamWindowProperties>& props);
|
std::shared_ptr<SubStreamWindowProperties>& props);
|
||||||
|
#ifdef __APPLE__
|
||||||
|
int RequestPermissionWindow();
|
||||||
|
bool CheckScreenRecordingPermission();
|
||||||
|
bool CheckAccessibilityPermission();
|
||||||
|
void OpenScreenRecordingPreferences();
|
||||||
|
void OpenAccessibilityPreferences();
|
||||||
|
bool DrawToggleSwitch(const char* id, bool active, bool enabled);
|
||||||
|
#endif
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static void OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
|
static void OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
|
||||||
@@ -300,6 +312,7 @@ class Render {
|
|||||||
SDL_Window* main_window_ = nullptr;
|
SDL_Window* main_window_ = nullptr;
|
||||||
SDL_Renderer* main_renderer_ = nullptr;
|
SDL_Renderer* main_renderer_ = nullptr;
|
||||||
ImGuiContext* main_ctx_ = nullptr;
|
ImGuiContext* main_ctx_ = nullptr;
|
||||||
|
ImFont* system_chinese_font_ = nullptr; // System Chinese font for fallback
|
||||||
bool exit_ = false;
|
bool exit_ = false;
|
||||||
const int sdl_refresh_ms_ = 16; // ~60 FPS
|
const int sdl_refresh_ms_ = 16; // ~60 FPS
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
@@ -307,8 +320,10 @@ class Render {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// main window properties
|
// main window properties
|
||||||
std::string latest_version_ = "";
|
nlohmann::json latest_version_info_ = nlohmann::json{};
|
||||||
bool update_available_ = false;
|
bool update_available_ = false;
|
||||||
|
std::string latest_version_ = "";
|
||||||
|
std::string release_notes_ = "";
|
||||||
bool start_mouse_controller_ = false;
|
bool start_mouse_controller_ = false;
|
||||||
bool mouse_controller_is_started_ = false;
|
bool mouse_controller_is_started_ = false;
|
||||||
bool start_screen_capturer_ = false;
|
bool start_screen_capturer_ = false;
|
||||||
@@ -349,6 +364,8 @@ class Render {
|
|||||||
float notification_window_height_ = 80;
|
float notification_window_height_ = 80;
|
||||||
float about_window_width_ = 300;
|
float about_window_width_ = 300;
|
||||||
float about_window_height_ = 170;
|
float about_window_height_ = 170;
|
||||||
|
float update_notification_window_width_ = 400;
|
||||||
|
float update_notification_window_height_ = 320;
|
||||||
int screen_width_ = 1280;
|
int screen_width_ = 1280;
|
||||||
int screen_height_ = 720;
|
int screen_height_ = 720;
|
||||||
int selected_display_ = 0;
|
int selected_display_ = 0;
|
||||||
@@ -362,6 +379,7 @@ class Render {
|
|||||||
int audio_len_ = 0;
|
int audio_len_ = 0;
|
||||||
bool audio_buffer_fresh_ = false;
|
bool audio_buffer_fresh_ = false;
|
||||||
bool need_to_rejoin_ = false;
|
bool need_to_rejoin_ = false;
|
||||||
|
std::chrono::steady_clock::time_point last_rejoin_check_time_;
|
||||||
bool just_created_ = false;
|
bool just_created_ = false;
|
||||||
std::string controlled_remote_id_ = "";
|
std::string controlled_remote_id_ = "";
|
||||||
std::string focused_remote_id_ = "";
|
std::string focused_remote_id_ = "";
|
||||||
@@ -404,6 +422,7 @@ class Render {
|
|||||||
bool show_about_window_ = false;
|
bool show_about_window_ = false;
|
||||||
bool show_connection_status_window_ = false;
|
bool show_connection_status_window_ = false;
|
||||||
bool show_reset_password_window_ = false;
|
bool show_reset_password_window_ = false;
|
||||||
|
bool show_update_notification_window_ = false;
|
||||||
bool fullscreen_button_pressed_ = false;
|
bool fullscreen_button_pressed_ = false;
|
||||||
bool focus_on_input_widget_ = true;
|
bool focus_on_input_widget_ = true;
|
||||||
bool is_client_mode_ = false;
|
bool is_client_mode_ = false;
|
||||||
@@ -439,6 +458,9 @@ class Render {
|
|||||||
bool show_new_version_icon_in_menu_ = true;
|
bool show_new_version_icon_in_menu_ = true;
|
||||||
uint64_t new_version_icon_last_trigger_time_ = 0;
|
uint64_t new_version_icon_last_trigger_time_ = 0;
|
||||||
uint64_t new_version_icon_render_start_time_ = 0;
|
uint64_t new_version_icon_render_start_time_ = 0;
|
||||||
|
#ifdef __APPLE__
|
||||||
|
bool show_request_permission_window_ = true;
|
||||||
|
#endif
|
||||||
char client_id_[10] = "";
|
char client_id_[10] = "";
|
||||||
char client_id_display_[12] = "";
|
char client_id_display_[12] = "";
|
||||||
char client_id_with_password_[17] = "";
|
char client_id_with_password_[17] = "";
|
||||||
@@ -448,7 +470,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";
|
||||||
@@ -460,11 +482,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_ = false;
|
||||||
bool enable_autostart_last_ = 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();
|
||||||
}
|
}
|
||||||
@@ -458,12 +469,12 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
|
|||||||
render->need_to_send_host_info_ = true;
|
render->need_to_send_host_info_ = true;
|
||||||
render->start_screen_capturer_ = true;
|
render->start_screen_capturer_ = true;
|
||||||
render->start_speaker_capturer_ = true;
|
render->start_speaker_capturer_ = true;
|
||||||
#ifdef CROSSDESK_DEBUG
|
// #ifdef CROSSDESK_DEBUG
|
||||||
render->start_mouse_controller_ = false;
|
// render->start_mouse_controller_ = false;
|
||||||
render->start_keyboard_capturer_ = false;
|
// render->start_keyboard_capturer_ = false;
|
||||||
#else
|
// #else
|
||||||
render->start_mouse_controller_ = true;
|
render->start_mouse_controller_ = true;
|
||||||
#endif
|
// #endif
|
||||||
if (std::all_of(render->connection_status_.begin(),
|
if (std::all_of(render->connection_status_.begin(),
|
||||||
render->connection_status_.end(), [](const auto& kv) {
|
render->connection_status_.end(), [](const auto& kv) {
|
||||||
return kv.first.find("web") != std::string::npos;
|
return kv.first.find("web") != std::string::npos;
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
void Hyperlink(const std::string& label, const std::string& url,
|
void Render::Hyperlink(const std::string& label, const std::string& url,
|
||||||
const float window_width) {
|
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::SetCursorPosX(window_width * 0.1f);
|
||||||
ImGui::Text("%s", label.c_str());
|
ImGui::Text("%s", label.c_str());
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
@@ -252,6 +254,34 @@ int Render::SettingWindow() {
|
|||||||
ImGui::SetCursorPosY(settings_items_offset);
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
|
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();
|
||||||
|
|
||||||
@@ -373,6 +403,13 @@ int Render::SettingWindow() {
|
|||||||
}
|
}
|
||||||
enable_autostart_last_ = enable_autostart_;
|
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 _WIN32
|
||||||
if (enable_minimize_to_tray_) {
|
if (enable_minimize_to_tray_) {
|
||||||
config_center_->SetMinimizeToTray(true);
|
config_center_->SetMinimizeToTray(true);
|
||||||
|
|||||||
205
src/gui/windows/request_permission_window.mm
Normal file
205
src/gui/windows/request_permission_window.mm
Normal file
@@ -0,0 +1,205 @@
|
|||||||
|
#include "layout.h"
|
||||||
|
#include "localization.h"
|
||||||
|
#include "rd_log.h"
|
||||||
|
#include "render.h"
|
||||||
|
|
||||||
|
#include <ApplicationServices/ApplicationServices.h>
|
||||||
|
#include <CoreGraphics/CoreGraphics.h>
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
|
namespace crossdesk {
|
||||||
|
|
||||||
|
bool Render::DrawToggleSwitch(const char* id, bool active, bool enabled) {
|
||||||
|
const float TRACK_HEIGHT = ImGui::GetFrameHeight();
|
||||||
|
const float TRACK_WIDTH = TRACK_HEIGHT * 1.8f;
|
||||||
|
const float TRACK_RADIUS = TRACK_HEIGHT * 0.5f;
|
||||||
|
const float KNOB_PADDING = 2.0f;
|
||||||
|
const float KNOB_HEIGHT = TRACK_HEIGHT - 4.0f;
|
||||||
|
const float KNOB_WIDTH = KNOB_HEIGHT * 1.2f;
|
||||||
|
const float KNOB_RADIUS = KNOB_HEIGHT * 0.5f;
|
||||||
|
const float DISABLED_ALPHA = 0.6f;
|
||||||
|
const float KNOB_ALPHA_DISABLED = 0.9f;
|
||||||
|
|
||||||
|
const ImVec4 COLOR_ACTIVE = ImVec4(0.0f, 0.0f, 1.0f, 1.0f);
|
||||||
|
const ImVec4 COLOR_ACTIVE_HOVER = ImVec4(0.26f, 0.59f, 0.98f, 1.0f);
|
||||||
|
const ImVec4 COLOR_INACTIVE = ImVec4(0.60f, 0.60f, 0.60f, 1.0f);
|
||||||
|
const ImVec4 COLOR_INACTIVE_HOVER = ImVec4(0.70f, 0.70f, 0.70f, 1.0f);
|
||||||
|
const ImVec4 COLOR_KNOB = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||||
|
|
||||||
|
ImDrawList* draw_list = ImGui::GetWindowDrawList();
|
||||||
|
ImVec2 track_pos = ImGui::GetCursorScreenPos();
|
||||||
|
|
||||||
|
ImGui::InvisibleButton(id, ImVec2(TRACK_WIDTH, TRACK_HEIGHT));
|
||||||
|
bool hovered = ImGui::IsItemHovered();
|
||||||
|
bool clicked = ImGui::IsItemClicked() && enabled;
|
||||||
|
|
||||||
|
ImVec4 track_color = active ? (hovered && enabled ? COLOR_ACTIVE_HOVER : COLOR_ACTIVE)
|
||||||
|
: (hovered && enabled ? COLOR_INACTIVE_HOVER : COLOR_INACTIVE);
|
||||||
|
|
||||||
|
if (!enabled) {
|
||||||
|
track_color.w *= DISABLED_ALPHA;
|
||||||
|
}
|
||||||
|
|
||||||
|
ImVec2 track_min = ImVec2(track_pos.x, track_pos.y + 0.5f);
|
||||||
|
ImVec2 track_max = ImVec2(track_pos.x + TRACK_WIDTH, track_pos.y + TRACK_HEIGHT - 0.5f);
|
||||||
|
draw_list->AddRectFilled(track_min, track_max, ImGui::GetColorU32(track_color), TRACK_RADIUS);
|
||||||
|
|
||||||
|
float knob_position = active ? 1.0f : 0.0f;
|
||||||
|
float knob_min_x = track_pos.x + KNOB_PADDING;
|
||||||
|
float knob_max_x = track_pos.x + TRACK_WIDTH - KNOB_WIDTH - KNOB_PADDING;
|
||||||
|
float knob_x = knob_min_x + knob_position * (knob_max_x - knob_min_x);
|
||||||
|
float knob_y = track_pos.y + (TRACK_HEIGHT - KNOB_HEIGHT) * 0.5f;
|
||||||
|
|
||||||
|
ImVec4 knob_color = COLOR_KNOB;
|
||||||
|
if (!enabled) {
|
||||||
|
knob_color.w = KNOB_ALPHA_DISABLED;
|
||||||
|
}
|
||||||
|
|
||||||
|
ImVec2 knob_min = ImVec2(knob_x, knob_y);
|
||||||
|
ImVec2 knob_max = ImVec2(knob_x + KNOB_WIDTH, knob_y + KNOB_HEIGHT);
|
||||||
|
draw_list->AddRectFilled(knob_min, knob_max, ImGui::GetColorU32(knob_color), KNOB_RADIUS);
|
||||||
|
|
||||||
|
return clicked;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Render::CheckScreenRecordingPermission() {
|
||||||
|
// CGPreflightScreenCaptureAccess is available on macOS 10.15+
|
||||||
|
if (@available(macOS 10.15, *)) {
|
||||||
|
bool granted = CGPreflightScreenCaptureAccess();
|
||||||
|
return granted;
|
||||||
|
}
|
||||||
|
// for older macOS versions, assume permission is granted
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Render::CheckAccessibilityPermission() {
|
||||||
|
NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @NO};
|
||||||
|
bool trusted = AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
|
||||||
|
return trusted;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Render::OpenAccessibilityPreferences() {
|
||||||
|
NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @YES};
|
||||||
|
AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
|
||||||
|
|
||||||
|
system("open "
|
||||||
|
"\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
|
||||||
|
"Accessibility\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
void Render::OpenScreenRecordingPreferences() {
|
||||||
|
if (@available(macOS 10.15, *)) {
|
||||||
|
CGRequestScreenCaptureAccess();
|
||||||
|
}
|
||||||
|
|
||||||
|
system("open "
|
||||||
|
"\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
|
||||||
|
"ScreenCapture\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
int Render::RequestPermissionWindow() {
|
||||||
|
bool screen_recording_granted = CheckScreenRecordingPermission();
|
||||||
|
bool accessibility_granted = CheckAccessibilityPermission();
|
||||||
|
|
||||||
|
show_request_permission_window_ = !screen_recording_granted || !accessibility_granted;
|
||||||
|
|
||||||
|
if (!show_request_permission_window_) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ImGuiViewport* viewport = ImGui::GetMainViewport();
|
||||||
|
float window_width = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_WIDTH_CN
|
||||||
|
: REQUEST_PERMISSION_WINDOW_WIDTH_EN;
|
||||||
|
float window_height = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_HEIGHT_CN
|
||||||
|
: REQUEST_PERMISSION_WINDOW_HEIGHT_EN;
|
||||||
|
|
||||||
|
float checkbox_padding = localization_language_index_ == 0
|
||||||
|
? REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN
|
||||||
|
: REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN;
|
||||||
|
|
||||||
|
ImVec2 center_pos = ImVec2((viewport->WorkSize.x - window_width) * 0.5f + viewport->WorkPos.x,
|
||||||
|
(viewport->WorkSize.y - window_height) * 0.5f + viewport->WorkPos.y);
|
||||||
|
ImGui::SetNextWindowPos(center_pos, ImGuiCond_Once);
|
||||||
|
|
||||||
|
ImGui::SetNextWindowSize(ImVec2(window_width, window_height), ImGuiCond_Always);
|
||||||
|
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
|
||||||
|
|
||||||
|
ImGui::Begin(
|
||||||
|
localization::request_permissions[localization_language_index_].c_str(), nullptr,
|
||||||
|
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings);
|
||||||
|
|
||||||
|
ImGui::SetWindowFontScale(0.3f);
|
||||||
|
|
||||||
|
// use system font
|
||||||
|
if (system_chinese_font_ != nullptr) {
|
||||||
|
ImGui::PushFont(system_chinese_font_);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() + 5.0f);
|
||||||
|
ImGui::SetCursorPosX(10.0f);
|
||||||
|
ImGui::TextWrapped(
|
||||||
|
"%s", localization::permission_required_message[localization_language_index_].c_str());
|
||||||
|
|
||||||
|
ImGui::Spacing();
|
||||||
|
ImGui::Spacing();
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
// accessibility permission
|
||||||
|
ImGui::SetCursorPosX(10.0f);
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::Text("1. %s:",
|
||||||
|
localization::accessibility_permission[localization_language_index_].c_str());
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::SetCursorPosX(checkbox_padding);
|
||||||
|
if (accessibility_granted) {
|
||||||
|
DrawToggleSwitch("accessibility_toggle_on", true, false);
|
||||||
|
} else {
|
||||||
|
if (DrawToggleSwitch("accessibility_toggle", accessibility_granted, !accessibility_granted)) {
|
||||||
|
OpenAccessibilityPreferences();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
// screen recording permission
|
||||||
|
ImGui::SetCursorPosX(10.0f);
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::Text("2. %s:",
|
||||||
|
localization::screen_recording_permission[localization_language_index_].c_str());
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::SetCursorPosX(checkbox_padding);
|
||||||
|
if (screen_recording_granted) {
|
||||||
|
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10.0f);
|
||||||
|
DrawToggleSwitch("screen_recording_toggle_on", true, false);
|
||||||
|
} else {
|
||||||
|
if (DrawToggleSwitch("screen_recording_toggle", screen_recording_granted,
|
||||||
|
!screen_recording_granted)) {
|
||||||
|
OpenScreenRecordingPreferences();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::SetWindowFontScale(0.45f);
|
||||||
|
|
||||||
|
// pop system font
|
||||||
|
if (system_chinese_font_ != nullptr) {
|
||||||
|
ImGui::PopFont();
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::End();
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::PopStyleVar(4);
|
||||||
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
} // namespace crossdesk
|
||||||
209
src/gui/windows/update_notification_window.cpp
Normal file
209
src/gui/windows/update_notification_window.cpp
Normal file
@@ -0,0 +1,209 @@
|
|||||||
|
#include <algorithm>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "layout.h"
|
||||||
|
#include "localization.h"
|
||||||
|
#include "rd_log.h"
|
||||||
|
#include "render.h"
|
||||||
|
|
||||||
|
namespace crossdesk {
|
||||||
|
|
||||||
|
std::string CleanMarkdown(const std::string& markdown) {
|
||||||
|
std::string result = markdown;
|
||||||
|
|
||||||
|
// remove # title mark
|
||||||
|
size_t pos = 0;
|
||||||
|
while (pos < result.length()) {
|
||||||
|
if (result[pos] == '\n' || pos == 0) {
|
||||||
|
size_t line_start = (result[pos] == '\n') ? pos + 1 : pos;
|
||||||
|
if (line_start < result.length() && result[line_start] == '#') {
|
||||||
|
size_t hash_end = line_start;
|
||||||
|
while (hash_end < result.length() &&
|
||||||
|
(result[hash_end] == '#' || result[hash_end] == ' ')) {
|
||||||
|
hash_end++;
|
||||||
|
}
|
||||||
|
|
||||||
|
result.erase(line_start, hash_end - line_start);
|
||||||
|
pos = line_start;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pos++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove ** bold mark
|
||||||
|
pos = 0;
|
||||||
|
while ((pos = result.find("**", pos)) != std::string::npos) {
|
||||||
|
result.erase(pos, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove all spaces
|
||||||
|
result.erase(std::remove(result.begin(), result.end(), ' '), result.end());
|
||||||
|
|
||||||
|
// replace . with 、
|
||||||
|
pos = 0;
|
||||||
|
while ((pos = result.find('.', pos)) != std::string::npos) {
|
||||||
|
result.replace(pos, 1, "、");
|
||||||
|
pos += 1; // Move to next position after the replacement
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Render::UpdateNotificationWindow() {
|
||||||
|
if (show_update_notification_window_ && update_available_) {
|
||||||
|
const ImGuiViewport* viewport = ImGui::GetMainViewport();
|
||||||
|
|
||||||
|
float window_width = update_notification_window_width_;
|
||||||
|
float window_height = update_notification_window_height_;
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
float font_scale = 0.3f;
|
||||||
|
#else
|
||||||
|
float font_scale = 0.5f;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ImGui::SetNextWindowPos(
|
||||||
|
ImVec2(
|
||||||
|
(viewport->WorkSize.x - viewport->WorkPos.x - window_width) / 2,
|
||||||
|
(viewport->WorkSize.y - viewport->WorkPos.y - window_height) / 2),
|
||||||
|
ImGuiCond_FirstUseEver);
|
||||||
|
|
||||||
|
ImGui::SetNextWindowSize(ImVec2(window_width, window_height));
|
||||||
|
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
|
||||||
|
ImGui::Begin(
|
||||||
|
localization::notification[localization_language_index_].c_str(),
|
||||||
|
nullptr,
|
||||||
|
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
|
||||||
|
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar);
|
||||||
|
|
||||||
|
if (system_chinese_font_ != nullptr) {
|
||||||
|
ImGui::PushFont(system_chinese_font_);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() +
|
||||||
|
5.0f);
|
||||||
|
|
||||||
|
// title: new version available
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.1f);
|
||||||
|
ImGui::SetWindowFontScale(font_scale + 0.2f);
|
||||||
|
std::string title =
|
||||||
|
localization::new_version_available[localization_language_index_] +
|
||||||
|
": v" + latest_version_;
|
||||||
|
ImGui::Text("%s", title.c_str());
|
||||||
|
ImGui::SetWindowFontScale(font_scale);
|
||||||
|
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
// website link
|
||||||
|
std::string download_text =
|
||||||
|
localization::access_website[localization_language_index_] +
|
||||||
|
"https://crossdesk.cn";
|
||||||
|
Hyperlink(download_text, "https://crossdesk.cn", window_width);
|
||||||
|
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
float scrollable_height =
|
||||||
|
window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
|
||||||
|
|
||||||
|
// scrollable content area
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.05f);
|
||||||
|
ImGui::BeginChild("ScrollableContent",
|
||||||
|
ImVec2(window_width * 0.9f, scrollable_height),
|
||||||
|
ImGuiChildFlags_Border, ImGuiWindowFlags_None);
|
||||||
|
|
||||||
|
// set text wrap position to current available width (accounts for
|
||||||
|
// scrollbar)
|
||||||
|
float wrap_pos = ImGui::GetContentRegionAvail().x;
|
||||||
|
ImGui::PushTextWrapPos(wrap_pos);
|
||||||
|
|
||||||
|
// release name
|
||||||
|
if (latest_version_info_.contains("releaseName") &&
|
||||||
|
latest_version_info_["releaseName"].is_string() &&
|
||||||
|
!latest_version_info_["releaseName"].empty()) {
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.05f);
|
||||||
|
std::string release_name =
|
||||||
|
latest_version_info_["releaseName"].get<std::string>();
|
||||||
|
ImGui::TextWrapped("%s", release_name.c_str());
|
||||||
|
ImGui::Spacing();
|
||||||
|
}
|
||||||
|
|
||||||
|
// release notes
|
||||||
|
if (!release_notes_.empty()) {
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.05f);
|
||||||
|
std::string cleaned_notes = CleanMarkdown(release_notes_);
|
||||||
|
ImGui::TextWrapped("%s", cleaned_notes.c_str());
|
||||||
|
ImGui::Spacing();
|
||||||
|
}
|
||||||
|
|
||||||
|
// release date
|
||||||
|
if (latest_version_info_.contains("releaseDate") &&
|
||||||
|
latest_version_info_["releaseDate"].is_string() &&
|
||||||
|
!latest_version_info_["releaseDate"].empty()) {
|
||||||
|
ImGui::SetCursorPosX(window_width * 0.05f);
|
||||||
|
std::string date_label =
|
||||||
|
localization::release_date[localization_language_index_];
|
||||||
|
std::string release_date = latest_version_info_["releaseDate"];
|
||||||
|
std::string date_text = date_label + release_date;
|
||||||
|
ImGui::Text("%s", date_text.c_str());
|
||||||
|
ImGui::Spacing();
|
||||||
|
}
|
||||||
|
|
||||||
|
// pop text wrap position
|
||||||
|
ImGui::PopTextWrapPos();
|
||||||
|
|
||||||
|
ImGui::EndChild();
|
||||||
|
|
||||||
|
ImGui::Spacing();
|
||||||
|
|
||||||
|
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
|
||||||
|
ImGui::SetCursorPosX(UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN);
|
||||||
|
} else {
|
||||||
|
ImGui::SetCursorPosX(UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN);
|
||||||
|
}
|
||||||
|
|
||||||
|
// update button
|
||||||
|
if (ImGui::Button(
|
||||||
|
localization::update[localization_language_index_].c_str())) {
|
||||||
|
// open download page
|
||||||
|
std::string url = "https://crossdesk.cn";
|
||||||
|
#if defined(_WIN32)
|
||||||
|
std::string cmd = "start " + url;
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
std::string cmd = "open " + url;
|
||||||
|
#else
|
||||||
|
std::string cmd = "xdg-open " + url;
|
||||||
|
#endif
|
||||||
|
system(cmd.c_str());
|
||||||
|
show_update_notification_window_ = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SameLine();
|
||||||
|
|
||||||
|
if (ImGui::Button(
|
||||||
|
localization::cancel[localization_language_index_].c_str())) {
|
||||||
|
show_update_notification_window_ = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::SetWindowFontScale(font_scale);
|
||||||
|
|
||||||
|
// pop system font
|
||||||
|
if (system_chinese_font_ != nullptr) {
|
||||||
|
ImGui::PopFont();
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::End();
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::PopStyleVar(3);
|
||||||
|
ImGui::PopStyleColor();
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace crossdesk
|
||||||
@@ -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>
|
||||||
|
|
||||||
@@ -100,6 +102,7 @@ int ScreenCapturerX11::Destroy() {
|
|||||||
|
|
||||||
int ScreenCapturerX11::Start(bool show_cursor) {
|
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]() {
|
||||||
@@ -156,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;
|
||||||
@@ -186,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
|
||||||
@@ -196,14 +196,26 @@ ScreenCapturerSckImpl::~ScreenCapturerSckImpl() {
|
|||||||
|
|
||||||
int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
||||||
_on_data = cb;
|
_on_data = cb;
|
||||||
|
fps_ = fps;
|
||||||
|
|
||||||
|
if (@available(macOS 10.15, *)) {
|
||||||
|
bool has_permission = CGPreflightScreenCaptureAccess();
|
||||||
|
if (!has_permission) {
|
||||||
|
LOG_ERROR("Screen recording permission not granted");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dispatch_semaphore_t sema = dispatch_semaphore_create(0);
|
dispatch_semaphore_t sema = dispatch_semaphore_create(0);
|
||||||
__block SCShareableContent *content = nil;
|
__block SCShareableContent *content = nil;
|
||||||
|
__block NSError *capture_error = nil;
|
||||||
|
|
||||||
[SCShareableContent
|
[SCShareableContent
|
||||||
getShareableContentWithCompletionHandler:^(SCShareableContent *result, NSError *error) {
|
getShareableContentWithCompletionHandler:^(SCShareableContent *result, NSError *error) {
|
||||||
if (error) {
|
if (error) {
|
||||||
NSLog(@"Failed to get shareable content: %@", error);
|
capture_error = error;
|
||||||
|
LOG_ERROR("Failed to get shareable content: {}",
|
||||||
|
std::string([error.localizedDescription UTF8String]));
|
||||||
} else {
|
} else {
|
||||||
content = result;
|
content = result;
|
||||||
}
|
}
|
||||||
@@ -211,9 +223,10 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
|||||||
}];
|
}];
|
||||||
dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
|
dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
|
||||||
|
|
||||||
if (!content || content.displays.count == 0) {
|
if (capture_error || !content || content.displays.count == 0) {
|
||||||
LOG_ERROR("Failed to get display info");
|
LOG_ERROR("Failed to get display info, error: {}",
|
||||||
return 0;
|
std::string([capture_error.localizedDescription UTF8String]));
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
CGDirectDisplayID displays[10];
|
CGDirectDisplayID displays[10];
|
||||||
@@ -252,6 +265,16 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int ScreenCapturerSckImpl::Start(bool show_cursor) {
|
int ScreenCapturerSckImpl::Start(bool show_cursor) {
|
||||||
|
if (permanent_error_) {
|
||||||
|
LOG_ERROR("Cannot start capturer: permanent error occurred");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (display_info_list_.empty()) {
|
||||||
|
LOG_ERROR("Cannot start capturer: display info not initialized");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
show_cursor_ = show_cursor;
|
show_cursor_ = show_cursor;
|
||||||
StartOrReconfigureCapturer();
|
StartOrReconfigureCapturer();
|
||||||
return 0;
|
return 0;
|
||||||
@@ -307,17 +330,17 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!content.displays.count) {
|
if (!content.displays || content.displays.count == 0) {
|
||||||
LOG_ERROR("getShareableContent returned no displays");
|
LOG_ERROR("getShareableContent returned no displays");
|
||||||
permanent_error_ = true;
|
permanent_error_ = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SCDisplay *captured_display;
|
SCDisplay *captured_display = nil;
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(lock_);
|
std::lock_guard<std::mutex> lock(lock_);
|
||||||
for (SCDisplay *display in content.displays) {
|
for (SCDisplay *display in content.displays) {
|
||||||
if (current_display_ == display.displayID) {
|
if (current_display_ != 0 && current_display_ == display.displayID) {
|
||||||
LOG_WARN("current display: {}, name: {}", current_display_,
|
LOG_WARN("current display: {}, name: {}", current_display_,
|
||||||
display_id_name_map_[current_display_]);
|
display_id_name_map_[current_display_]);
|
||||||
captured_display = display;
|
captured_display = display;
|
||||||
@@ -326,13 +349,33 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
|
|||||||
}
|
}
|
||||||
if (!captured_display) {
|
if (!captured_display) {
|
||||||
captured_display = content.displays.firstObject;
|
captured_display = content.displays.firstObject;
|
||||||
current_display_ = captured_display.displayID;
|
if (captured_display) {
|
||||||
|
current_display_ = captured_display.displayID;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!captured_display) {
|
||||||
|
LOG_ERROR("Failed to find valid display");
|
||||||
|
permanent_error_ = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SCContentFilter *filter = [[SCContentFilter alloc] initWithDisplay:captured_display
|
SCContentFilter *filter = [[SCContentFilter alloc] initWithDisplay:captured_display
|
||||||
excludingWindows:@[]];
|
excludingWindows:@[]];
|
||||||
|
if (!filter) {
|
||||||
|
LOG_ERROR("Failed to create SCContentFilter");
|
||||||
|
permanent_error_ = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
|
SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
|
||||||
|
if (!config) {
|
||||||
|
LOG_ERROR("Failed to create SCStreamConfiguration");
|
||||||
|
permanent_error_ = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
||||||
config.showsCursor = show_cursor_;
|
config.showsCursor = show_cursor_;
|
||||||
config.width = filter.contentRect.size.width * filter.pointPixelScale;
|
config.width = filter.contentRect.size.width * filter.pointPixelScale;
|
||||||
@@ -423,11 +466,28 @@ void ScreenCapturerSckImpl::OnNewCVPixelBuffer(CVPixelBufferRef pixelBuffer,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
|
void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
|
||||||
// The copy is needed to avoid capturing `this` in the Objective-C block. Accessing `helper_`
|
if (permanent_error_) {
|
||||||
// inside the block is equivalent to `this->helper_` and would crash (UAF) if `this` is
|
LOG_ERROR("Cannot reconfigure capturer: permanent error occurred");
|
||||||
// deleted before the block is executed.
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (@available(macOS 10.15, *)) {
|
||||||
|
bool has_permission = CGPreflightScreenCaptureAccess();
|
||||||
|
if (!has_permission) {
|
||||||
|
LOG_ERROR("Screen recording permission not granted");
|
||||||
|
permanent_error_ = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SckHelper *local_helper = helper_;
|
SckHelper *local_helper = helper_;
|
||||||
auto handler = ^(SCShareableContent *content, NSError *error) {
|
auto handler = ^(SCShareableContent *content, NSError *error) {
|
||||||
|
if (error) {
|
||||||
|
LOG_ERROR("getShareableContent failed: {}",
|
||||||
|
std::string([error.localizedDescription UTF8String]));
|
||||||
|
[local_helper onShareableContentCreated:nil];
|
||||||
|
return;
|
||||||
|
}
|
||||||
[local_helper onShareableContentCreated:content];
|
[local_helper onShareableContentCreated:content];
|
||||||
};
|
};
|
||||||
[SCShareableContent getShareableContentWithCompletionHandler:handler];
|
[SCShareableContent getShareableContentWithCompletionHandler:handler];
|
||||||
|
|||||||
@@ -4,19 +4,15 @@
|
|||||||
* Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
|
* Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _VERSION_CHECKER_H_
|
#include "version_checker.h"
|
||||||
#define _VERSION_CHECKER_H_
|
|
||||||
|
|
||||||
#include <httplib.h>
|
#include <httplib.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <nlohmann/json.hpp>
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
using json = nlohmann::json;
|
|
||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
static std::string latest_release_date_ = "";
|
static std::string latest_release_date_ = "";
|
||||||
@@ -129,7 +125,7 @@ bool IsNewerVersionWithDate(const std::string& current_version,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CheckUpdate() {
|
nlohmann::json CheckUpdate() {
|
||||||
httplib::Client cli("https://version.crossdesk.cn");
|
httplib::Client cli("https://version.crossdesk.cn");
|
||||||
|
|
||||||
cli.set_connection_timeout(5);
|
cli.set_connection_timeout(5);
|
||||||
@@ -138,28 +134,25 @@ std::string CheckUpdate() {
|
|||||||
if (auto res = cli.Get("/version.json")) {
|
if (auto res = cli.Get("/version.json")) {
|
||||||
if (res->status == 200) {
|
if (res->status == 200) {
|
||||||
try {
|
try {
|
||||||
auto j = json::parse(res->body);
|
auto j = nlohmann::json::parse(res->body);
|
||||||
std::string latest = j["version"];
|
|
||||||
if (j.contains("releaseDate") && j["releaseDate"].is_string()) {
|
if (j.contains("releaseDate") && j["releaseDate"].is_string()) {
|
||||||
latest_release_date_ = j["releaseDate"];
|
latest_release_date_ = j["releaseDate"];
|
||||||
} else {
|
} else {
|
||||||
latest_release_date_ = "";
|
latest_release_date_ = "";
|
||||||
}
|
}
|
||||||
return latest;
|
return j;
|
||||||
} catch (std::exception&) {
|
} catch (std::exception&) {
|
||||||
latest_release_date_ = "";
|
latest_release_date_ = "";
|
||||||
return "";
|
return nlohmann::json{};
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
latest_release_date_ = "";
|
latest_release_date_ = "";
|
||||||
return "";
|
return nlohmann::json{};
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
latest_release_date_ = "";
|
latest_release_date_ = "";
|
||||||
return "";
|
return nlohmann::json{};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetLatestReleaseDate() { return latest_release_date_; }
|
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
|
||||||
@@ -7,11 +7,12 @@
|
|||||||
#ifndef _VERSION_CHECKER_H_
|
#ifndef _VERSION_CHECKER_H_
|
||||||
#define _VERSION_CHECKER_H_
|
#define _VERSION_CHECKER_H_
|
||||||
|
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
std::string CheckUpdate();
|
nlohmann::json CheckUpdate();
|
||||||
|
|
||||||
bool IsNewerVersion(const std::string& current, const std::string& latest);
|
bool IsNewerVersion(const std::string& current, const std::string& latest);
|
||||||
|
|
||||||
|
|||||||
Submodule submodules/minirtc updated: 29ae03237f...0008123221
15
xmake.lua
15
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")
|
||||||
@@ -174,9 +182,12 @@ target("gui")
|
|||||||
if is_os("windows") then
|
if is_os("windows") then
|
||||||
add_files("src/gui/tray/*.cpp")
|
add_files("src/gui/tray/*.cpp")
|
||||||
add_includedirs("src/gui/tray", {public = true})
|
add_includedirs("src/gui/tray", {public = true})
|
||||||
|
elseif is_os("macosx") then
|
||||||
|
add_files("src/gui/windows/*.mm")
|
||||||
end
|
end
|
||||||
|
|
||||||
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