e_client: change the name of E_Binding_Event_Mouse_Button

It changes into E_Event_Mouse_Button

Change-Id: If332d9cba213242a0e6b75e060033bee73cb5cf5

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 800fc164c888dd67474678055160a8a99ad28ee5..cf12ebe1d4d59a75b496ecdc375908e46f5c87a6 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -724,7 +724,7 @@ _e_comp_object_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E
 {
    Evas_Event_Mouse_Down *ev = event_info;
    E_Comp_Object *cw = data;
-   E_Binding_Event_Mouse_Button ev2;
+   E_Event_Mouse_Button ev2;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!cw->ec) return;
@@ -738,7 +738,7 @@ _e_comp_object_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
 {
    Evas_Event_Mouse_Up *ev = event_info;
    E_Comp_Object *cw = data;
-   E_Binding_Event_Mouse_Button ev2;
+   E_Event_Mouse_Button ev2;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!cw->ec) return;

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 21cc572f5394ac39e84c4cb794f96108a8c4a870..89044f61b07019628e9ab199147ae096f37c8b08 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -3612,7 +3612,7 @@ e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev
 }
 
 EINTERN void
-e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev)
+e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_Button *ev)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
@@ -3658,7 +3658,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even
 }
 
 EINTERN void
-e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev)
+e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_Button* ev)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
    if (ec->iconic || e_client_util_ignored_get(ec)) return;
@@ -4765,7 +4765,7 @@ e_client_act_resize_keyboard(E_Client *ec)
 }
 
 EINTERN void
-e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
+e_client_act_move_begin(E_Client *ec, E_Event_Mouse_Button *ev)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
@@ -4784,7 +4784,7 @@ e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
 }
 
 E_API void
-e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
+e_client_act_move_end(E_Client *ec, E_Event_Mouse_Button *ev EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
@@ -4794,7 +4794,7 @@ e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED
 }
 
 EINTERN void
-e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode)
+e_client_act_resize_begin(E_Client *ec, E_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
@@ -4841,7 +4841,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Poin
 }
 
 EINTERN void
-e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
+e_client_act_resize_end(E_Client *ec, E_Event_Mouse_Button *ev EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
@@ -4856,7 +4856,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS
 }
 
 EINTERN void
-e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
+e_client_act_menu_begin(E_Client *ec, E_Event_Mouse_Button *ev, int key)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 6f0c1938bb2e962961b678b4f7842514fb402633..60df6fb02c35b967fb663e40cad090ec19427eb8 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -14,7 +14,7 @@ typedef struct _E_Client_Data_Get_Client
    E_Client *result_ec;
 } E_Client_Data_Get_Client;
 
-struct E_Binding_Event_Mouse_Button
+struct _E_Event_Mouse_Button
 {
    int               button; /**< Mouse button number that was raised (1 - 32) */
 
@@ -98,8 +98,8 @@ EINTERN E_Client *e_client_action_get(void);
 EINTERN void      e_client_mouse_in(E_Client *ec, int x, int y);
 EINTERN void      e_client_mouse_out(E_Client *ec, int x, int y);
 EINTERN void      e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev);
-EINTERN void      e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
-EINTERN void      e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev);
+EINTERN void      e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_Button *ev);
+EINTERN void      e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_Button* ev);
 EINTERN void      e_client_mouse_move(E_Client *ec, Evas_Point *output);
 
 EINTERN void      e_client_res_change_geometry_save(E_Client *bd);
@@ -122,10 +122,10 @@ EINTERN Eina_Bool e_client_focus_check_get(E_Client *ec);
 
 EINTERN void      e_client_act_move_keyboard(E_Client *ec);
 EINTERN void      e_client_act_resize_keyboard(E_Client *ec);
-EINTERN void      e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
-EINTERN void      e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode);
-EINTERN void      e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
-EINTERN void      e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key);
+EINTERN void      e_client_act_move_begin(E_Client *ec, E_Event_Mouse_Button *ev);
+EINTERN void      e_client_act_resize_begin(E_Client *ec, E_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode);
+EINTERN void      e_client_act_resize_end(E_Client *ec, E_Event_Mouse_Button *ev EINA_UNUSED);
+EINTERN void      e_client_act_menu_begin(E_Client *ec, E_Event_Mouse_Button *ev, int key);
 EINTERN void      e_client_act_close_begin(E_Client *ec);
 EINTERN void      e_client_act_kill_begin(E_Client *ec);
 

diff --git a/src/bin/server/e_comp_wl_shell.c b/src/bin/server/e_comp_wl_shell.c
index 0a18f26f2456e1337b749efb238a2f25affa5969..97e42bdfe647665edad1b84fdc23273ff1762566 100644 (file)
--- a/src/bin/server/e_comp_wl_shell.c
+++ b/src/bin/server/e_comp_wl_shell.c
@@ -243,7 +243,7 @@ e_shell_e_client_app_id_set(E_Client *ec, const char *app_id)
 }
 
 static void
