Mercurial > vim
changeset 2638:75a89c7c204e v7.3.059
updated for version 7.3.059
Problem: Netbeans: Problem with recursively handling messages for Athena
and Motif.
Solution: Call netbeans_parse_messages() in the main loop, like it's done
for GTK. (Xavier de Gaye)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 16 Nov 2010 15:04:57 +0100 |
| parents | 37d62d968182 |
| children | 73dd10c18ec4 |
| files | src/gui_x11.c src/netbeans.c src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -2895,6 +2895,11 @@ gui_mch_wait_for_chars(wtime) focus = gui.in_focus; } +#if defined(FEAT_NETBEANS_INTG) + /* Process any queued netbeans messages. */ + netbeans_parse_messages(); +#endif + /* * Don't use gui_mch_update() because then we will spin-lock until a * char arrives, instead we use XtAppProcessEvent() to hang until an
--- a/src/netbeans.c +++ b/src/netbeans.c @@ -726,9 +726,6 @@ netbeans_read() static char_u *buf = NULL; int len = 0; int readlen = 0; -#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) - static int level = 0; -#endif #ifdef HAVE_SELECT struct timeval tval; fd_set rfds; @@ -744,13 +741,6 @@ netbeans_read() return; } -#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) - /* recursion guard; this will be called from the X event loop at unknown - * moments */ - if (NB_HAS_GUI) - ++level; -#endif - /* Allocate a buffer to read into. */ if (buf == NULL) { @@ -803,21 +793,9 @@ netbeans_read() return; /* don't try to parse it */ } -#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_W32) - /* Let the main loop handle messages. */ - if (NB_HAS_GUI) - { -# ifdef FEAT_GUI_GTK - if (gtk_main_level() > 0) - gtk_main_quit(); -# else - /* Parse the messages now, but avoid recursion. */ - if (level == 1) - netbeans_parse_messages(); - - --level; -# endif - } +#if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK) + if (NB_HAS_GUI && gtk_main_level() > 0) + gtk_main_quit(); #endif }