devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=350b65fc21fb413ea69b07d8dc12510eae38e846
commit 350b65fc21fb413ea69b07d8dc12510eae38e846
Author: Christopher Michael <devilho...@comcast.net>
Date: Mon Mar 1 10:32:08 2021 -0500
ecore_wl2: Remove wayland wobbly windows stuffs
This cleans up the www mess that never worked properly and is
unsupported with no plans to ever be used
---
src/lib/ecore_wl2/ecore_wl2_display.c | 10 -----
src/lib/ecore_wl2/ecore_wl2_private.h | 21 -----------
src/lib/ecore_wl2/ecore_wl2_window.c | 69 -----------------------------------
3 files changed, 100 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 7344cf8b74..efaa25363c 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -307,15 +307,6 @@ _cb_global_add(void *data, struct wl_registry *registry,
unsigned int id, const
ewd->wl.data_device_manager =
wl_registry_bind(registry, id, &wl_data_device_manager_interface,
ewd->wl.data_device_manager_version);
}
- else if ((eina_streq(interface, "www")) &&
- (getenv("EFL_WAYLAND_ENABLE_WWW")))
- {
- Ecore_Wl2_Window *window;
-
- ewd->wl.www = wl_registry_bind(registry, id, &www_interface, 1);
- EINA_INLIST_FOREACH(ewd->windows, window)
- _ecore_wl2_window_www_surface_init(window);
- }
else if ((!strcmp(interface, "zwp_e_session_recovery")) &&
(!no_session_recovery))
{
@@ -452,7 +443,6 @@ _ecore_wl2_display_globals_cleanup(Ecore_Wl2_Display *ewd)
{
if (ewd->wl.session_recovery)
zwp_e_session_recovery_destroy(ewd->wl.session_recovery);
- if (ewd->wl.www) www_destroy(ewd->wl.www);
if (ewd->wl.xdg_wm_base) xdg_wm_base_destroy(ewd->wl.xdg_wm_base);
if (ewd->wl.zxdg_shell) zxdg_shell_v6_destroy(ewd->wl.zxdg_shell);
if (ewd->wl.shm) wl_shm_destroy(ewd->wl.shm);
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index e4d19bd1e0..0a662e7884 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -5,7 +5,6 @@
# include "Ecore_Wl2.h"
# include "Ecore_Input.h"
# include <xkbcommon/xkbcommon-compose.h>
-# include "www-client-protocol.h"
# include "ecore_wl2_internal.h"
# define EFL_TEAMWORK_VERSION 2
@@ -91,7 +90,6 @@ struct _Ecore_Wl2_Display
struct zwp_linux_dmabuf_v1 *dmabuf;
struct zxdg_shell_v6 *zxdg_shell;
struct xdg_wm_base *xdg_wm_base;
- struct www *www;
struct zwp_e_session_recovery *session_recovery;
struct efl_aux_hints *efl_aux_hints;
struct zwp_teamwork *teamwork;
@@ -182,7 +180,6 @@ struct _Ecore_Wl2_Window
struct wl_surface *surface;
void *buffer;
struct wl_callback *callback;
- struct www_surface *www_surface;
struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel;
struct xdg_popup *xdg_popup;
@@ -529,20 +526,6 @@ struct _Ecore_Wl2_Input
Eina_List *devices_list;
};
-typedef struct Ecore_Wl2_Event_Window_WWW
-{
- Ecore_Wl2_Window *window;
- int x_rel;
- int y_rel;
- uint32_t timestamp;
-} Ecore_Wl2_Event_Window_WWW;
-
-typedef struct Ecore_Wl2_Event_Window_WWW_Drag
-{
- Ecore_Wl2_Window *window;
- Eina_Bool dragging;
-} Ecore_Wl2_Event_Window_WWW_Drag;
-
typedef struct _Buffer_Handle Buffer_Handle;
typedef struct _Ecore_Wl2_Buffer
{
@@ -573,9 +556,6 @@ typedef struct _Ecore_Wl2_Surface
Eina_Bool alpha : 1;
} Ecore_Wl2_Surface;
-EAPI extern int _ecore_wl2_event_window_www;
-EAPI extern int _ecore_wl2_event_window_www_drag;
-
Ecore_Wl2_Window *_ecore_wl2_display_window_surface_find(Ecore_Wl2_Display
*display, struct wl_surface *wl_surface);
void _display_event_free(void *d, void *event EINA_UNUSED);
@@ -605,7 +585,6 @@ void _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf);
void _ecore_wl2_window_surface_create(Ecore_Wl2_Window *window);
void _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window);
-void _ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window);
void _ecore_wl2_offer_unref(Ecore_Wl2_Offer *offer);
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index e11e2e30a3..8c018ebd38 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -28,10 +28,6 @@ _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window)
if (window->zxdg_surface) zxdg_surface_v6_destroy(window->zxdg_surface);
window->zxdg_surface = NULL;
- if (window->www_surface)
- www_surface_destroy(window->www_surface);
- window->www_surface = NULL;
-
if (window->surface) wl_surface_destroy(window->surface);
window->surface = NULL;
window->surface_id = -1;
@@ -131,70 +127,6 @@ _configure_complete(Ecore_Wl2_Window *window)
#include "window_v6.x"
-static void
-_www_surface_end_drag(void *data, struct www_surface *www_surface EINA_UNUSED)
-{
- Ecore_Wl2_Window *window = data;
- Ecore_Wl2_Event_Window_WWW_Drag *ev;
-
- ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW_Drag));
- EINA_SAFETY_ON_NULL_RETURN(ev);
- ev->window = window;
- ev->dragging = 0;
-
- ecore_event_add(_ecore_wl2_event_window_www_drag, ev, NULL, NULL);
-}
-
-static void
-_www_surface_start_drag(void *data, struct www_surface *www_surface
EINA_UNUSED)
-{
- Ecore_Wl2_Window *window = data;
- Ecore_Wl2_Event_Window_WWW_Drag *ev;
-
- ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW_Drag));
- EINA_SAFETY_ON_NULL_RETURN(ev);
- ev->window = window;
- ev->dragging = 1;
-
- ecore_event_add(_ecore_wl2_event_window_www_drag, ev, NULL, NULL);
-}
-
-static void
-_www_surface_status(void *data, struct www_surface *www_surface EINA_UNUSED,
int32_t x_rel, int32_t y_rel, uint32_t timestamp)
-{
- Ecore_Wl2_Window *window = data;
- Ecore_Wl2_Event_Window_WWW *ev;
-
- ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW));
- EINA_SAFETY_ON_NULL_RETURN(ev);
- ev->window = window;
- ev->x_rel = x_rel;
- ev->y_rel = y_rel;
- ev->timestamp = timestamp;
-
- ecore_event_add(_ecore_wl2_event_window_www, ev, NULL, NULL);
-}
-
-static struct www_surface_listener _www_surface_listener =
-{
- .status = _www_surface_status,
- .start_drag = _www_surface_start_drag,
- .end_drag = _www_surface_end_drag,
-};
-
-void
-_ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window)
-{
- if (!window->surface) return;
- if (!window->display->wl.www) return;
- if (window->www_surface) return;
- window->www_surface = www_create(window->display->wl.www, window->surface);
- www_surface_set_user_data(window->www_surface, window);
- www_surface_add_listener(window->www_surface, &_www_surface_listener,
- window);
-}
-
-
static void
_xdg_surface_cb_configure(void *data, struct xdg_surface *xdg_surface
EINA_UNUSED, uint32_t serial)
{
@@ -639,7 +571,6 @@ ecore_wl2_window_show(Ecore_Wl2_Window *window)
(window->type != ECORE_WL2_WINDOW_TYPE_NONE))
{
_ecore_wl2_window_shell_surface_init(window);
- _ecore_wl2_window_www_surface_init(window);
_ecore_wl2_window_show_send(window);
}
else
--
