Bugfix festival.

[bpt/emacs.git] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index b4aa969..3cf15de 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5700,8 +5700,6 @@ buffer_posn_from_coords (w, x, y, dx, dy, object, pos)
   struct it it;
   struct buffer *old_current_buffer = current_buffer;
   struct text_pos startp;
-  struct glyph_row *row;
-  struct image *img;
   int x0, x1;
 
   current_buffer = XBUFFER (w->buffer);
@@ -5714,25 +5712,44 @@ buffer_posn_from_coords (w, x, y, dx, dy, object, pos)
   move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1,
              MOVE_TO_X | MOVE_TO_Y);
 
-  /* Add extra (default width) columns if clicked after EOL. */
-  x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x);
-  if (x0 > x1)
-    it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
-
   current_buffer = old_current_buffer;
 
   *dx = x0 + it.first_visible_x - it.current_x;
   *dy = *y - it.current_y;
 
+  *object =  w->buffer;
+
 #ifdef HAVE_WINDOW_SYSTEM
-  if (it.what == IT_IMAGE
-      && (img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL
-      && !NILP (img->spec))
-    *object = img->spec;
+  if (it.what == IT_IMAGE)
+    {
+      struct image *img;
+      if ((img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL
+         && !NILP (img->spec))
+       {
+         struct glyph_row *row = MATRIX_ROW (w->current_matrix, it.vpos);
+         struct glyph *glyph;
+
+         if (it.hpos < row->used[TEXT_AREA]
+             && (glyph = row->glyphs[TEXT_AREA] + it.hpos,
+                 glyph->type == IMAGE_GLYPH))
+           {
+             *dy -= row->ascent - glyph->ascent;
+             *object = img->spec;
+           }
+       }
+    }
   else
 #endif
-    *object = STRINGP (it.string) ? it.string : w->buffer;
+    if (STRINGP (it.string))
+      *object = it.string;
+
   *pos = it.current;
+
+  /* Add extra (default width) columns if clicked after EOL. */
+  x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x);
+  if (x0 > x1)
+    it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
+
   *x = it.hpos;
   *y = it.vpos;
 }
@@ -5852,6 +5869,16 @@ marginal_area_string (w, x, y, dx, dy, part, charpos)
        {
          string = glyph->object;
          *charpos = glyph->charpos;
+#ifdef HAVE_WINDOW_SYSTEM
+         if (glyph->type == IMAGE_GLYPH)
+           {
+             struct image *img;
+             img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id);
+             if (img != NULL)
+               string = img->spec;
+             y0 -= row->ascent - glyph->ascent;
+           }
+#endif
        }
       else
        /* Add extra (default width) columns if clicked after EOL. */
@@ -5894,11 +5921,12 @@ window_change_signal (signalnum) /* If we don't have an argument, */
   /* The frame size change obviously applies to a single
      termcap-controlled terminal, but we can't decide which.
      Therefore, we resize the frames corresponding to each tty.
-     
-     XXX In fact we only get the signal for the initial terminal.
   */
   for (tty = tty_list; tty; tty = tty->next) {
 
+    if (! tty->term_initted)
+      continue;
+    
     get_tty_size (tty, &width, &height);
     
     {
@@ -6596,8 +6624,13 @@ For types not defined in VMS, use  define emacs_term \"TYPE\".\n\
   }
 #endif /* VMS */
 
-  term_init (0, terminal_type);
-
+  {
+    struct tty_output *tty;
+    
+    tty = term_init (selected_frame, 0, terminal_type);
+    change_frame_size (XFRAME (selected_frame), FrameRows (tty), FrameCols (tty), 0, 0, 0);
+  }
+  
   {
     struct frame *sf = SELECTED_FRAME ();
     int width = FRAME_TOTAL_COLS (sf);