raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e483d25082c6fea1e077bfe104d63d49dc8a6906
commit e483d25082c6fea1e077bfe104d63d49dc8a6906 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Feb 4 18:58:48 2015 +0900 ecore-x - undo api/abi break with input selecting before release --- src/lib/ecore_x/Ecore_X.h | 2 +- src/lib/ecore_x/xlib/ecore_x_xi2.c | 2 +- src/modules/ecore_evas/engines/x/ecore_evas_x.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index 0697769..efdd2ff 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -2529,7 +2529,7 @@ EAPI Eina_Bool ecore_x_image_is_argb32_get(Ecore_X_Image *im); EAPI Eina_Bool ecore_x_image_to_argb_convert(void *src, int sbpp, int sbpl, Ecore_X_Colormap c, Ecore_X_Visual v, int x, int y, int w, int h, unsigned int *dst, int dbpl, int dx, int dy); -EAPI Eina_Bool ecore_x_input_select(Ecore_X_Window win); /**< @since 1.13 */ +EAPI Eina_Bool ecore_x_input_multi_select(Ecore_X_Window win); /**< @since 1.13 */ EAPI Eina_Bool ecore_x_input_raw_select(Ecore_X_Window win); /**< @since 1.8 */ EAPI Eina_Bool ecore_x_vsync_animator_tick_source_set(Ecore_X_Window win); diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c index a06eec0..832b424 100644 --- a/src/lib/ecore_x/xlib/ecore_x_xi2.c +++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c @@ -638,7 +638,7 @@ _ecore_x_input_handler(XEvent *xevent) } EAPI Eina_Bool -ecore_x_input_select(Ecore_X_Window win) +ecore_x_input_multi_select(Ecore_X_Window win) { #ifdef ECORE_XI2 int i; diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c index a401d46..60c623f 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -2531,7 +2531,7 @@ _alpha_do(Ecore_Evas *ee, int alpha) } evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h); ecore_x_window_shape_mask_set(ee->prop.window, 0); - ecore_x_input_select(ee->prop.window); + ecore_x_input_multi_select(ee->prop.window); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, @@ -2685,7 +2685,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) } evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h); // ecore_x_window_shape_mask_set(ee->prop.window, 0); - ecore_x_input_select(ee->prop.window); + ecore_x_input_multi_select(ee->prop.window); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, @@ -3997,7 +3997,7 @@ ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window paren ee->engine.func->fn_render = _ecore_evas_x_render; _ecore_evas_register(ee); - ecore_x_input_select(ee->prop.window); + ecore_x_input_multi_select(ee->prop.window); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, @@ -4221,7 +4221,7 @@ ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Windo ee->draw_ok = 1; - /* ecore_x_input_select(ee->prop.window); */ + /* ecore_x_input_multi_select(ee->prop.window); */ /* ecore_event_window_register(ee->prop.window, ee, ee->evas, */ /* (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, */ /* (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, */ @@ -4314,7 +4314,7 @@ _ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window w { *winp = win; edata->win_extra = eina_list_append(edata->win_extra, winp); - ecore_x_input_select(win); + ecore_x_input_multi_select(win); ecore_event_window_register(win, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, @@ -4448,7 +4448,7 @@ ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window par ee->engine.func->fn_render = _ecore_evas_x_render; _ecore_evas_register(ee); - ecore_x_input_select(ee->prop.window); + ecore_x_input_multi_select(ee->prop.window); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, @@ -4646,7 +4646,7 @@ ecore_evas_gl_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window pare ee->engine.func->fn_render = _ecore_evas_x_render; _ecore_evas_register(ee); - /* ecore_x_input_select(ee->prop.window); */ + /* ecore_x_input_multi_select(ee->prop.window); */ /* ecore_event_window_register(ee->prop.window, ee, ee->evas, */ /* (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, */ /* (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, */ --