ecore_wl2: Remove wl_shell client support

We're never going to encounter a compositor without at least xdg v5
support, so remove wl_shell support.

diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 2905bc0..c45306f 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -286,7 +286,6 @@ _recovery_timer_add(Ecore_Wl2_Display *ewd)
    if (ewd->wl.www) www_destroy(ewd->wl.www);
    if (ewd->wl.zxdg_shell) zxdg_shell_v6_destroy(ewd->wl.zxdg_shell);
    if (ewd->wl.xdg_shell) xdg_shell_destroy(ewd->wl.xdg_shell);
-   if (ewd->wl.wl_shell) wl_shell_destroy(ewd->wl.wl_shell);
    if (ewd->wl.shm) wl_shm_destroy(ewd->wl.shm);
    if (ewd->wl.data_device_manager)
      wl_data_device_manager_destroy(ewd->wl.data_device_manager);
@@ -434,7 +433,6 @@ _ecore_wl2_shell_bind(Ecore_Wl2_Display *ewd)
      {
         "zxdg_shell_v6",
         "xdg_shell",
-        "wl_shell",
         NULL
      };
 
@@ -449,14 +447,7 @@ _ecore_wl2_shell_bind(Ecore_Wl2_Display *ewd)
 
    if (!global) return;
 
-   if (!strcmp(global->interface, "wl_shell"))
-     {
-        ewd->wl.wl_shell =
-          wl_registry_bind(ewd->wl.registry, global->id,
-                           &wl_shell_interface, 1);
-        ewd->shell_done = EINA_TRUE;
-     }
-   else if ((!strcmp(global->interface, "xdg_shell")) &&
+   if ((!strcmp(global->interface, "xdg_shell")) &&
             (!getenv("EFL_WAYLAND_DONT_USE_XDG_SHELL")))
      {
         Ecore_Wl2_Window *window;
@@ -587,7 +578,6 @@ _ecore_wl2_display_cleanup(Ecore_Wl2_Display *ewd)
    if (ewd->wl.www) www_destroy(ewd->wl.www);
    if (ewd->wl.zxdg_shell) zxdg_shell_v6_destroy(ewd->wl.zxdg_shell);
    if (ewd->wl.xdg_shell) xdg_shell_destroy(ewd->wl.xdg_shell);
-   if (ewd->wl.wl_shell) wl_shell_destroy(ewd->wl.wl_shell);
    if (ewd->wl.shm) wl_shm_destroy(ewd->wl.shm);
    if (ewd->wl.data_device_manager)
      wl_data_device_manager_destroy(ewd->wl.data_device_manager);

diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 4d810a6..636ddf9 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -854,16 +854,12 @@ _keyboard_cb_enter(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigne
 
    input->focus.keyboard = window;
    window->input = input;
-
-   if (window->wl_shell_surface)
-     _ecore_wl2_input_focus_in_send(window);
 }
 
 static void
-_keyboard_cb_leave(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigned int serial, struct wl_surface *surface)
+_keyboard_cb_leave(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigned int serial, struct wl_surface *surface EINA_UNUSED)
 {
    Ecore_Wl2_Input *input;
-   Ecore_Wl2_Window *window;
 
    input = data;
    if (!input) return;
@@ -876,11 +872,6 @@ _keyboard_cb_leave(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigne
    if (input->repeat.timer) ecore_timer_del(input->repeat.timer);
    input->repeat.timer = NULL;
    input->focus.keyboard = NULL;
-
-   /* find the window which this surface belongs to */
-   window = _ecore_wl2_display_window_surface_find(input->display, surface);
-   if ((window) && (window->wl_shell_surface))
-     _ecore_wl2_input_focus_out_send(window);
 }
 
 static Eina_Bool

diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 05d4254..90fa3a5 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -88,7 +88,6 @@ struct _Ecore_Wl2_Display
         int data_device_manager_version;
         struct wl_shm *shm;
         struct zwp_linux_dmabuf_v1 *dmabuf;
-        struct wl_shell *wl_shell;
         struct xdg_shell *xdg_shell;
         struct zxdg_shell_v6 *zxdg_shell;
         struct www *www;
@@ -147,7 +146,6 @@ struct _Ecore_Wl2_Window
    const char *class;
 
    struct wl_surface *surface;
-   struct wl_shell_surface *wl_shell_surface;
    struct xdg_surface *xdg_surface;
    struct xdg_popup *xdg_popup;
    struct www_surface *www_surface;

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 35ddd25..fff93c4 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -22,10 +22,6 @@ _ecore_wl_window_semi_free(Ecore_Wl2_Window *window)
    if (window->xdg_popup) xdg_popup_destroy(window->xdg_popup);
    window->xdg_popup = NULL;
 
-   if (window->wl_shell_surface)
-     wl_shell_surface_destroy(window->wl_shell_surface);
-   window->wl_shell_surface = NULL;
-
    if (window->www_surface)
      www_surface_destroy(window->www_surface);
    window->www_surface = NULL;
@@ -58,39 +54,6 @@ _ecore_wl2_window_configure_send(Ecore_Wl2_Window *window, int w, int h, unsigne
 }
 
 static void
-_wl_shell_surface_cb_ping(void *data EINA_UNUSED, struct wl_shell_surface *shell_surface, unsigned int serial)
-{
-   wl_shell_surface_pong(shell_surface, serial);
-}
-
-static void
-_wl_shell_surface_cb_configure(void *data, struct wl_shell_surface *shell_surface EINA_UNUSED, unsigned int edges, int w, int h)
-{
-   Ecore_Wl2_Window *win = data;
-
-   _ecore_wl2_window_configure_send(win, w, h, edges, win->fullscreen,
-                                    win->maximized);
-}
-
-static void
-_wl_shell_surface_cb_popup_done(void *data EINA_UNUSED, struct wl_shell_surface *shell_surface EINA_UNUSED)
-{
-   Ecore_Wl2_Window *win;
-
-   win = data;
-   if (!win) return;
-
-   _ecore_wl2_input_ungrab(win->input);
-}
-
-static const struct wl_shell_surface_listener _wl_shell_surface_listener =
-{
-   _wl_shell_surface_cb_ping,
-   _wl_shell_surface_cb_configure,
-   _wl_shell_surface_cb_popup_done
-};
-
-static void
 _xdg_popup_cb_done(void *data, struct xdg_popup *xdg_popup EINA_UNUSED)
 {
    Ecore_Wl2_Window *win;
@@ -375,15 +338,6 @@ _ecore_wl2_window_type_set(Ecore_Wl2_Window *win)
                   xdg_popup_add_listener(win->xdg_popup,
                                          &_xdg_popup_listener, win);
                }
-             else if (win->wl_shell_surface)
-               {
-                  wl_shell_surface_set_popup(win->wl_shell_surface,
-                                             input->wl.seat,
-                                             wl_display_get_serial(win->display->wl.display),
-                                             win->parent->surface,
-                                             win->geometry.x,
-                                             win->geometry.y, 0);
-               }
           }
         break;
       case ECORE_WL2_WINDOW_TYPE_TOPLEVEL:
@@ -400,8 +354,6 @@ _ecore_wl2_window_type_set(Ecore_Wl2_Window *win)
           }
         else if (win->xdg_surface)
           xdg_surface_set_parent(win->xdg_surface, NULL);
-        else if (win->wl_shell_surface)
-          wl_shell_surface_set_toplevel(win->wl_shell_surface);
         break;
       default:
         break;
@@ -525,23 +477,6 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window)
         window->pending.configure = EINA_FALSE;
         _ecore_wl2_window_type_set(window);
      }
