Skip to content

Commit

Permalink
Implemented xdg-activation logic (#493)
Browse files Browse the repository at this point in the history
* Implemented xdg-activation logic

* Fixed vala-lint issues

* Bumped Ubuntu action version to 24.10
  • Loading branch information
ErikReider authored Dec 18, 2024
1 parent c5067e6 commit 49ff06a
Show file tree
Hide file tree
Showing 15 changed files with 429 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
UseTab: Always
IndentWidth: 4
TabWidth: 4
ColumnLimit: 80
AllowShortFunctionsOnASingleLine: None
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
ubuntu-build:
container: ubuntu:23.10
container: ubuntu:24.10
runs-on: ubuntu-latest
env:
DEBIAN_FRONTEND: noninteractive
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ SwayNotificationCenter
./swaync*
./src/swaync
./src/swaync*
.cache/
swaync-git*
8 changes: 7 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@ add_project_arguments(['-Wno-error=int-conversion'], language: 'c')
add_project_arguments(['--enable-gobject-tracing'], language: 'vala')
add_project_arguments(['--enable-checking'], language: 'vala')

i18n = import('i18n')
cc = meson.get_compiler('c')
vala = meson.get_compiler('vala')

gnome = import('gnome')

app_resources = []

config_path = join_paths(get_option('sysconfdir'), 'xdg', 'swaync')

# Wayland protocols
protocol_dep = []
subdir('protocols')

subdir('data')
subdir('src')

Expand Down
34 changes: 34 additions & 0 deletions protocols/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
dep_scanner = dependency('wayland-scanner', native: true)
prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner'))

protocol_file = files(
'xdg-activation-v1.xml',
)

protocol_sources = []
protocol_sources += custom_target(
'xdg-activation-v1-client-protocol.h',
command: [prog_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
input: protocol_file,
output: 'xdg-activation-v1-client-protocol.h',
)

output_type = 'private-code'
if dep_scanner.version().version_compare('< 1.14.91')
output_type = 'code'
endif
protocol_sources += custom_target(
'xdg-activation-protocol.c',
command: [prog_scanner, output_type, '@INPUT@', '@OUTPUT@'],
input: protocol_file,
output: 'xdg-activation-protocol.c',
)

protocol_dep += declare_dependency(
dependencies: [
vala.find_library('xdg-activation-v1', dirs: meson.current_source_dir()),
dependency('wayland-client'),
],
include_directories: include_directories('.'),
sources: protocol_sources,
)
1 change: 1 addition & 0 deletions protocols/xdg-activation-v1.deps
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wayland-client
48 changes: 48 additions & 0 deletions protocols/xdg-activation-v1.vapi
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// vim: ft=vala

namespace XDG.Activation {
[CCode (cheader_filename = "xdg-activation-v1-client-protocol.h", cname = "struct xdg_activation_v1", cprefix = "xdg_activation_v1_")]
public class Activation : Wl.Proxy {
[CCode (cheader_filename = "xdg-activation-v1-client-protocol.h", cname = "xdg_activation_v1_interface")]
public static Wl.Interface iface;
public void set_user_data (void * user_data);
public void * get_user_data ();
public uint32 get_version ();

public void destroy ();

public Token * get_activation_token ();
public void activate (string token, Wl.Surface surface);
}

[CCode (cheader_filename = "xdg-activation-v1-client-protocol.h", cname = "enum xdg_activation_token_v1_error", cprefix = "XDG_ACTIVATION_TOKEN_V1_ERROR_", has_type_id = false)]
public enum error {
ALREADY_USED = 0,
}

[CCode (cheader_filename = "xdg-activation-v1-client-protocol.h", cname = "struct xdg_activation_token_v1", cprefix = "xdg_activation_token_v1_")]
public class Token : Wl.Proxy {
[CCode (cheader_filename = "xdg-activation-v1-client-protocol.h", cname = "xdg_activation_token_v1_listener")]
public static Wl.Interface iface;
public void set_user_data (void * user_data);
public void * get_user_data ();
public uint32 get_version ();
public void destroy ();

public int add_listener (TokenListener listener, void * data);

public void set_serial (uint32 serial, Wl.Seat seat);
public void set_app_id (string app_id);
public void set_surface (Wl.Surface surface);
public void commit ();
}

[CCode (cname = "struct xdg_activation_token_v1_listener", has_type_id = false)]
public struct TokenListener {
public TokenListenerDone done;
}

[CCode (has_target = false, has_typedef = false)]
public delegate void TokenListenerDone (void * data, Token activation_token, string token);
}

200 changes: 200 additions & 0 deletions protocols/xdg-activation-v1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
<protocol name="xdg_activation_v1">

<copyright>
Copyright © 2020 Aleix Pol Gonzalez &lt;[email protected]&gt;
Copyright © 2020 Carlos Garnacho &lt;[email protected]&gt;

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
</copyright>

<description summary="Protocol for requesting activation of surfaces">
The way for a client to pass focus to another toplevel is as follows.

The client that intends to activate another toplevel uses the
xdg_activation_v1.get_activation_token request to get an activation token.
This token is then forwarded to the client, which is supposed to activate
one of its surfaces, through a separate band of communication.

One established way of doing this is through the XDG_ACTIVATION_TOKEN
environment variable of a newly launched child process. The child process
should unset the environment variable again right after reading it out in
order to avoid propagating it to other child processes.

Another established way exists for Applications implementing the D-Bus
interface org.freedesktop.Application, which should get their token under
activation-token on their platform_data.

In general activation tokens may be transferred across clients through
means not described in this protocol.

The client to be activated will then pass the token
it received to the xdg_activation_v1.activate request. The compositor can
then use this token to decide how to react to the activation request.

The token the activating client gets may be ineffective either already at
the time it receives it, for example if it was not focused, for focus
stealing prevention. The activating client will have no way to discover
the validity of the token, and may still forward it to the to be activated
client.

The created activation token may optionally get information attached to it
that can be used by the compositor to identify the application that we
intend to activate. This can for example be used to display a visual hint
about what application is being started.

Warning! The protocol described in this file is currently in the testing
phase. Backward compatible changes may be added together with the
corresponding interface version bump. Backward incompatible changes can
only be done by creating a new major version of the extension.
</description>

<interface name="xdg_activation_v1" version="1">
<description summary="interface for activating surfaces">
A global interface used for informing the compositor about applications
being activated or started, or for applications to request to be
activated.
</description>

<request name="destroy" type="destructor">
<description summary="destroy the xdg_activation object">
Notify the compositor that the xdg_activation object will no longer be
used.

The child objects created via this interface are unaffected and should
be destroyed separately.
</description>
</request>

<request name="get_activation_token">
<description summary="requests a token">
Creates an xdg_activation_token_v1 object that will provide
the initiating client with a unique token for this activation. This
token should be offered to the clients to be activated.
</description>

<arg name="id" type="new_id" interface="xdg_activation_token_v1"/>
</request>

<request name="activate">
<description summary="notify new interaction being available">
Requests surface activation. It's up to the compositor to display
this information as desired, for example by placing the surface above
the rest.

The compositor may know who requested this by checking the activation
token and might decide not to follow through with the activation if it's
considered unwanted.

Compositors can ignore unknown activation tokens when an invalid
token is passed.
</description>
<arg name="token" type="string" summary="the activation token of the initiating client"/>
<arg name="surface" type="object" interface="wl_surface"
summary="the wl_surface to activate"/>
</request>
</interface>

<interface name="xdg_activation_token_v1" version="1">
<description summary="an exported activation handle">
An object for setting up a token and receiving a token handle that can
be passed as an activation token to another client.

The object is created using the xdg_activation_v1.get_activation_token
request. This object should then be populated with the app_id, surface
and serial information and committed. The compositor shall then issue a
done event with the token. In case the request's parameters are invalid,
the compositor will provide an invalid token.
</description>

<enum name="error">
<entry name="already_used" value="0"
summary="The token has already been used previously"/>
</enum>

<request name="set_serial">
<description summary="specifies the seat and serial of the activating event">
Provides information about the seat and serial event that requested the
token.

The serial can come from an input or focus event. For instance, if a
click triggers the launch of a third-party client, the launcher client
should send a set_serial request with the serial and seat from the
wl_pointer.button event.

Some compositors might refuse to activate toplevels when the token
doesn't have a valid and recent enough event serial.

Must be sent before commit. This information is optional.
</description>
<arg name="serial" type="uint"
summary="the serial of the event that triggered the activation"/>
<arg name="seat" type="object" interface="wl_seat"
summary="the wl_seat of the event"/>
</request>

<request name="set_app_id">
<description summary="specifies the application being activated">
The requesting client can specify an app_id to associate the token
being created with it.

Must be sent before commit. This information is optional.
</description>
<arg name="app_id" type="string"
summary="the application id of the client being activated."/>
</request>

<request name="set_surface">
<description summary="specifies the surface requesting activation">
This request sets the surface requesting the activation. Note, this is
different from the surface that will be activated.

Some compositors might refuse to activate toplevels when the token
doesn't have a requesting surface.

Must be sent before commit. This information is optional.
</description>
<arg name="surface" type="object" interface="wl_surface"
summary="the requesting surface"/>
</request>

<request name="commit">
<description summary="issues the token request">
Requests an activation token based on the different parameters that
have been offered through set_serial, set_surface and set_app_id.
</description>
</request>

<event name="done">
<description summary="the exported activation token">
The 'done' event contains the unique token of this activation request
and notifies that the provider is done.
</description>
<arg name="token" type="string" summary="the exported activation token"/>
</event>

<request name="destroy" type="destructor">
<description summary="destroy the xdg_activation_token_v1 object">
Notify the compositor that the xdg_activation_token_v1 object will no
longer be used. The received token stays valid.
</description>
</request>
</interface>
</protocol>
27 changes: 27 additions & 0 deletions src/WaylandUtils/WaylandUtils.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#include <gdk/gdk.h>
#include <gdk/gdkwayland.h>
#include <glib.h>
#include <stdio.h>
#include <wayland-client.h>

/** GDK doesn't provide a vapi file for GDK Wayland... */

#define PRINT_ERROR \
g_error("Gdk Display isn't a Wayland display! Only Wayland is supported")

struct wl_display *get_wl_display() {
GdkDisplay *display = gdk_display_get_default();
if (GDK_IS_WAYLAND_DISPLAY(display)) {
return gdk_wayland_display_get_wl_display(display);
}
PRINT_ERROR;
return NULL;
}

struct wl_surface *get_wl_surface(GdkWindow *window) {
if (GDK_IS_WAYLAND_WINDOW(window)) {
return gdk_wayland_window_get_wl_surface(window);
}
PRINT_ERROR;
return NULL;
}
2 changes: 2 additions & 0 deletions src/WaylandUtils/WaylandUtils.vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
extern Wl.Display * get_wl_display ();
extern Wl.Surface * get_wl_surface (Gdk.Window window);
11 changes: 8 additions & 3 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,13 @@ app_sources = [
widget_sources,
'blankWindow/blankWindow.vala',
'functions.vala',
'WaylandUtils/WaylandUtils.c',
'WaylandUtils/WaylandUtils.vala',
'xdg_activation.vala',
constants,
]

assert(meson.get_compiler('vala').version() >= '0.56')
assert(vala.version() >= '0.56')

app_deps = [
dependency('gio-2.0', version: '>= 2.50'),
Expand All @@ -80,9 +83,11 @@ app_deps = [
fallback: ['gtk-layer-shell-0', 'gtk-layer-shell'],
version: '>= 0.8.0'
),
meson.get_compiler('c').find_library('m', required : true),
meson.get_compiler('vala').find_library('posix'),
cc.find_library('m', required : true),
vala.find_library('posix'),
dependency('gee-0.8'),
dependency('wayland-client'),
protocol_dep,
]

# Checks if the user wants scripting enabled
Expand Down
Loading

0 comments on commit 49ff06a

Please sign in to comment.