desktop_shell: Rename functions for improved readability

Change-Id: I0bb2fef5c2fbf00cf436878d2864733dc9bf6526

diff --git a/src/bin/server/e_desktop_shell.c b/src/bin/server/e_desktop_shell.c
index 3dfae8347f744c33ebc6cd350b440c245be1687c..c8dad8dc89dde3b080a16e8798869fece52233ce 100644 (file)
--- a/src/bin/server/e_desktop_shell.c
+++ b/src/bin/server/e_desktop_shell.c
@@ -289,7 +289,7 @@ e_desktop_toplevel_parent_set(E_Desktop_Toplevel *toplevel, E_Desktop_Toplevel *
 }
 
 EINTERN void
-e_desktop_toplevel_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *seat_resource)
+e_desktop_toplevel_interactive_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *seat_resource)
 {
    E_Client *ec = e_surface_ec_get(toplevel->surface.surface);
 
@@ -297,7 +297,7 @@ e_desktop_toplevel_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *
 }
 
 EINTERN void
-e_desktop_toplevel_resize_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *toplevel_resource, struct wl_resource *seat_resource, int32_t edges)
+e_desktop_toplevel_interactive_resize_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *toplevel_resource, struct wl_resource *seat_resource, int32_t edges)
 {
    E_Client *ec = e_surface_ec_get(toplevel->surface.surface);
 
@@ -423,14 +423,19 @@ e_desktop_toplevel_is_activated(E_Desktop_Toplevel *toplevel)
 }
 
 EINTERN void
-e_desktop_toplevel_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height)
+e_desktop_toplevel_fullscreen_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height)
 {
    E_Client *ec = e_surface_ec_get(toplevel->surface.surface);
 
-   if (ec->fullscreen)
-     e_client_base_output_resolution_useful_geometry_get(ec, NULL, NULL, width, height);
-   else if (ec->maximized)
-     e_client_maximized_geometry_get(ec, NULL, NULL, width, height);
+   e_client_base_output_resolution_useful_geometry_get(ec, NULL, NULL, width, height);
+}
+
+EINTERN void
+e_desktop_toplevel_maximized_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height)
+{
+   E_Client *ec = e_surface_ec_get(toplevel->surface.surface);
+
+   e_client_maximized_geometry_get(ec, NULL, NULL, width, height);
 }
 
 EINTERN E_Client *

diff --git a/src/bin/server/e_desktop_shell_intern.h b/src/bin/server/e_desktop_shell_intern.h
index c3fb05efcb47869b74aa967c699e6fc3fd95d02c..8ca5ec2461c523b7267d046961040656b344a918 100644 (file)
--- a/src/bin/server/e_desktop_shell_intern.h
+++ b/src/bin/server/e_desktop_shell_intern.h
@@ -25,6 +25,5 @@ E_Client *e_desktop_toplevel_ec_get(E_Desktop_Toplevel *toplevel);
 bool e_desktop_toplevel_is_fullscreen(E_Desktop_Toplevel *toplevel);
 bool e_desktop_toplevel_is_maximized(E_Desktop_Toplevel *toplevel);
 bool e_desktop_toplevel_is_activated(E_Desktop_Toplevel *toplevel);
-void e_desktop_toplevel_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height);
 
 #endif

diff --git a/src/bin/server/e_desktop_shell_private.h b/src/bin/server/e_desktop_shell_private.h
index e9938e6a6b04879a138ac649fc931cb4b5b788aa..afddd3ed9a8510daed18cd3365bd477662a35e06 100644 (file)
--- a/src/bin/server/e_desktop_shell_private.h
+++ b/src/bin/server/e_desktop_shell_private.h
@@ -19,8 +19,8 @@ E_Desktop_Toplevel *e_desktop_shell_toplevel_create(E_Desktop_Shell *shell, E_Su
 void e_desktop_toplevel_title_set(E_Desktop_Toplevel *toplevel, const char *title);
 void e_desktop_toplevel_app_id_set(E_Desktop_Toplevel *toplevel, const char *app_id);
 void e_desktop_toplevel_parent_set(E_Desktop_Toplevel *toplevel, E_Desktop_Toplevel *parent);
-void e_desktop_toplevel_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *seat_resource);
-void e_desktop_toplevel_resize_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *toplevel_resource, struct wl_resource *seat_resource, int32_t edges);
+void e_desktop_toplevel_interactive_move_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *seat_resource);
+void e_desktop_toplevel_interactive_resize_begin(E_Desktop_Toplevel *toplevel, struct wl_resource *toplevel_resource, struct wl_resource *seat_resource, int32_t edges);
 void e_desktop_toplevel_fullscreen_request(E_Desktop_Toplevel *toplevel);
 void e_desktop_toplevel_unfullscreen_request(E_Desktop_Toplevel *toplevel);
 void e_desktop_toplevel_maximize_request(E_Desktop_Toplevel *toplevel);
