Implement Input Capture Desktop Portal #268

3l0w · 2024-09-26T10:23:09Z

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.

vaxerski · 2024-09-26T10:29:31Z

.gitmodules

@@ -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


marking this one as a blocker until this is removed so we dont forget (don't resolve)

vaxerski

a bit of a lengthy review, mostly style and guidelines. Many comments apply to the entirety of the PR

src/core/PortalManager.cpp

src/core/PortalManager.hpp

src/portals/InputCapture.cpp

src/shared/Eis.cpp

src/shared/Eis.hpp

vaxerski · 2024-09-30T16:54:36Z

tag me for review when ready

littleblack111 · 2024-10-25T18:01:46Z

hey, uh the new version did not compile with the following error:

[ 22%] Building CXX object CMakeFiles/xdg-desktop-portal-hyprland.dir/src/core/PortalManager.cpp.o
/home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp: In member function ‘void CPortalManager::init()’:
/home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp:211:58: error: no matching function for call to ‘createSessionBusConnection(const char [45])’
  211 |         m_pConnection = sdbus::createSessionBusConnection("org.freedesktop.impl.portal.desktop.hyprland");
      |                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /usr/include/sdbus-c++/sdbus-c++.h:27,
                 from /home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.hpp:4,
                 from /home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp:1:
/usr/include/sdbus-c++/IConnection.h:481:55: note: candidate: ‘std::unique_ptr<sdbus::IConnection> sdbus::createSessionBusConnection()’
  481 |     [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection();
      |                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/sdbus-c++/IConnection.h:481:55: note:   candidate expects 0 arguments, 1 provided
/usr/include/sdbus-c++/IConnection.h:491:55: note: candidate: ‘std::unique_ptr<sdbus::IConnection> sdbus::createSessionBusConnection(const ServiceName&)’
  491 |     [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const ServiceName& name);
      |                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/sdbus-c++/IConnection.h:491:101: note:   no known conversion for argument 1 from ‘const char [45]’ to ‘const sdbus::ServiceName&’ {aka ‘const sdbus::BusName&’}
  491 |     [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const ServiceName& name);
      |                                                                                  ~~~~~~~~~~~~~~~~~~~^~~~
/home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp: In member function ‘void CPortalManager::startEventLoop()’:
/home/system/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp:366:35: error: ‘class sdbus::IConnection’ has no member named ‘processPendingRequest’; did you mean ‘processPendingEvent’?
  366 |             while (m_pConnection->processPendingRequest()) {
      |                                   ^~~~~~~~~~~~~~~~~~~~~
      |                                   processPendingEvent
At global scope:
cc1plus: note: unrecognized command-line option ‘-Wno-address-of-temporary’ may have been intended to silence earlier diagnostics
make[2]: *** [CMakeFiles/xdg-desktop-portal-hyprland.dir/build.make:125: CMakeFiles/xdg-desktop-portal-hyprland.dir/src/core/PortalManager.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:102: CMakeFiles/xdg-desktop-portal-hyprland.dir/all] Error 2
make: *** [Makefile:136: all] Error 2
-- Install configuration: ""
CMake Error at build/hyprland-share-picker/cmake_install.cmake:52 (file):
  file INSTALL cannot find
  "/home/system/xdg-desktop-portal-hyprland/build/hyprland-share-picker/hyprland-share-picker":
  No such file or directory.
Call Stack (most recent call first):
  build/cmake_install.cmake:47 (include)

3l0w · 2024-10-25T23:34:05Z

I am aware, it is due to the sdbus version bumb, it should be good now

Azodox · 2024-10-26T08:40:08Z

I am having this:

In file included from /home/luke/xdg-desktop-portal-hyprland/src/core/PortalManager.hpp:11,
                 from /home/luke/xdg-desktop-portal-hyprland/src/core/PortalManager.cpp:1:
/home/luke/xdg-desktop-portal-hyprland/src/core/../portals/InputCapture.hpp:2:10: fatal error: dbusDefines.hpp: No such file or directory
    2 | #include "dbusDefines.hpp"
      |          ^~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [CMakeFiles/xdg-desktop-portal-hyprland.dir/build.make:125: CMakeFiles/xdg-desktop-portal-hyprland.dir/src/core/PortalManager.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:102: CMakeFiles/xdg-desktop-portal-hyprland.dir/all] Error 2
make: *** [Makefile:136: all] Error 2
-- Install configuration: ""
-- Installing: /usr/bin/hyprland-share-picker
-- Up-to-date: /usr/bin/hyprland-share-picker
CMake Error at build/cmake_install.cmake:81 (file):
  file INSTALL cannot find
  "/home/luke/xdg-desktop-portal-hyprland/build/xdg-desktop-portal-hyprland":
  No such file or directory.

littleblack111 · 2024-10-26T09:48:58Z

src/portals/InputCapture.hpp

@@ -0,0 +1,100 @@
+#pragma once
+#include "dbusDefines.hpp"


Suggested change

#include "dbusDefines.hpp"

#include "../dbusDefines.hpp"

littleblack111 · 2024-10-26T09:49:49Z

https://github.com/hyprwm/xdg-desktop-portal-hyprland/pull/268/files#r1817726512

should fix it

3l0w · 2024-10-26T13:54:16Z

I pushed the fix

littleblack111 · 2024-10-26T14:29:23Z

i gave feedback in hyprwm/Hyprland#7919

gptlang · 2024-11-05T00:39:49Z

Hyprland 0.44.0 built from branch  at commit 189f6152f1354ae936cafffa7b7dd62af8dd5bd4  (input-capture: fix rebase issues).

Deskflow:

[2024-11-05T00:39:23] ERROR: failed to initialize input capture session, quitting: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.InputCapture” on object at path /org/freedesktop/portal/desktop

Is this currently working?

littleblack111 · 2024-11-05T10:10:36Z

it works for me. restart ur xdg-desktop-portals after installation

3l0w · 2024-11-05T10:14:17Z

Also make sure that the hyprland.portal file has been copied over /usr/share/xdg-desktop-portal/portals

littleblack111 · 2024-11-05T11:34:25Z

also, as an update, still consistently have my modifiers always held down on the client and have to restart input leap/the connection(stop then start again) to fix

gptlang · 2024-11-05T21:54:29Z

It seems to work fine now as the server. org.freedesktop.portal.RemoteDesktop is still needed for the client though.

littleblack111 · 2024-11-09T11:12:12Z

also @3l0w, input capture should not work in ext-session-lock. i.e. rn in hyprlock, you can still control other device via input leap

littleblack111 · 2024-11-12T04:16:07Z

It seems to work fine now as the server. org.freedesktop.portal.RemoteDesktop is still needed for the client though.

dont know if this will work: https://github.com/waycrate/xdg-desktop-portal-luminous since hyprland is no longer wlroots. but it does have org.freedesktop.portal.RemoteDesktop

vaxerski reviewed Sep 26, 2024

View reviewed changes

3l0w mentioned this pull request Sep 26, 2024

[Feature Request] EIS Support #64

Open

vaxerski reviewed Sep 26, 2024

View reviewed changes

3l0w marked this pull request as draft October 1, 2024 09:12

3l0w force-pushed the feat/input-capture-impl branch from 91e9b70 to fb0e34d Compare October 1, 2024 09:47

EthanDarling8 mentioned this pull request Oct 3, 2024

Error when trying to run server on Arch Linux CachyOS using Hyprland with Wayland deskflow/deskflow#7613

Closed

5 tasks

3l0w force-pushed the feat/input-capture-impl branch from b9b17ef to 37c5d83 Compare October 22, 2024 09:57

3l0w added 8 commits October 25, 2024 17:03

WIP: input capture

e4035e6

input-capture: inhibit inputs

6851f0c

input-capture: code cleanup

497a2ce

input-capture: various fixes

44ba88d

Free EIS server on disable

5a3c582

input-capture: various fixes

01d24da

input-capture: impl keymap

99121e0

input-capture: impl force release

cec147f

input-capture: update to sdbus2.0

75a754a

3l0w force-pushed the feat/input-capture-impl branch from 37c5d83 to 75a754a Compare October 25, 2024 23:33

littleblack111 reviewed Oct 26, 2024

View reviewed changes

fix build

9c4d32c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement Input Capture Desktop Portal #268

Implement Input Capture Desktop Portal #268

3l0w commented Sep 26, 2024

vaxerski Sep 26, 2024

vaxerski left a comment

vaxerski commented Sep 30, 2024

littleblack111 commented Oct 25, 2024 •

edited

Loading

3l0w commented Oct 25, 2024 •

edited

Loading

Azodox commented Oct 26, 2024

littleblack111 Oct 26, 2024

littleblack111 commented Oct 26, 2024

3l0w commented Oct 26, 2024

littleblack111 commented Oct 26, 2024

gptlang commented Nov 5, 2024

littleblack111 commented Nov 5, 2024

3l0w commented Nov 5, 2024

littleblack111 commented Nov 5, 2024 •

edited

Loading

gptlang commented Nov 5, 2024

littleblack111 commented Nov 9, 2024 •

edited

Loading

littleblack111 commented Nov 12, 2024

Implement Input Capture Desktop Portal #268

Are you sure you want to change the base?

Implement Input Capture Desktop Portal #268

Conversation

3l0w commented Sep 26, 2024

Describe your PR, what does it fix/add?

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

Is it ready for merging, or does it need work?

vaxerski Sep 26, 2024

Choose a reason for hiding this comment

vaxerski left a comment

Choose a reason for hiding this comment

vaxerski commented Sep 30, 2024

littleblack111 commented Oct 25, 2024 • edited Loading

3l0w commented Oct 25, 2024 • edited Loading

Azodox commented Oct 26, 2024

littleblack111 Oct 26, 2024

Choose a reason for hiding this comment

littleblack111 commented Oct 26, 2024

3l0w commented Oct 26, 2024

littleblack111 commented Oct 26, 2024

gptlang commented Nov 5, 2024

littleblack111 commented Nov 5, 2024

3l0w commented Nov 5, 2024

littleblack111 commented Nov 5, 2024 • edited Loading

gptlang commented Nov 5, 2024

littleblack111 commented Nov 9, 2024 • edited Loading

littleblack111 commented Nov 12, 2024

littleblack111 commented Oct 25, 2024 •

edited

Loading

3l0w commented Oct 25, 2024 •

edited

Loading

littleblack111 commented Nov 5, 2024 •

edited

Loading

littleblack111 commented Nov 9, 2024 •

edited

Loading