YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-08-26 13:29:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] rename remote cursor shape to avoid X11 macro conflict

Browse Source
This commit is contained in:
dijunkun
2026-08-26 00:01:25 +08:00
parent 74ac849efe
commit d6d0a548b2
5 changed files with 90 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/device_controller/device_controller.h
+5 -5
View File
@@ -74,7 +74,7 @@ typedef struct {
// Keep these values aligned with Slint's MouseCursor enum. The wire protocol
// intentionally carries a semantic cursor instead of a platform handle so a
// Windows, macOS or Linux host can control a different desktop platform.
enum class CursorShape : uint8_t {
enum class RemoteCursorShape : uint8_t {
default_cursor = 0,
none,
help,
@@ -109,7 +109,7 @@ enum class CursorShape : uint8_t {
typedef struct {
uint32_t seq;
bool visible;
CursorShape shape;
RemoteCursorShape shape;
} CursorState;
typedef struct {
@@ -270,13 +270,13 @@ struct RemoteAction {
case ControlType::cursor_state: {
const auto& cursor_state_json = j.at("cursor_state");
const int shape = cursor_state_json.at("shape").get<int>();
if (shape < static_cast<int>(CursorShape::default_cursor) ||
shape > static_cast<int>(CursorShape::nwse_resize)) {
if (shape < static_cast<int>(RemoteCursorShape::default_cursor) ||
shape > static_cast<int>(RemoteCursorShape::nwse_resize)) {
return false;
}
out.cs.seq = cursor_state_json.at("seq").get<uint32_t>();
out.cs.visible = cursor_state_json.at("visible").get<bool>();
out.cs.shape = static_cast<CursorShape>(shape);
out.cs.shape = static_cast<RemoteCursorShape>(shape);
break;
}
case ControlType::audio_capture: