meta-agl/recipes-graphics/wayland/weston/0015-window-client-remove-ivi-application-support.patch

   1 index c37cd00b..f30ddbe9 100644
   2 --- a/Makefile.am
   3 +++ b/Makefile.am
   4 @@ -665,8 +665,6 @@ nodist_libtoytoolkit_la_SOURCES =                   \
   5         protocol/viewporter-client-protocol.h           \
   6         protocol/xdg-shell-unstable-v6-protocol.c                       \
   7         protocol/xdg-shell-unstable-v6-client-protocol.h                \
   8 -       protocol/ivi-application-protocol.c             \
   9 -       protocol/ivi-application-client-protocol.h      \
  10         protocol/pointer-constraints-unstable-v1-protocol.c             \
  11         protocol/pointer-constraints-unstable-v1-client-protocol.h      \
  12         protocol/relative-pointer-unstable-v1-protocol.c                \
  13 diff --git a/clients/window.c b/clients/window.c
  14 index 95796d46..aac43abd 100644
  15 --- a/clients/window.c
  16 +++ b/clients/window.c
  17 @@ -82,10 +82,6 @@ typedef void *EGLContext;
  18
  19  #include "window.h"
  20
  21 -#include <sys/types.h>
  22 -#include "ivi-application-client-protocol.h"
  23 -#define IVI_SURFACE_ID 9000
  24 -
  25  #define ZWP_RELATIVE_POINTER_MANAGER_V1_VERSION 1
  26  #define ZWP_POINTER_CONSTRAINTS_V1_VERSION 1
  27
  28 @@ -107,7 +103,6 @@ struct display {
  29         struct wl_data_device_manager *data_device_manager;
  30         struct text_cursor_position *text_cursor_position;
  31         struct zxdg_shell_v6 *xdg_shell;
  32 -       struct ivi_application *ivi_application; /* ivi style shell */
  33         struct zwp_relative_pointer_manager_v1 *relative_pointer_manager;
  34         struct zwp_pointer_constraints_v1 *pointer_constraints;
  35         EGLDisplay dpy;
  36 @@ -269,8 +264,6 @@ struct window {
  37         struct window *parent;
  38         struct window *last_parent;
  39
  40 -       struct ivi_surface *ivi_surface;
  41 -
  42         struct window_frame *frame;
  43
  44         /* struct surface::link, contains also main_surface */
  45 @@ -1441,19 +1434,6 @@ window_get_display(struct window *window)
  46         return window->display;
  47  }
  48
  49 -static void
  50 -handle_ivi_surface_configure(void *data, struct ivi_surface *ivi_surface,
  51 -                             int32_t width, int32_t height)
  52 -{
  53 -       struct window *window = data;
  54 -
  55 -       window_schedule_resize(window, width, height);
  56 -}
  57 -
  58 -static const struct ivi_surface_listener ivi_surface_listener = {
  59 -        handle_ivi_surface_configure,
  60 -};
  61 -
  62  static void
  63  surface_create_surface(struct surface *surface, uint32_t flags)
  64  {
  65 @@ -1604,9 +1584,6 @@ window_destroy(struct window *window)
  66         if (window->xdg_surface)
  67                 zxdg_surface_v6_destroy(window->xdg_surface);
  68
  69 -       if (window->ivi_surface)
  70 -               ivi_surface_destroy(window->ivi_surface);
  71 -
  72         surface_destroy(window->main_surface);
  73
  74         wl_list_remove(&window->link);
  75 @@ -5200,7 +5177,7 @@ window_create_internal(struct display *display, int custom)
  76         surface = surface_create(window);
  77         window->main_surface = surface;
  78
  79 -       assert(custom || display->xdg_shell || display->ivi_application);
  80 +       assert(custom || display->xdg_shell);
  81
  82         window->custom = custom;
  83         window->preferred_format = WINDOW_PREFERRED_FORMAT_NONE;
  84 @@ -5220,7 +5197,6 @@ struct window *
  85  window_create(struct display *display)
  86  {
  87         struct window *window;
  88 -       uint32_t id_ivisurf;
  89
  90         window = window_create_internal(display, 0);
  91
  92 @@ -5243,16 +5219,6 @@ window_create(struct display *display)
  93                 window_inhibit_redraw(window);
  94
  95                 wl_surface_commit(window->main_surface->surface);
  96 -       } else if (display->ivi_application) {
  97 -               /* auto generation of ivi_id based on process id + basement of id */
  98 -               id_ivisurf = IVI_SURFACE_ID + (uint32_t)getpid();
  99 -               window->ivi_surface =
 100 -                       ivi_application_surface_create(display->ivi_application,
 101 -                                                      id_ivisurf, window->main_surface->surface);
 102 -               fail_on_null(window->ivi_surface, 0, __FILE__, __LINE__);
 103 -
 104 -               ivi_surface_add_listener(window->ivi_surface,
 105 -                                        &ivi_surface_listener, window);
 106         }
 107
 108         return window;
 109 @@ -6013,11 +5979,6 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t id,
 110                         wl_registry_bind(registry, id,
 111                                          &wl_subcompositor_interface, 1);
 112         }
 113 -       else if (strcmp(interface, "ivi_application") == 0) {
 114 -               d->ivi_application =
 115 -                       wl_registry_bind(registry, id,
 116 -                                        &ivi_application_interface, 1);
 117 -       }
 118
 119         if (d->global_handler)
 120                 d->global_handler(d, id, interface, version, d->user_data);
 121 @@ -6316,9 +6277,6 @@ display_destroy(struct display *display)
 122         if (display->xdg_shell)
 123                 zxdg_shell_v6_destroy(display->xdg_shell);
 124
 125 -       if (display->ivi_application)
 126 -               ivi_application_destroy(display->ivi_application);
 127 -
 128         if (display->shm)
 129                 wl_shm_destroy(display->shm);
 130