From c16e0f7f4c1c6ff1336dfa401e879f6649224c49 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Tue, 13 Sep 2011 16:32:34 +0000 Subject: [PATCH] Ecore_X(cb): Remove extra calls to ecore_x_flush. Move main loop flushing call to an idler like ecore_evas does...Thanks k-s ;) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@63359 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/xcb/ecore_xcb.c | 33 +++++++++++++----- src/lib/ecore_x/xcb/ecore_xcb_composite.c | 18 +++++----- src/lib/ecore_x/xcb/ecore_xcb_damage.c | 6 ++-- src/lib/ecore_x/xcb/ecore_xcb_dnd.c | 14 ++++---- src/lib/ecore_x/xcb/ecore_xcb_drawable.c | 2 +- src/lib/ecore_x/xcb/ecore_xcb_e.c | 14 ++++---- src/lib/ecore_x/xcb/ecore_xcb_events.c | 6 ++-- src/lib/ecore_x/xcb/ecore_xcb_gc.c | 8 ++--- src/lib/ecore_x/xcb/ecore_xcb_icccm.c | 4 +-- src/lib/ecore_x/xcb/ecore_xcb_image.c | 2 +- src/lib/ecore_x/xcb/ecore_xcb_netwm.c | 12 +++---- src/lib/ecore_x/xcb/ecore_xcb_pixmap.c | 6 ++-- src/lib/ecore_x/xcb/ecore_xcb_randr.c | 2 +- src/lib/ecore_x/xcb/ecore_xcb_region.c | 2 +- src/lib/ecore_x/xcb/ecore_xcb_selection.c | 2 +- src/lib/ecore_x/xcb/ecore_xcb_sync.c | 16 ++++----- src/lib/ecore_x/xcb/ecore_xcb_window.c | 52 ++++++++++++++-------------- src/lib/ecore_x/xcb/ecore_xcb_window_prop.c | 14 ++++---- src/lib/ecore_x/xcb/ecore_xcb_window_shape.c | 44 +++++++++++------------ src/lib/ecore_x/xcb/ecore_xcb_xfixes.c | 36 +++++++++---------- 20 files changed, 154 insertions(+), 139 deletions(-) diff --git a/src/lib/ecore_x/xcb/ecore_xcb.c b/src/lib/ecore_x/xcb/ecore_xcb.c index ff50b6b..241aea9 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb.c +++ b/src/lib/ecore_x/xcb/ecore_xcb.c @@ -6,12 +6,14 @@ static int _ecore_xcb_shutdown(Eina_Bool close_display); static Eina_Bool _ecore_xcb_fd_handle(void *data, Ecore_Fd_Handler *hdlr __UNUSED__); static Eina_Bool _ecore_xcb_fd_handle_buff(void *data, Ecore_Fd_Handler *hdlr __UNUSED__); +static Eina_Bool _ecore_xcb_idle_enter(void *data __UNUSED__); /* local variables */ static int _ecore_xcb_init_count = 0; static int _ecore_xcb_grab_count = 0; static Ecore_Fd_Handler *_ecore_xcb_fd_handler = NULL; static xcb_generic_event_t *_ecore_xcb_event_buffered = NULL; +static Ecore_Idle_Enterer *_ecore_xcb_idle_enterer = NULL; /* external variables */ int _ecore_xcb_log_dom = -1; @@ -247,6 +249,9 @@ ecore_x_init(const char *name) 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(); @@ -432,7 +437,7 @@ ecore_x_client_message32_send(Ecore_X_Window win, Ecore_X_Atom type, Ecore_X_Eve cookie = xcb_send_event_checked(_ecore_xcb_conn, 0, win, mask, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); err = xcb_request_check(_ecore_xcb_conn, cookie); if (err) @@ -482,7 +487,7 @@ ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom type, const void * xcb_send_event_checked(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); err = xcb_request_check(_ecore_xcb_conn, cookie); if (err) @@ -536,7 +541,7 @@ ecore_x_mouse_down_send(Ecore_X_Window win, int x, int y, int b) xcb_send_event_checked(_ecore_xcb_conn, 1, win, XCB_EVENT_MASK_BUTTON_PRESS, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); err = xcb_request_check(_ecore_xcb_conn, vcookie); if (err) @@ -587,7 +592,7 @@ ecore_x_mouse_up_send(Ecore_X_Window win, int x, int y, int b) xcb_send_event_checked(_ecore_xcb_conn, 1, win, XCB_EVENT_MASK_BUTTON_RELEASE, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); err = xcb_request_check(_ecore_xcb_conn, vcookie); if (err) @@ -638,7 +643,7 @@ ecore_x_mouse_move_send(Ecore_X_Window win, int x, int y) xcb_send_event_checked(_ecore_xcb_conn, 1, win, XCB_EVENT_MASK_POINTER_MOTION, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); err = xcb_request_check(_ecore_xcb_conn, vcookie); if (err) @@ -967,7 +972,7 @@ ecore_x_focus_reset(void) xcb_set_input_focus(_ecore_xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT, ((xcb_screen_t *)_ecore_xcb_screen)->root, XCB_CURRENT_TIME); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -976,7 +981,7 @@ ecore_x_events_allow_all(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_allow_events(_ecore_xcb_conn, XCB_ALLOW_ASYNC_BOTH, XCB_CURRENT_TIME); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -992,7 +997,7 @@ ecore_x_kill(Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_kill_client(_ecore_xcb_conn, win); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -1313,6 +1318,9 @@ _ecore_xcb_shutdown(Eina_Bool close_display) LOGFN(__FILE__, __LINE__, __FUNCTION__); + ecore_idle_enterer_del(_ecore_xcb_idle_enterer); + _ecore_xcb_idle_enterer = NULL; + if (_ecore_xcb_fd_handler) ecore_main_fd_handler_del(_ecore_xcb_fd_handler); @@ -1372,7 +1380,7 @@ _ecore_xcb_fd_handle(void *data, Ecore_Fd_Handler *hdlr __UNUSED__) _ecore_xcb_event_buffered = NULL; } - xcb_flush(conn); +// xcb_flush(conn); while ((ev = xcb_poll_for_event(conn))) { @@ -1456,3 +1464,10 @@ _ecore_xcb_fd_handle_buff(void *data, Ecore_Fd_Handler *hdlr __UNUSED__) } return ECORE_CALLBACK_CANCEL; } + +static Eina_Bool +_ecore_xcb_idle_enter(void *data __UNUSED__) +{ + xcb_flush(_ecore_xcb_conn); + return ECORE_CALLBACK_RENEW; +} diff --git a/src/lib/ecore_x/xcb/ecore_xcb_composite.c b/src/lib/ecore_x/xcb/ecore_xcb_composite.c index aef9b6a..6a3e624 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_composite.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_composite.c @@ -98,7 +98,7 @@ ecore_x_composite_redirect_window(Ecore_X_Window win, Ecore_X_Composite_Update_T break; } xcb_composite_redirect_window(_ecore_xcb_conn, win, update); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -120,7 +120,7 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Upda break; } xcb_composite_redirect_subwindows(_ecore_xcb_conn, win, update); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -142,7 +142,7 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win, Ecore_X_Composite_Update break; } xcb_composite_unredirect_window(_ecore_xcb_conn, win, update); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -164,7 +164,7 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Up break; } xcb_composite_unredirect_subwindows(_ecore_xcb_conn, win, update); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -178,7 +178,7 @@ ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win) #ifdef ECORE_XCB_COMPOSITE pmap = xcb_generate_id(_ecore_xcb_conn); xcb_composite_name_window_pixmap(_ecore_xcb_conn, win, pmap); - ecore_x_flush(); +// ecore_x_flush(); #endif return pmap; @@ -191,7 +191,7 @@ ecore_x_composite_window_events_disable(Ecore_X_Window win) #ifdef ECORE_XCB_SHAPE ecore_x_window_shape_input_rectangle_set(win, -1, -1, 1, 1); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -205,7 +205,7 @@ ecore_x_composite_window_events_enable(Ecore_X_Window win) #ifdef ECORE_XCB_SHAPE ecore_x_window_shape_input_rectangle_set(win, 0, 0, 65535, 65535); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -233,7 +233,7 @@ ecore_x_composite_render_window_enable(Ecore_X_Window root) free(reply); ecore_x_composite_window_events_disable(win); - ecore_x_flush(); +// ecore_x_flush(); #endif return win; @@ -246,6 +246,6 @@ ecore_x_composite_render_window_disable(Ecore_X_Window win) #ifdef ECORE_XCB_COMPOSITE xcb_composite_release_overlay_window(_ecore_xcb_conn, win); - ecore_x_flush(); +// ecore_x_flush(); #endif } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_damage.c b/src/lib/ecore_x/xcb/ecore_xcb_damage.c index fd3b946..c34e45b 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_damage.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_damage.c @@ -86,7 +86,7 @@ ecore_x_damage_new(Ecore_X_Drawable drawable, Ecore_X_Damage_Report_Level level) #ifdef ECORE_XCB_DAMAGE damage = xcb_generate_id(_ecore_xcb_conn); xcb_damage_create(_ecore_xcb_conn, damage, drawable, level); - ecore_x_flush(); +// ecore_x_flush(); #endif return damage; @@ -108,7 +108,7 @@ ecore_x_damage_free(Ecore_X_Damage damage) #ifdef ECORE_XCB_DAMAGE xcb_damage_destroy(_ecore_xcb_conn, damage); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -137,6 +137,6 @@ ecore_x_damage_subtract(Ecore_X_Damage damage, Ecore_X_Region repair, Ecore_X_Re #ifdef ECORE_XCB_DAMAGE xcb_damage_subtract(_ecore_xcb_conn, damage, repair, parts); - ecore_x_flush(); +// ecore_x_flush(); #endif } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c index d5f0b91..6bb6133 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c @@ -119,7 +119,7 @@ ecore_x_dnd_send_status(Eina_Bool will_accept, Eina_Bool suppress, Ecore_X_Recta xcb_send_event(_ecore_xcb_conn, 0, _target->source, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI Eina_Bool @@ -148,7 +148,7 @@ ecore_x_dnd_drop(void) xcb_send_event(_ecore_xcb_conn, 0, _source->dest, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _source->state = ECORE_X_DND_SOURCE_DROPPED; status = EINA_TRUE; } @@ -160,7 +160,7 @@ ecore_x_dnd_drop(void) xcb_send_event(_ecore_xcb_conn, 0, _source->dest, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _source->state = ECORE_X_DND_SOURCE_IDLE; } } @@ -472,7 +472,7 @@ ecore_x_dnd_send_finished(void) xcb_send_event(_ecore_xcb_conn, 0, _target->source, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _target->state = ECORE_X_DND_TARGET_IDLE; } @@ -531,7 +531,7 @@ _ecore_xcb_dnd_drag(Ecore_X_Window root, int x, int y) xcb_send_event(_ecore_xcb_conn, 0, _source->dest, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _source->suppress = 0; } @@ -570,7 +570,7 @@ _ecore_xcb_dnd_drag(Ecore_X_Window root, int x, int y) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _source->await_status = 0; _source->will_accept = 0; } @@ -593,7 +593,7 @@ _ecore_xcb_dnd_drag(Ecore_X_Window root, int x, int y) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); _source->await_status = 1; } } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_drawable.c b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c index bc5a7c8..9487699 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_drawable.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c @@ -28,7 +28,7 @@ ecore_x_drawable_rectangle_fill(Ecore_X_Drawable draw, Ecore_X_GC gc, int x, int rect.height = h; xcb_poly_fill_rectangle(_ecore_xcb_conn, draw, gc, 1, (const xcb_rectangle_t *)&rect); - ecore_x_flush(); +// ecore_x_flush(); } /** diff --git a/src/lib/ecore_x/xcb/ecore_xcb_e.c b/src/lib/ecore_x/xcb/ecore_xcb_e.c index 15f676f..f31e184 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_e.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_e.c @@ -38,7 +38,7 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root, Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, root, (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -65,7 +65,7 @@ ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root, Ecore_X_Window win, xcb_send_event(_ecore_xcb_conn, 0, root, (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -170,7 +170,7 @@ ecore_x_e_comp_sync_begin_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -194,7 +194,7 @@ ecore_x_e_comp_sync_end_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -218,7 +218,7 @@ ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -242,7 +242,7 @@ ecore_x_e_comp_flush_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -266,7 +266,7 @@ ecore_x_e_comp_dump_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c index bfbc915..bb75356 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_events.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c @@ -446,7 +446,7 @@ ecore_x_event_mask_set(Ecore_X_Window win, Ecore_X_Event_Mask mask) free(reply); xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_EVENT_MASK, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -467,7 +467,7 @@ ecore_x_event_mask_unset(Ecore_X_Window win, Ecore_X_Event_Mask mask) free(reply); xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_EVENT_MASK, &list); - ecore_x_flush(); +// ecore_x_flush(); } unsigned int @@ -1652,7 +1652,7 @@ _ecore_xcb_event_handle_client_message(xcb_generic_event_t *event) (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } } else if ((ev->type == ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN) && diff --git a/src/lib/ecore_x/xcb/ecore_xcb_gc.c b/src/lib/ecore_x/xcb/ecore_xcb_gc.c index 4c135e9..accc662 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_gc.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_gc.c @@ -100,7 +100,7 @@ ecore_x_gc_new(Ecore_X_Drawable drawable, Ecore_X_GC_Value_Mask value_mask, cons gc = xcb_generate_id(_ecore_xcb_conn); xcb_create_gc(_ecore_xcb_conn, gc, drawable, vmask, value_list); - ecore_x_flush(); +// ecore_x_flush(); return gc; } @@ -114,7 +114,7 @@ ecore_x_gc_free(Ecore_X_GC gc) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_free_gc(_ecore_xcb_conn, gc); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -126,7 +126,7 @@ ecore_x_gc_foreground_set(Ecore_X_GC gc, unsigned long foreground) list = foreground; xcb_change_gc(_ecore_xcb_conn, gc, XCB_GC_FOREGROUND, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -138,5 +138,5 @@ ecore_x_gc_background_set(Ecore_X_GC gc, unsigned long background) list = background; xcb_change_gc(_ecore_xcb_conn, gc, XCB_GC_BACKGROUND, &list); - ecore_x_flush(); +// ecore_x_flush(); } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/src/lib/ecore_x/xcb/ecore_xcb_icccm.c index 6dd6130..f672c3d 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_icccm.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_icccm.c @@ -903,7 +903,7 @@ ecore_x_icccm_iconic_request_send(Ecore_X_Window win, Ecore_X_Window root) (XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -1304,7 +1304,7 @@ ecore_x_icccm_move_resize_send(Ecore_X_Window win, int x, int y, int w, int h) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } /** diff --git a/src/lib/ecore_x/xcb/ecore_xcb_image.c b/src/lib/ecore_x/xcb/ecore_xcb_image.c index 10b5659..776f717 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_image.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_image.c @@ -64,7 +64,7 @@ ecore_x_image_free(Ecore_X_Image *im) } free(im); - ecore_x_flush(); +// ecore_x_flush(); } EAPI Eina_Bool diff --git a/src/lib/ecore_x/xcb/ecore_xcb_netwm.c b/src/lib/ecore_x/xcb/ecore_xcb_netwm.c index 32903b0..1a9e523 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_netwm.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_netwm.c @@ -277,7 +277,7 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root, const char **names, unsigned i xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, root, ECORE_X_ATOM_NET_DESKTOP_NAMES, ECORE_X_ATOM_UTF8_STRING, 8, len, (const void *)buf); - ecore_x_flush(); +// ecore_x_flush(); free(buf); } @@ -394,7 +394,7 @@ ecore_x_netwm_state_request_send(Ecore_X_Window win, Ecore_X_Window root, Ecore_ xcb_send_event(_ecore_xcb_conn, 0, root, (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -486,7 +486,7 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, int xcb_send_event(_ecore_xcb_conn, 0, root, (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -590,7 +590,7 @@ ecore_x_netwm_ping_send(Ecore_X_Window win) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -652,7 +652,7 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win, unsigned int serial) xcb_send_event(_ecore_xcb_conn, 0, win, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -699,7 +699,7 @@ ecore_x_netwm_desktop_request_send(Ecore_X_Window win, Ecore_X_Window root, unsi xcb_send_event(_ecore_xcb_conn, 0, root, (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY), (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void diff --git a/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c index 88760b8..e194a52 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c @@ -31,7 +31,7 @@ ecore_x_pixmap_new(Ecore_X_Window win, int w, int h, int dep) pmap = xcb_generate_id(_ecore_xcb_conn); xcb_create_pixmap(_ecore_xcb_conn, dep, pmap, win, w, h); - ecore_x_flush(); +// ecore_x_flush(); return pmap; } @@ -50,7 +50,7 @@ ecore_x_pixmap_free(Ecore_X_Pixmap pmap) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_free_pixmap(_ecore_xcb_conn, pmap); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -73,7 +73,7 @@ ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, Ecore_X_Drawable dest, Ecore_X_GC gc, LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_copy_area(_ecore_xcb_conn, pmap, dest, gc, sx, sy, dx, dy, w, h); - ecore_x_flush(); +// ecore_x_flush(); } /** diff --git a/src/lib/ecore_x/xcb/ecore_xcb_randr.c b/src/lib/ecore_x/xcb/ecore_xcb_randr.c index 014a774..d145c82 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_randr.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_randr.c @@ -2425,7 +2425,7 @@ ecore_x_randr_output_backlight_level_set(Ecore_X_Window root, Ecore_X_Randr_Outp _backlight, XCB_ATOM_INTEGER, 32, XCB_PROP_MODE_REPLACE, 1, (unsigned char *)&n); - ecore_x_flush(); // needed +// ecore_x_flush(); // needed } free(qreply); diff --git a/src/lib/ecore_x/xcb/ecore_xcb_region.c b/src/lib/ecore_x/xcb/ecore_xcb_region.c index a13b207..b0a3792 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_region.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_region.c @@ -56,7 +56,7 @@ ecore_x_xregion_set(Ecore_X_XRegion *region, Ecore_X_GC gc) xcb_set_clip_rectangles(_ecore_xcb_conn, XCB_CLIP_ORDERING_YX_BANDED, gc, 0, 0, num, rects); - ecore_x_flush(); +// ecore_x_flush(); return EINA_TRUE; } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_selection.c b/src/lib/ecore_x/xcb/ecore_xcb_selection.c index c7e5c02..2d495ad 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_selection.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_selection.c @@ -454,7 +454,7 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor, Ecore_X_Atom selection, xcb_send_event(_ecore_xcb_conn, 0, requestor, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); - ecore_x_flush(); +// ecore_x_flush(); return EINA_TRUE; } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_sync.c b/src/lib/ecore_x/xcb/ecore_xcb_sync.c index 9d80532..24db622 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_sync.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_sync.c @@ -58,7 +58,7 @@ _ecore_xcb_sync_magic_send(int val, Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, 27777, XCB_EVENT_MASK_NO_EVENT, 0x7162534, (0x10000000 + val), win, 0, 0); - ecore_x_flush(); +// ecore_x_flush(); } /* public functions */ @@ -108,7 +108,7 @@ ecore_x_sync_alarm_free(Ecore_X_Sync_Alarm alarm) #ifdef ECORE_XCB_SYNC xcb_sync_destroy_alarm(_ecore_xcb_conn, alarm); - ecore_x_flush(); +// ecore_x_flush(); return EINA_TRUE; #endif @@ -156,7 +156,7 @@ ecore_x_sync_counter_inc(Ecore_X_Sync_Counter counter, int by) v.lo = by; xcb_sync_change_counter(_ecore_xcb_conn, counter, v); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -193,7 +193,7 @@ ecore_x_sync_counter_val_wait(Ecore_X_Sync_Counter counter, int val) cond.event_threshold = v2; xcb_sync_await(_ecore_xcb_conn, 1, &cond); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -215,7 +215,7 @@ ecore_x_sync_counter_new(int val) counter = xcb_generate_id(_ecore_xcb_conn); xcb_sync_create_counter(_ecore_xcb_conn, counter, v); - ecore_x_flush(); +// ecore_x_flush(); return counter; #endif @@ -232,7 +232,7 @@ ecore_x_sync_counter_free(Ecore_X_Sync_Counter counter) #ifdef ECORE_XCB_SYNC xcb_sync_destroy_counter(_ecore_xcb_conn, counter); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -252,7 +252,7 @@ ecore_x_sync_counter_set(Ecore_X_Sync_Counter counter, int val) v.lo = val; xcb_sync_set_counter(_ecore_xcb_conn, counter, v); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -272,7 +272,7 @@ ecore_x_sync_counter_2_set(Ecore_X_Sync_Counter counter, int val_hi, unsigned in v.lo = val_lo; xcb_sync_set_counter(_ecore_xcb_conn, counter, v); - ecore_x_flush(); +// ecore_x_flush(); #endif } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window.c b/src/lib/ecore_x/xcb/ecore_xcb_window.c index 1446f6a..7cc3dd6 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_window.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_window.c @@ -315,7 +315,7 @@ ecore_x_window_free(Ecore_X_Window win) /* (const char *)&ev); */ xcb_destroy_window(_ecore_xcb_conn, win); - ecore_x_flush(); +// ecore_x_flush(); } } @@ -385,7 +385,7 @@ ecore_x_window_configure(Ecore_X_Window win, Ecore_X_Window_Configure_Mask mask, xcb_configure_window(_ecore_xcb_conn, win, vmask, (const uint32_t *)&vlist); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -420,7 +420,7 @@ ecore_x_window_move(Ecore_X_Window win, int x, int y) xcb_configure_window(_ecore_xcb_conn, win, mask, (const uint32_t *)&list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -447,7 +447,7 @@ ecore_x_window_resize(Ecore_X_Window win, int w, int h) xcb_configure_window(_ecore_xcb_conn, win, mask, (const uint32_t *)&list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -479,7 +479,7 @@ ecore_x_window_move_resize(Ecore_X_Window win, int x, int y, int w, int h) xcb_configure_window(_ecore_xcb_conn, win, mask, (const uint32_t *)&list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -516,7 +516,7 @@ ecore_x_window_border_width_set(Ecore_X_Window win, int border_width) xcb_configure_window(_ecore_xcb_conn, win, XCB_CONFIG_WINDOW_BORDER_WIDTH, &list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -539,7 +539,7 @@ ecore_x_window_raise(Ecore_X_Window win) xcb_configure_window(_ecore_xcb_conn, win, XCB_CONFIG_WINDOW_STACK_MODE, list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -556,7 +556,7 @@ ecore_x_window_lower(Ecore_X_Window win) xcb_configure_window(_ecore_xcb_conn, win, XCB_CONFIG_WINDOW_STACK_MODE, list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -632,7 +632,7 @@ ecore_x_window_show(Ecore_X_Window win) if (win) { xcb_map_window(_ecore_xcb_conn, win); - ecore_x_flush(); +// ecore_x_flush(); } } @@ -681,7 +681,7 @@ ecore_x_window_hide(Ecore_X_Window win) (const char *)&ev); xcb_unmap_window(_ecore_xcb_conn, win); - ecore_x_flush(); +// ecore_x_flush(); } } @@ -705,7 +705,7 @@ ecore_x_window_focus(Ecore_X_Window win) xcb_set_input_focus(_ecore_xcb_conn, XCB_INPUT_FOCUS_PARENT, win, XCB_CURRENT_TIME); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -721,7 +721,7 @@ ecore_x_window_focus_at_time(Ecore_X_Window win, Ecore_X_Time time) if (!win) win = ((xcb_screen_t *)_ecore_xcb_screen)->root; xcb_set_input_focus(_ecore_xcb_conn, XCB_INPUT_FOCUS_PARENT, win, time); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -747,7 +747,7 @@ ecore_x_window_reparent(Ecore_X_Window win, Ecore_X_Window parent, int x, int y) parent = ((xcb_screen_t *)_ecore_xcb_screen)->root; xcb_reparent_window(_ecore_xcb_conn, win, parent, x, y); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -761,7 +761,7 @@ ecore_x_window_pixmap_set(Ecore_X_Window win, Ecore_X_Pixmap pixmap) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_BACK_PIXMAP, &list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -791,7 +791,7 @@ ecore_x_window_background_color_set(Ecore_X_Window win, unsigned short red, unsi xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_BACK_PIXEL, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -805,7 +805,7 @@ ecore_x_window_pixel_gravity_set(Ecore_X_Window win, Ecore_X_Gravity gravity) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_BIT_GRAVITY, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -819,7 +819,7 @@ ecore_x_window_gravity_set(Ecore_X_Window win, Ecore_X_Gravity gravity) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_WIN_GRAVITY, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -833,7 +833,7 @@ ecore_x_window_override_set(Ecore_X_Window win, Eina_Bool override) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_OVERRIDE_REDIRECT, &list); - ecore_x_flush(); +// ecore_x_flush(); } /** @@ -887,7 +887,7 @@ ecore_x_window_cursor_show(Ecore_X_Window win, Eina_Bool show) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_CURSOR, &list); } - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -900,7 +900,7 @@ ecore_x_window_cursor_set(Ecore_X_Window win, Ecore_X_Cursor cursor) list = cursor; xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_CURSOR, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -915,7 +915,7 @@ ecore_x_window_container_manage(Ecore_X_Window win) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_EVENT_MASK, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -938,7 +938,7 @@ ecore_x_window_client_manage(Ecore_X_Window win) #ifdef ECORE_XCB_SHAPE xcb_shape_select_input(_ecore_xcb_conn, win, EINA_TRUE); #endif - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -953,7 +953,7 @@ ecore_x_window_sniff(Ecore_X_Window win) xcb_change_window_attributes(_ecore_xcb_conn, win, XCB_CW_EVENT_MASK, &list); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -975,7 +975,7 @@ ecore_x_window_client_sniff(Ecore_X_Window win) #ifdef ECORE_XCB_SHAPE xcb_shape_select_input(_ecore_xcb_conn, win, EINA_TRUE); #endif - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -984,7 +984,7 @@ ecore_x_window_area_clear(Ecore_X_Window win, int x, int y, int w, int h) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_clear_area(_ecore_xcb_conn, 0, win, x, y, w, h); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void @@ -993,7 +993,7 @@ ecore_x_window_area_expose(Ecore_X_Window win, int x, int y, int w, int h) LOGFN(__FILE__, __LINE__, __FUNCTION__); xcb_clear_area(_ecore_xcb_conn, 1, win, x, y, w, h); - ecore_x_flush(); +// ecore_x_flush(); } EAPI void diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c b/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c index ea1d043..a6b37cb 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c @@ -48,7 +48,7 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win, Ecore_X_Atom atom, unsigned i #if SIZEOF_INT == SIZEOF_LONG xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, atom, ECORE_X_ATOM_CARDINAL, 32, num, (unsigned char *)val); - ecore_x_flush(); +// ecore_x_flush(); #else long *v2; unsigned int i; @@ -61,7 +61,7 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win, Ecore_X_Atom atom, unsigned i xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, atom, ECORE_X_ATOM_CARDINAL, 32, num, (unsigned char *)v2); free(v2); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -136,7 +136,7 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Atom #if SIZEOF_INT == SIZEOF_LONG xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, atom, type, 32, num, (unsigned char *)xids); - ecore_x_flush(); +// ecore_x_flush(); #else long *v2; unsigned int i; @@ -149,7 +149,7 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Atom xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, atom, type, 32, num, (unsigned char *)v2); free(v2); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -198,7 +198,7 @@ ecore_x_window_prop_string_set(Ecore_X_Window win, Ecore_X_Atom type, const char xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, type, ECORE_X_ATOM_UTF8_STRING, 8, strlen(str), str); - ecore_x_flush(); +// ecore_x_flush(); } EAPI char * @@ -306,7 +306,7 @@ ecore_x_window_prop_property_set(Ecore_X_Window win, Ecore_X_Atom property, Ecor { xcb_change_property(_ecore_xcb_conn, XCB_PROP_MODE_REPLACE, win, property, type, size, num, (unsigned char *)data); - ecore_x_flush(); +// ecore_x_flush(); } else { @@ -322,7 +322,7 @@ ecore_x_window_prop_property_set(Ecore_X_Window win, Ecore_X_Atom property, Ecor property, type, size, num, (unsigned char *)dat); free(dat); - ecore_x_flush(); +// ecore_x_flush(); } } } diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c index 52d0440..ae82ffe 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c @@ -25,7 +25,7 @@ ecore_x_window_shape_input_mask_set(Ecore_X_Window win, Ecore_X_Pixmap mask) #ifdef ECORE_XCB_SHAPE xcb_shape_mask(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, win, 0, 0, mask); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -48,7 +48,7 @@ ecore_x_window_shape_mask_set(Ecore_X_Window win, Ecore_X_Pixmap mask) #ifdef ECORE_XCB_SHAPE xcb_shape_mask(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, win, 0, 0, mask); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -64,7 +64,7 @@ ecore_x_window_shape_window_set(Ecore_X_Window win, Ecore_X_Window shape_win) #ifdef ECORE_XCB_SHAPE xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, win, 0, 0, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -80,7 +80,7 @@ ecore_x_window_shape_window_set_xy(Ecore_X_Window win, Ecore_X_Window shape_win, #ifdef ECORE_XCB_SHAPE xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, win, x, y, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -107,7 +107,7 @@ ecore_x_window_shape_rectangle_set(Ecore_X_Window win, int x, int y, int w, int xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -150,7 +150,7 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects win, 0, 0, num, (xcb_rectangle_t *)rect); if (rect) free(rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -168,7 +168,7 @@ ecore_x_window_shape_window_add(Ecore_X_Window win, Ecore_X_Window shape_win) xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_UNION, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, win, 0, 0, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -185,7 +185,7 @@ ecore_x_window_shape_window_add_xy(Ecore_X_Window win, Ecore_X_Window shape_win, xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_UNION, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, win, x, y, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -212,7 +212,7 @@ ecore_x_window_shape_rectangle_add(Ecore_X_Window win, int x, int y, int w, int xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_UNION, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -240,7 +240,7 @@ ecore_x_window_shape_rectangle_subtract(Ecore_X_Window win, int x, int y, int w, xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SUBTRACT, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -268,7 +268,7 @@ ecore_x_window_shape_rectangle_clip(Ecore_X_Window win, int x, int y, int w, int xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_INTERSECT, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -310,7 +310,7 @@ ecore_x_window_shape_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle *rects win, 0, 0, num, (xcb_rectangle_t *)&rect); if (rect) free(rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -380,7 +380,7 @@ ecore_x_window_shape_events_select(Ecore_X_Window win, Eina_Bool on) #ifdef ECORE_XCB_SHAPE xcb_shape_select_input(_ecore_xcb_conn, win, on); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -491,7 +491,7 @@ ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle win, 0, 0, num, (xcb_rectangle_t *)rect); if (rect) free(rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -517,7 +517,7 @@ ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win, int x, int y, xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SUBTRACT, XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -545,7 +545,7 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, int x, int y, int w xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_UNION, XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -573,7 +573,7 @@ ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win, int x, int y, int w xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -592,7 +592,7 @@ ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win, Ecore_X_Window shap #ifdef ECORE_XCB_SHAPE xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, XCB_SHAPE_SK_INPUT, win, x, y, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -610,7 +610,7 @@ ecore_x_window_shape_input_window_add_xy(Ecore_X_Window win, Ecore_X_Window shap #ifdef ECORE_XCB_SHAPE xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_UNION, XCB_SHAPE_SK_INPUT, XCB_SHAPE_SK_INPUT, win, x, y, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -628,7 +628,7 @@ ecore_x_window_shape_input_window_set(Ecore_X_Window win, Ecore_X_Window shape_w #ifdef ECORE_XCB_SHAPE xcb_shape_combine(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, XCB_SHAPE_SK_INPUT, win, 0, 0, shape_win); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -653,7 +653,7 @@ ecore_x_window_shape_input_rectangle_clip(Ecore_X_Window win, int x, int y, int xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_INTERSECT, XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, win, 0, 0, 1, &rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; @@ -695,7 +695,7 @@ ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle win, 0, 0, num, (xcb_rectangle_t *)&rect); if (rect) free(rect); - ecore_x_flush(); +// ecore_x_flush(); #else return; win = 0; diff --git a/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c index ff0c5ec..2028832 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c @@ -133,7 +133,7 @@ ecore_x_region_new(Ecore_X_Rectangle *rects, int num) region = xcb_generate_id(_ecore_xcb_conn); xcb_xfixes_create_region(_ecore_xcb_conn, region, num, xrects); free(xrects); - ecore_x_flush(); +// ecore_x_flush(); #endif return region; @@ -158,7 +158,7 @@ ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap) #ifdef ECORE_XCB_XFIXES region = xcb_generate_id(_ecore_xcb_conn); xcb_xfixes_create_region_from_bitmap(_ecore_xcb_conn, region, bitmap); - ecore_x_flush(); +// ecore_x_flush(); #endif return region; @@ -185,7 +185,7 @@ ecore_x_region_new_from_window(Ecore_X_Window win, Ecore_X_Region_Type type) #ifdef ECORE_XCB_XFIXES region = xcb_generate_id(_ecore_xcb_conn); xcb_xfixes_create_region_from_window(_ecore_xcb_conn, region, win, type); - ecore_x_flush(); +// ecore_x_flush(); #endif return region; @@ -209,7 +209,7 @@ ecore_x_region_new_from_gc(Ecore_X_GC gc) #ifdef ECORE_XCB_XFIXES region = xcb_generate_id(_ecore_xcb_conn); xcb_xfixes_create_region_from_gc(_ecore_xcb_conn, region, gc); - ecore_x_flush(); +// ecore_x_flush(); #endif return region; @@ -233,7 +233,7 @@ ecore_x_region_new_from_picture(Ecore_X_Picture picture) #ifdef ECORE_XCB_XFIXES region = xcb_generate_id(_ecore_xcb_conn); xcb_xfixes_create_region_from_picture(_ecore_xcb_conn, region, picture); - ecore_x_flush(); +// ecore_x_flush(); #endif return region; @@ -253,7 +253,7 @@ ecore_x_region_free(Ecore_X_Region region) #ifdef ECORE_XCB_XFIXES xcb_xfixes_destroy_region(_ecore_xcb_conn, region); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -280,7 +280,7 @@ ecore_x_region_set(Ecore_X_Region region, Ecore_X_Rectangle *rects, int num) xrects = _ecore_xcb_rect_to_xcb(rects, num); xcb_xfixes_set_region(_ecore_xcb_conn, region, num, xrects); free(xrects); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -300,7 +300,7 @@ ecore_x_region_copy(Ecore_X_Region dest, Ecore_X_Region source) // NB: Hmmmm...this may need converting to/fro xcb_rectangle_t #ifdef ECORE_XCB_XFIXES xcb_xfixes_copy_region(_ecore_xcb_conn, source, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -321,7 +321,7 @@ ecore_x_region_combine(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Regi #ifdef ECORE_XCB_XFIXES xcb_xfixes_union_region(_ecore_xcb_conn, source1, source2, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -342,7 +342,7 @@ ecore_x_region_intersect(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Re #ifdef ECORE_XCB_XFIXES xcb_xfixes_intersect_region(_ecore_xcb_conn, source1, source2, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -363,7 +363,7 @@ ecore_x_region_subtract(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Reg #ifdef ECORE_XCB_XFIXES xcb_xfixes_subtract_region(_ecore_xcb_conn, source1, source2, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -394,7 +394,7 @@ ecore_x_region_invert(Ecore_X_Region dest, Ecore_X_Rectangle *bounds, Ecore_X_Re xrects.height = bounds->height; xcb_xfixes_invert_region(_ecore_xcb_conn, source, xrects, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -414,7 +414,7 @@ ecore_x_region_translate(Ecore_X_Region region, int dx, int dy) #ifdef ECORE_XCB_XFIXES xcb_xfixes_translate_region(_ecore_xcb_conn, region, dx, dy); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -433,7 +433,7 @@ ecore_x_region_extents(Ecore_X_Region dest, Ecore_X_Region source) #ifdef ECORE_XCB_XFIXES xcb_xfixes_region_extents(_ecore_xcb_conn, source, dest); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -526,7 +526,7 @@ ecore_x_region_expand(Ecore_X_Region dest, Ecore_X_Region source, unsigned int l #ifdef ECORE_XCB_XFIXES xcb_xfixes_expand_region(_ecore_xcb_conn, source, dest, left, right, top, bottom); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -553,7 +553,7 @@ ecore_x_region_gc_clip_set(Ecore_X_Region region, Ecore_X_GC gc, int x, int y) #ifdef ECORE_XCB_XFIXES xcb_xfixes_set_gc_clip_region(_ecore_xcb_conn, gc, region, x, y); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -577,7 +577,7 @@ ecore_x_region_window_shape_set(Ecore_X_Region region, Ecore_X_Window dest, Ecor #ifdef ECORE_XCB_XFIXES xcb_xfixes_set_window_shape_region(_ecore_xcb_conn, dest, type, x, y, region); - ecore_x_flush(); +// ecore_x_flush(); #endif } @@ -603,7 +603,7 @@ ecore_x_region_picture_clip_set(Ecore_X_Region region, Ecore_X_Picture picture, #ifdef ECORE_XCB_XFIXES xcb_xfixes_set_picture_clip_region(_ecore_xcb_conn, picture, region, x, y); - ecore_x_flush(); +// ecore_x_flush(); #endif } -- 2.7.4