[PATCH] shell: moving drag surface refine

[juan.j.zhao at linux.intel.com]

From: Juan Zhao <juan.j.zhao at linux.intel.com>

When applications not directly based on toytoolkit, like simple-egl, efl
applications is grabbed and moved, they may be moved to the place under
the panel. Then they could not be grabbed again.
Don't allow the pointer's bounding box move across the desktop's viewport.

Signed-off-by: Juan Zhao <juan.j.zhao at linux.intel.com>
---
 src/shell.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/shell.c b/src/shell.c
index a9e4d4f..b85f3f6 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -221,6 +221,13 @@ get_shell_surface(struct weston_surface *surface);
 static struct desktop_shell *
 shell_surface_get_shell(struct shell_surface *shsurf);
 
+static int
+get_output_panel_height(struct desktop_shell *shell,
+                        struct weston_output *output);
+
+static struct weston_output *
+get_default_output(struct weston_compositor *compositor);
+
 static bool
 shell_surface_is_top_fullscreen(struct shell_surface *shsurf)
 {
@@ -784,13 +791,40 @@ move_grab_motion(struct wl_pointer_grab *grab,
 	struct wl_pointer *pointer = grab->pointer;
 	struct shell_surface *shsurf = move->base.shsurf;
 	struct weston_surface *es;
+	struct desktop_shell *shell = NULL;
 	int dx = wl_fixed_to_int(pointer->x + move->dx);
 	int dy = wl_fixed_to_int(pointer->y + move->dy);
+	int bounding_x, bounding_y, view_x, view_y, view_w, view_h, panel_height;
+	int ncx = 0, ncy = 0;
+	int boxsize = 10;
 
 	if (!shsurf)
 		return;
 
 	es = shsurf->surface;
+	shsurf->output = shsurf->output ? shsurf->output
+			     : get_default_output(es->compositor);
+	shell = shell_surface_get_shell(shsurf);
+	panel_height = get_output_panel_height(shell, shsurf->output);
+
+	weston_surface_from_global(es, wl_fixed_to_int(pointer->x),
+				   wl_fixed_to_int(pointer->y),
+				   &ncx, &ncy);
+	ncx -= boxsize>>1;
+	ncy -= boxsize>>1;
+
+	bounding_x = dx + (ncx>0?ncx:0);
+	bounding_y = dy + (ncy>0?ncy:0);
+
+	view_x = 0;
+	view_y = panel_height;
+	view_w = shsurf->output->current->width;
+	view_h = shsurf->output->current->height - panel_height;
+
+	if ( !(bounding_x >= view_x && bounding_y >= view_y &&
+	       bounding_x + boxsize <= view_x + view_w &&
+	       bounding_y + boxsize <= view_y + view_h) )
+	    return;
 
 	weston_surface_configure(es, dx, dy,
 				 es->geometry.width, es->geometry.height);
-- 
1.7.11