@@ -29,5 +29,7 @@ void e_desktop_toplevel_minimize_request(E_Desktop_Toplevel *toplevel);
 void e_desktop_toplevel_window_geometry_set(E_Desktop_Toplevel *toplevel, int x, int y, int width, int height);
 void e_desktop_toplevel_min_size_set(E_Desktop_Toplevel *toplevel, int width, int height);
 void e_desktop_toplevel_max_size_set(E_Desktop_Toplevel *toplevel, int width, int height);
+void e_desktop_toplevel_fullscreen_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height);
+void e_desktop_toplevel_maximized_size_get(E_Desktop_Toplevel *toplevel, int32_t *width, int32_t *height);
 
 #endif

diff --git a/src/bin/server/e_desktop_xdg_shell_v6.c b/src/bin/server/e_desktop_xdg_shell_v6.c
index b0154dc4ef8cbc3bc871626a898d8af6b29541fa..4d9247ae2a1362fadff06ca852721a56c7d8a3f8 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v6.c
+++ b/src/bin/server/e_desktop_xdg_shell_v6.c
@@ -196,30 +196,29 @@ static void
 _toplevel_size_send(E_Desktop_Xdg_Toplevel_V6 *toplevel, int32_t width, int32_t height)
 {
    struct ds_xdg_toplevel_v6 *ds_toplevel = toplevel->ds_toplevel;
-   int32_t configure_width = 0, configure_height = 0;
-   int mw, mh;
-   bool fullscreen, maximized;
+   int32_t cw = 0, ch = 0;
 
-   fullscreen = e_desktop_toplevel_is_fullscreen(toplevel->toplevel);
-   maximized = e_desktop_toplevel_is_maximized(toplevel->toplevel);
-   if (fullscreen || maximized)
+   if (e_desktop_toplevel_is_fullscreen(toplevel->toplevel))
      {
-        e_desktop_toplevel_size_get(toplevel->toplevel, &mw, &mh);
+        e_desktop_toplevel_fullscreen_size_get(toplevel->toplevel, &cw, &ch);
         LOG("toplevel_v6(%p) FORCELY STAY current size (%d %d) of E_Client, requested size "
-            "is (%d %d), the state (maximize %d, fullscreen %d)",
-            toplevel, mw, mh, width, height, maximized, fullscreen);
-        configure_width = mw;
-        configure_height = mh;
+            "is (%d %d), the state: fullscreen", toplevel, cw, ch, width, height);
+     }
+   else if (e_desktop_toplevel_is_maximized(toplevel->toplevel))
+     {
+        e_desktop_toplevel_maximized_size_get(toplevel->toplevel, &cw, &ch);
+        LOG("toplevel_v6(%p) FORCELY STAY current size (%d %d) of E_Client, requested size "
+            "is (%d %d), the state: maximized", toplevel, cw, ch, width, height);
      }
    else if ((width != -1) && (height != -1))
      {
-        configure_width = width;
-        configure_height = height;
+        cw = width;
+        ch = height;
      }
 
-   LOG("toplevel_v6(%p) Send size(%dx%d)", toplevel, configure_width, configure_height);
+   LOG("toplevel_v6(%p) Send size(%dx%d)", toplevel, cw, ch);
 
-   ds_xdg_toplevel_v6_set_size(ds_toplevel, configure_width, configure_height);
+   ds_xdg_toplevel_v6_set_size(ds_toplevel, cw, ch);
 }
 
 static void
@@ -285,7 +284,7 @@ _toplevel_move_begin(E_Desktop_Xdg_Toplevel_V6 *toplevel, struct wl_resource *se
 {
    LOG("toplevel_v6(%p) Begin interactive move", toplevel);
 
-   e_desktop_toplevel_move_begin(toplevel->toplevel, seat_resource);
+   e_desktop_toplevel_interactive_move_begin(toplevel->toplevel, seat_resource);
 }
 
 static void
@@ -295,7 +294,7 @@ _toplevel_resize_begin(E_Desktop_Xdg_Toplevel_V6 *toplevel, struct wl_resource *
 
    LOG("toplevel_v6(%p) Begin interactive resize", toplevel);
 
-   e_desktop_toplevel_resize_begin(toplevel->toplevel, toplevel_resource, seat_resource, edges);
+   e_desktop_toplevel_interactive_resize_begin(toplevel->toplevel, toplevel_resource, seat_resource, edges);
 }
 
 static void