-   else if ((window->display->wl.wl_shell) && (!window->wl_shell_surface))
-     {
-        window->wl_shell_surface =
-          wl_shell_get_shell_surface(window->display->wl.wl_shell,
-                                     window->surface);
-        if (!window->wl_shell_surface) goto surf_err;
-
-        if (window->title)
-          wl_shell_surface_set_title(window->wl_shell_surface, window->title);
-        if (window->class)
-          wl_shell_surface_set_class(window->wl_shell_surface, window->class);
-
-        wl_shell_surface_add_listener(window->wl_shell_surface,
-                                      &_wl_shell_surface_listener, window);
-        window->pending.configure = EINA_FALSE;
-        _ecore_wl2_window_type_set(window);
-     }
 
    if (window->display->wl.session_recovery)
      {
@@ -765,9 +700,6 @@ ecore_wl2_window_move(Ecore_Wl2_Window *window, int x EINA_UNUSED, int y EINA_UN
    else if (window->xdg_surface)
      xdg_surface_move(window->xdg_surface, input->wl.seat,
                       window->display->serial);
-   else if (window->wl_shell_surface)
-     wl_shell_surface_move(window->wl_shell_surface, input->wl.seat,
-                           window->display->serial);
 }
 
 EAPI void
@@ -791,9 +723,6 @@ ecore_wl2_window_resize(Ecore_Wl2_Window *window, int w EINA_UNUSED, int h EINA_
    else if (window->xdg_surface)
      xdg_surface_resize(window->xdg_surface, input->wl.seat,
                         window->display->serial, location);
-   else if (window->wl_shell_surface)
-     wl_shell_surface_resize(window->wl_shell_surface, input->wl.seat,
-                             window->display->serial, location);
 }
 
 EAPI void
@@ -827,8 +756,6 @@ ecore_wl2_window_raise(Ecore_Wl2_Window *window)
                                   &states, 0);
         wl_array_release(&states);
      }
