e_client: Deprecate serial field of surface_sync

The serial field hasn't been used since the commit f49701c9.

Change-Id: Ida73f24571c6b9796ce28c763b24acc01e041ed7

diff --git a/src/bin/debug/e_info_client.c b/src/bin/debug/e_info_client.c
index 9590bef5034de57ab42cc3025d2fa05088f68cf2..ddfcfc19e46e571db48777660f97bc34899b44b3 100644 (file)
--- a/src/bin/debug/e_info_client.c
+++ b/src/bin/debug/e_info_client.c
@@ -6911,8 +6911,7 @@ _e_info_client_log_control(int argc, char **argv)
 
    type = argv[2];
    if (eina_streq(type, "key_input_ttrace_enable") ||
-       eina_streq(type, "input_log_enable") ||
-       eina_streq(type, "buffer_serial_log_enable"))
+       eina_streq(type, "input_log_enable"))
      {
         msg = eldbus_proxy_method_call_new(e_info_client.proxy, "log_control");
         itr = eldbus_message_iter_get(msg);

diff --git a/src/bin/debug/e_info_server.c b/src/bin/debug/e_info_server.c
index 1facc6540fbfe4a6d004e3b560d93c5d047c8fe4..d2478f6a3d4a777cc361a3ff3892eaf52302fb69 100644 (file)
--- a/src/bin/debug/e_info_server.c
+++ b/src/bin/debug/e_info_server.c
@@ -7491,10 +7491,6 @@ _e_info_server_cb_log_control(const Eldbus_Service_Interface *iface EINA_UNUSED,
      {
         e_info_server_input_log_enable_set(onoff);
      }
-   else if (!e_util_strcmp("buffer_serial_log_enable", type))
-     {
-        e_comp_wl_trace_serial_debug(onoff);
-     }
 
    return reply;
 }

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 25d0b0a3701f4f076f40d7ca07b3db2976d4b018..eab3d905e38b7c368eb700d57bbe11db2830ee97 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -85,7 +85,6 @@ struct _E_Comp_Data
 };
 
 static Eina_Bool _e_comp_wl_cursor_timer_control(Evas_Callback_Type type, E_Comp_Wl_Data *comp_wl, E_Client *ec);
-static void      _e_comp_wl_surface_state_serial_update(E_Client *ec, E_Comp_Wl_Buffer *buffer);
 
 /* local variables */
 typedef struct _E_Comp_Wl_Key_Data
@@ -143,7 +142,6 @@ static Eina_Inlist *_e_comp_wl_intercept_hooks[] =
 };
 
 static Eina_List *hooks = NULL;
-static Eina_Bool serial_trace_debug = 0;
 
 static E_Input_Hook *input_hook = NULL;
 
@@ -2551,28 +2549,6 @@ e_comp_wl_surface_state_buffer_set(E_Comp_Wl_Surface_State *state, E_Comp_Wl_Buf
    _e_comp_wl_surface_state_buffer_set(state, buffer);
 }
 
-EINTERN void
-e_comp_wl_trace_serial_debug(Eina_Bool on)
-{
-   if (on == serial_trace_debug) return;
-   serial_trace_debug = on;
-   ELOGF("COMP", "serial trace_debug %s", NULL, (on ? "ON" : "OFF"));
-}
-
-static void
-_e_comp_wl_surface_state_serial_update(E_Client *ec, E_Comp_Wl_Buffer *buffer)
-{
-   uint32_t serial = 0;
-
-   if (!buffer) return;
-
-   serial = wayland_tbm_server_buffer_get_buffer_serial(buffer->resource);
-   ec->surface_sync.serial = serial;
-
-   if (serial_trace_debug)
-     ELOGF("COMP", "Update serial(%u) wl_buffer(%u)", ec, serial, wl_resource_get_id(buffer->resource));
-}
-
 static void
 _e_comp_wl_input_thread_input_area_clear(void *data)
 {
@@ -2839,7 +2815,6 @@ _e_comp_wl_client_buffer_viewport_set(E_Client *ec, E_Comp_Wl_Buffer_Viewport *n
 static void
 _e_comp_wl_client_buffer_set(E_Client *ec, E_Comp_Wl_Buffer *buffer)
 {
-   _e_comp_wl_surface_state_serial_update(ec, buffer);
    e_comp_wl_surface_attach(ec, buffer);
 }
 
@@ -5326,7 +5301,6 @@ e_comp_wl_output_size_get(E_Comp_Wl_Output *output, int *w, int *h)
 // --------------------------------------------------------
 EINTERN Eina_Bool
 e_comp_wl_commit_sync_client_geometry_add(E_Client *ec,
-                                          uint32_t serial,
                                           int32_t x,
                                           int32_t y,
                                           int32_t w,
@@ -5341,7 +5315,6 @@ e_comp_wl_commit_sync_client_geometry_add(E_Client *ec,
    geo = E_NEW(E_Client_Pending_Geometry, 1);
    if (!geo) goto err;
 
-   geo->serial = serial;
    geo->x = x;
    geo->y = y;
    geo->w = w;
@@ -5498,7 +5471,7 @@ _tz_move_resize_iface_cb_set_geometry(struct wl_client *client EINA_UNUSED,
           }
      }
 
-   if (!e_comp_wl_commit_sync_client_geometry_add(ec, serial, x, y, w, h)) goto err;
+   if (!e_comp_wl_commit_sync_client_geometry_add(ec, x, y, w, h)) goto err;
    return;
 
 err:

diff --git a/src/bin/server/e_comp_wl_intern.h b/src/bin/server/e_comp_wl_intern.h
index 6a05a0246b18c706113c1545b375e90a069145dc..ba6be0dc696cac433d04d75de9717a3323602daf 100644 (file)
--- a/src/bin/server/e_comp_wl_intern.h
+++ b/src/bin/server/e_comp_wl_intern.h
@@ -67,7 +67,7 @@ EINTERN void e_comp_wl_rect_convert_inverse(int width, int height, int transform
 
 EINTERN void     e_comp_wl_feed_focus_in(E_Client *ec);
 
-EINTERN Eina_Bool e_comp_wl_commit_sync_client_geometry_add(E_Client *ec, uint32_t serial, int32_t x, int32_t y, int32_t w, int32_t h);
+EINTERN Eina_Bool e_comp_wl_commit_sync_client_geometry_add(E_Client *ec, int32_t x, int32_t y, int32_t w, int32_t h);
 EINTERN Eina_Bool e_comp_wl_commit_sync_configure(E_Client *ec);
 
 EINTERN void        e_comp_wl_surface_state_init(E_Comp_Wl_Surface_State *state);
@@ -102,8 +102,6 @@ EINTERN void      e_comp_wl_client_subsurface_commit_from_cache(E_Client *ec);
 EINTERN Eina_Bool e_comp_wl_move_resize_init(void);
 EINTERN void      e_comp_wl_move_resize_shutdown(void);
 
-EINTERN void      e_comp_wl_trace_serial_debug(Eina_Bool on);
-
 EINTERN void      e_comp_wl_surface_mouse_button_send(E_Comp_Wl_Data *comp_wl, struct wl_resource *surface, uint32_t timestamp, uint32_t button_id, uint32_t state);
 EINTERN void      e_comp_wl_surface_mouse_wheel_send(E_Comp_Wl_Data *comp_wl, struct wl_resource *surface, int direction, int z, int timestamp);
 EINTERN void      e_comp_wl_surface_device_renew_axis(const char *dev_name, Evas_Device_Class dev_class, struct wl_resource *surface, unsigned int idx, double radius_x, double radius_y, double pressure, double angle);

diff --git a/src/bin/server/e_policy_wl.c b/src/bin/server/e_policy_wl.c
index 69e9799273c477b6795089558f49ca958cff9a8d..22c8a61b6541bc0d43b6fbd796a5d945ce652795 100644 (file)
--- a/src/bin/server/e_policy_wl.c
+++ b/src/bin/server/e_policy_wl.c
@@ -672,10 +672,10 @@ _tzpos_iface_cb_set(struct wl_client *client EINA_UNUSED, struct wl_resource *re
           {
              // if there is geometry pending list, add move job at the end of the list.
              // so client to be applied new position at the same time with the pending requests
-             // pending geometries are flushed when 'wl surface commit' and matched serial are delivered.
+             // pending geometries are flushed when 'wl surface commit' and matched geometry are delivered.
              int w, h;
              e_client_pending_geometry_last_geometry_get(ec, NULL, NULL, &w, &h);
-             e_comp_wl_commit_sync_client_geometry_add(ec, ec->surface_sync.serial, x, y, w, h);
+             e_comp_wl_commit_sync_client_geometry_add(ec, x, y, w, h);
           }
         else
           {

diff --git a/src/include/e_client.h b/src/include/e_client.h
index f3c10e4bca7a721e0f5a33fae588c2600fcd8a88..0066419f6dc80028702520b1280ef4a9bb894a1e 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -352,7 +352,7 @@ struct _E_Event_Client_Rotation_Geometry_Set
 struct _E_Client_Pending_Geometry
 {
    int                           x, y, w, h;
-   unsigned int                  serial;
+   E_DEPRECATED unsigned int                  serial;
 };
 
 struct _E_Client
@@ -781,7 +781,7 @@ struct _E_Client
    struct
    {
       Eina_Bool    wait_commit : 1;
-      unsigned int serial;
+      E_DEPRECATED unsigned int serial;
       Eina_List   *pending_geometry; // E_Client_Pending_Geometry
    } surface_sync;
 

diff --git a/src/include/e_info_shared_types.h b/src/include/e_info_shared_types.h
index 050fcc403ec864a495f3e36a6e281712c42d4c70..19a1bd772dd29b5f09896d0a0e7aa48290e1d2cf 100644 (file)
--- a/src/include/e_info_shared_types.h
+++ b/src/include/e_info_shared_types.h
@@ -371,8 +371,7 @@ typedef enum
    "\t           key_input_ttrace_enable\n"      \
    "Example:\n"                                  \
    "\twinfo -log input_log_enable 1\n"           \
-   "\twinfo -log key_input_ttrace_enable 1\n"    \
-   "\twinfo -log buffer_serial_log_enable 1\n"
+   "\twinfo -log key_input_ttrace_enable 1\n"
 
 /* -------------------------------------------------------------------------- */
 /* VIDEO SHELL                                                                */