ekiga r6843 - in trunk: . lib/engine/gui/gtk-frontend

[jschamp svn gnome org]

Author: jschamp
Date: Sat Sep  6 17:36:08 2008
New Revision: 6843
URL: http://svn.gnome.org/viewvc/ekiga?rev=6843&view=rev

Log:
Better handling when inserting font tags in the chat.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/chat-area.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	Sat Sep  6 17:36:08 2008
@@ -478,9 +478,13 @@
 {
   ChatArea* self = NULL;
   GtkTextBuffer *buffer = NULL;
-  GtkTextMark *mark = NULL;
+  GtkTextMark* mark = NULL;
+  GtkTextMark* mark_at_insert = NULL;
+  GtkTextMark* mark_at_bound = NULL;
   GtkTextIter start;
   GtkTextIter end;
+  GtkTextIter iter_sav_insert;
+  GtkTextIter iter_sav_bound;
 
   const gchar* opening_tag = NULL;
   const gchar* closing_tag = NULL;
@@ -500,19 +504,46 @@
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->priv->message));
   if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) {
 
-    /* FIXME we need to avoid that the closing_tag is part of the selection
-     * after this */
-    mark = gtk_text_buffer_create_mark (buffer, "end", &end, FALSE);
+    /* "save" the current selection by inserting marks with different gravity
+     * depending on the order of insert/bound in the buffer */
+    gtk_text_buffer_get_iter_at_mark (buffer, &iter_sav_insert,
+				      gtk_text_buffer_get_insert (buffer));
+    gtk_text_buffer_get_iter_at_mark (buffer, &iter_sav_bound,
+				      gtk_text_buffer_get_selection_bound (buffer));
+    if (gtk_text_iter_compare (&iter_sav_bound, &iter_sav_insert) < 0) {
+      /* selection is left-right */
+      mark_at_bound = gtk_text_buffer_create_mark (buffer, NULL,
+						   &iter_sav_bound, FALSE);
+      mark_at_insert = gtk_text_buffer_create_mark (buffer, NULL,
+						    &iter_sav_insert, TRUE);
+      mark = mark_at_insert;
+    } else {
+      /* selection is right-left */
+      mark_at_bound = gtk_text_buffer_create_mark (buffer, NULL,
+						   &iter_sav_bound, TRUE);
+      mark_at_insert = gtk_text_buffer_create_mark (buffer, NULL,
+						    &iter_sav_insert, FALSE);
+      mark = mark_at_bound;
+    }
+
+    /* actually insert the tags */
     gtk_text_buffer_insert (buffer, &start, opening_tag, -1);
     gtk_text_buffer_get_iter_at_mark (buffer, &end, mark);
     gtk_text_buffer_insert (buffer, &end, closing_tag, -1);
+
+    /* restore the original selection */
+    gtk_text_buffer_get_iter_at_mark (buffer, &iter_sav_bound, mark_at_bound);
+    gtk_text_buffer_get_iter_at_mark (buffer, &iter_sav_insert, mark_at_insert);
+    gtk_text_buffer_move_mark_by_name (buffer, "selection_bound", &iter_sav_bound);
+    gtk_text_buffer_move_mark_by_name (buffer, "insert", &iter_sav_insert);
   }
-  else {
+  else { /* no text selected - just insert */
 
-    /* FIXME we need to place the insertion mark between the tags after this, and also
-     * clear the selection that occurs */
-    gtk_text_buffer_get_iter_at_mark (buffer, &end, gtk_text_buffer_get_insert (buffer));
+    gtk_text_buffer_get_iter_at_mark (buffer, &end,
+				      gtk_text_buffer_get_insert (buffer));
     gtk_text_buffer_insert (buffer, &end, tags, -1);
+    gtk_text_iter_backward_chars (&end, strlen (closing_tag));
+    gtk_text_buffer_place_cursor (buffer, &end);
   }
 
   g_free (tags);