adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1585: Wayland: gvim still needs GVIM_ENABLE_WAYLAND

Browse Source 
Problem:  Wayland: gvim still needs GVIM_ENABLE_WAYLAND
Solution: Drop the GVIM_ENABLE_WAYLAND code, always enable both X11 and
          Wayland GUI support (Christoffer Aasted)

closes: #17817

Signed-off-by: Christoffer Aasted <chr.aasted@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christoffer Aasted
2025-07-23 21:05:51 +02:00
committed by Christian Brabandt
parent 714671de35
commit 48a3b146b4
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/gui_x11.txt
View File

@ -1,4 +1,4 @@
*gui_x11.txt* For Vim version 9.1. Last change: 2024 Nov 17 *gui_x11.txt* For Vim version 9.1. Last change: 2025 Jul 23
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -649,9 +649,8 @@ X11R5 with a library for X11R6 probably doesn't work (although the linking
won't give an error message, Vim will crash later). won't give an error message, Vim will crash later).
*gui-wayland* *gui-wayland*
Initial support for the Wayland display server protocol has landed in patch Support for the Wayland display server protocol has landed in patch
9.1.0064. To enable it, you need to set the environment variable 9.1.0064.
"$GVIM_ENABLE_WAYLAND" in your shell.
Note: The Wayland protocol is subject to some restrictions, so the following Note: The Wayland protocol is subject to some restrictions, so the following
functions won't work: |getwinpos()|, |getwinposx()|, |getwinposy()| and the functions won't work: |getwinpos()|, |getwinposx()|, |getwinposy()| and the

9
src/gui_gtk_x11.c
View File

@ -1732,15 +1732,6 @@ gui_mch_init_check(void)
} }
#endif #endif
#if GTK_CHECK_VERSION(3,10,0)
// Vim currently assumes that Gtk means X11, so it cannot use native Gtk
// support for other backends such as Wayland.
//
// Use an environment variable to enable unfinished Wayland support.
if (getenv("GVIM_ENABLE_WAYLAND") == NULL)
gdk_set_allowed_backends ("x11");
#endif
#ifdef FEAT_GUI_GNOME #ifdef FEAT_GUI_GNOME
if (gtk_socket_id == 0) if (gtk_socket_id == 0)
using_gnome = 1; using_gnome = 1;

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1585,
/**/ /**/
1584, 1584,
/**/ /**/