diff --git a/libportal/inputcapture.h b/libportal/inputcapture.h index ffe90b7d..7ed6089b 100644 --- a/libportal/inputcapture.h +++ b/libportal/inputcapture.h @@ -35,19 +35,17 @@ G_DECLARE_FINAL_TYPE (XdpInputCaptureSession, xdp_input_capture_session, XDP, IN /** * XdpCapability: * @XDP_CAPABILITY_NONE: no device - * @XDP_CAPABILITY_POINTER_RELATIVE: capture relative pointer events. - * @XDP_CAPABILITY_POINTER_ABSOLUTE: capture absolute pointer events. - * @XDP_CAPABILITY_KEYBOARD: capture the keyboard. - * @XDP_CAPABILITY_TOUCH: capture touch events + * @XDP_CAPABILITY_KEYBOARD: capture the keyboard + * @XDP_CAPABILITY_POINTER: capture pointer events + * @XDP_CAPABILITY_TOUCHSCREEN: capture touchscreen events * * Flags to specify what input device capabilities should be captured */ typedef enum { XDP_CAPABILITY_NONE = 0, - XDP_CAPABILITY_POINTER_RELATIVE = 1 << 0, - XDP_CAPABILITY_POINTER_ABSOLUTE = 1 << 1, - XDP_CAPABILITY_KEYBOARD = 1 << 2, - XDP_CAPABILITY_TOUCHSCREEN = 1 << 3 + XDP_CAPABILITY_KEYBOARD = 1 << 0, + XDP_CAPABILITY_POINTER = 1 << 1, + XDP_CAPABILITY_TOUCHSCREEN = 1 << 2 } XdpCapability; diff --git a/portal-test/gtk3/portal-test-win.c b/portal-test/gtk3/portal-test-win.c index 28b944a9..44ff317b 100644 --- a/portal-test/gtk3/portal-test-win.c +++ b/portal-test/gtk3/portal-test-win.c @@ -611,7 +611,7 @@ start_input_capture (PortalTestWin *win) xdp_portal_create_input_capture_session (win->portal, NULL, - XDP_CAPABILITY_POINTER_RELATIVE | XDP_CAPABILITY_KEYBOARD, + XDP_CAPABILITY_POINTER | XDP_CAPABILITY_KEYBOARD, NULL, inputcapture_session_created, win); diff --git a/tests/pyportaltest/test_inputcapture.py b/tests/pyportaltest/test_inputcapture.py index 285ad647..9b163749 100644 --- a/tests/pyportaltest/test_inputcapture.py +++ b/tests/pyportaltest/test_inputcapture.py @@ -44,7 +44,7 @@ def create_session_with_barriers( self, params=None, parent=None, - capabilities=Xdp.Capability.POINTER_RELATIVE, + capabilities=Xdp.Capability.POINTER, barriers=None, allow_failed_barriers=False, cancellable=None, @@ -165,7 +165,7 @@ def test_session_create(self): } self.setup_daemon(params) - capabilities = Xdp.Capability.POINTER_RELATIVE | Xdp.Capability.KEYBOARD + capabilities = Xdp.Capability.POINTER | Xdp.Capability.KEYBOARD setup = self.create_session_with_barriers(params, capabilities=capabilities) assert setup.session is not None @@ -285,7 +285,7 @@ def create_session_done(portal, task, data): session_error = e self.mainloop.quit() - capabilities = Xdp.Capability.POINTER_RELATIVE | Xdp.Capability.KEYBOARD + capabilities = Xdp.Capability.POINTER | Xdp.Capability.KEYBOARD xdp.create_input_capture_session( parent=None, capabilities=capabilities,