-   else if (window->wl_shell_surface)
-     wl_shell_surface_set_toplevel(window->wl_shell_surface);
 }
 
 EAPI Eina_Bool
@@ -1033,9 +960,6 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized)
    maximized = !!maximized;
    if (prev == maximized) return;
 
-   if (window->wl_shell_surface)
-     window->maximized = maximized;
-
    if (maximized)
      {
         window->saved = window->geometry;
@@ -1044,8 +968,6 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized)
           zxdg_toplevel_v6_set_maximized(window->zxdg_toplevel);
         else if (window->xdg_surface)
           xdg_surface_set_maximized(window->xdg_surface);
-        else if (window->wl_shell_surface)
-          wl_shell_surface_set_maximized(window->wl_shell_surface, NULL);
      }
    else
      {
@@ -1053,15 +975,6 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized)
           zxdg_toplevel_v6_unset_maximized(window->zxdg_toplevel);
         else if (window->xdg_surface)
           xdg_surface_unset_maximized(window->xdg_surface);
-        else if (window->wl_shell_surface)
-          {
-             wl_shell_surface_set_toplevel(window->wl_shell_surface);
-
-             _ecore_wl2_window_configure_send(window, window->saved.w,
-                                              window->saved.h, 0,
-                                              window->fullscreen,
-                                              window->maximized);
-          }
      }
 }
 
@@ -1084,9 +997,6 @@ ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen)
    fullscreen = !!fullscreen;
    if (prev == fullscreen) return;
 
-   if (window->wl_shell_surface)
-     window->fullscreen = fullscreen;
-
    if (fullscreen)
      {
         window->saved = window->geometry;
@@ -1095,10 +1005,6 @@ ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen)
           zxdg_toplevel_v6_set_fullscreen(window->zxdg_toplevel, NULL);
         else if (window->xdg_surface)
           xdg_surface_set_fullscreen(window->xdg_surface, NULL);
-        else if (window->wl_shell_surface)
-          wl_shell_surface_set_fullscreen(window->wl_shell_surface,
-                                          WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
-                                          0, NULL);
      }
    else
      {
@@ -1106,15 +1012,6 @@ ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen)
           zxdg_toplevel_v6_unset_fullscreen(window->zxdg_toplevel);
         else if (window->xdg_surface)
           xdg_surface_unset_fullscreen(window->xdg_surface);
-        else if (window->wl_shell_surface)
-          {
-             wl_shell_surface_set_toplevel(window->wl_shell_surface);
-
-             _ecore_wl2_window_configure_send(window, window->saved.w,
-                                              window->saved.h, 0,
-                                              window->fullscreen,
-                                              window->maximized);
-          }
      }
 }
 
@@ -1146,8 +1043,6 @@ ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title)
      zxdg_toplevel_v6_set_title(window->zxdg_toplevel, window->title);
    else if (window->xdg_surface)
      xdg_surface_set_title(window->xdg_surface, window->title);
-   else if (window->wl_shell_surface)
-     wl_shell_surface_set_title(window->wl_shell_surface, window->title);
 }
 
 EAPI void
@@ -1162,8 +1057,6 @@ ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas)
      zxdg_toplevel_v6_set_app_id(window->zxdg_toplevel, window->class);
    else if (window->xdg_surface)
      xdg_surface_set_app_id(window->xdg_surface, window->class);
-   else if (window->wl_shell_surface)
-     wl_shell_surface_set_class(window->wl_shell_surface, window->class);
 }
 
 EAPI void
@@ -1382,6 +1275,5 @@ ecore_wl2_window_has_shell_surface(Ecore_Wl2_Window *window)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE);
 
-   return (window->xdg_surface ||
-           window->wl_shell_surface || window->zxdg_surface);
+   return (window->xdg_surface || window->zxdg_surface);
 }