Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68214db744 | ||
|
|
6c8146e79c | ||
|
|
aa812b0da7 | ||
|
|
3840ea9f62 | ||
|
|
7ce7260305 | ||
|
|
48adcf33ee | ||
|
|
21e7a39c53 | ||
|
|
f126f4b55c | ||
|
|
4daf5cfc65 | ||
|
|
0990049241 | ||
|
|
6d5133e1bd | ||
|
|
9d88b74c04 | ||
|
|
49ee12f5a1 | ||
|
|
ac3cebc9ae | ||
|
|
8f83b0c8d9 | ||
|
|
ac1deac148 | ||
|
|
b28adf8cbe | ||
|
|
317df68d1f | ||
|
|
fce69b8be9 | ||
|
|
f3ea7f12a3 | ||
|
|
30f0134748 | ||
|
|
a89748be67 | ||
|
|
4b4b7d68f2 | ||
|
|
793fdd9366 | ||
|
|
27cc3a3bb2 | ||
|
|
c1c23d115a | ||
|
|
f54c2e9bcd | ||
|
|
ae9928782d | ||
|
|
2485ffb14f |
@@ -1 +1,3 @@
|
||||
/build/
|
||||
/dist/
|
||||
/.flatpak-builder/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.21)
|
||||
|
||||
project(OrbitHub VERSION 0.1.0 LANGUAGES CXX)
|
||||
project(OrbitHub VERSION 2026.9.8 LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
@@ -10,6 +10,8 @@ set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
find_package(Qt6 6.2 REQUIRED COMPONENTS Widgets Sql)
|
||||
|
||||
qt_standard_project_setup()
|
||||
@@ -40,7 +42,8 @@ set(CHANNEL_DISP ON CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_DISP_CLIENT ON CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_AINPUT OFF CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_AUDIN OFF CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_CLIPRDR OFF CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_CLIPRDR ON CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_CLIPRDR_CLIENT ON CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_DRIVE OFF CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_ECHO OFF CACHE BOOL "" FORCE)
|
||||
set(CHANNEL_ENCOMSP OFF CACHE BOOL "" FORCE)
|
||||
@@ -75,7 +78,7 @@ set(WITH_WINPR_TOOLS OFF CACHE BOOL "" FORCE)
|
||||
|
||||
add_subdirectory(third_party/FreeRDP EXCLUDE_FROM_ALL)
|
||||
|
||||
add_executable(orbithub
|
||||
set(ORBITHUB_SOURCES
|
||||
src/about_dialog.cpp
|
||||
src/about_dialog.h
|
||||
src/app_icon.cpp
|
||||
@@ -108,6 +111,24 @@ add_executable(orbithub
|
||||
src/unsupported_session_backend.h
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
list(APPEND ORBITHUB_SOURCES packaging/windows/orbithub.rc)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
list(APPEND ORBITHUB_SOURCES packaging/macos/orbithub.icns)
|
||||
set_source_files_properties(packaging/macos/orbithub.icns PROPERTIES
|
||||
MACOSX_PACKAGE_LOCATION "Resources"
|
||||
)
|
||||
set(MACOSX_BUNDLE_ICON_FILE orbithub.icns)
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME "OrbitHub")
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.darksingularity.OrbitHub")
|
||||
set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}")
|
||||
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
|
||||
endif()
|
||||
|
||||
add_executable(orbithub WIN32 MACOSX_BUNDLE ${ORBITHUB_SOURCES})
|
||||
|
||||
target_link_libraries(orbithub PRIVATE Qt6::Widgets Qt6::Sql)
|
||||
target_link_libraries(orbithub PRIVATE KodoTerm::KodoTerm)
|
||||
if(TARGET freerdp AND TARGET winpr)
|
||||
@@ -126,4 +147,114 @@ else()
|
||||
message(FATAL_ERROR "Vendored FreeRDP targets were not produced as expected.")
|
||||
endif()
|
||||
|
||||
install(TARGETS orbithub RUNTIME DESTINATION bin)
|
||||
# Qt loads platform integration and SQL driver plugins dynamically at
|
||||
# runtime (QFactoryLoader), so they never appear in orbithub.exe's import
|
||||
# table. vcpkg's automatic DLL deployment only follows the import table, so
|
||||
# these plugins have to be copied out explicitly or the app fails to start
|
||||
# with "Could not find the Qt platform plugin" / "can not load requested
|
||||
# driver 'QSQLITE'".
|
||||
if(WIN32)
|
||||
if(TARGET Qt6::QWindowsIntegrationPlugin)
|
||||
add_custom_command(TARGET orbithub POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"$<TARGET_FILE_DIR:orbithub>/platforms"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"$<TARGET_FILE:Qt6::QWindowsIntegrationPlugin>"
|
||||
"$<TARGET_FILE_DIR:orbithub>/platforms/"
|
||||
COMMENT "Deploying Qt Windows platform plugin"
|
||||
)
|
||||
install(FILES "$<TARGET_FILE:Qt6::QWindowsIntegrationPlugin>"
|
||||
DESTINATION "${CMAKE_INSTALL_BINDIR}/platforms"
|
||||
)
|
||||
endif()
|
||||
|
||||
if(TARGET Qt6::QSQLiteDriverPlugin)
|
||||
add_custom_command(TARGET orbithub POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"$<TARGET_FILE_DIR:orbithub>/sqldrivers"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"$<TARGET_FILE:Qt6::QSQLiteDriverPlugin>"
|
||||
"$<TARGET_FILE_DIR:orbithub>/sqldrivers/"
|
||||
COMMENT "Deploying Qt SQLite driver plugin"
|
||||
)
|
||||
install(FILES "$<TARGET_FILE:Qt6::QSQLiteDriverPlugin>"
|
||||
DESTINATION "${CMAKE_INSTALL_BINDIR}/sqldrivers"
|
||||
)
|
||||
|
||||
# vcpkg's qtbase[sql-sqlite] links the plugin against vcpkg's own
|
||||
# shared sqlite3 port rather than bundling SQLite into the plugin,
|
||||
# so the plugin fails to load ("can not load requested driver
|
||||
# 'QSQLITE'") unless sqlite3.dll also ships next to the executable.
|
||||
find_file(ORBITHUB_SQLITE3_DLL
|
||||
NAMES sqlite3.dll
|
||||
PATHS ${CMAKE_PREFIX_PATH}
|
||||
PATH_SUFFIXES bin
|
||||
)
|
||||
if(ORBITHUB_SQLITE3_DLL)
|
||||
add_custom_command(TARGET orbithub POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"${ORBITHUB_SQLITE3_DLL}"
|
||||
"$<TARGET_FILE_DIR:orbithub>/"
|
||||
COMMENT "Deploying sqlite3.dll (Qt SQLite plugin dependency)"
|
||||
)
|
||||
install(FILES "${ORBITHUB_SQLITE3_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
# Mirrors macdeployqt's own layout for Qt frameworks: dylibs live in
|
||||
# Contents/Frameworks inside the bundle, found via @executable_path
|
||||
# (the macOS/dyld equivalent of Linux's $ORIGIN token, which dyld
|
||||
# does not understand).
|
||||
set_target_properties(orbithub PROPERTIES
|
||||
INSTALL_RPATH "@executable_path/../Frameworks"
|
||||
INSTALL_RPATH_USE_LINK_PATH ON
|
||||
)
|
||||
else()
|
||||
set_target_properties(orbithub PROPERTIES
|
||||
BUILD_RPATH_USE_ORIGIN ON
|
||||
INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/orbithub"
|
||||
INSTALL_RPATH_USE_LINK_PATH ON
|
||||
)
|
||||
endif()
|
||||
|
||||
install(TARGETS orbithub
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
BUNDLE DESTINATION .
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
set(ORBITHUB_PRIVATE_LIB_DESTINATION "OrbitHub.app/Contents/Frameworks")
|
||||
else()
|
||||
set(ORBITHUB_PRIVATE_LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}/orbithub")
|
||||
endif()
|
||||
set(ORBITHUB_RUNTIME_TARGETS KodoTerm freerdp winpr)
|
||||
if(TARGET freerdp-client)
|
||||
list(APPEND ORBITHUB_RUNTIME_TARGETS freerdp-client)
|
||||
endif()
|
||||
foreach(runtime_target IN LISTS ORBITHUB_RUNTIME_TARGETS)
|
||||
if(TARGET ${runtime_target})
|
||||
install(TARGETS ${runtime_target}
|
||||
RUNTIME DESTINATION ${ORBITHUB_PRIVATE_LIB_DESTINATION}
|
||||
LIBRARY DESTINATION ${ORBITHUB_PRIVATE_LIB_DESTINATION}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
install(FILES
|
||||
packaging/linux/org.darksingularity.OrbitHub.desktop
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
|
||||
)
|
||||
foreach(icon_size IN ITEMS 16 24 32 48 64 128 256)
|
||||
install(FILES
|
||||
packaging/linux/icons/${icon_size}x${icon_size}/apps/org.darksingularity.OrbitHub.png
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${icon_size}x${icon_size}/apps
|
||||
)
|
||||
endforeach()
|
||||
install(FILES
|
||||
packaging/linux/org.darksingularity.OrbitHub.metainfo.xml
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo
|
||||
)
|
||||
install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/orbithub)
|
||||
|
||||
@@ -0,0 +1,170 @@
|
||||
# OrbitHub
|
||||
|
||||
OrbitHub is a cross-platform native desktop app for managing and launching remote sessions from one place.
|
||||
|
||||
It is implemented in C++17 with Qt6 Widgets and built with CMake.
|
||||
|
||||
Supported target platforms:
|
||||
- Windows
|
||||
- Linux
|
||||
- macOS
|
||||
|
||||
## Current Status
|
||||
|
||||
OrbitHub is in active development.
|
||||
|
||||
- Milestones completed: M0-M5, and M7-M9
|
||||
- Current milestone: Milestone 10 (v1.0 Stabilization)
|
||||
- Deferred milestone: Milestone 6 (VNC Fully Working)
|
||||
- Latest checkpoint tag: `v0-m9-done`
|
||||
- VNC implementation milestone (M6) is currently deferred
|
||||
|
||||
Progress and milestone details:
|
||||
- [docs/PROGRESS.md](docs/PROGRESS.md)
|
||||
|
||||
## Screenshots
|
||||
|
||||

|
||||
|
||||
Profiles organized into folders, with protocol, host, and tags shown at a glance. (Sample data shown; not real hosts.)
|
||||
|
||||
## Implemented Features
|
||||
|
||||
### Profile Management
|
||||
|
||||
- SQLite-backed profile storage
|
||||
- Create, edit, delete profiles
|
||||
- Protocol-aware profile validation (SSH/RDP/VNC)
|
||||
- Profile search and sorting
|
||||
- Tags support
|
||||
- Folder/subfolder support
|
||||
- `List` and `Folders` profile views
|
||||
- Right-click profile tree actions:
|
||||
- New Folder
|
||||
- New Connection
|
||||
- Drag-and-drop profile moves between folders with persistence
|
||||
|
||||
### Session Experience
|
||||
|
||||
- Multi-tab session window
|
||||
- Auto-connect on tab open
|
||||
- Disconnect on tab close
|
||||
- Session state indicators on tabs
|
||||
- Timestamped event log with filtering and export
|
||||
|
||||
### SSH
|
||||
|
||||
- Embedded interactive terminal (in-app typing)
|
||||
- Theme support (`Dark`, `Light`, `Solarized Dark`)
|
||||
- Password and private-key auth flows
|
||||
- Known-hosts policy support
|
||||
|
||||
### RDP
|
||||
|
||||
- Embedded in-window RDP rendering surface (no external launcher)
|
||||
- Keyboard/mouse input forwarding
|
||||
- Resize handling and resolution renegotiation
|
||||
- Domain-aware authentication support
|
||||
- RDP security/performance profile options
|
||||
|
||||
### App UX
|
||||
|
||||
- App icon and themed About dialog
|
||||
- `File` menu:
|
||||
- New Profile
|
||||
- New Folder
|
||||
- Quit
|
||||
- `Help` menu:
|
||||
- About OrbitHub
|
||||
|
||||
## Build and Run
|
||||
|
||||
Detailed platform instructions:
|
||||
- [docs/BUILDING.md](docs/BUILDING.md)
|
||||
|
||||
Quick start (Linux/macOS with Ninja):
|
||||
|
||||
```bash
|
||||
cmake -S . -B build -G Ninja
|
||||
cmake --build build
|
||||
./build/orbithub
|
||||
```
|
||||
|
||||
## Packaging
|
||||
|
||||
Detailed packaging instructions for all platforms:
|
||||
- [docs/BUILDING.md](docs/BUILDING.md)
|
||||
|
||||
Linux (`.deb`):
|
||||
|
||||
```bash
|
||||
./packaging/linux/build-deb.sh
|
||||
```
|
||||
|
||||
Linux (Flatpak):
|
||||
|
||||
```bash
|
||||
./packaging/flatpak/build-flatpak.sh
|
||||
```
|
||||
|
||||
Windows (Inno Setup installer):
|
||||
|
||||
```powershell
|
||||
.\packaging\windows\build-installer.ps1
|
||||
```
|
||||
|
||||
macOS (`.dmg`):
|
||||
|
||||
```bash
|
||||
./packaging/macos/build-dmg.sh
|
||||
```
|
||||
|
||||
## Dependencies
|
||||
|
||||
Core dependencies:
|
||||
- Qt 6 (Widgets, SQL)
|
||||
- CMake 3.21+
|
||||
- C++17 toolchain
|
||||
|
||||
Protocol/runtime dependencies:
|
||||
- SSH client (`ssh`) available on `PATH` for SSH sessions
|
||||
|
||||
Bundled/vendored third-party components:
|
||||
- KodoTerm
|
||||
- libvterm
|
||||
- FreeRDP/WinPR
|
||||
|
||||
## Licensing
|
||||
|
||||
Project license:
|
||||
- MIT (see [LICENSE](LICENSE))
|
||||
|
||||
License links:
|
||||
- MIT License: <https://opensource.org/licenses/MIT>
|
||||
- GNU LGPLv3: <https://www.gnu.org/licenses/lgpl-3.0.html>
|
||||
- Apache License 2.0: <https://www.apache.org/licenses/LICENSE-2.0>
|
||||
|
||||
Important third-party license notes:
|
||||
- Qt6 is dynamically linked in this project build setup.
|
||||
- Qt6 is used under LGPLv3 terms in this project build setup.
|
||||
- KodoTerm and libvterm are MIT-licensed.
|
||||
- FreeRDP/WinPR is Apache-2.0 licensed.
|
||||
|
||||
Repository license files:
|
||||
- Project: [LICENSE](LICENSE)
|
||||
- KodoTerm: [third_party/KodoTerm/LICENSE](third_party/KodoTerm/LICENSE)
|
||||
- FreeRDP: [third_party/FreeRDP/LICENSE](third_party/FreeRDP/LICENSE)
|
||||
|
||||
See in-app `Help -> About OrbitHub` for license links and third-party inventory.
|
||||
|
||||
## Repository Structure
|
||||
|
||||
- `src/` - application source code
|
||||
- `docs/` - build guide, spec, and progress tracking
|
||||
- `third_party/` - vendored third-party dependencies
|
||||
- `build/` - local build output (generated)
|
||||
|
||||
## Notes
|
||||
|
||||
- Passwords are requested at connect time and are not stored in the profile database.
|
||||
- This repository currently prioritizes integrated SSH and RDP workflows while VNC implementation is pending.
|
||||
@@ -2,6 +2,14 @@
|
||||
|
||||
Run all commands from the repository root unless noted.
|
||||
|
||||
## Requirements
|
||||
|
||||
Minimum toolchain requirements on all platforms:
|
||||
- CMake 3.21+
|
||||
- C++17 compiler toolchain
|
||||
- Qt 6.2+ with `Widgets` and `Sql` modules (dynamic linking)
|
||||
- OpenSSH client available on `PATH` (required for SSH sessions)
|
||||
|
||||
## Linux (Ubuntu / Mint)
|
||||
|
||||
```bash
|
||||
@@ -9,9 +17,9 @@ sudo apt update
|
||||
sudo apt install -y \
|
||||
build-essential cmake ninja-build git pkg-config \
|
||||
qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools \
|
||||
openssh-client
|
||||
openssh-client libssl-dev zlib1g-dev
|
||||
|
||||
cmake -S . -B build -G Ninja
|
||||
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build build
|
||||
./build/orbithub
|
||||
```
|
||||
@@ -21,39 +29,114 @@ cmake --build build
|
||||
```bash
|
||||
xcode-select --install
|
||||
brew update
|
||||
brew install cmake ninja pkg-config qt@6 openssh
|
||||
brew install cmake ninja pkg-config qt@6 openssh openssl@3
|
||||
|
||||
cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6)"
|
||||
cmake -S . -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix openssl@3)"
|
||||
cmake --build build
|
||||
./build/orbithub
|
||||
open build/orbithub.app
|
||||
```
|
||||
|
||||
## Windows 11 (PowerShell + MSVC + vcpkg)
|
||||
|
||||
Install required software:
|
||||
|
||||
```powershell
|
||||
winget install -e --id Git.Git
|
||||
winget install -e --id Kitware.CMake
|
||||
winget install -e --id Ninja-build.Ninja
|
||||
Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
|
||||
winget install -e --id Microsoft.VisualStudio.2022.BuildTools `
|
||||
--override "--quiet --wait --norestart --add Microsoft.VisualStudio.Workload.VCTools"
|
||||
--override "--quiet --wait --norestart --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.Windows11SDK.22621"
|
||||
```
|
||||
|
||||
Open a new terminal after installs, then:
|
||||
Install dependencies via vcpkg:
|
||||
|
||||
```powershell
|
||||
git clone https://github.com/microsoft/vcpkg C:\dev\vcpkg
|
||||
C:\dev\vcpkg\bootstrap-vcpkg.bat
|
||||
C:\dev\vcpkg\vcpkg.exe install qtbase:x64-windows
|
||||
|
||||
cmake -S . -B build -G Ninja `
|
||||
-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake
|
||||
cmake --build build
|
||||
.\build\orbithub.exe
|
||||
C:\dev\vcpkg\vcpkg.exe install qtbase:x64-windows openssl:x64-windows zlib:x64-windows
|
||||
```
|
||||
|
||||
Open `x64 Native Tools Command Prompt for VS 2022` (or Developer PowerShell), then build:
|
||||
|
||||
```powershell
|
||||
cmake -S . -B build -G Ninja `
|
||||
-DCMAKE_BUILD_TYPE=Release `
|
||||
-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake `
|
||||
-DVCPKG_TARGET_TRIPLET=x64-windows
|
||||
cmake --build build
|
||||
```
|
||||
|
||||
Run (ensures DLL paths from vcpkg are present):
|
||||
|
||||
```powershell
|
||||
C:\dev\vcpkg\vcpkg.exe env --triplet x64-windows -- .\build\orbithub.exe
|
||||
```
|
||||
|
||||
If you already have `Qt 6` from the Qt installer and do not want vcpkg Qt, you can point CMake at that Qt install with `-DCMAKE_PREFIX_PATH=...`, but you still need compatible `OpenSSL` and `zlib` development libraries for the embedded FreeRDP build.
|
||||
|
||||
## Notes
|
||||
|
||||
- OrbitHub currently requires Qt6 Widgets and CMake 3.21+.
|
||||
- Milestone 3 SSH sessions require an `ssh` client available on `PATH`.
|
||||
- OrbitHub builds vendored `KodoTerm`, `libvterm`, and `FreeRDP` from `third_party/`.
|
||||
- If Qt is installed in a custom location, pass `-DCMAKE_PREFIX_PATH=/path/to/Qt/6.x.x/<toolchain>` to CMake.
|
||||
- Build output executable:
|
||||
- Linux: `build/orbithub`
|
||||
- macOS: `build/orbithub.app` (a proper app bundle, launch with `open build/orbithub.app`)
|
||||
- Windows: `build\\orbithub.exe`
|
||||
|
||||
## Linux Packaging
|
||||
|
||||
Build a Debian package (`.deb`) from the current Linux build:
|
||||
|
||||
```bash
|
||||
./packaging/linux/build-deb.sh
|
||||
```
|
||||
|
||||
Output path:
|
||||
- `dist/orbithub_<version>_<arch>.deb`
|
||||
|
||||
Build a Flatpak bundle:
|
||||
|
||||
```bash
|
||||
sudo apt-get install -y flatpak flatpak-builder
|
||||
./packaging/flatpak/build-flatpak.sh
|
||||
```
|
||||
|
||||
Output path:
|
||||
- `dist/flatpak/org.darksingularity.OrbitHub.flatpak`
|
||||
|
||||
## Windows Packaging
|
||||
|
||||
Requires [Inno Setup 6](https://jrsoftware.org/isinfo.php) (`winget install -e --id JRSoftware.InnoSetup`).
|
||||
|
||||
From a configured and built `build\` directory (see Windows build steps above):
|
||||
|
||||
```powershell
|
||||
.\packaging\windows\build-installer.ps1
|
||||
```
|
||||
|
||||
Output path:
|
||||
- `dist\windows\OrbitHub-Setup-<version>.exe`
|
||||
|
||||
## macOS Packaging
|
||||
|
||||
Requires `qt@6` from Homebrew (for `macdeployqt`). For a custom volume icon on
|
||||
the `.dmg`, also install `SetFile` (via Xcode's "Additional Tools", from
|
||||
[developer.apple.com/download/all](https://developer.apple.com/download/all))
|
||||
or `brew install fileicon` — packaging still works without either, just with
|
||||
the generic disk image icon.
|
||||
|
||||
```bash
|
||||
./packaging/macos/build-dmg.sh
|
||||
```
|
||||
|
||||
This runs `cmake --install`, then `macdeployqt` to bundle Qt frameworks and
|
||||
plugins into the `.app`, then re-signs the bundle (ad hoc, since there is no
|
||||
Developer ID certificate) so it passes macOS's launch-time code-integrity
|
||||
check. The result is unsigned/unnotarized, so first launch requires
|
||||
right-click → **Open** to bypass Gatekeeper's unidentified-developer warning.
|
||||
|
||||
Output path:
|
||||
- `dist/macos/OrbitHub-<version>.dmg`
|
||||
|
||||
@@ -115,18 +115,46 @@ Planned Scope:
|
||||
|
||||
## Milestone 7 - Cross-Platform Protocol Hardening
|
||||
|
||||
Status: Planned
|
||||
Status: Completed
|
||||
|
||||
Planned Scope:
|
||||
- Validate SSH/RDP/VNC workflows on Windows, Linux, and macOS
|
||||
- Fix platform-specific runtime/process/auth issues
|
||||
- Add repeatable protocol validation checklist/scripts
|
||||
Delivered:
|
||||
- Validated SSH and RDP workflows on Linux, macOS, and Windows 11 (VNC is out
|
||||
of scope while Milestone 6 remains deferred)
|
||||
- Windows: validated the full `docs/BUILDING.md` toolchain end-to-end
|
||||
(Git/CMake/Ninja/VS Build Tools with the C++ workload/vcpkg for
|
||||
Qt6-OpenSSL-zlib); documented a VS Build Tools installer gotcha where the
|
||||
actual compiler is a "recommended", not "required", component of the
|
||||
VCTools workload
|
||||
- Fixed RDP keyboard input misreading punctuation keys on Linux (X11 keycode
|
||||
numbering was being treated as a PC/AT scancode; now uses FreeRDP's
|
||||
authoritative X11-keycode-to-scancode table)
|
||||
- Added RDP clipboard sync (bidirectional, plain text) and RDP cursor/pointer
|
||||
shape sync (resize handles, text I-beam, etc. instead of a static arrow)
|
||||
- Fixed Tab/Shift+Tab being intercepted by local UI focus navigation instead
|
||||
of reaching SSH/RDP sessions
|
||||
- Fixed RDP key auto-repeat being dropped, so holding a key only ever sent a
|
||||
single keystroke to the remote machine
|
||||
- Windows-specific RDP fixes: a crash on every connect attempt (FreeRDP's
|
||||
signal-handling critical section was never initialized) and a host
|
||||
resolution failure on every connect, including literal IP addresses
|
||||
(Winsock was never initialized via `WSAStartup`)
|
||||
- Windows: automatic build-time deployment of Qt's platform/SQL-driver
|
||||
plugins and their runtime DLL dependencies, and marked the executable as a
|
||||
GUI (`WIN32`) app to remove a stray console window behind the UI
|
||||
- Windows and macOS: proper native app icon embedding (Windows `.rc`/`.ico`
|
||||
resource; macOS `.app` bundle with `.icns`), replacing the generic default
|
||||
icon previously shown for the built executable/bundle
|
||||
- macOS: fixed Edit/New Profile dialog form fields collapsing to `sizeHint`
|
||||
width due to the platform-default `QFormLayout` field growth policy
|
||||
|
||||
Git:
|
||||
- Tag: Pending user approval (`v0-m7-done`)
|
||||
|
||||
## Milestone 8 - Profile and Session UX Completion
|
||||
|
||||
Status: In Progress
|
||||
Status: Completed
|
||||
|
||||
Started:
|
||||
Delivered:
|
||||
- Added profile `tags` field to storage + schema migration and profile editor UX
|
||||
- Added profile `folder_path` field + nested folder/subfolder profile view mode
|
||||
- Added profile tree context actions (`New Folder`, `New Connection`) and drag-to-folder profile moves with persistence
|
||||
@@ -140,19 +168,35 @@ Started:
|
||||
- Persisted session UI defaults (`terminal theme`, `events panel visibility`) for new tabs/windows
|
||||
- Added profile quick filters (`Protocol`, `Tag`) with persistence to speed profile browsing
|
||||
|
||||
Planned Scope:
|
||||
- Complete protocol-aware profile validation and UX polish
|
||||
- Add/persist session UI preferences and default behaviors
|
||||
- Improve events/diagnostics visibility for long-running session usage
|
||||
Validation:
|
||||
- Local build verification passed (`cmake --build build`)
|
||||
- No automated tests are currently configured in CTest
|
||||
|
||||
Git:
|
||||
- Tag: Pending user approval (`v0-m8-done`)
|
||||
|
||||
## Milestone 9 - Packaging and Distribution
|
||||
|
||||
Status: Planned
|
||||
Status: Completed
|
||||
|
||||
Planned Scope:
|
||||
- Build distributable artifacts for Windows/Linux/macOS
|
||||
- Document runtime dependencies and install prerequisites
|
||||
- Add reproducible release packaging steps/scripts
|
||||
Delivered:
|
||||
- Linux `.deb` (`packaging/linux/build-deb.sh`) and Flatpak (`packaging/flatpak/build-flatpak.sh`) packages, both verified installed and launched with working SSH/RDP
|
||||
- Renamed the app's reverse-DNS identity from `io.orbithub.OrbitHub` to `org.darksingularity.OrbitHub` (desktop file, AppStream metainfo, Flatpak manifest, macOS bundle identifier) to reflect a domain actually owned by the project
|
||||
- Fixed Linux taskbar/panel pin matching (`StartupWMClass`) so a pinned launcher merges with its running window instead of creating a duplicate entry
|
||||
- Replaced the stale, mismatched hand-authored launcher SVG with PNG icons rendered directly from the app's own `createOrbitHubAppIcon()` at each hicolor theme size
|
||||
- Windows installer via Inno Setup (`packaging/windows/orbithub.iss`, `packaging/windows/build-installer.ps1`), verified installed silently and launched cleanly with no crash events
|
||||
- macOS `.dmg` via `cmake --install` + `macdeployqt` + `hdiutil` (`packaging/macos/build-dmg.sh`), verified installed and launched after fixing:
|
||||
- a launch crash caused by `macdeployqt` invalidating the code signature (fixed with ad hoc re-signing)
|
||||
- a missing-library crash caused by the Linux-only `$ORIGIN` rpath token and vendored dylibs installing outside the `.app` bundle (fixed with `APPLE`-specific `@executable_path`/`Contents/Frameworks` layout)
|
||||
- the dmg showing the generic disk icon instead of the app icon
|
||||
- README and `docs/BUILDING.md` Packaging sections documented for all three platforms
|
||||
|
||||
Validation:
|
||||
- All three installers built, installed, and launched successfully with working SSH/RDP sessions
|
||||
- Code signing is ad hoc only (no purchased Apple Developer ID or Windows code-signing certificate), so macOS Gatekeeper and Windows SmartScreen still show first-run warnings by design
|
||||
|
||||
Git:
|
||||
- Tag: `v0-m9-done`
|
||||
|
||||
## Milestone 10 - v1.0 Stabilization
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 71 KiB |
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
MANIFEST="$ROOT_DIR/packaging/flatpak/org.darksingularity.OrbitHub.yml"
|
||||
DIST_DIR="${1:-$ROOT_DIR/dist/flatpak}"
|
||||
BUILD_DIR="$DIST_DIR/build"
|
||||
REPO_DIR="$DIST_DIR/repo"
|
||||
BUNDLE="$DIST_DIR/org.darksingularity.OrbitHub.flatpak"
|
||||
|
||||
if ! command -v flatpak-builder >/dev/null 2>&1; then
|
||||
echo "flatpak-builder is required. Install it first:" >&2
|
||||
echo " sudo apt-get install -y flatpak-builder" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "$DIST_DIR"
|
||||
|
||||
flatpak-builder \
|
||||
--force-clean \
|
||||
--repo="$REPO_DIR" \
|
||||
"$BUILD_DIR" \
|
||||
"$MANIFEST"
|
||||
|
||||
flatpak build-bundle "$REPO_DIR" "$BUNDLE" org.darksingularity.OrbitHub
|
||||
echo "Created $BUNDLE"
|
||||
@@ -0,0 +1,21 @@
|
||||
app-id: org.darksingularity.OrbitHub
|
||||
runtime: org.kde.Platform
|
||||
runtime-version: "6.10"
|
||||
sdk: org.kde.Sdk
|
||||
command: orbithub
|
||||
finish-args:
|
||||
- --share=network
|
||||
- --share=ipc
|
||||
- --socket=fallback-x11
|
||||
- --socket=wayland
|
||||
- --device=dri
|
||||
- --filesystem=home
|
||||
modules:
|
||||
- name: orbithub
|
||||
buildsystem: cmake-ninja
|
||||
builddir: true
|
||||
config-opts:
|
||||
- -DCMAKE_BUILD_TYPE=Release
|
||||
sources:
|
||||
- type: dir
|
||||
path: ../..
|
||||
@@ -0,0 +1,70 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
BUILD_DIR="${1:-$ROOT_DIR/build}"
|
||||
DIST_DIR="${2:-$ROOT_DIR/dist}"
|
||||
STAGE_DIR="$DIST_DIR/deb-staging"
|
||||
PKG_ROOT="$STAGE_DIR/orbithub"
|
||||
|
||||
if [[ ! -f "$BUILD_DIR/CMakeCache.txt" ]]; then
|
||||
echo "Build directory not configured: $BUILD_DIR" >&2
|
||||
echo "Run: cmake -S \"$ROOT_DIR\" -B \"$BUILD_DIR\" -G Ninja" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "$DIST_DIR"
|
||||
rm -rf "$STAGE_DIR"
|
||||
mkdir -p "$PKG_ROOT/DEBIAN"
|
||||
|
||||
VERSION="$(sed -n 's/^CMAKE_PROJECT_VERSION:STATIC=//p' "$BUILD_DIR/CMakeCache.txt" | head -n1)"
|
||||
ARCH="$(dpkg --print-architecture)"
|
||||
|
||||
if [[ -z "$VERSION" ]]; then
|
||||
echo "Unable to determine project version from $BUILD_DIR/CMakeCache.txt" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cmake --build "$BUILD_DIR" -j
|
||||
cmake --install "$BUILD_DIR" --prefix "$PKG_ROOT/usr"
|
||||
|
||||
cat > "$PKG_ROOT/DEBIAN/control" <<EOF
|
||||
Package: orbithub
|
||||
Version: ${VERSION}
|
||||
Section: net
|
||||
Priority: optional
|
||||
Architecture: ${ARCH}
|
||||
Maintainer: OrbitHub Maintainers <maintainers@orbithub.local>
|
||||
Depends: libc6, libstdc++6, libqt6core6, libqt6gui6, libqt6widgets6, libqt6sql6, libssl3, zlib1g, openssh-client
|
||||
Description: OrbitHub remote session manager
|
||||
OrbitHub is a native desktop application for managing connection profiles
|
||||
and opening SSH and RDP sessions in a tabbed interface.
|
||||
EOF
|
||||
|
||||
cat > "$PKG_ROOT/DEBIAN/postinst" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
if command -v update-desktop-database >/dev/null 2>&1; then
|
||||
update-desktop-database -q /usr/share/applications || true
|
||||
fi
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -q /usr/share/icons/hicolor || true
|
||||
fi
|
||||
EOF
|
||||
chmod 0755 "$PKG_ROOT/DEBIAN/postinst"
|
||||
|
||||
cat > "$PKG_ROOT/DEBIAN/postrm" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
if command -v update-desktop-database >/dev/null 2>&1; then
|
||||
update-desktop-database -q /usr/share/applications || true
|
||||
fi
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -q /usr/share/icons/hicolor || true
|
||||
fi
|
||||
EOF
|
||||
chmod 0755 "$PKG_ROOT/DEBIAN/postrm"
|
||||
|
||||
OUTPUT_DEB="$DIST_DIR/orbithub_${VERSION}_${ARCH}.deb"
|
||||
fakeroot dpkg-deb --build "$PKG_ROOT" "$OUTPUT_DEB" >/dev/null
|
||||
echo "Created $OUTPUT_DEB"
|
||||
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 645 B |
|
After Width: | Height: | Size: 960 B |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
@@ -0,0 +1,12 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Version=1.0
|
||||
Name=OrbitHub
|
||||
GenericName=Remote Session Manager
|
||||
Comment=Manage SSH and RDP sessions in one native app
|
||||
Exec=orbithub
|
||||
Icon=org.darksingularity.OrbitHub
|
||||
Terminal=false
|
||||
StartupWMClass=OrbitHub
|
||||
Categories=Network;RemoteAccess;Utility;
|
||||
StartupNotify=true
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop-application">
|
||||
<id>org.darksingularity.OrbitHub</id>
|
||||
<name>OrbitHub</name>
|
||||
<summary>Unified remote session manager for SSH and RDP</summary>
|
||||
<metadata_license>MIT</metadata_license>
|
||||
<project_license>MIT</project_license>
|
||||
<description>
|
||||
<p>OrbitHub is a native desktop app for organizing connection profiles and launching SSH and RDP sessions in one tabbed interface.</p>
|
||||
</description>
|
||||
<launchable type="desktop-id">org.darksingularity.OrbitHub.desktop</launchable>
|
||||
<url type="homepage">https://git.darksingularity.org/DarkSingularity/orbithub</url>
|
||||
<provides>
|
||||
<binary>orbithub</binary>
|
||||
</provides>
|
||||
</component>
|
||||
@@ -0,0 +1,100 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
BUILD_DIR="${1:-$ROOT_DIR/build}"
|
||||
DIST_DIR="${2:-$ROOT_DIR/dist/macos}"
|
||||
STAGE_DIR="$DIST_DIR/dmg-staging"
|
||||
INSTALL_PREFIX="$DIST_DIR/install"
|
||||
APP_BUNDLE="OrbitHub.app"
|
||||
|
||||
if [[ ! -f "$BUILD_DIR/CMakeCache.txt" ]]; then
|
||||
echo "Build directory not configured: $BUILD_DIR" >&2
|
||||
echo "Run: cmake -S \"$ROOT_DIR\" -B \"$BUILD_DIR\" -G Ninja" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION="$(sed -n 's/^CMAKE_PROJECT_VERSION:STATIC=//p' "$BUILD_DIR/CMakeCache.txt" | head -n1)"
|
||||
if [[ -z "$VERSION" ]]; then
|
||||
echo "Unable to determine project version from $BUILD_DIR/CMakeCache.txt" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MACDEPLOYQT="$(brew --prefix qt@6)/bin/macdeployqt"
|
||||
if [[ ! -x "$MACDEPLOYQT" ]]; then
|
||||
echo "macdeployqt not found at $MACDEPLOYQT" >&2
|
||||
echo "Install it: brew install qt@6" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "$DIST_DIR"
|
||||
rm -rf "$STAGE_DIR" "$INSTALL_PREFIX"
|
||||
mkdir -p "$STAGE_DIR"
|
||||
|
||||
cmake --build "$BUILD_DIR" -j
|
||||
cmake --install "$BUILD_DIR" --prefix "$INSTALL_PREFIX"
|
||||
|
||||
if [[ ! -d "$INSTALL_PREFIX/$APP_BUNDLE" ]]; then
|
||||
echo "Expected app bundle not found: $INSTALL_PREFIX/$APP_BUNDLE" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
"$MACDEPLOYQT" "$INSTALL_PREFIX/$APP_BUNDLE"
|
||||
|
||||
# macdeployqt rewrites library load paths after bundling Qt, which
|
||||
# invalidates any prior signature. Re-sign (ad hoc, since we have no
|
||||
# Developer ID certificate) so the app passes macOS's code-integrity
|
||||
# check at launch. Without this, launching fails with a generic
|
||||
# "cannot be opened because of a problem" crash-reporter dialog rather
|
||||
# than the milder unidentified-developer Gatekeeper prompt.
|
||||
codesign --force --deep --sign - "$INSTALL_PREFIX/$APP_BUNDLE"
|
||||
|
||||
cp -R "$INSTALL_PREFIX/$APP_BUNDLE" "$STAGE_DIR/$APP_BUNDLE"
|
||||
ln -s /Applications "$STAGE_DIR/Applications"
|
||||
cp "$ROOT_DIR/packaging/macos/orbithub.icns" "$STAGE_DIR/.VolumeIcon.icns"
|
||||
|
||||
OUTPUT_DMG="$DIST_DIR/OrbitHub-${VERSION}.dmg"
|
||||
RW_DMG="$DIST_DIR/OrbitHub-rw.dmg"
|
||||
rm -f "$OUTPUT_DMG" "$RW_DMG"
|
||||
|
||||
hdiutil create -volname "OrbitHub" -srcfolder "$STAGE_DIR" -ov -format UDRW "$RW_DMG"
|
||||
|
||||
# Setting the volume's icon requires flipping a Finder attribute bit,
|
||||
# which needs SetFile (from Xcode's "Additional Tools", not the base
|
||||
# Command Line Tools) or the fileicon brew formula. Neither is
|
||||
# guaranteed to be installed, so this step degrades gracefully: the
|
||||
# dmg is still produced either way, just without a custom icon if no
|
||||
# tool is available.
|
||||
ICON_TOOL=""
|
||||
if command -v SetFile >/dev/null 2>&1; then
|
||||
ICON_TOOL="SetFile"
|
||||
elif [[ -x /Library/Developer/CommandLineTools/usr/bin/SetFile ]]; then
|
||||
ICON_TOOL="/Library/Developer/CommandLineTools/usr/bin/SetFile"
|
||||
elif command -v fileicon >/dev/null 2>&1; then
|
||||
ICON_TOOL="fileicon"
|
||||
fi
|
||||
|
||||
if [[ -n "$ICON_TOOL" ]]; then
|
||||
MOUNT_DIR="$(mktemp -d)"
|
||||
hdiutil attach "$RW_DMG" -mountpoint "$MOUNT_DIR" -nobrowse -quiet
|
||||
|
||||
if [[ "$ICON_TOOL" == "fileicon" ]]; then
|
||||
fileicon set "$MOUNT_DIR" "$ROOT_DIR/packaging/macos/orbithub.icns" >/dev/null
|
||||
else
|
||||
"$ICON_TOOL" -a V "$MOUNT_DIR/.VolumeIcon.icns"
|
||||
"$ICON_TOOL" -a C "$MOUNT_DIR"
|
||||
fi
|
||||
|
||||
hdiutil detach "$MOUNT_DIR" -quiet
|
||||
rmdir "$MOUNT_DIR" 2>/dev/null || true
|
||||
else
|
||||
echo "Note: SetFile/fileicon not found, dmg will use the generic disk icon." >&2
|
||||
echo " Install one to get a custom volume icon:" >&2
|
||||
echo " brew install fileicon" >&2
|
||||
echo " or download 'Additional Tools for Xcode' from developer.apple.com/download/all" >&2
|
||||
fi
|
||||
|
||||
hdiutil convert "$RW_DMG" -format UDZO -ov -o "$OUTPUT_DMG"
|
||||
rm -f "$RW_DMG"
|
||||
|
||||
echo "Created $OUTPUT_DMG"
|
||||
@@ -0,0 +1,36 @@
|
||||
param(
|
||||
[string]$BuildDir = "$PSScriptRoot\..\..\build",
|
||||
[string]$DistDir = "$PSScriptRoot\..\..\dist\windows"
|
||||
)
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$cacheFile = Join-Path $BuildDir "CMakeCache.txt"
|
||||
if (-not (Test-Path $cacheFile)) {
|
||||
throw "Build directory not configured: $BuildDir (run cmake -S . -B build first)"
|
||||
}
|
||||
|
||||
$versionLine = Select-String -Path $cacheFile -Pattern '^CMAKE_PROJECT_VERSION:STATIC=(.*)$'
|
||||
if (-not $versionLine) {
|
||||
throw "Unable to determine project version from $cacheFile"
|
||||
}
|
||||
$version = $versionLine.Matches[0].Groups[1].Value
|
||||
|
||||
$isccCandidates = @(
|
||||
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe",
|
||||
"C:\Program Files\Inno Setup 6\ISCC.exe",
|
||||
"$env:LOCALAPPDATA\Programs\Inno Setup 6\ISCC.exe"
|
||||
)
|
||||
$iscc = $isccCandidates | Where-Object { Test-Path $_ } | Select-Object -First 1
|
||||
if (-not $iscc) {
|
||||
throw "Inno Setup compiler (ISCC.exe) not found. Install it: winget install -e --id JRSoftware.InnoSetup"
|
||||
}
|
||||
|
||||
New-Item -ItemType Directory -Force -Path $DistDir | Out-Null
|
||||
|
||||
& $iscc "/DMyAppVersion=$version" "$PSScriptRoot\orbithub.iss"
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
throw "ISCC.exe failed with exit code $LASTEXITCODE"
|
||||
}
|
||||
|
||||
Write-Output "Created $DistDir\OrbitHub-Setup-$version.exe"
|
||||
|
After Width: | Height: | Size: 35 KiB |
@@ -0,0 +1,46 @@
|
||||
#ifndef MyAppVersion
|
||||
#define MyAppVersion "0.0.0"
|
||||
#endif
|
||||
|
||||
#define MyAppName "OrbitHub"
|
||||
#define MyAppPublisher "OrbitHub Maintainers"
|
||||
#define MyAppExeName "orbithub.exe"
|
||||
#define MyBuildDir "..\..\build"
|
||||
|
||||
[Setup]
|
||||
AppId={{6B2E0B8F-2C6D-4E7C-9C36-6C6C9C6F6C1A}
|
||||
AppName={#MyAppName}
|
||||
AppVersion={#MyAppVersion}
|
||||
AppPublisher={#MyAppPublisher}
|
||||
DefaultDirName={autopf}\{#MyAppName}
|
||||
DefaultGroupName={#MyAppName}
|
||||
UninstallDisplayIcon={app}\{#MyAppExeName}
|
||||
OutputDir=..\..\dist\windows
|
||||
OutputBaseFilename=OrbitHub-Setup-{#MyAppVersion}
|
||||
Compression=lzma2
|
||||
SolidCompression=yes
|
||||
ArchitecturesAllowed=x64compatible
|
||||
ArchitecturesInstallIn64BitMode=x64compatible
|
||||
SetupIconFile=orbithub.ico
|
||||
WizardStyle=modern
|
||||
DisableProgramGroupPage=yes
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "Create a &desktop shortcut"; GroupDescription: "Additional icons:"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "{#MyBuildDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#MyBuildDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#MyBuildDir}\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs
|
||||
Source: "{#MyBuildDir}\sqldrivers\*"; DestDir: "{app}\sqldrivers"; Flags: ignoreversion recursesubdirs
|
||||
|
||||
[Icons]
|
||||
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
||||
Name: "{group}\Uninstall {#MyAppName}"; Filename: "{uninstallexe}"
|
||||
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
||||
|
||||
[Run]
|
||||
Filename: "{app}\{#MyAppExeName}"; Description: "Launch {#MyAppName}"; Flags: nowait postinstall skipifsilent
|
||||
@@ -0,0 +1 @@
|
||||
1 ICON "orbithub.ico"
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "app_icon.h"
|
||||
#include "profiles_window.h"
|
||||
#include "session_window.h"
|
||||
|
||||
#include <QApplication>
|
||||
|
||||
@@ -12,7 +12,7 @@ int main(int argc, char* argv[])
|
||||
app.setApplicationName(QStringLiteral("OrbitHub"));
|
||||
app.setWindowIcon(createOrbitHubAppIcon());
|
||||
|
||||
ProfilesWindow window;
|
||||
SessionWindow window;
|
||||
window.show();
|
||||
|
||||
return app.exec();
|
||||
|
||||
@@ -71,6 +71,9 @@ ProfileDialog::ProfileDialog(QWidget* parent)
|
||||
|
||||
auto* layout = new QVBoxLayout(this);
|
||||
auto* form = new QFormLayout();
|
||||
form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
||||
form->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
form->setLabelAlignment(Qt::AlignRight);
|
||||
|
||||
m_nameInput->setPlaceholderText(QStringLiteral("Production Bastion"));
|
||||
m_hostInput->setPlaceholderText(QStringLiteral("example.internal"));
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
#include "profiles_window.h"
|
||||
|
||||
#include "about_dialog.h"
|
||||
#include "profile_dialog.h"
|
||||
#include "profile_repository.h"
|
||||
#include "profiles_tree_widget.h"
|
||||
#include "session_window.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QAbstractItemView>
|
||||
@@ -15,13 +13,11 @@
|
||||
#include <QLineEdit>
|
||||
#include <QInputDialog>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
#include <QSet>
|
||||
#include <QSettings>
|
||||
#include <QSignalBlocker>
|
||||
#include <QApplication>
|
||||
#include <QStringList>
|
||||
#include <QStyle>
|
||||
#include <QTreeWidget>
|
||||
@@ -92,7 +88,7 @@ bool profileHasTag(const Profile& profile, const QString& requestedTag)
|
||||
}
|
||||
|
||||
ProfilesWindow::ProfilesWindow(QWidget* parent)
|
||||
: QMainWindow(parent),
|
||||
: QWidget(parent),
|
||||
m_searchBox(nullptr),
|
||||
m_viewModeBox(nullptr),
|
||||
m_sortBox(nullptr),
|
||||
@@ -104,10 +100,6 @@ ProfilesWindow::ProfilesWindow(QWidget* parent)
|
||||
m_deleteButton(nullptr),
|
||||
m_repository(std::make_unique<ProfileRepository>())
|
||||
{
|
||||
setWindowTitle(QStringLiteral("OrbitHub Profiles"));
|
||||
resize(860, 640);
|
||||
setWindowIcon(QApplication::windowIcon());
|
||||
|
||||
setupUi();
|
||||
|
||||
if (!m_repository->initError().isEmpty()) {
|
||||
@@ -131,36 +123,35 @@ ProfilesWindow::~ProfilesWindow() = default;
|
||||
|
||||
void ProfilesWindow::setupUi()
|
||||
{
|
||||
auto* central = new QWidget(this);
|
||||
auto* rootLayout = new QVBoxLayout(central);
|
||||
auto* rootLayout = new QVBoxLayout(this);
|
||||
|
||||
auto* searchLabel = new QLabel(QStringLiteral("Search"), central);
|
||||
m_searchBox = new QLineEdit(central);
|
||||
auto* searchLabel = new QLabel(QStringLiteral("Search"), this);
|
||||
m_searchBox = new QLineEdit(this);
|
||||
m_searchBox->setPlaceholderText(QStringLiteral("Filter by name, host, folder, or tags..."));
|
||||
|
||||
auto* viewModeLabel = new QLabel(QStringLiteral("View"), central);
|
||||
m_viewModeBox = new QComboBox(central);
|
||||
auto* viewModeLabel = new QLabel(QStringLiteral("View"), this);
|
||||
m_viewModeBox = new QComboBox(this);
|
||||
m_viewModeBox->addItem(QStringLiteral("List"));
|
||||
m_viewModeBox->addItem(QStringLiteral("Folders"));
|
||||
|
||||
auto* sortLabel = new QLabel(QStringLiteral("Sort"), central);
|
||||
m_sortBox = new QComboBox(central);
|
||||
auto* sortLabel = new QLabel(QStringLiteral("Sort"), this);
|
||||
m_sortBox = new QComboBox(this);
|
||||
m_sortBox->addItem(QStringLiteral("Name"), static_cast<int>(ProfileSortOrder::NameAsc));
|
||||
m_sortBox->addItem(QStringLiteral("Protocol"), static_cast<int>(ProfileSortOrder::ProtocolAsc));
|
||||
m_sortBox->addItem(QStringLiteral("Host"), static_cast<int>(ProfileSortOrder::HostAsc));
|
||||
|
||||
auto* protocolFilterLabel = new QLabel(QStringLiteral("Protocol"), central);
|
||||
m_protocolFilterBox = new QComboBox(central);
|
||||
auto* protocolFilterLabel = new QLabel(QStringLiteral("Protocol"), this);
|
||||
m_protocolFilterBox = new QComboBox(this);
|
||||
m_protocolFilterBox->addItem(QStringLiteral("All"));
|
||||
m_protocolFilterBox->addItem(QStringLiteral("SSH"));
|
||||
m_protocolFilterBox->addItem(QStringLiteral("RDP"));
|
||||
m_protocolFilterBox->addItem(QStringLiteral("VNC"));
|
||||
|
||||
auto* tagFilterLabel = new QLabel(QStringLiteral("Tag"), central);
|
||||
m_tagFilterBox = new QComboBox(central);
|
||||
auto* tagFilterLabel = new QLabel(QStringLiteral("Tag"), this);
|
||||
m_tagFilterBox = new QComboBox(this);
|
||||
m_tagFilterBox->addItem(QStringLiteral("All"));
|
||||
|
||||
m_profilesTree = new ProfilesTreeWidget(central);
|
||||
m_profilesTree = new ProfilesTreeWidget(this);
|
||||
m_profilesTree->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
m_profilesTree->setColumnCount(4);
|
||||
m_profilesTree->setHeaderLabels(
|
||||
@@ -179,9 +170,9 @@ void ProfilesWindow::setupUi()
|
||||
m_profilesTree->header()->setSectionResizeMode(3, QHeaderView::Stretch);
|
||||
|
||||
auto* buttonRow = new QHBoxLayout();
|
||||
m_newButton = new QPushButton(QStringLiteral("New"), central);
|
||||
m_editButton = new QPushButton(QStringLiteral("Edit"), central);
|
||||
m_deleteButton = new QPushButton(QStringLiteral("Delete"), central);
|
||||
m_newButton = new QPushButton(QStringLiteral("New"), this);
|
||||
m_editButton = new QPushButton(QStringLiteral("Edit"), this);
|
||||
m_deleteButton = new QPushButton(QStringLiteral("Delete"), this);
|
||||
|
||||
buttonRow->addWidget(m_newButton);
|
||||
buttonRow->addWidget(m_editButton);
|
||||
@@ -204,40 +195,6 @@ void ProfilesWindow::setupUi()
|
||||
rootLayout->addWidget(m_profilesTree, 1);
|
||||
rootLayout->addLayout(buttonRow);
|
||||
|
||||
setCentralWidget(central);
|
||||
|
||||
QMenu* fileMenu = menuBar()->addMenu(QStringLiteral("File"));
|
||||
QAction* newProfileAction = fileMenu->addAction(QStringLiteral("New Profile"));
|
||||
QAction* newFolderAction = fileMenu->addAction(QStringLiteral("New Folder"));
|
||||
fileMenu->addSeparator();
|
||||
QAction* quitAction = fileMenu->addAction(QStringLiteral("Quit"));
|
||||
|
||||
connect(newProfileAction,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
[this]() {
|
||||
const QString folderPath = folderPathForItem(m_profilesTree->currentItem());
|
||||
createProfile(folderPath);
|
||||
});
|
||||
connect(newFolderAction,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
[this]() {
|
||||
const QString folderPath = folderPathForItem(m_profilesTree->currentItem());
|
||||
createFolderInContext(folderPath);
|
||||
});
|
||||
connect(quitAction, &QAction::triggered, this, [this]() { close(); });
|
||||
|
||||
QMenu* helpMenu = menuBar()->addMenu(QStringLiteral("Help"));
|
||||
QAction* aboutAction = helpMenu->addAction(QStringLiteral("About OrbitHub"));
|
||||
connect(aboutAction,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
[this]() {
|
||||
AboutDialog dialog(this);
|
||||
dialog.exec();
|
||||
});
|
||||
|
||||
connect(m_searchBox,
|
||||
&QLineEdit::textChanged,
|
||||
this,
|
||||
@@ -959,16 +916,17 @@ void ProfilesWindow::openSessionForItem(QTreeWidgetItem* item)
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_sessionWindow.isNull()) {
|
||||
m_sessionWindow = new SessionWindow(profile.value());
|
||||
m_sessionWindow->setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(m_sessionWindow, &QObject::destroyed, this, [this]() { m_sessionWindow = nullptr; });
|
||||
} else {
|
||||
m_sessionWindow->openProfile(profile.value());
|
||||
}
|
||||
|
||||
m_sessionWindow->setWindowState(m_sessionWindow->windowState() & ~Qt::WindowMinimized);
|
||||
m_sessionWindow->show();
|
||||
m_sessionWindow->raise();
|
||||
m_sessionWindow->activateWindow();
|
||||
emit connectRequested(profile.value());
|
||||
}
|
||||
|
||||
void ProfilesWindow::createProfileInCurrentContext()
|
||||
{
|
||||
const QString folderPath = folderPathForItem(m_profilesTree->currentItem());
|
||||
createProfile(folderPath);
|
||||
}
|
||||
|
||||
void ProfilesWindow::createFolderInCurrentContext()
|
||||
{
|
||||
const QString folderPath = folderPathForItem(m_profilesTree->currentItem());
|
||||
createFolderInContext(folderPath);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "profile_repository.h"
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QWidget>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QtGlobal>
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <memory>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
#include <QPointer>
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -21,10 +20,9 @@ class QLineEdit;
|
||||
class QPushButton;
|
||||
class QComboBox;
|
||||
class QPoint;
|
||||
class SessionWindow;
|
||||
class ProfilesTreeWidget;
|
||||
|
||||
class ProfilesWindow : public QMainWindow
|
||||
class ProfilesWindow : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -32,6 +30,12 @@ public:
|
||||
explicit ProfilesWindow(QWidget* parent = nullptr);
|
||||
~ProfilesWindow() override;
|
||||
|
||||
void createProfileInCurrentContext();
|
||||
void createFolderInCurrentContext();
|
||||
|
||||
signals:
|
||||
void connectRequested(const Profile& profile);
|
||||
|
||||
private:
|
||||
QLineEdit* m_searchBox;
|
||||
QComboBox* m_viewModeBox;
|
||||
@@ -42,7 +46,6 @@ private:
|
||||
QPushButton* m_newButton;
|
||||
QPushButton* m_editButton;
|
||||
QPushButton* m_deleteButton;
|
||||
QPointer<SessionWindow> m_sessionWindow;
|
||||
std::unique_ptr<ProfileRepository> m_repository;
|
||||
std::unordered_map<qint64, Profile> m_profileCache;
|
||||
QString m_pendingTagFilterPreference;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
#include "rdp_display_widget.h"
|
||||
|
||||
#include <QCursor>
|
||||
#include <QKeyEvent>
|
||||
#include <QMouseEvent>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QResizeEvent>
|
||||
#include <QTimer>
|
||||
#include <QWheelEvent>
|
||||
@@ -16,7 +18,7 @@ QSize sanitizeSize(const QSize& size)
|
||||
}
|
||||
|
||||
RdpDisplayWidget::RdpDisplayWidget(QWidget* parent)
|
||||
: QWidget(parent), m_remoteSize(1280, 720)
|
||||
: QWidget(parent), m_remoteSize(1280, 720), m_cursorMode(CursorMode::Default)
|
||||
{
|
||||
setFocusPolicy(Qt::StrongFocus);
|
||||
setMouseTracking(true);
|
||||
@@ -61,6 +63,62 @@ void RdpDisplayWidget::clearFrame()
|
||||
update();
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::setCursorImage(const QImage& image, const QPoint& hotspot)
|
||||
{
|
||||
m_cursorImage = image;
|
||||
m_cursorHotspot = hotspot;
|
||||
m_cursorMode = CursorMode::Custom;
|
||||
applyCursor();
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::setCursorHidden()
|
||||
{
|
||||
m_cursorMode = CursorMode::Hidden;
|
||||
applyCursor();
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::setCursorDefault()
|
||||
{
|
||||
m_cursorMode = CursorMode::Default;
|
||||
applyCursor();
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::applyCursor()
|
||||
{
|
||||
if (m_cursorMode == CursorMode::Hidden) {
|
||||
setCursor(Qt::BlankCursor);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_cursorMode == CursorMode::Default || m_cursorImage.isNull()) {
|
||||
unsetCursor();
|
||||
return;
|
||||
}
|
||||
|
||||
const QSize remote = effectiveRemoteSize();
|
||||
const QRectF target = renderRect();
|
||||
if (remote.isEmpty() || target.isEmpty()) {
|
||||
setCursor(QCursor(QPixmap::fromImage(m_cursorImage),
|
||||
m_cursorHotspot.x(),
|
||||
m_cursorHotspot.y()));
|
||||
return;
|
||||
}
|
||||
|
||||
const qreal scale = target.width() / remote.width();
|
||||
QImage scaledImage = m_cursorImage;
|
||||
if (!qFuzzyCompare(scale, 1.0)) {
|
||||
scaledImage = m_cursorImage.scaled(
|
||||
qMax(1, qRound(m_cursorImage.width() * scale)),
|
||||
qMax(1, qRound(m_cursorImage.height() * scale)),
|
||||
Qt::IgnoreAspectRatio,
|
||||
Qt::SmoothTransformation);
|
||||
}
|
||||
|
||||
const int hotX = qBound(0, qRound(m_cursorHotspot.x() * scale), scaledImage.width());
|
||||
const int hotY = qBound(0, qRound(m_cursorHotspot.y() * scale), scaledImage.height());
|
||||
setCursor(QCursor(QPixmap::fromImage(scaledImage), hotX, hotY));
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::paintEvent(QPaintEvent* event)
|
||||
{
|
||||
Q_UNUSED(event);
|
||||
@@ -84,14 +142,21 @@ void RdpDisplayWidget::resizeEvent(QResizeEvent* event)
|
||||
QWidget::resizeEvent(event);
|
||||
const QSize size = sanitizeSize(event->size());
|
||||
emit viewportSizeChanged(size.width(), size.height());
|
||||
applyCursor();
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::keyPressEvent(QKeyEvent* event)
|
||||
{
|
||||
if (event == nullptr || event->isAutoRepeat()) {
|
||||
if (event == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Auto-repeat presses must reach the remote server so it can perform
|
||||
// its own typematic repeat, exactly as a physical keyboard held down
|
||||
// would. Only release events filter out isAutoRepeat() (below), since
|
||||
// Qt uses a synthetic release/press pair purely to normalize platform
|
||||
// auto-repeat quirks -- forwarding that synthetic release would send a
|
||||
// spurious key-up for a key that is still physically held.
|
||||
emit keyInput(event->key(),
|
||||
event->nativeScanCode(),
|
||||
event->text(),
|
||||
@@ -114,6 +179,14 @@ void RdpDisplayWidget::keyReleaseEvent(QKeyEvent* event)
|
||||
event->accept();
|
||||
}
|
||||
|
||||
bool RdpDisplayWidget::focusNextPrevChild(bool next)
|
||||
{
|
||||
Q_UNUSED(next);
|
||||
// Tab/Shift+Tab must reach keyPressEvent() and be forwarded to the
|
||||
// remote session instead of moving focus to the next local widget.
|
||||
return false;
|
||||
}
|
||||
|
||||
void RdpDisplayWidget::mousePressEvent(QMouseEvent* event)
|
||||
{
|
||||
if (event == nullptr) {
|
||||
|
||||
@@ -20,6 +20,9 @@ public:
|
||||
void setFrame(const QImage& frame);
|
||||
void setRemoteDesktopSize(int width, int height);
|
||||
void clearFrame();
|
||||
void setCursorImage(const QImage& image, const QPoint& hotspot);
|
||||
void setCursorHidden();
|
||||
void setCursorDefault();
|
||||
|
||||
signals:
|
||||
void keyInput(int key, quint32 nativeScanCode, const QString& text, bool pressed, int modifiers);
|
||||
@@ -37,14 +40,25 @@ protected:
|
||||
void mouseReleaseEvent(QMouseEvent* event) override;
|
||||
void mouseMoveEvent(QMouseEvent* event) override;
|
||||
void wheelEvent(QWheelEvent* event) override;
|
||||
bool focusNextPrevChild(bool next) override;
|
||||
|
||||
private:
|
||||
enum class CursorMode {
|
||||
Default,
|
||||
Custom,
|
||||
Hidden,
|
||||
};
|
||||
|
||||
QImage m_frame;
|
||||
QSize m_remoteSize;
|
||||
QImage m_cursorImage;
|
||||
QPoint m_cursorHotspot;
|
||||
CursorMode m_cursorMode;
|
||||
|
||||
QRectF renderRect() const;
|
||||
QPoint mapToRemote(const QPointF& pos) const;
|
||||
QSize effectiveRemoteSize() const;
|
||||
void applyCursor();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -7,29 +7,74 @@
|
||||
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <mutex>
|
||||
#include <new>
|
||||
#include <utility>
|
||||
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
#include <freerdp/channels/channels.h>
|
||||
#include <freerdp/channels/cliprdr.h>
|
||||
#include <freerdp/channels/drdynvc.h>
|
||||
#include <freerdp/channels/disp.h>
|
||||
#include <freerdp/client/cliprdr.h>
|
||||
#include <freerdp/addin.h>
|
||||
#include <freerdp/client/channels.h>
|
||||
#include <freerdp/client/cmdline.h>
|
||||
#include <freerdp/client/disp.h>
|
||||
#include <freerdp/codec/color.h>
|
||||
#include <freerdp/display.h>
|
||||
#include <freerdp/error.h>
|
||||
#include <freerdp/event.h>
|
||||
#include <freerdp/freerdp.h>
|
||||
#include <freerdp/gdi/gdi.h>
|
||||
#include <freerdp/graphics.h>
|
||||
#include <freerdp/input.h>
|
||||
#include <freerdp/locale/keyboard.h>
|
||||
#include <freerdp/scancode.h>
|
||||
#include <freerdp/settings.h>
|
||||
#include <freerdp/utils/signal.h>
|
||||
#include <winpr/winsock.h>
|
||||
#include <winpr/crt.h>
|
||||
#include <winpr/synch.h>
|
||||
#include <winpr/user.h>
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
// Mirrors wfreerdp_client_global_init() in FreeRDP's own reference Windows
|
||||
// client (client/Windows/wf_client.c): every reference client calls
|
||||
// WSAStartup + freerdp_handle_signals once at startup before connecting.
|
||||
//
|
||||
// WSAStartup: on Windows, sockets (getaddrinfo et al.) fail immediately
|
||||
// with WSANOTINITIALISED until this has been called by *someone* in the
|
||||
// process; OrbitHub never used Qt Network, so nothing else on Windows was
|
||||
// calling it, and every connect failed instantly with
|
||||
// ERRCONNECT_DNS_NAME_NOT_FOUND even for a literal IP address. WinPR
|
||||
// provides a portable no-op WSAStartup shim on POSIX, so this is safe to
|
||||
// call unconditionally cross-platform.
|
||||
//
|
||||
// freerdp_handle_signals: on Windows it's the only place that initializes
|
||||
// a global CRITICAL_SECTION used by freerdp_add_signal_cleanup_handler();
|
||||
// skipping it leaves that lock zero-initialized (invalid on Windows,
|
||||
// tolerated on POSIX), so the first freerdp_connect() crashed with a
|
||||
// null-pointer dereference inside EnterCriticalSection.
|
||||
//
|
||||
// Guarded so it only ever runs once.
|
||||
void ensureFreeRdpRuntimeInitialized()
|
||||
{
|
||||
static std::once_flag onceFlag;
|
||||
std::call_once(onceFlag, []() {
|
||||
WSADATA wsaData;
|
||||
const int wsaRc = WSAStartup(0x101, &wsaData);
|
||||
Q_UNUSED(wsaRc);
|
||||
|
||||
const int signalRc = freerdp_handle_signals();
|
||||
Q_UNUSED(signalRc);
|
||||
});
|
||||
}
|
||||
#endif
|
||||
|
||||
constexpr int kDefaultDesktopWidth = 1280;
|
||||
constexpr int kDefaultDesktopHeight = 720;
|
||||
constexpr int kMinDesktopWidth = 640;
|
||||
@@ -146,6 +191,16 @@ UINT orbitDisplayControlCaps(DispClientContext* context,
|
||||
UINT32 maxNumMonitors,
|
||||
UINT32 maxMonitorAreaFactorA,
|
||||
UINT32 maxMonitorAreaFactorB);
|
||||
UINT orbitCliprdrMonitorReady(CliprdrClientContext* context,
|
||||
const CLIPRDR_MONITOR_READY* monitorReady);
|
||||
UINT orbitCliprdrServerFormatList(CliprdrClientContext* context,
|
||||
const CLIPRDR_FORMAT_LIST* formatList);
|
||||
UINT orbitCliprdrServerFormatListResponse(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse);
|
||||
UINT orbitCliprdrServerFormatDataRequest(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest);
|
||||
UINT orbitCliprdrServerFormatDataResponse(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse);
|
||||
BOOL orbitLoadChannels(freerdp* instance);
|
||||
bool orbitLoadStaticChannel(rdpChannels* channels,
|
||||
rdpSettings* settings,
|
||||
@@ -246,6 +301,118 @@ BOOL orbitDesktopResize(rdpContext* context)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Custom rdpPointer subclass: FreeRDP allocates this with calloc() and only
|
||||
// ever touches the base rdpPointer fields itself, so the trailing fields here
|
||||
// must stay plain-old-data and be managed manually in New()/Free() (mirrors
|
||||
// FreeRDP's own X11 client, client/X11/xf_graphics.c).
|
||||
struct OrbitRdpPointer
|
||||
{
|
||||
rdpPointer pointer;
|
||||
uchar* rgbaData;
|
||||
UINT32 rgbaWidth;
|
||||
UINT32 rgbaHeight;
|
||||
};
|
||||
|
||||
BOOL orbitPointerNew(rdpContext* context, rdpPointer* pointer)
|
||||
{
|
||||
if (context == nullptr || pointer == nullptr || context->gdi == nullptr) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
auto* orbitPointer = reinterpret_cast<OrbitRdpPointer*>(pointer);
|
||||
orbitPointer->rgbaData = nullptr;
|
||||
orbitPointer->rgbaWidth = 0;
|
||||
orbitPointer->rgbaHeight = 0;
|
||||
|
||||
if (pointer->width == 0 || pointer->height == 0) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
const size_t size = static_cast<size_t>(pointer->width) * pointer->height * 4;
|
||||
auto* buffer = new (std::nothrow) uchar[size];
|
||||
if (buffer == nullptr) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!freerdp_image_copy_from_pointer_data(buffer,
|
||||
PIXEL_FORMAT_BGRA32,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
pointer->width,
|
||||
pointer->height,
|
||||
pointer->xorMaskData,
|
||||
pointer->lengthXorMask,
|
||||
pointer->andMaskData,
|
||||
pointer->lengthAndMask,
|
||||
pointer->xorBpp,
|
||||
&context->gdi->palette)) {
|
||||
delete[] buffer;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
orbitPointer->rgbaData = buffer;
|
||||
orbitPointer->rgbaWidth = pointer->width;
|
||||
orbitPointer->rgbaHeight = pointer->height;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void orbitPointerFree(rdpContext* context, rdpPointer* pointer)
|
||||
{
|
||||
Q_UNUSED(context);
|
||||
if (pointer == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto* orbitPointer = reinterpret_cast<OrbitRdpPointer*>(pointer);
|
||||
delete[] orbitPointer->rgbaData;
|
||||
orbitPointer->rgbaData = nullptr;
|
||||
}
|
||||
|
||||
BOOL orbitPointerSet(rdpContext* context, rdpPointer* pointer)
|
||||
{
|
||||
if (context == nullptr || pointer == nullptr) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
RdpSessionBackend* backend = backendFromContext(context);
|
||||
if (backend == nullptr) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
auto* orbitPointer = reinterpret_cast<OrbitRdpPointer*>(pointer);
|
||||
if (orbitPointer->rgbaData == nullptr || orbitPointer->rgbaWidth == 0
|
||||
|| orbitPointer->rgbaHeight == 0) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
const QImage image(orbitPointer->rgbaData,
|
||||
static_cast<int>(orbitPointer->rgbaWidth),
|
||||
static_cast<int>(orbitPointer->rgbaHeight),
|
||||
QImage::Format_ARGB32);
|
||||
|
||||
emit backend->cursorImageChanged(
|
||||
image.copy(),
|
||||
QPoint(static_cast<int>(pointer->xPos), static_cast<int>(pointer->yPos)));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL orbitPointerSetNull(rdpContext* context)
|
||||
{
|
||||
if (RdpSessionBackend* backend = backendFromContext(context)) {
|
||||
emit backend->cursorHidden();
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL orbitPointerSetDefault(rdpContext* context)
|
||||
{
|
||||
if (RdpSessionBackend* backend = backendFromContext(context)) {
|
||||
emit backend->cursorReset();
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL orbitPreConnect(freerdp* instance)
|
||||
{
|
||||
if (instance == nullptr || instance->context == nullptr || instance->context->settings == nullptr) {
|
||||
@@ -274,6 +441,17 @@ BOOL orbitPostConnect(freerdp* instance)
|
||||
context->update->EndPaint = orbitEndPaint;
|
||||
context->update->DesktopResize = orbitDesktopResize;
|
||||
|
||||
if (context->graphics != nullptr) {
|
||||
rdpPointer pointerCallbacks = {};
|
||||
pointerCallbacks.size = sizeof(OrbitRdpPointer);
|
||||
pointerCallbacks.New = orbitPointerNew;
|
||||
pointerCallbacks.Free = orbitPointerFree;
|
||||
pointerCallbacks.Set = orbitPointerSet;
|
||||
pointerCallbacks.SetNull = orbitPointerSetNull;
|
||||
pointerCallbacks.SetDefault = orbitPointerSetDefault;
|
||||
graphics_register_pointer(context->graphics, &pointerCallbacks);
|
||||
}
|
||||
|
||||
if (RdpSessionBackend* backend = backendFromContext(context)) {
|
||||
const int width = static_cast<int>(
|
||||
freerdp_settings_get_uint32(context->settings, FreeRDP_DesktopWidth));
|
||||
@@ -291,6 +469,7 @@ void orbitPostDisconnect(freerdp* instance)
|
||||
if (instance->context != nullptr) {
|
||||
if (RdpSessionBackend* backend = backendFromContext(instance->context)) {
|
||||
backend->onChannelDisconnectedEvent(DISP_DVC_CHANNEL_NAME, nullptr);
|
||||
backend->onChannelDisconnectedEvent(CLIPRDR_SVC_CHANNEL_NAME, nullptr);
|
||||
}
|
||||
PubSub_UnsubscribeChannelConnected(instance->context->pubSub,
|
||||
orbitOnChannelConnectedEventHandler);
|
||||
@@ -337,6 +516,75 @@ UINT orbitDisplayControlCaps(DispClientContext* context,
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
UINT orbitCliprdrMonitorReady(CliprdrClientContext* context,
|
||||
const CLIPRDR_MONITOR_READY* monitorReady)
|
||||
{
|
||||
Q_UNUSED(monitorReady);
|
||||
if (context == nullptr || context->custom == nullptr) {
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
auto* backend = reinterpret_cast<RdpSessionBackend*>(context->custom);
|
||||
backend->onCliprdrMonitorReady();
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
UINT orbitCliprdrServerFormatList(CliprdrClientContext* context,
|
||||
const CLIPRDR_FORMAT_LIST* formatList)
|
||||
{
|
||||
if (context == nullptr || context->custom == nullptr || formatList == nullptr) {
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
bool hasUnicodeText = false;
|
||||
for (UINT32 i = 0; i < formatList->numFormats; ++i) {
|
||||
if (formatList->formats[i].formatId == CF_UNICODETEXT) {
|
||||
hasUnicodeText = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
auto* backend = reinterpret_cast<RdpSessionBackend*>(context->custom);
|
||||
backend->onCliprdrServerFormatList(hasUnicodeText);
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
UINT orbitCliprdrServerFormatListResponse(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse)
|
||||
{
|
||||
Q_UNUSED(context);
|
||||
Q_UNUSED(formatListResponse);
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
UINT orbitCliprdrServerFormatDataRequest(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest)
|
||||
{
|
||||
if (context == nullptr || context->custom == nullptr || formatDataRequest == nullptr) {
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
auto* backend = reinterpret_cast<RdpSessionBackend*>(context->custom);
|
||||
backend->onCliprdrServerFormatDataRequest(formatDataRequest->requestedFormatId);
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
UINT orbitCliprdrServerFormatDataResponse(
|
||||
CliprdrClientContext* context, const CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse)
|
||||
{
|
||||
if (context == nullptr || context->custom == nullptr || formatDataResponse == nullptr) {
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
auto* backend = reinterpret_cast<RdpSessionBackend*>(context->custom);
|
||||
const bool success = (formatDataResponse->common.msgFlags & CB_RESPONSE_OK) != 0;
|
||||
backend->onCliprdrServerFormatDataResponse(
|
||||
success,
|
||||
reinterpret_cast<const uint8_t*>(formatDataResponse->requestedFormatData),
|
||||
formatDataResponse->common.dataLen);
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
BOOL orbitLoadChannels(freerdp* instance)
|
||||
{
|
||||
if (instance == nullptr || instance->context == nullptr || instance->context->settings == nullptr
|
||||
@@ -383,6 +631,14 @@ BOOL orbitLoadChannels(freerdp* instance)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (!orbitLoadStaticChannel(channels, settings, CLIPRDR_SVC_CHANNEL_NAME, settings)) {
|
||||
if (backend != nullptr) {
|
||||
emit backend->eventLogged(
|
||||
QStringLiteral("RDP warning: failed to load static '%1' channel; clipboard sync unavailable.")
|
||||
.arg(QString::fromUtf8(CLIPRDR_SVC_CHANNEL_NAME)));
|
||||
}
|
||||
}
|
||||
|
||||
if (backend != nullptr) {
|
||||
emit backend->eventLogged(QStringLiteral("RDP channel loader: display-control channels initialized."));
|
||||
}
|
||||
@@ -576,6 +832,25 @@ UINT32 scancodeFromNativeScanCode(quint32 nativeScanCode)
|
||||
return RDP_SCANCODE_UNKNOWN;
|
||||
}
|
||||
|
||||
#if defined(Q_OS_LINUX)
|
||||
// On X11, Qt's nativeScanCode() is the raw X11 KeyCode, not a PC/AT set-1
|
||||
// scancode. X11 keycode numbering only coincidentally overlaps with PC/AT
|
||||
// scancodes for some keys and diverges for others (e.g. X11 keycode 0x30
|
||||
// is the apostrophe/quote key, while PC/AT scancode 0x30 is the B key), so
|
||||
// treating one as the other silently sends the wrong key. FreeRDP ships an
|
||||
// authoritative X11-keycode -> RDP-scancode table; use it directly.
|
||||
// The function is marked deprecated upstream ("implement yourself in
|
||||
// client") but remains present and correct in this pinned FreeRDP build.
|
||||
#if defined(__GNUC__) || defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif
|
||||
const DWORD mapped = freerdp_keyboard_get_rdp_scancode_from_x11_keycode(nativeScanCode);
|
||||
#if defined(__GNUC__) || defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
return mapped != 0 ? mapped : RDP_SCANCODE_UNKNOWN;
|
||||
#else
|
||||
quint32 code = 0;
|
||||
bool extended = false;
|
||||
if ((nativeScanCode & 0xFF000000u) == 0xE0000000u) {
|
||||
@@ -607,6 +882,7 @@ UINT32 scancodeFromNativeScanCode(quint32 nativeScanCode)
|
||||
}
|
||||
|
||||
return scancode;
|
||||
#endif
|
||||
}
|
||||
|
||||
UINT32 scancodeForQtKey(int key, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode)
|
||||
@@ -1001,7 +1277,8 @@ RdpSessionBackend::RdpSessionBackend(const Profile& profile, QObject* parent)
|
||||
m_displayControlReady(false),
|
||||
m_resizeFailureLogged(false),
|
||||
m_lastResizeWidth(0),
|
||||
m_lastResizeHeight(0)
|
||||
m_lastResizeHeight(0),
|
||||
m_cliprdrContext(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1112,6 +1389,18 @@ void RdpSessionBackend::sendKeyEvent(int key,
|
||||
enqueueInputEvent(event);
|
||||
}
|
||||
|
||||
void RdpSessionBackend::setClipboardText(const QString& text)
|
||||
{
|
||||
if (!m_workerRunning.load()) {
|
||||
return;
|
||||
}
|
||||
|
||||
InputEvent event;
|
||||
event.type = InputEventType::SetClipboardText;
|
||||
event.text = text;
|
||||
enqueueInputEvent(event);
|
||||
}
|
||||
|
||||
void RdpSessionBackend::sendMouseMoveEvent(int x, int y)
|
||||
{
|
||||
if (!m_workerRunning.load()) {
|
||||
@@ -1221,6 +1510,8 @@ void RdpSessionBackend::workerMain()
|
||||
m_workerRunning.store(false);
|
||||
return;
|
||||
#else
|
||||
ensureFreeRdpRuntimeInitialized();
|
||||
|
||||
freerdp* instance = freerdp_new();
|
||||
if (instance == nullptr) {
|
||||
emitConnectionFailureAsync(QStringLiteral("Failed to initialize FreeRDP runtime."),
|
||||
@@ -1537,6 +1828,38 @@ bool RdpSessionBackend::sendDisplayResize(rdp_freerdp* instance, int width, int
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::sendClipboardTextToRemote(rdp_freerdp* instance, const QString& text)
|
||||
{
|
||||
#ifndef ORBITHUB_HAS_FREERDP
|
||||
Q_UNUSED(instance);
|
||||
Q_UNUSED(text);
|
||||
#else
|
||||
Q_UNUSED(instance);
|
||||
|
||||
CliprdrClientContext* cliprdrContext = nullptr;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
m_pendingLocalClipboardText = text;
|
||||
cliprdrContext = reinterpret_cast<CliprdrClientContext*>(m_cliprdrContext);
|
||||
}
|
||||
|
||||
if (cliprdrContext == nullptr || cliprdrContext->ClientFormatList == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
CLIPRDR_FORMAT format = {};
|
||||
format.formatId = CF_UNICODETEXT;
|
||||
format.formatName = nullptr;
|
||||
|
||||
CLIPRDR_FORMAT_LIST formatList = {};
|
||||
formatList.numFormats = 1;
|
||||
formatList.formats = &format;
|
||||
|
||||
const UINT rc = cliprdrContext->ClientFormatList(cliprdrContext, &formatList);
|
||||
Q_UNUSED(rc);
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::processInputEvents(rdp_freerdp* instance)
|
||||
{
|
||||
#ifndef ORBITHUB_HAS_FREERDP
|
||||
@@ -1661,6 +1984,9 @@ void RdpSessionBackend::processInputEvents(rdp_freerdp* instance)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case InputEventType::SetClipboardText:
|
||||
sendClipboardTextToRemote(instance, event.text);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1686,24 +2012,47 @@ void RdpSessionBackend::processInputEvents(rdp_freerdp* instance)
|
||||
void RdpSessionBackend::onChannelConnectedEvent(const char* name, void* channelInterface)
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
if (name == nullptr || std::strcmp(name, DISP_DVC_CHANNEL_NAME) != 0) {
|
||||
if (name == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto* dispContext = reinterpret_cast<DispClientContext*>(channelInterface);
|
||||
if (dispContext == nullptr) {
|
||||
if (std::strcmp(name, DISP_DVC_CHANNEL_NAME) == 0) {
|
||||
auto* dispContext = reinterpret_cast<DispClientContext*>(channelInterface);
|
||||
if (dispContext == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
dispContext->custom = this;
|
||||
dispContext->DisplayControlCaps = orbitDisplayControlCaps;
|
||||
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_displayControlMutex);
|
||||
m_displayControlContext = dispContext;
|
||||
m_displayControlReady = false;
|
||||
}
|
||||
emit eventLogged(QStringLiteral("RDP display-control channel connected."));
|
||||
return;
|
||||
}
|
||||
|
||||
dispContext->custom = this;
|
||||
dispContext->DisplayControlCaps = orbitDisplayControlCaps;
|
||||
if (std::strcmp(name, CLIPRDR_SVC_CHANNEL_NAME) == 0) {
|
||||
auto* cliprdrContext = reinterpret_cast<CliprdrClientContext*>(channelInterface);
|
||||
if (cliprdrContext == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_displayControlMutex);
|
||||
m_displayControlContext = dispContext;
|
||||
m_displayControlReady = false;
|
||||
cliprdrContext->custom = this;
|
||||
cliprdrContext->MonitorReady = orbitCliprdrMonitorReady;
|
||||
cliprdrContext->ServerFormatList = orbitCliprdrServerFormatList;
|
||||
cliprdrContext->ServerFormatListResponse = orbitCliprdrServerFormatListResponse;
|
||||
cliprdrContext->ServerFormatDataRequest = orbitCliprdrServerFormatDataRequest;
|
||||
cliprdrContext->ServerFormatDataResponse = orbitCliprdrServerFormatDataResponse;
|
||||
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
m_cliprdrContext = cliprdrContext;
|
||||
}
|
||||
emit eventLogged(QStringLiteral("RDP clipboard channel connected."));
|
||||
}
|
||||
emit eventLogged(QStringLiteral("RDP display-control channel connected."));
|
||||
#else
|
||||
Q_UNUSED(name);
|
||||
Q_UNUSED(channelInterface);
|
||||
@@ -1713,24 +2062,43 @@ void RdpSessionBackend::onChannelConnectedEvent(const char* name, void* channelI
|
||||
void RdpSessionBackend::onChannelDisconnectedEvent(const char* name, void* channelInterface)
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
if (name != nullptr && std::strcmp(name, DISP_DVC_CHANNEL_NAME) != 0) {
|
||||
return;
|
||||
}
|
||||
const bool matchesDisp = name == nullptr || std::strcmp(name, DISP_DVC_CHANNEL_NAME) == 0;
|
||||
const bool matchesCliprdr =
|
||||
name == nullptr || std::strcmp(name, CLIPRDR_SVC_CHANNEL_NAME) == 0;
|
||||
|
||||
bool cleared = false;
|
||||
bool hadDisplayControl = false;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_displayControlMutex);
|
||||
hadDisplayControl = (m_displayControlContext != nullptr) || m_displayControlReady;
|
||||
if (channelInterface == nullptr || m_displayControlContext == channelInterface) {
|
||||
m_displayControlContext = nullptr;
|
||||
m_displayControlReady = false;
|
||||
cleared = true;
|
||||
if (matchesDisp) {
|
||||
bool cleared = false;
|
||||
bool hadDisplayControl = false;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_displayControlMutex);
|
||||
hadDisplayControl = (m_displayControlContext != nullptr) || m_displayControlReady;
|
||||
if (channelInterface == nullptr || m_displayControlContext == channelInterface) {
|
||||
m_displayControlContext = nullptr;
|
||||
m_displayControlReady = false;
|
||||
cleared = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (cleared && hadDisplayControl) {
|
||||
emit eventLogged(QStringLiteral("RDP display-control channel disconnected."));
|
||||
}
|
||||
}
|
||||
|
||||
if (cleared && hadDisplayControl) {
|
||||
emit eventLogged(QStringLiteral("RDP display-control channel disconnected."));
|
||||
if (matchesCliprdr) {
|
||||
bool cleared = false;
|
||||
bool hadCliprdr = false;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
hadCliprdr = m_cliprdrContext != nullptr;
|
||||
if (channelInterface == nullptr || m_cliprdrContext == channelInterface) {
|
||||
m_cliprdrContext = nullptr;
|
||||
cleared = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (cleared && hadCliprdr) {
|
||||
emit eventLogged(QStringLiteral("RDP clipboard channel disconnected."));
|
||||
}
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(name);
|
||||
@@ -1769,6 +2137,130 @@ void RdpSessionBackend::onDisplayControlCaps(uint32_t maxNumMonitors,
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::onCliprdrMonitorReady()
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
CliprdrClientContext* cliprdrContext = nullptr;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
cliprdrContext = reinterpret_cast<CliprdrClientContext*>(m_cliprdrContext);
|
||||
}
|
||||
|
||||
if (cliprdrContext == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet = {};
|
||||
generalCapabilitySet.capabilitySetType = CB_CAPSTYPE_GENERAL;
|
||||
generalCapabilitySet.capabilitySetLength = CB_CAPSTYPE_GENERAL_LEN;
|
||||
generalCapabilitySet.version = CB_CAPS_VERSION_2;
|
||||
generalCapabilitySet.generalFlags = CB_USE_LONG_FORMAT_NAMES;
|
||||
|
||||
CLIPRDR_CAPABILITIES capabilities = {};
|
||||
capabilities.cCapabilitiesSets = 1;
|
||||
capabilities.capabilitySets = reinterpret_cast<CLIPRDR_CAPABILITY_SET*>(&generalCapabilitySet);
|
||||
|
||||
if (cliprdrContext->ClientCapabilities != nullptr) {
|
||||
const UINT rc = cliprdrContext->ClientCapabilities(cliprdrContext, &capabilities);
|
||||
Q_UNUSED(rc);
|
||||
}
|
||||
|
||||
emit eventLogged(QStringLiteral("RDP clipboard channel ready."));
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::onCliprdrServerFormatList(bool hasUnicodeText)
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
CliprdrClientContext* cliprdrContext = nullptr;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
cliprdrContext = reinterpret_cast<CliprdrClientContext*>(m_cliprdrContext);
|
||||
}
|
||||
|
||||
if (cliprdrContext == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cliprdrContext->ClientFormatListResponse != nullptr) {
|
||||
CLIPRDR_FORMAT_LIST_RESPONSE response = {};
|
||||
response.common.msgFlags = CB_RESPONSE_OK;
|
||||
const UINT rc = cliprdrContext->ClientFormatListResponse(cliprdrContext, &response);
|
||||
Q_UNUSED(rc);
|
||||
}
|
||||
|
||||
if (hasUnicodeText && cliprdrContext->ClientFormatDataRequest != nullptr) {
|
||||
CLIPRDR_FORMAT_DATA_REQUEST request = {};
|
||||
request.requestedFormatId = CF_UNICODETEXT;
|
||||
const UINT rc = cliprdrContext->ClientFormatDataRequest(cliprdrContext, &request);
|
||||
Q_UNUSED(rc);
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(hasUnicodeText);
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::onCliprdrServerFormatDataRequest(uint32_t requestedFormatId)
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
CliprdrClientContext* cliprdrContext = nullptr;
|
||||
QString pendingText;
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(m_cliprdrMutex);
|
||||
cliprdrContext = reinterpret_cast<CliprdrClientContext*>(m_cliprdrContext);
|
||||
pendingText = m_pendingLocalClipboardText;
|
||||
}
|
||||
|
||||
if (cliprdrContext == nullptr || cliprdrContext->ClientFormatDataResponse == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
CLIPRDR_FORMAT_DATA_RESPONSE response = {};
|
||||
QByteArray encoded;
|
||||
if (requestedFormatId == CF_UNICODETEXT) {
|
||||
const int byteLength = (pendingText.size() + 1) * static_cast<int>(sizeof(ushort));
|
||||
encoded = QByteArray(reinterpret_cast<const char*>(pendingText.utf16()), byteLength);
|
||||
}
|
||||
|
||||
response.common.msgFlags = encoded.isEmpty() ? CB_RESPONSE_FAIL : CB_RESPONSE_OK;
|
||||
response.common.dataLen = static_cast<UINT32>(encoded.size());
|
||||
response.requestedFormatData =
|
||||
encoded.isEmpty() ? nullptr : reinterpret_cast<const BYTE*>(encoded.constData());
|
||||
const UINT rc = cliprdrContext->ClientFormatDataResponse(cliprdrContext, &response);
|
||||
Q_UNUSED(rc);
|
||||
#else
|
||||
Q_UNUSED(requestedFormatId);
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::onCliprdrServerFormatDataResponse(bool success,
|
||||
const uint8_t* data,
|
||||
uint32_t size)
|
||||
{
|
||||
#ifdef ORBITHUB_HAS_FREERDP
|
||||
if (!success || data == nullptr || size == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const auto* utf16Data = reinterpret_cast<const char16_t*>(data);
|
||||
const size_t charCount = size / sizeof(char16_t);
|
||||
|
||||
// CF_UNICODETEXT is NUL-terminated per MS-RDPECLIP; trim at the first NUL
|
||||
// rather than trusting dataLen to exclude it.
|
||||
size_t length = 0;
|
||||
while (length < charCount && utf16Data[length] != 0) {
|
||||
++length;
|
||||
}
|
||||
|
||||
const QString text = QString::fromUtf16(utf16Data, static_cast<int>(length));
|
||||
emit remoteClipboardTextChanged(text);
|
||||
#else
|
||||
Q_UNUSED(success);
|
||||
Q_UNUSED(data);
|
||||
Q_UNUSED(size);
|
||||
#endif
|
||||
}
|
||||
|
||||
void RdpSessionBackend::emitStateAsync(SessionState state, const QString& message)
|
||||
{
|
||||
QMetaObject::invokeMethod(
|
||||
|
||||
@@ -34,6 +34,7 @@ public slots:
|
||||
void sendMouseMoveEvent(int x, int y) override;
|
||||
void sendMouseButtonEvent(int x, int y, int button, bool pressed) override;
|
||||
void sendMouseWheelEvent(int x, int y, int deltaX, int deltaY) override;
|
||||
void setClipboardText(const QString& text) override;
|
||||
|
||||
private:
|
||||
enum class InputEventType {
|
||||
@@ -42,6 +43,7 @@ private:
|
||||
MouseButton,
|
||||
MouseWheel,
|
||||
Resize,
|
||||
SetClipboardText,
|
||||
};
|
||||
|
||||
struct InputEvent {
|
||||
@@ -84,6 +86,10 @@ private:
|
||||
int m_lastResizeWidth;
|
||||
int m_lastResizeHeight;
|
||||
|
||||
std::mutex m_cliprdrMutex;
|
||||
void* m_cliprdrContext;
|
||||
QString m_pendingLocalClipboardText;
|
||||
|
||||
void setState(SessionState state, const QString& message);
|
||||
bool validateProfile(QString& message) const;
|
||||
void startWorker();
|
||||
@@ -92,12 +98,17 @@ private:
|
||||
void enqueueInputEvent(const InputEvent& event);
|
||||
void processInputEvents(rdp_freerdp* instance);
|
||||
bool sendDisplayResize(rdp_freerdp* instance, int width, int height);
|
||||
void sendClipboardTextToRemote(rdp_freerdp* instance, const QString& text);
|
||||
public:
|
||||
void onChannelConnectedEvent(const char* name, void* channelInterface);
|
||||
void onChannelDisconnectedEvent(const char* name, void* channelInterface);
|
||||
void onDisplayControlCaps(uint32_t maxNumMonitors,
|
||||
uint32_t maxMonitorAreaFactorA,
|
||||
uint32_t maxMonitorAreaFactorB);
|
||||
void onCliprdrMonitorReady();
|
||||
void onCliprdrServerFormatList(bool hasUnicodeText);
|
||||
void onCliprdrServerFormatDataRequest(uint32_t requestedFormatId);
|
||||
void onCliprdrServerFormatDataResponse(bool success, const uint8_t* data, uint32_t size);
|
||||
private:
|
||||
void emitStateAsync(SessionState state, const QString& message);
|
||||
void emitConnectionFailureAsync(const QString& displayMessage, const QString& rawMessage);
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <QImage>
|
||||
#include <QObject>
|
||||
#include <QPoint>
|
||||
#include <QString>
|
||||
#include <QtGlobal>
|
||||
|
||||
@@ -46,6 +47,10 @@ public slots:
|
||||
virtual void sendInput(const QString& input) = 0;
|
||||
virtual void confirmHostKey(bool trustHost) = 0;
|
||||
virtual void updateTerminalSize(int columns, int rows) = 0;
|
||||
virtual void setClipboardText(const QString& text)
|
||||
{
|
||||
Q_UNUSED(text);
|
||||
}
|
||||
virtual void sendKeyEvent(int key,
|
||||
quint32 nativeScanCode,
|
||||
const QString& text,
|
||||
@@ -86,6 +91,10 @@ signals:
|
||||
void hostKeyConfirmationRequested(const QString& prompt);
|
||||
void frameUpdated(const QImage& frame);
|
||||
void remoteDesktopSizeChanged(int width, int height);
|
||||
void remoteClipboardTextChanged(const QString& text);
|
||||
void cursorImageChanged(const QImage& image, const QPoint& hotspot);
|
||||
void cursorHidden();
|
||||
void cursorReset();
|
||||
|
||||
private:
|
||||
Profile m_profile;
|
||||
|
||||
@@ -13,15 +13,16 @@
|
||||
#include <QFont>
|
||||
#include <QFontDatabase>
|
||||
#include <QHBoxLayout>
|
||||
#include <QInputDialog>
|
||||
#include <QLabel>
|
||||
#include <QLineEdit>
|
||||
#include <QMessageBox>
|
||||
#include <QPlainTextEdit>
|
||||
#include <QApplication>
|
||||
#include <QClipboard>
|
||||
#include <QMimeData>
|
||||
#include <QComboBox>
|
||||
#include <QProcessEnvironment>
|
||||
#include <QPushButton>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QToolButton>
|
||||
@@ -71,6 +72,11 @@ SessionTab::SessionTab(const Profile& profile,
|
||||
m_terminalThemeName(preferences.terminalThemeName.trimmed().isEmpty()
|
||||
? QStringLiteral("Dark")
|
||||
: preferences.terminalThemeName.trimmed()),
|
||||
m_terminalFontPointSize(preferences.terminalFontPointSize > 0
|
||||
? preferences.terminalFontPointSize
|
||||
: 0),
|
||||
m_clipboardSyncSupported(profile.protocol.compare(QStringLiteral("RDP"), Qt::CaseInsensitive)
|
||||
== 0),
|
||||
m_sshTerminal(nullptr),
|
||||
m_rdpDisplay(nullptr),
|
||||
m_terminalOutput(nullptr),
|
||||
@@ -81,6 +87,11 @@ SessionTab::SessionTab(const Profile& profile,
|
||||
m_clearEventsButton(nullptr),
|
||||
m_exportEventsButton(nullptr),
|
||||
m_eventsPanel(nullptr),
|
||||
m_passwordPromptBar(nullptr),
|
||||
m_passwordPromptLabel(nullptr),
|
||||
m_passwordPromptInput(nullptr),
|
||||
m_passwordPromptConnectButton(nullptr),
|
||||
m_passwordPromptCancelButton(nullptr),
|
||||
m_eventSeverityFilter(EventSeverity::Info),
|
||||
m_eventsPanelExpanded(preferences.eventsPanelExpanded)
|
||||
{
|
||||
@@ -185,6 +196,11 @@ SessionTab::SessionTab(const Profile& profile,
|
||||
m_backend,
|
||||
&SessionBackend::sendMouseWheelEvent,
|
||||
Qt::QueuedConnection);
|
||||
connect(this,
|
||||
&SessionTab::requestSetClipboardText,
|
||||
m_backend,
|
||||
&SessionBackend::setClipboardText,
|
||||
Qt::QueuedConnection);
|
||||
|
||||
connect(m_backend,
|
||||
&SessionBackend::stateChanged,
|
||||
@@ -229,10 +245,49 @@ SessionTab::SessionTab(const Profile& profile,
|
||||
}
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
connect(m_backend,
|
||||
&SessionBackend::remoteClipboardTextChanged,
|
||||
this,
|
||||
&SessionTab::onBackendRemoteClipboardTextChanged,
|
||||
Qt::QueuedConnection);
|
||||
connect(m_backend,
|
||||
&SessionBackend::cursorImageChanged,
|
||||
this,
|
||||
[this](const QImage& image, const QPoint& hotspot) {
|
||||
if (m_rdpDisplay != nullptr) {
|
||||
m_rdpDisplay->setCursorImage(image, hotspot);
|
||||
}
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
connect(m_backend,
|
||||
&SessionBackend::cursorHidden,
|
||||
this,
|
||||
[this]() {
|
||||
if (m_rdpDisplay != nullptr) {
|
||||
m_rdpDisplay->setCursorHidden();
|
||||
}
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
connect(m_backend,
|
||||
&SessionBackend::cursorReset,
|
||||
this,
|
||||
[this]() {
|
||||
if (m_rdpDisplay != nullptr) {
|
||||
m_rdpDisplay->setCursorDefault();
|
||||
}
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
|
||||
m_backendThread->start();
|
||||
}
|
||||
|
||||
if (m_clipboardSyncSupported) {
|
||||
connect(QApplication::clipboard(),
|
||||
&QClipboard::dataChanged,
|
||||
this,
|
||||
&SessionTab::onSystemClipboardChanged);
|
||||
}
|
||||
|
||||
setState(SessionState::Disconnected, QStringLiteral("Ready to connect."));
|
||||
QTimer::singleShot(0, this, &SessionTab::connectSession);
|
||||
}
|
||||
@@ -265,21 +320,20 @@ void SessionTab::connectSession()
|
||||
return;
|
||||
}
|
||||
|
||||
const std::optional<SessionConnectOptions> options = buildConnectOptions();
|
||||
if (!options.has_value()) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_lastConnectOptions = options.value();
|
||||
|
||||
if (m_useKodoTermForSsh) {
|
||||
if (!startSshTerminal(options.value())) {
|
||||
requestConnectOptions([this](std::optional<SessionConnectOptions> options) {
|
||||
if (!options.has_value()) {
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
emit requestConnect(options.value());
|
||||
m_lastConnectOptions = options.value();
|
||||
|
||||
if (m_useKodoTermForSsh) {
|
||||
startSshTerminal(options.value());
|
||||
return;
|
||||
}
|
||||
|
||||
emit requestConnect(options.value());
|
||||
});
|
||||
}
|
||||
|
||||
void SessionTab::disconnectSession()
|
||||
@@ -305,24 +359,25 @@ void SessionTab::reconnectSession()
|
||||
return;
|
||||
}
|
||||
|
||||
const std::optional<SessionConnectOptions> options = buildConnectOptions();
|
||||
if (!options.has_value()) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_lastConnectOptions = options.value();
|
||||
|
||||
if (m_useKodoTermForSsh) {
|
||||
if (m_sshTerminal != nullptr) {
|
||||
m_sshTerminal->kill();
|
||||
requestConnectOptions([this](std::optional<SessionConnectOptions> options) {
|
||||
if (!options.has_value()) {
|
||||
return;
|
||||
}
|
||||
QTimer::singleShot(50,
|
||||
this,
|
||||
[this, options]() { startSshTerminal(options.value()); });
|
||||
return;
|
||||
}
|
||||
|
||||
emit requestReconnect(options.value());
|
||||
m_lastConnectOptions = options.value();
|
||||
|
||||
if (m_useKodoTermForSsh) {
|
||||
if (m_sshTerminal != nullptr) {
|
||||
m_sshTerminal->kill();
|
||||
}
|
||||
QTimer::singleShot(50,
|
||||
this,
|
||||
[this, options]() { startSshTerminal(options.value()); });
|
||||
return;
|
||||
}
|
||||
|
||||
emit requestReconnect(options.value());
|
||||
});
|
||||
}
|
||||
|
||||
void SessionTab::clearTerminal()
|
||||
@@ -380,6 +435,84 @@ bool SessionTab::supportsClearAction() const
|
||||
return m_useKodoTermForSsh || m_terminalOutput != nullptr;
|
||||
}
|
||||
|
||||
bool SessionTab::supportsZoom() const
|
||||
{
|
||||
return m_useKodoTermForSsh || m_terminalOutput != nullptr;
|
||||
}
|
||||
|
||||
void SessionTab::zoomIn()
|
||||
{
|
||||
if (m_useKodoTermForSsh && m_sshTerminal != nullptr) {
|
||||
m_sshTerminal->zoomIn();
|
||||
m_terminalFontPointSize = m_sshTerminal->getConfig().font.pointSize();
|
||||
} else if (m_terminalOutput != nullptr) {
|
||||
m_terminalFontPointSize = m_terminalOutput->font().pointSize() + 1;
|
||||
m_terminalOutput->setFontPointSize(m_terminalFontPointSize);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
emit terminalFontSizeChanged(m_terminalFontPointSize);
|
||||
}
|
||||
|
||||
void SessionTab::zoomOut()
|
||||
{
|
||||
if (m_useKodoTermForSsh && m_sshTerminal != nullptr) {
|
||||
m_sshTerminal->zoomOut();
|
||||
m_terminalFontPointSize = m_sshTerminal->getConfig().font.pointSize();
|
||||
} else if (m_terminalOutput != nullptr) {
|
||||
const int newSize = m_terminalOutput->font().pointSize() - 1;
|
||||
if (newSize < 6) {
|
||||
return;
|
||||
}
|
||||
m_terminalFontPointSize = newSize;
|
||||
m_terminalOutput->setFontPointSize(m_terminalFontPointSize);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
emit terminalFontSizeChanged(m_terminalFontPointSize);
|
||||
}
|
||||
|
||||
void SessionTab::resetZoom()
|
||||
{
|
||||
if (m_useKodoTermForSsh && m_sshTerminal != nullptr) {
|
||||
m_sshTerminal->resetZoom();
|
||||
m_terminalFontPointSize = m_sshTerminal->getConfig().font.pointSize();
|
||||
} else if (m_terminalOutput != nullptr) {
|
||||
m_terminalFontPointSize = defaultTerminalFont().pointSize();
|
||||
m_terminalOutput->setFontPointSize(m_terminalFontPointSize);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
emit terminalFontSizeChanged(m_terminalFontPointSize);
|
||||
}
|
||||
|
||||
void SessionTab::setTerminalFontPointSize(int pointSize)
|
||||
{
|
||||
const int clamped = qBound(6, pointSize, 72);
|
||||
|
||||
if (m_useKodoTermForSsh && m_sshTerminal != nullptr) {
|
||||
KodoTermConfig config = m_sshTerminal->getConfig();
|
||||
config.font.setPointSize(clamped);
|
||||
m_sshTerminal->setConfig(config);
|
||||
m_terminalFontPointSize = clamped;
|
||||
} else if (m_terminalOutput != nullptr) {
|
||||
m_terminalFontPointSize = clamped;
|
||||
m_terminalOutput->setFontPointSize(clamped);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
emit terminalFontSizeChanged(m_terminalFontPointSize);
|
||||
}
|
||||
|
||||
int SessionTab::terminalFontPointSize() const
|
||||
{
|
||||
return m_terminalFontPointSize;
|
||||
}
|
||||
|
||||
bool SessionTab::isEventsPanelExpanded() const
|
||||
{
|
||||
return m_eventsPanelExpanded;
|
||||
@@ -529,13 +662,46 @@ void SessionTab::onBackendHostKeyConfirmationRequested(const QString& prompt)
|
||||
emit requestHostKeyConfirmation(reply == QMessageBox::Yes);
|
||||
}
|
||||
|
||||
void SessionTab::onBackendRemoteClipboardTextChanged(const QString& text)
|
||||
{
|
||||
if (text == m_lastSyncedClipboardText) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_lastSyncedClipboardText = text;
|
||||
QApplication::clipboard()->setText(text);
|
||||
}
|
||||
|
||||
void SessionTab::onSystemClipboardChanged()
|
||||
{
|
||||
if (!m_clipboardSyncSupported || m_state != SessionState::Connected) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QClipboard* clipboard = QApplication::clipboard();
|
||||
if (!clipboard->mimeData()->hasText()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QString text = clipboard->text();
|
||||
if (text == m_lastSyncedClipboardText) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_lastSyncedClipboardText = text;
|
||||
emit requestSetClipboardText(text);
|
||||
}
|
||||
|
||||
void SessionTab::setupUi()
|
||||
{
|
||||
auto* rootLayout = new QVBoxLayout(this);
|
||||
|
||||
if (m_useKodoTermForSsh) {
|
||||
m_sshTerminal = new KodoTerm(this);
|
||||
const QFont terminalFont = defaultTerminalFont();
|
||||
QFont terminalFont = defaultTerminalFont();
|
||||
if (m_terminalFontPointSize > 0) {
|
||||
terminalFont.setPointSize(m_terminalFontPointSize);
|
||||
}
|
||||
|
||||
KodoTermConfig config = m_sshTerminal->getConfig();
|
||||
config.font = terminalFont;
|
||||
@@ -548,7 +714,11 @@ void SessionTab::setupUi()
|
||||
rootLayout->addWidget(m_rdpDisplay, 1);
|
||||
} else {
|
||||
m_terminalOutput = new TerminalView(this);
|
||||
m_terminalOutput->setFont(defaultTerminalFont());
|
||||
QFont fallbackFont = defaultTerminalFont();
|
||||
if (m_terminalFontPointSize > 0) {
|
||||
fallbackFont.setPointSize(m_terminalFontPointSize);
|
||||
}
|
||||
m_terminalOutput->setFont(fallbackFont);
|
||||
m_terminalOutput->setMinimumHeight(260);
|
||||
m_terminalOutput->setReadOnly(true);
|
||||
if (m_profile.protocol.compare(QStringLiteral("VNC"), Qt::CaseInsensitive) == 0) {
|
||||
@@ -563,6 +733,45 @@ void SessionTab::setupUi()
|
||||
|
||||
applyTerminalTheme(m_terminalThemeName);
|
||||
|
||||
auto* passwordPromptLayout = new QHBoxLayout();
|
||||
m_passwordPromptLabel = new QLabel(this);
|
||||
m_passwordPromptInput = new QLineEdit(this);
|
||||
m_passwordPromptInput->setEchoMode(QLineEdit::Password);
|
||||
m_passwordPromptConnectButton = new QPushButton(QStringLiteral("Connect"), this);
|
||||
m_passwordPromptCancelButton = new QPushButton(QStringLiteral("Cancel"), this);
|
||||
passwordPromptLayout->addWidget(m_passwordPromptLabel);
|
||||
passwordPromptLayout->addWidget(m_passwordPromptInput, 1);
|
||||
passwordPromptLayout->addWidget(m_passwordPromptConnectButton);
|
||||
passwordPromptLayout->addWidget(m_passwordPromptCancelButton);
|
||||
|
||||
m_passwordPromptBar = new QWidget(this);
|
||||
m_passwordPromptBar->setLayout(passwordPromptLayout);
|
||||
m_passwordPromptBar->setAutoFillBackground(true);
|
||||
m_passwordPromptBar->setVisible(false);
|
||||
rootLayout->addWidget(m_passwordPromptBar);
|
||||
|
||||
connect(m_passwordPromptConnectButton, &QPushButton::clicked, this, [this]() {
|
||||
if (!m_passwordPromptCallback) {
|
||||
return;
|
||||
}
|
||||
const QString password = m_passwordPromptInput->text();
|
||||
const auto callback = m_passwordPromptCallback;
|
||||
hidePasswordPrompt();
|
||||
callback(password);
|
||||
});
|
||||
connect(m_passwordPromptCancelButton, &QPushButton::clicked, this, [this]() {
|
||||
if (!m_passwordPromptCallback) {
|
||||
return;
|
||||
}
|
||||
const auto callback = m_passwordPromptCallback;
|
||||
hidePasswordPrompt();
|
||||
callback(std::nullopt);
|
||||
});
|
||||
connect(m_passwordPromptInput,
|
||||
&QLineEdit::returnPressed,
|
||||
m_passwordPromptConnectButton,
|
||||
&QPushButton::click);
|
||||
|
||||
auto* eventsHeader = new QHBoxLayout();
|
||||
m_toggleEventsButton = new QToolButton(this);
|
||||
m_toggleEventsButton->setCheckable(true);
|
||||
@@ -676,77 +885,85 @@ void SessionTab::setupUi()
|
||||
}
|
||||
}
|
||||
|
||||
std::optional<SessionConnectOptions> SessionTab::buildConnectOptions()
|
||||
void SessionTab::requestConnectOptions(
|
||||
std::function<void(std::optional<SessionConnectOptions>)> callback)
|
||||
{
|
||||
SessionConnectOptions options;
|
||||
options.knownHostsPolicy = m_profile.knownHostsPolicy;
|
||||
SessionConnectOptions baseOptions;
|
||||
baseOptions.knownHostsPolicy = m_profile.knownHostsPolicy;
|
||||
|
||||
const bool isSsh = m_profile.protocol.compare(QStringLiteral("SSH"), Qt::CaseInsensitive) == 0;
|
||||
const bool isRdp = m_profile.protocol.compare(QStringLiteral("RDP"), Qt::CaseInsensitive) == 0;
|
||||
|
||||
if (!isSsh && !isRdp) {
|
||||
return options;
|
||||
callback(baseOptions);
|
||||
return;
|
||||
}
|
||||
|
||||
if (isRdp) {
|
||||
if (m_profile.authMode.compare(QStringLiteral("Password"), Qt::CaseInsensitive) != 0) {
|
||||
return options;
|
||||
callback(baseOptions);
|
||||
return;
|
||||
}
|
||||
|
||||
bool accepted = false;
|
||||
const QString password = QInputDialog::getText(
|
||||
this,
|
||||
QStringLiteral("RDP Password"),
|
||||
QStringLiteral("Password for %1:")
|
||||
.arg(m_profile.username.trimmed().isEmpty()
|
||||
? m_profile.host
|
||||
: QStringLiteral("%1@%2").arg(m_profile.username, m_profile.host)),
|
||||
QLineEdit::Password,
|
||||
QString(),
|
||||
&accepted);
|
||||
if (!accepted) {
|
||||
return std::nullopt;
|
||||
}
|
||||
const QString label = QStringLiteral("RDP password for %1:")
|
||||
.arg(m_profile.username.trimmed().isEmpty()
|
||||
? m_profile.host
|
||||
: QStringLiteral("%1@%2").arg(m_profile.username, m_profile.host));
|
||||
|
||||
if (password.isEmpty()) {
|
||||
QMessageBox::warning(this,
|
||||
QStringLiteral("Connect"),
|
||||
QStringLiteral("Password is required for password authentication."));
|
||||
return std::nullopt;
|
||||
}
|
||||
showPasswordPrompt(
|
||||
label,
|
||||
[this, baseOptions, callback](std::optional<QString> password) {
|
||||
if (!password.has_value()) {
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
options.password = password;
|
||||
return options;
|
||||
if (password->isEmpty()) {
|
||||
QMessageBox::warning(
|
||||
this,
|
||||
QStringLiteral("Connect"),
|
||||
QStringLiteral("Password is required for password authentication."));
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
SessionConnectOptions options = baseOptions;
|
||||
options.password = password.value();
|
||||
callback(options);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_useKodoTermForSsh
|
||||
&& m_profile.authMode.compare(QStringLiteral("Password"), Qt::CaseInsensitive) == 0) {
|
||||
// Password is entered directly in terminal prompt.
|
||||
return options;
|
||||
callback(baseOptions);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_profile.authMode.compare(QStringLiteral("Password"), Qt::CaseInsensitive) == 0) {
|
||||
bool accepted = false;
|
||||
const QString password = QInputDialog::getText(this,
|
||||
QStringLiteral("SSH Password"),
|
||||
QStringLiteral("Password for %1@%2:")
|
||||
.arg(m_profile.username, m_profile.host),
|
||||
QLineEdit::Password,
|
||||
QString(),
|
||||
&accepted);
|
||||
if (!accepted) {
|
||||
return std::nullopt;
|
||||
}
|
||||
showPasswordPrompt(
|
||||
QStringLiteral("SSH password for %1@%2:").arg(m_profile.username, m_profile.host),
|
||||
[this, baseOptions, callback](std::optional<QString> password) {
|
||||
if (!password.has_value()) {
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
if (password.isEmpty()) {
|
||||
QMessageBox::warning(this,
|
||||
QStringLiteral("Connect"),
|
||||
QStringLiteral("Password is required for password authentication."));
|
||||
return std::nullopt;
|
||||
}
|
||||
if (password->isEmpty()) {
|
||||
QMessageBox::warning(
|
||||
this,
|
||||
QStringLiteral("Connect"),
|
||||
QStringLiteral("Password is required for password authentication."));
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
options.password = password;
|
||||
return options;
|
||||
SessionConnectOptions options = baseOptions;
|
||||
options.password = password.value();
|
||||
callback(options);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
QString keyPath = m_profile.privateKeyPath.trimmed();
|
||||
@@ -756,7 +973,8 @@ std::optional<SessionConnectOptions> SessionTab::buildConnectOptions()
|
||||
QString(),
|
||||
QStringLiteral("All Files (*)"));
|
||||
if (keyPath.isEmpty()) {
|
||||
return std::nullopt;
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -764,11 +982,35 @@ std::optional<SessionConnectOptions> SessionTab::buildConnectOptions()
|
||||
QMessageBox::warning(this,
|
||||
QStringLiteral("Connect"),
|
||||
QStringLiteral("Private key file not found: %1").arg(keyPath));
|
||||
return std::nullopt;
|
||||
callback(std::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
SessionConnectOptions options = baseOptions;
|
||||
options.privateKeyPath = keyPath;
|
||||
return options;
|
||||
callback(options);
|
||||
}
|
||||
|
||||
void SessionTab::showPasswordPrompt(const QString& labelText,
|
||||
std::function<void(std::optional<QString>)> callback)
|
||||
{
|
||||
if (m_passwordPromptCallback) {
|
||||
const auto previousCallback = m_passwordPromptCallback;
|
||||
m_passwordPromptCallback = nullptr;
|
||||
previousCallback(std::nullopt);
|
||||
}
|
||||
|
||||
m_passwordPromptCallback = std::move(callback);
|
||||
m_passwordPromptLabel->setText(labelText);
|
||||
m_passwordPromptInput->clear();
|
||||
m_passwordPromptBar->setVisible(true);
|
||||
m_passwordPromptInput->setFocus();
|
||||
}
|
||||
|
||||
void SessionTab::hidePasswordPrompt()
|
||||
{
|
||||
m_passwordPromptBar->setVisible(false);
|
||||
m_passwordPromptCallback = nullptr;
|
||||
}
|
||||
|
||||
bool SessionTab::validateProfileForConnect()
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <QStringList>
|
||||
#include <QtGlobal>
|
||||
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
#include <vector>
|
||||
|
||||
@@ -19,12 +20,15 @@ class RdpDisplayWidget;
|
||||
class QToolButton;
|
||||
class QLineEdit;
|
||||
class QComboBox;
|
||||
class QLabel;
|
||||
class QPushButton;
|
||||
class KodoTerm;
|
||||
|
||||
struct SessionUiPreferences
|
||||
{
|
||||
QString terminalThemeName = QStringLiteral("Dark");
|
||||
bool eventsPanelExpanded = false;
|
||||
int terminalFontPointSize = 0;
|
||||
};
|
||||
|
||||
class SessionTab : public QWidget
|
||||
@@ -46,6 +50,12 @@ public:
|
||||
QString terminalThemeName() const;
|
||||
bool supportsThemeSelection() const;
|
||||
bool supportsClearAction() const;
|
||||
bool supportsZoom() const;
|
||||
void zoomIn();
|
||||
void zoomOut();
|
||||
void resetZoom();
|
||||
void setTerminalFontPointSize(int pointSize);
|
||||
int terminalFontPointSize() const;
|
||||
bool isEventsPanelExpanded() const;
|
||||
void setEventsPanelExpanded(bool expanded);
|
||||
void clearEvents();
|
||||
@@ -56,6 +66,7 @@ signals:
|
||||
void tabTitleChanged(const QString& title);
|
||||
void tabStateChanged(SessionState state);
|
||||
void terminalThemeChanged(const QString& themeName);
|
||||
void terminalFontSizeChanged(int pointSize);
|
||||
void eventsPanelVisibilityChanged(bool expanded);
|
||||
void requestConnect(const SessionConnectOptions& options);
|
||||
void requestDisconnect();
|
||||
@@ -71,6 +82,7 @@ signals:
|
||||
void requestMouseMoveEvent(int x, int y);
|
||||
void requestMouseButtonEvent(int x, int y, int button, bool pressed);
|
||||
void requestMouseWheelEvent(int x, int y, int deltaX, int deltaY);
|
||||
void requestSetClipboardText(const QString& text);
|
||||
|
||||
private slots:
|
||||
void onBackendStateChanged(SessionState state, const QString& message);
|
||||
@@ -78,6 +90,8 @@ private slots:
|
||||
void onBackendConnectionError(const QString& displayMessage, const QString& rawMessage);
|
||||
void onBackendOutputReceived(const QString& text);
|
||||
void onBackendHostKeyConfirmationRequested(const QString& prompt);
|
||||
void onBackendRemoteClipboardTextChanged(const QString& text);
|
||||
void onSystemClipboardChanged();
|
||||
|
||||
private:
|
||||
Profile m_profile;
|
||||
@@ -88,6 +102,9 @@ private:
|
||||
QString m_lastError;
|
||||
SessionConnectOptions m_lastConnectOptions;
|
||||
QString m_terminalThemeName;
|
||||
int m_terminalFontPointSize;
|
||||
QString m_lastSyncedClipboardText;
|
||||
bool m_clipboardSyncSupported;
|
||||
|
||||
KodoTerm* m_sshTerminal;
|
||||
RdpDisplayWidget* m_rdpDisplay;
|
||||
@@ -99,6 +116,12 @@ private:
|
||||
QToolButton* m_clearEventsButton;
|
||||
QToolButton* m_exportEventsButton;
|
||||
QWidget* m_eventsPanel;
|
||||
QWidget* m_passwordPromptBar;
|
||||
QLabel* m_passwordPromptLabel;
|
||||
QLineEdit* m_passwordPromptInput;
|
||||
QPushButton* m_passwordPromptConnectButton;
|
||||
QPushButton* m_passwordPromptCancelButton;
|
||||
std::function<void(std::optional<QString>)> m_passwordPromptCallback;
|
||||
enum class EventSeverity {
|
||||
Info,
|
||||
Warning,
|
||||
@@ -114,7 +137,10 @@ private:
|
||||
bool m_eventsPanelExpanded;
|
||||
|
||||
void setupUi();
|
||||
std::optional<SessionConnectOptions> buildConnectOptions();
|
||||
void requestConnectOptions(std::function<void(std::optional<SessionConnectOptions>)> callback);
|
||||
void showPasswordPrompt(const QString& labelText,
|
||||
std::function<void(std::optional<QString>)> callback);
|
||||
void hidePasswordPrompt();
|
||||
bool validateProfileForConnect();
|
||||
void appendEvent(const QString& message);
|
||||
void setState(SessionState state, const QString& message);
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
#include "session_window.h"
|
||||
|
||||
#include "about_dialog.h"
|
||||
#include "profiles_window.h"
|
||||
#include <QApplication>
|
||||
#include "session_tab.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QColor>
|
||||
#include <QInputDialog>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QPalette>
|
||||
@@ -37,12 +39,12 @@ QStringList terminalThemeNames()
|
||||
}
|
||||
}
|
||||
|
||||
SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
: QMainWindow(parent), m_tabs(new QTabWidget(this))
|
||||
SessionWindow::SessionWindow(QWidget* parent)
|
||||
: QMainWindow(parent), m_tabs(new QTabWidget(this)), m_profilesWidget(nullptr)
|
||||
{
|
||||
loadUiPreferences();
|
||||
|
||||
setWindowTitle(QStringLiteral("OrbitHub Session - %1").arg(profile.name));
|
||||
setWindowTitle(QStringLiteral("OrbitHub"));
|
||||
resize(1080, 760);
|
||||
setWindowIcon(QApplication::windowIcon());
|
||||
|
||||
@@ -57,8 +59,8 @@ SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
}
|
||||
m_tabs->removeTab(index);
|
||||
delete tab;
|
||||
if (m_tabs->count() == 0) {
|
||||
close();
|
||||
if (sessionTabCount() == 0) {
|
||||
setWindowTitle(QStringLiteral("OrbitHub"));
|
||||
}
|
||||
});
|
||||
m_tabs->tabBar()->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
@@ -105,6 +107,18 @@ SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
clearAction = menu.addAction(QStringLiteral("Clear"));
|
||||
}
|
||||
|
||||
QAction* zoomInAction = nullptr;
|
||||
QAction* zoomOutAction = nullptr;
|
||||
QAction* resetZoomAction = nullptr;
|
||||
QAction* setFontSizeAction = nullptr;
|
||||
if (tab->supportsZoom()) {
|
||||
menu.addSeparator();
|
||||
zoomInAction = menu.addAction(QStringLiteral("Increase Font Size"));
|
||||
zoomOutAction = menu.addAction(QStringLiteral("Decrease Font Size"));
|
||||
resetZoomAction = menu.addAction(QStringLiteral("Reset Font Size"));
|
||||
setFontSizeAction = menu.addAction(QStringLiteral("Set Font Size..."));
|
||||
}
|
||||
|
||||
QAction* chosen = menu.exec(m_tabs->tabBar()->mapToGlobal(pos));
|
||||
if (chosen == disconnectAction) {
|
||||
tab->disconnectSession();
|
||||
@@ -120,6 +134,27 @@ SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
tab->clearEvents();
|
||||
} else if (clearAction != nullptr && chosen == clearAction) {
|
||||
tab->clearTerminal();
|
||||
} else if (zoomInAction != nullptr && chosen == zoomInAction) {
|
||||
tab->zoomIn();
|
||||
} else if (zoomOutAction != nullptr && chosen == zoomOutAction) {
|
||||
tab->zoomOut();
|
||||
} else if (resetZoomAction != nullptr && chosen == resetZoomAction) {
|
||||
tab->resetZoom();
|
||||
} else if (setFontSizeAction != nullptr && chosen == setFontSizeAction) {
|
||||
bool accepted = false;
|
||||
const int currentSize =
|
||||
tab->terminalFontPointSize() > 0 ? tab->terminalFontPointSize() : 10;
|
||||
const int newSize = QInputDialog::getInt(this,
|
||||
QStringLiteral("Set Font Size"),
|
||||
QStringLiteral("Font size (points):"),
|
||||
currentSize,
|
||||
6,
|
||||
72,
|
||||
1,
|
||||
&accepted);
|
||||
if (accepted) {
|
||||
tab->setTerminalFontPointSize(newSize);
|
||||
}
|
||||
} else {
|
||||
for (QAction* themeAction : themeActions) {
|
||||
if (chosen == themeAction) {
|
||||
@@ -130,6 +165,22 @@ SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
}
|
||||
});
|
||||
|
||||
QMenu* fileMenu = menuBar()->addMenu(QStringLiteral("File"));
|
||||
QAction* newProfileAction = fileMenu->addAction(QStringLiteral("New Profile"));
|
||||
QAction* newFolderAction = fileMenu->addAction(QStringLiteral("New Folder"));
|
||||
fileMenu->addSeparator();
|
||||
QAction* quitAction = fileMenu->addAction(QStringLiteral("Quit"));
|
||||
|
||||
connect(newProfileAction,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
[this]() { m_profilesWidget->createProfileInCurrentContext(); });
|
||||
connect(newFolderAction,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
[this]() { m_profilesWidget->createFolderInCurrentContext(); });
|
||||
connect(quitAction, &QAction::triggered, this, []() { qApp->quit(); });
|
||||
|
||||
QMenu* helpMenu = menuBar()->addMenu(QStringLiteral("Help"));
|
||||
QAction* aboutAction = helpMenu->addAction(QStringLiteral("About OrbitHub"));
|
||||
connect(aboutAction,
|
||||
@@ -141,7 +192,15 @@ SessionWindow::SessionWindow(const Profile& profile, QWidget* parent)
|
||||
});
|
||||
|
||||
setCentralWidget(m_tabs);
|
||||
addSessionTab(profile);
|
||||
|
||||
m_profilesWidget = new ProfilesWindow(this);
|
||||
const int profilesIndex = m_tabs->addTab(m_profilesWidget, QStringLiteral("Profiles"));
|
||||
m_tabs->tabBar()->setTabButton(profilesIndex, QTabBar::LeftSide, nullptr);
|
||||
m_tabs->tabBar()->setTabButton(profilesIndex, QTabBar::RightSide, nullptr);
|
||||
connect(m_profilesWidget,
|
||||
&ProfilesWindow::connectRequested,
|
||||
this,
|
||||
&SessionWindow::addSessionTab);
|
||||
}
|
||||
|
||||
void SessionWindow::openProfile(const Profile& profile)
|
||||
@@ -154,8 +213,10 @@ void SessionWindow::addSessionTab(const Profile& profile)
|
||||
auto* tab = new SessionTab(profile, m_preferences, this);
|
||||
const int index = m_tabs->addTab(tab, tab->tabTitle());
|
||||
m_tabs->setCurrentIndex(index);
|
||||
if (m_tabs->count() > 1) {
|
||||
if (sessionTabCount() > 1) {
|
||||
setWindowTitle(QStringLiteral("OrbitHub Sessions"));
|
||||
} else {
|
||||
setWindowTitle(QStringLiteral("OrbitHub Session - %1").arg(profile.name));
|
||||
}
|
||||
m_tabs->tabBar()->setTabTextColor(
|
||||
index, tabColorForState(SessionState::Disconnected, m_tabs->palette()));
|
||||
@@ -185,6 +246,16 @@ void SessionWindow::addSessionTab(const Profile& profile)
|
||||
: themeName.trimmed();
|
||||
saveUiPreferences();
|
||||
});
|
||||
connect(tab,
|
||||
&SessionTab::terminalFontSizeChanged,
|
||||
this,
|
||||
[this](int pointSize) {
|
||||
if (pointSize <= 0) {
|
||||
return;
|
||||
}
|
||||
m_preferences.terminalFontPointSize = pointSize;
|
||||
saveUiPreferences();
|
||||
});
|
||||
connect(tab,
|
||||
&SessionTab::eventsPanelVisibilityChanged,
|
||||
this,
|
||||
@@ -204,6 +275,11 @@ void SessionWindow::updateTabTitle(SessionTab* tab, const QString& title)
|
||||
}
|
||||
}
|
||||
|
||||
int SessionWindow::sessionTabCount() const
|
||||
{
|
||||
return m_tabs->count() - 1;
|
||||
}
|
||||
|
||||
void SessionWindow::loadUiPreferences()
|
||||
{
|
||||
QSettings settings;
|
||||
@@ -216,6 +292,8 @@ void SessionWindow::loadUiPreferences()
|
||||
}
|
||||
m_preferences.eventsPanelExpanded =
|
||||
settings.value(QStringLiteral("session/eventsPanelExpanded"), false).toBool();
|
||||
m_preferences.terminalFontPointSize =
|
||||
settings.value(QStringLiteral("session/terminalFontPointSize"), 0).toInt();
|
||||
}
|
||||
|
||||
void SessionWindow::saveUiPreferences() const
|
||||
@@ -225,4 +303,6 @@ void SessionWindow::saveUiPreferences() const
|
||||
m_preferences.terminalThemeName);
|
||||
settings.setValue(QStringLiteral("session/eventsPanelExpanded"),
|
||||
m_preferences.eventsPanelExpanded);
|
||||
settings.setValue(QStringLiteral("session/terminalFontPointSize"),
|
||||
m_preferences.terminalFontPointSize);
|
||||
}
|
||||
|
||||
@@ -7,23 +7,26 @@
|
||||
#include <QMainWindow>
|
||||
|
||||
class QTabWidget;
|
||||
class ProfilesWindow;
|
||||
|
||||
class SessionWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SessionWindow(const Profile& profile, QWidget* parent = nullptr);
|
||||
explicit SessionWindow(QWidget* parent = nullptr);
|
||||
void openProfile(const Profile& profile);
|
||||
|
||||
private:
|
||||
QTabWidget* m_tabs;
|
||||
ProfilesWindow* m_profilesWidget;
|
||||
SessionUiPreferences m_preferences;
|
||||
|
||||
void addSessionTab(const Profile& profile);
|
||||
void updateTabTitle(SessionTab* tab, const QString& title);
|
||||
void loadUiPreferences();
|
||||
void saveUiPreferences() const;
|
||||
int sessionTabCount() const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -52,6 +52,14 @@ void TerminalView::setThemeName(const QString& themeName)
|
||||
applyThemePalette(paletteByName(themeName));
|
||||
}
|
||||
|
||||
void TerminalView::setFontPointSize(int pointSize)
|
||||
{
|
||||
QFont updatedFont = font();
|
||||
updatedFont.setPointSize(pointSize);
|
||||
setFont(updatedFont);
|
||||
emitTerminalSize();
|
||||
}
|
||||
|
||||
void TerminalView::appendTerminalData(const QString& data)
|
||||
{
|
||||
if (data.isEmpty()) {
|
||||
@@ -211,6 +219,14 @@ void TerminalView::focusInEvent(QFocusEvent* event)
|
||||
moveCursor(QTextCursor::End);
|
||||
}
|
||||
|
||||
bool TerminalView::focusNextPrevChild(bool next)
|
||||
{
|
||||
Q_UNUSED(next);
|
||||
// Tab/Shift+Tab must reach keyPressEvent() and be forwarded to the
|
||||
// remote session instead of moving focus to the next local widget.
|
||||
return false;
|
||||
}
|
||||
|
||||
void TerminalView::resizeEvent(QResizeEvent* event)
|
||||
{
|
||||
QTextEdit::resizeEvent(event);
|
||||
|
||||
@@ -19,6 +19,7 @@ public:
|
||||
static QStringList themeNames();
|
||||
void setThemeName(const QString& themeName);
|
||||
void appendTerminalData(const QString& data);
|
||||
void setFontPointSize(int pointSize);
|
||||
|
||||
signals:
|
||||
void inputGenerated(const QString& input);
|
||||
@@ -28,6 +29,7 @@ protected:
|
||||
void keyPressEvent(QKeyEvent* event) override;
|
||||
void focusInEvent(QFocusEvent* event) override;
|
||||
void resizeEvent(QResizeEvent* event) override;
|
||||
bool focusNextPrevChild(bool next) override;
|
||||
|
||||
private:
|
||||
struct ThemePalette {
|
||||
|
||||