discomfitor pushed a commit to branch master.
commit ab079ae1a514c6e9434fb3c5447b55735ef9ec83
Author: Mike Blumenkrantz <[email protected]>
Date: Wed May 22 10:14:43 2013 +0100
move ecore-x fd handler creation to after ecore-x init has finished so we
can ignore more x events during startup
---
src/lib/ecore_x/xcb/ecore_xcb.c | 20 ++++++++++----------
src/lib/ecore_x/xlib/ecore_x.c | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/lib/ecore_x/xcb/ecore_xcb.c b/src/lib/ecore_x/xcb/ecore_xcb.c
index 32f7ea4..00e38d3 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -242,16 +242,6 @@ ecore_x_init(const char *name)
/* finalize xcb keymasks */
_ecore_xcb_keymap_finalize();
- /* setup ecore fd handler */
- _ecore_xcb_fd_handler =
- ecore_main_fd_handler_add(xcb_get_file_descriptor(_ecore_xcb_conn),
- ECORE_FD_READ, _ecore_xcb_fd_handle,
- _ecore_xcb_conn, _ecore_xcb_fd_handle_buff,
- _ecore_xcb_conn);
-
- if (!_ecore_xcb_fd_handler)
- return _ecore_xcb_shutdown(EINA_TRUE);
-
/* prefetch atoms */
_ecore_xcb_atoms_init();
@@ -285,6 +275,16 @@ ecore_x_init(const char *name)
_ecore_xcb_idle_enterer =
ecore_idle_enterer_add(_ecore_xcb_idle_enter, NULL);
+ /* setup ecore fd handler */
+ _ecore_xcb_fd_handler =
+ ecore_main_fd_handler_add(xcb_get_file_descriptor(_ecore_xcb_conn),
+ ECORE_FD_READ, _ecore_xcb_fd_handle,
+ _ecore_xcb_conn, _ecore_xcb_fd_handle_buff,
+ _ecore_xcb_conn);
+
+ if (!_ecore_xcb_fd_handler)
+ return _ecore_xcb_shutdown(EINA_TRUE);
+
return _ecore_xcb_init_count;
}
diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
index b6ddd5e..f15ca25 100644
--- a/src/lib/ecore_x/xlib/ecore_x.c
+++ b/src/lib/ecore_x/xlib/ecore_x.c
@@ -635,14 +635,6 @@ ecore_x_init(const char *name)
_ecore_x_modifiers_get();
- _ecore_x_fd_handler_handle =
- ecore_main_fd_handler_add(ConnectionNumber(_ecore_x_disp),
- ECORE_FD_READ,
- _ecore_x_fd_handler, _ecore_x_disp,
- _ecore_x_fd_handler_buf, _ecore_x_disp);
- if (!_ecore_x_fd_handler_handle)
- goto free_event_handlers;
-
_ecore_x_atoms_init();
/* Set up the ICCCM hints */
@@ -676,6 +668,14 @@ ecore_x_init(const char *name)
_ecore_x_input_init();
_ecore_x_events_init();
+ _ecore_x_fd_handler_handle =
+ ecore_main_fd_handler_add(ConnectionNumber(_ecore_x_disp),
+ ECORE_FD_READ,
+ _ecore_x_fd_handler, _ecore_x_disp,
+ _ecore_x_fd_handler_buf, _ecore_x_disp);
+ if (!_ecore_x_fd_handler_handle)
+ goto free_event_handlers;
+
_ecore_x_private_win = ecore_x_window_override_new(0, -77, -777, 123, 456);
return _ecore_x_init_count;
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
