mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add labwc to XDG_CURRENT_DESKTOP to support a portals.conf (#1716)

Browse source 
The previous `UseIn` key was deprecated in xdg-desktop-portal 1.17/1.18.
It has been superceded by the portals.conf structure so that each
desktop can configure the precise desired structure for portals. In
addition, support was added to the Desktop Entry Specifications to
support a `DesktopNames` key that login managers will use to set
XDG_CURRENT_DESKTOP.

* [portals.conf
  Documentation](https://github.com/flatpak/xdg-desktop-portal/blob/main/doc/portals.conf.rst.in)
* [Example
  sway-portals.conf](https://salsa.debian.org/swaywm-team/sway/-/blob/debian/sid/debian/sway-portals.conf)
* [Desktop Entry
  Specifications](https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html)

Ref: flatpak/xdg-desktop-portal#955
This commit is contained in:
Rick Calixte 2024-10-01 16:33:45 -04:00 • committed by GitHub
parent d18e67eea8
commit 5b774e6e99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/labwc-portals.conf Normal file
View file

@ -0,0 +1,2 @@
[preferred]
default=wlr;*

2
data/labwc.desktop
View file

@ -4,4 +4,4 @@ Comment=A wayland stacking compositor
Exec=labwc Exec=labwc
Icon=labwc Icon=labwc
Type=Application Type=Application
DesktopNames=wlroots DesktopNames=labwc;wlroots

4
docs/environment
View file

@ -60,13 +60,13 @@
## ##
## This allows xdg-desktop-portal-wlr to function (e.g. for screen-recording). ## This allows xdg-desktop-portal-wlr to function (e.g. for screen-recording).
## It is automatically set to "wlroots" by labwc though, so it is only ## It is automatically set to "labwc:wlroots" by labwc though, so it is only
## included here for completeness. Again, labwc will not over-write an ## included here for completeness. Again, labwc will not over-write an
## already set environment variable, so if you need it set to something else, ## already set environment variable, so if you need it set to something else,
## then uncomment and adjust. ## then uncomment and adjust.
## ##
# XDG_CURRENT_DESKTOP=wlroots # XDG_CURRENT_DESKTOP=labwc:wlroots
## ##
## This causes a virtual output to be created automatically whenever there ## This causes a virtual output to be created automatically whenever there

2
meson.build
View file

@ -174,6 +174,8 @@ executable(
install_data('data/labwc.desktop', install_dir: get_option('datadir') / 'wayland-sessions') install_data('data/labwc.desktop', install_dir: get_option('datadir') / 'wayland-sessions')
install_data('data/labwc-portals.conf', install_dir: get_option('datadir') / 'xdg-desktop-portal')
icons = ['labwc-symbolic.svg', 'labwc.svg'] icons = ['labwc-symbolic.svg', 'labwc.svg']
foreach icon : icons foreach icon : icons
icon_path = join_paths('data', icon) icon_path = join_paths('data', icon)

2
src/config/session.c
View file

@ -227,7 +227,7 @@ session_environment_init(void)
* May be overridden either by already having a value set or by the user * May be overridden either by already having a value set or by the user
* supplied environment file. * supplied environment file.
*/ */
setenv("XDG_CURRENT_DESKTOP", "wlroots", 0); setenv("XDG_CURRENT_DESKTOP", "labwc:wlroots", 0);
/* /*
* Set default for _JAVA_AWT_WM_NONREPARENTING so that Java applications * Set default for _JAVA_AWT_WM_NONREPARENTING so that Java applications