From 1d477665be444891bcfb9f380e7cc0954e6d3815 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 5 Jul 2024 09:34:00 +0900 Subject: [PATCH] e_client: make the function all be simple Remove the functions which are directly calling the e_comp_wl functions. Change-Id: I8fbb7b2e28479c93883c95d784e18b925581f71f --- src/bin/core/e_client.c | 100 ----------------------------------------- src/bin/core/e_client_intern.h | 12 ----- src/bin/server/e_comp_wl_rsm.c | 40 ++++++++--------- 3 files changed, 20 insertions(+), 132 deletions(-) diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c index b1d0f57..6a67b2a 100644 --- a/src/bin/core/e_client.c +++ b/src/bin/core/e_client.c @@ -5506,106 +5506,6 @@ e_client_window_role_set(E_Client *ec, const char *role) } } -EINTERN Eina_Bool -e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_key_send(ec, keycode, pressed, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_key_cancel(ec, keycode, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_touch_send(ec, idx, x, y, pressed, dev, radius_x, radius_y, pressure, angle, time); - - return res; -} - -EINTERN Eina_Bool -e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_touch_update_send(ec, idx, x, y, dev, radius_x, radius_y, pressure, angle, time); - - return res; -} - -EINTERN Eina_Bool -e_client_touch_cancel_send(E_Client *ec) -{ - Eina_Bool res; - - res = e_comp_wl_touch_cancel_send(ec); - - return res; -} - -EINTERN Eina_Bool -e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_mouse_button_send(ec, buttons, pressed, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_mouse_move_send(ec, x, y, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_mouse_wheel_send(ec, direction, z, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_mouse_in_send(ec, x, y, dev, time); - - return res; -} - -EINTERN Eina_Bool -e_client_mouse_out_send(E_Client *ec, Ecore_Device *dev, unsigned int time) -{ - Eina_Bool res; - - res = e_comp_wl_mouse_out_send(ec, dev, time); - - return res; -} - E_API Eina_Bool e_client_video_client_has(E_Client *ec) { diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h index de45798..40fa38a 100644 --- a/src/bin/core/e_client_intern.h +++ b/src/bin/core/e_client_intern.h @@ -83,24 +83,12 @@ EINTERN Eina_Bool e_client_comp_grabbed_get(void); EINTERN E_Client *e_client_action_get(void); -EINTERN Eina_Bool e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *dev, unsigned int time); -EINTERN Eina_Bool e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int time); - -EINTERN Eina_Bool e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time); -EINTERN Eina_Bool e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time); -EINTERN Eina_Bool e_client_touch_cancel_send(E_Client *ec); - 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_move(E_Client *ec, Evas_Point *output); -EINTERN Eina_Bool e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, unsigned int time); -EINTERN Eina_Bool e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time); -EINTERN Eina_Bool e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, unsigned int time); -EINTERN Eina_Bool e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time); -EINTERN Eina_Bool e_client_mouse_out_send(E_Client *ec, Ecore_Device *dev, unsigned int time); EINTERN void e_client_res_change_geometry_save(E_Client *bd); EINTERN void e_client_res_change_geometry_restore(E_Client *ec); diff --git a/src/bin/server/e_comp_wl_rsm.c b/src/bin/server/e_comp_wl_rsm.c index a708993..6db21a0 100644 --- a/src/bin/server/e_comp_wl_rsm.c +++ b/src/bin/server/e_comp_wl_rsm.c @@ -1693,33 +1693,33 @@ _remote_surface_cb_mouse_event_transfer(struct wl_client *client, struct wl_reso switch (event_type) { case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_DOWN: - e_client_mouse_button_send(ec, + e_comp_wl_mouse_button_send(ec, button, EINA_TRUE, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_UP: - e_client_mouse_button_send(ec, + e_comp_wl_mouse_button_send(ec, button, EINA_FALSE, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_MOVE: - e_client_mouse_move_send(ec, + e_comp_wl_mouse_move_send(ec, x, y, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_IN: - e_client_mouse_in_send(ec, + e_comp_wl_mouse_in_send(ec, x, y, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_OUT: - e_client_mouse_out_send(ec, + e_comp_wl_mouse_out_send(ec, edev, time); break; @@ -1734,13 +1734,13 @@ _remote_surface_cb_mouse_event_transfer(struct wl_client *client, struct wl_reso { case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_DOWN: /* FIXME: temporary fix for first touch down w/o move event */ - e_client_touch_update_send(ec, + e_comp_wl_touch_update_send(ec, device, x, y, edev, eradx, erady, epressure, eangle, time); - e_client_touch_send(ec, + e_comp_wl_touch_send(ec, device, x, y, EINA_TRUE, @@ -1749,7 +1749,7 @@ _remote_surface_cb_mouse_event_transfer(struct wl_client *client, struct wl_reso time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_UP: - e_client_touch_send(ec, + e_comp_wl_touch_send(ec, device, x, y, EINA_FALSE, @@ -1758,7 +1758,7 @@ _remote_surface_cb_mouse_event_transfer(struct wl_client *client, struct wl_reso time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_MOVE: - e_client_touch_update_send(ec, + e_comp_wl_touch_update_send(ec, device, x, y, edev, @@ -1766,13 +1766,13 @@ _remote_surface_cb_mouse_event_transfer(struct wl_client *client, struct wl_reso time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_IN: - e_client_mouse_in_send(ec, + e_comp_wl_mouse_in_send(ec, x, y, NULL, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_OUT: - e_client_mouse_out_send(ec, + e_comp_wl_mouse_out_send(ec, NULL, time); break; @@ -1826,7 +1826,7 @@ _remote_surface_cb_mouse_wheel_transfer(struct wl_client *client, struct wl_reso NULL, direction, z, clas, identifier); } - e_client_mouse_wheel_send(ec, direction, z, edev, time); + e_comp_wl_mouse_wheel_send(ec, direction, z, edev, time); } static void @@ -1899,13 +1899,13 @@ _remote_surface_cb_touch_event_transfer(struct wl_client *client, struct wl_reso switch (event_type) { case TIZEN_REMOTE_SURFACE_EVENT_TYPE_TOUCH_DOWN: - e_client_touch_update_send(ec, + e_comp_wl_touch_update_send(ec, device, x, y, edev, eradx, erady, epressure, eangle, time); - e_client_touch_send(ec, + e_comp_wl_touch_send(ec, device, x, y, EINA_TRUE, @@ -1914,7 +1914,7 @@ _remote_surface_cb_touch_event_transfer(struct wl_client *client, struct wl_reso time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_TOUCH_UP: - e_client_touch_send(ec, + e_comp_wl_touch_send(ec, device, x, y, EINA_FALSE, @@ -1923,7 +1923,7 @@ _remote_surface_cb_touch_event_transfer(struct wl_client *client, struct wl_reso time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_TOUCH_MOVE: - e_client_touch_update_send(ec, + e_comp_wl_touch_update_send(ec, device, x, y, edev, @@ -1966,7 +1966,7 @@ _remote_surface_cb_touch_cancel_transfer(struct wl_client *client, struct wl_res NULL, pid, ec?ec->netwm.pid:-1, ec); } - e_client_touch_cancel_send(ec); + e_comp_wl_touch_cancel_send(ec); } static void @@ -2020,21 +2020,21 @@ _remote_surface_cb_key_event_transfer(struct wl_client *client, struct wl_resour switch (event_type) { case TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_DOWN: - e_client_key_send(ec, + e_comp_wl_key_send(ec, keycode, EINA_TRUE, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_UP: - e_client_key_send(ec, + e_comp_wl_key_send(ec, keycode, EINA_FALSE, edev, time); break; case TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_CANCEL: - e_client_key_cancel(ec, + e_comp_wl_key_cancel(ec, keycode, edev, time); -- 2.7.4