gimp r27484 - in trunk: . app/display app/tools

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 30 23:13:24 2008
New Revision: 27484
URL: http://svn.gnome.org/viewvc/gimp?rev=27484&view=rev

Log:
2008-10-31  Michael Natterer  <mitch gimp org>

	* app/tools/gimptexttool.c (gimp_text_tool_key_press): bail out
	instead of crashing if the tool has no display.

	(gimp_text_tool_draw)
	(gimp_text_tool_draw_preedit)
	(gimp_text_tool_draw_selection)
	(gimp_text_tool_xy_to_offset): need to adjust all drawing and
	event coordinates by a possible negative offset between logical
	rectangle and ink rectangle (if the ink rectangle is larger than
	the logical one).

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): continue normally if
	tool_manager_key_press_active() returns FALSE.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-callbacks.c
   trunk/app/tools/gimptexttool.c

Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c	(original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c	Thu Oct 30 23:13:24 2008
@@ -1382,13 +1382,14 @@
 
             if (gimp_tool_control_get_wants_all_key_events (active_tool->control))
               {
-                tool_manager_key_press_active (gimp, kevent, display);
-
-                /* FIXME: need to do some of the stuff below, like
-                 * calling oper_update()
-                 */
+                if (tool_manager_key_press_active (gimp, kevent, display))
+                  {
+                    /* FIXME: need to do some of the stuff below, like
+                     * calling oper_update()
+                     */
 
-                return TRUE;
+                    return TRUE;
+                  }
               }
 
             switch (kevent->keyval)

Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c	(original)
+++ trunk/app/tools/gimptexttool.c	Thu Oct 30 23:13:24 2008
@@ -116,8 +116,12 @@
                                                  const gchar      **ui_path);
 
 static void      gimp_text_tool_draw            (GimpDrawTool      *draw_tool);
-static void      gimp_text_tool_draw_preedit    (GimpDrawTool      *draw_tool);
-static void      gimp_text_tool_draw_selection  (GimpDrawTool      *draw_tool);
+static void      gimp_text_tool_draw_preedit    (GimpDrawTool      *draw_tool,
+                                                 gint               logical_off_x,
+                                                 gint               logical_off_y);
+static void      gimp_text_tool_draw_selection  (GimpDrawTool      *draw_tool,
+                                                 gint               logical_off_x,
+                                                 gint               logical_off_y);
 
 static gboolean  gimp_text_tool_rectangle_change_complete
                                                 (GimpRectangleTool *rect_tool);
@@ -706,6 +710,9 @@
   gint          x_pos  = -1;
   gboolean      retval = TRUE;
 
