comparison src/xterm.c @ 106186:9b6f45dd8386

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.
author Jan Djärv <jan.h.d@swipnet.se>
date Sat, 21 Nov 2009 15:28:59 +0000
parents f2cea199b0c4
children 63bf64653ed3
comparison
equal deleted inserted replaced
106185:f2cea199b0c4 106186:9b6f45dd8386
85 #include "atimer.h" 85 #include "atimer.h"
86 #include "keymap.h" 86 #include "keymap.h"
87 #include "font.h" 87 #include "font.h"
88 #include "fontset.h" 88 #include "fontset.h"
89 #include "xsettings.h" 89 #include "xsettings.h"
90 #include "xgselect.h"
90 #include "sysselect.h" 91 #include "sysselect.h"
91 92
92 #ifdef USE_X_TOOLKIT 93 #ifdef USE_X_TOOLKIT
93 #include <X11/Shell.h> 94 #include <X11/Shell.h>
94 #endif 95 #endif
10848 original error handler. */ 10849 original error handler. */
10849 XSetErrorHandler (x_error_handler); 10850 XSetErrorHandler (x_error_handler);
10850 XSetIOErrorHandler (x_io_error_quitter); 10851 XSetIOErrorHandler (x_io_error_quitter);
10851 10852
10852 signal (SIGPIPE, x_connection_signal); 10853 signal (SIGPIPE, x_connection_signal);
10854
10855 xgselect_initialize ();
10853 } 10856 }
10854 10857
10855 10858
10856 void 10859 void
10857 syms_of_xterm () 10860 syms_of_xterm ()