diff options
author | Jarek Czekalski <jarekczek@poczta.onet.pl> | 2014-04-21 11:55:28 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-21 11:55:28 -0400 |
commit | 6709d4dab9d434dcd1d797e081dfc796b735a1ff (patch) | |
tree | d3b0a7d1a084fb6cafa8c3ed0ac197bfb053cb1c /src/xgselect.c | |
parent | f982b37104acdd2b3aee4fe3bb08ae052990f869 (diff) | |
download | emacs-6709d4dab9d434dcd1d797e081dfc796b735a1ff.tar.gz |
Fix freezing with scroll bars of GTK3 Toolkit.
* src/keyboard.c (unblock_input): Add comment.
* src/xgselect.c (xg_select): Prevent Glib main loop recursion.
Fixes: debbugs:15801
Diffstat (limited to 'src/xgselect.c')
-rw-r--r-- | src/xgselect.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/xgselect.c b/src/xgselect.c index 1d3f916c9f8..42fdfed0d34 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -28,6 +28,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <stdbool.h> #include <timespec.h> #include "frame.h" +#include "blockinput.h" + +/* `xg_select' is a `pselect' replacement. Why do we need a separate function? + 1. Timeouts. Glib and Gtk rely on timer events. If we did pselect + with a greater timeout then the one scheduled by Glib, we would + not allow Glib to process its timer events. We want Glib to + work smoothly, so we need to reduce our timeout to match Glib. + 2. Descriptors. Glib may listen to more file descriptors than we do. + So we add Glib descriptors to our pselect pool, but we don't change + the value returned by the function. The return value matches only + the descriptors passed as arguments, making it compatible with + plain pselect. */ int xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds, @@ -47,12 +59,6 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds, bool need_to_dispatch; USE_SAFE_ALLOCA; - /* Do not try to optimize with an initial check with g_main_context_pending - and a call to pselect if it returns false. If Gdk has a timeout for 0.01 - second, and Emacs has a timeout for 1 second, g_main_context_pending will - return false, but the timeout will be 1 second, thus missing the gdk - timeout with a lot. */ - context = g_main_context_default (); if (rfds) all_rfds = *rfds; @@ -136,8 +142,13 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds, if (need_to_dispatch) { int pselect_errno = errno; + /* Prevent g_main_dispatch recursion, that would occur without + block_input wrapper, because event handlers call + unblock_input. Event loop recursion was causing Bug#15801. */ + block_input (); while (g_main_context_pending (context)) - g_main_context_dispatch (context); + g_main_context_dispatch (context); + unblock_input (); errno = pselect_errno; } |