+  if (! tool->display)
+    return FALSE;
+
   if (gtk_im_context_filter_keypress (text_tool->im_context, kevent))
     {
       text_tool->needs_im_reset = TRUE;
@@ -1003,11 +1010,15 @@
 static void
 gimp_text_tool_draw (GimpDrawTool *draw_tool)
 {
-  GimpTextTool *text_tool = GIMP_TEXT_TOOL (draw_tool);
-  GdkRectangle  cliprect;
-  gint          x1, x2;
-  gint          y1, y2;
-  GtkTextIter   start;
+  GimpTextTool   *text_tool = GIMP_TEXT_TOOL (draw_tool);
+  GdkRectangle    cliprect;
+  gint            x1, x2;
+  gint            y1, y2;
+  gint            logical_off_x = 0;
+  gint            logical_off_y = 0;
+  PangoRectangle  ink_extents;
+  PangoRectangle  logical_extents;
+  GtkTextIter     start;
 
   g_object_set (text_tool,
                 "narrow-mode", TRUE,
@@ -1037,6 +1048,15 @@
   cliprect.height = y2 - y1;
   gimp_draw_tool_set_clip_rect (draw_tool, &cliprect, FALSE);
 
+  pango_layout_get_pixel_extents (text_tool->layout->layout,
+                                  &ink_extents, &logical_extents);
+
+  if (ink_extents.x < 0)
+    logical_off_x = -ink_extents.x;
+
+  if (ink_extents.y < 0)
+    logical_off_y = -ink_extents.y;
+
   gtk_text_buffer_get_start_iter (text_tool->text_buffer, &start);
 
   if (! gtk_text_buffer_get_has_selection (text_tool->text_buffer))
@@ -1065,8 +1085,8 @@
 
       pango_layout_index_to_pos (text_tool->layout->layout, cursorx, &crect);
 
-      crect.x      = PANGO_PIXELS (crect.x);
-      crect.y      = PANGO_PIXELS (crect.y);
+      crect.x      = PANGO_PIXELS (crect.x) + logical_off_x;
+      crect.y      = PANGO_PIXELS (crect.y) + logical_off_y;
       crect.height = PANGO_PIXELS (crect.height);
 
       gimp_draw_tool_draw_rectangle (draw_tool, TRUE,
@@ -1083,14 +1103,14 @@
                                      TRUE);
 
       if (text_tool->preedit_string && text_tool->preedit_len > 0)
-        gimp_text_tool_draw_preedit (draw_tool);
+        gimp_text_tool_draw_preedit (draw_tool, logical_off_x, logical_off_y);
     }
   else
     {
       /* If the text buffer has a selection, highlight the selected
        * letters
        */
-      gimp_text_tool_draw_selection (draw_tool);
+      gimp_text_tool_draw_selection (draw_tool, logical_off_x, logical_off_y);
     }
 
   /* Turn off clipping when done */
@@ -1098,7 +1118,9 @@
 }
 
 static void
-gimp_text_tool_draw_preedit (GimpDrawTool *draw_tool)
+gimp_text_tool_draw_preedit (GimpDrawTool *draw_tool,
+                             gint          logical_off_x,
+                             gint          logical_off_y)
 {
   GimpTextTool    *text_tool = GIMP_TEXT_TOOL (draw_tool);
   PangoLayout     *layout;
@@ -1130,6 +1152,9 @@
       pango_layout_index_to_line_x (layout, min, 0, &firstline, &first_x);
       pango_layout_index_to_line_x (layout, max, 0, &lastline, &last_x);
 
+      first_x = PANGO_PIXELS (first_x) + logical_off_x;
+      last_x  = PANGO_PIXELS (last_x)  + logical_off_x;
+
       if (i >= firstline && i <= lastline)
         {
           PangoRectangle crect;
@@ -1137,6 +1162,9 @@
           pango_layout_iter_get_line_extents (line_iter, NULL, &crect);
           pango_extents_to_pixels (&crect, NULL);
 
+          crect.x += logical_off_x;
+          crect.y += logical_off_y;
+
           gimp_draw_tool_draw_line (draw_tool,
                                     crect.x, crect.y + crect.height,
                                     crect.x + crect.width,
@@ -1147,7 +1175,7 @@
             {
               PangoRectangle crect2 = crect;
 
-              crect2.width = PANGO_PIXELS (first_x) - crect.x;
+              crect2.width = first_x - crect.x;
               crect2.x     = crect.x;
 
               gimp_draw_tool_draw_line (draw_tool,
@@ -1161,8 +1189,8 @@
             {
               PangoRectangle crect2 = crect;
 
-              crect2.width = crect.x + crect.width - PANGO_PIXELS (last_x);
-              crect2.x     = PANGO_PIXELS (last_x);
+              crect2.width = crect.x + crect.width - last_x;
+              crect2.x     = last_x;
 
               gimp_draw_tool_draw_line (draw_tool,
                                         crect2.x, crect2.y + crect2.height,
@@ -1180,7 +1208,9 @@
 }
 
 static void
-gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
+gimp_text_tool_draw_selection (GimpDrawTool *draw_tool,
+                               gint          logical_off_x,
+                               gint          logical_off_y)
 {
   GimpTextTool    *text_tool = GIMP_TEXT_TOOL (draw_tool);
   PangoLayout     *layout;
@@ -1219,7 +1249,10 @@
       gint first_x,   last_x;
 
       pango_layout_index_to_line_x (layout, min, 0, &firstline, &first_x);
-      pango_layout_index_to_line_x (layout, max, 0, &lastline, &last_x);
+      pango_layout_index_to_line_x (layout, max, 0, &lastline,  &last_x);
+
+      first_x = PANGO_PIXELS (first_x) + logical_off_x;
+      last_x  = PANGO_PIXELS (last_x)  + logical_off_x;
 
       if (i >= firstline && i <= lastline)
         {
@@ -1228,6 +1261,9 @@
           pango_layout_iter_get_line_extents (line_iter, NULL, &crect);
           pango_extents_to_pixels (&crect, NULL);
 
+          crect.x += logical_off_x;
+          crect.y += logical_off_y;
+
           gimp_draw_tool_draw_rectangle (draw_tool, TRUE,
                                          crect.x, crect.y,
                                          crect.width, crect.height,
@@ -1240,7 +1276,7 @@
                */
               PangoRectangle crect2 = crect;
 
-              crect2.width = PANGO_PIXELS (first_x) - crect.x;
+              crect2.width = first_x - crect.x;
               crect2.x     = crect.x;
 
               gimp_draw_tool_draw_rectangle (draw_tool, TRUE,
@@ -1256,8 +1292,8 @@
                */
               PangoRectangle crect2 = crect;
 
-              crect2.width = crect.x + crect.width - PANGO_PIXELS (last_x);
-              crect2.x     = PANGO_PIXELS (last_x);
+              crect2.width = crect.x + crect.width - last_x;
+              crect2.x     = last_x;
 
               gimp_draw_tool_draw_rectangle (draw_tool, TRUE,
                                              crect2.x, crect2.y,
@@ -2174,10 +2210,21 @@
                              gdouble       x,
                              gdouble       y)
 {
-  GtkTextIter start, end;
-  gchar      *string;
-  gint        offset;
-  gint        trailing;
+  PangoRectangle  ink_extents;
+  GtkTextIter     start, end;
+  gchar          *string;
+  gint            offset;
+  gint            trailing;
+
+  /*  adjust to offset of logical rect  */
+  pango_layout_get_pixel_extents (text_tool->layout->layout,
+                                  &ink_extents, NULL);
+
+  if (ink_extents.x < 0)
+    x += ink_extents.x;
+
+  if (ink_extents.y < 0)
+    y += ink_extents.y;
 
   gtk_text_buffer_get_bounds (text_tool->text_buffer, &start, &end);
   string = gtk_text_buffer_get_text (text_tool->text_buffer,