gimp r26901 - in branches/soc-2008-text: . app/tools

[weskaggs svn gnome org]

Author: weskaggs
Date: Mon Sep  8 19:27:54 2008
New Revision: 26901
URL: http://svn.gnome.org/viewvc/gimp?rev=26901&view=rev

Log:
Bill Skaggs <weskaggs gmail com>

	* app/tools/gimptexttool.c: More work on the external editor,
	and some bug-fixes.


Modified:
   branches/soc-2008-text/ChangeLog
   branches/soc-2008-text/app/tools/gimptexttool.c

Modified: branches/soc-2008-text/app/tools/gimptexttool.c
==============================================================================
--- branches/soc-2008-text/app/tools/gimptexttool.c	(original)
+++ branches/soc-2008-text/app/tools/gimptexttool.c	Mon Sep  8 19:27:54 2008
@@ -171,6 +171,13 @@
                                                 const gchar       *str);
 static void gimp_text_tool_text_buffer_changed (GtkTextBuffer     *text_buffer,
                                                 GimpTextTool      *text_tool);
+static void gimp_text_tool_text_buffer_mark_set (GtkTextBuffer    *text_buffer,
+                                                 GtkTextIter      *location,
+                                                 GtkTextMark      *mark,
+                                                 GimpTextTool     *text_tool);
+static void gimp_text_tool_use_editor_notify   (GimpTextOptions   *options,
+                                                GParamSpec        *pspec,
+                                                GimpTextTool      *text_tool);
 
 /* IM Context Callbacks
  */
@@ -268,6 +275,8 @@
 
   g_signal_connect (text_tool->text_buffer, "changed",
                     G_CALLBACK (gimp_text_tool_text_buffer_changed), text_tool);
+  g_signal_connect (text_tool->text_buffer, "mark-set",
+                    G_CALLBACK (gimp_text_tool_text_buffer_mark_set), text_tool);
 
   text_tool->im_context = gtk_im_multicontext_new ();
 
@@ -311,6 +320,10 @@
                            G_CALLBACK (gimp_text_tool_proxy_notify),
                            text_tool, 0);
 
+  g_signal_connect_object (options, "notify::use-editor",
+                           G_CALLBACK (gimp_text_tool_use_editor_notify),
+                           text_tool, 0);
+
   return object;
 }
 
@@ -322,18 +335,12 @@
 
   gimp_text_tool_set_drawable (text_tool, NULL, FALSE);
 
+  if (text_tool->editor)
+    gtk_widget_destroy (text_tool->editor);
+
   gimp_tool_control_set_wants_all_key_events (tool->control, FALSE);
   gimp_tool_control_set_show_context_menu (tool->control, FALSE);
 
-  gtk_text_buffer_set_text (text_tool->text_buffer, "", -1);
-  g_signal_handlers_disconnect_by_func (text_tool->im_context,
-                                        gimp_text_tool_commit_cb, text_tool);
-  g_signal_handlers_disconnect_by_func (text_tool->im_context,
-                                        gimp_text_tool_preedit_changed_cb,
-                                        text_tool);
-  g_signal_handlers_disconnect_by_func (text_tool,
-                                        gimp_text_tool_show_context_menu,
-                                        NULL);
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -360,6 +367,12 @@
       text_tool->text_buffer = NULL;
     }
 
+  if (text_tool->im_context)
+    {
+      g_object_unref (text_tool->im_context);
+      text_tool->im_context = NULL;
+    }
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -404,6 +417,9 @@
 
   gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
 
+  g_signal_handlers_block_by_func (text_tool->text_buffer,
+                                   G_CALLBACK (gimp_text_tool_text_buffer_mark_set),
+                                   text_tool);
 
   /* FIXME: this should certainly be done elsewhere */
   g_object_set (options,
@@ -480,7 +496,8 @@
               if (text && text_tool->text == text)
               {
                 gimp_text_tool_canvas_editor (text_tool);
-                gtk_text_buffer_set_text (text_tool->text_buffer, text_tool->text->text, -1);
+                gtk_text_buffer_set_text (text_tool->text_buffer,
+                                          text_tool->text->text, -1);
 
                 gimp_text_tool_update_layout (text_tool);
               }
@@ -579,6 +596,10 @@
                                           GIMP_ITEM (text_tool->layer));
           text_tool->handle_rectangle_change_complete = TRUE;
 
+          g_signal_handlers_unblock_by_func (text_tool->text_buffer,
+                                           G_CALLBACK (gimp_text_tool_text_buffer_mark_set),
+                                           text_tool);
+
           return;
         }
       else
@@ -634,6 +655,10 @@
   gimp_rectangle_tool_button_release (tool, coords, time, state,
                                       release_type, display);
   text_tool->handle_rectangle_change_complete = TRUE;
+
+  g_signal_handlers_unblock_by_func (text_tool->text_buffer,
+                                     G_CALLBACK (gimp_text_tool_text_buffer_mark_set),
+                                     text_tool);
 }
 
 void
@@ -840,9 +865,6 @@
 
   g_return_if_fail (text == NULL || (layer != NULL && layer->text == text));
 
-  if (! text && text_tool->editor)
-    gtk_widget_destroy (text_tool->editor);
-
   if (text_tool->text != text)
     {
       GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (tool);
@@ -915,6 +937,23 @@
 }
 
 static void
+gimp_text_tool_use_editor_notify (GimpTextOptions *options,
+                                  GParamSpec      *pspec,
+                                  GimpTextTool    *text_tool)
+{
+  if (options->use_editor)
+    {
+      if (text_tool->text_buffer)
+        gimp_text_tool_editor (text_tool);
+    }
+  else
+    {
+      if (text_tool->editor)
+        gtk_widget_destroy (text_tool->editor);
+    }
+}
+
+static void
 gimp_text_tool_layer_notify (GimpTextLayer *layer,
                              GParamSpec    *pspec,
                              GimpTextTool  *text_tool)
@@ -2089,7 +2128,7 @@
   GtkTextIter cursor, start, end;
 
   gtk_text_buffer_get_iter_at_mark (text_tool->text_buffer,
-                                   &cursor,
+                                    &cursor,
                                     gtk_text_buffer_get_insert (text_tool->text_buffer));
 
   if (gtk_text_buffer_get_has_selection (text_tool->text_buffer))
@@ -2097,15 +2136,17 @@
   else
     gtk_text_buffer_backspace (text_tool->text_buffer, &cursor, TRUE, TRUE);
 
-  gimp_text_tool_update_proxy (text_tool);
+/*   gimp_text_tool_update_proxy (text_tool); */
 }
 
 static void
 gimp_text_tool_enter_text (GimpTextTool *text_tool,
                            const gchar *str)
 {
+  if (gtk_text_buffer_get_has_selection (text_tool->text_buffer))
+    gtk_text_buffer_delete_selection (text_tool->text_buffer, TRUE, TRUE);
   gtk_text_buffer_insert_at_cursor (text_tool->text_buffer, str, -1);
-  gimp_text_tool_update_proxy (text_tool);
+/*   gimp_text_tool_update_proxy (text_tool); */
 }
 
 static void
@@ -2116,6 +2157,15 @@
 }
 
 static void
+gimp_text_tool_text_buffer_mark_set (GtkTextBuffer *text_buffer,
+                                     GtkTextIter   *iter,
+                                     GtkTextMark   *mark,
+                                     GimpTextTool  *text_tool)
+{
+  gimp_text_tool_update_proxy (text_tool);
+}
+
+static void
 gimp_text_tool_update_layout (GimpTextTool *text_tool)
 {
   GimpItem       *item;