aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJan Djärv <[email protected]>2009-11-21 15:28:59 +0000
committerJan Djärv <[email protected]>2009-11-21 15:28:59 +0000
commit872870b29a846cc8e27d53d05147eb3e0beb7c50 (patch)
tree5bf7121650264015843c2111e98a0d26ededc358 /src/xterm.c
parent62a6e103dd7b9d940565639d6a47c8bdee3f24ce (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/xterm.c')
-rw-r--r--src/xterm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index f18b8105c0..aefa9d7217 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -87,6 +87,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "font.h"
#include "fontset.h"
#include "xsettings.h"
+#include "xgselect.h"
#include "sysselect.h"
#ifdef USE_X_TOOLKIT
@@ -10850,6 +10851,8 @@ x_initialize ()
XSetIOErrorHandler (x_io_error_quitter);
signal (SIGPIPE, x_connection_signal);
+
+ xgselect_initialize ();
}