Ecore_X_Display *_ecore_xcb_display = NULL;
Ecore_X_Connection *_ecore_xcb_conn = NULL;
Ecore_X_Screen *_ecore_xcb_screen = NULL;
-int _ecore_xcb_event_handlers_num = 0;
Ecore_X_Atom _ecore_xcb_atoms_wm_protocol[ECORE_X_WM_PROTOCOL_NUM];
double _ecore_xcb_double_click_time = 0.25;
}
}
+ DBG("Ecore XCB Conn: %p", _ecore_xcb_conn);
+
if (xcb_connection_has_error(_ecore_xcb_conn))
{
CRIT("XCB Connection has error");
if (!_ecore_xcb_fd_handler)
return _ecore_xcb_shutdown(EINA_TRUE);
- _ecore_xcb_idle_enterer =
- ecore_idle_enterer_add(_ecore_xcb_idle_enter, NULL);
-
/* prefetch atoms */
_ecore_xcb_atoms_init();
/* setup dnd */
_ecore_xcb_dnd_init();
+ _ecore_xcb_idle_enterer =
+ ecore_idle_enterer_add(_ecore_xcb_idle_enter, NULL);
+
return _ecore_xcb_init_count;
}
ev.data.data32[3] = (uint32_t)d3;
ev.data.data32[4] = (uint32_t)d4;
- // FIXME: Use unchecked version after development is ironed out
- cookie =
- xcb_send_event_checked(_ecore_xcb_conn, 0, win, mask, (const char *)&ev);
-
-// ecore_x_flush();
+ cookie = xcb_send_event(_ecore_xcb_conn, 0, win, mask, (const char *)&ev);
err = xcb_request_check(_ecore_xcb_conn, cookie);
if (err)
memcpy(ev.data.data8, data, len);
memset(ev.data.data8 + len, 0, 20 - len);
- // FIXME: Use unchecked version after development is ironed out
- cookie =
- xcb_send_event_checked(_ecore_xcb_conn, 0, win,
- XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);
-
-// ecore_x_flush();
+ cookie = xcb_send_event(_ecore_xcb_conn, 0, win,
+ XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);
err = xcb_request_check(_ecore_xcb_conn, cookie);
if (err)
ev.time = ecore_x_current_time_get();
free(reply);
- // FIXME: Use unchecked version after development is ironed out
- vcookie =
- xcb_send_event_checked(_ecore_xcb_conn, 1, win,
+ vcookie = xcb_send_event(_ecore_xcb_conn, 1, win,
XCB_EVENT_MASK_BUTTON_PRESS, (const char *)&ev);
-// ecore_x_flush();
-
err = xcb_request_check(_ecore_xcb_conn, vcookie);
if (err)
{
ev.time = ecore_x_current_time_get();
free(reply);
- // FIXME: Use unchecked version after development is ironed out
- vcookie =
- xcb_send_event_checked(_ecore_xcb_conn, 1, win,
+ vcookie = xcb_send_event(_ecore_xcb_conn, 1, win,
XCB_EVENT_MASK_BUTTON_RELEASE, (const char *)&ev);
-// ecore_x_flush();
-
err = xcb_request_check(_ecore_xcb_conn, vcookie);
if (err)
{
ev.time = ecore_x_current_time_get();
free(reply);
- // FIXME: Use unchecked version after development is ironed out
- vcookie =
- xcb_send_event_checked(_ecore_xcb_conn, 1, win,
+ vcookie = xcb_send_event(_ecore_xcb_conn, 1, win,
XCB_EVENT_MASK_POINTER_MOTION, (const char *)&ev);
-// ecore_x_flush();
-
err = xcb_request_check(_ecore_xcb_conn, vcookie);
if (err)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
vcookie =
- xcb_change_pointer_control_checked(_ecore_xcb_conn,
- accel_num, accel_denom, threshold,
- 1, 1);
+ xcb_change_pointer_control(_ecore_xcb_conn,
+ accel_num, accel_denom, threshold, 1, 1);
err = xcb_request_check(_ecore_xcb_conn, vcookie);
if (err)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
/* grab the default screen */
- screen = xcb_setup_roots_iterator(xcb_get_setup(dsp)).data;
+ screen = xcb_setup_roots_iterator(xcb_get_setup(_ecore_xcb_conn)).data;
if (w) *w = screen->width_in_pixels;
if (h) *h = screen->height_in_pixels;
}
LOGFN(__FILE__, __LINE__, __FUNCTION__);
/* grab the default screen */
- screen = xcb_setup_roots_iterator(xcb_get_setup(dsp)).data;
+ screen = xcb_setup_roots_iterator(xcb_get_setup(_ecore_xcb_conn)).data;
return screen->black_pixel;
}
LOGFN(__FILE__, __LINE__, __FUNCTION__);
/* grab the default screen */
- screen = xcb_setup_roots_iterator(xcb_get_setup(dsp)).data;
+ screen = xcb_setup_roots_iterator(xcb_get_setup(_ecore_xcb_conn)).data;
return screen->white_pixel;
}
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (xcb_connection_has_error(_ecore_xcb_conn))
+ {
+ DBG("XCB Connection Has Error !!!");
+ return 0;
+ }
return xcb_setup_roots_length(xcb_get_setup(_ecore_xcb_conn));
}
int i = 0;
iter =
- xcb_setup_roots_iterator(xcb_get_setup((xcb_connection_t *)_ecore_xcb_conn));
+ xcb_setup_roots_iterator(xcb_get_setup(_ecore_xcb_conn));
for (; iter.rem; xcb_screen_next(&iter))
{
if (iter.data == (xcb_screen_t *)screen)
xcb_screen_iterator_t iter;
iter =
- xcb_setup_roots_iterator(xcb_get_setup((xcb_connection_t *)_ecore_xcb_conn));
+ xcb_setup_roots_iterator(xcb_get_setup(_ecore_xcb_conn));
for (; iter.rem; xcb_screen_next(&iter))
{
if (iter.index == index)
if (close_display)
xcb_disconnect(_ecore_xcb_conn);
else
- close(xcb_get_file_descriptor(_ecore_xcb_conn));
+ {
+ close(xcb_get_file_descriptor(_ecore_xcb_conn));
+ _ecore_xcb_conn = NULL;
+ }
/* shutdown events */
_ecore_xcb_events_shutdown();