devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8fd255c45c48aa3bd0659524238cfaf92985691f
commit 8fd255c45c48aa3bd0659524238cfaf92985691f
Author: Christopher Michael <devilho...@comcast.net>
Date: Mon Mar 1 10:35:15 2021 -0500
e_comp_wl: Remove wayland wobbly windows stuffs
This never worked properly, is unsupported by upstream wayland, and
just general clutter so let's remove it. There are no plans to support
this and is just extra overhead...
---
src/bin/e_comp_wl.c | 16 ----------
src/bin/e_comp_wl.h | 9 ------
src/bin/e_comp_wl_extensions.c | 72 ------------------------------------------
3 files changed, 97 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 67f5f591e..123cd5906 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -5,8 +5,6 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-#include "www-server-protocol.h"
-
#define COMPOSITOR_VERSION 4
E_API int E_EVENT_WAYLAND_GLOBAL_ADD = -1;
@@ -757,20 +755,6 @@ _e_comp_wl_evas_cb_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_U
Eina_List *l;
if (e_object_is_del(E_OBJECT(ec))) return;
- if (ec->comp_data->www.surface)
- {
- if (ec->comp_data->moved)
- {
- if ((!ec->maximized) && (!ec->fullscreen) &&
(!ec->comp_data->maximizing) && (!ec->maximize_override))
- www_surface_send_status(ec->comp_data->www.surface,
- ec->x - ec->comp_data->www.x, ec->y - ec->comp_data->www.y,
lround(ecore_loop_time_get()));
- else if (ec->comp_data->maximizing || ec->maximize_override)
- www_surface_send_status(ec->comp_data->www.surface,
- ec->w / 3, ec->h / 3, lround(ecore_loop_time_get()));
- }
- ec->comp_data->www.x = ec->x;
- ec->comp_data->www.y = ec->y;
- }
ec->comp_data->moved = 1;
EINA_LIST_FOREACH(ec->comp_data->sub.list, l, sec)
{
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index f9b29b5dd..a18746c5d 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -109,10 +109,6 @@ typedef struct E_Comp_Wl_Extension_Data
{
struct wl_global *global;
} session_recovery;
- struct
- {
- struct wl_global *global;
- } www;
/* begin xdg-foreign */
struct
{
@@ -330,11 +326,6 @@ struct _E_Comp_Wl_Client_Data
int fs_zone;
} set;
} shell;
- struct
- {
- struct wl_resource *surface;
- int x, y;
- } www;
E_Comp_Wl_Surface_State pending;
diff --git a/src/bin/e_comp_wl_extensions.c b/src/bin/e_comp_wl_extensions.c
index 241ba107c..7de8de268 100644
--- a/src/bin/e_comp_wl_extensions.c
+++ b/src/bin/e_comp_wl_extensions.c
@@ -1,16 +1,13 @@
#define E_COMP_WL
#include "e.h"
-
#include <uuid.h>
#include "session-recovery-server-protocol.h"
-#include "www-server-protocol.h"
#include "xdg-foreign-unstable-v1-server-protocol.h"
#include "relative-pointer-unstable-v1-server-protocol.h"
#include "pointer-constraints-unstable-v1-server-protocol.h"
#include "action_route-server-protocol.h"
-
/* mutter uses 32, seems reasonable */
#define HANDLE_LEN 32
@@ -51,18 +48,12 @@ static void
_e_comp_wl_extensions_client_move_begin(void *d EINA_UNUSED, E_Client *ec)
{
if (e_client_has_xwindow(ec) || e_object_is_del(E_OBJECT(ec))) return;
-
- if (ec->comp_data->www.surface)
- www_surface_send_start_drag(ec->comp_data->www.surface);
}
static void
_e_comp_wl_extensions_client_move_end(void *d EINA_UNUSED, E_Client *ec)
{
if (e_client_has_xwindow(ec) || e_object_is_del(E_OBJECT(ec))) return;
-
- if (ec->comp_data->www.surface)
- www_surface_send_end_drag(ec->comp_data->www.surface);
}
static void
@@ -133,62 +124,6 @@ _e_comp_wl_session_recovery_destroy_uuid(struct wl_client
*client EINA_UNUSED, s
e_remember_apply(ec->sr_remember, ec);
}
-static void
-_e_comp_wl_www_surface_del(struct wl_resource *res)
-{
- E_Client *ec;
-
- ec = wl_resource_get_user_data(res);
- if (!e_object_is_del(E_OBJECT(ec)))
- {
- ec->comp_data->www.surface = NULL;
- ec->comp_data->maximize_anims_disabled = 0;
- }
- ec->maximize_anims_disabled = 0;
- e_object_unref(E_OBJECT(ec));
-}
-
-static void
-_e_comp_wl_www_surface_destroy(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource)
-{
- wl_resource_destroy(resource);
-}
-
-static const struct www_surface_interface _e_www_surface_interface =
-{
- _e_comp_wl_www_surface_destroy,
-};
-
-static void
-_e_comp_wl_www_cb_create(struct wl_client *client, struct wl_resource
*resource, uint32_t id, struct wl_resource *surface)
-{
- struct wl_resource *ww;
- E_Client *ec;
-
- ec = wl_resource_get_user_data(surface);
- if (ec->comp_data->www.surface)
- {
- wl_resource_post_error(resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "Surface already created www_surface");
- return;
- }
- ww = wl_resource_create(client, &www_surface_interface, 1, id);
- if (!ww)
- {
- ERR("Could not create www_surface!");
- wl_client_post_no_memory(client);
- return;
- }
- wl_resource_set_implementation(ww, &_e_www_surface_interface, NULL,
_e_comp_wl_www_surface_del);
- wl_resource_set_user_data(ww, ec);
- ec->comp_data->www.surface = ww;
- ec->comp_data->www.x = ec->x;
- ec->comp_data->www.y = ec->y;
- ec->comp_data->maximize_anims_disabled = ec->maximize_anims_disabled = 1;
- e_object_ref(E_OBJECT(ec));
-}
-
///////////////////////////////////////////////////////
static void
@@ -922,11 +857,6 @@ static const struct zwp_e_session_recovery_interface
_e_session_recovery_interfa
_e_comp_wl_session_recovery_destroy_uuid,
};
-static const struct www_interface _e_www_interface =
-{
- _e_comp_wl_www_cb_create
-};
-
static const struct zxdg_exporter_v1_interface _e_zxdg_exporter_v1_interface =
{
_e_comp_wl_zxdg_exporter_v1_exporter_destroy,
@@ -983,7 +913,6 @@ _e_comp_wl_##NAME##_cb_bind(struct wl_client *client, void
*data EINA_UNUSED, ui
}
GLOBAL_BIND_CB(session_recovery, zwp_e_session_recovery_interface)
-GLOBAL_BIND_CB(www, www_interface)
GLOBAL_BIND_CB(zxdg_exporter_v1, zxdg_exporter_v1_interface)
GLOBAL_BIND_CB(zxdg_importer_v1, zxdg_importer_v1_interface)
GLOBAL_BIND_CB(zwp_relative_pointer_manager_v1,
zwp_relative_pointer_manager_v1_interface)
@@ -1079,7 +1008,6 @@ e_comp_wl_extensions_init(void)
/* try to add session_recovery to wayland globals */
GLOBAL_CREATE_OR_RETURN(session_recovery, zwp_e_session_recovery_interface,
1);
- GLOBAL_CREATE_OR_RETURN(www, www_interface, 1);
GLOBAL_CREATE_OR_RETURN(zxdg_exporter_v1, zxdg_exporter_v1_interface, 1);
e_comp_wl->extensions->zxdg_exporter_v1.surfaces =
eina_hash_string_superfast_new(NULL);
GLOBAL_CREATE_OR_RETURN(zxdg_importer_v1, zxdg_importer_v1_interface, 1);
--
