Implement Input Capture Desktop Portal #268
Open
+1,062
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vaxerski
reviewed
Sep 26, 2024
| @@ -1,6 +1,7 @@ | |||
| [submodule "hyprland-protocols"] | |||
| path = subprojects/hyprland-protocols | |||
| url = https://github.com/hyprwm/hyprland-protocols | |||
| url = https://github.com/3l0w/hyprland-protocols | |||
| branch = feat/input-capture-impl | |||
There was a problem hiding this comment.
marking this one as a blocker until this is removed so we dont forget (don't resolve)
vaxerski
reviewed
Sep 26, 2024
| transform = (wl_output_transform)transform_; | ||
| output->setMode([this](CCWlOutput* r, uint32_t flags, int32_t width, int32_t height, int32_t refresh) { | ||
| refreshRate = refresh; | ||
| this->width = width; |
There was a problem hiding this comment.
no this-> here and everywhere else
for conflicting local and member names, use local_ e.g. int32_t width_ and then width = width_
| @@ -32,6 +33,9 @@ struct SOutput { | |||
| uint32_t id = 0; | |||
| float refreshRate = 60.0; | |||
| wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL; | |||
| uint32_t width, height; | |||
There was a problem hiding this comment.
ALWAYS initialize member primitives
| CInputCapturePortal::CInputCapturePortal(SP<CCHyprlandInputCaptureManagerV1> mgr) { | ||
| Debug::log(LOG, "[input-capture] initializing input capture portal"); | ||
| m_sState.manager = mgr; | ||
| sessionCounter = 0; |
|
|
||
| CInputCapturePortal::CInputCapturePortal(SP<CCHyprlandInputCaptureManagerV1> mgr) { | ||
| Debug::log(LOG, "[input-capture] initializing input capture portal"); | ||
| m_sState.manager = mgr; |
There was a problem hiding this comment.
CInputCapturePortal::CInputCapturePortal(SP<CCHyprlandInputCaptureManagerV1> mgr) : m_sState.manager(mgr) {
| m_pObject->registerMethod(INTERFACE_NAME, "Release", "osa{sv}", "ua{sv}", [&](sdbus::MethodCall c) { onRelease(c); }); | ||
| m_pObject->registerMethod(INTERFACE_NAME, "ConnectToEIS", "osa{sv}", "h", [&](sdbus::MethodCall c) { onConnectToEIS(c); }); | ||
|
|
||
| m_pObject->registerProperty(INTERFACE_NAME, "SupportedCapabilities", "u", [](sdbus::PropertyGetReply& reply) { reply << (uint)(1 | 2); }); |
There was a problem hiding this comment.
uint is quite ambiguous, use uint32_t
| return 0; | ||
| } | ||
|
|
||
| this->client.handle = client; |
| } | ||
|
|
||
| void EmulatedInputServer::ensurePointer(eis_event* event) { | ||
| if (client.pointer != nullptr) |
| if (client.pointer != nullptr) | ||
| return; | ||
|
|
||
| struct eis_device* pointer = eis_seat_new_device(client.seat); |
There was a problem hiding this comment.
C-style structs, drop the struct
| #include <string> | ||
|
|
||
| struct EisClient { | ||
| struct eis_client* handle; |
There was a problem hiding this comment.
no C-style structs + initialize
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
This PR implements the input capture desktop portal with the new protocol defined in hyprwm/hyprland-protocols#8.
Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
Nothing to declare yet.
Is it ready for merging, or does it need work?
It work when used with hyprwm/Hyprland#7919, but still need work, like sending the keyboard layout, or security concerns.