desktop-shell: Split out input-panel code
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 4 Dec 2013 19:00:19 +0000 (11:00 -0800)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 4 Dec 2013 19:03:24 +0000 (11:03 -0800)
desktop-shell/Makefile.am
desktop-shell/input-panel.c [new file with mode: 0644]
desktop-shell/shell.c
desktop-shell/shell.h

index f49bfae..509c3af 100644 (file)
@@ -19,6 +19,7 @@ desktop_shell_la_SOURCES =                    \
        shell.h                                 \
        shell.c                                 \
        exposay.c                               \
+       input-panel.c                           \
        desktop-shell-protocol.c                \
        desktop-shell-server-protocol.h         \
        xdg-shell-protocol.c                    \
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
new file mode 100644 (file)
index 0000000..d97d073
--- /dev/null
@@ -0,0 +1,364 @@
+/*
+ * Copyright © 2010-2012 Intel Corporation
+ * Copyright © 2011-2012 Collabora, Ltd.
+ * Copyright © 2013 Raspberry Pi Foundation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "shell.h"
+#include "desktop-shell-server-protocol.h"
+#include "input-method-server-protocol.h"
+
+struct input_panel_surface {
+       struct wl_resource *resource;
+       struct wl_signal destroy_signal;
+
+       struct desktop_shell *shell;
+
+       struct wl_list link;
+       struct weston_surface *surface;
+       struct weston_view *view;
+       struct wl_listener surface_destroy_listener;
+
+       struct weston_output *output;
+       uint32_t panel;
+};
+
+static void
+show_input_panels(struct wl_listener *listener, void *data)
+{
+       struct desktop_shell *shell =
+               container_of(listener, struct desktop_shell,
+                            show_input_panel_listener);
+       struct input_panel_surface *ipsurf, *next;
+
+       shell->text_input.surface = (struct weston_surface*)data;
+
+       if (shell->showing_input_panels)
+               return;
+
+       shell->showing_input_panels = true;
+
+       if (!shell->locked)
+               wl_list_insert(&shell->panel_layer.link,
+                              &shell->input_panel_layer.link);
+
+       wl_list_for_each_safe(ipsurf, next,
+                             &shell->input_panel.surfaces, link) {
+               if (!ipsurf->surface->buffer_ref.buffer)
+                       continue;
+               wl_list_insert(&shell->input_panel_layer.view_list,
+                              &ipsurf->view->layer_link);
+               weston_view_geometry_dirty(ipsurf->view);
+               weston_view_update_transform(ipsurf->view);
+               weston_surface_damage(ipsurf->surface);
+               weston_slide_run(ipsurf->view, ipsurf->surface->height,
+                                0, NULL, NULL);
+       }
+}
+
+static void
+hide_input_panels(struct wl_listener *listener, void *data)
+{
+       struct desktop_shell *shell =
+               container_of(listener, struct desktop_shell,
+                            hide_input_panel_listener);
+       struct weston_view *view, *next;
+
+       if (!shell->showing_input_panels)
+               return;
+
+       shell->showing_input_panels = false;
+
+       if (!shell->locked)
+               wl_list_remove(&shell->input_panel_layer.link);
+
+       wl_list_for_each_safe(view, next,
+                             &shell->input_panel_layer.view_list, layer_link)
+               weston_view_unmap(view);
+}
+
+static void
+update_input_panels(struct wl_listener *listener, void *data)
+{
+       struct desktop_shell *shell =
+               container_of(listener, struct desktop_shell,
+                            update_input_panel_listener);
+
+       memcpy(&shell->text_input.cursor_rectangle, data, sizeof(pixman_box32_t));
+}
+
+static void
+input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
+{
+       struct input_panel_surface *ip_surface = surface->configure_private;
+       struct desktop_shell *shell = ip_surface->shell;
+       float x, y;
+       uint32_t show_surface = 0;
+
+       if (surface->width == 0)
+               return;
+
+       if (!weston_surface_is_mapped(surface)) {
+               if (!shell->showing_input_panels)
+                       return;
+
+               show_surface = 1;
+       }
+
+       fprintf(stderr, "%s panel: %d, output: %p\n", __FUNCTION__, ip_surface->panel, ip_surface->output);
+
+       if (ip_surface->panel) {
+               x = get_default_view(shell->text_input.surface)->geometry.x + shell->text_input.cursor_rectangle.x2;
+               y = get_default_view(shell->text_input.surface)->geometry.y + shell->text_input.cursor_rectangle.y2;
+       } else {
+               x = ip_surface->output->x + (ip_surface->output->width - surface->width) / 2;
+               y = ip_surface->output->y + ip_surface->output->height - surface->height;
+       }
+
+       weston_view_set_position(ip_surface->view, x, y);
+
+       if (show_surface) {
+               wl_list_insert(&shell->input_panel_layer.view_list,
+                              &ip_surface->view->layer_link);
+               weston_view_update_transform(ip_surface->view);
+               weston_surface_damage(surface);
+               weston_slide_run(ip_surface->view, ip_surface->view->surface->height, 0, NULL, NULL);
+       }
+}
+
+static void
+destroy_input_panel_surface(struct input_panel_surface *input_panel_surface)
+{
+       wl_signal_emit(&input_panel_surface->destroy_signal, input_panel_surface);
+
+       wl_list_remove(&input_panel_surface->surface_destroy_listener.link);
+       wl_list_remove(&input_panel_surface->link);
+
+       input_panel_surface->surface->configure = NULL;
+       weston_view_destroy(input_panel_surface->view);
+
+       free(input_panel_surface);
+}
+
+static struct input_panel_surface *
+get_input_panel_surface(struct weston_surface *surface)
+{
+       if (surface->configure == input_panel_configure) {
+               return surface->configure_private;
+       } else {
+               return NULL;
+       }
+}
+
+static void
+input_panel_handle_surface_destroy(struct wl_listener *listener, void *data)
+{
+       struct input_panel_surface *ipsurface = container_of(listener,
+                                                            struct input_panel_surface,
+                                                            surface_destroy_listener);
+
+       if (ipsurface->resource) {
+               wl_resource_destroy(ipsurface->resource);
+       } else {
+               destroy_input_panel_surface(ipsurface);
+       }
+}
+
+static struct input_panel_surface *
+create_input_panel_surface(struct desktop_shell *shell,
+                          struct weston_surface *surface)
+{
+       struct input_panel_surface *input_panel_surface;
+
+       input_panel_surface = calloc(1, sizeof *input_panel_surface);
+       if (!input_panel_surface)
+               return NULL;
+
+       surface->configure = input_panel_configure;
+       surface->configure_private = input_panel_surface;
+
+       input_panel_surface->shell = shell;
+
+       input_panel_surface->surface = surface;
+       input_panel_surface->view = weston_view_create(surface);
+
+       wl_signal_init(&input_panel_surface->destroy_signal);
+       input_panel_surface->surface_destroy_listener.notify = input_panel_handle_surface_destroy;
+       wl_signal_add(&surface->destroy_signal,
+                     &input_panel_surface->surface_destroy_listener);
+
+       wl_list_init(&input_panel_surface->link);
+
+       return input_panel_surface;
+}
+
+static void
+input_panel_surface_set_toplevel(struct wl_client *client,
+                                struct wl_resource *resource,
+                                struct wl_resource *output_resource,
+                                uint32_t position)
+{
+       struct input_panel_surface *input_panel_surface =
+               wl_resource_get_user_data(resource);
+       struct desktop_shell *shell = input_panel_surface->shell;
+
+       wl_list_insert(&shell->input_panel.surfaces,
+                      &input_panel_surface->link);
+
+       input_panel_surface->output = wl_resource_get_user_data(output_resource);
+       input_panel_surface->panel = 0;
+}
+
+static void
+input_panel_surface_set_overlay_panel(struct wl_client *client,
+                                     struct wl_resource *resource)
+{
+       struct input_panel_surface *input_panel_surface =
+               wl_resource_get_user_data(resource);
+       struct desktop_shell *shell = input_panel_surface->shell;
+
+       wl_list_insert(&shell->input_panel.surfaces,
+                      &input_panel_surface->link);
+
+       input_panel_surface->panel = 1;
+}
+
+static const struct wl_input_panel_surface_interface input_panel_surface_implementation = {
+       input_panel_surface_set_toplevel,
+       input_panel_surface_set_overlay_panel
+};
+
+static void
+destroy_input_panel_surface_resource(struct wl_resource *resource)
+{
+       struct input_panel_surface *ipsurf =
+               wl_resource_get_user_data(resource);
+
+       destroy_input_panel_surface(ipsurf);
+}
+
+static void
+input_panel_get_input_panel_surface(struct wl_client *client,
+                                   struct wl_resource *resource,
+                                   uint32_t id,
+                                   struct wl_resource *surface_resource)
+{
+       struct weston_surface *surface =
+               wl_resource_get_user_data(surface_resource);
+       struct desktop_shell *shell = wl_resource_get_user_data(resource);
+       struct input_panel_surface *ipsurf;
+
+       if (get_input_panel_surface(surface)) {
+               wl_resource_post_error(surface_resource,
+                                      WL_DISPLAY_ERROR_INVALID_OBJECT,
+                                      "wl_input_panel::get_input_panel_surface already requested");
+               return;
+       }
+
+       ipsurf = create_input_panel_surface(shell, surface);
+       if (!ipsurf) {
+               wl_resource_post_error(surface_resource,
+                                      WL_DISPLAY_ERROR_INVALID_OBJECT,
+                                      "surface->configure already set");
+               return;
+       }
+
+       ipsurf->resource =
+               wl_resource_create(client,
+                                  &wl_input_panel_surface_interface, 1, id);
+       wl_resource_set_implementation(ipsurf->resource,
+                                      &input_panel_surface_implementation,
+                                      ipsurf,
+                                      destroy_input_panel_surface_resource);
+}
+
+static const struct wl_input_panel_interface input_panel_implementation = {
+       input_panel_get_input_panel_surface
+};
+
+static void
+unbind_input_panel(struct wl_resource *resource)
+{
+       struct desktop_shell *shell = wl_resource_get_user_data(resource);
+
+       shell->input_panel.binding = NULL;
+}
+
+static void
+bind_input_panel(struct wl_client *client,
+             void *data, uint32_t version, uint32_t id)
+{
+       struct desktop_shell *shell = data;
+       struct wl_resource *resource;
+
+       resource = wl_resource_create(client,
+                                     &wl_input_panel_interface, 1, id);
+
+       if (shell->input_panel.binding == NULL) {
+               wl_resource_set_implementation(resource,
+                                              &input_panel_implementation,
+                                              shell, unbind_input_panel);
+               shell->input_panel.binding = resource;
+               return;
+       }
+
+       wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+                              "interface object already bound");
+       wl_resource_destroy(resource);
+}
+
+void
+input_panel_destroy(struct desktop_shell *shell)
+{
+       wl_list_remove(&shell->show_input_panel_listener.link);
+       wl_list_remove(&shell->hide_input_panel_listener.link);
+}
+
+int
+input_panel_setup(struct desktop_shell *shell)
+{
+       struct weston_compositor *ec = shell->compositor;
+
+       shell->show_input_panel_listener.notify = show_input_panels;
+       wl_signal_add(&ec->show_input_panel_signal,
+                     &shell->show_input_panel_listener);
+       shell->hide_input_panel_listener.notify = hide_input_panels;
+       wl_signal_add(&ec->hide_input_panel_signal,
+                     &shell->hide_input_panel_listener);
+       shell->update_input_panel_listener.notify = update_input_panels;
+       wl_signal_add(&ec->update_input_panel_signal,
+                     &shell->update_input_panel_listener);
+
+       wl_list_init(&shell->input_panel.surfaces);
+
+       if (wl_global_create(shell->compositor->wl_display,
+                            &wl_input_panel_interface, 1,
+                            shell, bind_input_panel) == NULL)
+               return -1;
+
+       return 0;
+}
index 47f6a59..de54e37 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "shell.h"
 #include "desktop-shell-server-protocol.h"
-#include "input-method-server-protocol.h"
 #include "workspaces-server-protocol.h"
 #include "../shared/config-parser.h"
 #include "xdg-shell-server-protocol.h"
@@ -53,21 +52,6 @@ struct focus_state {
        struct wl_listener surface_destroy_listener;
 };
 
-struct input_panel_surface {
-       struct wl_resource *resource;
-       struct wl_signal destroy_signal;
-
-       struct desktop_shell *shell;
-
-       struct wl_list link;
-       struct weston_surface *surface;
-       struct weston_view *view;
-       struct wl_listener surface_destroy_listener;
-
-       struct weston_output *output;
-       uint32_t panel;
-};
-
 struct shell_output {
        struct desktop_shell  *shell;
        struct weston_output  *output;
@@ -4735,70 +4719,6 @@ wake_handler(struct wl_listener *listener, void *data)
 }
 
 static void
-show_input_panels(struct wl_listener *listener, void *data)
-{
-       struct desktop_shell *shell =
-               container_of(listener, struct desktop_shell,
-                            show_input_panel_listener);
-       struct input_panel_surface *ipsurf, *next;
-
-       shell->text_input.surface = (struct weston_surface*)data;
-
-       if (shell->showing_input_panels)
-               return;
-
-       shell->showing_input_panels = true;
-
-       if (!shell->locked)
-               wl_list_insert(&shell->panel_layer.link,
-                              &shell->input_panel_layer.link);
-
-       wl_list_for_each_safe(ipsurf, next,
-                             &shell->input_panel.surfaces, link) {
-               if (!ipsurf->surface->buffer_ref.buffer)
-                       continue;
-               wl_list_insert(&shell->input_panel_layer.view_list,
-                              &ipsurf->view->layer_link);
-               weston_view_geometry_dirty(ipsurf->view);
-               weston_view_update_transform(ipsurf->view);
-               weston_surface_damage(ipsurf->surface);
-               weston_slide_run(ipsurf->view, ipsurf->surface->height,
-                                0, NULL, NULL);
-       }
-}
-
-static void
-hide_input_panels(struct wl_listener *listener, void *data)
-{
-       struct desktop_shell *shell =
-               container_of(listener, struct desktop_shell,
-                            hide_input_panel_listener);
-       struct weston_view *view, *next;
-
-       if (!shell->showing_input_panels)
-               return;
-
-       shell->showing_input_panels = false;
-
-       if (!shell->locked)
-               wl_list_remove(&shell->input_panel_layer.link);
-
-       wl_list_for_each_safe(view, next,
-                             &shell->input_panel_layer.view_list, layer_link)
-               weston_view_unmap(view);
-}
-
-static void
-update_input_panels(struct wl_listener *listener, void *data)
-{
-       struct desktop_shell *shell =
-               container_of(listener, struct desktop_shell,
-                            update_input_panel_listener);
-
-       memcpy(&shell->text_input.cursor_rectangle, data, sizeof(pixman_box32_t));
-}
-
-static void
 center_on_output(struct weston_view *view, struct weston_output *output)
 {
        int32_t surf_x, surf_y, width, height;
@@ -5233,226 +5153,6 @@ bind_screensaver(struct wl_client *client,
        wl_resource_destroy(resource);
 }
 
-static void
-input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
-{
-       struct input_panel_surface *ip_surface = surface->configure_private;
-       struct desktop_shell *shell = ip_surface->shell;
-       float x, y;
-       uint32_t show_surface = 0;
-
-       if (surface->width == 0)
-               return;
-
-       if (!weston_surface_is_mapped(surface)) {
-               if (!shell->showing_input_panels)
-                       return;
-
-               show_surface = 1;
-       }
-
-       fprintf(stderr, "%s panel: %d, output: %p\n", __FUNCTION__, ip_surface->panel, ip_surface->output);
-
-       if (ip_surface->panel) {
-               x = get_default_view(shell->text_input.surface)->geometry.x + shell->text_input.cursor_rectangle.x2;
-               y = get_default_view(shell->text_input.surface)->geometry.y + shell->text_input.cursor_rectangle.y2;
-       } else {
-               x = ip_surface->output->x + (ip_surface->output->width - surface->width) / 2;
-               y = ip_surface->output->y + ip_surface->output->height - surface->height;
-       }
-
-       weston_view_set_position(ip_surface->view, x, y);
-
-       if (show_surface) {
-               wl_list_insert(&shell->input_panel_layer.view_list,
-                              &ip_surface->view->layer_link);
-               weston_view_update_transform(ip_surface->view);
-               weston_surface_damage(surface);
-               weston_slide_run(ip_surface->view, ip_surface->view->surface->height, 0, NULL, NULL);
-       }
-}
-
-static void
-destroy_input_panel_surface(struct input_panel_surface *input_panel_surface)
-{
-       wl_signal_emit(&input_panel_surface->destroy_signal, input_panel_surface);
-
-       wl_list_remove(&input_panel_surface->surface_destroy_listener.link);
-       wl_list_remove(&input_panel_surface->link);
-
-       input_panel_surface->surface->configure = NULL;
-       weston_view_destroy(input_panel_surface->view);
-
-       free(input_panel_surface);
-}
-
-static struct input_panel_surface *
-get_input_panel_surface(struct weston_surface *surface)
-{
-       if (surface->configure == input_panel_configure) {
-               return surface->configure_private;
-       } else {
-               return NULL;
-       }
-}
-
-static void
-input_panel_handle_surface_destroy(struct wl_listener *listener, void *data)
-{
-       struct input_panel_surface *ipsurface = container_of(listener,
-                                                            struct input_panel_surface,
-                                                            surface_destroy_listener);
-
-       if (ipsurface->resource) {
-               wl_resource_destroy(ipsurface->resource);
-       } else {
-               destroy_input_panel_surface(ipsurface);
-       }
-}
-
-static struct input_panel_surface *
-create_input_panel_surface(struct desktop_shell *shell,
-                          struct weston_surface *surface)
-{
-       struct input_panel_surface *input_panel_surface;
-
-       input_panel_surface = calloc(1, sizeof *input_panel_surface);
-       if (!input_panel_surface)
-               return NULL;
-
-       surface->configure = input_panel_configure;
-       surface->configure_private = input_panel_surface;
-
-       input_panel_surface->shell = shell;
-
-       input_panel_surface->surface = surface;
-       input_panel_surface->view = weston_view_create(surface);
-
-       wl_signal_init(&input_panel_surface->destroy_signal);
-       input_panel_surface->surface_destroy_listener.notify = input_panel_handle_surface_destroy;
-       wl_signal_add(&surface->destroy_signal,
-                     &input_panel_surface->surface_destroy_listener);
-
-       wl_list_init(&input_panel_surface->link);
-
-       return input_panel_surface;
-}
-
-static void
-input_panel_surface_set_toplevel(struct wl_client *client,
-                                struct wl_resource *resource,
-                                struct wl_resource *output_resource,
-                                uint32_t position)
-{
-       struct input_panel_surface *input_panel_surface =
-               wl_resource_get_user_data(resource);
-       struct desktop_shell *shell = input_panel_surface->shell;
-
-       wl_list_insert(&shell->input_panel.surfaces,
-                      &input_panel_surface->link);
-
-       input_panel_surface->output = wl_resource_get_user_data(output_resource);
-       input_panel_surface->panel = 0;
-}
-
-static void
-input_panel_surface_set_overlay_panel(struct wl_client *client,
-                                     struct wl_resource *resource)
-{
-       struct input_panel_surface *input_panel_surface =
-               wl_resource_get_user_data(resource);
-       struct desktop_shell *shell = input_panel_surface->shell;
-
-       wl_list_insert(&shell->input_panel.surfaces,
-                      &input_panel_surface->link);
-
-       input_panel_surface->panel = 1;
-}
-
-static const struct wl_input_panel_surface_interface input_panel_surface_implementation = {
-       input_panel_surface_set_toplevel,
-       input_panel_surface_set_overlay_panel
-};
-
-static void
-destroy_input_panel_surface_resource(struct wl_resource *resource)
-{
-       struct input_panel_surface *ipsurf =
-               wl_resource_get_user_data(resource);
-
-       destroy_input_panel_surface(ipsurf);
-}
-
-static void
-input_panel_get_input_panel_surface(struct wl_client *client,
-                                   struct wl_resource *resource,
-                                   uint32_t id,
-                                   struct wl_resource *surface_resource)
-{
-       struct weston_surface *surface =
-               wl_resource_get_user_data(surface_resource);
-       struct desktop_shell *shell = wl_resource_get_user_data(resource);
-       struct input_panel_surface *ipsurf;
-
-       if (get_input_panel_surface(surface)) {
-               wl_resource_post_error(surface_resource,
-                                      WL_DISPLAY_ERROR_INVALID_OBJECT,
-                                      "wl_input_panel::get_input_panel_surface already requested");
-               return;
-       }
-
-       ipsurf = create_input_panel_surface(shell, surface);
-       if (!ipsurf) {
-               wl_resource_post_error(surface_resource,
-                                      WL_DISPLAY_ERROR_INVALID_OBJECT,
-                                      "surface->configure already set");
-               return;
-       }
-
-       ipsurf->resource =
-               wl_resource_create(client,
-                                  &wl_input_panel_surface_interface, 1, id);
-       wl_resource_set_implementation(ipsurf->resource,
-                                      &input_panel_surface_implementation,
-                                      ipsurf,
-                                      destroy_input_panel_surface_resource);
-}
-
-static const struct wl_input_panel_interface input_panel_implementation = {
-       input_panel_get_input_panel_surface
-};
-
-static void
-unbind_input_panel(struct wl_resource *resource)
-{
-       struct desktop_shell *shell = wl_resource_get_user_data(resource);
-
-       shell->input_panel.binding = NULL;
-}
-
-static void
-bind_input_panel(struct wl_client *client,
-             void *data, uint32_t version, uint32_t id)
-{
-       struct desktop_shell *shell = data;
-       struct wl_resource *resource;
-
-       resource = wl_resource_create(client,
-                                     &wl_input_panel_interface, 1, id);
-
-       if (shell->input_panel.binding == NULL) {
-               wl_resource_set_implementation(resource,
-                                              &input_panel_implementation,
-                                              shell, unbind_input_panel);
-               shell->input_panel.binding = resource;
-               return;
-       }
-
-       wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
-                              "interface object already bound");
-       wl_resource_destroy(resource);
-}
-
 struct switcher {
        struct desktop_shell *shell;
        struct weston_surface *current;
@@ -5939,8 +5639,8 @@ shell_destroy(struct wl_listener *listener, void *data)
 
        wl_list_remove(&shell->idle_listener.link);
        wl_list_remove(&shell->wake_listener.link);
-       wl_list_remove(&shell->show_input_panel_listener.link);
-       wl_list_remove(&shell->hide_input_panel_listener.link);
+
+       input_panel_destroy(shell);
 
        wl_list_for_each_safe(shell_output, tmp, &shell->output_list, link) {
                wl_list_remove(&shell_output->destroy_listener.link);
@@ -6068,12 +5768,7 @@ module_init(struct weston_compositor *ec,
        wl_signal_add(&ec->idle_signal, &shell->idle_listener);
        shell->wake_listener.notify = wake_handler;
        wl_signal_add(&ec->wake_signal, &shell->wake_listener);
-       shell->show_input_panel_listener.notify = show_input_panels;
-       wl_signal_add(&ec->show_input_panel_signal, &shell->show_input_panel_listener);
-       shell->hide_input_panel_listener.notify = hide_input_panels;
-       wl_signal_add(&ec->hide_input_panel_signal, &shell->hide_input_panel_listener);
-       shell->update_input_panel_listener.notify = update_input_panels;
-       wl_signal_add(&ec->update_input_panel_signal, &shell->update_input_panel_listener);
+
        ec->ping_handler = ping_handler;
        ec->shell_interface.shell = shell;
        ec->shell_interface.create_shell_surface = create_shell_surface;
@@ -6086,8 +5781,6 @@ module_init(struct weston_compositor *ec,
        ec->shell_interface.resize = surface_resize;
        ec->shell_interface.set_title = set_title;
 
-       wl_list_init(&shell->input_panel.surfaces);
-
        weston_layer_init(&shell->fullscreen_layer, &ec->cursor_layer.link);
        weston_layer_init(&shell->panel_layer, &shell->fullscreen_layer.link);
        weston_layer_init(&shell->background_layer, &shell->panel_layer.link);
@@ -6097,6 +5790,9 @@ module_init(struct weston_compositor *ec,
        wl_array_init(&shell->workspaces.array);
        wl_list_init(&shell->workspaces.client_list);
 
+       if (input_panel_setup(shell) < 0)
+               return -1;
+
        shell_configuration(shell);
 
        shell->exposay.state_cur = EXPOSAY_LAYOUT_INACTIVE;
@@ -6134,10 +5830,6 @@ module_init(struct weston_compositor *ec,
                             shell, bind_screensaver) == NULL)
                return -1;
 
-       if (wl_global_create(ec->wl_display, &wl_input_panel_interface, 1,
-                                 shell, bind_input_panel) == NULL)
-               return -1;
-
        if (wl_global_create(ec->wl_display, &workspace_manager_interface, 1,
                             shell, bind_workspace_manager) == NULL)
                return -1;
index 17419e3..d7c34fc 100644 (file)
@@ -210,3 +210,7 @@ void
 exposay_binding(struct weston_seat *seat,
                enum weston_keyboard_modifier modifier,
                void *data);
+int
+input_panel_setup(struct desktop_shell *shell);
+void
+input_panel_destroy(struct desktop_shell *shell);