[gtksourceview/gtksourcecompletion] Correctly handle gravity when moving the popup window

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 97ad6bd5c3157beaf1a98ac2d1e9f19f07f25c7a
Author: Jesse van den Kieboom <jesse icecrew nl>
Date:   Sat Apr 18 16:21:29 2009 +0200

    Correctly handle gravity when moving the popup window
    
    It seems setting gravity on the window doesn't really work, but at least were trying to compensate for it if it would...
---
 gtksourceview/gtksourcecompletion.c      |    9 +-
 gtksourceview/gtksourcecompletioninfo.c  |   13 +--
 gtksourceview/gtksourcecompletionitem.c  |    2 +-
 gtksourceview/gtksourcecompletionutils.c |  239 ++++++++++++++++--------------
 gtksourceview/gtksourcecompletionutils.h |   19 +--
 5 files changed, 139 insertions(+), 143 deletions(-)

diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 177e2fd..052fcdd 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -1870,7 +1870,6 @@ gtk_source_completion_popup (GtkSourceCompletion *completion,
                              const gchar         *criteria)
 {
 	GList *l;
-	gint x, y;
 
 	g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), FALSE);
 	
@@ -1918,12 +1917,8 @@ gtk_source_completion_popup (GtkSourceCompletion *completion,
 
 	update_selection_label (completion);
 
-	/* FIXME: Maybe support are types of positioning */
-	gtk_source_completion_utils_get_pos_at_cursor (GTK_WINDOW (completion->priv->window),
-						       GTK_SOURCE_VIEW (completion->priv->view),
-						       &x, &y, NULL);
-
-	gtk_window_move (GTK_WINDOW (completion->priv->window), x, y);
+	gtk_source_completion_utils_move_to_cursor (GTK_WINDOW (completion->priv->window),
+						    GTK_SOURCE_VIEW (completion->priv->view));
 	
 	if (!GTK_WIDGET_VISIBLE (completion->priv->window))
 	{
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c
index e5acfcc..177fef1 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtksourcecompletioninfo.c
@@ -369,8 +369,6 @@ gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *self,
 	GtkTextBuffer *buffer;
 	GtkTextMark *insert_mark;
 	GtkTextIter start;
-	gint x;
-	gint y;
 	
 	g_return_if_fail (GTK_IS_SOURCE_COMPLETION_INFO (self));
 	g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
@@ -386,14 +384,9 @@ gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *self,
 		start = *iter;
 	}
 	
-	gtk_source_completion_utils_get_pos_at_iter (GTK_WINDOW (self),
-						     GTK_SOURCE_VIEW (view),
-						     &start,
-						     &x,
-						     &y,
-						     NULL);
-
-	gtk_window_move (GTK_WINDOW (self), x, y);
+	gtk_source_completion_utils_move_to_iter (GTK_WINDOW (self),
+						  GTK_SOURCE_VIEW (view),
+						  &start);
 }
 
 /**
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c
index 582c0e8..ff50ee0 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtksourcecompletionitem.c
@@ -47,7 +47,7 @@ gtk_source_completion_proposal_get_label_impl (GtkSourceCompletionProposal *self
 	return GTK_SOURCE_COMPLETION_ITEM (self)->priv->label;
 }
 
-static const GdkPixbuf *
+static GdkPixbuf *
 gtk_source_completion_proposal_get_icon_impl (GtkSourceCompletionProposal *self)
 {
 	return GTK_SOURCE_COMPLETION_ITEM (self)->priv->icon;
diff --git a/gtksourceview/gtksourcecompletionutils.c b/gtksourceview/gtksourcecompletionutils.c
index 255fe96..4ee1c6d 100644
--- a/gtksourceview/gtksourcecompletionutils.c
+++ b/gtksourceview/gtksourcecompletionutils.c
@@ -143,20 +143,12 @@ gtk_source_completion_utils_get_word (GtkSourceBuffer *source_buffer)
 	return gtk_source_completion_utils_get_word_iter (source_buffer, NULL, NULL);
 }
 
-/** 
- * gsc_utils_view_get_cursor_pos:
- * @source_view: The #GtksourceView
- * @iter: a #GtkTextIter
- * @x: Assign the x position of the cursor
- * @y: Assign the y position of the cursor
- *
- * Gets the cursor position on the screen.
- */
-void
-gtk_source_completion_utils_get_iter_pos (GtkSourceView *source_view, 
-					  GtkTextIter   *iter,
-					  gint          *x,
-					  gint          *y)
+static void
+get_iter_pos (GtkSourceView *source_view, 
+              GtkTextIter   *iter,
+              gint          *x,
+              gint          *y,
+              gint          *height)
 {
 	GdkWindow *win;
 	GtkTextView *text_view;
@@ -182,6 +174,7 @@ gtk_source_completion_utils_get_iter_pos (GtkSourceView *source_view,
 	
 	*x = win_x + xx;
 	*y = win_y + yy + location.height;
+	*height = location.height;
 }
 
 /**
@@ -214,35 +207,104 @@ gtk_source_completion_utils_replace_current_word (GtkSourceBuffer *source_buffer
 	gtk_text_buffer_end_user_action (buffer);
 }
 
+static void
+compensate_for_gravity (GtkWindow *window,
+                        gint      *x,
+                        gint      *y,
+                        gint      w,
+                        gint      h)
+{
+	GdkGravity gravity;
+	
+	gravity = gtk_window_get_gravity (window);
+	
+	/* Horizontal */
+	switch (gravity)
+	{
+		case GDK_GRAVITY_NORTH:
+		case GDK_GRAVITY_SOUTH:
+		case GDK_GRAVITY_CENTER:
+			*x = w / 2;
+			break;
+		case GDK_GRAVITY_NORTH_EAST:
+		case GDK_GRAVITY_SOUTH_EAST:
+		case GDK_GRAVITY_EAST:
+			*x = w;
+			break;
+		default:
+			*x = 0;
+			break;
+	}
+	
+	/* Vertical */
+	switch (gravity)
+	{
+		case GDK_GRAVITY_WEST:
+		case GDK_GRAVITY_CENTER:
+		case GDK_GRAVITY_EAST:
+			*y = w / 2;
+			break;
+		case GDK_GRAVITY_SOUTH_EAST:
+		case GDK_GRAVITY_SOUTH:
+		case GDK_GRAVITY_SOUTH_WEST:
+			*y = w;
+			break;
+		default:
+			*y = 0;
+			break;
+	}
+}
+
+static void
+move_overlap (gint     *x,
+              gint     *y,
+              gint      w,
+              gint      h,
+              gint      oy,
+              gint      cx,
+              gint      cy,
+              gint      line_height,
+              gboolean  move_up)
+{
+	/* Test if there is overlap */
+	if (*y - cy < oy && *y - cy + h > oy - line_height)
+	{
+		if (move_up)
+		{
+			*y = oy - line_height - h + cy;
+		}
+		else
+		{
+			*y = oy + cy;
+		}
+	}
+}
+
 /**
- * gtk_source_completion_utils_get_pos_at_iter:
- * @window: Window to set
- * @iter: a #GtkTextIter
- * @view: Parent view where we get the cursor position
- * @x: The returned x position
- * @y: The returned y position
+ * gtk_source_completion_utils_move_to_iter:
+ * @window: the #GtkWindow to move
+ * @view: the view 
+ * @iter: the iter to move @window to
  *
- * Returns: %TRUE if the position is over the text and %FALSE if 
- * the position is under the text.
  */
