aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-14 23:04:02 -05:00
Code Activity

patch 9.1.1726: Patch v9.1.1725 causes problems

Browse Source 
Problem:  Patch v9.1.1725 causes problems
Solution: Revert the patch for now

fixes: #18187

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-09-02 19:06:06 +02:00
parent 0ed08788a1
commit 8429a44a9e
29 changed files with 2688 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/os_unix.c
View File

@@ -5731,7 +5731,7 @@ mch_call_shell_fork(
#ifdef FEAT_WAYLAND
// Handle Wayland events such as sending data as the source
// client.
wayland_update();
wayland_client_update();
#endif
}
finished:
@@ -5805,7 +5805,7 @@ finished:
#ifdef FEAT_WAYLAND
// Handle Wayland events such as sending data as the source
// client.
wayland_update();
wayland_client_update();
#endif
// Wait for 1 to 10 msec. 1 is faster but gives the child
@@ -6657,9 +6657,6 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *interrupted)
int mzquantum_used = FALSE;
# endif
#endif
#ifdef FEAT_WAYLAND
int wayland_fd = -1;
#endif
#ifndef HAVE_SELECT
// each channel may use in, out and err
struct pollfd fds[7 + 3 * MAX_OPEN_CHANNELS];
@@ -6703,11 +6700,11 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *interrupted)
}
# endif
# ifdef FEAT_WAYLAND
if ((wayland_fd = wayland_prepare_read()) >= 0)
# ifdef FEAT_WAYLAND_CLIPBOARD
if (wayland_may_restore_connection())
{
wayland_idx = nfd;
fds[nfd].fd = wayland_fd;
fds[nfd].fd = wayland_display_fd;
fds[nfd].events = POLLIN;
nfd++;
}
@@ -6771,9 +6768,13 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *interrupted)
}
# endif
# ifdef FEAT_WAYLAND
if (wayland_idx >= 0)
wayland_poll_check(fds[wayland_idx].revents);
# ifdef FEAT_WAYLAND_CLIPBOARD
// Technically we should first call wl_display_prepare_read() before
// polling the fd, then read and dispatch after we poll. However that is
// only needed for multi threaded environments to prevent deadlocks so
// we are fine.
if (fds[wayland_idx].revents & POLLIN)
wayland_client_update();
# endif
# ifdef FEAT_XCLIPBOARD
@@ -6866,13 +6867,14 @@ select_eintr:
}
# endif
# ifdef FEAT_WAYLAND
if ((wayland_fd = wayland_prepare_read()) >= 0)
{
FD_SET(wayland_fd, &rfds);
# ifdef FEAT_WAYLAND_CLIPBOARD
if (maxfd < wayland_fd)
maxfd = wayland_fd;
if (wayland_may_restore_connection())
{
FD_SET(wayland_display_fd, &rfds);
if (maxfd < wayland_display_fd)
maxfd = wayland_display_fd;
}
# endif
@@ -6972,9 +6974,13 @@ select_eintr:
socket_server_uninit();
# endif
# ifdef FEAT_WAYLAND
if (wayland_fd != -1)
wayland_select_check(ret > 0 && FD_ISSET(wayland_fd, &rfds));
# ifdef FEAT_WAYLAND_CLIPBOARD
// Technically we should first call wl_display_prepare_read() before
// polling the fd, then read and dispatch after we poll. However that is
// only needed for multi threaded environments to prevent deadlocks so
// we are fine.
if (ret > 0 && FD_ISSET(wayland_display_fd, &rfds))
wayland_client_update();
# endif
# ifdef FEAT_XCLIPBOARD