diff options
author | Jan Djärv <[email protected]> | 2009-11-21 15:28:59 +0000 |
---|---|---|
committer | Jan Djärv <[email protected]> | 2009-11-21 15:28:59 +0000 |
commit | 872870b29a846cc8e27d53d05147eb3e0beb7c50 (patch) | |
tree | 5bf7121650264015843c2111e98a0d26ededc358 /src/process.c | |
parent | 62a6e103dd7b9d940565639d6a47c8bdee3f24ce (diff) |
Use a select wrapper around the GLib event loop, thus taking into account GLib
timeouts and event sources. This simplifies Gtk+-code a lot, and is needed
for handling GConf death/restart.
* xterm.c: #include xgselect.h.
(x_initialize): Call xgselect_initialize.
* xsettings.c (something_changedCB): C++ comments => C comments.
(init_gconf): Do not deal with any GLib file descriptors, xg_select
does that now.
* gtkutil.c (xg_timer, xg_process_timeouts, xg_start_timer)
(xg_stop_timer, menu_grab_callback_cnt, menu_grab_callback)
(scroll_bar_button_cb): Remove.
(create_menus): C++ comments => C comments. Don't bind grab-notify
event.
(xg_create_scroll_bar): Don't bind button-press-event and
button-release-event.
* process.c: Include xgselect.h if defined (USE_GTK) ||
defined (HAVE_GCONF).
(wait_reading_process_output): Call xg_select for the same condition.
* xgselect.c (xg_select): New function to better integrate with
GLib/Gtk event handling. Needed if GConf daemon dies/restarts.
* xgselect.h: New file, declare xg_select, xgselect_initialize.
* Makefile.in (XOBJ): Add xgselect.o.
Diffstat (limited to 'src/process.c')
-rw-r--r-- | src/process.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 5c6875520e..90f2a9aa6b 100644 --- a/src/process.c +++ b/src/process.c @@ -120,6 +120,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "composite.h" #include "atimer.h" +#if defined (USE_GTK) || defined (HAVE_GCONF) +#include "xgselect.h" +#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ + Lisp_Object Qprocessp; Lisp_Object Qrun, Qstop, Qsignal; Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; @@ -4922,7 +4926,9 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, process_output_skip = 0; } #endif -#ifdef HAVE_NS +#if defined (USE_GTK) || defined (HAVE_GCONF) + nfds = xg_select +#elif defined (HAVE_NS) nfds = ns_select #else nfds = select |