-_e_shell_e_client_mouse_down_helper(E_Client *ec, E_Binding_Event_Mouse_Button *ev, Eina_Bool move, int resize_edges)
+_e_shell_e_client_mouse_down_helper(E_Client *ec, E_Event_Mouse_Button *ev, Eina_Bool move, int resize_edges)
 {
    E_Pointer_Mode resize_mode = E_POINTER_RESIZE_NONE;
 
@@ -292,7 +292,7 @@ e_shell_e_client_interactive_move(E_Client *ec,
                                   /* TODO Multi seat is not yet supported */
                                   struct wl_resource *seat EINA_UNUSED)
 {
-   E_Binding_Event_Mouse_Button ev;
+   E_Event_Mouse_Button ev;
    E_Comp_Wl_Data *comp_wl;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
@@ -333,7 +333,7 @@ e_shell_e_client_interactive_resize(E_Client *ec,
                                     struct wl_resource *seat EINA_UNUSED,
                                     uint32_t edges)
 {
-   E_Binding_Event_Mouse_Button ev;
+   E_Event_Mouse_Button ev;
    E_Comp_Wl_Data *comp_wl;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);

diff --git a/src/bin/windowmgr/e_actions.c b/src/bin/windowmgr/e_actions.c
index 88d59fabdc93303a427edb09456cb02e07dbbd79..5e3b8af68b7d98e9b36c5c2da18346b6f16405b0 100644 (file)
--- a/src/bin/windowmgr/e_actions.c
+++ b/src/bin/windowmgr/e_actions.c
@@ -46,7 +46,7 @@ static void       _e_action_predef_name_all_del(void);
      if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse;  \
   }
 #define ACT_FN_GO_MOUSE(act, use) \
-  static void _e_actions_act_##act##_go_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED)
+  static void _e_actions_act_##act##_go_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Event_Mouse_Button * ev EINA_UNUSED)
 
 #define ACT_GO_SIGNAL(name)                                             \
   {                                                                     \
@@ -78,7 +78,7 @@ static void       _e_action_predef_name_all_del(void);
      if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse;  \
   }
 #define ACT_FN_END_MOUSE(act, use) \
-  static void _e_actions_act_##act##_end_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED)
+  static void _e_actions_act_##act##_end_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Event_Mouse_Button * ev EINA_UNUSED)
 
 /* to save writing this in N places - the sections are defined here */
 /***************************************************************************/

diff --git a/src/include/e_client.h b/src/include/e_client.h
index 2b9ba075d058b4976acd63f64ea19a4d98dbf8ca..f3c10e4bca7a721e0f5a33fae588c2600fcd8a88 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -917,7 +917,7 @@ E_API void      e_client_iconify(E_Client *ec);
 E_API void      e_client_uniconify(E_Client *ec);
 E_API void      e_client_iconified_type_set(E_Client *ec, E_Iconified_Type type);
 E_API void      e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip);
-E_API void      e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+E_API void      e_client_act_move_end(E_Client *ec, E_Event_Mouse_Button *ev EINA_UNUSED);
 E_API void      e_client_redirected_set(E_Client *ec, Eina_Bool set);
 E_API void      e_client_post_raise_lower_set(E_Client *ec, Eina_Bool raise_set, Eina_Bool lower_set);
 E_API Eina_Bool e_client_first_mapped_get(E_Client *ec);

diff --git a/src/include/e_types.h b/src/include/e_types.h
index bdfac02ab3f7d55a0b17ca348b936ecd8607d468..ff3b44f95f36f6a641c54bfcbf94047fe7884290 100644 (file)
--- a/src/include/e_types.h
+++ b/src/include/e_types.h
@@ -73,7 +73,7 @@ typedef struct _E_Object                      E_Object;                      //
 
 typedef struct _E_Client_Hook E_Client_Hook;  // type of e_client.h
 
-typedef struct E_Binding_Event_Mouse_Button   E_Binding_Event_Mouse_Button;  // type of e_bindings_intern.h FIXME: remove it
+typedef struct _E_Event_Mouse_Button   E_Event_Mouse_Button;
 typedef struct E_Binding_Event_Wheel          E_Binding_Event_Wheel;         // type of e_bindings_intern.h FIXME: remove it
 
 typedef void (*E_Object_Cleanup_Func) (void *obj); // type of e_object.h
@@ -198,12 +198,12 @@ struct _E_Action
    struct
    {
       void (*go)(E_Object *obj, const char *params);
-      void (*go_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
+      void (*go_mouse)(E_Object *obj, const char *params, E_Event_Mouse_Button *ev);
       void (*go_wheel)(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev);
       void (*go_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
       void (*go_signal)(E_Object *obj, const char *params, const char *sig, const char *src);
       void (*end)(E_Object *obj, const char *params);
-      void (*end_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
+      void (*end_mouse)(E_Object *obj, const char *params, E_Event_Mouse_Button *ev);
       void (*end_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
    } func;
 };