mirror of
https://github.com/labwc/labwc.git
synced 2025-10-28 05:40:22 -04:00
Add labwc to XDG_CURRENT_DESKTOP to support a portals.conf (#1716)
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:
parent
d18e67eea8
commit
5b774e6e99
5 changed files with 8 additions and 4 deletions
2
data/labwc-portals.conf
Normal file
2
data/labwc-portals.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
[preferred]
|
||||
default=wlr;*
|
||||
|
|
@ -4,4 +4,4 @@ Comment=A wayland stacking compositor
|
|||
Exec=labwc
|
||||
Icon=labwc
|
||||
Type=Application
|
||||
DesktopNames=wlroots
|
||||
DesktopNames=labwc;wlroots
|
||||
|
|
|
|||
|
|
@ -60,13 +60,13 @@
|
|||
|
||||
##
|
||||
## 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
|
||||
## already set environment variable, so if you need it set to something else,
|
||||
## then uncomment and adjust.
|
||||
##
|
||||
|
||||
# XDG_CURRENT_DESKTOP=wlroots
|
||||
# XDG_CURRENT_DESKTOP=labwc:wlroots
|
||||
|
||||
##
|
||||
## This causes a virtual output to be created automatically whenever there
|
||||
|
|
|
|||
|
|
@ -174,6 +174,8 @@ executable(
|
|||
|
||||
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']
|
||||
foreach icon : icons
|
||||
icon_path = join_paths('data', icon)
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ session_environment_init(void)
|
|||
* May be overridden either by already having a value set or by the user
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue