desktop_shell: Improve logging

Change-Id: I24eb050c60c7da35c452f117288a8342bd4a9eb7

diff --git a/src/bin/server/e_comp_wl_shell.c b/src/bin/server/e_comp_wl_shell.c
index 27219a6e5869581430d4543ace839824794c62dc..95f75a75ae23b7246ebcc3fabd3040330c68ca03 100644 (file)
--- a/src/bin/server/e_comp_wl_shell.c
+++ b/src/bin/server/e_comp_wl_shell.c
@@ -119,8 +119,6 @@ e_shell_e_client_toplevel_set(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("SHELL", "Set toplevel", ec);
-
    /* set toplevel client properties */
    if (!ec->internal)
      ec->borderless = 1;
@@ -137,8 +135,6 @@ e_shell_e_client_popup_set(E_Client *ec)
    E_Comp *comp;
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("SHELL", "Set popup", ec);
-
    EC_CHANGED(ec);
    ec->new_client = ec->override = 1;
    e_client_unignore(ec);
@@ -349,8 +345,6 @@ e_shell_e_client_destroy(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("SHELL", "Destroy shell surface", ec);
-
    _e_shell_e_client_shsurface_api_reset(ec);
 
    /* remove this 'ec' from parent's transients list */

diff --git a/src/bin/server/e_desktop_shell.c b/src/bin/server/e_desktop_shell.c
index 0dab1c9352cc2f4e35c05bb77ae47ccac0d682b2..7566c13dc7fd4d67b90c725246fd333ddb2372f2 100644 (file)
--- a/src/bin/server/e_desktop_shell.c
+++ b/src/bin/server/e_desktop_shell.c
@@ -62,6 +62,8 @@ _shell_create(struct wl_display *display)
 static void
 _shell_destroy(E_Desktop_Shell *shell)
 {
+   INF("Destroy E_Desktop_Shell");
+
    wl_signal_emit(&shell->events.destroy, shell);
 
    if (shell->e_comp_wl_shell)
@@ -105,6 +107,8 @@ e_desktop_shell_create(struct wl_display *display)
    if (!shell->e_comp_wl_shell)
      goto err;
 
+   INF("Create E_Desktop_Shell");
+
    return shell;
 err:
    _shell_destroy(shell);
@@ -121,6 +125,8 @@ e_desktop_shell_display_get(E_Desktop_Shell *shell)
 EINTERN void
 e_desktop_shell_toplevel_add(E_Desktop_Shell *shell, E_Desktop_Toplevel *toplevel)
 {
+   ELOGF("TOPLEVEL", "New E_Desktop_Toplevel(%p)", toplevel->surface.ec, toplevel);
+
    wl_signal_emit(&shell->events.new_toplevel, toplevel);
 }
 
@@ -198,6 +204,8 @@ e_desktop_surface_configure_send(E_Desktop_Surface *surface, uint32_t edges, int
    if (!surface->iface)
      return;
 
+   ELOGF("SURFACE", "Send configure: edges(%d) width(%d) height(%d)", surface->ec, edges, width, height);
+
    surface->iface->configure_send(surface->iface, edges, width, height);
 }
 
@@ -207,6 +215,8 @@ e_desktop_surface_configure(E_Desktop_Surface *surface, int32_t x, int32_t y, in
    if (!surface->iface)
      return;
 
+   ELOGF("SURFACE", "Configure: %d,%d %dx%d", surface->ec, x, y, width, height);
+
    if (surface->iface->configure)
      surface->iface->configure(surface->iface, x, y, width, height);
    else
@@ -219,6 +229,8 @@ e_desktop_surface_map(E_Desktop_Surface *surface)
    if (!surface->iface)
      return;
 
+   ELOGF("SURFACE", "Map", surface->ec);
+
    if (surface->iface->map)
      surface->iface->map(surface->iface);
    else
@@ -231,6 +243,8 @@ e_desktop_surface_unmap(E_Desktop_Surface *surface)
    if (!surface->iface)
      return;
 
+   ELOGF("SURFACE", "Unmap", surface->ec);
+
    if (surface->iface->unmap)
      surface->iface->unmap(surface->iface);
    else
@@ -249,11 +263,15 @@ e_desktop_toplevel_init(E_Desktop_Toplevel *toplevel, E_Desktop_Surface_Interfac
 {
    _surface_init(&toplevel->surface, e_surface, iface);
    _toplevel_init(toplevel, shell_surface_resource);
+
+   ELOGF("TOPLEVEL", "Initialize E_Desktop_Toplevel(%p)", toplevel->surface.ec, toplevel);
 }
 
 EINTERN void
 e_desktop_toplevel_finish(E_Desktop_Toplevel *toplevel)
 {
+   ELOGF("TOPLEVEL", "Finish E_Desktop_Toplevel(%p)", toplevel->surface.ec, toplevel);
+
    _surface_finish(&toplevel->surface);
 }
 
@@ -272,12 +290,14 @@ e_desktop_toplevel_try_from_surface(E_Surface *e_surface)
 EINTERN void
 e_desktop_toplevel_title_set(E_Desktop_Toplevel *toplevel, const char *title)
 {
+   ELOGF("TOPLEVEL", "Set title: %s", toplevel->surface.ec, title ?: "(null)");
    e_shell_e_client_name_title_set(toplevel->surface.ec, title, title);
 }
 
 EINTERN void
 e_desktop_toplevel_app_id_set(E_Desktop_Toplevel *toplevel, const char *app_id)
 {
+   ELOGF("TOPLEVEL", "Set app_id: %s", toplevel->surface.ec, app_id ?: "(null)");
    e_shell_e_client_app_id_set(toplevel->surface.ec, app_id);
 }
 
@@ -289,6 +309,7 @@ e_desktop_toplevel_parent_set(E_Desktop_Toplevel *toplevel, E_Desktop_Toplevel *
    if (parent)
      epc = parent->surface.ec;
 
+   ELOGF("TOPLEVEL", "Set parent: ec(%p)", toplevel->surface.ec, epc);
    e_client_parent_set(toplevel->surface.ec, epc);
    EC_CHANGED(toplevel->surface.ec);
 }
@@ -296,12 +317,14 @@ e_desktop_toplevel_parent_set(E_Desktop_Toplevel *toplevel, E_Desktop_Toplevel *
 EINTERN void
 e_desktop_toplevel_interactive_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *seat_resource)
 {
+   ELOGF("TOPLEVEL", "Begin interactive move: seat_resource(%p)", toplevel->surface.ec, seat_resource);
    e_shell_e_client_interactive_move(toplevel->surface.ec, seat_resource);
 }
 
 EINTERN void
 e_desktop_toplevel_interactive_resize_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *toplevel_resource, struct wl_resource *seat_resource, int32_t edges)
 {
+   ELOGF("TOPLEVEL", "Begin interactive resize: seat_resource(%p), edges(%d)", toplevel->surface.ec, seat_resource, edges);
    e_shell_e_client_interactive_resize(toplevel->surface.ec, toplevel_resource, seat_resource, edges);
 }
 
@@ -310,6 +333,8 @@ e_desktop_toplevel_fullscreen_request(E_Desktop_Toplevel *toplevel)
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Request fullscreen: lock_user_fullscreen(%d)", ec, ec->lock_user_fullscreen);
+
    if (ec->lock_user_fullscreen)
      return;
 
@@ -321,6 +346,8 @@ e_desktop_toplevel_unfullscreen_request(E_Desktop_Toplevel *toplevel)
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Request unfullscreen: lock_user_fullscreen(%d)", ec, ec->lock_user_fullscreen);
+
    if (ec->lock_user_fullscreen)
      return;
 
@@ -333,6 +360,8 @@ e_desktop_toplevel_maximize_request(E_Desktop_Toplevel *toplevel)
    E_Client *ec = toplevel->surface.ec;
    E_Maximize max = ec->maximize_type | E_MAXIMIZE_BOTH;
 
+   ELOGF("TOPLEVEL", "Request maximize: lock_user_maximize(%d)", ec, ec->lock_user_maximize);
+
    if (ec->lock_user_maximize)
      return;
 
@@ -349,6 +378,8 @@ e_desktop_toplevel_unmaximize_request(E_Desktop_Toplevel *toplevel)
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Request unmaximize", ec);
+
    e_client_layout_apply(ec, EINA_FALSE);
 
    ec->maximize_dir = E_MAXIMIZE_DIRECTION_NONE;
@@ -361,6 +392,8 @@ e_desktop_toplevel_minimize_request(E_Desktop_Toplevel *toplevel)
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Request minimize: lock_client_iconify(%d)", ec, ec->lock_client_iconify);
+
    if (ec->lock_client_iconify)
      return;
 
@@ -370,6 +403,7 @@ e_desktop_toplevel_minimize_request(E_Desktop_Toplevel *toplevel)
 EINTERN void
 e_desktop_toplevel_window_geometry_set(E_Desktop_Toplevel *toplevel, int x, int y, int width, int height)
 {
+   ELOGF("TOPLEVEL", "Set window geometry: %d,%d %dx%d", toplevel->surface.ec, x, y, width, height);
    EINA_RECTANGLE_SET(&toplevel->surface.ec->comp_data->shell.window, x, y, width, height);
 }
 
@@ -378,6 +412,9 @@ e_desktop_toplevel_min_size_set(E_Desktop_Toplevel *toplevel, int width, int hei
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Set min size: lock_client_size(%d) size(%dx%d)",
+         toplevel->surface.ec, ec->lock_client_size, width, height);
+
    if (ec->lock_client_size)
      return;
 
@@ -390,6 +427,9 @@ e_desktop_toplevel_max_size_set(E_Desktop_Toplevel *toplevel, int width, int hei
 {
    E_Client *ec = toplevel->surface.ec;
 
+   ELOGF("TOPLEVEL", "Set max size: lock_client_size(%d) size(%dx%d)",
+         toplevel->surface.ec, ec->lock_client_size, width, height);
+
    if (ec->lock_client_size)
      return;
 

diff --git a/src/bin/server/e_desktop_xdg_shell_v6.c b/src/bin/server/e_desktop_xdg_shell_v6.c
index 6891e43c68eb4347f51bcfb0821659f792f12164..dba3fd7a5e6fe3548cf25966b3707bc80d64d1ec 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v6.c
+++ b/src/bin/server/e_desktop_xdg_shell_v6.c
@@ -210,8 +210,6 @@ _toplevel_client_parent_update(E_Desktop_Xdg_Toplevel_V6 *toplevel)
    if (toplevel->ds_toplevel->parent)
      parent = _toplevel_from_shell_surface_resource(toplevel->ds_toplevel->parent->base->resource);
 
-   LOG("toplevel_v6(%p) Set parent(%p)", toplevel, parent);
-
    e_desktop_toplevel_parent_set(&toplevel->base, parent ? &parent->base : NULL);
 }
 
@@ -220,8 +218,6 @@ _toplevel_title_update(E_Desktop_Xdg_Toplevel_V6 *toplevel)
 {
    char *title = toplevel->ds_toplevel->title;
 
-   LOG("toplevel_v6(%p) Set title: %s", toplevel, title ? title : "(null)");
-
    e_desktop_toplevel_title_set(&toplevel->base, title);
 }
 
@@ -230,16 +226,12 @@ _toplevel_app_id_update(E_Desktop_Xdg_Toplevel_V6 *toplevel)
 {
    char *app_id = toplevel->ds_toplevel->app_id;
 
-   LOG("toplevel_v6(%p) Set app_id: %s", toplevel, app_id ? app_id : "(null)");
-
    e_desktop_toplevel_app_id_set(&toplevel->base, app_id);
 }
 
 static void
 _toplevel_move_begin(E_Desktop_Xdg_Toplevel_V6 *toplevel, struct wl_resource *seat_resource)
 {
-   LOG("toplevel_v6(%p) Begin interactive move", toplevel);
-
    e_desktop_toplevel_interactive_move_begin(&toplevel->base, seat_resource);
 }
 
@@ -248,8 +240,6 @@ _toplevel_resize_begin(E_Desktop_Xdg_Toplevel_V6 *toplevel, struct wl_resource *
 {
    struct wl_resource *toplevel_resource = toplevel->ds_toplevel->resource;
 
-   LOG("toplevel_v6(%p) Begin interactive resize", toplevel);
-
    e_desktop_toplevel_interactive_resize_begin(&toplevel->base, toplevel_resource, seat_resource, edges);
 }
 
@@ -354,8 +344,6 @@ _toplevel_cb_request_maximize(struct wl_listener *listener, void *data)
 
    toplevel = wl_container_of(listener, toplevel, request_maximize);
 
-   LOG("toplevel_v6(%p) Request maximize(%d)", toplevel, toplevel->ds_toplevel->requested.maximized);
-
    if (toplevel->ds_toplevel->requested.maximized)
      e_desktop_toplevel_maximize_request(&toplevel->base);
    else
@@ -369,8 +357,6 @@ _toplevel_cb_request_fullscreen(struct wl_listener *listener, void *data)
 
    toplevel = wl_container_of(listener, toplevel, request_fullscreen);
 
-   LOG("toplevel_v6(%p) Request fullscreen(%d)", toplevel, toplevel->ds_toplevel->requested.fullscreen);
-
    if (toplevel->ds_toplevel->requested.fullscreen)
      e_desktop_toplevel_fullscreen_request(&toplevel->base);
    else
@@ -384,8 +370,6 @@ _toplevel_cb_request_minimize(struct wl_listener *listener, void *data)
 
    toplevel = wl_container_of(listener, toplevel, request_minimize);
 
-   LOG("toplevel_v6(%p) Set minimize", toplevel);
-
    e_desktop_toplevel_minimize_request(&toplevel->base);
 }