-gboolean 
-gtk_source_completion_utils_get_pos_at_iter (GtkWindow     *window,
-					     GtkSourceView *view,
-					     GtkTextIter   *iter,
-					     gint          *x, 
-					     gint          *y,
-					     gboolean      *resized)
+void
+gtk_source_completion_utils_move_to_iter (GtkWindow     *window,
+					  GtkSourceView *view,
+					  GtkTextIter   *iter)
 {
+	gint x;
+	gint y;
 	gint w;
 	gint h;
-	gint xtext;
-	gint ytext;
-	gint ytemp;
+	gint cx;
+	gint cy;
+	gint oy;
+	gint height;
 	GdkScreen *screen;
+	gboolean overlapup;
+
 	gint sw = gdk_screen_width();
 	gint sh = gdk_screen_height();
-	gboolean resize = FALSE;
-	gboolean up = FALSE;
 	
 	if (window != NULL)
 	{
@@ -256,103 +318,60 @@ gtk_source_completion_utils_get_pos_at_iter (GtkWindow     *window,
 	sw = gdk_screen_get_width (screen);
 	sh = gdk_screen_get_height (screen);
 
-	gtk_source_completion_utils_get_iter_pos (view, iter, x, y);
+	get_iter_pos (view, iter, &x, &y, &height);
 	gtk_window_get_size (window, &w, &h);
 	
-	/* Processing x position and width */
-	if (w > (sw - 8))
+	oy = y;
+	compensate_for_gravity (window, &cx, &cy, w, h);
+
+	/* Push window inside screen */
+	if (x - cx + w > sw)
 	{
-		/* Resize to view all the window */
-		resize = TRUE;
-		w = sw - 8;
+		x = (sw - w) + cx;
 	}
-	
-	/* Move position to view all the window */
-	if ((*x + w) > (sw - 4))
+	else if (x - cx < 0)
 	{
-		*x = sw - w - 4;
+		x = cx;
 	}
 
-	/* Processing y position and height */
-	
-	/* 
-	If we cannot show it down, we show it up and if we cannot show it up, we
-	show the window at the largest position 
-	*/
-	if ((*y + h) > sh)
+	if (y - cy + h > sh)
 	{
-		PangoLayout* layout = 
-			gtk_widget_create_pango_layout (GTK_WIDGET(view), NULL);
-
-		pango_layout_get_pixel_size (layout, &xtext, &ytext);
-		ytemp = *y - ytext;
-
-		/* Cabe arriba? */
-		if ((ytemp - h) >= 4)
-		{
-			*y = ytemp - h;
-			up = TRUE;
-		}
-		else
-		{
-			/* 
-			Si no cabe arriba, lo ponemos donde haya más espacio
-			y redimensionamos la ventana
-			*/
-			if ((sh - *y) > ytemp)
-			{
-				h = sh - *y - 4;
-			}
-			else
-			{
-				*y = 4;
-				h = ytemp -4;
-				up = TRUE;
-			}
-
-			resize = TRUE;
-		}
-
-		g_object_unref (layout);
+		y = (sh - h) + cy;
+		overlapup = TRUE;
+	}
+	else if (y - cy < 0)
+	{
+		y = cy;
+		overlapup = FALSE;
+	}
+	else
+	{
+		overlapup = TRUE;
 	}
 	
-	if (resize)
-		gtk_window_resize (window, w, h);
-
-	if (resized != NULL)
-		*resized = resize;
+	/* Make sure that text is still readable */
+	move_overlap (&x, &y, w, h, oy, cx, cy, height, overlapup);
 	
-	return up;
+	gtk_window_move (window, x, y);
 }
 
 /**
  * gtk_source_completion_utils_get_pos_at_cursor:
- * @window: Window to set
- * @view: Parent view where we get the cursor position
- * @x: The returned x position
- * @y: The returned y position
+ * @window: the #GtkWindow to move
+ * @view: the view 
  *
- * Returns: %TRUE if the position is over the text and %FALSE if 
- * the position is under the text.
  */
-gboolean 
-gtk_source_completion_utils_get_pos_at_cursor (GtkWindow     *window,
-					       GtkSourceView *view,
-					       gint          *x, 
-					       gint          *y,
-					       gboolean      *resized)
+void 
+gtk_source_completion_utils_move_to_cursor (GtkWindow     *window,
+					    GtkSourceView *view)
 {
 	GtkTextBuffer *buffer;
-	GtkTextMark *insert_mark;
 	GtkTextIter insert;
 	
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	insert_mark = gtk_text_buffer_get_insert (buffer);
-	gtk_text_buffer_get_iter_at_mark (buffer, &insert, insert_mark);
+	gtk_text_buffer_get_iter_at_mark (buffer, &insert, gtk_text_buffer_get_insert (buffer));
 	
-	return gtk_source_completion_utils_get_pos_at_iter (window,
-							    view,
-							    &insert,
-							    x, y,
-							    resized);
+	gtk_source_completion_utils_move_to_iter (window,
+	                                          view,
+	                                          &insert);
 }
diff --git a/gtksourceview/gtksourcecompletionutils.h b/gtksourceview/gtksourcecompletionutils.h
index 8894f08..3e06889 100644
--- a/gtksourceview/gtksourcecompletionutils.h
+++ b/gtksourceview/gtksourcecompletionutils.h
@@ -35,27 +35,16 @@ gchar		*gtk_source_completion_utils_get_word_iter		(GtkSourceBuffer *source_buff
 
 gchar		*gtk_source_completion_utils_get_word			(GtkSourceBuffer *text_view);
 
-void		 gtk_source_completion_utils_get_iter_pos		(GtkSourceView   *source_view, 
-									 GtkTextIter     *iter,
-									 gint            *x, 
-									 gint            *y);
-
 void		 gtk_source_completion_utils_replace_current_word	(GtkSourceBuffer *source_buffer, 
 									 const gchar     *text,
 									 gint             len);
 
-gboolean	 gtk_source_completion_utils_get_pos_at_iter		(GtkWindow       *window,
+void		 gtk_source_completion_utils_move_to_iter		(GtkWindow       *window,
 									 GtkSourceView   *view,
-									 GtkTextIter     *iter,
-									 gint            *x,
-									 gint            *y,
-									 gboolean        *resized);
+									 GtkTextIter     *iter);
 
-gboolean	 gtk_source_completion_utils_get_pos_at_cursor		(GtkWindow       *window,
-									 GtkSourceView   *view,
-									 gint            *x,
-									 gint            *y,
-									 gboolean        *resized);
+void		 gtk_source_completion_utils_move_to_cursor		(GtkWindow       *window,
+									 GtkSourceView   *view);
 
 G_END_DECLS