Split shell object out from compositor.c into its own file

1 files changed, 6 insertions, 448 deletions

diff --git a/compositor/compositor.c b/compositor/compositor.c
index cd13e4d..31f70cf 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -32,7 +32,7 @@
 #include <math.h>
 #include <linux/input.h>
 
-#include "wayland-server-protocol.h"
+#include "wayland-server.h"
 #include "compositor.h"
 
 /* The plan here is to generate a random anonymous socket name and
@@ -157,7 +157,7 @@ wlsc_surface_create(struct wlsc_compositor *compositor,
 	return surface;
 }
 
-static uint32_t
+uint32_t
 get_time(void)
 {
 	struct timeval tv;
@@ -359,7 +359,7 @@ wlsc_surface_raise(struct wlsc_surface *surface)
 	wl_list_insert(&compositor->surface_list, &surface->link);
 }
 
-static void
+void
 wlsc_surface_update_matrix(struct wlsc_surface *es)
 {
 	wlsc_matrix_init(&es->matrix);
@@ -511,7 +511,7 @@ wlsc_input_device_attach(struct wlsc_input_device *device,
 }
 
 
-static void
+void
 wlsc_input_device_set_pointer_image(struct wlsc_input_device *device,
 				    enum wlsc_pointer_type type)
 {
@@ -524,248 +524,6 @@ wlsc_input_device_set_pointer_image(struct wlsc_input_device *device,
 				 pointer_images[type].hotspot_y);
 }
 
-struct wlsc_move_grab {
-	struct wl_grab grab;
-	int32_t dx, dy;
-};
-
-static void
-move_grab_motion(struct wl_grab *grab,
-		   uint32_t time, int32_t x, int32_t y)
-{
-	struct wlsc_move_grab *move = (struct wlsc_move_grab *) grab;
-	struct wlsc_surface *es =
-		(struct wlsc_surface *) grab->input_device->pointer_focus;
-
-	es->x = x + move->dx;
-	es->y = y + move->dy;
-	wlsc_surface_update_matrix(es);
-}
-
-static void
-move_grab_button(struct wl_grab *grab,
-		 uint32_t time, int32_t button, int32_t state)
-{
-}
-
-static void
-move_grab_end(struct wl_grab *grab, uint32_t time)
-{
-	free(grab);
-}
-
-static const struct wl_grab_interface move_grab_interface = {
-	move_grab_motion,
-	move_grab_button,
-	move_grab_end
-};
-
-static void
-shell_move(struct wl_client *client, struct wl_shell *shell,
-	   struct wl_surface *surface,
-	   struct wl_input_device *device, uint32_t time)
-{
-	struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
-	struct wlsc_surface *es = (struct wlsc_surface *) surface;
-	struct wlsc_move_grab *move;
-
-	move = malloc(sizeof *move);
-	if (!move) {
-		wl_client_post_no_memory(client);
-		return;
-	}
-
-	move->grab.interface = &move_grab_interface;
-	move->dx = es->x - wd->input_device.grab_x;
-	move->dy = es->y - wd->input_device.grab_y;
-
-	if (wl_input_device_update_grab(&wd->input_device,
-					&move->grab, surface, time) < 0)
-		return;
-
-	wlsc_input_device_set_pointer_image(wd, WLSC_POINTER_DRAGGING);
-}
-
-struct wlsc_resize_grab {
-	struct wl_grab grab;
-	uint32_t edges;
-	int32_t dx, dy, width, height;
-};
-
-static void
-resize_grab_motion(struct wl_grab *grab,
-		   uint32_t time, int32_t x, int32_t y)
-{
-	struct wlsc_resize_grab *resize = (struct wlsc_resize_grab *) grab;
-	struct wl_input_device *device = grab->input_device;
-	struct wlsc_compositor *ec =
-		(struct wlsc_compositor *) device->compositor;
-	struct wl_surface *surface = device->pointer_focus;
-	int32_t width, height;
-
-	if (resize->edges & WL_GRAB_RESIZE_LEFT) {
-		width = device->grab_x - x + resize->width;
-	} else if (resize->edges & WL_GRAB_RESIZE_RIGHT) {
-		width = x - device->grab_x + resize->width;
-	} else {
-		width = resize->width;
-	}
-
-	if (resize->edges & WL_GRAB_RESIZE_TOP) {
-		height = device->grab_y - y + resize->height;
-	} else if (resize->edges & WL_GRAB_RESIZE_BOTTOM) {
-		height = y - device->grab_y + resize->height;
-	} else {
-		height = resize->height;
-	}
-
-	wl_client_post_event(surface->client, &ec->shell.object,
-			     WL_SHELL_CONFIGURE, time, resize->edges,
-			     surface, width, height);
-}
-
-static void
-resize_grab_button(struct wl_grab *grab,
-		   uint32_t time, int32_t button, int32_t state)
-{
-}
-
-static void
-resize_grab_end(struct wl_grab *grab, uint32_t time)
-{
-	free(grab);
-}
-
-static const struct wl_grab_interface resize_grab_interface = {
-	resize_grab_motion,
-	resize_grab_button,
-	resize_grab_end
-};
-
-static void
-shell_resize(struct wl_client *client, struct wl_shell *shell,
-	     struct wl_surface *surface,
-	     struct wl_input_device *device, uint32_t time, uint32_t edges)
-{
-	struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
-	struct wlsc_resize_grab *resize;
-	enum wlsc_pointer_type pointer = WLSC_POINTER_LEFT_PTR;
-	struct wlsc_surface *es = (struct wlsc_surface *) surface;
-
-	resize = malloc(sizeof *resize);
-	if (!resize) {
-		wl_client_post_no_memory(client);
-		return;
-	}
-
-	resize->grab.interface = &resize_grab_interface;
-	resize->edges = edges;
-	resize->dx = es->x - wd->input_device.grab_x;
-	resize->dy = es->y - wd->input_device.grab_y;
-	resize->width = es->width;
-	resize->height = es->height;
-
-	if (edges == 0 || edges > 15 ||
-	    (edges & 3) == 3 || (edges & 12) == 12)
-		return;
-
-	switch (edges) {
-	case WL_GRAB_RESIZE_TOP:
-		pointer = WLSC_POINTER_TOP;
-		break;
-	case WL_GRAB_RESIZE_BOTTOM:
-		pointer = WLSC_POINTER_BOTTOM;
-		break;
-	case WL_GRAB_RESIZE_LEFT:
-		pointer = WLSC_POINTER_LEFT;
-		break;
-	case WL_GRAB_RESIZE_TOP_LEFT:
-		pointer = WLSC_POINTER_TOP_LEFT;
-		break;
-	case WL_GRAB_RESIZE_BOTTOM_LEFT:
-		pointer = WLSC_POINTER_BOTTOM_LEFT;
-		break;
-	case WL_GRAB_RESIZE_RIGHT:
-		pointer = WLSC_POINTER_RIGHT;
-		break;
-	case WL_GRAB_RESIZE_TOP_RIGHT:
-		pointer = WLSC_POINTER_TOP_RIGHT;
-		break;
-	case WL_GRAB_RESIZE_BOTTOM_RIGHT:
-		pointer = WLSC_POINTER_BOTTOM_RIGHT;
-		break;
-	}
-
-	if (wl_input_device_update_grab(&wd->input_device,
-					&resize->grab, surface, time) < 0)
-		return;
-
-	wlsc_input_device_set_pointer_image(wd, pointer);
-}
-
-static void
-wl_drag_set_pointer_focus(struct wl_drag *drag,
-			  struct wl_surface *surface, uint32_t time,
-			  int32_t x, int32_t y, int32_t sx, int32_t sy);
-
-static void
-destroy_drag(struct wl_resource *resource, struct wl_client *client)
-{
-	struct wl_drag *drag =
-		container_of(resource, struct wl_drag, resource);
-
-	wl_list_remove(&drag->drag_focus_listener.link);
-	if (drag->grab.input_device)
-		wl_input_device_end_grab(drag->grab.input_device, get_time());
-
-	free(drag);
-}
-
-const static struct wl_drag_interface drag_interface;
-
-static void
-drag_handle_surface_destroy(struct wl_listener *listener,
-			    struct wl_surface *surface, uint32_t time)
-{
-	struct wl_drag *drag =
-		container_of(listener, struct wl_drag, drag_focus_listener);
-
-	if (drag->drag_focus == surface)
-		wl_drag_set_pointer_focus(drag, NULL, time, 0, 0, 0, 0);
-}
-
-static void
-shell_create_drag(struct wl_client *client,
-		  struct wl_shell *shell, uint32_t id)
-{
-	struct wl_drag *drag;
-
-	drag = malloc(sizeof *drag);
-	if (drag == NULL) {
-		wl_client_post_no_memory(client);
-		return;
-	}
-
-	memset(drag, 0, sizeof *drag);
-	drag->resource.object.id = id;
-	drag->resource.object.interface = &wl_drag_interface;
-	drag->resource.object.implementation =
-		(void (**)(void)) &drag_interface;
-
-	drag->resource.destroy = destroy_drag;
-
-	drag->drag_focus_listener.func = drag_handle_surface_destroy;
-	wl_list_init(&drag->drag_focus_listener.link);
-
-	wl_client_add_resource(client, &drag->resource);
-}
-
-const static struct wl_shell_interface shell_interface = {
-	shell_move,
-	shell_resize,
-	shell_create_drag
-};
-
 static void
 compositor_create_surface(struct wl_client *client,
 			  struct wl_compositor *compositor, uint32_t id)
@@ -805,7 +563,7 @@ wlsc_surface_transform(struct wlsc_surface *surface,
 	*sy = v.f[1] * surface->height;
 }
 
-static struct wlsc_surface *
+struct wlsc_surface *
 pick_surface(struct wl_input_device *device, int32_t *sx, int32_t *sy)
 {
 	struct wlsc_compositor *ec =
@@ -1010,202 +768,6 @@ notify_key(struct wl_input_device *device,
 }
 
 static void
-wl_drag_set_pointer_focus(struct wl_drag *drag,
-			  struct wl_surface *surface, uint32_t time,
-			  int32_t x, int32_t y, int32_t sx, int32_t sy)
-{
-	char **p, **end;
-
-	if (drag->drag_focus == surface)
-		return;
-
-	if (drag->drag_focus &&
-	    (!surface || drag->drag_focus->client != surface->client))
-		wl_client_post_event(drag->drag_focus->client,
-				      &drag->drag_offer.object,
-				      WL_DRAG_OFFER_POINTER_FOCUS,
-				      time, NULL, 0, 0, 0, 0);
-
-	if (surface &&
-	    (!drag->drag_focus ||
-	     drag->drag_focus->client != surface->client)) {
-		wl_client_post_global(surface->client,
-				      &drag->drag_offer.object);
-
-		end = drag->types.data + drag->types.size;
-		for (p = drag->types.data; p < end; p++)
-			wl_client_post_event(surface->client,
-					      &drag->drag_offer.object,
-					      WL_DRAG_OFFER_OFFER, *p);
-	}
-
-	if (surface) {
-		wl_client_post_event(surface->client,
-				     &drag->drag_offer.object,
-				     WL_DRAG_OFFER_POINTER_FOCUS,
-				     time, surface,
-				     x, y, sx, sy);
-
-	}
-
-	drag->drag_focus = surface;
-	drag->pointer_focus_time = time;
-	drag->target = NULL;
-
-	wl_list_remove(&drag->drag_focus_listener.link);
-	if (surface)
-		wl_list_insert(surface->destroy_listener_list.prev,
-			       &drag->drag_focus_listener.link);
-}
-
-static void
-drag_offer_accept(struct wl_client *client,
-		  struct wl_drag_offer *offer, uint32_t time, const char *type)
-{
-	struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
-	char **p, **end;
-
-	/* If the client responds to drag pointer_focus or motion
-	 * events after the pointer has left the surface, we just
-	 * discard the accept requests.  The drag source just won't
-	 * get the corresponding 'target' events and eventually the
-	 * next surface/root will start sending events. */
-	if (time < drag->pointer_focus_time)
-		return;
-
-	drag->target = client;
-	drag->type = NULL;
-	end = drag->types.data + drag->types.size;
-	for (p = drag->types.data; p < end; p++)
-		if (type && strcmp(*p, type) == 0)
-			drag->type = *p;
-
-	wl_client_post_event(drag->source->client, &drag->resource.object,
-			     WL_DRAG_TARGET, drag->type);
-}
-
-static void
-drag_offer_receive(struct wl_client *client,
-		   struct wl_drag_offer *offer, int fd)
-{
-	struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
-
-	wl_client_post_event(drag->source->client, &drag->resource.object,
-			     WL_DRAG_FINISH, fd);
-	close(fd);
-}
-
-static void
-drag_offer_reject(struct wl_client *client, struct wl_drag_offer *offer)
-{
-	struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
-
-	wl_client_post_event(drag->source->client, &drag->resource.object,
-			     WL_DRAG_REJECT);
-}
-
-static const struct wl_drag_offer_interface drag_offer_interface = {
-	drag_offer_accept,
-	drag_offer_receive,
-	drag_offer_reject
-};
-
-static void
-drag_offer(struct wl_client *client, struct wl_drag *drag, const char *type)
-{
-	char **p;
-
-	p = wl_array_add(&drag->types, sizeof *p);
-	if (p)
-		*p = strdup(type);
-	if (!p || !*p)
-		wl_client_post_no_memory(client);
-}
-
-static void
-drag_grab_motion(struct wl_grab *grab,
-		   uint32_t time, int32_t x, int32_t y)
-{
-	struct wl_drag *drag = container_of(grab, struct wl_drag, grab);
-	struct wlsc_surface *es;
-	int32_t sx, sy;
-
-	es = pick_surface(grab->input_device, &sx, &sy);
-	wl_drag_set_pointer_focus(drag, &es->surface, time, x, y, sx, sy);
-	if (es)
-		wl_client_post_event(es->surface.client,
-				     &drag->drag_offer.object,
-				     WL_DRAG_OFFER_MOTION,
-				     time, x, y, sx, sy);
-}
-
-static void
-drag_grab_button(struct wl_grab *grab,
-		 uint32_t time, int32_t button, int32_t state)
-{
-}
-
-static void
-drag_grab_end(struct wl_grab *grab, uint32_t time)
-{
-	struct wl_drag *drag = container_of(grab, struct wl_drag, grab);
-
-	if (drag->target)
-		wl_client_post_event(drag->target,
-				     &drag->drag_offer.object,
-				     WL_DRAG_OFFER_DROP);
-
-	wl_drag_set_pointer_focus(drag, NULL, time, 0, 0, 0, 0);
-}
-
-static const struct wl_grab_interface drag_grab_interface = {
-	drag_grab_motion,
-	drag_grab_button,
-	drag_grab_end
-};
-
-static void
-drag_activate(struct wl_client *client,
-	      struct wl_drag *drag,
-	      struct wl_surface *surface,
-	      struct wl_input_device *device, uint32_t time)
-{
-	struct wl_display *display = wl_client_get_display (client);
-	struct wlsc_surface *target;
-	int32_t sx, sy;
-
-	if (wl_input_device_update_grab(device,
-					&drag->grab, surface, time) < 0)
-		return;
-
-	drag->grab.interface = &drag_grab_interface;
-
-	drag->source = surface;
-
-	drag->drag_offer.object.interface = &wl_drag_offer_interface;
-	drag->drag_offer.object.implementation =
-		(void (**)(void)) &drag_offer_interface;
-
-	wl_display_add_object(display, &drag->drag_offer.object);
-
-	target = pick_surface(device, &sx, &sy);
-	wl_drag_set_pointer_focus(drag, &target->surface, time,
-				  device->x, device->y, sx, sy);
-}
-
-static void
-drag_destroy(struct wl_client *client, struct wl_drag *drag)
-{
-	wl_resource_destroy(&drag->resource, client);
-}
-
-static const struct wl_drag_interface drag_interface = {
-	drag_offer,
-	drag_activate,
-	drag_destroy,
-};
-
-static void
 input_device_attach(struct wl_client *client,
 		    struct wl_input_device *device_base,
 		    uint32_t time,
@@ -1410,11 +972,7 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
 
 	wlsc_shm_init(ec);
 
-	ec->shell.object.interface = &wl_shell_interface;
-	ec->shell.object.implementation = (void (**)(void)) &shell_interface;
-	wl_display_add_object(display, &ec->shell.object);
-	if (wl_display_add_global(display, &ec->shell.object, NULL))
-		return -1;
+	wlsc_shell_init(ec);
 
 	wl_list_init(&ec->surface_list);
 	wl_list_init(&ec->input_device_list);